diff --git a/Directory.Build.props b/Directory.Build.props
index b9e9577cd23a3b9c1b1deb133a629690cec45fed..1c6bee655b6959f864f99d9336793857ca01dbd2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -8,7 +8,7 @@
<!--<DefineConstants>CERTIFICATION_RELEASE</DefineConstants>-->
<!-- Global VECTO Version -->
- <MainProductVersion>0.7.8</MainProductVersion>
+ <MainProductVersion>0.7.9</MainProductVersion>
<VersionSuffix>DEV</VersionSuffix>
<!-- The following settings are used as default values for ALL projects -->
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 5888f23e743aa10da43dccae2fc659ed157289c8..edd2f606374e37fb159728dd97ca5eb55a68d30c 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -24,13 +24,14 @@
<ItemGroup Condition="'$(Configuration)'=='Deploy'">
<!-- All files for net45 -->
- <Net45VECTO Include="$(SolutionDir)VECTO\bin\Release\net45\*.exe*"/>
+ <Net45VECTO Include="$(SolutionDir)VECTO\bin\Release\net45\*.exe"/>
<Net45VECTO Include="$(SolutionDir)VECTO\bin\Release\net45\*.dll*"/>
- <Net45HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net45\*.exe*"/>
+ <Net45Vecto Include="$(SolutionDir)VECTO\bin\Release\net45\nlog.config"/>
+ <Net45HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net45\*.exe"/>
<Net45HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net45\*.dll*"/>
- <Net45HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net45\*.exe*"/>
+ <Net45HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net45\*.exe"/>
<Net45HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net45\*.dll*"/>
- <Net45VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net45\*.exe*"/>
+ <Net45VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net45\*.exe"/>
<Net45VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net45\*.dll*"/>
</ItemGroup>
<!--MockupDeploy-->
@@ -55,13 +56,14 @@
<ItemGroup Condition="'$(Configuration)'=='Deploy'">
<!-- All files for net48 -->
- <Net48VECTO Include="$(SolutionDir)VECTO\bin\Release\net48\*.exe*"/>
+ <Net48VECTO Include="$(SolutionDir)VECTO\bin\Release\net48\*.exe"/>
<Net48VECTO Include="$(SolutionDir)VECTO\bin\Release\net48\*.dll*"/>
- <Net48HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net48\*.exe*"/>
+ <Net48Vecto Include="$(SolutionDir)VECTO\bin\Release\net48\nlog.config"/>
+ <Net48HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net48\*.exe"/>
<Net48HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net48\*.dll*"/>
- <Net48VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net48\*.exe*"/>
+ <Net48VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net48\*.exe"/>
<Net48VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net48\*.dll*"/>
- <Net48VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net48\*.exe*"/>
+ <Net48VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net48\*.exe"/>
<Net48VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net48\*.dll*"/>
</ItemGroup>
@@ -87,6 +89,7 @@
<!-- All files for net6.0 -->
<Vecto Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\VECTO.*" Exclude="*.dev.json"/>
<Vecto Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\*.dll"/>
+ <Vecto Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\nlog.config"/>
<VectoRuntimes Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\runtimes\**\*.*"/>
<VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net6.0\vectocmd.*" Exclude="*.dev.json"/>
<VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net6.0\*.dll"/>
diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf
index f4fd08c9171912a98a390276108b8255e24260bb..0cf07b3c0271a4622f27ebd0bbe2d4cfc21bb04a 100644
Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf and b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf differ
diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx
index d0a0e0aea336c18e477643c8ee6bfd639fae05a4..8bff50339356cdc703753c405d8e996ed61698b6 100644
Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx and b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx differ
diff --git a/Documentation/User Manual Source/material User Manual.pptx b/Documentation/User Manual Source/material User Manual.pptx
index a3f5a0a78e18a538105222dac7fd93bbaca9f2f0..2d28b13f895c7b8ba85633cf3eb3d2411b28106a 100644
Binary files a/Documentation/User Manual Source/material User Manual.pptx and b/Documentation/User Manual Source/material User Manual.pptx differ
diff --git a/Documentation/User Manual/1-user-interface/A_index.md b/Documentation/User Manual/1-user-interface/A_index.md
index 37f1ab1516006ed88b0c9535746b3bd19523e936..97c90b5d43927fb4a756d6b50ccb5d3c41cb0036 100644
--- a/Documentation/User Manual/1-user-interface/A_index.md
+++ b/Documentation/User Manual/1-user-interface/A_index.md
@@ -6,12 +6,16 @@ When VECTO starts the [Main Form](#main-form) is loaded. Closing this form will
- [Main Form](#main-form)
- [Settings](#settings)
- [Job Editor](#job-editor)
-- [Vehicle Editor](#vehicle-editor-general-tab)
-- [Vehicle Editor](#vehicle-editor-powertrain-tab)
-- [Vehicle Editor](#vehicle-editor-electric-components-tab)
-- [Vehicle Editor](#vehicle-editor-torque-limits-tab)
-- [Vehicle Editor](#vehicle-editor-adas-tab)
-- [Vehicle Editor](#vehicle-editor-pto-tab)
+- [Vehicle Editor - General](#vehicle-editor-general-tab)
+- [Vehicle Editor - Powertrain](#vehicle-editor-powertrain-tab)
+- [Vehicle Editor - Electric Machine](#vehicle-editor-electric-machine-tab)
+- [Vehicle Editor - REESS](#vehicle-editor-reess-tab)
+- [Vehicle Editor - IEPC](#vehicle-editor-iepc-tab)
+- [Vehicle Editor - IHPC](#vehicle-editor-ihpc-tab)
+- [Vehicle Editor - GenSet](#vehicle-editor-genset-tab)
+- [Vehicle Editor - Torque Limits](#vehicle-editor-torque-limits-tab)
+- [Vehicle Editor - ADAS](#vehicle-editor-adas-tab)
+- [Vehicle Editor - PTO](#vehicle-editor-pto-tab)
- [Aux Dialog](#auxiliary-dialog)
- [BusAux Dialog](#busauxiliary-dialog)
- [Engine Editor](#engine-editor)
diff --git a/Documentation/User Manual/1-user-interface/F_VEH-Editor.md b/Documentation/User Manual/1-user-interface/F_VEH-Editor.md
index 644da2d8df0cd8055af516e311b762aac6ad91cb..dbafd237a94e0b898b39f1b01c46576cef5ae021 100644
--- a/Documentation/User Manual/1-user-interface/F_VEH-Editor.md
+++ b/Documentation/User Manual/1-user-interface/F_VEH-Editor.md
@@ -155,13 +155,13 @@ Three options are available:
-## Vehicle Editor -- Electric Components Tab
+## Vehicle Editor -- Electric Machine Tab
-
+
-For hybrid vehicles and battery electric vehicles the input elements on the *electric components* tab are enabled. Here the component file for the eletric motor and battery pack can be loaded or created (see [Electric Motor Editor](#electric-motor-editor), [Electric Energy Storage Editor](#rechargeable-electric-energy-storage-editor))
+For hybrid vehicles and battery electric vehicles the input elements on the *electric machine* tab is enabled. Here the component file for the eletric motor can be loaded or created (see [Electric Motor Editor](#electric-motor-editor))
-The position where the electric machine is positioned in the powertrain can be selected. It is possible that the electric machine is connected to the powertrain via a fixed gear ratio.
+The position where the electric machine is located in the powertrain can be selected. It is possible that the electric machine is connected to the powertrain via a fixed gear ratio.
At the moment electric machines are supported to be present at a single position only. It is not possible to have an electric motor at position P2 and another at position P4!
However, it is possible that more than one electric machine is used at a certain position.
@@ -170,6 +170,13 @@ The *Loss map EM ADC* can be used to consider the losses of a transmission step
In case of a P2.5 configuration (the electric motor is connected to an internal shaft of the tranmission) the transmission ratio for every single gear of the transmission has to be specified in the list to the right of the electric motor parameters. The ratio is defeined as $n_\textrm{GBX,in} / n_\textrm{EM}$ in case of EM without additional ADC or $n_\textrm{GBX,in} / n_\textrm{ADC,out}$ in case of EM with additional ADC.
+
+## Vehicle Editor -- REESS Tab
+
+
+
+For hybrid vehicles and battery electric vehicles the input elements on the *rechargeable electric energy storage system (REESS)* tab is enabled. Here the component file for the battery pack can be loaded or created (see [Electric Energy Storage Editor](#rechargeable-electric-energy-storage-editor))
+
For the electric energy storage multiple battery packs can be configured either in series or in parallel and the initial state of charge of the whole battery system can be defined. For every entry of a battery pack the number of packs (count) in series and a stream identifier need to be specified. Battery packs on the same stream are connected in series (e.g., two different battery packs on stream number 1 are in series) while all streams are then connected in parallel (see [Battery Model](#ress) for details). This is only supported for batteries and **not** for SuperCaps.
**Double-click** an entry to edit.
@@ -182,6 +189,25 @@ In the REESS Dialog the battery file itself and how it is connected to the elect
+## Vehicle Editor -- IEPC Tab
+
+
+
+For battery electric vehicles of type IEPC-E or hybrid vehicles of type IEPC-S, the tab for the *integrated electric powertrain component (IEPC)* is visible. Here the component file for the IEPC can be loaded or created (see [IEPC Editor](#iepc-editor)).
+
+## Vehicle Editor -- IHPC Tab
+
+
+
+For hybrid vehicles if type IHPC the input tab for *integrated hybrid powertrain component (IHPC)* is visible. Here the component file for the electric machine part of the IHPC can be loaded or created (see [IHPC Editor](#ihpc-editor))
+
+## Vehicle Editor -- GenSet Tab
+
+
+
+For serial hybrid vehicles the *GenSet tab* is visible. On this tab the electric machine used as generator connected to the combustion engine can be specified (see [Electric Motor Editor](#electric-motor-editor)). It is possible to have multiple equal electric machines as generator. The electric machines can be connected via a transmission to the combustion engine.
+
+The *Loss map EM ADC* can be used to consider the losses of a transmission step between drivetrain and electric machine or to consider losses of a summation gear. The loss map has the same format as for all other transmission components (see [Transmission Loss Map (.vtlm)](#transmission-loss-map-.vtlm)). For simplicity or if no such transmission step is used it is possible to enter the efficiency directly (i.e., "1" if no transmission step is used).
## Vehicle Editor -- Torque Limits Tab
@@ -194,7 +220,7 @@ In case that the gearbox' maximum torque is lower than the engine's maximum torq
Next, the maximum available torque for the electric machine can be reduced at the vehicle level, both for propulsion and recuperation. The input file is the same as the maximum drive and maximum recuperation curve (see [Electric Motor Max Torque File](#electric-motor-max-torque-file-.vemp))
-Last, the overall propulsion of the vehicle (i.e., HEV Px, electric motor plus combustion engine) can be limited. The "Propulsion Torque Limit" curve limits the maximum effective torque at the gearbox input shaft over the input speed. This curve is added to the combustion engine's maximum torque curve (only positive values are allowed!). For details on the file format see [Vehicle Boosting Limits](#vehcle-boosing-limits-.vemp). The propulsion torque limit has to be provided from 0 rpm to the maximum speed of the combustion engine. In case of P3 or P4 configuration, the torque at the gearbox input shaft is calculated assuming that the electric motor does not contribute to propelling the vehicle, considering the increased losses in the transmission components inbetween. For P2.5 powertrain configurations no special calculations are necessary as this architecture is internally anyhow modelled as P2 architecture.
+Last, the overall propulsion of the vehicle (i.e., HEV Px, electric motor plus combustion engine) can be limited. The "Propulsion Torque Limit" curve limits the maximum effective torque at the gearbox input shaft over the input speed. This curve is added to the combustion engine's maximum torque curve (only positive values are allowed!). For details on the file format see [Vehicle Boosting Limits](#vehicle-boosting-limits-.vtqp). The propulsion torque limit has to be provided from 0 rpm to the maximum speed of the combustion engine. In case of P3 or P4 configuration, the torque at the gearbox input shaft is calculated assuming that the electric motor does not contribute to propelling the vehicle, considering the increased losses in the transmission components inbetween. For P2.5 powertrain configurations no special calculations are necessary as this architecture is internally anyhow modelled as P2 architecture.
## Vehicle Editor -- ADAS Tab
diff --git a/Documentation/User Manual/1-user-interface/H1_HybridStrategyParams-Editor.md b/Documentation/User Manual/1-user-interface/H1_HybridStrategyParams-Editor.md
index b3cff88c75d41593b7b57fb3c70672ed67cb0aea..c8e7aeb3cff86ed3a7954eb409455f973054fad5 100644
--- a/Documentation/User Manual/1-user-interface/H1_HybridStrategyParams-Editor.md
+++ b/Documentation/User Manual/1-user-interface/H1_HybridStrategyParams-Editor.md
@@ -6,7 +6,7 @@
### Description
-The [Hybrid Strategy Parameters File (.vhctl)](#hybrid-strategy-parameters-file-.vhctl) defines all parameters used by the [Hybrid Control Strategy](#hybrid-control-strategy) to evaluate the best option for splitting the demanded torque between electric motor and combustion engine.
+The [Hybrid Strategy Parameters File (.vhctl)](#hybrid-strategy-parameters-file-.vhctl) defines all parameters used by the [Parallel Hybrid Control Strategy](#parallel-hybrid-control-strategy)/[Serial Hybrid Control Strategy](#serial-hybrid-control-strategy) to evaluate the best option for splitting the demanded torque between electric motor and combustion engine.
### Strategy Parameters
diff --git a/Documentation/User Manual/1-user-interface/H_GBX-Editor.md b/Documentation/User Manual/1-user-interface/H_GBX-Editor.md
index 5ddaec22fbced1dd77948bdb1931908adac51547..639d3487ee6f6207ce2669c06399cf22335215ae 100644
--- a/Documentation/User Manual/1-user-interface/H_GBX-Editor.md
+++ b/Documentation/User Manual/1-user-interface/H_GBX-Editor.md
@@ -71,7 +71,7 @@ Automated Manual Transmission - Hybrid Electric vehicle
: Gearshift is handled by the hybrid controller. Shift lines (calculated in the same way as for conventional vehicles) are used as upper and lower boundary for allowed ICE operating points.
Automated Manual Transmission - Pure Electric vehicle
-: Efficiency shift based strategy. The calculation of gearshift lines and the gearshift rules are [described here](#FFOOO)
+: Efficiency shift based strategy. The calculation of gearshift lines and the gearshift rules are [described here](#pev-gear-shift-model)
Automatic Transmission - Conventional vehicle
: Efficiency shift. The calculation of gearshift lines and the gearshift rules are [described here](#shift-strategy-apt-gearshift-rules)
@@ -80,7 +80,7 @@ Automatic Transmission - Hybrid Electric vehicle
: Gearshift is handled by the hybrid controller. Shift lines (calculated in the same way as for conventional vehicles) are used as upper and lower boundary for allowed ICE operating points.
Automatic Transmission (APT-N) - Pure Electric vehicle
-: Efficiency shift based strategy. The calculation of gearshift lines and the gearshift rules are [described here](#FFOOO)
+: Efficiency shift based strategy. The calculation of gearshift lines and the gearshift rules are [described here](#pev-gear-shift-model)
<div class="engineering">
diff --git a/Documentation/User Manual/1-user-interface/L_ElectricMotor.md b/Documentation/User Manual/1-user-interface/L_ElectricMotor.md
index f05e2240fd32ae7d61550171941a833025425b76..77cf5a81526c6c2cb3bfaeb5347ac36c21237f81 100644
--- a/Documentation/User Manual/1-user-interface/L_ElectricMotor.md
+++ b/Documentation/User Manual/1-user-interface/L_ElectricMotor.md
@@ -11,7 +11,7 @@ The electric motor file defines all parameters relevant for the electric machine
It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths.
-VECTO automatically uses relative paths if the input file (e.g. elctric power map) is in the same directory as the Electric Motor File. (The Electric Motor File must be saved before browsing for input files.)
+VECTO automatically uses relative paths if the input file (e.g. elctric power map) is in the same directory as the Electric Motor File. (The Electric Motor File must be saved before browsing for input files.)
### Main Parameters
@@ -47,7 +47,7 @@ Max. Drive and Max. Generation Torque Curve
: Torque over engine speed the electric motor can apply on its output shaft. (see [Electric Motor Max Torque File (.vemp)](#electric-motor-max-torque-file-.vemp)). The max drive and max generation torque have to be provided for two different voltage levels.
Electric Power Consumption Map
-: Defines the electric power that is required to provide a certain mechanical power (torque and angular speed) at the motor's shaft. This map is used to calculate the electric power demand. The electric power consumption map shall cover a torque range exceeding the max. drive and max. generation torque and shall cover the speed range from 0 up to the maximum speed. (see [Electric Motor Map (.vemo)](#electric-motor-map-.vemo)). The power map has to be provided for two different voltage levels.
+: Defines the electric power that is required to provide a certain mechanical power (torque and angular speed) at the motor's shaft. This map is used to calculate the electric power demand. The electric power consumption map shall cover a torque range exceeding the max. drive and max. generation torque and shall cover the speed range from 0 up to the maximum speed. (see [Electric Motor Map (.vemo)](#electric-motor-power-map-.vemo)). The power map has to be provided for two different voltage levels.
Voltage Level Low/High
: Applicable voltage level for the electric power consumption map and max drive/generation torque curve
diff --git a/Documentation/User Manual/1-user-interface/N_IEPC.md b/Documentation/User Manual/1-user-interface/N_IEPC.md
new file mode 100644
index 0000000000000000000000000000000000000000..13932980c6b4032bb4c13e275ef9da1f6d568705
--- /dev/null
+++ b/Documentation/User Manual/1-user-interface/N_IEPC.md
@@ -0,0 +1,92 @@
+## IEPC Editor
+
+
+
+
+### Description
+
+Integrated electric powertrain component (IEPC) means a combined system of an electric machine system together with the funcitonality of either a single- or multi-speed gearbox or a differential or both.
+
+An IEPC can be of design-type wheel motor which means that the output shaft (or two output shafts) are directly connected to the wheel hub(s). The IEPC component file defines all parameters relevant for the electric machine. These are the motor's maximum drive and recuperation torque, the drag torque as well as the electric power map.
+
+An IEPC may have several shiftable transmission steps or only a single gear stage between the output shaft and the electric machine. The electric power consumption map has to be provided for every gear.
+
+### Relative File Paths
+
+It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths.
+
+VECTO automatically uses relative paths if the input file (e.g. elctric power map) is in the same directory as the Electric Motor File. (The Electric Motor File must be saved before browsing for input files.)
+
+
+### Main Parameters
+
+Make and Model
+: Free text defining the gearbox model, type, etc.
+
+Inertia \[kgm²\]
+: Rotational inertia of the electric machine at the output shaft of the EM. (Engineering mode only)
+
+Gears
+: Gear ratios of the transmission steps of the IEPC
+
+Continuous Torque \[Nm\]
+: The nominal torque the electric machine can provide continuously
+
+Test Speed Continous Torque \[rpm\]
+: Angular speed at which the continouos torque can be provided
+
+Overload Torque \[Nm\]
+: Maximum torque above the continuous torque the electric motor can provide for a certain time
+
+Test Speed Overload Torque \[rpm\]
+: Angular speed at which the overload torque was measured
+
+Overload Duration \[s\]
+: The time interval the electric machine can operate at its peak performance
+
+Thermal Overload Recovery Factor
+: The accumulated overload energy has to be below the max. overload capacity multiplied by this factor so that the peak power is available again.
+
+Drag Torque Curve
+: The motor's drag torque over engine speed when the motor is not energized. The torque values in the drag curve have to be negative. (see [IEPC Drag Curve File (.viepcd)](#iepc-drag-curve-file-.viepcd))
+
+Max. Drive and Max. Generation Torque Curve
+: Torque over engine speed the electric motor can apply on its output shaft. (see [IEPC Max Torque File (.vemp)](#iepc-max-torque-file-.viepcp)). The max drive and max generation torque have to be provided for two different voltage levels.
+
+Electric Power Consumption Map
+: Defines the electric power that is required to provide a certain mechanical power (torque and angular speed) at the motor's shaft. This map is used to calculate the electric power demand. The electric power consumption map shall cover a torque range exceeding the max. drive and max. generation torque and shall cover the speed range from 0 up to the maximum speed. (see [IEPC Map (.viepco)](#iepc-power-map-.viepco)). The power map has to be provided for two different voltage levels and all gears.
+
+Voltage Level Low/High
+: Applicable voltage level for the electric power consumption map and max drive/generation torque curve
+
+
+
+### Controls
+
+
+ New file
+: Create a new empty .vem file
+
+Open existing file
+: Open an existing .vem file
+
+
+ ***Save current file***
+
+ ***Save file as...***
+
+ Send current file to the [VECTO Editor](#job-editor)
+: **Note:** If the current file was opened via the [VECTO Editor](#job-editor) the file will be sent automatically when saved.
+
+
+ ***Open file browser***
+
+ ***Open file*** (see [File Open Command)](#settings).
+
+ Save and close file
+: If necessary the file path in the [VECTO Editor](#job-editor) will
+be updated.
+
+
+ ***Cancel without saving***
+
diff --git a/Documentation/User Manual/1-user-interface/O_IHPC.md b/Documentation/User Manual/1-user-interface/O_IHPC.md
new file mode 100644
index 0000000000000000000000000000000000000000..b4724e77a7b6df357c0deee4539721fadb680cbf
--- /dev/null
+++ b/Documentation/User Manual/1-user-interface/O_IHPC.md
@@ -0,0 +1,89 @@
+## IHPC Editor
+
+
+
+
+### Description
+
+Integrated hybrid electric vehicle powertrain component (IHPC) means a combined system of multiple electric machine systems together with the functionality of a multi-speed gearbox.
+
+
+### Relative File Paths
+
+It is recommended to use relative filepaths. This way the Job File and all input files can be moved without having to update the paths.
+
+VECTO automatically uses relative paths if the input file (e.g. elctric power map) is in the same directory as the Electric Motor File. (The Electric Motor File must be saved before browsing for input files.)
+
+
+### Main Parameters
+
+Make and Model
+: Free text defining the gearbox model, type, etc.
+
+Inertia \[kgm²\]
+: Rotational inertia of the electric machine defined at the output shaft of the EM. (Engineering mode only)
+
+Gears
+: Gear ratios of the transmission steps of the IEPC
+
+Continuous Torque \[Nm\]
+: The nominal torque the electric machine can provide continuously
+
+Test Speed Continous Torque \[rpm\]
+: Angular speed at which the continouos torque can be provided
+
+Overload Torque \[Nm\]
+: Maximum torque above the continuous torque the electric motor can provide for a certain time
+
+Test Speed Overload Torque \[rpm\]
+: Angular speed at which the overload torque was measured
+
+Overload Duration \[s\]
+: The time interval the electric machine can operate at its peak performance
+
+Thermal Overload Recovery Factor
+: The accumulated overload energy has to be below the max. overload capacity multiplied by this factor so that the peak power is available again.
+
+Drag Torque Curve
+: The motor's drag torque over engine speed when the motor is not energized. The torque values in the drag curve have to be negative. (see [Electric Motor Drag Curve File (.vemd)](#electric-motor-drag-curve-file-.vemd))
+
+Max. Drive and Max. Generation Torque Curve
+: Torque over engine speed the electric motor can apply on its output shaft. (see [Electric Motor Max Torque File (.vemp)](#electric-motor-max-torque-file-.vemp)). The max drive and max generation torque have to be provided for two different voltage levels.
+
+Electric Power Consumption Map
+: Defines the electric power that is required to provide a certain mechanical power (torque and angular speed) at the motor's shaft. This map is used to calculate the electric power demand. The electric power consumption map shall cover a torque range exceeding the max. drive and max. generation torque and shall cover the speed range from 0 up to the maximum speed. (see [Electric Motor Map (.viepco)](#electric-motor-power-map-.vemo)). The power map has to be provided for two different voltage levels and all gears.
+
+Voltage Level Low/High
+: Applicable voltage level for the electric power consumption map and max drive/generation torque curve
+
+
+
+### Controls
+
+
+ New file
+: Create a new empty .vem file
+
+Open existing file
+: Open an existing .vem file
+
+
+ ***Save current file***
+
+ ***Save file as...***
+
+ Send current file to the [VECTO Editor](#job-editor)
+: **Note:** If the current file was opened via the [VECTO Editor](#job-editor) the file will be sent automatically when saved.
+
+
+ ***Open file browser***
+
+ ***Open file*** (see [File Open Command)](#settings).
+
+ Save and close file
+: If necessary the file path in the [VECTO Editor](#job-editor) will
+be updated.
+
+
+ ***Cancel without saving***
+
diff --git a/Documentation/User Manual/3-simulation-models/Electric_Motor.md b/Documentation/User Manual/3-simulation-models/Electric_Motor.md
index d96d45d86eed7c371fecb7b0f928b43c19071cff..221d374fc7703564f1df6293679d201bd0f90eef 100644
--- a/Documentation/User Manual/3-simulation-models/Electric_Motor.md
+++ b/Documentation/User Manual/3-simulation-models/Electric_Motor.md
@@ -12,7 +12,7 @@ The electric motor is modeled by basically 4 map files:
- Engine speed for overload torque ($n_\textrm{T,ovl}$)
- Maximum overload time ($t_\textrm{ovl}$)
-The first two curves are read from a .vemp file (see [Electric Motor Max Torque File (.vemp)](#electric-motor-max-torque-file-.vemp)). The drag curve is provided in a .vemd file (see [Electric Motor Drag Curve File (.vemd)](#electric-motor-drag-curve-file-.vemd)) and the electric power map in a .vemo file (see [Electric Motor Map (.vemo)](#electric-motor-map-.vemo)).
+The first two curves are read from a .vemp file (see [Electric Motor Max Torque File (.vemp)](#electric-motor-max-torque-file-.vemp)). The drag curve is provided in a .vemd file (see [Electric Motor Drag Curve File (.vemd)](#electric-motor-drag-curve-file-.vemd)) and the electric power map in a .vemo file (see [Electric Motor Map (.vemo)](#electric-motor-power-map-.vemo)).
During the simulation the maximum drive torque, maximum generation torque, and electric power map is interpolated for both voltage levels and the actual value used is interpolated between both voltage levels with the current internal voltage of the REESS.
diff --git a/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md b/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md
index a9282f9bd3ef258accf62d489213799876d05723..2735062bda4541975ecda6bdfb7b0aad3676e25e 100644
--- a/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md
+++ b/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md
@@ -143,9 +143,9 @@ $$
$\textbf{\textrm{FC\_WHR}} = - (\textrm{E\_WHR\_mech} + \textrm{E\_WHR\_el\_mech}) \cdot k_\textrm{engline}$
-#### Hybrid Vehicles: REESS SoC Correction
+#### Parallel Hybrid Vehicles: REESS SoC Correction
-If the REESS Soc at the end of the simulation is higher than the initial SoC the correction is done according to:
+If the REESS Soc at the end of the simulation is different than the initial SoC the correction is done according to:
$$
\textbf{\textrm{FC\_SoC}} = -\frac{\Delta\textrm{E\_REESS} \cdot k_\textrm{engline}}{\eta_{\textrm{EM}_\textrm{chg}} \cdot \eta_{\textrm{REESS}_\textrm{chg}}}
@@ -164,6 +164,24 @@ $\eta_{\textrm{REESS}_\textrm{chg}} = \frac{\textrm{E\_REESS\_INT\_CHG}}{\textrm
$\eta_{\textrm{REESS}_\textrm{dischg}} = \frac{\textrm{E\_REESS\_INT\_DISCHG}}{\textrm{E\_REEES\_T\_DISCHG}}$
+#### Serial Hybrid Vehicles: REESS SoC Correction
+
+If the REESS Soc at the end of the simulation is different than the initial SoC the correction is done according to:
+
+$FC_\textrm{gen,charging} = \sum{FC_\textrm{mod,final}\cdot dt}$
+
+$E_\textrm{gen,el} = \sum{P_\textrm{em,el}\cdot dt}$
+
+If the GenSet was on during the cycle, the SoC correction is done according to:
+
+$\textrm{FC\_SOC} = \Delta\textrm{E\_REESS} \cdot \frac{FC_\textrm{gen,charging}}{E_\textrm{gen,el}}$
+
+If the GenSet was never on during the cycle, the SoC correction is done according to:
+
+$\textrm{FC\_SOC} = \Delta\textrm{E\_REESS} \cdot \frac{FC_\textrm{gen,optimal}}{E_\textrm{gen,el,optimal}}$
+
+where $FC_\textrm{gen,optimal}$ and $E_\textrm{gen,el,optimal}$ are the fuel consumption and generated electric power in the optimal operating point of the GenSet
+
### Corrected Total Fuel Consumption
The final fuel consumption after all corrections are applied is calcualted as follows:
diff --git a/Documentation/User Manual/3-simulation-models/GearShift.md b/Documentation/User Manual/3-simulation-models/GearShift.md
index 192a4c5009b4fcf7c497a8f12b5990925e5e26e9..626bcc4c29fa3bb6ba71ee6142b021f185b86de7 100644
--- a/Documentation/User Manual/3-simulation-models/GearShift.md
+++ b/Documentation/User Manual/3-simulation-models/GearShift.md
@@ -24,7 +24,28 @@ $a_{demand} = a_{act} * a_{red}$ for $(n_{act} > n_{T98h})$
$a_{red} = 1+ (\textrm{AccelerationFactorNP98h} - 1) / (n_{P98h} - n_{T98h}) * (n - n_{T98h})$ for $(n_{act} > n_{T98h})$
+## PEV Gear Shift Model
+The gear shift lines for pure electric vehicles is different than for conventional vehicles and HEV as the shape of maximum torque curve is typically very different.
+The figure below depicts a typical maximum torque curve (orange) and maximum power curve (blue) for an electric motor. The downshift and upshift lines are plotted with a dot-dashed green line.
+**Basics:**
+
+ * Downshift for operation point left of green dot-dashed downshift lines
+ * Upshift for operation point right of green dot-dashed upshift line
+ * EffShift method applied for operation point between downshift and upshift lines (refer to user manual)
+
+**Driving:**
+
+ * Maximum downshift speed always located at n_P80low (where 80% of max power is available)
+ * For EM in de-rating n_P80low is calculated from the de-rated power curve
+
+**Braking:**
+
+ * EffShift is suppressed for operation point within red shaded area (2% below max recuperation power)
+ * New gear after downshift is selected so that operation point is closest to and above n_brake_target_norm (or only closest to n_brake_target_norm in case no operation point with higher speed exists)
+
+
+
diff --git a/Documentation/User Manual/3-simulation-models/IEPC.md b/Documentation/User Manual/3-simulation-models/IEPC.md
new file mode 100644
index 0000000000000000000000000000000000000000..ba25b0d1d933a0808fa4fbd4f49746fef6a05f95
--- /dev/null
+++ b/Documentation/User Manual/3-simulation-models/IEPC.md
@@ -0,0 +1,24 @@
+## Integrated Electric Powertrain Component (IEPC)
+
+Integrated electric powertrain component (IEPC) means a combined system of an electric machine system together with the funcitonality of either a single- or multi-speed gearbox or a differential or both.
+
+An IEPC can be of design-type wheel motor which means that the output shaft (or two output shafts) are directly connected to the wheel hub(s).
+
+The IEPC is modeled by the following parameters and map files:
+
+- Maximum drive torque over rotational speed (related to the output shaft)
+- Maximum generation torque over rotational speed (Related to the output shaft)
+- Gear ratios of all gears (electric motor to out shaft)
+- Drag curve. either for a single gear (measured with the gear with the ratio closest to 1) or all gears
+- Electric power map for all mechanical gears
+- Continuous torque and rotational speed (output shaft), measured with the gear with the ratio closest to 1
+- Overload torque and rotational speed (output shaft), measured with the gear with the ratio closest to 1
+- Maximum overload time
+
+The first two curves are read from a .viepcp file (see [IEPC Max Torque File (.viepcp)](#iepc-max-torque-file-.viepcp)). The drag curve(s) are provided in .viepcd file(s) (see [IEPC Drag Curve File (.viepcd)](#iepc-drag-curve-file-.viepcd)) and the electric power maps in .viepco file(s) (see [IEPC Power Map (.viepco)](#iepc-power-map-.viepco)). It is important to note that for the IEPC all maps are related to the output shaft speed (including all integrated components of the IEPC).
+
+In the VECTO simulation, the IEPC component is virtually split up into the electric machine (with gear-dependent electric power maps), an APT-N gearbox in case of a multi-speed gearbox or a single-speed gearbox in case the IEPC has only a single fixed transmission ratio, and optionally an axle gear. All virtual powertrain components (gearbox, axlegear) are modeled as loss-less components. Thus, the simulation of an IEPC is similar to E2 vehicles in case of a multi-speed gearbox or an E3 vehicle in case of a single-speed gearbox.
+
+
+
+All signals with the suffix "_int" refer to the electric motor, while signals without this suffix refer to the whole component.
\ No newline at end of file
diff --git a/Documentation/User Manual/3-simulation-models/IHPC.md b/Documentation/User Manual/3-simulation-models/IHPC.md
new file mode 100644
index 0000000000000000000000000000000000000000..b54c4a93f94ba533adab2958891307ff887b67d4
--- /dev/null
+++ b/Documentation/User Manual/3-simulation-models/IHPC.md
@@ -0,0 +1,18 @@
+## Integrated Hybrid Electric Powertrain Component (IHPC)
+
+Integrated hybrid electric powertrain component (IEPC) means a combined system of multiple electric machine systems together with the functionality of a multi-speed gearbox. An electric machine of type IHPC has to be used together with a gearbox of type IHPC.
+
+The IEPC is modeled by the following parameters and map files:
+
+- Maximum drive torque over rotational speed (related to the output shaft)
+- Maximum generation torque over rotational speed (Related to the output shaft)
+- Drag curve (shall be 0 as the drag losses are covered by the gearbox model)
+- Electric power map for all mechanical gears
+- Continuous torque and rotational speed (output shaft), measured with the gear with the ratio closest to 1
+- Overload torque and rotational speed (output shaft), measured with the gear with the ratio closest to 1
+- Maximum overload time
+
+The first two curves are read from a .vemp file (see [Electric Motor Max Torque File (.vemp)](#electric-motor-max-torque-file-.vemp)). The drag curve(s) are provided in .viepcd file(s) (see [IEPC Drag Curve File (.viepcd)](#electric-motor-drag-curve-file-.vemd)) and the electric power maps in .viepco file(s) (see [IEPC Power Map (.viepco)](#electric-motor-power-map-.vemo)).
+
+In the VECTO simulation, the IHPC component is similar to an electric motor, except the electric power maps are gear dependent.
+
diff --git a/Documentation/User Manual/3-simulation-models/HybridControlStrategy.md b/Documentation/User Manual/3-simulation-models/ParallelHybridControlStrategy.md
similarity index 99%
rename from Documentation/User Manual/3-simulation-models/HybridControlStrategy.md
rename to Documentation/User Manual/3-simulation-models/ParallelHybridControlStrategy.md
index 8a289e85e06fcaaeb9919464bcff77c1678cf02f..36fb74baea9f6cf0b361dd60b9714bdf81555f00 100644
--- a/Documentation/User Manual/3-simulation-models/HybridControlStrategy.md
+++ b/Documentation/User Manual/3-simulation-models/ParallelHybridControlStrategy.md
@@ -1,4 +1,4 @@
-## Hybrid Control Strategy
+## Parallel Hybrid Control Strategy
The basic principle of the hybrid control strategy is to evaluate different options of operating modes, i.e., different splits of the demanded torque at the wheels among the electric motor and the combustion engine. For every option a cost function is calculated, taking onto account the required electric energy and the fuel consumption. Out of the examined operating modes the best option, i.e, the option with the lowest cost value is selected.
diff --git a/Documentation/User Manual/3-simulation-models/SerialHybridControlStrategy.md b/Documentation/User Manual/3-simulation-models/SerialHybridControlStrategy.md
new file mode 100644
index 0000000000000000000000000000000000000000..dcf5fcc23ac22de29d0e6088d2cab07a0e011a63
--- /dev/null
+++ b/Documentation/User Manual/3-simulation-models/SerialHybridControlStrategy.md
@@ -0,0 +1,17 @@
+## Serial Hybrid Control Strategy
+
+The basic principle of the serial hybrid strategy is to operate the GenSet in three different states, depending on the power demand of the drivetrain and the REESS' state of charge. So the serial hybrid strategy operates as a three-point controller with a hysteresis.
+
+The following picture illustrates the basic idea. If the SoC is above the target SoC, the GenSet is off and the vehicle drives solely from the battery. When the SoC gets lower and reaches the SoC_min threshold, the GenSet is switched on. As long as the SoC is between SoC_min and SoC_target, the GenSet operates in the optimal operating point. When the upper threshold SoC_target is reached, the GenSet is switched off. In case the power demand from the drivetrain is higher than what the GenSet can provide in the optimal point and the SoC falls below the lower threshold SoC_min, the GenSet operates either in the maximum power operating point (if the drivetrain power demand is higher than the power generated in the optimal point) or in the optimal point.
+
+
+
+The statemachine for the serial hybrid control strategy is depicted here:
+
+
+
+**Note:** The SoC boundaries (SoC_target and SoC_min) shall be narrower than the batteries SoC limits so that on the one hand the vehicle can still recuperate even in case the REESS is charging and reaching the target SoC and on the other hand that there is a buffer available if the drivetrain power demand is high and the GenSet needs some time to ramp up to the maximal power operating point.
+
+### GenSet Pre-Processing
+
+The optimal and maximal GenSet operating points are calculated in a pre-processing step. The fuel consumption and generated electric power is calculated for 400 different operating points: from ICE idle speed up to the maximum speed (minimum of ICE and electric motor), and from 0 mechanical power up to the maximum mechanical power of the ICE. Out of this set of operating points the one with the highest electrical power and the operating point with the best fuel efficiency is selected. This is done for the GenSet operating in de-rating or not.
\ No newline at end of file
diff --git a/Documentation/User Manual/5-input-and-output-files/VEMx.md b/Documentation/User Manual/5-input-and-output-files/VEMx.md
index f717539a6d69d0f3735e70d9220e0e18ca681434..082c9785e33a987d0005526f0e1a72d24e8e3884 100644
--- a/Documentation/User Manual/5-input-and-output-files/VEMx.md
+++ b/Documentation/User Manual/5-input-and-output-files/VEMx.md
@@ -36,7 +36,7 @@ n [rpm] , T_drag [Nm]
~~~
-## Electric Motor Map (.vemo)
+## Electric Motor Power Map (.vemo)
This file is used to interpolate the electric power required for a certain mechanical power at the eletric motor's shaft. The file uses the [VECTO CSV format](#csv).
@@ -63,4 +63,5 @@ n [rpm], T [Nm], P_el [kW]
47.746 , -50 , -0.064626
47.746 , 0 , 0.1449
...
-~~~
\ No newline at end of file
+~~~
+
diff --git a/Documentation/User Manual/5-input-and-output-files/VIEPCx.md b/Documentation/User Manual/5-input-and-output-files/VIEPCx.md
new file mode 100644
index 0000000000000000000000000000000000000000..e6812cd30f8730a6bcbbace1bb8c7d95d90dbe8e
--- /dev/null
+++ b/Documentation/User Manual/5-input-and-output-files/VIEPCx.md
@@ -0,0 +1,86 @@
+## IEPC Max Torque File (.viepcp)
+
+This file contains the IEPC's maximum drive torque and maximum recuperation torque depending on the motor's angluar speed. The file uses the [VECTO CSV format](#csv).
+
+- Filetype: .viepcp
+- Header: **n_out [rpm] , T_drive_out [Nm] , T_recuperation_out [Nm]**
+- Requires at least 2 data entries
+
+**Example:**
+
+~~~
+n_out , T_drive_out , T_recuperation_out
+0.00 , 4027.80 , -4193.88
+14.96 , 4027.80 , -4193.88
+151.09 , 4027.80 , -4193.88
+302.19 , 4027.80 , -4193.88
+452.92 , 4027.80 , -4193.88
+604.01 , 4027.80 , -4193.88
+755.11 , 4027.80 , -4193.88
+906.20 , 3356.50 , -3494.90
+1057.30 , 2876.98 , -2995.60
+1208.03 , 2517.38 , -2621.17
+1359.12 , 2237.68 , -2329.95
+1510.22 , 2013.90 , -2096.94
+...
+~~~
+
+## IEPC Drag Curve File (.viepcd)
+
+This file contains the IEPC's drag torque (i.e. the eletric motor is not energized) depending on the motor's angluar speed. The file uses the [VECTO CSV format](#csv).
+
+- Filetype: .viepcd
+- Header: **n_out [rpm] , T_drag_out [Nm]**
+- Requires at least 2 data entries
+
+**Example:**
+
+~~~
+n_out , T_drag_out
+0.00 , -8.02
+15.10 , -8.28
+151.02 , -10.62
+302.05 , -13.22
+453.07 , -15.82
+604.09 , -18.45
+755.11 , -21.05
+906.14 , -23.65
+1057.16 , -26.25
+1208.18 , -28.85
+...
+~~~
+
+
+## IEPC Power Map (.viepco)
+
+This file is used to interpolate the electric power required for a certain mechanical power at the IEPC's output shaft. The file uses the [VECTO CSV format](#csv).
+
+- Filetype: .viepco
+- Header: **n_out [rpm] , T_out [Nm] , P_el [kW]**
+- Requires at least 2 data entries
+
+**Example:**
+
+~~~
+n [rpm], T [Nm], P_el [kW]
+0.00 , -12984.38 , 0.00
+0.00 , -12335.16 , 0.00
+0.00 , -11685.94 , 0.00
+0.00 , -11036.72 , 0.00
+...
+0.00 , 10171.44 , 11.99
+0.00 , 10769.76 , 12.87
+0.00 , 11368.08 , 13.76
+0.00 , 11966.40 , 14.67
+4.98 , -12984.38 , 0.00
+4.98 , -12335.16 , 0.00
+4.98 , -11685.94 , 0.00
+...
+995.92 , 10171.44 , 1271.27
+995.92 , 10769.76 , 1347.52
+995.92 , 11368.08 , 1424.25
+995.92 , 11966.40 , 1501.45
+...
+~~~
+
+
diff --git a/Documentation/User Manual/files.txt b/Documentation/User Manual/files.txt
index d51ab07430d68c4186944f3b0c8660ae4b4cf685..0f124838b1720dbc1e488bc934c7bb924bf4f489 100644
--- a/Documentation/User Manual/files.txt
+++ b/Documentation/User Manual/files.txt
@@ -11,6 +11,8 @@
1-user-interface/H1_HybridStrategyParams-Editor.md
1-user-interface/L_ElectricMotor.md
1-user-interface/M_BatteryPackEditor.md
+1-user-interface/N_IEPC.md
+1-user-interface/O_IHPC.md
1-user-interface/I_Graph.md
4-command-line-arguments/cmd.md
2-calculation-modes/calculation-modes.md
@@ -46,8 +48,11 @@
3-simulation-models/PwheelInput.md
3-simulation-models/PTO.md
3-simulation-models/Electric_Motor.md
+3-simulation-models/IEPC.md
+3-simulation-models/IHPC.md
3-simulation-models/Electric_Storage.md
-3-simulation-models/HybridControlStrategy.md
+3-simulation-models/ParallelHybridControlStrategy.md
+3-simulation-models/SerialHybridControlStrategy.md
5-input-and-output-files/input-output.md
5-input-and-output-files/XML_Job-File_DeclarationMode.md
5-input-and-output-files/XML_DeclarationReport.md
@@ -63,6 +68,7 @@
5-input-and-output-files/VFLD.md
5-input-and-output-files/VMAP.md
5-input-and-output-files/VEMx.md
+5-input-and-output-files/VIEPCx.md
5-input-and-output-files/VTQP.md
5-input-and-output-files/VBATx.md
5-input-and-output-files/VGBX.md
diff --git a/Documentation/User Manual/pics/IEPC_Form.png b/Documentation/User Manual/pics/IEPC_Form.png
new file mode 100644
index 0000000000000000000000000000000000000000..eba91e89e20ded478366b857ef4017325a212a1f
Binary files /dev/null and b/Documentation/User Manual/pics/IEPC_Form.png differ
diff --git a/Documentation/User Manual/pics/IHPC_Form.png b/Documentation/User Manual/pics/IHPC_Form.png
new file mode 100644
index 0000000000000000000000000000000000000000..9087ad8227b5bae8f3262484458b9b1c97e57c5b
Binary files /dev/null and b/Documentation/User Manual/pics/IHPC_Form.png differ
diff --git a/Documentation/User Manual/pics/P1Tests.png b/Documentation/User Manual/pics/P1Tests.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0c4e0bcfd114219f4314c70c289526d0780b4f6
Binary files /dev/null and b/Documentation/User Manual/pics/P1Tests.png differ
diff --git a/Documentation/User Manual/pics/PEV_Gearshift.png b/Documentation/User Manual/pics/PEV_Gearshift.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d53b5f42ba7819fd8a06d4a8f678e2cbe8437d7
Binary files /dev/null and b/Documentation/User Manual/pics/PEV_Gearshift.png differ
diff --git a/Documentation/User Manual/pics/SerialHybrid_SoCBoundaries.png b/Documentation/User Manual/pics/SerialHybrid_SoCBoundaries.png
new file mode 100644
index 0000000000000000000000000000000000000000..54400d29165440784f62341f2796dd24cee41730
Binary files /dev/null and b/Documentation/User Manual/pics/SerialHybrid_SoCBoundaries.png differ
diff --git a/Documentation/User Manual/pics/SerialHybrid_Statemachine.png b/Documentation/User Manual/pics/SerialHybrid_Statemachine.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d7699052898a236cce1cd4bba50e60f3443f386
Binary files /dev/null and b/Documentation/User Manual/pics/SerialHybrid_Statemachine.png differ
diff --git a/Documentation/User Manual/pics/Structure_IEPC.png b/Documentation/User Manual/pics/Structure_IEPC.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d5516d8fecfb124f7631bb24c833e2317322fb7
Binary files /dev/null and b/Documentation/User Manual/pics/Structure_IEPC.png differ
diff --git a/Documentation/User Manual/pics/VehicleForm_ElectricMachine.png b/Documentation/User Manual/pics/VehicleForm_ElectricMachine.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bd1805a644b6b9dd4ff6c1d9e564fcb5e0b2d8b
Binary files /dev/null and b/Documentation/User Manual/pics/VehicleForm_ElectricMachine.png differ
diff --git a/Documentation/User Manual/pics/VehicleForm_GenSet.png b/Documentation/User Manual/pics/VehicleForm_GenSet.png
new file mode 100644
index 0000000000000000000000000000000000000000..05214b4d42c1f368afe301068bb768f9dc280f00
Binary files /dev/null and b/Documentation/User Manual/pics/VehicleForm_GenSet.png differ
diff --git a/Documentation/User Manual/pics/VehicleForm_IEPC.png b/Documentation/User Manual/pics/VehicleForm_IEPC.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7c78ce6c58bf6b90e367cd4648113ab120a948d
Binary files /dev/null and b/Documentation/User Manual/pics/VehicleForm_IEPC.png differ
diff --git a/Documentation/User Manual/pics/VehicleForm_IHPC.png b/Documentation/User Manual/pics/VehicleForm_IHPC.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3ec75799806b7d692332f1e063667344f867baa
Binary files /dev/null and b/Documentation/User Manual/pics/VehicleForm_IHPC.png differ
diff --git a/Documentation/User Manual/pics/VehicleForm_REESS.png b/Documentation/User Manual/pics/VehicleForm_REESS.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ed0b18f04d46cf8d21aa7b65fdecfc11518b3d9
Binary files /dev/null and b/Documentation/User Manual/pics/VehicleForm_REESS.png differ
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF.xml
index 2570c5ed1fd450fa8cfcba3771cb6a5fc9efe9d4..1f0b49b4a554529fa9842e73671fe66bbc5d9acb 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF.xml
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF.xml
@@ -2,9 +2,9 @@
<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:vif="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" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<Data id="VEH-88dcf76d37a64b5eaf70" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehiclePIFType">
- <ManufacturerPrimaryVehicle>Generic Bus Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
+ <Manufacturer>Generic Bus Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -18,19 +18,19 @@
<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 xsi:type="v2.4:ADAS_Conventional_Type">
+ <v2.4:EngineStopStart>false</v2.4:EngineStopStart>
+ <v2.4:EcoRollWithoutEngineStop>false</v2.4:EcoRollWithoutEngineStop>
+ <v2.4:EcoRollWithEngineStop>false</v2.4:EcoRollWithEngineStop>
+ <v2.4:PredictiveCruiseControl>none</v2.4:PredictiveCruiseControl>
</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="VehicleComponentsPIFType">
+ <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>
@@ -41,9 +41,9 @@
<RatedPower>200000</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>
@@ -68,14 +68,14 @@
</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>
@@ -106,7 +106,7 @@
</Data>
</Transmission>
<TorqueConverter>
- <Data xsi:type="TorqueConverterDataPIFType">
+ <Data xsi:type="TorqueConverterDataVIFType">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -115,7 +115,7 @@
</Data>
</TorqueConverter>
<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>
@@ -126,7 +126,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>
@@ -186,7 +186,7 @@
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
+ <Data xsi:type="AuxiliaryDataVIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml
index a6b29451614c66db5b4cd585c7456bbff6734e73..13c3fca2ef3ff7df74bfc2ae9824ba073ff0255c 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml
@@ -619,6 +619,7 @@
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
<Date>2021-06-07T22:00:00Z</Date>
+ <Model>SomeModel</Model>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>19400</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/209kW_7c7l.veng b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/209kW_7c7l.veng
new file mode 100644
index 0000000000000000000000000000000000000000..55c93808f6660bfaa906083b1dc6182899876c89
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/209kW_7c7l.veng
@@ -0,0 +1,35 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-06-17T07:29:46.1581600Z",
+ "AppVersion": "3",
+ "FileVersion": 5
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "209kW 7.7l Engine",
+ "Displacement": "7700",
+ "IdlingSpeed": 600.0,
+ "Inertia": 3.33,
+ "Fuels": [
+ {
+ "WHTC-Urban": 0.0,
+ "WHTC-Rural": 0.0,
+ "WHTC-Motorway": 0.0,
+ "WHTC-Engineering": 1.0090832895,
+ "ColdHotBalancingFactor": 0.0,
+ "CFRegPer": 1.0,
+ "FuelMap": "209kW_ICE_Map.vmap",
+ "FuelType": "DieselCI"
+ }
+ ],
+ "RatedPower": 209000,
+ "RatedSpeed": 2550.0,
+ "MaxTorque": 1100,
+ "FullLoadCurve": "209kW_ICE_fld.vfld",
+ "WHRType": [
+ "None"
+ ],
+ "WHRCorrectionFactors": {}
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/209kW_ICE_Map.vmap b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/209kW_ICE_Map.vmap
new file mode 100644
index 0000000000000000000000000000000000000000..10f19d740cea49453b2c50171533dabc94912974
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/209kW_ICE_Map.vmap
@@ -0,0 +1,163 @@
+engine speed [rpm], torque [Nm], fuel consumption [g/h]
+600.00,0.00,648.214
+600.00,68.85,1626.915
+600.00,98.35,2053.103
+600.00,195.48,3383.983
+600.00,293.83,4726.347
+600.00,392.18,6058.504
+600.00,489.31,8107.779
+600.00,587.66,10186.402
+600.00,684.78,12239.042
+600.00,783.14,14317.665
+600.00,881.49,16396.288
+600.00,978.61,18448.929
+600.00,1076.96,20527.552
+600.00,1175.32,22606.175
+851.61,0.00,928.937
+851.61,64.67,1892.325
+851.61,92.39,2405.282
+851.61,183.63,4070.477
+851.61,276.02,5758.641
+851.61,368.41,7453.185
+851.61,459.65,9663.237
+851.61,552.04,11837.561
+851.61,643.28,13995.297
+851.61,735.67,16050.952
+851.61,828.06,18103.130
+851.61,919.30,20129.657
+851.61,1011.69,22181.836
+851.61,1104.09,24234.015
+1103.23,0.00,1209.659
+1103.23,62.41,2157.736
+1103.23,89.15,2758.737
+1103.23,177.19,4758.248
+1103.23,266.34,6792.210
+1103.23,355.49,8847.865
+1103.23,443.52,11219.971
+1103.23,532.67,13488.720
+1103.23,620.71,15726.845
+1103.23,709.86,17966.245
+1103.23,799.01,20229.890
+1103.23,887.05,22492.259
+1103.23,976.20,24743.508
+1103.23,1065.35,26994.757
+1354.84,0.00,1490.382
+1354.84,60.98,2421.870
+1354.84,87.11,3112.193
+1354.84,173.14,5444.742
+1354.84,260.25,7824.504
+1354.84,347.36,10242.546
+1354.84,433.39,12776.705
+1354.84,520.50,15141.155
+1354.84,606.52,17457.117
+1354.84,693.63,19881.539
+1354.84,780.75,22341.689
+1354.84,866.77,24801.840
+1354.84,953.88,27249.231
+1354.84,1041.00,30075.597
+1606.45,0.00,1964.218
+1606.45,60.00,2898.713
+1606.45,85.71,3701.160
+1606.45,170.35,6375.138
+1606.45,256.07,9132.915
+1606.45,341.78,11916.086
+1606.45,426.42,14629.424
+1606.45,512.14,17373.235
+1606.45,596.78,20240.205
+1606.45,682.49,23084.322
+1606.45,768.20,25784.963
+1606.45,852.85,28443.704
+1606.45,938.56,31162.121
+1606.45,1024.27,33987.192
+1858.06,0.00,2405.472
+1858.06,59.28,3395.960
+1858.06,84.69,4296.748
+1858.06,168.33,7298.534
+1858.06,253.02,10456.979
+1858.06,337.71,13614.161
+1858.06,421.35,16806.717
+1858.06,506.04,19948.738
+1858.06,589.67,23098.339
+1858.06,674.37,26265.628
+1858.06,759.06,29333.109
+1858.06,842.69,32242.669
+1858.06,927.39,35435.225
+1858.06,1012.08,38645.468
+2109.68,0.00,2908.296
+2109.68,58.74,4008.698
+2109.68,83.92,4995.396
+2109.68,166.78,8282.706
+2109.68,250.70,11854.275
+2109.68,334.61,15399.314
+2109.68,417.48,18962.040
+2109.68,501.40,22400.954
+2109.68,584.26,25903.038
+2109.68,668.18,29565.571
+2109.68,752.10,33148.511
+2109.68,834.96,36787.039
+2109.68,918.88,40596.124
+2109.68,1002.79,44447.432
+2361.29,0.00,3517.244
+2361.29,58.31,4836.211
+2361.29,83.30,5889.868
+2361.29,165.57,9403.322
+2361.29,248.87,13398.123
+2361.29,332.18,17295.644
+2361.29,414.44,21267.704
+2361.29,497.74,25214.497
+2361.29,580.01,29106.965
+2361.29,663.31,33230.630
+2361.29,746.62,37409.885
+2361.29,828.88,41464.064
+2361.29,912.18,45307.994
+2361.29,995.49,49151.923
+2612.90,0.00,4272.744
+2612.90,57.97,5567.707
+2612.90,82.81,6727.488
+2612.90,164.59,10597.214
+2612.90,247.40,14941.971
+2612.90,330.21,19262.724
+2612.90,411.98,23531.678
+2612.90,494.79,27996.455
+2612.90,576.57,32694.958
+2612.90,659.38,37346.716
+2612.90,742.19,41862.028
+2612.90,823.97,46367.264
+2612.90,906.78,50929.527
+2612.90,989.59,55491.791
+2864.52,0.00,4975.182
+2864.52,57.68,6271.408
+2864.52,82.40,7570.161
+2864.52,163.78,11901.020
+2864.52,246.18,16541.408
+2864.52,328.59,21435.734
+2864.52,409.96,26482.929
+2864.52,492.36,31523.807
+2864.52,573.74,36936.118
+2864.52,656.14,42358.536
+2864.52,738.54,47310.978
+2864.52,819.92,52201.514
+2864.52,902.32,57153.955
+2864.52,984.73,62106.397
+535.00,-48.25,0.000
+795.00,-53.16,0.000
+1055.00,-59.37,0.000
+1315.00,-66.29,0.000
+1575.00,-73.79,0.000
+1835.00,-81.42,0.000
+2095.00,-88.73,0.000
+2355.00,-95.54,0.000
+2615.00,-102.74,0.000
+2875.00,-110.97,0.000
+3005.00,-115.10,0.000
+535.00,-117.19,0.000
+795.00,-115.02,0.000
+1055.00,-117.63,0.000
+1315.00,-122.38,0.000
+1575.00,-128.43,0.000
+1835.00,-135.02,0.000
+2095.00,-141.54,0.000
+2355.00,-147.74,0.000
+2615.00,-154.45,0.000
+2875.00,-162.29,0.000
+3005.00,-166.24,0.000
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/209kW_ICE_fld.vfld b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/209kW_ICE_fld.vfld
new file mode 100644
index 0000000000000000000000000000000000000000..9fa844476ee0a96a2063e146c0d48bc6b19b5798
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/209kW_ICE_fld.vfld
@@ -0,0 +1,7 @@
+engine speed [1/min], full load torque [Nm], motoring torque [Nm]
+600.00,385.00,-55.851
+1321.50,1100.00,-61.072
+1867.50,1100.00,-75.131
+2550.00,782.67,-97.074
+3291.00,0.00,-144.231
+
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/Gen_Map.vemo b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/Gen_Map.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..2cc4c716211c5f1847b8dd7e5a7ec77f5ee757d3
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/Gen_Map.vemo
@@ -0,0 +1,379 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00,-1030.00,0.000
+0.00,-978.50,0.000
+0.00,-927.00,0.000
+0.00,-875.50,0.000
+0.00,-824.00,0.000
+0.00,-772.50,0.000
+0.00,-721.00,-0.220
+0.00,-669.50,-0.510
+0.00,-618.00,-0.671
+0.00,-566.50,-0.765
+0.00,-515.00,-0.813
+0.00,-463.50,-0.826
+0.00,-412.00,-0.811
+0.00,-360.50,-0.771
+0.00,-309.00,-0.710
+0.00,-257.50,-0.629
+0.00,-206.00,-0.531
+0.00,-154.50,-0.416
+0.00,-103.00,-0.287
+0.00,-51.50,-0.143
+0.00,-10.30,-0.015
+0.00,10.30,0.059
+0.00,51.50,0.264
+0.00,103.00,0.527
+0.00,154.50,0.800
+0.00,206.00,1.080
+0.00,257.50,1.370
+0.00,309.00,1.667
+0.00,360.50,1.972
+0.00,412.00,2.285
+0.00,463.50,2.606
+0.00,515.00,2.935
+0.00,566.50,3.270
+0.00,618.00,3.613
+0.00,669.50,3.964
+0.00,721.00,4.321
+0.00,772.50,4.685
+0.00,824.00,5.056
+0.00,875.50,5.433
+0.00,927.00,5.818
+0.00,978.50,6.209
+0.00,1030.00,6.606
+37.00,-1030.00,0.000
+37.00,-978.50,0.000
+37.00,-927.00,0.000
+37.00,-875.50,0.000
+37.00,-824.00,0.000
+37.00,-772.50,0.000
+37.00,-721.00,-0.447
+37.00,-669.50,-0.678
+37.00,-618.00,-0.798
+37.00,-566.50,-0.860
+37.00,-515.00,-0.883
+37.00,-463.50,-0.876
+37.00,-412.00,-0.845
+37.00,-360.50,-0.792
+37.00,-309.00,-0.721
+37.00,-257.50,-0.633
+37.00,-206.00,-0.530
+37.00,-154.50,-0.413
+37.00,-103.00,-0.283
+37.00,-51.50,-0.141
+37.00,-10.30,-0.015
+37.00,10.30,0.055
+37.00,51.50,0.248
+37.00,103.00,0.495
+37.00,154.50,0.749
+37.00,206.00,1.011
+37.00,257.50,1.280
+37.00,309.00,1.556
+37.00,360.50,1.840
+37.00,412.00,2.129
+37.00,463.50,2.426
+37.00,515.00,2.729
+37.00,566.50,3.039
+37.00,618.00,3.355
+37.00,669.50,3.677
+37.00,721.00,4.005
+37.00,772.50,4.340
+37.00,824.00,4.680
+37.00,875.50,5.026
+37.00,927.00,5.378
+37.00,978.50,5.735
+37.00,1030.00,6.098
+370.00,-1030.00,-36.344
+370.00,-978.50,-34.617
+370.00,-927.00,-32.881
+370.00,-875.50,-31.134
+370.00,-824.00,-29.376
+370.00,-772.50,-27.609
+370.00,-721.00,-25.831
+370.00,-669.50,-24.043
+370.00,-618.00,-22.244
+370.00,-566.50,-20.436
+370.00,-515.00,-18.617
+370.00,-463.50,-16.789
+370.00,-412.00,-14.950
+370.00,-360.50,-13.102
+370.00,-309.00,-11.244
+370.00,-257.50,-9.375
+370.00,-206.00,-7.497
+370.00,-154.50,-5.609
+370.00,-103.00,-3.711
+370.00,-51.50,-1.802
+370.00,-10.30,-0.248
+370.00,10.30,0.515
+370.00,51.50,2.185
+370.00,103.00,4.271
+370.00,154.50,6.366
+370.00,206.00,8.470
+370.00,257.50,10.584
+370.00,309.00,12.707
+370.00,360.50,14.839
+370.00,412.00,16.982
+370.00,463.50,19.133
+370.00,515.00,21.294
+370.00,566.50,23.465
+370.00,618.00,25.644
+370.00,669.50,27.833
+370.00,721.00,30.032
+370.00,772.50,32.239
+370.00,824.00,34.456
+370.00,875.50,36.682
+370.00,927.00,38.918
+370.00,978.50,41.162
+370.00,1030.00,43.415
+740.00,-1030.00,-74.961
+740.00,-978.50,-71.312
+740.00,-927.00,-67.651
+740.00,-875.50,-63.979
+740.00,-824.00,-60.294
+740.00,-772.50,-56.597
+740.00,-721.00,-52.889
+740.00,-669.50,-49.169
+740.00,-618.00,-45.436
+740.00,-566.50,-41.693
+740.00,-515.00,-37.937
+740.00,-463.50,-34.170
+740.00,-412.00,-30.391
+740.00,-360.50,-26.600
+740.00,-309.00,-22.798
+740.00,-257.50,-18.984
+740.00,-206.00,-15.158
+740.00,-154.50,-11.321
+740.00,-103.00,-7.471
+740.00,-51.50,-3.607
+740.00,-10.30,-0.452
+740.00,10.30,1.051
+740.00,51.50,4.367
+740.00,103.00,8.495
+740.00,154.50,12.632
+740.00,206.00,16.780
+740.00,257.50,20.940
+740.00,309.00,25.111
+740.00,360.50,29.294
+740.00,412.00,33.488
+740.00,463.50,37.693
+740.00,515.00,41.910
+740.00,566.50,46.139
+740.00,618.00,50.379
+740.00,669.50,54.630
+740.00,721.00,58.893
+740.00,772.50,63.167
+740.00,824.00,67.452
+740.00,875.50,71.749
+740.00,927.00,76.057
+740.00,978.50,80.377
+740.00,1030.00,84.707
+1110.00,-1030.00,-113.264
+1110.00,-978.50,-107.719
+1110.00,-927.00,-102.159
+1110.00,-875.50,-96.584
+1110.00,-824.00,-90.994
+1110.00,-772.50,-85.390
+1110.00,-721.00,-79.770
+1110.00,-669.50,-74.136
+1110.00,-618.00,-68.486
+1110.00,-566.50,-62.822
+1110.00,-515.00,-57.144
+1110.00,-463.50,-51.450
+1110.00,-412.00,-45.742
+1110.00,-360.50,-40.018
+1110.00,-309.00,-34.281
+1110.00,-257.50,-28.528
+1110.00,-206.00,-22.760
+1110.00,-154.50,-16.978
+1110.00,-103.00,-11.179
+1110.00,-51.50,-5.359
+1110.00,-10.30,-0.563
+1110.00,10.30,1.626
+1110.00,51.50,6.595
+1110.00,103.00,12.768
+1110.00,154.50,18.951
+1110.00,206.00,25.148
+1110.00,257.50,31.359
+1110.00,309.00,37.584
+1110.00,360.50,43.824
+1110.00,412.00,50.078
+1110.00,463.50,56.347
+1110.00,515.00,62.631
+1110.00,566.50,68.929
+1110.00,618.00,75.242
+1110.00,669.50,81.569
+1110.00,721.00,87.911
+1110.00,772.50,94.268
+1110.00,824.00,100.638
+1110.00,875.50,107.024
+1110.00,927.00,113.423
+1110.00,978.50,119.838
+1110.00,1030.00,126.266
+1480.00,-1030.00,-151.257
+1480.00,-978.50,-143.841
+1480.00,-927.00,-136.405
+1480.00,-875.50,-128.950
+1480.00,-824.00,-121.475
+1480.00,-772.50,-113.982
+1480.00,-721.00,-106.469
+1480.00,-669.50,-98.937
+1480.00,-618.00,-91.386
+1480.00,-566.50,-83.815
+1480.00,-515.00,-76.226
+1480.00,-463.50,-68.618
+1480.00,-412.00,-60.990
+1480.00,-360.50,-53.344
+1480.00,-309.00,-45.678
+1480.00,-257.50,-37.993
+1480.00,-206.00,-30.289
+1480.00,-154.50,-22.565
+1480.00,-103.00,-14.819
+1480.00,-51.50,-7.042
+1480.00,-10.30,-0.493
+1480.00,10.30,2.246
+1480.00,51.50,8.883
+1480.00,103.00,17.106
+1480.00,154.50,25.338
+1480.00,206.00,33.588
+1480.00,257.50,41.855
+1480.00,309.00,50.141
+1480.00,360.50,58.446
+1480.00,412.00,66.770
+1480.00,463.50,75.112
+1480.00,515.00,83.474
+1480.00,566.50,91.854
+1480.00,618.00,100.253
+1480.00,669.50,108.671
+1480.00,721.00,117.108
+1480.00,772.50,125.563
+1480.00,824.00,134.038
+1480.00,875.50,142.531
+1480.00,927.00,151.043
+1480.00,978.50,159.573
+1480.00,1030.00,168.122
+1850.00,-1030.00,-188.930
+1850.00,-978.50,-179.665
+1850.00,-927.00,-170.376
+1850.00,-875.50,-161.062
+1850.00,-824.00,-151.723
+1850.00,-772.50,-142.360
+1850.00,-721.00,-132.971
+1850.00,-669.50,-123.558
+1850.00,-618.00,-114.120
+1850.00,-566.50,-104.657
+1850.00,-515.00,-95.170
+1850.00,-463.50,-85.659
+1850.00,-412.00,-76.122
+1850.00,-360.50,-66.561
+1850.00,-309.00,-56.976
+1850.00,-257.50,-47.365
+1850.00,-206.00,-37.729
+1850.00,-154.50,-28.067
+1850.00,-103.00,-18.376
+1850.00,-51.50,-8.638
+1850.00,-10.30,0.000
+1850.00,10.30,2.921
+1850.00,51.50,11.243
+1850.00,103.00,21.520
+1850.00,154.50,31.807
+1850.00,206.00,42.113
+1850.00,257.50,52.443
+1850.00,309.00,62.797
+1850.00,360.50,73.174
+1850.00,412.00,83.576
+1850.00,463.50,94.003
+1850.00,515.00,104.453
+1850.00,566.50,114.928
+1850.00,618.00,125.427
+1850.00,669.50,135.950
+1850.00,721.00,146.498
+1850.00,772.50,157.070
+1850.00,824.00,167.666
+1850.00,875.50,178.286
+1850.00,927.00,188.931
+1850.00,978.50,199.599
+1850.00,1030.00,210.291
+2220.00,-1030.00,-226.266
+2220.00,-978.50,-215.178
+2220.00,-927.00,-204.058
+2220.00,-875.50,-192.907
+2220.00,-824.00,-181.723
+2220.00,-772.50,-170.509
+2220.00,-721.00,-159.262
+2220.00,-669.50,-147.984
+2220.00,-618.00,-136.675
+2220.00,-566.50,-125.334
+2220.00,-515.00,-113.962
+2220.00,-463.50,-102.558
+2220.00,-412.00,-91.123
+2220.00,-360.50,-79.656
+2220.00,-309.00,-68.158
+2220.00,-257.50,-56.628
+2220.00,-206.00,-45.066
+2220.00,-154.50,-33.469
+2220.00,-103.00,-21.833
+2220.00,-51.50,-10.128
+2220.00,-10.30,0.000
+2220.00,10.30,3.656
+2220.00,51.50,13.687
+2220.00,103.00,26.025
+2220.00,154.50,38.369
+2220.00,206.00,50.739
+2220.00,257.50,63.137
+2220.00,309.00,75.565
+2220.00,360.50,88.023
+2220.00,412.00,100.512
+2220.00,463.50,113.032
+2220.00,515.00,125.583
+2220.00,566.50,138.165
+2220.00,618.00,150.778
+2220.00,669.50,163.421
+2220.00,721.00,176.096
+2220.00,772.50,188.801
+2220.00,824.00,201.537
+2220.00,875.50,214.304
+2220.00,927.00,227.101
+2220.00,978.50,239.929
+2220.00,1030.00,252.787
+2590.00,-1030.00,-263.249
+2590.00,-978.50,-250.362
+2590.00,-927.00,-237.434
+2590.00,-875.50,-224.467
+2590.00,-824.00,-211.460
+2590.00,-772.50,-198.413
+2590.00,-721.00,-185.327
+2590.00,-669.50,-172.200
+2590.00,-618.00,-159.035
+2590.00,-566.50,-145.830
+2590.00,-515.00,-132.585
+2590.00,-463.50,-119.301
+2590.00,-412.00,-105.977
+2590.00,-360.50,-92.614
+2590.00,-309.00,-79.211
+2590.00,-257.50,-65.768
+2590.00,-206.00,-52.283
+2590.00,-154.50,-38.755
+2590.00,-103.00,-25.173
+2590.00,-51.50,-11.490
+2590.00,-10.30,0.000
+2590.00,10.30,4.457
+2590.00,51.50,16.224
+2590.00,103.00,30.631
+2590.00,154.50,45.039
+2590.00,206.00,59.477
+2590.00,257.50,73.949
+2590.00,309.00,88.458
+2590.00,360.50,103.005
+2590.00,412.00,117.591
+2590.00,463.50,132.215
+2590.00,515.00,146.877
+2590.00,566.50,161.579
+2590.00,618.00,176.319
+2590.00,669.50,191.097
+2590.00,721.00,205.914
+2590.00,772.50,220.770
+2590.00,824.00,235.664
+2590.00,875.50,250.596
+2590.00,927.00,265.567
+2590.00,978.50,280.576
+2590.00,1030.00,295.623
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/Gen_drag.vemd b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/Gen_drag.vemd
new file mode 100644
index 0000000000000000000000000000000000000000..314a3b4215bb1aa40d2cff6c8ce1d423f740eeff
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/Gen_drag.vemd
@@ -0,0 +1,11 @@
+n [rpm] , T_drag [Nm]
+0, -1.89
+37, -2.01
+370, -3.02
+740, -4.14
+1110, -5.26
+1480, -6.38
+1850, -7.5
+2220, -8.62
+2590, -9.74
+
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/Gen_fld.vemp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/Gen_fld.vemp
new file mode 100644
index 0000000000000000000000000000000000000000..d7a681028a9a2a69ef89f14bd1b89e4ae5792efc
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/Gen_fld.vemp
@@ -0,0 +1,13 @@
+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0, 1030.00, -1030.00
+37, 1030.00, -1030.00
+370, 1030.00, -1030.00
+740, 1030.00, -1030.00
+1110, 1030.00, -1030.00
+1480, 1030.00, -1030.00
+1850, 1030.00, -1030.00
+2220, 858.33, -858.33
+2590, 735.71, -735.71
+
+
+
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/GenericBattery.vbat b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/GenericBattery.vbat
new file mode 100644
index 0000000000000000000000000000000000000000..b196ef74b1bc1895a313960f51f9da24ea3a1b31
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/GenericBattery.vbat
@@ -0,0 +1,18 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic Battery",
+ "InternalResistanceCurve": "GenericBattery.vbatr",
+ "SOC_min": 10,
+ "SOC_max": 90,
+ "MaxCurrentMap": "MaxCurrent.vimax",
+ "Capacity": 68,
+ "SoCCurve": "GenericBattery.vbatv"
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/GenericBattery.vbatr b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/GenericBattery.vbatr
new file mode 100644
index 0000000000000000000000000000000000000000..953f417ac43d9bc1432971034d22d3ab15d5e1a2
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/GenericBattery.vbatr
@@ -0,0 +1,3 @@
+SoC, Ri
+0, 0.04
+100, 0.04
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/GenericBattery.vbatv b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/GenericBattery.vbatv
new file mode 100644
index 0000000000000000000000000000000000000000..28376e3632a1a24d0631665c19822b66f0310257
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/GenericBattery.vbatv
@@ -0,0 +1,12 @@
+SOC, V
+0, 673.5
+10, 700.2
+20, 715.4
+30, 723.6
+40, 727.7
+50, 730.0
+60, 731.6
+70, 733.8
+80, 737.1
+90, 742.2
+100, 750.2
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/GenericGen.vem b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/GenericGen.vem
new file mode 100644
index 0000000000000000000000000000000000000000..8bce454f0ffcf15816a1bb5d813bce93b58a315d
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/GenericGen.vem
@@ -0,0 +1,33 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-08-05T14:49:40.5920495Z",
+ "AppVersion": "3",
+ "FileVersion": 3
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic Electric Motor",
+ "Inertia": 0.134,
+ "ContinuousTorque": 798,
+ "ContinuousTorqueSpeed": 1850,
+ "OverloadTorque": 1030,
+ "OverloadTorqueSpeed": 1850,
+ "OverloadTime": 120,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "VoltageLevels": [
+ {
+ "Voltage": 0.0,
+ "FullLoadCurve": "Gen_fld.vemp",
+ "DragCurve": "Gen_drag.vemd",
+ "EfficiencyMap": "Gen_Map.vemo"
+ },
+ {
+ "Voltage": 1000.0,
+ "FullLoadCurve": "Gen_fld.vemp",
+ "DragCurve": "Gen_drag.vemd",
+ "EfficiencyMap": "Gen_Map.vemo"
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/Hybrid_Parameters.vhctl b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/Hybrid_Parameters.vhctl
new file mode 100644
index 0000000000000000000000000000000000000000..2f2ed814fcff9e24e146e56f0d0ff41378f5a386
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/Hybrid_Parameters.vhctl
@@ -0,0 +1,18 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:28:08.3781385Z",
+ "AppVersion": "3",
+ "FileVersion": 2
+ },
+ "Body": {
+ "----EquivalenceFactor": 2.0,
+ "MinSoC": 24.0,
+ "----MaxSoC": 80.0,
+ "TargetSoC": 70.0,
+ "----AuxBufferTime": 5.0,
+ "----AuxBufferChgTime": 5.0,
+ "----MinICEOnTime": 10.0,
+ "GensetMinOptPowerFactor": 0.2
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/MaxCurrent.vimax b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/MaxCurrent.vimax
new file mode 100644
index 0000000000000000000000000000000000000000..adf28fb9b5ced83296d2634fc6727e2d1b82357e
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/MaxCurrent.vimax
@@ -0,0 +1,3 @@
+SOC, I_charge, I_discharge
+0, 1620, 1620
+100, 1620, 1620
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/ShiftParameters.vtcu b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/ShiftParameters.vtcu
new file mode 100644
index 0000000000000000000000000000000000000000..a26e0e50f9e03240a8ddf18d296b8edbcda8bdcb
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/ShiftParameters.vtcu
@@ -0,0 +1,14 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T15:52:04.0766564Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "Rating_current_gear": 0.995,
+ "RatioEarlyUpshiftFC" : 24,
+ "RatioEarlyDownshiftFC" : 24
+
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/Truck.vacc b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/Truck.vacc
new file mode 100644
index 0000000000000000000000000000000000000000..54e77864874d21d67e8f8d69a97b35c5c6031749
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/Common/Truck.vacc
@@ -0,0 +1,6 @@
+v [km/h],acc [m/s²],dec [m/s²]
+0,1,-1
+25,1,-1
+50,0.642857143,-1
+60,0.5,-0.5
+120,0.5,-0.5
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..6e4c104a21b4bf31fa7bc80e95c8c53d69437d5f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": true,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 12.276
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 13860.59,
+ "ContinuousTorqueSpeed": 166.99,
+ "OverloadTorque": 16517.20,
+ "OverloadTorqueSpeed": 166.01,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1Axl_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Axl.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 15015.63,
+ "ContinuousTorqueSpeed": 168.62,
+ "OverloadTorque": 17325.73,
+ "OverloadTorqueSpeed": 170.17,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1Axl_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Axl.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1Axl_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_ENG_Gbx1Axl.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_ENG_Gbx1Axl.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..3a4d93f4e55bb31268825f80295bf5fa14d13d01
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_ENG_Gbx1Axl.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx1Axl.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..66b2094898284f1421a9dc011cadd6657f6903de
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1Axl.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..07eb40e197c27c23aea5f69c3200e3b799688102
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -37.45
+3.37 , -38.62
+33.71 , -49.58
+67.42 , -61.71
+101.12 , -73.85
+134.83 , -86.11
+168.54 , -98.24
+202.25 , -110.38
+235.96 , -122.51
+269.67 , -134.65
+303.37 , -146.91
+337.08 , -159.04
+370.79 , -171.18
+404.50 , -183.31
+438.21 , -195.45
+471.92 , -207.71
+505.62 , -219.84
+539.33 , -231.98
+573.04 , -244.11
+606.75 , -256.24
+640.46 , -268.51
+674.17 , -280.64
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/GenericIEPC_Gbx1Whl1.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/GenericIEPC_Gbx1Whl1.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..5b924aea7e507dab781c6727c70efd7ef3105ee9
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/GenericIEPC_Gbx1Whl1.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 12.276
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 6930.29,
+ "ContinuousTorqueSpeed": 166.99,
+ "OverloadTorque": 8258.60,
+ "OverloadTorqueSpeed": 166.01,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1Whl1_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl1.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 7507.82,
+ "ContinuousTorqueSpeed": 168.62,
+ "OverloadTorque": 8662.87,
+ "OverloadTorqueSpeed": 170.17,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1Whl1_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl1.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1Whl1_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_ENG_Gbx1Whl1.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_ENG_Gbx1Whl1.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..23dc4d8779da2a340976283944f098d7eb74b70f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_ENG_Gbx1Whl1.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx1Whl1.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_Vehicle_Gbx1Whl1.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_Vehicle_Gbx1Whl1.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..cfb13988ce331d1927ea9bfedf3cef81a2563305
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_Vehicle_Gbx1Whl1.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1Whl1.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..b5980ac32ff2f44452666e544ce91c462f5c5a7f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -9785.31 , 0.00
+0.00 , -9296.05 , 0.00
+0.00 , -8806.78 , 0.00
+0.00 , -8317.52 , 0.00
+0.00 , -7828.25 , 0.00
+0.00 , -7338.98 , 0.00
+0.00 , -6849.72 , -0.07
+0.00 , -6360.45 , -0.33
+0.00 , -5871.19 , -0.49
+0.00 , -5381.92 , -0.60
+0.00 , -4892.66 , -0.66
+0.00 , -4403.39 , -0.69
+0.00 , -3914.12 , -0.70
+0.00 , -3424.86 , -0.67
+0.00 , -2935.59 , -0.63
+0.00 , -2446.33 , -0.57
+0.00 , -1957.06 , -0.48
+0.00 , -1467.80 , -0.38
+0.00 , -978.53 , -0.27
+0.00 , -489.27 , -0.13
+0.00 , -97.85 , -0.01
+0.00 , 86.63 , 0.06
+0.00 , 433.14 , 0.28
+0.00 , 866.29 , 0.56
+0.00 , 1299.43 , 0.85
+0.00 , 1732.57 , 1.15
+0.00 , 2165.72 , 1.47
+0.00 , 2598.86 , 1.79
+0.00 , 3032.00 , 2.12
+0.00 , 3465.15 , 2.47
+0.00 , 3898.29 , 2.82
+0.00 , 4331.43 , 3.19
+0.00 , 4764.58 , 3.56
+0.00 , 5197.72 , 3.94
+0.00 , 5630.86 , 4.33
+0.00 , 6064.01 , 4.74
+0.00 , 6497.15 , 5.15
+0.00 , 6930.29 , 5.57
+0.00 , 7363.44 , 6.00
+0.00 , 7796.58 , 6.43
+0.00 , 8229.72 , 6.88
+0.00 , 8662.87 , 7.34
+3.37 , -9785.31 , 0.00
+3.37 , -9296.05 , 0.00
+3.37 , -8806.78 , 0.00
+3.37 , -8317.52 , 0.00
+3.37 , -7828.25 , 0.00
+3.37 , -7338.98 , 0.00
+3.37 , -6849.72 , -0.25
+3.37 , -6360.45 , -0.42
+3.37 , -5871.19 , -0.52
+3.37 , -5381.92 , -0.58
+3.37 , -4892.66 , -0.61
+3.37 , -4403.39 , -0.62
+3.37 , -3914.12 , -0.61
+3.37 , -3424.86 , -0.58
+3.37 , -2935.59 , -0.53
+3.37 , -2446.33 , -0.47
+3.37 , -1957.06 , -0.40
+3.37 , -1467.80 , -0.31
+3.37 , -978.53 , -0.22
+3.37 , -489.27 , -0.11
+3.37 , -97.85 , -0.01
+3.37 , 86.63 , 0.05
+3.37 , 433.14 , 0.21
+3.37 , 866.29 , 0.43
+3.37 , 1299.43 , 0.65
+3.37 , 1732.57 , 0.88
+3.37 , 2165.72 , 1.11
+3.37 , 2598.86 , 1.36
+3.37 , 3032.00 , 1.61
+3.37 , 3465.15 , 1.87
+3.37 , 3898.29 , 2.13
+3.37 , 4331.43 , 2.40
+3.37 , 4764.58 , 2.68
+3.37 , 5197.72 , 2.97
+3.37 , 5630.86 , 3.26
+3.37 , 6064.01 , 3.56
+3.37 , 6497.15 , 3.86
+3.37 , 6930.29 , 4.18
+3.37 , 7363.44 , 4.50
+3.37 , 7796.58 , 4.82
+3.37 , 8229.72 , 5.15
+3.37 , 8662.87 , 5.49
+33.71 , -9785.31 , -29.05
+33.71 , -9296.05 , -27.68
+33.71 , -8806.78 , -26.31
+33.71 , -8317.52 , -24.92
+33.71 , -7828.25 , -23.53
+33.71 , -7338.98 , -22.12
+33.71 , -6849.72 , -20.71
+33.71 , -6360.45 , -19.28
+33.71 , -5871.19 , -17.85
+33.71 , -5381.92 , -16.41
+33.71 , -4892.66 , -14.95
+33.71 , -4403.39 , -13.49
+33.71 , -3914.12 , -12.02
+33.71 , -3424.86 , -10.53
+33.71 , -2935.59 , -9.04
+33.71 , -2446.33 , -7.54
+33.71 , -1957.06 , -6.03
+33.71 , -1467.80 , -4.51
+33.71 , -978.53 , -2.98
+33.71 , -489.27 , -1.44
+33.71 , -97.85 , -0.18
+33.71 , 86.63 , 0.45
+33.71 , 433.14 , 1.84
+33.71 , 866.29 , 3.58
+33.71 , 1299.43 , 5.33
+33.71 , 1732.57 , 7.09
+33.71 , 2165.72 , 8.85
+33.71 , 2598.86 , 10.63
+33.71 , 3032.00 , 12.42
+33.71 , 3465.15 , 14.21
+33.71 , 3898.29 , 16.02
+33.71 , 4331.43 , 17.84
+33.71 , 4764.58 , 19.66
+33.71 , 5197.72 , 21.49
+33.71 , 5630.86 , 23.34
+33.71 , 6064.01 , 25.19
+33.71 , 6497.15 , 27.05
+33.71 , 6930.29 , 28.93
+33.71 , 7363.44 , 30.81
+33.71 , 7796.58 , 32.70
+33.71 , 8229.72 , 34.60
+33.71 , 8662.87 , 36.50
+67.42 , -9785.31 , -60.28
+67.42 , -9296.05 , -57.37
+67.42 , -8806.78 , -54.44
+67.42 , -8317.52 , -51.49
+67.42 , -7828.25 , -48.54
+67.42 , -7338.98 , -45.58
+67.42 , -6849.72 , -42.60
+67.42 , -6360.45 , -39.61
+67.42 , -5871.19 , -36.61
+67.42 , -5381.92 , -33.60
+67.42 , -4892.66 , -30.58
+67.42 , -4403.39 , -27.55
+67.42 , -3914.12 , -24.51
+67.42 , -3424.86 , -21.45
+67.42 , -2935.59 , -18.38
+67.42 , -2446.33 , -15.31
+67.42 , -1957.06 , -12.22
+67.42 , -1467.80 , -9.12
+67.42 , -978.53 , -6.00
+67.42 , -489.27 , -2.88
+67.42 , -97.85 , -0.33
+67.42 , 86.63 , 0.92
+67.42 , 433.14 , 3.68
+67.42 , 866.29 , 7.11
+67.42 , 1299.43 , 10.56
+67.42 , 1732.57 , 14.01
+67.42 , 2165.72 , 17.48
+67.42 , 2598.86 , 20.96
+67.42 , 3032.00 , 24.45
+67.42 , 3465.15 , 27.95
+67.42 , 3898.29 , 31.47
+67.42 , 4331.43 , 34.99
+67.42 , 4764.58 , 38.53
+67.42 , 5197.72 , 42.08
+67.42 , 5630.86 , 45.64
+67.42 , 6064.01 , 49.21
+67.42 , 6497.15 , 52.79
+67.42 , 6930.29 , 56.38
+67.42 , 7363.44 , 59.99
+67.42 , 7796.58 , 63.60
+67.42 , 8229.72 , 67.23
+67.42 , 8662.87 , 70.87
+101.12 , -9785.31 , -91.22
+101.12 , -9296.05 , -86.77
+101.12 , -8806.78 , -82.31
+101.12 , -8317.52 , -77.84
+101.12 , -7828.25 , -73.35
+101.12 , -7338.98 , -68.84
+101.12 , -6849.72 , -64.32
+101.12 , -6360.45 , -59.79
+101.12 , -5871.19 , -55.24
+101.12 , -5381.92 , -50.68
+101.12 , -4892.66 , -46.11
+101.12 , -4403.39 , -41.51
+101.12 , -3914.12 , -36.91
+101.12 , -3424.86 , -32.29
+101.12 , -2935.59 , -27.66
+101.12 , -2446.33 , -23.01
+101.12 , -1957.06 , -18.35
+101.12 , -1467.80 , -13.67
+101.12 , -978.53 , -8.98
+101.12 , -489.27 , -4.27
+101.12 , -97.85 , -0.39
+101.12 , 86.63 , 1.43
+101.12 , 433.14 , 5.56
+101.12 , 866.29 , 10.69
+101.12 , 1299.43 , 15.84
+101.12 , 1732.57 , 21.00
+101.12 , 2165.72 , 26.17
+101.12 , 2598.86 , 31.36
+101.12 , 3032.00 , 36.56
+101.12 , 3465.15 , 41.77
+101.12 , 3898.29 , 47.01
+101.12 , 4331.43 , 52.25
+101.12 , 4764.58 , 57.51
+101.12 , 5197.72 , 62.79
+101.12 , 5630.86 , 68.08
+101.12 , 6064.01 , 73.38
+101.12 , 6497.15 , 78.70
+101.12 , 6930.29 , 84.03
+101.12 , 7363.44 , 89.38
+101.12 , 7796.58 , 94.74
+101.12 , 8229.72 , 100.12
+101.12 , 8662.87 , 105.51
+134.83 , -9785.31 , -121.86
+134.83 , -9296.05 , -115.91
+134.83 , -8806.78 , -109.94
+134.83 , -8317.52 , -103.95
+134.83 , -7828.25 , -97.94
+134.83 , -7338.98 , -91.91
+134.83 , -6849.72 , -85.87
+134.83 , -6360.45 , -79.81
+134.83 , -5871.19 , -73.73
+134.83 , -5381.92 , -67.63
+134.83 , -4892.66 , -61.51
+134.83 , -4403.39 , -55.37
+134.83 , -3914.12 , -49.21
+134.83 , -3424.86 , -43.04
+134.83 , -2935.59 , -36.85
+134.83 , -2446.33 , -30.64
+134.83 , -1957.06 , -24.41
+134.83 , -1467.80 , -18.16
+134.83 , -978.53 , -11.89
+134.83 , -489.27 , -5.59
+134.83 , -97.85 , -0.32
+134.83 , 86.63 , 1.99
+134.83 , 433.14 , 7.50
+134.83 , 866.29 , 14.34
+134.83 , 1299.43 , 21.19
+134.83 , 1732.57 , 28.05
+134.83 , 2165.72 , 34.94
+134.83 , 2598.86 , 41.84
+134.83 , 3032.00 , 48.76
+134.83 , 3465.15 , 55.70
+134.83 , 3898.29 , 62.66
+134.83 , 4331.43 , 69.63
+134.83 , 4764.58 , 76.63
+134.83 , 5197.72 , 83.65
+134.83 , 5630.86 , 90.68
+134.83 , 6064.01 , 97.73
+134.83 , 6497.15 , 104.80
+134.83 , 6930.29 , 111.90
+134.83 , 7363.44 , 119.00
+134.83 , 7796.58 , 126.13
+134.83 , 8229.72 , 133.28
+134.83 , 8662.87 , 140.44
+168.54 , -9785.31 , -152.18
+168.54 , -9296.05 , -144.75
+168.54 , -8806.78 , -137.29
+168.54 , -8317.52 , -129.81
+168.54 , -7828.25 , -122.31
+168.54 , -7338.98 , -114.78
+168.54 , -6849.72 , -107.23
+168.54 , -6360.45 , -99.65
+168.54 , -5871.19 , -92.05
+168.54 , -5381.92 , -84.42
+168.54 , -4892.66 , -76.77
+168.54 , -4403.39 , -69.10
+168.54 , -3914.12 , -61.41
+168.54 , -3424.86 , -53.69
+168.54 , -2935.59 , -45.94
+168.54 , -2446.33 , -38.17
+168.54 , -1957.06 , -30.38
+168.54 , -1467.80 , -22.57
+168.54 , -978.53 , -14.72
+168.54 , -489.27 , -6.84
+168.54 , -97.85 , 0.00
+168.54 , 86.63 , 2.61
+168.54 , 433.14 , 9.52
+168.54 , 866.29 , 18.06
+168.54 , 1299.43 , 26.62
+168.54 , 1732.57 , 35.19
+168.54 , 2165.72 , 43.79
+168.54 , 2598.86 , 52.42
+168.54 , 3032.00 , 61.07
+168.54 , 3465.15 , 69.74
+168.54 , 3898.29 , 78.43
+168.54 , 4331.43 , 87.15
+168.54 , 4764.58 , 95.90
+168.54 , 5197.72 , 104.67
+168.54 , 5630.86 , 113.46
+168.54 , 6064.01 , 122.28
+168.54 , 6497.15 , 131.12
+168.54 , 6930.29 , 139.99
+168.54 , 7363.44 , 148.88
+168.54 , 7796.58 , 157.79
+168.54 , 8229.72 , 166.73
+168.54 , 8662.87 , 175.69
+202.25 , -9785.31 , -182.19
+202.25 , -9296.05 , -173.29
+202.25 , -8806.78 , -164.37
+202.25 , -8317.52 , -155.42
+202.25 , -7828.25 , -146.44
+202.25 , -7338.98 , -137.42
+202.25 , -6849.72 , -128.38
+202.25 , -6360.45 , -119.30
+202.25 , -5871.19 , -110.20
+202.25 , -5381.92 , -101.06
+202.25 , -4892.66 , -91.89
+202.25 , -4403.39 , -82.70
+202.25 , -3914.12 , -73.47
+202.25 , -3424.86 , -64.21
+202.25 , -2935.59 , -54.93
+202.25 , -2446.33 , -45.61
+202.25 , -1957.06 , -36.26
+202.25 , -1467.80 , -26.87
+202.25 , -978.53 , -17.46
+202.25 , -489.27 , -7.98
+202.25 , -97.85 , 0.00
+202.25 , 86.63 , 3.29
+202.25 , 433.14 , 11.62
+202.25 , 866.29 , 21.88
+202.25 , 1299.43 , 32.14
+202.25 , 1732.57 , 42.44
+202.25 , 2165.72 , 52.76
+202.25 , 2598.86 , 63.11
+202.25 , 3032.00 , 73.49
+202.25 , 3465.15 , 83.91
+202.25 , 3898.29 , 94.35
+202.25 , 4331.43 , 104.82
+202.25 , 4764.58 , 115.33
+202.25 , 5197.72 , 125.87
+202.25 , 5630.86 , 136.43
+202.25 , 6064.01 , 147.03
+202.25 , 6497.15 , 157.66
+202.25 , 6930.29 , 168.32
+202.25 , 7363.44 , 179.01
+202.25 , 7796.58 , 189.74
+202.25 , 8229.72 , 200.49
+202.25 , 8662.87 , 211.27
+235.96 , -9785.31 , -211.85
+235.96 , -9296.05 , -201.52
+235.96 , -8806.78 , -191.16
+235.96 , -8317.52 , -180.75
+235.96 , -7828.25 , -170.31
+235.96 , -7338.98 , -159.83
+235.96 , -6849.72 , -149.31
+235.96 , -6360.45 , -138.75
+235.96 , -5871.19 , -128.16
+235.96 , -5381.92 , -117.52
+235.96 , -4892.66 , -106.85
+235.96 , -4403.39 , -96.14
+235.96 , -3914.12 , -85.39
+235.96 , -3424.86 , -74.61
+235.96 , -2935.59 , -63.78
+235.96 , -2446.33 , -52.92
+235.96 , -1957.06 , -42.02
+235.96 , -1467.80 , -31.07
+235.96 , -978.53 , -20.08
+235.96 , -489.27 , -9.00
+235.96 , -97.85 , 0.00
+235.96 , 86.63 , 4.05
+235.96 , 433.14 , 13.82
+235.96 , 866.29 , 25.80
+235.96 , 1299.43 , 37.78
+235.96 , 1732.57 , 49.79
+235.96 , 2165.72 , 61.84
+235.96 , 2598.86 , 73.93
+235.96 , 3032.00 , 86.05
+235.96 , 3465.15 , 98.22
+235.96 , 3898.29 , 110.42
+235.96 , 4331.43 , 122.66
+235.96 , 4764.58 , 134.94
+235.96 , 5197.72 , 147.26
+235.96 , 5630.86 , 159.61
+235.96 , 6064.01 , 172.01
+235.96 , 6497.15 , 184.44
+235.96 , 6930.29 , 196.92
+235.96 , 7363.44 , 209.43
+235.96 , 7796.58 , 221.98
+235.96 , 8229.72 , 234.57
+235.96 , 8662.87 , 247.19
+269.67 , -9785.31 , -241.15
+269.67 , -9296.05 , -229.41
+269.67 , -8806.78 , -217.63
+269.67 , -8317.52 , -205.79
+269.67 , -7828.25 , -193.91
+269.67 , -7338.98 , -181.98
+269.67 , -6849.72 , -170.01
+269.67 , -6360.45 , -157.99
+269.67 , -5871.19 , -145.91
+269.67 , -5381.92 , -133.80
+269.67 , -4892.66 , -121.63
+269.67 , -4403.39 , -109.42
+269.67 , -3914.12 , -97.16
+269.67 , -3424.86 , -84.85
+269.67 , -2935.59 , -72.50
+269.67 , -2446.33 , -60.10
+269.67 , -1957.06 , -47.65
+269.67 , -1467.80 , -35.14
+269.67 , -978.53 , -22.57
+269.67 , -489.27 , -9.88
+269.67 , -97.85 , 0.00
+269.67 , 86.63 , 4.88
+269.67 , 433.14 , 16.13
+269.67 , 866.29 , 29.83
+269.67 , 1299.43 , 43.53
+269.67 , 1732.57 , 57.27
+269.67 , 2165.72 , 71.06
+269.67 , 2598.86 , 84.89
+269.67 , 3032.00 , 98.76
+269.67 , 3465.15 , 112.68
+269.67 , 3898.29 , 126.65
+269.67 , 4331.43 , 140.67
+269.67 , 4764.58 , 154.74
+269.67 , 5197.72 , 168.85
+269.67 , 5630.86 , 183.01
+269.67 , 6064.01 , 197.22
+269.67 , 6497.15 , 211.48
+269.67 , 6930.29 , 225.78
+269.67 , 7363.44 , 240.13
+269.67 , 7796.58 , 254.53
+269.67 , 8229.72 , 268.97
+269.67 , 8662.87 , 283.46
+303.37 , -9785.31 , -270.09
+303.37 , -9296.05 , -256.96
+303.37 , -8806.78 , -243.78
+303.37 , -8317.52 , -230.53
+303.37 , -7828.25 , -217.23
+303.37 , -7338.98 , -203.87
+303.37 , -6849.72 , -190.46
+303.37 , -6360.45 , -176.98
+303.37 , -5871.19 , -163.45
+303.37 , -5381.92 , -149.87
+303.37 , -4892.66 , -136.22
+303.37 , -4403.39 , -122.52
+303.37 , -3914.12 , -108.76
+303.37 , -3424.86 , -94.94
+303.37 , -2935.59 , -81.06
+303.37 , -2446.33 , -67.13
+303.37 , -1957.06 , -53.13
+303.37 , -1467.80 , -39.07
+303.37 , -978.53 , -24.92
+303.37 , -489.27 , -10.59
+303.37 , -97.85 , 0.00
+303.37 , 86.63 , 5.80
+303.37 , 433.14 , 18.55
+303.37 , 866.29 , 33.99
+303.37 , 1299.43 , 49.42
+303.37 , 1732.57 , 64.90
+303.37 , 2165.72 , 80.42
+303.37 , 2598.86 , 96.00
+303.37 , 3032.00 , 111.63
+303.37 , 3465.15 , 127.32
+303.37 , 3898.29 , 143.07
+303.37 , 4331.43 , 158.88
+303.37 , 4764.58 , 174.74
+303.37 , 5197.72 , 190.66
+303.37 , 5630.86 , 206.64
+303.37 , 6064.01 , 222.68
+303.37 , 6497.15 , 238.77
+303.37 , 6930.29 , 254.92
+303.37 , 7363.44 , 271.13
+303.37 , 7796.58 , 287.40
+303.37 , 8229.72 , 303.72
+303.37 , 8662.87 , 320.10
+337.08 , -9785.31 , -298.63
+337.08 , -9296.05 , -284.14
+337.08 , -8806.78 , -269.58
+337.08 , -8317.52 , -254.95
+337.08 , -7828.25 , -240.25
+337.08 , -7338.98 , -225.48
+337.08 , -6849.72 , -210.64
+337.08 , -6360.45 , -195.74
+337.08 , -5871.19 , -180.76
+337.08 , -5381.92 , -165.71
+337.08 , -4892.66 , -150.60
+337.08 , -4403.39 , -135.42
+337.08 , -3914.12 , -120.16
+337.08 , -3424.86 , -104.84
+337.08 , -2935.59 , -89.45
+337.08 , -2446.33 , -73.99
+337.08 , -1957.06 , -58.45
+337.08 , -1467.80 , -42.83
+337.08 , -978.53 , -27.10
+337.08 , -489.27 , -11.12
+337.08 , -97.85 , 0.00
+337.08 , 86.63 , 6.80
+337.08 , 433.14 , 21.10
+337.08 , 866.29 , 38.29
+337.08 , 1299.43 , 55.46
+337.08 , 1732.57 , 72.67
+337.08 , 2165.72 , 89.94
+337.08 , 2598.86 , 107.27
+337.08 , 3032.00 , 124.67
+337.08 , 3465.15 , 142.14
+337.08 , 3898.29 , 159.68
+337.08 , 4331.43 , 177.29
+337.08 , 4764.58 , 194.96
+337.08 , 5197.72 , 212.70
+337.08 , 5630.86 , 230.52
+337.08 , 6064.01 , 248.40
+337.08 , 6497.15 , 266.35
+337.08 , 6930.29 , 284.37
+337.08 , 7363.44 , 302.45
+337.08 , 7796.58 , 320.61
+337.08 , 8229.72 , 338.83
+337.08 , 8662.87 , 357.12
+370.79 , -9785.31 , -326.77
+370.79 , -9296.05 , -310.94
+370.79 , -8806.78 , -295.03
+370.79 , -8317.52 , -279.03
+370.79 , -7828.25 , -262.95
+370.79 , -7338.98 , -246.79
+370.79 , -6849.72 , -230.55
+370.79 , -6360.45 , -214.22
+370.79 , -5871.19 , -197.81
+370.79 , -5381.92 , -181.33
+370.79 , -4892.66 , -164.76
+370.79 , -4403.39 , -148.10
+370.79 , -3914.12 , -131.37
+370.79 , -3424.86 , -114.55
+370.79 , -2935.59 , -97.65
+370.79 , -2446.33 , -80.67
+370.79 , -1957.06 , -63.59
+370.79 , -1467.80 , -46.42
+370.79 , -978.53 , -29.10
+370.79 , -489.27 , -11.41
+370.79 , -97.85 , 0.00
+370.79 , 86.63 , 7.90
+370.79 , 433.14 , 23.79
+370.79 , 866.29 , 42.74
+370.79 , 1299.43 , 61.65
+370.79 , 1732.57 , 80.61
+370.79 , 2165.72 , 99.63
+370.79 , 2598.86 , 118.73
+370.79 , 3032.00 , 137.91
+370.79 , 3465.15 , 157.16
+370.79 , 3898.29 , 176.50
+370.79 , 4331.43 , 195.91
+370.79 , 4764.58 , 215.41
+370.79 , 5197.72 , 234.99
+370.79 , 5630.86 , 254.65
+370.79 , 6064.01 , 274.39
+370.79 , 6497.15 , 294.21
+370.79 , 6930.29 , 314.12
+370.79 , 7363.44 , 334.10
+370.79 , 7796.58 , 354.16
+370.79 , 8229.72 , 374.31
+370.79 , 8662.87 , 394.53
+404.50 , -9785.31 , -354.49
+404.50 , -9296.05 , -337.34
+404.50 , -8806.78 , -320.10
+404.50 , -8317.52 , -302.75
+404.50 , -7828.25 , -285.32
+404.50 , -7338.98 , -267.78
+404.50 , -6849.72 , -250.15
+404.50 , -6360.45 , -232.43
+404.50 , -5871.19 , -214.60
+404.50 , -5381.92 , -196.69
+404.50 , -4892.66 , -178.67
+404.50 , -4403.39 , -160.56
+404.50 , -3914.12 , -142.36
+404.50 , -3424.86 , -124.05
+404.50 , -2935.59 , -105.65
+404.50 , -2446.33 , -87.15
+404.50 , -1957.06 , -68.54
+404.50 , -1467.80 , -49.80
+404.50 , -978.53 , -30.89
+404.50 , -489.27 , -11.43
+404.50 , -97.85 , 0.00
+404.50 , 86.63 , 9.08
+404.50 , 433.14 , 26.62
+404.50 , 866.29 , 47.35
+404.50 , 1299.43 , 68.02
+404.50 , 1732.57 , 88.72
+404.50 , 2165.72 , 109.51
+404.50 , 2598.86 , 130.38
+404.50 , 3032.00 , 151.34
+404.50 , 3465.15 , 172.39
+404.50 , 3898.29 , 193.53
+404.50 , 4331.43 , 214.77
+404.50 , 4764.58 , 236.11
+404.50 , 5197.72 , 257.53
+404.50 , 5630.86 , 279.05
+404.50 , 6064.01 , 300.67
+404.50 , 6497.15 , 322.38
+404.50 , 6930.29 , 344.19
+404.50 , 7363.44 , 366.08
+404.50 , 7796.58 , 388.08
+404.50 , 8229.72 , 410.16
+404.50 , 8662.87 , 432.34
+438.21 , -9785.31 , -381.77
+438.21 , -9296.05 , -363.33
+438.21 , -8806.78 , -344.77
+438.21 , -8317.52 , -326.11
+438.21 , -7828.25 , -307.33
+438.21 , -7338.98 , -288.45
+438.21 , -6849.72 , -269.45
+438.21 , -6360.45 , -250.33
+438.21 , -5871.19 , -231.11
+438.21 , -5381.92 , -211.78
+438.21 , -4892.66 , -192.34
+438.21 , -4403.39 , -172.78
+438.21 , -3914.12 , -153.11
+438.21 , -3424.86 , -133.33
+438.21 , -2935.59 , -113.43
+438.21 , -2446.33 , -93.42
+438.21 , -1957.06 , -73.27
+438.21 , -1467.80 , -52.98
+438.21 , -978.53 , -32.45
+438.21 , -489.27 , -11.12
+438.21 , -97.85 , 0.00
+438.21 , 86.63 , 10.37
+438.21 , 433.14 , 29.60
+438.21 , 866.29 , 52.14
+438.21 , 1299.43 , 74.56
+438.21 , 1732.57 , 97.03
+438.21 , 2165.72 , 119.58
+438.21 , 2598.86 , 142.23
+438.21 , 3032.00 , 164.98
+438.21 , 3465.15 , 187.84
+438.21 , 3898.29 , 210.80
+438.21 , 4331.43 , 233.87
+438.21 , 4764.58 , 257.05
+438.21 , 5197.72 , 280.34
+438.21 , 5630.86 , 303.74
+438.21 , 6064.01 , 327.25
+438.21 , 6497.15 , 350.87
+438.21 , 6930.29 , 374.59
+438.21 , 7363.44 , 398.42
+438.21 , 7796.58 , 422.36
+438.21 , 8229.72 , 446.41
+438.21 , 8662.87 , 470.57
+471.92 , -9785.31 , -408.59
+471.92 , -9296.05 , -388.88
+471.92 , -8806.78 , -369.04
+471.92 , -8317.52 , -349.08
+471.92 , -7828.25 , -328.98
+471.92 , -7338.98 , -308.76
+471.92 , -6849.72 , -288.41
+471.92 , -6360.45 , -267.93
+471.92 , -5871.19 , -247.32
+471.92 , -5381.92 , -226.59
+471.92 , -4892.66 , -205.73
+471.92 , -4403.39 , -184.73
+471.92 , -3914.12 , -163.61
+471.92 , -3424.86 , -142.36
+471.92 , -2935.59 , -120.97
+471.92 , -2446.33 , -99.45
+471.92 , -1957.06 , -77.77
+471.92 , -1467.80 , -55.91
+471.92 , -978.53 , -33.75
+471.92 , -489.27 , -10.40
+471.92 , -97.85 , 0.00
+471.92 , 86.63 , 11.76
+471.92 , 433.14 , 32.74
+471.92 , 866.29 , 57.10
+471.92 , 1299.43 , 81.29
+471.92 , 1732.57 , 105.53
+471.92 , 2165.72 , 129.86
+471.92 , 2598.86 , 154.29
+471.92 , 3032.00 , 178.85
+471.92 , 3465.15 , 203.52
+471.92 , 3898.29 , 228.31
+471.92 , 4331.43 , 253.23
+471.92 , 4764.58 , 278.27
+471.92 , 5197.72 , 303.44
+471.92 , 5630.86 , 328.73
+471.92 , 6064.01 , 354.14
+471.92 , 6497.15 , 379.68
+471.92 , 6930.29 , 405.34
+471.92 , 7363.44 , 431.13
+471.92 , 7796.58 , 457.03
+471.92 , 8229.72 , 483.07
+471.92 , 8662.87 , 509.22
+505.62 , -9785.31 , -434.93
+505.62 , -9296.05 , -413.98
+505.62 , -8806.78 , -392.88
+505.62 , -8317.52 , -371.64
+505.62 , -7828.25 , -350.25
+505.62 , -7338.98 , -328.71
+505.62 , -6849.72 , -307.03
+505.62 , -6360.45 , -285.20
+505.62 , -5871.19 , -263.22
+505.62 , -5381.92 , -241.10
+505.62 , -4892.66 , -218.83
+505.62 , -4403.39 , -196.41
+505.62 , -3914.12 , -173.85
+505.62 , -3424.86 , -151.13
+505.62 , -2935.59 , -128.26
+505.62 , -2446.33 , -105.23
+505.62 , -1957.06 , -82.02
+505.62 , -1467.80 , -58.59
+505.62 , -978.53 , -34.77
+505.62 , -489.27 , -9.14
+505.62 , -97.85 , 0.00
+505.62 , 86.63 , 13.25
+505.62 , 433.14 , 36.05
+505.62 , 866.29 , 62.25
+505.62 , 1299.43 , 88.23
+505.62 , 1732.57 , 114.25
+505.62 , 2165.72 , 140.36
+505.62 , 2598.86 , 166.59
+505.62 , 3032.00 , 192.95
+505.62 , 3465.15 , 219.45
+505.62 , 3898.29 , 246.08
+505.62 , 4331.43 , 272.86
+505.62 , 4764.58 , 299.77
+505.62 , 5197.72 , 326.82
+505.62 , 5630.86 , 354.02
+505.62 , 6064.01 , 381.35
+505.62 , 6497.15 , 408.83
+505.62 , 6930.29 , 436.45
+505.62 , 7363.44 , 464.20
+505.62 , 7796.58 , 492.10
+505.62 , 8229.72 , 520.14
+505.62 , 8662.87 , 548.31
+539.33 , -9785.31 , -460.78
+539.33 , -9296.05 , -438.62
+539.33 , -8806.78 , -416.28
+539.33 , -8317.52 , -393.78
+539.33 , -7828.25 , -371.11
+539.33 , -7338.98 , -348.28
+539.33 , -6849.72 , -325.28
+539.33 , -6360.45 , -302.11
+539.33 , -5871.19 , -278.78
+539.33 , -5381.92 , -255.29
+539.33 , -4892.66 , -231.62
+539.33 , -4403.39 , -207.79
+539.33 , -3914.12 , -183.79
+539.33 , -3424.86 , -159.62
+539.33 , -2935.59 , -135.27
+539.33 , -2446.33 , -110.74
+539.33 , -1957.06 , -85.99
+539.33 , -1467.80 , -60.98
+539.33 , -978.53 , -35.47
+539.33 , -489.27 , -7.05
+539.33 , -97.85 , 0.00
+539.33 , 86.63 , 14.84
+539.33 , 433.14 , 39.53
+539.33 , 866.29 , 67.60
+539.33 , 1299.43 , 95.38
+539.33 , 1732.57 , 123.18
+539.33 , 2165.72 , 151.09
+539.33 , 2598.86 , 179.12
+539.33 , 3032.00 , 207.30
+539.33 , 3465.15 , 235.63
+539.33 , 3898.29 , 264.12
+539.33 , 4331.43 , 292.76
+539.33 , 4764.58 , 321.56
+539.33 , 5197.72 , 350.51
+539.33 , 5630.86 , 379.63
+539.33 , 6064.01 , 408.90
+539.33 , 6497.15 , 438.33
+539.33 , 6930.29 , 467.92
+539.33 , 7363.44 , 497.67
+539.33 , 7796.58 , 527.57
+539.33 , 8229.72 , 557.64
+539.33 , 8662.87 , 587.85
+573.04 , -9785.31 , -486.12
+573.04 , -9296.05 , -462.76
+573.04 , -8806.78 , -439.22
+573.04 , -8317.52 , -415.48
+573.04 , -7828.25 , -391.56
+573.04 , -7338.98 , -367.45
+573.04 , -6849.72 , -343.15
+573.04 , -6360.45 , -318.67
+573.04 , -5871.19 , -294.00
+573.04 , -5381.92 , -269.14
+573.04 , -4892.66 , -244.09
+573.04 , -4403.39 , -218.86
+573.04 , -3914.12 , -193.44
+573.04 , -3424.86 , -167.82
+573.04 , -2935.59 , -142.00
+573.04 , -2446.33 , -115.96
+573.04 , -1957.06 , -89.67
+573.04 , -1467.80 , -63.06
+573.04 , -978.53 , -35.80
+573.04 , -489.27 , -3.22
+573.04 , -97.85 , 0.00
+573.04 , 86.63 , 16.54
+573.04 , 433.14 , 43.18
+573.04 , 866.29 , 73.16
+573.04 , 1299.43 , 102.75
+573.04 , 1732.57 , 132.35
+573.04 , 2165.72 , 162.06
+573.04 , 2598.86 , 191.91
+573.04 , 3032.00 , 221.91
+573.04 , 3465.15 , 252.09
+573.04 , 3898.29 , 282.44
+573.04 , 4331.43 , 312.96
+573.04 , 4764.58 , 343.65
+573.04 , 5197.72 , 374.52
+573.04 , 5630.86 , 405.57
+573.04 , 6064.01 , 436.80
+573.04 , 6497.15 , 468.20
+573.04 , 6930.29 , 499.78
+573.04 , 7363.44 , 531.53
+573.04 , 7796.58 , 563.46
+573.04 , 8229.72 , 595.57
+573.04 , 8662.87 , 627.85
+606.75 , -9785.31 , -510.93
+606.75 , -9296.05 , -486.40
+606.75 , -8806.78 , -461.67
+606.75 , -8317.52 , -436.72
+606.75 , -7828.25 , -411.56
+606.75 , -7338.98 , -386.20
+606.75 , -6849.72 , -360.62
+606.75 , -6360.45 , -334.84
+606.75 , -5871.19 , -308.84
+606.75 , -5381.92 , -282.64
+606.75 , -4892.66 , -256.22
+606.75 , -4403.39 , -229.60
+606.75 , -3914.12 , -202.76
+606.75 , -3424.86 , -175.70
+606.75 , -2935.59 , -148.41
+606.75 , -2446.33 , -120.87
+606.75 , -1957.06 , -93.04
+606.75 , -1467.80 , -64.80
+606.75 , -978.53 , -35.73
+606.75 , -489.27 , 0.00
+606.75 , -97.85 , 0.00
+606.75 , 86.63 , 18.35
+606.75 , 433.14 , 47.02
+606.75 , 866.29 , 78.93
+606.75 , 1299.43 , 110.35
+606.75 , 1732.57 , 141.76
+606.75 , 2165.72 , 173.28
+606.75 , 2598.86 , 204.95
+606.75 , 3032.00 , 236.80
+606.75 , 3465.15 , 268.83
+606.75 , 3898.29 , 301.04
+606.75 , 4331.43 , 333.46
+606.75 , 4764.58 , 366.06
+606.75 , 5197.72 , 398.86
+606.75 , 5630.86 , 431.86
+606.75 , 6064.01 , 465.05
+606.75 , 6497.15 , 498.44
+606.75 , 6930.29 , 532.03
+606.75 , 7363.44 , 565.81
+606.75 , 7796.58 , 599.79
+606.75 , 8229.72 , 633.96
+606.75 , 8662.87 , 668.33
+640.46 , -9785.31 , -535.19
+640.46 , -9296.05 , -509.52
+640.46 , -8806.78 , -483.62
+640.46 , -8317.52 , -457.48
+640.46 , -7828.25 , -431.11
+640.46 , -7338.98 , -404.51
+640.46 , -6849.72 , -377.67
+640.46 , -6360.45 , -350.60
+640.46 , -5871.19 , -323.30
+640.46 , -5381.92 , -295.76
+640.46 , -4892.66 , -267.99
+640.46 , -4403.39 , -239.99
+640.46 , -3914.12 , -211.74
+640.46 , -3424.86 , -183.24
+640.46 , -2935.59 , -154.48
+640.46 , -2446.33 , -125.44
+640.46 , -1957.06 , -96.05
+640.46 , -1467.80 , -66.18
+640.46 , -978.53 , -35.19
+640.46 , -489.27 , 0.00
+640.46 , -97.85 , 0.00
+640.46 , 86.63 , 20.27
+640.46 , 433.14 , 51.05
+640.46 , 866.29 , 84.92
+640.46 , 1299.43 , 118.19
+640.46 , 1732.57 , 151.42
+640.46 , 2165.72 , 184.76
+640.46 , 2598.86 , 218.27
+640.46 , 3032.00 , 251.96
+640.46 , 3465.15 , 285.86
+640.46 , 3898.29 , 319.96
+640.46 , 4331.43 , 354.27
+640.46 , 4764.58 , 388.80
+640.46 , 5197.72 , 423.54
+640.46 , 5630.86 , 458.50
+640.46 , 6064.01 , 493.68
+640.46 , 6497.15 , 529.07
+640.46 , 6930.29 , 564.68
+640.46 , 7363.44 , 600.51
+640.46 , 7796.58 , 636.55
+640.46 , 8229.72 , 672.81
+640.46 , 8662.87 , 709.28
+674.17 , -9785.31 , -558.87
+674.17 , -9296.05 , -532.09
+674.17 , -8806.78 , -505.05
+674.17 , -8317.52 , -477.75
+674.17 , -7828.25 , -450.19
+674.17 , -7338.98 , -422.37
+674.17 , -6849.72 , -394.29
+674.17 , -6360.45 , -365.95
+674.17 , -5871.19 , -337.36
+674.17 , -5381.92 , -308.50
+674.17 , -4892.66 , -279.38
+674.17 , -4403.39 , -250.00
+674.17 , -3914.12 , -220.35
+674.17 , -3424.86 , -190.43
+674.17 , -2935.59 , -160.20
+674.17 , -2446.33 , -129.65
+674.17 , -1957.06 , -98.70
+674.17 , -1467.80 , -67.15
+674.17 , -978.53 , -34.12
+674.17 , -489.27 , 0.00
+674.17 , -97.85 , 0.00
+674.17 , 86.63 , 22.30
+674.17 , 433.14 , 55.27
+674.17 , 866.29 , 91.14
+674.17 , 1299.43 , 126.27
+674.17 , 1732.57 , 161.34
+674.17 , 2165.72 , 196.52
+674.17 , 2598.86 , 231.87
+674.17 , 3032.00 , 267.42
+674.17 , 3465.15 , 303.19
+674.17 , 3898.29 , 339.18
+674.17 , 4331.43 , 375.41
+674.17 , 4764.58 , 411.87
+674.17 , 5197.72 , 448.57
+674.17 , 5630.86 , 485.51
+674.17 , 6064.01 , 522.68
+674.17 , 6497.15 , 560.09
+674.17 , 6930.29 , 597.75
+674.17 , 7363.44 , 635.63
+674.17 , 7796.58 , 673.76
+674.17 , 8229.72 , 712.12
+674.17 , 8662.87 , 750.73
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..cf325529f23837579dfd10ebea1c609e97a60f77
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 8662.87 , -9785.31
+3.34 , 8662.87 , -9785.31
+33.72 , 8662.87 , -9785.31
+67.45 , 8662.87 , -9785.31
+101.09 , 8662.87 , -9785.31
+134.82 , 8662.87 , -9785.31
+168.54 , 8662.87 , -9785.31
+202.26 , 7219.06 , -8154.43
+235.99 , 6187.71 , -6989.45
+269.63 , 5414.29 , -6115.82
+303.36 , 4812.74 , -5436.33
+337.08 , 4331.43 , -4892.66
+370.80 , 3937.68 , -4447.88
+404.53 , 3609.53 , -4077.21
+438.17 , 3331.85 , -3763.56
+471.90 , 3093.91 , -3494.79
+505.62 , 2887.62 , -3261.77
+539.35 , 2707.20 , -3057.98
+573.07 , 2547.92 , -2878.06
+606.71 , 2406.31 , -2718.10
+640.44 , 2279.72 , -2575.10
+674.16 , 2165.72 , -2446.33
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..cf325529f23837579dfd10ebea1c609e97a60f77
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 8662.87 , -9785.31
+3.34 , 8662.87 , -9785.31
+33.72 , 8662.87 , -9785.31
+67.45 , 8662.87 , -9785.31
+101.09 , 8662.87 , -9785.31
+134.82 , 8662.87 , -9785.31
+168.54 , 8662.87 , -9785.31
+202.26 , 7219.06 , -8154.43
+235.99 , 6187.71 , -6989.45
+269.63 , 5414.29 , -6115.82
+303.36 , 4812.74 , -5436.33
+337.08 , 4331.43 , -4892.66
+370.80 , 3937.68 , -4447.88
+404.53 , 3609.53 , -4077.21
+438.17 , 3331.85 , -3763.56
+471.90 , 3093.91 , -3494.79
+505.62 , 2887.62 , -3261.77
+539.35 , 2707.20 , -3057.98
+573.07 , 2547.92 , -2878.06
+606.71 , 2406.31 , -2718.10
+640.44 , 2279.72 , -2575.10
+674.16 , 2165.72 , -2446.33
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..02b9cfdf04fa8e9596deed86f2453d35136592f2
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -18.72
+3.37 , -19.31
+33.71 , -24.79
+67.42 , -30.86
+101.12 , -36.92
+134.83 , -43.06
+168.54 , -49.12
+202.25 , -55.19
+235.96 , -61.26
+269.67 , -67.32
+303.37 , -73.46
+337.08 , -79.52
+370.79 , -85.59
+404.50 , -91.66
+438.21 , -97.72
+471.92 , -103.85
+505.62 , -109.92
+539.33 , -115.99
+573.04 , -122.06
+606.75 , -128.12
+640.46 , -134.25
+674.17 , -140.32
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/GenericIEPC_Gbx1Whl2.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/GenericIEPC_Gbx1Whl2.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..77bb834401f33bc4b2a25ae51ca8f4a67a6b6d51
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/GenericIEPC_Gbx1Whl2.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 2,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 12.276
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 13860.59,
+ "ContinuousTorqueSpeed": 166.99,
+ "OverloadTorque": 16517.20,
+ "OverloadTorqueSpeed": 166.01,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1Whl2_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl2.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 15015.63,
+ "ContinuousTorqueSpeed": 168.62,
+ "OverloadTorque": 17325.73,
+ "OverloadTorqueSpeed": 170.17,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1Whl2_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl2.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1Whl2_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_ENG_Gbx1Whl2.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_ENG_Gbx1Whl2.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..d826a010c7133b88f2373c6b8335da18a2eee0c8
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_ENG_Gbx1Whl2.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx1Whl2.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_Vehicle_Gbx1Whl2.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_Vehicle_Gbx1Whl2.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..22a694626fa007c104dd2d709e82db0e0fe2c6e1
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_Vehicle_Gbx1Whl2.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1Whl2.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..07eb40e197c27c23aea5f69c3200e3b799688102
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -37.45
+3.37 , -38.62
+33.71 , -49.58
+67.42 , -61.71
+101.12 , -73.85
+134.83 , -86.11
+168.54 , -98.24
+202.25 , -110.38
+235.96 , -122.51
+269.67 , -134.65
+303.37 , -146.91
+337.08 , -159.04
+370.79 , -171.18
+404.50 , -183.31
+438.21 , -195.45
+471.92 , -207.71
+505.62 , -219.84
+539.33 , -231.98
+573.04 , -244.11
+606.75 , -256.24
+640.46 , -268.51
+674.17 , -280.64
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/Axle_4x2_Tractor.vtlm b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/Axle_4x2_Tractor.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..e11cbf7cdde175e06ab8f6a0b79d46b84b3e0c1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/Axle_4x2_Tractor.vtlm
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/Axlegear.vgbx b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/Axlegear.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..8c4b5d9467fc9de8c168253de67633e521e24a0f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/Axlegear.vgbx
@@ -0,0 +1,33 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-11-03T14:19:09.9858299Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "3_speed_AMT",
+ "Inertia": 0.0,
+ "TracInt": 0.8,
+ "Gears": [
+ {
+ "Ratio": 2.64,
+ "LossMap": "Axle_4x2_Tractor.vtlm"
+ }
+ ],
+ "TqReserve": 0.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.22222222222222,
+ "StartAcc": 0.8,
+ "GearboxType": "AMT",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAfterUpshiftDelay": 6.0,
+ "UpshiftAfterDownshiftDelay": 6.0,
+ "UpshiftMinAcceleration": 0.1,
+ "PowershiftShiftTime": 0.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/GenericIEPC_Gbx1.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/GenericIEPC_Gbx1.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..8fcddfd0904b8b3f8c53039ee4aa55372733a70b
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/GenericIEPC_Gbx1.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 4.65
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 5412.60,
+ "ContinuousTorqueSpeed": 440.86,
+ "OverloadTorque": 6450.02,
+ "OverloadTorqueSpeed": 438.28,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 5863.65,
+ "ContinuousTorqueSpeed": 445.16,
+ "OverloadTorque": 6765.75,
+ "OverloadTorqueSpeed": 449.25,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_ENG_Gbx1.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_ENG_Gbx1.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..d2d2ae973f430cb783c48cda76335d11ebaa8890
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_ENG_Gbx1.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx1.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "Axlegear.vgbx",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..1f27defc739513aa86f68e0de1141b8b9f8ea0ff
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..e4be1e22ede233c40afa5a00eeb1292d2cad8f78
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -7190.72 , 0.00
+0.00 , -6831.19 , 0.00
+0.00 , -6471.65 , 0.00
+0.00 , -6112.11 , 0.00
+0.00 , -5752.58 , 0.00
+0.00 , -5393.04 , 0.00
+0.00 , -5033.51 , -0.13
+0.00 , -4673.97 , -0.66
+0.00 , -4314.43 , -0.98
+0.00 , -3954.90 , -1.19
+0.00 , -3595.36 , -1.32
+0.00 , -3235.82 , -1.38
+0.00 , -2876.29 , -1.39
+0.00 , -2516.75 , -1.35
+0.00 , -2157.22 , -1.26
+0.00 , -1797.68 , -1.13
+0.00 , -1438.14 , -0.97
+0.00 , -1078.61 , -0.77
+0.00 , -719.07 , -0.53
+0.00 , -359.54 , -0.27
+0.00 , -71.91 , -0.02
+0.00 , 67.66 , 0.13
+0.00 , 338.29 , 0.56
+0.00 , 676.58 , 1.12
+0.00 , 1014.86 , 1.70
+0.00 , 1353.15 , 2.31
+0.00 , 1691.44 , 2.93
+0.00 , 2029.73 , 3.58
+0.00 , 2368.01 , 4.25
+0.00 , 2706.30 , 4.93
+0.00 , 3044.59 , 5.64
+0.00 , 3382.88 , 6.37
+0.00 , 3721.16 , 7.12
+0.00 , 4059.45 , 7.88
+0.00 , 4397.74 , 8.67
+0.00 , 4736.03 , 9.47
+0.00 , 5074.31 , 10.29
+0.00 , 5412.60 , 11.13
+0.00 , 5750.89 , 11.99
+0.00 , 6089.18 , 12.87
+0.00 , 6427.46 , 13.76
+0.00 , 6765.75 , 14.67
+8.90 , -7190.72 , 0.00
+8.90 , -6831.19 , 0.00
+8.90 , -6471.65 , 0.00
+8.90 , -6112.11 , 0.00
+8.90 , -5752.58 , 0.00
+8.90 , -5393.04 , 0.00
+8.90 , -5033.51 , -0.50
+8.90 , -4673.97 , -0.84
+8.90 , -4314.43 , -1.04
+8.90 , -3954.90 , -1.16
+8.90 , -3595.36 , -1.22
+8.90 , -3235.82 , -1.24
+8.90 , -2876.29 , -1.21
+8.90 , -2516.75 , -1.15
+8.90 , -2157.22 , -1.06
+8.90 , -1797.68 , -0.94
+8.90 , -1438.14 , -0.80
+8.90 , -1078.61 , -0.62
+8.90 , -719.07 , -0.43
+8.90 , -359.54 , -0.21
+8.90 , -71.91 , -0.02
+8.90 , 67.66 , 0.10
+8.90 , 338.29 , 0.43
+8.90 , 676.58 , 0.85
+8.90 , 1014.86 , 1.30
+8.90 , 1353.15 , 1.75
+8.90 , 1691.44 , 2.23
+8.90 , 2029.73 , 2.71
+8.90 , 2368.01 , 3.21
+8.90 , 2706.30 , 3.73
+8.90 , 3044.59 , 4.26
+8.90 , 3382.88 , 4.80
+8.90 , 3721.16 , 5.36
+8.90 , 4059.45 , 5.93
+8.90 , 4397.74 , 6.52
+8.90 , 4736.03 , 7.12
+8.90 , 5074.31 , 7.73
+8.90 , 5412.60 , 8.35
+8.90 , 5750.89 , 8.99
+8.90 , 6089.18 , 9.64
+8.90 , 6427.46 , 10.30
+8.90 , 6765.75 , 10.98
+88.99 , -7190.72 , -58.10
+88.99 , -6831.19 , -55.37
+88.99 , -6471.65 , -52.62
+88.99 , -6112.11 , -49.85
+88.99 , -5752.58 , -47.06
+88.99 , -5393.04 , -44.25
+88.99 , -5033.51 , -41.42
+88.99 , -4673.97 , -38.57
+88.99 , -4314.43 , -35.70
+88.99 , -3954.90 , -32.81
+88.99 , -3595.36 , -29.90
+88.99 , -3235.82 , -26.98
+88.99 , -2876.29 , -24.03
+88.99 , -2516.75 , -21.07
+88.99 , -2157.22 , -18.08
+88.99 , -1797.68 , -15.08
+88.99 , -1438.14 , -12.06
+88.99 , -1078.61 , -9.02
+88.99 , -719.07 , -5.96
+88.99 , -359.54 , -2.88
+88.99 , -71.91 , -0.37
+88.99 , 67.66 , 0.90
+88.99 , 338.29 , 3.68
+88.99 , 676.58 , 7.16
+88.99 , 1014.86 , 10.66
+88.99 , 1353.15 , 14.17
+88.99 , 1691.44 , 17.71
+88.99 , 2029.73 , 21.26
+88.99 , 2368.01 , 24.84
+88.99 , 2706.30 , 28.43
+88.99 , 3044.59 , 32.04
+88.99 , 3382.88 , 35.67
+88.99 , 3721.16 , 39.32
+88.99 , 4059.45 , 42.99
+88.99 , 4397.74 , 46.68
+88.99 , 4736.03 , 50.38
+88.99 , 5074.31 , 54.11
+88.99 , 5412.60 , 57.85
+88.99 , 5750.89 , 61.61
+88.99 , 6089.18 , 65.39
+88.99 , 6427.46 , 69.19
+88.99 , 6765.75 , 73.01
+177.98 , -7190.72 , -120.57
+177.98 , -6831.19 , -114.73
+177.98 , -6471.65 , -108.87
+177.98 , -6112.11 , -102.99
+177.98 , -5752.58 , -97.08
+177.98 , -5393.04 , -91.15
+177.98 , -5033.51 , -85.20
+177.98 , -4673.97 , -79.23
+177.98 , -4314.43 , -73.23
+177.98 , -3954.90 , -67.21
+177.98 , -3595.36 , -61.17
+177.98 , -3235.82 , -55.10
+177.98 , -2876.29 , -49.01
+177.98 , -2516.75 , -42.90
+177.98 , -2157.22 , -36.77
+177.98 , -1797.68 , -30.61
+177.98 , -1438.14 , -24.43
+177.98 , -1078.61 , -18.23
+177.98 , -719.07 , -12.01
+177.98 , -359.54 , -5.76
+177.98 , -71.91 , -0.66
+177.98 , 67.66 , 1.84
+177.98 , 338.29 , 7.35
+177.98 , 676.58 , 14.22
+177.98 , 1014.86 , 21.11
+177.98 , 1353.15 , 28.02
+177.98 , 1691.44 , 34.96
+177.98 , 2029.73 , 41.92
+177.98 , 2368.01 , 48.90
+177.98 , 2706.30 , 55.90
+177.98 , 3044.59 , 62.93
+177.98 , 3382.88 , 69.98
+177.98 , 3721.16 , 77.05
+177.98 , 4059.45 , 84.15
+177.98 , 4397.74 , 91.27
+177.98 , 4736.03 , 98.41
+177.98 , 5074.31 , 105.58
+177.98 , 5412.60 , 112.76
+177.98 , 5750.89 , 119.97
+177.98 , 6089.18 , 127.21
+177.98 , 6427.46 , 134.46
+177.98 , 6765.75 , 141.74
+266.97 , -7190.72 , -182.44
+266.97 , -6831.19 , -173.55
+266.97 , -6471.65 , -164.62
+266.97 , -6112.11 , -155.67
+266.97 , -5752.58 , -146.69
+266.97 , -5393.04 , -137.68
+266.97 , -5033.51 , -128.65
+266.97 , -4673.97 , -119.58
+266.97 , -4314.43 , -110.49
+266.97 , -3954.90 , -101.36
+266.97 , -3595.36 , -92.21
+266.97 , -3235.82 , -83.03
+266.97 , -2876.29 , -73.82
+266.97 , -2516.75 , -64.58
+266.97 , -2157.22 , -55.31
+266.97 , -1797.68 , -46.02
+266.97 , -1438.14 , -36.70
+266.97 , -1078.61 , -27.34
+266.97 , -719.07 , -17.96
+266.97 , -359.54 , -8.54
+266.97 , -71.91 , -0.79
+266.97 , 67.66 , 2.86
+266.97 , 338.29 , 11.12
+266.97 , 676.58 , 21.39
+266.97 , 1014.86 , 31.68
+266.97 , 1353.15 , 41.99
+266.97 , 1691.44 , 52.34
+266.97 , 2029.73 , 62.71
+266.97 , 2368.01 , 73.12
+266.97 , 2706.30 , 83.55
+266.97 , 3044.59 , 94.01
+266.97 , 3382.88 , 104.50
+266.97 , 3721.16 , 115.02
+266.97 , 4059.45 , 125.57
+266.97 , 4397.74 , 136.15
+266.97 , 4736.03 , 146.76
+266.97 , 5074.31 , 157.40
+266.97 , 5412.60 , 168.06
+266.97 , 5750.89 , 178.76
+266.97 , 6089.18 , 189.48
+266.97 , 6427.46 , 200.23
+266.97 , 6765.75 , 211.02
+355.96 , -7190.72 , -243.71
+355.96 , -6831.19 , -231.81
+355.96 , -6471.65 , -219.87
+355.96 , -6112.11 , -207.89
+355.96 , -5752.58 , -195.88
+355.96 , -5393.04 , -183.83
+355.96 , -5033.51 , -171.74
+355.96 , -4673.97 , -159.61
+355.96 , -4314.43 , -147.45
+355.96 , -3954.90 , -135.25
+355.96 , -3595.36 , -123.01
+355.96 , -3235.82 , -110.74
+355.96 , -2876.29 , -98.43
+355.96 , -2516.75 , -86.08
+355.96 , -2157.22 , -73.70
+355.96 , -1797.68 , -61.27
+355.96 , -1438.14 , -48.82
+355.96 , -1078.61 , -36.32
+355.96 , -719.07 , -23.78
+355.96 , -359.54 , -11.19
+355.96 , -71.91 , -0.63
+355.96 , 67.66 , 3.98
+355.96 , 338.29 , 15.01
+355.96 , 676.58 , 28.68
+355.96 , 1014.86 , 42.37
+355.96 , 1353.15 , 56.10
+355.96 , 1691.44 , 69.87
+355.96 , 2029.73 , 83.67
+355.96 , 2368.01 , 97.52
+355.96 , 2706.30 , 111.40
+355.96 , 3044.59 , 125.31
+355.96 , 3382.88 , 139.27
+355.96 , 3721.16 , 153.26
+355.96 , 4059.45 , 167.29
+355.96 , 4397.74 , 181.36
+355.96 , 4736.03 , 195.46
+355.96 , 5074.31 , 209.61
+355.96 , 5412.60 , 223.79
+355.96 , 5750.89 , 238.01
+355.96 , 6089.18 , 252.26
+355.96 , 6427.46 , 266.56
+355.96 , 6765.75 , 280.89
+444.95 , -7190.72 , -304.37
+444.95 , -6831.19 , -289.50
+444.95 , -6471.65 , -274.59
+444.95 , -6112.11 , -259.63
+444.95 , -5752.58 , -244.61
+444.95 , -5393.04 , -229.56
+444.95 , -5033.51 , -214.45
+444.95 , -4673.97 , -199.30
+444.95 , -4314.43 , -184.10
+444.95 , -3954.90 , -168.85
+444.95 , -3595.36 , -153.55
+444.95 , -3235.82 , -138.20
+444.95 , -2876.29 , -122.81
+444.95 , -2516.75 , -107.37
+444.95 , -2157.22 , -91.88
+444.95 , -1797.68 , -76.35
+444.95 , -1438.14 , -60.76
+444.95 , -1078.61 , -45.13
+444.95 , -719.07 , -29.44
+444.95 , -359.54 , -13.67
+444.95 , -71.91 , 0.00
+444.95 , 67.66 , 5.21
+444.95 , 338.29 , 19.04
+444.95 , 676.58 , 36.13
+444.95 , 1014.86 , 53.24
+444.95 , 1353.15 , 70.39
+444.95 , 1691.44 , 87.59
+444.95 , 2029.73 , 104.83
+444.95 , 2368.01 , 122.13
+444.95 , 2706.30 , 139.47
+444.95 , 3044.59 , 156.87
+444.95 , 3382.88 , 174.31
+444.95 , 3721.16 , 191.80
+444.95 , 4059.45 , 209.33
+444.95 , 4397.74 , 226.92
+444.95 , 4736.03 , 244.56
+444.95 , 5074.31 , 262.24
+444.95 , 5412.60 , 279.97
+444.95 , 5750.89 , 297.76
+444.95 , 6089.18 , 315.58
+444.95 , 6427.46 , 333.46
+444.95 , 6765.75 , 351.39
+533.94 , -7190.72 , -364.37
+533.94 , -6831.19 , -346.59
+533.94 , -6471.65 , -328.74
+533.94 , -6112.11 , -310.84
+533.94 , -5752.58 , -292.87
+533.94 , -5393.04 , -274.84
+533.94 , -5033.51 , -256.75
+533.94 , -4673.97 , -238.60
+533.94 , -4314.43 , -220.39
+533.94 , -3954.90 , -202.12
+533.94 , -3595.36 , -183.79
+533.94 , -3235.82 , -165.40
+533.94 , -2876.29 , -146.94
+533.94 , -2516.75 , -128.43
+533.94 , -2157.22 , -109.85
+533.94 , -1797.68 , -91.21
+533.94 , -1438.14 , -72.51
+533.94 , -1078.61 , -53.75
+533.94 , -719.07 , -34.91
+533.94 , -359.54 , -15.95
+533.94 , -71.91 , 0.00
+533.94 , 67.66 , 6.58
+533.94 , 338.29 , 23.25
+533.94 , 676.58 , 43.76
+533.94 , 1014.86 , 64.29
+533.94 , 1353.15 , 84.87
+533.94 , 1691.44 , 105.52
+533.94 , 2029.73 , 126.22
+533.94 , 2368.01 , 146.98
+533.94 , 2706.30 , 167.81
+533.94 , 3044.59 , 188.70
+533.94 , 3382.88 , 209.65
+533.94 , 3721.16 , 230.66
+533.94 , 4059.45 , 251.73
+533.94 , 4397.74 , 272.87
+533.94 , 4736.03 , 294.07
+533.94 , 5074.31 , 315.33
+533.94 , 5412.60 , 336.65
+533.94 , 5750.89 , 358.03
+533.94 , 6089.18 , 379.47
+533.94 , 6427.46 , 400.98
+533.94 , 6765.75 , 422.54
+622.93 , -7190.72 , -423.69
+622.93 , -6831.19 , -403.04
+622.93 , -6471.65 , -382.31
+622.93 , -6112.11 , -361.50
+622.93 , -5752.58 , -340.62
+622.93 , -5393.04 , -319.66
+622.93 , -5033.51 , -298.62
+622.93 , -4673.97 , -277.51
+622.93 , -4314.43 , -256.31
+622.93 , -3954.90 , -235.05
+622.93 , -3595.36 , -213.70
+622.93 , -3235.82 , -192.28
+622.93 , -2876.29 , -170.79
+622.93 , -2516.75 , -149.21
+622.93 , -2157.22 , -127.57
+622.93 , -1797.68 , -105.84
+622.93 , -1438.14 , -84.03
+622.93 , -1078.61 , -62.14
+622.93 , -719.07 , -40.16
+622.93 , -359.54 , -18.00
+622.93 , -71.91 , 0.00
+622.93 , 67.66 , 8.09
+622.93 , 338.29 , 27.64
+622.93 , 676.58 , 51.59
+622.93 , 1014.86 , 75.56
+622.93 , 1353.15 , 99.58
+622.93 , 1691.44 , 123.68
+622.93 , 2029.73 , 147.86
+622.93 , 2368.01 , 172.10
+622.93 , 2706.30 , 196.43
+622.93 , 3044.59 , 220.84
+622.93 , 3382.88 , 245.32
+622.93 , 3721.16 , 269.88
+622.93 , 4059.45 , 294.51
+622.93 , 4397.74 , 319.23
+622.93 , 4736.03 , 344.02
+622.93 , 5074.31 , 368.89
+622.93 , 5412.60 , 393.83
+622.93 , 5750.89 , 418.85
+622.93 , 6089.18 , 443.95
+622.93 , 6427.46 , 469.13
+622.93 , 6765.75 , 494.38
+711.92 , -7190.72 , -482.31
+711.92 , -6831.19 , -458.83
+711.92 , -6471.65 , -435.26
+711.92 , -6112.11 , -411.59
+711.92 , -5752.58 , -387.83
+711.92 , -5393.04 , -363.97
+711.92 , -5033.51 , -340.02
+711.92 , -4673.97 , -315.97
+711.92 , -4314.43 , -291.83
+711.92 , -3954.90 , -267.59
+711.92 , -3595.36 , -243.26
+711.92 , -3235.82 , -218.84
+711.92 , -2876.29 , -194.32
+711.92 , -2516.75 , -169.71
+711.92 , -2157.22 , -145.00
+711.92 , -1797.68 , -120.19
+711.92 , -1438.14 , -95.29
+711.92 , -1078.61 , -70.28
+711.92 , -719.07 , -45.14
+711.92 , -359.54 , -19.76
+711.92 , -71.91 , 0.00
+711.92 , 67.66 , 9.76
+711.92 , 338.29 , 32.25
+711.92 , 676.58 , 59.66
+711.92 , 1014.86 , 87.07
+711.92 , 1353.15 , 114.55
+711.92 , 1691.44 , 142.11
+711.92 , 2029.73 , 169.77
+711.92 , 2368.01 , 197.52
+711.92 , 2706.30 , 225.37
+711.92 , 3044.59 , 253.31
+711.92 , 3382.88 , 281.34
+711.92 , 3721.16 , 309.47
+711.92 , 4059.45 , 337.70
+711.92 , 4397.74 , 366.02
+711.92 , 4736.03 , 394.44
+711.92 , 5074.31 , 422.95
+711.92 , 5412.60 , 451.56
+711.92 , 5750.89 , 480.26
+711.92 , 6089.18 , 509.05
+711.92 , 6427.46 , 537.94
+711.92 , 6765.75 , 566.93
+800.91 , -7190.72 , -540.17
+800.91 , -6831.19 , -513.92
+800.91 , -6471.65 , -487.55
+800.91 , -6112.11 , -461.06
+800.91 , -5752.58 , -434.46
+800.91 , -5393.04 , -407.75
+800.91 , -5033.51 , -380.92
+800.91 , -4673.97 , -353.97
+800.91 , -4314.43 , -326.91
+800.91 , -3954.90 , -299.73
+800.91 , -3595.36 , -272.44
+800.91 , -3235.82 , -245.03
+800.91 , -2876.29 , -217.51
+800.91 , -2516.75 , -189.87
+800.91 , -2157.22 , -162.12
+800.91 , -1797.68 , -134.25
+800.91 , -1438.14 , -106.26
+800.91 , -1078.61 , -78.13
+800.91 , -719.07 , -49.84
+800.91 , -359.54 , -21.19
+800.91 , -71.91 , 0.00
+800.91 , 67.66 , 11.59
+800.91 , 338.29 , 37.10
+800.91 , 676.58 , 67.98
+800.91 , 1014.86 , 98.85
+800.91 , 1353.15 , 129.79
+800.91 , 1691.44 , 160.84
+800.91 , 2029.73 , 191.99
+800.91 , 2368.01 , 223.26
+800.91 , 2706.30 , 254.64
+800.91 , 3044.59 , 286.14
+800.91 , 3382.88 , 317.75
+800.91 , 3721.16 , 349.48
+800.91 , 4059.45 , 381.32
+800.91 , 4397.74 , 413.28
+800.91 , 4736.03 , 445.36
+800.91 , 5074.31 , 477.54
+800.91 , 5412.60 , 509.85
+800.91 , 5750.89 , 542.27
+800.91 , 6089.18 , 574.80
+800.91 , 6427.46 , 607.45
+800.91 , 6765.75 , 640.21
+889.90 , -7190.72 , -597.26
+889.90 , -6831.19 , -568.28
+889.90 , -6471.65 , -539.16
+889.90 , -6112.11 , -509.90
+889.90 , -5752.58 , -480.50
+889.90 , -5393.04 , -450.96
+889.90 , -5033.51 , -421.28
+889.90 , -4673.97 , -391.47
+889.90 , -4314.43 , -361.52
+889.90 , -3954.90 , -331.43
+889.90 , -3595.36 , -301.20
+889.90 , -3235.82 , -270.83
+889.90 , -2876.29 , -240.33
+889.90 , -2516.75 , -209.68
+889.90 , -2157.22 , -178.90
+889.90 , -1797.68 , -147.97
+889.90 , -1438.14 , -116.90
+889.90 , -1078.61 , -85.66
+889.90 , -719.07 , -54.21
+889.90 , -359.54 , -22.23
+889.90 , -71.91 , 0.00
+889.90 , 67.66 , 13.60
+889.90 , 338.29 , 42.20
+889.90 , 676.58 , 76.58
+889.90 , 1014.86 , 110.92
+889.90 , 1353.15 , 145.34
+889.90 , 1691.44 , 179.88
+889.90 , 2029.73 , 214.55
+889.90 , 2368.01 , 249.35
+889.90 , 2706.30 , 284.29
+889.90 , 3044.59 , 319.36
+889.90 , 3382.88 , 354.57
+889.90 , 3721.16 , 389.92
+889.90 , 4059.45 , 425.41
+889.90 , 4397.74 , 461.03
+889.90 , 4736.03 , 496.79
+889.90 , 5074.31 , 532.69
+889.90 , 5412.60 , 568.73
+889.90 , 5750.89 , 604.90
+889.90 , 6089.18 , 641.21
+889.90 , 6427.46 , 677.66
+889.90 , 6765.75 , 714.24
+978.89 , -7190.72 , -653.54
+978.89 , -6831.19 , -621.88
+978.89 , -6471.65 , -590.05
+978.89 , -6112.11 , -558.06
+978.89 , -5752.58 , -525.90
+978.89 , -5393.04 , -493.58
+978.89 , -5033.51 , -461.09
+978.89 , -4673.97 , -428.44
+978.89 , -4314.43 , -395.63
+978.89 , -3954.90 , -362.65
+978.89 , -3595.36 , -329.51
+978.89 , -3235.82 , -296.21
+978.89 , -2876.29 , -262.74
+978.89 , -2516.75 , -229.11
+978.89 , -2157.22 , -195.31
+978.89 , -1797.68 , -161.34
+978.89 , -1438.14 , -127.18
+978.89 , -1078.61 , -92.83
+978.89 , -719.07 , -58.20
+978.89 , -359.54 , -22.82
+978.89 , -71.91 , 0.00
+978.89 , 67.66 , 15.79
+978.89 , 338.29 , 47.58
+978.89 , 676.58 , 85.48
+978.89 , 1014.86 , 123.30
+978.89 , 1353.15 , 161.22
+978.89 , 1691.44 , 199.26
+978.89 , 2029.73 , 237.46
+978.89 , 2368.01 , 275.81
+978.89 , 2706.30 , 314.32
+978.89 , 3044.59 , 352.99
+978.89 , 3382.88 , 391.83
+978.89 , 3721.16 , 430.82
+978.89 , 4059.45 , 469.98
+978.89 , 4397.74 , 509.30
+978.89 , 4736.03 , 548.78
+978.89 , 5074.31 , 588.42
+978.89 , 5412.60 , 628.23
+978.89 , 5750.89 , 668.20
+978.89 , 6089.18 , 708.32
+978.89 , 6427.46 , 748.61
+978.89 , 6765.75 , 789.06
+1067.88 , -7190.72 , -708.97
+1067.88 , -6831.19 , -674.68
+1067.88 , -6471.65 , -640.19
+1067.88 , -6112.11 , -605.51
+1067.88 , -5752.58 , -570.63
+1067.88 , -5393.04 , -535.56
+1067.88 , -5033.51 , -500.30
+1067.88 , -4673.97 , -464.85
+1067.88 , -4314.43 , -429.21
+1067.88 , -3954.90 , -393.37
+1067.88 , -3595.36 , -357.35
+1067.88 , -3235.82 , -321.13
+1067.88 , -2876.29 , -284.71
+1067.88 , -2516.75 , -248.11
+1067.88 , -2157.22 , -211.31
+1067.88 , -1797.68 , -174.30
+1067.88 , -1438.14 , -137.08
+1067.88 , -1078.61 , -99.61
+1067.88 , -719.07 , -61.78
+1067.88 , -359.54 , -22.86
+1067.88 , -71.91 , 0.00
+1067.88 , 67.66 , 18.17
+1067.88 , 338.29 , 53.24
+1067.88 , 676.58 , 94.71
+1067.88 , 1014.86 , 136.03
+1067.88 , 1353.15 , 177.45
+1067.88 , 1691.44 , 219.01
+1067.88 , 2029.73 , 260.75
+1067.88 , 2368.01 , 302.67
+1067.88 , 2706.30 , 344.78
+1067.88 , 3044.59 , 387.07
+1067.88 , 3382.88 , 429.54
+1067.88 , 3721.16 , 472.21
+1067.88 , 4059.45 , 515.06
+1067.88 , 4397.74 , 558.11
+1067.88 , 4736.03 , 601.34
+1067.88 , 5074.31 , 644.76
+1067.88 , 5412.60 , 688.37
+1067.88 , 5750.89 , 732.17
+1067.88 , 6089.18 , 776.15
+1067.88 , 6427.46 , 820.33
+1067.88 , 6765.75 , 864.69
+1156.87 , -7190.72 , -763.53
+1156.87 , -6831.19 , -726.65
+1156.87 , -6471.65 , -689.55
+1156.87 , -6112.11 , -652.22
+1156.87 , -5752.58 , -614.67
+1156.87 , -5393.04 , -576.89
+1156.87 , -5033.51 , -538.89
+1156.87 , -4673.97 , -500.67
+1156.87 , -4314.43 , -462.22
+1156.87 , -3954.90 , -423.56
+1156.87 , -3595.36 , -384.67
+1156.87 , -3235.82 , -345.56
+1156.87 , -2876.29 , -306.22
+1156.87 , -2516.75 , -266.66
+1156.87 , -2157.22 , -226.86
+1156.87 , -1797.68 , -186.83
+1156.87 , -1438.14 , -146.54
+1156.87 , -1078.61 , -105.95
+1156.87 , -719.07 , -64.90
+1156.87 , -359.54 , -22.24
+1156.87 , -71.91 , 0.00
+1156.87 , 67.66 , 20.74
+1156.87 , 338.29 , 59.20
+1156.87 , 676.58 , 104.27
+1156.87 , 1014.86 , 149.12
+1156.87 , 1353.15 , 194.05
+1156.87 , 1691.44 , 239.16
+1156.87 , 2029.73 , 284.45
+1156.87 , 2368.01 , 329.96
+1156.87 , 2706.30 , 375.67
+1156.87 , 3044.59 , 421.60
+1156.87 , 3382.88 , 467.75
+1156.87 , 3721.16 , 514.11
+1156.87 , 4059.45 , 560.69
+1156.87 , 4397.74 , 607.48
+1156.87 , 4736.03 , 654.50
+1156.87 , 5074.31 , 701.73
+1156.87 , 5412.60 , 749.18
+1156.87 , 5750.89 , 796.84
+1156.87 , 6089.18 , 844.73
+1156.87 , 6427.46 , 892.83
+1156.87 , 6765.75 , 941.14
+1245.86 , -7190.72 , -817.17
+1245.86 , -6831.19 , -777.76
+1245.86 , -6471.65 , -738.08
+1245.86 , -6112.11 , -698.15
+1245.86 , -5752.58 , -657.96
+1245.86 , -5393.04 , -617.52
+1245.86 , -5033.51 , -576.82
+1245.86 , -4673.97 , -535.86
+1245.86 , -4314.43 , -494.65
+1245.86 , -3954.90 , -453.18
+1245.86 , -3595.36 , -411.45
+1245.86 , -3235.82 , -369.47
+1245.86 , -2876.29 , -327.22
+1245.86 , -2516.75 , -284.72
+1245.86 , -2157.22 , -241.95
+1245.86 , -1797.68 , -198.90
+1245.86 , -1438.14 , -155.54
+1245.86 , -1078.61 , -111.82
+1245.86 , -719.07 , -67.51
+1245.86 , -359.54 , -20.80
+1245.86 , -71.91 , 0.00
+1245.86 , 67.66 , 23.52
+1245.86 , 338.29 , 65.48
+1245.86 , 676.58 , 114.20
+1245.86 , 1014.86 , 162.59
+1245.86 , 1353.15 , 211.06
+1245.86 , 1691.44 , 259.72
+1245.86 , 2029.73 , 308.59
+1245.86 , 2368.01 , 357.69
+1245.86 , 2706.30 , 407.04
+1245.86 , 3044.59 , 456.62
+1245.86 , 3382.88 , 506.46
+1245.86 , 3721.16 , 556.54
+1245.86 , 4059.45 , 606.87
+1245.86 , 4397.74 , 657.45
+1245.86 , 4736.03 , 708.28
+1245.86 , 5074.31 , 759.35
+1245.86 , 5412.60 , 810.68
+1245.86 , 5750.89 , 862.25
+1245.86 , 6089.18 , 914.07
+1245.86 , 6427.46 , 966.13
+1245.86 , 6765.75 , 1018.44
+1334.85 , -7190.72 , -869.86
+1334.85 , -6831.19 , -827.96
+1334.85 , -6471.65 , -785.77
+1334.85 , -6112.11 , -743.28
+1334.85 , -5752.58 , -700.50
+1334.85 , -5393.04 , -657.42
+1334.85 , -5033.51 , -614.05
+1334.85 , -4673.97 , -570.39
+1334.85 , -4314.43 , -526.44
+1334.85 , -3954.90 , -482.19
+1334.85 , -3595.36 , -437.65
+1334.85 , -3235.82 , -392.82
+1334.85 , -2876.29 , -347.69
+1334.85 , -2516.75 , -302.26
+1334.85 , -2157.22 , -256.52
+1334.85 , -1797.68 , -210.46
+1334.85 , -1438.14 , -164.04
+1334.85 , -1078.61 , -117.17
+1334.85 , -719.07 , -69.54
+1334.85 , -359.54 , -18.27
+1334.85 , -71.91 , 0.00
+1334.85 , 67.66 , 26.49
+1334.85 , 338.29 , 72.10
+1334.85 , 676.58 , 124.50
+1334.85 , 1014.86 , 176.46
+1334.85 , 1353.15 , 228.49
+1334.85 , 1691.44 , 280.71
+1334.85 , 2029.73 , 333.18
+1334.85 , 2368.01 , 385.90
+1334.85 , 2706.30 , 438.89
+1334.85 , 3044.59 , 492.16
+1334.85 , 3382.88 , 545.71
+1334.85 , 3721.16 , 599.54
+1334.85 , 4059.45 , 653.64
+1334.85 , 4397.74 , 708.03
+1334.85 , 4736.03 , 762.71
+1334.85 , 5074.31 , 817.66
+1334.85 , 5412.60 , 872.89
+1334.85 , 5750.89 , 928.41
+1334.85 , 6089.18 , 984.20
+1334.85 , 6427.46 , 1040.27
+1334.85 , 6765.75 , 1096.63
+1423.84 , -7190.72 , -921.56
+1423.84 , -6831.19 , -877.23
+1423.84 , -6471.65 , -832.56
+1423.84 , -6112.11 , -787.56
+1423.84 , -5752.58 , -742.22
+1423.84 , -5393.04 , -696.56
+1423.84 , -5033.51 , -650.56
+1423.84 , -4673.97 , -604.23
+1423.84 , -4314.43 , -557.56
+1423.84 , -3954.90 , -510.57
+1423.84 , -3595.36 , -463.24
+1423.84 , -3235.82 , -415.58
+1423.84 , -2876.29 , -367.58
+1423.84 , -2516.75 , -319.24
+1423.84 , -2157.22 , -270.55
+1423.84 , -1797.68 , -221.48
+1423.84 , -1438.14 , -171.99
+1423.84 , -1078.61 , -121.95
+1423.84 , -719.07 , -70.93
+1423.84 , -359.54 , -14.10
+1423.84 , -71.91 , 0.00
+1423.84 , 67.66 , 29.68
+1423.84 , 338.29 , 79.05
+1423.84 , 676.58 , 135.20
+1423.84 , 1014.86 , 190.76
+1423.84 , 1353.15 , 246.36
+1423.84 , 1691.44 , 302.17
+1423.84 , 2029.73 , 358.24
+1423.84 , 2368.01 , 414.60
+1423.84 , 2706.30 , 471.27
+1423.84 , 3044.59 , 528.24
+1423.84 , 3382.88 , 585.52
+1423.84 , 3721.16 , 643.12
+1423.84 , 4059.45 , 701.03
+1423.84 , 4397.74 , 759.26
+1423.84 , 4736.03 , 817.80
+1423.84 , 5074.31 , 876.66
+1423.84 , 5412.60 , 935.84
+1423.84 , 5750.89 , 995.34
+1423.84 , 6089.18 , 1055.15
+1423.84 , 6427.46 , 1115.27
+1423.84 , 6765.75 , 1175.71
+1512.83 , -7190.72 , -972.24
+1512.83 , -6831.19 , -925.52
+1512.83 , -6471.65 , -878.43
+1512.83 , -6112.11 , -830.96
+1512.83 , -5752.58 , -783.11
+1512.83 , -5393.04 , -734.89
+1512.83 , -5033.51 , -686.30
+1512.83 , -4673.97 , -637.33
+1512.83 , -4314.43 , -587.99
+1512.83 , -3954.90 , -538.28
+1512.83 , -3595.36 , -488.19
+1512.83 , -3235.82 , -437.72
+1512.83 , -2876.29 , -386.87
+1512.83 , -2516.75 , -335.63
+1512.83 , -2157.22 , -283.99
+1512.83 , -1797.68 , -231.92
+1512.83 , -1438.14 , -179.35
+1512.83 , -1078.61 , -126.12
+1512.83 , -719.07 , -71.60
+1512.83 , -359.54 , -6.45
+1512.83 , -71.91 , 0.00
+1512.83 , 67.66 , 33.08
+1512.83 , 338.29 , 86.37
+1512.83 , 676.58 , 146.31
+1512.83 , 1014.86 , 205.50
+1512.83 , 1353.15 , 264.70
+1512.83 , 1691.44 , 324.11
+1512.83 , 2029.73 , 383.81
+1512.83 , 2368.01 , 443.83
+1512.83 , 2706.30 , 504.18
+1512.83 , 3044.59 , 564.87
+1512.83 , 3382.88 , 625.91
+1512.83 , 3721.16 , 687.30
+1512.83 , 4059.45 , 749.05
+1512.83 , 4397.74 , 811.14
+1512.83 , 4736.03 , 873.59
+1512.83 , 5074.31 , 936.40
+1512.83 , 5412.60 , 999.56
+1512.83 , 5750.89 , 1063.07
+1512.83 , 6089.18 , 1126.93
+1512.83 , 6427.46 , 1191.14
+1512.83 , 6765.75 , 1255.71
+1601.82 , -7190.72 , -1021.86
+1601.82 , -6831.19 , -972.81
+1601.82 , -6471.65 , -923.33
+1601.82 , -6112.11 , -873.44
+1601.82 , -5752.58 , -823.13
+1601.82 , -5393.04 , -772.39
+1601.82 , -5033.51 , -721.24
+1601.82 , -4673.97 , -669.67
+1601.82 , -4314.43 , -617.68
+1601.82 , -3954.90 , -565.27
+1601.82 , -3595.36 , -512.45
+1601.82 , -3235.82 , -459.19
+1601.82 , -2876.29 , -405.51
+1601.82 , -2516.75 , -351.39
+1601.82 , -2157.22 , -296.81
+1601.82 , -1797.68 , -241.73
+1601.82 , -1438.14 , -186.07
+1601.82 , -1078.61 , -129.61
+1601.82 , -719.07 , -71.46
+1601.82 , -359.54 , 0.00
+1601.82 , -71.91 , 0.00
+1601.82 , 67.66 , 36.70
+1601.82 , 338.29 , 94.04
+1601.82 , 676.58 , 157.85
+1601.82 , 1014.86 , 220.70
+1601.82 , 1353.15 , 283.52
+1601.82 , 1691.44 , 346.56
+1601.82 , 2029.73 , 409.90
+1601.82 , 2368.01 , 473.59
+1601.82 , 2706.30 , 537.65
+1601.82 , 3044.59 , 602.09
+1601.82 , 3382.88 , 666.91
+1601.82 , 3721.16 , 732.12
+1601.82 , 4059.45 , 797.72
+1601.82 , 4397.74 , 863.72
+1601.82 , 4736.03 , 930.10
+1601.82 , 5074.31 , 996.88
+1601.82 , 5412.60 , 1064.05
+1601.82 , 5750.89 , 1131.62
+1601.82 , 6089.18 , 1199.57
+1601.82 , 6427.46 , 1267.92
+1601.82 , 6765.75 , 1336.65
+1690.81 , -7190.72 , -1070.37
+1690.81 , -6831.19 , -1019.04
+1690.81 , -6471.65 , -967.24
+1690.81 , -6112.11 , -914.96
+1690.81 , -5752.58 , -862.23
+1690.81 , -5393.04 , -809.02
+1690.81 , -5033.51 , -755.35
+1690.81 , -4673.97 , -701.21
+1690.81 , -4314.43 , -646.60
+1690.81 , -3954.90 , -591.53
+1690.81 , -3595.36 , -535.99
+1690.81 , -3235.82 , -479.97
+1690.81 , -2876.29 , -423.47
+1690.81 , -2516.75 , -366.48
+1690.81 , -2157.22 , -308.96
+1690.81 , -1797.68 , -250.88
+1690.81 , -1438.14 , -192.11
+1690.81 , -1078.61 , -132.36
+1690.81 , -719.07 , -70.38
+1690.81 , -359.54 , 0.00
+1690.81 , -71.91 , 0.00
+1690.81 , 67.66 , 40.53
+1690.81 , 338.29 , 102.10
+1690.81 , 676.58 , 169.83
+1690.81 , 1014.86 , 236.37
+1690.81 , 1353.15 , 302.84
+1690.81 , 1691.44 , 369.53
+1690.81 , 2029.73 , 436.54
+1690.81 , 2368.01 , 503.92
+1690.81 , 2706.30 , 571.71
+1690.81 , 3044.59 , 639.91
+1690.81 , 3382.88 , 708.54
+1690.81 , 3721.16 , 777.59
+1690.81 , 4059.45 , 847.08
+1690.81 , 4397.74 , 917.00
+1690.81 , 4736.03 , 987.35
+1690.81 , 5074.31 , 1058.14
+1690.81 , 5412.60 , 1129.36
+1690.81 , 5750.89 , 1201.01
+1690.81 , 6089.18 , 1273.09
+1690.81 , 6427.46 , 1345.61
+1690.81 , 6765.75 , 1418.56
+1779.80 , -7190.72 , -1117.74
+1779.80 , -6831.19 , -1064.18
+1779.80 , -6471.65 , -1010.10
+1779.80 , -6112.11 , -955.49
+1779.80 , -5752.58 , -900.37
+1779.80 , -5393.04 , -844.73
+1779.80 , -5033.51 , -788.58
+1779.80 , -4673.97 , -731.90
+1779.80 , -4314.43 , -674.71
+1779.80 , -3954.90 , -617.00
+1779.80 , -3595.36 , -558.77
+1779.80 , -3235.82 , -500.01
+1779.80 , -2876.29 , -440.71
+1779.80 , -2516.75 , -380.85
+1779.80 , -2157.22 , -320.40
+1779.80 , -1797.68 , -259.31
+1779.80 , -1438.14 , -197.41
+1779.80 , -1078.61 , -134.30
+1779.80 , -719.07 , -68.24
+1779.80 , -359.54 , 0.00
+1779.80 , -71.91 , 0.00
+1779.80 , 67.66 , 44.59
+1779.80 , 338.29 , 110.53
+1779.80 , 676.58 , 182.27
+1779.80 , 1014.86 , 252.55
+1779.80 , 1353.15 , 322.69
+1779.80 , 1691.44 , 393.04
+1779.80 , 2029.73 , 463.74
+1779.80 , 2368.01 , 534.84
+1779.80 , 2706.30 , 606.37
+1779.80 , 3044.59 , 678.37
+1779.80 , 3382.88 , 750.82
+1779.80 , 3721.16 , 823.74
+1779.80 , 4059.45 , 897.14
+1779.80 , 4397.74 , 971.01
+1779.80 , 4736.03 , 1045.36
+1779.80 , 5074.31 , 1120.19
+1779.80 , 5412.60 , 1195.49
+1779.80 , 5750.89 , 1271.27
+1779.80 , 6089.18 , 1347.52
+1779.80 , 6427.46 , 1424.25
+1779.80 , 6765.75 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..14358b02ff657904b67a1a81913128b0ff6bad78
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 6765.75 , -7190.72
+8.82 , 6765.75 , -7190.72
+89.03 , 6765.75 , -7190.72
+178.06 , 6765.75 , -7190.72
+266.88 , 6765.75 , -7190.72
+355.91 , 6765.75 , -7190.72
+444.95 , 6765.75 , -7190.72
+533.98 , 5638.13 , -5992.27
+623.01 , 4832.64 , -5136.19
+711.83 , 4228.59 , -4494.20
+800.86 , 3758.78 , -3994.88
+889.89 , 3382.88 , -3595.36
+978.92 , 3075.35 , -3268.52
+1067.96 , 2819.06 , -2996.13
+1156.77 , 2602.20 , -2765.65
+1245.81 , 2416.37 , -2568.14
+1334.84 , 2255.25 , -2396.91
+1423.87 , 2114.34 , -2247.15
+1512.90 , 1989.94 , -2114.94
+1601.72 , 1879.34 , -1997.39
+1690.75 , 1780.47 , -1892.31
+1779.78 , 1691.44 , -1797.68
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..14358b02ff657904b67a1a81913128b0ff6bad78
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 6765.75 , -7190.72
+8.82 , 6765.75 , -7190.72
+89.03 , 6765.75 , -7190.72
+178.06 , 6765.75 , -7190.72
+266.88 , 6765.75 , -7190.72
+355.91 , 6765.75 , -7190.72
+444.95 , 6765.75 , -7190.72
+533.98 , 5638.13 , -5992.27
+623.01 , 4832.64 , -5136.19
+711.83 , 4228.59 , -4494.20
+800.86 , 3758.78 , -3994.88
+889.89 , 3382.88 , -3595.36
+978.92 , 3075.35 , -3268.52
+1067.96 , 2819.06 , -2996.13
+1156.77 , 2602.20 , -2765.65
+1245.81 , 2416.37 , -2568.14
+1334.84 , 2255.25 , -2396.91
+1423.87 , 2114.34 , -2247.15
+1512.90 , 1989.94 , -2114.94
+1601.72 , 1879.34 , -1997.39
+1690.75 , 1780.47 , -1892.31
+1779.78 , 1691.44 , -1797.68
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..ffb4883b312afeed23be5a96783b2b92e3c03bed
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -13.76
+8.90 , -14.19
+88.99 , -18.22
+177.98 , -22.67
+266.97 , -27.13
+355.96 , -31.64
+444.95 , -36.10
+533.94 , -40.56
+622.93 , -45.01
+711.92 , -49.47
+800.91 , -53.98
+889.90 , -58.44
+978.89 , -62.89
+1067.88 , -67.35
+1156.87 , -71.81
+1245.86 , -76.32
+1334.85 , -80.78
+1423.84 , -85.23
+1512.83 , -89.69
+1601.82 , -94.15
+1690.81 , -98.66
+1779.80 , -103.11
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/GenericIEPC_Gbx3Axl.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/GenericIEPC_Gbx3Axl.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..960168f579fdda05ed04d0089c7fb128803c6922
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/GenericIEPC_Gbx3Axl.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": true,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 21.9384
+ },
+ {
+ "Ratio": 12.276
+ },
+ {
+ "Ratio": 7.2336
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3Axl_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Axl_1.viepco",
+ "2": "IEPC_Gbx3Axl_2.viepco",
+ "3": "IEPC_Gbx3Axl_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3Axl_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Axl_1.viepco",
+ "2": "IEPC_Gbx3Axl_2.viepco",
+ "3": "IEPC_Gbx3Axl_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3Axl_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_ENG_Gbx3Axl.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_ENG_Gbx3Axl.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..f06545a5fa8c567c132fcd4291c0c5292bcce37c
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_ENG_Gbx3Axl.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx3Axl.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_Vehicle_Gbx3Axl.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_Vehicle_Gbx3Axl.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..62b96216fe4a1a5d4d908d32e13745bc1c0747fa
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_Vehicle_Gbx3Axl.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3Axl.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_1.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..6661444505d1f80e1b7ccf4680f069a1394f3e8d
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -35338.92 , 0.00
+0.00 , -33571.97 , 0.00
+0.00 , -31805.03 , 0.00
+0.00 , -30038.08 , 0.00
+0.00 , -28271.13 , 0.00
+0.00 , -26504.19 , 0.00
+0.00 , -24737.24 , -0.13
+0.00 , -22970.30 , -0.66
+0.00 , -21203.35 , -0.98
+0.00 , -19436.40 , -1.19
+0.00 , -17669.46 , -1.32
+0.00 , -15902.51 , -1.38
+0.00 , -14135.57 , -1.39
+0.00 , -12368.62 , -1.35
+0.00 , -10601.68 , -1.26
+0.00 , -8834.73 , -1.13
+0.00 , -7067.78 , -0.97
+0.00 , -5300.84 , -0.77
+0.00 , -3533.89 , -0.53
+0.00 , -1766.95 , -0.27
+0.00 , -353.39 , -0.02
+0.00 , 306.44 , 0.13
+0.00 , 1532.18 , 0.56
+0.00 , 3064.36 , 1.12
+0.00 , 4596.53 , 1.70
+0.00 , 6128.71 , 2.31
+0.00 , 7660.89 , 2.93
+0.00 , 9193.07 , 3.58
+0.00 , 10725.24 , 4.25
+0.00 , 12257.42 , 4.93
+0.00 , 13789.60 , 5.64
+0.00 , 15321.78 , 6.37
+0.00 , 16853.96 , 7.12
+0.00 , 18386.13 , 7.88
+0.00 , 19918.31 , 8.67
+0.00 , 21450.49 , 9.47
+0.00 , 22982.67 , 10.29
+0.00 , 24514.85 , 11.13
+0.00 , 26047.02 , 11.99
+0.00 , 27579.20 , 12.87
+0.00 , 29111.38 , 13.76
+0.00 , 30643.56 , 14.67
+1.89 , -35338.92 , 0.00
+1.89 , -33571.97 , 0.00
+1.89 , -31805.03 , 0.00
+1.89 , -30038.08 , 0.00
+1.89 , -28271.13 , 0.00
+1.89 , -26504.19 , 0.00
+1.89 , -24737.24 , -0.50
+1.89 , -22970.30 , -0.84
+1.89 , -21203.35 , -1.04
+1.89 , -19436.40 , -1.16
+1.89 , -17669.46 , -1.22
+1.89 , -15902.51 , -1.24
+1.89 , -14135.57 , -1.21
+1.89 , -12368.62 , -1.15
+1.89 , -10601.68 , -1.06
+1.89 , -8834.73 , -0.94
+1.89 , -7067.78 , -0.80
+1.89 , -5300.84 , -0.62
+1.89 , -3533.89 , -0.43
+1.89 , -1766.95 , -0.21
+1.89 , -353.39 , -0.02
+1.89 , 306.44 , 0.10
+1.89 , 1532.18 , 0.43
+1.89 , 3064.36 , 0.85
+1.89 , 4596.53 , 1.30
+1.89 , 6128.71 , 1.75
+1.89 , 7660.89 , 2.23
+1.89 , 9193.07 , 2.71
+1.89 , 10725.24 , 3.21
+1.89 , 12257.42 , 3.73
+1.89 , 13789.60 , 4.26
+1.89 , 15321.78 , 4.80
+1.89 , 16853.96 , 5.36
+1.89 , 18386.13 , 5.93
+1.89 , 19918.31 , 6.52
+1.89 , 21450.49 , 7.12
+1.89 , 22982.67 , 7.73
+1.89 , 24514.85 , 8.35
+1.89 , 26047.02 , 8.99
+1.89 , 27579.20 , 9.64
+1.89 , 29111.38 , 10.30
+1.89 , 30643.56 , 10.98
+18.86 , -35338.92 , -58.10
+18.86 , -33571.97 , -55.37
+18.86 , -31805.03 , -52.62
+18.86 , -30038.08 , -49.85
+18.86 , -28271.13 , -47.06
+18.86 , -26504.19 , -44.25
+18.86 , -24737.24 , -41.42
+18.86 , -22970.30 , -38.57
+18.86 , -21203.35 , -35.70
+18.86 , -19436.40 , -32.81
+18.86 , -17669.46 , -29.90
+18.86 , -15902.51 , -26.98
+18.86 , -14135.57 , -24.03
+18.86 , -12368.62 , -21.07
+18.86 , -10601.68 , -18.08
+18.86 , -8834.73 , -15.08
+18.86 , -7067.78 , -12.06
+18.86 , -5300.84 , -9.02
+18.86 , -3533.89 , -5.96
+18.86 , -1766.95 , -2.88
+18.86 , -353.39 , -0.37
+18.86 , 306.44 , 0.90
+18.86 , 1532.18 , 3.68
+18.86 , 3064.36 , 7.16
+18.86 , 4596.53 , 10.66
+18.86 , 6128.71 , 14.17
+18.86 , 7660.89 , 17.71
+18.86 , 9193.07 , 21.26
+18.86 , 10725.24 , 24.84
+18.86 , 12257.42 , 28.43
+18.86 , 13789.60 , 32.04
+18.86 , 15321.78 , 35.67
+18.86 , 16853.96 , 39.32
+18.86 , 18386.13 , 42.99
+18.86 , 19918.31 , 46.68
+18.86 , 21450.49 , 50.38
+18.86 , 22982.67 , 54.11
+18.86 , 24514.85 , 57.85
+18.86 , 26047.02 , 61.61
+18.86 , 27579.20 , 65.39
+18.86 , 29111.38 , 69.19
+18.86 , 30643.56 , 73.01
+37.72 , -35338.92 , -120.57
+37.72 , -33571.97 , -114.73
+37.72 , -31805.03 , -108.87
+37.72 , -30038.08 , -102.99
+37.72 , -28271.13 , -97.08
+37.72 , -26504.19 , -91.15
+37.72 , -24737.24 , -85.20
+37.72 , -22970.30 , -79.23
+37.72 , -21203.35 , -73.23
+37.72 , -19436.40 , -67.21
+37.72 , -17669.46 , -61.17
+37.72 , -15902.51 , -55.10
+37.72 , -14135.57 , -49.01
+37.72 , -12368.62 , -42.90
+37.72 , -10601.68 , -36.77
+37.72 , -8834.73 , -30.61
+37.72 , -7067.78 , -24.43
+37.72 , -5300.84 , -18.23
+37.72 , -3533.89 , -12.01
+37.72 , -1766.95 , -5.76
+37.72 , -353.39 , -0.66
+37.72 , 306.44 , 1.84
+37.72 , 1532.18 , 7.35
+37.72 , 3064.36 , 14.22
+37.72 , 4596.53 , 21.11
+37.72 , 6128.71 , 28.02
+37.72 , 7660.89 , 34.96
+37.72 , 9193.07 , 41.92
+37.72 , 10725.24 , 48.90
+37.72 , 12257.42 , 55.90
+37.72 , 13789.60 , 62.93
+37.72 , 15321.78 , 69.98
+37.72 , 16853.96 , 77.05
+37.72 , 18386.13 , 84.15
+37.72 , 19918.31 , 91.27
+37.72 , 21450.49 , 98.41
+37.72 , 22982.67 , 105.58
+37.72 , 24514.85 , 112.76
+37.72 , 26047.02 , 119.97
+37.72 , 27579.20 , 127.21
+37.72 , 29111.38 , 134.46
+37.72 , 30643.56 , 141.74
+56.59 , -35338.92 , -182.44
+56.59 , -33571.97 , -173.55
+56.59 , -31805.03 , -164.62
+56.59 , -30038.08 , -155.67
+56.59 , -28271.13 , -146.69
+56.59 , -26504.19 , -137.68
+56.59 , -24737.24 , -128.65
+56.59 , -22970.30 , -119.58
+56.59 , -21203.35 , -110.49
+56.59 , -19436.40 , -101.36
+56.59 , -17669.46 , -92.21
+56.59 , -15902.51 , -83.03
+56.59 , -14135.57 , -73.82
+56.59 , -12368.62 , -64.58
+56.59 , -10601.68 , -55.31
+56.59 , -8834.73 , -46.02
+56.59 , -7067.78 , -36.70
+56.59 , -5300.84 , -27.34
+56.59 , -3533.89 , -17.96
+56.59 , -1766.95 , -8.54
+56.59 , -353.39 , -0.79
+56.59 , 306.44 , 2.86
+56.59 , 1532.18 , 11.12
+56.59 , 3064.36 , 21.39
+56.59 , 4596.53 , 31.68
+56.59 , 6128.71 , 41.99
+56.59 , 7660.89 , 52.34
+56.59 , 9193.07 , 62.71
+56.59 , 10725.24 , 73.12
+56.59 , 12257.42 , 83.55
+56.59 , 13789.60 , 94.01
+56.59 , 15321.78 , 104.50
+56.59 , 16853.96 , 115.02
+56.59 , 18386.13 , 125.57
+56.59 , 19918.31 , 136.15
+56.59 , 21450.49 , 146.76
+56.59 , 22982.67 , 157.40
+56.59 , 24514.85 , 168.06
+56.59 , 26047.02 , 178.76
+56.59 , 27579.20 , 189.48
+56.59 , 29111.38 , 200.23
+56.59 , 30643.56 , 211.02
+75.45 , -35338.92 , -243.71
+75.45 , -33571.97 , -231.81
+75.45 , -31805.03 , -219.87
+75.45 , -30038.08 , -207.89
+75.45 , -28271.13 , -195.88
+75.45 , -26504.19 , -183.83
+75.45 , -24737.24 , -171.74
+75.45 , -22970.30 , -159.61
+75.45 , -21203.35 , -147.45
+75.45 , -19436.40 , -135.25
+75.45 , -17669.46 , -123.01
+75.45 , -15902.51 , -110.74
+75.45 , -14135.57 , -98.43
+75.45 , -12368.62 , -86.08
+75.45 , -10601.68 , -73.70
+75.45 , -8834.73 , -61.27
+75.45 , -7067.78 , -48.82
+75.45 , -5300.84 , -36.32
+75.45 , -3533.89 , -23.78
+75.45 , -1766.95 , -11.19
+75.45 , -353.39 , -0.63
+75.45 , 306.44 , 3.98
+75.45 , 1532.18 , 15.01
+75.45 , 3064.36 , 28.68
+75.45 , 4596.53 , 42.37
+75.45 , 6128.71 , 56.10
+75.45 , 7660.89 , 69.87
+75.45 , 9193.07 , 83.67
+75.45 , 10725.24 , 97.52
+75.45 , 12257.42 , 111.40
+75.45 , 13789.60 , 125.31
+75.45 , 15321.78 , 139.27
+75.45 , 16853.96 , 153.26
+75.45 , 18386.13 , 167.29
+75.45 , 19918.31 , 181.36
+75.45 , 21450.49 , 195.46
+75.45 , 22982.67 , 209.61
+75.45 , 24514.85 , 223.79
+75.45 , 26047.02 , 238.01
+75.45 , 27579.20 , 252.26
+75.45 , 29111.38 , 266.56
+75.45 , 30643.56 , 280.89
+94.31 , -35338.92 , -304.37
+94.31 , -33571.97 , -289.50
+94.31 , -31805.03 , -274.59
+94.31 , -30038.08 , -259.63
+94.31 , -28271.13 , -244.61
+94.31 , -26504.19 , -229.56
+94.31 , -24737.24 , -214.45
+94.31 , -22970.30 , -199.30
+94.31 , -21203.35 , -184.10
+94.31 , -19436.40 , -168.85
+94.31 , -17669.46 , -153.55
+94.31 , -15902.51 , -138.20
+94.31 , -14135.57 , -122.81
+94.31 , -12368.62 , -107.37
+94.31 , -10601.68 , -91.88
+94.31 , -8834.73 , -76.35
+94.31 , -7067.78 , -60.76
+94.31 , -5300.84 , -45.13
+94.31 , -3533.89 , -29.44
+94.31 , -1766.95 , -13.67
+94.31 , -353.39 , 0.00
+94.31 , 306.44 , 5.21
+94.31 , 1532.18 , 19.04
+94.31 , 3064.36 , 36.13
+94.31 , 4596.53 , 53.24
+94.31 , 6128.71 , 70.39
+94.31 , 7660.89 , 87.59
+94.31 , 9193.07 , 104.83
+94.31 , 10725.24 , 122.13
+94.31 , 12257.42 , 139.47
+94.31 , 13789.60 , 156.87
+94.31 , 15321.78 , 174.31
+94.31 , 16853.96 , 191.80
+94.31 , 18386.13 , 209.33
+94.31 , 19918.31 , 226.92
+94.31 , 21450.49 , 244.56
+94.31 , 22982.67 , 262.24
+94.31 , 24514.85 , 279.97
+94.31 , 26047.02 , 297.76
+94.31 , 27579.20 , 315.58
+94.31 , 29111.38 , 333.46
+94.31 , 30643.56 , 351.39
+113.17 , -35338.92 , -364.37
+113.17 , -33571.97 , -346.59
+113.17 , -31805.03 , -328.74
+113.17 , -30038.08 , -310.84
+113.17 , -28271.13 , -292.87
+113.17 , -26504.19 , -274.84
+113.17 , -24737.24 , -256.75
+113.17 , -22970.30 , -238.60
+113.17 , -21203.35 , -220.39
+113.17 , -19436.40 , -202.12
+113.17 , -17669.46 , -183.79
+113.17 , -15902.51 , -165.40
+113.17 , -14135.57 , -146.94
+113.17 , -12368.62 , -128.43
+113.17 , -10601.68 , -109.85
+113.17 , -8834.73 , -91.21
+113.17 , -7067.78 , -72.51
+113.17 , -5300.84 , -53.75
+113.17 , -3533.89 , -34.91
+113.17 , -1766.95 , -15.95
+113.17 , -353.39 , 0.00
+113.17 , 306.44 , 6.58
+113.17 , 1532.18 , 23.25
+113.17 , 3064.36 , 43.76
+113.17 , 4596.53 , 64.29
+113.17 , 6128.71 , 84.87
+113.17 , 7660.89 , 105.52
+113.17 , 9193.07 , 126.22
+113.17 , 10725.24 , 146.98
+113.17 , 12257.42 , 167.81
+113.17 , 13789.60 , 188.70
+113.17 , 15321.78 , 209.65
+113.17 , 16853.96 , 230.66
+113.17 , 18386.13 , 251.73
+113.17 , 19918.31 , 272.87
+113.17 , 21450.49 , 294.07
+113.17 , 22982.67 , 315.33
+113.17 , 24514.85 , 336.65
+113.17 , 26047.02 , 358.03
+113.17 , 27579.20 , 379.47
+113.17 , 29111.38 , 400.98
+113.17 , 30643.56 , 422.54
+132.03 , -35338.92 , -423.69
+132.03 , -33571.97 , -403.04
+132.03 , -31805.03 , -382.31
+132.03 , -30038.08 , -361.50
+132.03 , -28271.13 , -340.62
+132.03 , -26504.19 , -319.66
+132.03 , -24737.24 , -298.62
+132.03 , -22970.30 , -277.51
+132.03 , -21203.35 , -256.31
+132.03 , -19436.40 , -235.05
+132.03 , -17669.46 , -213.70
+132.03 , -15902.51 , -192.28
+132.03 , -14135.57 , -170.79
+132.03 , -12368.62 , -149.21
+132.03 , -10601.68 , -127.57
+132.03 , -8834.73 , -105.84
+132.03 , -7067.78 , -84.03
+132.03 , -5300.84 , -62.14
+132.03 , -3533.89 , -40.16
+132.03 , -1766.95 , -18.00
+132.03 , -353.39 , 0.00
+132.03 , 306.44 , 8.09
+132.03 , 1532.18 , 27.64
+132.03 , 3064.36 , 51.59
+132.03 , 4596.53 , 75.56
+132.03 , 6128.71 , 99.58
+132.03 , 7660.89 , 123.68
+132.03 , 9193.07 , 147.86
+132.03 , 10725.24 , 172.10
+132.03 , 12257.42 , 196.43
+132.03 , 13789.60 , 220.84
+132.03 , 15321.78 , 245.32
+132.03 , 16853.96 , 269.88
+132.03 , 18386.13 , 294.51
+132.03 , 19918.31 , 319.23
+132.03 , 21450.49 , 344.02
+132.03 , 22982.67 , 368.89
+132.03 , 24514.85 , 393.83
+132.03 , 26047.02 , 418.85
+132.03 , 27579.20 , 443.95
+132.03 , 29111.38 , 469.13
+132.03 , 30643.56 , 494.38
+150.90 , -35338.92 , -482.31
+150.90 , -33571.97 , -458.83
+150.90 , -31805.03 , -435.26
+150.90 , -30038.08 , -411.59
+150.90 , -28271.13 , -387.83
+150.90 , -26504.19 , -363.97
+150.90 , -24737.24 , -340.02
+150.90 , -22970.30 , -315.97
+150.90 , -21203.35 , -291.83
+150.90 , -19436.40 , -267.59
+150.90 , -17669.46 , -243.26
+150.90 , -15902.51 , -218.84
+150.90 , -14135.57 , -194.32
+150.90 , -12368.62 , -169.71
+150.90 , -10601.68 , -145.00
+150.90 , -8834.73 , -120.19
+150.90 , -7067.78 , -95.29
+150.90 , -5300.84 , -70.28
+150.90 , -3533.89 , -45.14
+150.90 , -1766.95 , -19.76
+150.90 , -353.39 , 0.00
+150.90 , 306.44 , 9.76
+150.90 , 1532.18 , 32.25
+150.90 , 3064.36 , 59.66
+150.90 , 4596.53 , 87.07
+150.90 , 6128.71 , 114.55
+150.90 , 7660.89 , 142.11
+150.90 , 9193.07 , 169.77
+150.90 , 10725.24 , 197.52
+150.90 , 12257.42 , 225.37
+150.90 , 13789.60 , 253.31
+150.90 , 15321.78 , 281.34
+150.90 , 16853.96 , 309.47
+150.90 , 18386.13 , 337.70
+150.90 , 19918.31 , 366.02
+150.90 , 21450.49 , 394.44
+150.90 , 22982.67 , 422.95
+150.90 , 24514.85 , 451.56
+150.90 , 26047.02 , 480.26
+150.90 , 27579.20 , 509.05
+150.90 , 29111.38 , 537.94
+150.90 , 30643.56 , 566.93
+169.76 , -35338.92 , -540.17
+169.76 , -33571.97 , -513.92
+169.76 , -31805.03 , -487.55
+169.76 , -30038.08 , -461.06
+169.76 , -28271.13 , -434.46
+169.76 , -26504.19 , -407.75
+169.76 , -24737.24 , -380.92
+169.76 , -22970.30 , -353.97
+169.76 , -21203.35 , -326.91
+169.76 , -19436.40 , -299.73
+169.76 , -17669.46 , -272.44
+169.76 , -15902.51 , -245.03
+169.76 , -14135.57 , -217.51
+169.76 , -12368.62 , -189.87
+169.76 , -10601.68 , -162.12
+169.76 , -8834.73 , -134.25
+169.76 , -7067.78 , -106.26
+169.76 , -5300.84 , -78.13
+169.76 , -3533.89 , -49.84
+169.76 , -1766.95 , -21.19
+169.76 , -353.39 , 0.00
+169.76 , 306.44 , 11.59
+169.76 , 1532.18 , 37.10
+169.76 , 3064.36 , 67.98
+169.76 , 4596.53 , 98.85
+169.76 , 6128.71 , 129.79
+169.76 , 7660.89 , 160.84
+169.76 , 9193.07 , 191.99
+169.76 , 10725.24 , 223.26
+169.76 , 12257.42 , 254.64
+169.76 , 13789.60 , 286.14
+169.76 , 15321.78 , 317.75
+169.76 , 16853.96 , 349.48
+169.76 , 18386.13 , 381.32
+169.76 , 19918.31 , 413.28
+169.76 , 21450.49 , 445.36
+169.76 , 22982.67 , 477.54
+169.76 , 24514.85 , 509.85
+169.76 , 26047.02 , 542.27
+169.76 , 27579.20 , 574.80
+169.76 , 29111.38 , 607.45
+169.76 , 30643.56 , 640.21
+188.62 , -35338.92 , -597.26
+188.62 , -33571.97 , -568.28
+188.62 , -31805.03 , -539.16
+188.62 , -30038.08 , -509.90
+188.62 , -28271.13 , -480.50
+188.62 , -26504.19 , -450.96
+188.62 , -24737.24 , -421.28
+188.62 , -22970.30 , -391.47
+188.62 , -21203.35 , -361.52
+188.62 , -19436.40 , -331.43
+188.62 , -17669.46 , -301.20
+188.62 , -15902.51 , -270.83
+188.62 , -14135.57 , -240.33
+188.62 , -12368.62 , -209.68
+188.62 , -10601.68 , -178.90
+188.62 , -8834.73 , -147.97
+188.62 , -7067.78 , -116.90
+188.62 , -5300.84 , -85.66
+188.62 , -3533.89 , -54.21
+188.62 , -1766.95 , -22.23
+188.62 , -353.39 , 0.00
+188.62 , 306.44 , 13.60
+188.62 , 1532.18 , 42.20
+188.62 , 3064.36 , 76.58
+188.62 , 4596.53 , 110.92
+188.62 , 6128.71 , 145.34
+188.62 , 7660.89 , 179.88
+188.62 , 9193.07 , 214.55
+188.62 , 10725.24 , 249.35
+188.62 , 12257.42 , 284.29
+188.62 , 13789.60 , 319.36
+188.62 , 15321.78 , 354.57
+188.62 , 16853.96 , 389.92
+188.62 , 18386.13 , 425.41
+188.62 , 19918.31 , 461.03
+188.62 , 21450.49 , 496.79
+188.62 , 22982.67 , 532.69
+188.62 , 24514.85 , 568.73
+188.62 , 26047.02 , 604.90
+188.62 , 27579.20 , 641.21
+188.62 , 29111.38 , 677.66
+188.62 , 30643.56 , 714.24
+207.48 , -35338.92 , -653.54
+207.48 , -33571.97 , -621.88
+207.48 , -31805.03 , -590.05
+207.48 , -30038.08 , -558.06
+207.48 , -28271.13 , -525.90
+207.48 , -26504.19 , -493.58
+207.48 , -24737.24 , -461.09
+207.48 , -22970.30 , -428.44
+207.48 , -21203.35 , -395.63
+207.48 , -19436.40 , -362.65
+207.48 , -17669.46 , -329.51
+207.48 , -15902.51 , -296.21
+207.48 , -14135.57 , -262.74
+207.48 , -12368.62 , -229.11
+207.48 , -10601.68 , -195.31
+207.48 , -8834.73 , -161.34
+207.48 , -7067.78 , -127.18
+207.48 , -5300.84 , -92.83
+207.48 , -3533.89 , -58.20
+207.48 , -1766.95 , -22.82
+207.48 , -353.39 , 0.00
+207.48 , 306.44 , 15.79
+207.48 , 1532.18 , 47.58
+207.48 , 3064.36 , 85.48
+207.48 , 4596.53 , 123.30
+207.48 , 6128.71 , 161.22
+207.48 , 7660.89 , 199.26
+207.48 , 9193.07 , 237.46
+207.48 , 10725.24 , 275.81
+207.48 , 12257.42 , 314.32
+207.48 , 13789.60 , 352.99
+207.48 , 15321.78 , 391.83
+207.48 , 16853.96 , 430.82
+207.48 , 18386.13 , 469.98
+207.48 , 19918.31 , 509.30
+207.48 , 21450.49 , 548.78
+207.48 , 22982.67 , 588.42
+207.48 , 24514.85 , 628.23
+207.48 , 26047.02 , 668.20
+207.48 , 27579.20 , 708.32
+207.48 , 29111.38 , 748.61
+207.48 , 30643.56 , 789.06
+226.34 , -35338.92 , -708.97
+226.34 , -33571.97 , -674.68
+226.34 , -31805.03 , -640.19
+226.34 , -30038.08 , -605.51
+226.34 , -28271.13 , -570.63
+226.34 , -26504.19 , -535.56
+226.34 , -24737.24 , -500.30
+226.34 , -22970.30 , -464.85
+226.34 , -21203.35 , -429.21
+226.34 , -19436.40 , -393.37
+226.34 , -17669.46 , -357.35
+226.34 , -15902.51 , -321.13
+226.34 , -14135.57 , -284.71
+226.34 , -12368.62 , -248.11
+226.34 , -10601.68 , -211.31
+226.34 , -8834.73 , -174.30
+226.34 , -7067.78 , -137.08
+226.34 , -5300.84 , -99.61
+226.34 , -3533.89 , -61.78
+226.34 , -1766.95 , -22.86
+226.34 , -353.39 , 0.00
+226.34 , 306.44 , 18.17
+226.34 , 1532.18 , 53.24
+226.34 , 3064.36 , 94.71
+226.34 , 4596.53 , 136.03
+226.34 , 6128.71 , 177.45
+226.34 , 7660.89 , 219.01
+226.34 , 9193.07 , 260.75
+226.34 , 10725.24 , 302.67
+226.34 , 12257.42 , 344.78
+226.34 , 13789.60 , 387.07
+226.34 , 15321.78 , 429.54
+226.34 , 16853.96 , 472.21
+226.34 , 18386.13 , 515.06
+226.34 , 19918.31 , 558.11
+226.34 , 21450.49 , 601.34
+226.34 , 22982.67 , 644.76
+226.34 , 24514.85 , 688.37
+226.34 , 26047.02 , 732.17
+226.34 , 27579.20 , 776.15
+226.34 , 29111.38 , 820.33
+226.34 , 30643.56 , 864.69
+245.21 , -35338.92 , -763.53
+245.21 , -33571.97 , -726.65
+245.21 , -31805.03 , -689.55
+245.21 , -30038.08 , -652.22
+245.21 , -28271.13 , -614.67
+245.21 , -26504.19 , -576.89
+245.21 , -24737.24 , -538.89
+245.21 , -22970.30 , -500.67
+245.21 , -21203.35 , -462.22
+245.21 , -19436.40 , -423.56
+245.21 , -17669.46 , -384.67
+245.21 , -15902.51 , -345.56
+245.21 , -14135.57 , -306.22
+245.21 , -12368.62 , -266.66
+245.21 , -10601.68 , -226.86
+245.21 , -8834.73 , -186.83
+245.21 , -7067.78 , -146.54
+245.21 , -5300.84 , -105.95
+245.21 , -3533.89 , -64.90
+245.21 , -1766.95 , -22.24
+245.21 , -353.39 , 0.00
+245.21 , 306.44 , 20.74
+245.21 , 1532.18 , 59.20
+245.21 , 3064.36 , 104.27
+245.21 , 4596.53 , 149.12
+245.21 , 6128.71 , 194.05
+245.21 , 7660.89 , 239.16
+245.21 , 9193.07 , 284.45
+245.21 , 10725.24 , 329.96
+245.21 , 12257.42 , 375.67
+245.21 , 13789.60 , 421.60
+245.21 , 15321.78 , 467.75
+245.21 , 16853.96 , 514.11
+245.21 , 18386.13 , 560.69
+245.21 , 19918.31 , 607.48
+245.21 , 21450.49 , 654.50
+245.21 , 22982.67 , 701.73
+245.21 , 24514.85 , 749.18
+245.21 , 26047.02 , 796.84
+245.21 , 27579.20 , 844.73
+245.21 , 29111.38 , 892.83
+245.21 , 30643.56 , 941.14
+264.07 , -35338.92 , -817.17
+264.07 , -33571.97 , -777.76
+264.07 , -31805.03 , -738.08
+264.07 , -30038.08 , -698.15
+264.07 , -28271.13 , -657.96
+264.07 , -26504.19 , -617.52
+264.07 , -24737.24 , -576.82
+264.07 , -22970.30 , -535.86
+264.07 , -21203.35 , -494.65
+264.07 , -19436.40 , -453.18
+264.07 , -17669.46 , -411.45
+264.07 , -15902.51 , -369.47
+264.07 , -14135.57 , -327.22
+264.07 , -12368.62 , -284.72
+264.07 , -10601.68 , -241.95
+264.07 , -8834.73 , -198.90
+264.07 , -7067.78 , -155.54
+264.07 , -5300.84 , -111.82
+264.07 , -3533.89 , -67.51
+264.07 , -1766.95 , -20.80
+264.07 , -353.39 , 0.00
+264.07 , 306.44 , 23.52
+264.07 , 1532.18 , 65.48
+264.07 , 3064.36 , 114.20
+264.07 , 4596.53 , 162.59
+264.07 , 6128.71 , 211.06
+264.07 , 7660.89 , 259.72
+264.07 , 9193.07 , 308.59
+264.07 , 10725.24 , 357.69
+264.07 , 12257.42 , 407.04
+264.07 , 13789.60 , 456.62
+264.07 , 15321.78 , 506.46
+264.07 , 16853.96 , 556.54
+264.07 , 18386.13 , 606.87
+264.07 , 19918.31 , 657.45
+264.07 , 21450.49 , 708.28
+264.07 , 22982.67 , 759.35
+264.07 , 24514.85 , 810.68
+264.07 , 26047.02 , 862.25
+264.07 , 27579.20 , 914.07
+264.07 , 29111.38 , 966.13
+264.07 , 30643.56 , 1018.44
+282.93 , -35338.92 , -869.86
+282.93 , -33571.97 , -827.96
+282.93 , -31805.03 , -785.77
+282.93 , -30038.08 , -743.28
+282.93 , -28271.13 , -700.50
+282.93 , -26504.19 , -657.42
+282.93 , -24737.24 , -614.05
+282.93 , -22970.30 , -570.39
+282.93 , -21203.35 , -526.44
+282.93 , -19436.40 , -482.19
+282.93 , -17669.46 , -437.65
+282.93 , -15902.51 , -392.82
+282.93 , -14135.57 , -347.69
+282.93 , -12368.62 , -302.26
+282.93 , -10601.68 , -256.52
+282.93 , -8834.73 , -210.46
+282.93 , -7067.78 , -164.04
+282.93 , -5300.84 , -117.17
+282.93 , -3533.89 , -69.54
+282.93 , -1766.95 , -18.27
+282.93 , -353.39 , 0.00
+282.93 , 306.44 , 26.49
+282.93 , 1532.18 , 72.10
+282.93 , 3064.36 , 124.50
+282.93 , 4596.53 , 176.46
+282.93 , 6128.71 , 228.49
+282.93 , 7660.89 , 280.71
+282.93 , 9193.07 , 333.18
+282.93 , 10725.24 , 385.90
+282.93 , 12257.42 , 438.89
+282.93 , 13789.60 , 492.16
+282.93 , 15321.78 , 545.71
+282.93 , 16853.96 , 599.54
+282.93 , 18386.13 , 653.64
+282.93 , 19918.31 , 708.03
+282.93 , 21450.49 , 762.71
+282.93 , 22982.67 , 817.66
+282.93 , 24514.85 , 872.89
+282.93 , 26047.02 , 928.41
+282.93 , 27579.20 , 984.20
+282.93 , 29111.38 , 1040.27
+282.93 , 30643.56 , 1096.63
+301.79 , -35338.92 , -921.56
+301.79 , -33571.97 , -877.23
+301.79 , -31805.03 , -832.56
+301.79 , -30038.08 , -787.56
+301.79 , -28271.13 , -742.22
+301.79 , -26504.19 , -696.56
+301.79 , -24737.24 , -650.56
+301.79 , -22970.30 , -604.23
+301.79 , -21203.35 , -557.56
+301.79 , -19436.40 , -510.57
+301.79 , -17669.46 , -463.24
+301.79 , -15902.51 , -415.58
+301.79 , -14135.57 , -367.58
+301.79 , -12368.62 , -319.24
+301.79 , -10601.68 , -270.55
+301.79 , -8834.73 , -221.48
+301.79 , -7067.78 , -171.99
+301.79 , -5300.84 , -121.95
+301.79 , -3533.89 , -70.93
+301.79 , -1766.95 , -14.10
+301.79 , -353.39 , 0.00
+301.79 , 306.44 , 29.68
+301.79 , 1532.18 , 79.05
+301.79 , 3064.36 , 135.20
+301.79 , 4596.53 , 190.76
+301.79 , 6128.71 , 246.36
+301.79 , 7660.89 , 302.17
+301.79 , 9193.07 , 358.24
+301.79 , 10725.24 , 414.60
+301.79 , 12257.42 , 471.27
+301.79 , 13789.60 , 528.24
+301.79 , 15321.78 , 585.52
+301.79 , 16853.96 , 643.12
+301.79 , 18386.13 , 701.03
+301.79 , 19918.31 , 759.26
+301.79 , 21450.49 , 817.80
+301.79 , 22982.67 , 876.66
+301.79 , 24514.85 , 935.84
+301.79 , 26047.02 , 995.34
+301.79 , 27579.20 , 1055.15
+301.79 , 29111.38 , 1115.27
+301.79 , 30643.56 , 1175.71
+320.65 , -35338.92 , -972.24
+320.65 , -33571.97 , -925.52
+320.65 , -31805.03 , -878.43
+320.65 , -30038.08 , -830.96
+320.65 , -28271.13 , -783.11
+320.65 , -26504.19 , -734.89
+320.65 , -24737.24 , -686.30
+320.65 , -22970.30 , -637.33
+320.65 , -21203.35 , -587.99
+320.65 , -19436.40 , -538.28
+320.65 , -17669.46 , -488.19
+320.65 , -15902.51 , -437.72
+320.65 , -14135.57 , -386.87
+320.65 , -12368.62 , -335.63
+320.65 , -10601.68 , -283.99
+320.65 , -8834.73 , -231.92
+320.65 , -7067.78 , -179.35
+320.65 , -5300.84 , -126.12
+320.65 , -3533.89 , -71.60
+320.65 , -1766.95 , -6.45
+320.65 , -353.39 , 0.00
+320.65 , 306.44 , 33.08
+320.65 , 1532.18 , 86.37
+320.65 , 3064.36 , 146.31
+320.65 , 4596.53 , 205.50
+320.65 , 6128.71 , 264.70
+320.65 , 7660.89 , 324.11
+320.65 , 9193.07 , 383.81
+320.65 , 10725.24 , 443.83
+320.65 , 12257.42 , 504.18
+320.65 , 13789.60 , 564.87
+320.65 , 15321.78 , 625.91
+320.65 , 16853.96 , 687.30
+320.65 , 18386.13 , 749.05
+320.65 , 19918.31 , 811.14
+320.65 , 21450.49 , 873.59
+320.65 , 22982.67 , 936.40
+320.65 , 24514.85 , 999.56
+320.65 , 26047.02 , 1063.07
+320.65 , 27579.20 , 1126.93
+320.65 , 29111.38 , 1191.14
+320.65 , 30643.56 , 1255.71
+339.52 , -35338.92 , -1021.86
+339.52 , -33571.97 , -972.81
+339.52 , -31805.03 , -923.33
+339.52 , -30038.08 , -873.44
+339.52 , -28271.13 , -823.13
+339.52 , -26504.19 , -772.39
+339.52 , -24737.24 , -721.24
+339.52 , -22970.30 , -669.67
+339.52 , -21203.35 , -617.68
+339.52 , -19436.40 , -565.27
+339.52 , -17669.46 , -512.45
+339.52 , -15902.51 , -459.19
+339.52 , -14135.57 , -405.51
+339.52 , -12368.62 , -351.39
+339.52 , -10601.68 , -296.81
+339.52 , -8834.73 , -241.73
+339.52 , -7067.78 , -186.07
+339.52 , -5300.84 , -129.61
+339.52 , -3533.89 , -71.46
+339.52 , -1766.95 , 0.00
+339.52 , -353.39 , 0.00
+339.52 , 306.44 , 36.70
+339.52 , 1532.18 , 94.04
+339.52 , 3064.36 , 157.85
+339.52 , 4596.53 , 220.70
+339.52 , 6128.71 , 283.52
+339.52 , 7660.89 , 346.56
+339.52 , 9193.07 , 409.90
+339.52 , 10725.24 , 473.59
+339.52 , 12257.42 , 537.65
+339.52 , 13789.60 , 602.09
+339.52 , 15321.78 , 666.91
+339.52 , 16853.96 , 732.12
+339.52 , 18386.13 , 797.72
+339.52 , 19918.31 , 863.72
+339.52 , 21450.49 , 930.10
+339.52 , 22982.67 , 996.88
+339.52 , 24514.85 , 1064.05
+339.52 , 26047.02 , 1131.62
+339.52 , 27579.20 , 1199.57
+339.52 , 29111.38 , 1267.92
+339.52 , 30643.56 , 1336.65
+358.38 , -35338.92 , -1070.37
+358.38 , -33571.97 , -1019.04
+358.38 , -31805.03 , -967.24
+358.38 , -30038.08 , -914.96
+358.38 , -28271.13 , -862.23
+358.38 , -26504.19 , -809.02
+358.38 , -24737.24 , -755.35
+358.38 , -22970.30 , -701.21
+358.38 , -21203.35 , -646.60
+358.38 , -19436.40 , -591.53
+358.38 , -17669.46 , -535.99
+358.38 , -15902.51 , -479.97
+358.38 , -14135.57 , -423.47
+358.38 , -12368.62 , -366.48
+358.38 , -10601.68 , -308.96
+358.38 , -8834.73 , -250.88
+358.38 , -7067.78 , -192.11
+358.38 , -5300.84 , -132.36
+358.38 , -3533.89 , -70.38
+358.38 , -1766.95 , 0.00
+358.38 , -353.39 , 0.00
+358.38 , 306.44 , 40.53
+358.38 , 1532.18 , 102.10
+358.38 , 3064.36 , 169.83
+358.38 , 4596.53 , 236.37
+358.38 , 6128.71 , 302.84
+358.38 , 7660.89 , 369.53
+358.38 , 9193.07 , 436.54
+358.38 , 10725.24 , 503.92
+358.38 , 12257.42 , 571.71
+358.38 , 13789.60 , 639.91
+358.38 , 15321.78 , 708.54
+358.38 , 16853.96 , 777.59
+358.38 , 18386.13 , 847.08
+358.38 , 19918.31 , 917.00
+358.38 , 21450.49 , 987.35
+358.38 , 22982.67 , 1058.14
+358.38 , 24514.85 , 1129.36
+358.38 , 26047.02 , 1201.01
+358.38 , 27579.20 , 1273.09
+358.38 , 29111.38 , 1345.61
+358.38 , 30643.56 , 1418.56
+377.24 , -35338.92 , -1117.74
+377.24 , -33571.97 , -1064.18
+377.24 , -31805.03 , -1010.10
+377.24 , -30038.08 , -955.49
+377.24 , -28271.13 , -900.37
+377.24 , -26504.19 , -844.73
+377.24 , -24737.24 , -788.58
+377.24 , -22970.30 , -731.90
+377.24 , -21203.35 , -674.71
+377.24 , -19436.40 , -617.00
+377.24 , -17669.46 , -558.77
+377.24 , -15902.51 , -500.01
+377.24 , -14135.57 , -440.71
+377.24 , -12368.62 , -380.85
+377.24 , -10601.68 , -320.40
+377.24 , -8834.73 , -259.31
+377.24 , -7067.78 , -197.41
+377.24 , -5300.84 , -134.30
+377.24 , -3533.89 , -68.24
+377.24 , -1766.95 , 0.00
+377.24 , -353.39 , 0.00
+377.24 , 306.44 , 44.59
+377.24 , 1532.18 , 110.53
+377.24 , 3064.36 , 182.27
+377.24 , 4596.53 , 252.55
+377.24 , 6128.71 , 322.69
+377.24 , 7660.89 , 393.04
+377.24 , 9193.07 , 463.74
+377.24 , 10725.24 , 534.84
+377.24 , 12257.42 , 606.37
+377.24 , 13789.60 , 678.37
+377.24 , 15321.78 , 750.82
+377.24 , 16853.96 , 823.74
+377.24 , 18386.13 , 897.14
+377.24 , 19918.31 , 971.01
+377.24 , 21450.49 , 1045.36
+377.24 , 22982.67 , 1120.19
+377.24 , 24514.85 , 1195.49
+377.24 , 26047.02 , 1271.27
+377.24 , 27579.20 , 1347.52
+377.24 , 29111.38 , 1424.25
+377.24 , 30643.56 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_2.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_3.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..07feb55aeb84a3946955f362d5131493fe83d565
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -11414.26 , 0.00
+0.00 , -10843.55 , 0.00
+0.00 , -10272.84 , 0.00
+0.00 , -9702.12 , 0.00
+0.00 , -9131.41 , 0.00
+0.00 , -8560.70 , 0.00
+0.00 , -7989.99 , -0.13
+0.00 , -7419.27 , -0.66
+0.00 , -6848.56 , -0.98
+0.00 , -6277.85 , -1.19
+0.00 , -5707.13 , -1.32
+0.00 , -5136.42 , -1.38
+0.00 , -4565.71 , -1.39
+0.00 , -3994.99 , -1.35
+0.00 , -3424.28 , -1.26
+0.00 , -2853.57 , -1.13
+0.00 , -2282.85 , -0.97
+0.00 , -1712.14 , -0.77
+0.00 , -1141.43 , -0.53
+0.00 , -570.71 , -0.27
+0.00 , -114.14 , -0.02
+0.00 , 103.14 , 0.13
+0.00 , 515.72 , 0.56
+0.00 , 1031.44 , 1.12
+0.00 , 1547.16 , 1.70
+0.00 , 2062.88 , 2.31
+0.00 , 2578.60 , 2.93
+0.00 , 3094.32 , 3.58
+0.00 , 3610.04 , 4.25
+0.00 , 4125.76 , 4.93
+0.00 , 4641.48 , 5.64
+0.00 , 5157.20 , 6.37
+0.00 , 5672.91 , 7.12
+0.00 , 6188.63 , 7.88
+0.00 , 6704.35 , 8.67
+0.00 , 7220.07 , 9.47
+0.00 , 7735.79 , 10.29
+0.00 , 8251.51 , 11.13
+0.00 , 8767.23 , 11.99
+0.00 , 9282.95 , 12.87
+0.00 , 9798.67 , 13.76
+0.00 , 10314.39 , 14.67
+5.72 , -11414.26 , 0.00
+5.72 , -10843.55 , 0.00
+5.72 , -10272.84 , 0.00
+5.72 , -9702.12 , 0.00
+5.72 , -9131.41 , 0.00
+5.72 , -8560.70 , 0.00
+5.72 , -7989.99 , -0.50
+5.72 , -7419.27 , -0.84
+5.72 , -6848.56 , -1.04
+5.72 , -6277.85 , -1.16
+5.72 , -5707.13 , -1.22
+5.72 , -5136.42 , -1.24
+5.72 , -4565.71 , -1.21
+5.72 , -3994.99 , -1.15
+5.72 , -3424.28 , -1.06
+5.72 , -2853.57 , -0.94
+5.72 , -2282.85 , -0.80
+5.72 , -1712.14 , -0.62
+5.72 , -1141.43 , -0.43
+5.72 , -570.71 , -0.21
+5.72 , -114.14 , -0.02
+5.72 , 103.14 , 0.10
+5.72 , 515.72 , 0.43
+5.72 , 1031.44 , 0.85
+5.72 , 1547.16 , 1.30
+5.72 , 2062.88 , 1.75
+5.72 , 2578.60 , 2.23
+5.72 , 3094.32 , 2.71
+5.72 , 3610.04 , 3.21
+5.72 , 4125.76 , 3.73
+5.72 , 4641.48 , 4.26
+5.72 , 5157.20 , 4.80
+5.72 , 5672.91 , 5.36
+5.72 , 6188.63 , 5.93
+5.72 , 6704.35 , 6.52
+5.72 , 7220.07 , 7.12
+5.72 , 7735.79 , 7.73
+5.72 , 8251.51 , 8.35
+5.72 , 8767.23 , 8.99
+5.72 , 9282.95 , 9.64
+5.72 , 9798.67 , 10.30
+5.72 , 10314.39 , 10.98
+57.21 , -11414.26 , -58.10
+57.21 , -10843.55 , -55.37
+57.21 , -10272.84 , -52.62
+57.21 , -9702.12 , -49.85
+57.21 , -9131.41 , -47.06
+57.21 , -8560.70 , -44.25
+57.21 , -7989.99 , -41.42
+57.21 , -7419.27 , -38.57
+57.21 , -6848.56 , -35.70
+57.21 , -6277.85 , -32.81
+57.21 , -5707.13 , -29.90
+57.21 , -5136.42 , -26.98
+57.21 , -4565.71 , -24.03
+57.21 , -3994.99 , -21.07
+57.21 , -3424.28 , -18.08
+57.21 , -2853.57 , -15.08
+57.21 , -2282.85 , -12.06
+57.21 , -1712.14 , -9.02
+57.21 , -1141.43 , -5.96
+57.21 , -570.71 , -2.88
+57.21 , -114.14 , -0.37
+57.21 , 103.14 , 0.90
+57.21 , 515.72 , 3.68
+57.21 , 1031.44 , 7.16
+57.21 , 1547.16 , 10.66
+57.21 , 2062.88 , 14.17
+57.21 , 2578.60 , 17.71
+57.21 , 3094.32 , 21.26
+57.21 , 3610.04 , 24.84
+57.21 , 4125.76 , 28.43
+57.21 , 4641.48 , 32.04
+57.21 , 5157.20 , 35.67
+57.21 , 5672.91 , 39.32
+57.21 , 6188.63 , 42.99
+57.21 , 6704.35 , 46.68
+57.21 , 7220.07 , 50.38
+57.21 , 7735.79 , 54.11
+57.21 , 8251.51 , 57.85
+57.21 , 8767.23 , 61.61
+57.21 , 9282.95 , 65.39
+57.21 , 9798.67 , 69.19
+57.21 , 10314.39 , 73.01
+114.41 , -11414.26 , -120.57
+114.41 , -10843.55 , -114.73
+114.41 , -10272.84 , -108.87
+114.41 , -9702.12 , -102.99
+114.41 , -9131.41 , -97.08
+114.41 , -8560.70 , -91.15
+114.41 , -7989.99 , -85.20
+114.41 , -7419.27 , -79.23
+114.41 , -6848.56 , -73.23
+114.41 , -6277.85 , -67.21
+114.41 , -5707.13 , -61.17
+114.41 , -5136.42 , -55.10
+114.41 , -4565.71 , -49.01
+114.41 , -3994.99 , -42.90
+114.41 , -3424.28 , -36.77
+114.41 , -2853.57 , -30.61
+114.41 , -2282.85 , -24.43
+114.41 , -1712.14 , -18.23
+114.41 , -1141.43 , -12.01
+114.41 , -570.71 , -5.76
+114.41 , -114.14 , -0.66
+114.41 , 103.14 , 1.84
+114.41 , 515.72 , 7.35
+114.41 , 1031.44 , 14.22
+114.41 , 1547.16 , 21.11
+114.41 , 2062.88 , 28.02
+114.41 , 2578.60 , 34.96
+114.41 , 3094.32 , 41.92
+114.41 , 3610.04 , 48.90
+114.41 , 4125.76 , 55.90
+114.41 , 4641.48 , 62.93
+114.41 , 5157.20 , 69.98
+114.41 , 5672.91 , 77.05
+114.41 , 6188.63 , 84.15
+114.41 , 6704.35 , 91.27
+114.41 , 7220.07 , 98.41
+114.41 , 7735.79 , 105.58
+114.41 , 8251.51 , 112.76
+114.41 , 8767.23 , 119.97
+114.41 , 9282.95 , 127.21
+114.41 , 9798.67 , 134.46
+114.41 , 10314.39 , 141.74
+171.62 , -11414.26 , -182.44
+171.62 , -10843.55 , -173.55
+171.62 , -10272.84 , -164.62
+171.62 , -9702.12 , -155.67
+171.62 , -9131.41 , -146.69
+171.62 , -8560.70 , -137.68
+171.62 , -7989.99 , -128.65
+171.62 , -7419.27 , -119.58
+171.62 , -6848.56 , -110.49
+171.62 , -6277.85 , -101.36
+171.62 , -5707.13 , -92.21
+171.62 , -5136.42 , -83.03
+171.62 , -4565.71 , -73.82
+171.62 , -3994.99 , -64.58
+171.62 , -3424.28 , -55.31
+171.62 , -2853.57 , -46.02
+171.62 , -2282.85 , -36.70
+171.62 , -1712.14 , -27.34
+171.62 , -1141.43 , -17.96
+171.62 , -570.71 , -8.54
+171.62 , -114.14 , -0.79
+171.62 , 103.14 , 2.86
+171.62 , 515.72 , 11.12
+171.62 , 1031.44 , 21.39
+171.62 , 1547.16 , 31.68
+171.62 , 2062.88 , 41.99
+171.62 , 2578.60 , 52.34
+171.62 , 3094.32 , 62.71
+171.62 , 3610.04 , 73.12
+171.62 , 4125.76 , 83.55
+171.62 , 4641.48 , 94.01
+171.62 , 5157.20 , 104.50
+171.62 , 5672.91 , 115.02
+171.62 , 6188.63 , 125.57
+171.62 , 6704.35 , 136.15
+171.62 , 7220.07 , 146.76
+171.62 , 7735.79 , 157.40
+171.62 , 8251.51 , 168.06
+171.62 , 8767.23 , 178.76
+171.62 , 9282.95 , 189.48
+171.62 , 9798.67 , 200.23
+171.62 , 10314.39 , 211.02
+228.82 , -11414.26 , -243.71
+228.82 , -10843.55 , -231.81
+228.82 , -10272.84 , -219.87
+228.82 , -9702.12 , -207.89
+228.82 , -9131.41 , -195.88
+228.82 , -8560.70 , -183.83
+228.82 , -7989.99 , -171.74
+228.82 , -7419.27 , -159.61
+228.82 , -6848.56 , -147.45
+228.82 , -6277.85 , -135.25
+228.82 , -5707.13 , -123.01
+228.82 , -5136.42 , -110.74
+228.82 , -4565.71 , -98.43
+228.82 , -3994.99 , -86.08
+228.82 , -3424.28 , -73.70
+228.82 , -2853.57 , -61.27
+228.82 , -2282.85 , -48.82
+228.82 , -1712.14 , -36.32
+228.82 , -1141.43 , -23.78
+228.82 , -570.71 , -11.19
+228.82 , -114.14 , -0.63
+228.82 , 103.14 , 3.98
+228.82 , 515.72 , 15.01
+228.82 , 1031.44 , 28.68
+228.82 , 1547.16 , 42.37
+228.82 , 2062.88 , 56.10
+228.82 , 2578.60 , 69.87
+228.82 , 3094.32 , 83.67
+228.82 , 3610.04 , 97.52
+228.82 , 4125.76 , 111.40
+228.82 , 4641.48 , 125.31
+228.82 , 5157.20 , 139.27
+228.82 , 5672.91 , 153.26
+228.82 , 6188.63 , 167.29
+228.82 , 6704.35 , 181.36
+228.82 , 7220.07 , 195.46
+228.82 , 7735.79 , 209.61
+228.82 , 8251.51 , 223.79
+228.82 , 8767.23 , 238.01
+228.82 , 9282.95 , 252.26
+228.82 , 9798.67 , 266.56
+228.82 , 10314.39 , 280.89
+286.03 , -11414.26 , -304.37
+286.03 , -10843.55 , -289.50
+286.03 , -10272.84 , -274.59
+286.03 , -9702.12 , -259.63
+286.03 , -9131.41 , -244.61
+286.03 , -8560.70 , -229.56
+286.03 , -7989.99 , -214.45
+286.03 , -7419.27 , -199.30
+286.03 , -6848.56 , -184.10
+286.03 , -6277.85 , -168.85
+286.03 , -5707.13 , -153.55
+286.03 , -5136.42 , -138.20
+286.03 , -4565.71 , -122.81
+286.03 , -3994.99 , -107.37
+286.03 , -3424.28 , -91.88
+286.03 , -2853.57 , -76.35
+286.03 , -2282.85 , -60.76
+286.03 , -1712.14 , -45.13
+286.03 , -1141.43 , -29.44
+286.03 , -570.71 , -13.67
+286.03 , -114.14 , 0.00
+286.03 , 103.14 , 5.21
+286.03 , 515.72 , 19.04
+286.03 , 1031.44 , 36.13
+286.03 , 1547.16 , 53.24
+286.03 , 2062.88 , 70.39
+286.03 , 2578.60 , 87.59
+286.03 , 3094.32 , 104.83
+286.03 , 3610.04 , 122.13
+286.03 , 4125.76 , 139.47
+286.03 , 4641.48 , 156.87
+286.03 , 5157.20 , 174.31
+286.03 , 5672.91 , 191.80
+286.03 , 6188.63 , 209.33
+286.03 , 6704.35 , 226.92
+286.03 , 7220.07 , 244.56
+286.03 , 7735.79 , 262.24
+286.03 , 8251.51 , 279.97
+286.03 , 8767.23 , 297.76
+286.03 , 9282.95 , 315.58
+286.03 , 9798.67 , 333.46
+286.03 , 10314.39 , 351.39
+343.23 , -11414.26 , -364.37
+343.23 , -10843.55 , -346.59
+343.23 , -10272.84 , -328.74
+343.23 , -9702.12 , -310.84
+343.23 , -9131.41 , -292.87
+343.23 , -8560.70 , -274.84
+343.23 , -7989.99 , -256.75
+343.23 , -7419.27 , -238.60
+343.23 , -6848.56 , -220.39
+343.23 , -6277.85 , -202.12
+343.23 , -5707.13 , -183.79
+343.23 , -5136.42 , -165.40
+343.23 , -4565.71 , -146.94
+343.23 , -3994.99 , -128.43
+343.23 , -3424.28 , -109.85
+343.23 , -2853.57 , -91.21
+343.23 , -2282.85 , -72.51
+343.23 , -1712.14 , -53.75
+343.23 , -1141.43 , -34.91
+343.23 , -570.71 , -15.95
+343.23 , -114.14 , 0.00
+343.23 , 103.14 , 6.58
+343.23 , 515.72 , 23.25
+343.23 , 1031.44 , 43.76
+343.23 , 1547.16 , 64.29
+343.23 , 2062.88 , 84.87
+343.23 , 2578.60 , 105.52
+343.23 , 3094.32 , 126.22
+343.23 , 3610.04 , 146.98
+343.23 , 4125.76 , 167.81
+343.23 , 4641.48 , 188.70
+343.23 , 5157.20 , 209.65
+343.23 , 5672.91 , 230.66
+343.23 , 6188.63 , 251.73
+343.23 , 6704.35 , 272.87
+343.23 , 7220.07 , 294.07
+343.23 , 7735.79 , 315.33
+343.23 , 8251.51 , 336.65
+343.23 , 8767.23 , 358.03
+343.23 , 9282.95 , 379.47
+343.23 , 9798.67 , 400.98
+343.23 , 10314.39 , 422.54
+400.44 , -11414.26 , -423.69
+400.44 , -10843.55 , -403.04
+400.44 , -10272.84 , -382.31
+400.44 , -9702.12 , -361.50
+400.44 , -9131.41 , -340.62
+400.44 , -8560.70 , -319.66
+400.44 , -7989.99 , -298.62
+400.44 , -7419.27 , -277.51
+400.44 , -6848.56 , -256.31
+400.44 , -6277.85 , -235.05
+400.44 , -5707.13 , -213.70
+400.44 , -5136.42 , -192.28
+400.44 , -4565.71 , -170.79
+400.44 , -3994.99 , -149.21
+400.44 , -3424.28 , -127.57
+400.44 , -2853.57 , -105.84
+400.44 , -2282.85 , -84.03
+400.44 , -1712.14 , -62.14
+400.44 , -1141.43 , -40.16
+400.44 , -570.71 , -18.00
+400.44 , -114.14 , 0.00
+400.44 , 103.14 , 8.09
+400.44 , 515.72 , 27.64
+400.44 , 1031.44 , 51.59
+400.44 , 1547.16 , 75.56
+400.44 , 2062.88 , 99.58
+400.44 , 2578.60 , 123.68
+400.44 , 3094.32 , 147.86
+400.44 , 3610.04 , 172.10
+400.44 , 4125.76 , 196.43
+400.44 , 4641.48 , 220.84
+400.44 , 5157.20 , 245.32
+400.44 , 5672.91 , 269.88
+400.44 , 6188.63 , 294.51
+400.44 , 6704.35 , 319.23
+400.44 , 7220.07 , 344.02
+400.44 , 7735.79 , 368.89
+400.44 , 8251.51 , 393.83
+400.44 , 8767.23 , 418.85
+400.44 , 9282.95 , 443.95
+400.44 , 9798.67 , 469.13
+400.44 , 10314.39 , 494.38
+457.64 , -11414.26 , -482.31
+457.64 , -10843.55 , -458.83
+457.64 , -10272.84 , -435.26
+457.64 , -9702.12 , -411.59
+457.64 , -9131.41 , -387.83
+457.64 , -8560.70 , -363.97
+457.64 , -7989.99 , -340.02
+457.64 , -7419.27 , -315.97
+457.64 , -6848.56 , -291.83
+457.64 , -6277.85 , -267.59
+457.64 , -5707.13 , -243.26
+457.64 , -5136.42 , -218.84
+457.64 , -4565.71 , -194.32
+457.64 , -3994.99 , -169.71
+457.64 , -3424.28 , -145.00
+457.64 , -2853.57 , -120.19
+457.64 , -2282.85 , -95.29
+457.64 , -1712.14 , -70.28
+457.64 , -1141.43 , -45.14
+457.64 , -570.71 , -19.76
+457.64 , -114.14 , 0.00
+457.64 , 103.14 , 9.76
+457.64 , 515.72 , 32.25
+457.64 , 1031.44 , 59.66
+457.64 , 1547.16 , 87.07
+457.64 , 2062.88 , 114.55
+457.64 , 2578.60 , 142.11
+457.64 , 3094.32 , 169.77
+457.64 , 3610.04 , 197.52
+457.64 , 4125.76 , 225.37
+457.64 , 4641.48 , 253.31
+457.64 , 5157.20 , 281.34
+457.64 , 5672.91 , 309.47
+457.64 , 6188.63 , 337.70
+457.64 , 6704.35 , 366.02
+457.64 , 7220.07 , 394.44
+457.64 , 7735.79 , 422.95
+457.64 , 8251.51 , 451.56
+457.64 , 8767.23 , 480.26
+457.64 , 9282.95 , 509.05
+457.64 , 9798.67 , 537.94
+457.64 , 10314.39 , 566.93
+514.85 , -11414.26 , -540.17
+514.85 , -10843.55 , -513.92
+514.85 , -10272.84 , -487.55
+514.85 , -9702.12 , -461.06
+514.85 , -9131.41 , -434.46
+514.85 , -8560.70 , -407.75
+514.85 , -7989.99 , -380.92
+514.85 , -7419.27 , -353.97
+514.85 , -6848.56 , -326.91
+514.85 , -6277.85 , -299.73
+514.85 , -5707.13 , -272.44
+514.85 , -5136.42 , -245.03
+514.85 , -4565.71 , -217.51
+514.85 , -3994.99 , -189.87
+514.85 , -3424.28 , -162.12
+514.85 , -2853.57 , -134.25
+514.85 , -2282.85 , -106.26
+514.85 , -1712.14 , -78.13
+514.85 , -1141.43 , -49.84
+514.85 , -570.71 , -21.19
+514.85 , -114.14 , 0.00
+514.85 , 103.14 , 11.59
+514.85 , 515.72 , 37.10
+514.85 , 1031.44 , 67.98
+514.85 , 1547.16 , 98.85
+514.85 , 2062.88 , 129.79
+514.85 , 2578.60 , 160.84
+514.85 , 3094.32 , 191.99
+514.85 , 3610.04 , 223.26
+514.85 , 4125.76 , 254.64
+514.85 , 4641.48 , 286.14
+514.85 , 5157.20 , 317.75
+514.85 , 5672.91 , 349.48
+514.85 , 6188.63 , 381.32
+514.85 , 6704.35 , 413.28
+514.85 , 7220.07 , 445.36
+514.85 , 7735.79 , 477.54
+514.85 , 8251.51 , 509.85
+514.85 , 8767.23 , 542.27
+514.85 , 9282.95 , 574.80
+514.85 , 9798.67 , 607.45
+514.85 , 10314.39 , 640.21
+572.06 , -11414.26 , -597.26
+572.06 , -10843.55 , -568.28
+572.06 , -10272.84 , -539.16
+572.06 , -9702.12 , -509.90
+572.06 , -9131.41 , -480.50
+572.06 , -8560.70 , -450.96
+572.06 , -7989.99 , -421.28
+572.06 , -7419.27 , -391.47
+572.06 , -6848.56 , -361.52
+572.06 , -6277.85 , -331.43
+572.06 , -5707.13 , -301.20
+572.06 , -5136.42 , -270.83
+572.06 , -4565.71 , -240.33
+572.06 , -3994.99 , -209.68
+572.06 , -3424.28 , -178.90
+572.06 , -2853.57 , -147.97
+572.06 , -2282.85 , -116.90
+572.06 , -1712.14 , -85.66
+572.06 , -1141.43 , -54.21
+572.06 , -570.71 , -22.23
+572.06 , -114.14 , 0.00
+572.06 , 103.14 , 13.60
+572.06 , 515.72 , 42.20
+572.06 , 1031.44 , 76.58
+572.06 , 1547.16 , 110.92
+572.06 , 2062.88 , 145.34
+572.06 , 2578.60 , 179.88
+572.06 , 3094.32 , 214.55
+572.06 , 3610.04 , 249.35
+572.06 , 4125.76 , 284.29
+572.06 , 4641.48 , 319.36
+572.06 , 5157.20 , 354.57
+572.06 , 5672.91 , 389.92
+572.06 , 6188.63 , 425.41
+572.06 , 6704.35 , 461.03
+572.06 , 7220.07 , 496.79
+572.06 , 7735.79 , 532.69
+572.06 , 8251.51 , 568.73
+572.06 , 8767.23 , 604.90
+572.06 , 9282.95 , 641.21
+572.06 , 9798.67 , 677.66
+572.06 , 10314.39 , 714.24
+629.26 , -11414.26 , -653.54
+629.26 , -10843.55 , -621.88
+629.26 , -10272.84 , -590.05
+629.26 , -9702.12 , -558.06
+629.26 , -9131.41 , -525.90
+629.26 , -8560.70 , -493.58
+629.26 , -7989.99 , -461.09
+629.26 , -7419.27 , -428.44
+629.26 , -6848.56 , -395.63
+629.26 , -6277.85 , -362.65
+629.26 , -5707.13 , -329.51
+629.26 , -5136.42 , -296.21
+629.26 , -4565.71 , -262.74
+629.26 , -3994.99 , -229.11
+629.26 , -3424.28 , -195.31
+629.26 , -2853.57 , -161.34
+629.26 , -2282.85 , -127.18
+629.26 , -1712.14 , -92.83
+629.26 , -1141.43 , -58.20
+629.26 , -570.71 , -22.82
+629.26 , -114.14 , 0.00
+629.26 , 103.14 , 15.79
+629.26 , 515.72 , 47.58
+629.26 , 1031.44 , 85.48
+629.26 , 1547.16 , 123.30
+629.26 , 2062.88 , 161.22
+629.26 , 2578.60 , 199.26
+629.26 , 3094.32 , 237.46
+629.26 , 3610.04 , 275.81
+629.26 , 4125.76 , 314.32
+629.26 , 4641.48 , 352.99
+629.26 , 5157.20 , 391.83
+629.26 , 5672.91 , 430.82
+629.26 , 6188.63 , 469.98
+629.26 , 6704.35 , 509.30
+629.26 , 7220.07 , 548.78
+629.26 , 7735.79 , 588.42
+629.26 , 8251.51 , 628.23
+629.26 , 8767.23 , 668.20
+629.26 , 9282.95 , 708.32
+629.26 , 9798.67 , 748.61
+629.26 , 10314.39 , 789.06
+686.47 , -11414.26 , -708.97
+686.47 , -10843.55 , -674.68
+686.47 , -10272.84 , -640.19
+686.47 , -9702.12 , -605.51
+686.47 , -9131.41 , -570.63
+686.47 , -8560.70 , -535.56
+686.47 , -7989.99 , -500.30
+686.47 , -7419.27 , -464.85
+686.47 , -6848.56 , -429.21
+686.47 , -6277.85 , -393.37
+686.47 , -5707.13 , -357.35
+686.47 , -5136.42 , -321.13
+686.47 , -4565.71 , -284.71
+686.47 , -3994.99 , -248.11
+686.47 , -3424.28 , -211.31
+686.47 , -2853.57 , -174.30
+686.47 , -2282.85 , -137.08
+686.47 , -1712.14 , -99.61
+686.47 , -1141.43 , -61.78
+686.47 , -570.71 , -22.86
+686.47 , -114.14 , 0.00
+686.47 , 103.14 , 18.17
+686.47 , 515.72 , 53.24
+686.47 , 1031.44 , 94.71
+686.47 , 1547.16 , 136.03
+686.47 , 2062.88 , 177.45
+686.47 , 2578.60 , 219.01
+686.47 , 3094.32 , 260.75
+686.47 , 3610.04 , 302.67
+686.47 , 4125.76 , 344.78
+686.47 , 4641.48 , 387.07
+686.47 , 5157.20 , 429.54
+686.47 , 5672.91 , 472.21
+686.47 , 6188.63 , 515.06
+686.47 , 6704.35 , 558.11
+686.47 , 7220.07 , 601.34
+686.47 , 7735.79 , 644.76
+686.47 , 8251.51 , 688.37
+686.47 , 8767.23 , 732.17
+686.47 , 9282.95 , 776.15
+686.47 , 9798.67 , 820.33
+686.47 , 10314.39 , 864.69
+743.67 , -11414.26 , -763.53
+743.67 , -10843.55 , -726.65
+743.67 , -10272.84 , -689.55
+743.67 , -9702.12 , -652.22
+743.67 , -9131.41 , -614.67
+743.67 , -8560.70 , -576.89
+743.67 , -7989.99 , -538.89
+743.67 , -7419.27 , -500.67
+743.67 , -6848.56 , -462.22
+743.67 , -6277.85 , -423.56
+743.67 , -5707.13 , -384.67
+743.67 , -5136.42 , -345.56
+743.67 , -4565.71 , -306.22
+743.67 , -3994.99 , -266.66
+743.67 , -3424.28 , -226.86
+743.67 , -2853.57 , -186.83
+743.67 , -2282.85 , -146.54
+743.67 , -1712.14 , -105.95
+743.67 , -1141.43 , -64.90
+743.67 , -570.71 , -22.24
+743.67 , -114.14 , 0.00
+743.67 , 103.14 , 20.74
+743.67 , 515.72 , 59.20
+743.67 , 1031.44 , 104.27
+743.67 , 1547.16 , 149.12
+743.67 , 2062.88 , 194.05
+743.67 , 2578.60 , 239.16
+743.67 , 3094.32 , 284.45
+743.67 , 3610.04 , 329.96
+743.67 , 4125.76 , 375.67
+743.67 , 4641.48 , 421.60
+743.67 , 5157.20 , 467.75
+743.67 , 5672.91 , 514.11
+743.67 , 6188.63 , 560.69
+743.67 , 6704.35 , 607.48
+743.67 , 7220.07 , 654.50
+743.67 , 7735.79 , 701.73
+743.67 , 8251.51 , 749.18
+743.67 , 8767.23 , 796.84
+743.67 , 9282.95 , 844.73
+743.67 , 9798.67 , 892.83
+743.67 , 10314.39 , 941.14
+800.88 , -11414.26 , -817.17
+800.88 , -10843.55 , -777.76
+800.88 , -10272.84 , -738.08
+800.88 , -9702.12 , -698.15
+800.88 , -9131.41 , -657.96
+800.88 , -8560.70 , -617.52
+800.88 , -7989.99 , -576.82
+800.88 , -7419.27 , -535.86
+800.88 , -6848.56 , -494.65
+800.88 , -6277.85 , -453.18
+800.88 , -5707.13 , -411.45
+800.88 , -5136.42 , -369.47
+800.88 , -4565.71 , -327.22
+800.88 , -3994.99 , -284.72
+800.88 , -3424.28 , -241.95
+800.88 , -2853.57 , -198.90
+800.88 , -2282.85 , -155.54
+800.88 , -1712.14 , -111.82
+800.88 , -1141.43 , -67.51
+800.88 , -570.71 , -20.80
+800.88 , -114.14 , 0.00
+800.88 , 103.14 , 23.52
+800.88 , 515.72 , 65.48
+800.88 , 1031.44 , 114.20
+800.88 , 1547.16 , 162.59
+800.88 , 2062.88 , 211.06
+800.88 , 2578.60 , 259.72
+800.88 , 3094.32 , 308.59
+800.88 , 3610.04 , 357.69
+800.88 , 4125.76 , 407.04
+800.88 , 4641.48 , 456.62
+800.88 , 5157.20 , 506.46
+800.88 , 5672.91 , 556.54
+800.88 , 6188.63 , 606.87
+800.88 , 6704.35 , 657.45
+800.88 , 7220.07 , 708.28
+800.88 , 7735.79 , 759.35
+800.88 , 8251.51 , 810.68
+800.88 , 8767.23 , 862.25
+800.88 , 9282.95 , 914.07
+800.88 , 9798.67 , 966.13
+800.88 , 10314.39 , 1018.44
+858.08 , -11414.26 , -869.86
+858.08 , -10843.55 , -827.96
+858.08 , -10272.84 , -785.77
+858.08 , -9702.12 , -743.28
+858.08 , -9131.41 , -700.50
+858.08 , -8560.70 , -657.42
+858.08 , -7989.99 , -614.05
+858.08 , -7419.27 , -570.39
+858.08 , -6848.56 , -526.44
+858.08 , -6277.85 , -482.19
+858.08 , -5707.13 , -437.65
+858.08 , -5136.42 , -392.82
+858.08 , -4565.71 , -347.69
+858.08 , -3994.99 , -302.26
+858.08 , -3424.28 , -256.52
+858.08 , -2853.57 , -210.46
+858.08 , -2282.85 , -164.04
+858.08 , -1712.14 , -117.17
+858.08 , -1141.43 , -69.54
+858.08 , -570.71 , -18.27
+858.08 , -114.14 , 0.00
+858.08 , 103.14 , 26.49
+858.08 , 515.72 , 72.10
+858.08 , 1031.44 , 124.50
+858.08 , 1547.16 , 176.46
+858.08 , 2062.88 , 228.49
+858.08 , 2578.60 , 280.71
+858.08 , 3094.32 , 333.18
+858.08 , 3610.04 , 385.90
+858.08 , 4125.76 , 438.89
+858.08 , 4641.48 , 492.16
+858.08 , 5157.20 , 545.71
+858.08 , 5672.91 , 599.54
+858.08 , 6188.63 , 653.64
+858.08 , 6704.35 , 708.03
+858.08 , 7220.07 , 762.71
+858.08 , 7735.79 , 817.66
+858.08 , 8251.51 , 872.89
+858.08 , 8767.23 , 928.41
+858.08 , 9282.95 , 984.20
+858.08 , 9798.67 , 1040.27
+858.08 , 10314.39 , 1096.63
+915.29 , -11414.26 , -921.56
+915.29 , -10843.55 , -877.23
+915.29 , -10272.84 , -832.56
+915.29 , -9702.12 , -787.56
+915.29 , -9131.41 , -742.22
+915.29 , -8560.70 , -696.56
+915.29 , -7989.99 , -650.56
+915.29 , -7419.27 , -604.23
+915.29 , -6848.56 , -557.56
+915.29 , -6277.85 , -510.57
+915.29 , -5707.13 , -463.24
+915.29 , -5136.42 , -415.58
+915.29 , -4565.71 , -367.58
+915.29 , -3994.99 , -319.24
+915.29 , -3424.28 , -270.55
+915.29 , -2853.57 , -221.48
+915.29 , -2282.85 , -171.99
+915.29 , -1712.14 , -121.95
+915.29 , -1141.43 , -70.93
+915.29 , -570.71 , -14.10
+915.29 , -114.14 , 0.00
+915.29 , 103.14 , 29.68
+915.29 , 515.72 , 79.05
+915.29 , 1031.44 , 135.20
+915.29 , 1547.16 , 190.76
+915.29 , 2062.88 , 246.36
+915.29 , 2578.60 , 302.17
+915.29 , 3094.32 , 358.24
+915.29 , 3610.04 , 414.60
+915.29 , 4125.76 , 471.27
+915.29 , 4641.48 , 528.24
+915.29 , 5157.20 , 585.52
+915.29 , 5672.91 , 643.12
+915.29 , 6188.63 , 701.03
+915.29 , 6704.35 , 759.26
+915.29 , 7220.07 , 817.80
+915.29 , 7735.79 , 876.66
+915.29 , 8251.51 , 935.84
+915.29 , 8767.23 , 995.34
+915.29 , 9282.95 , 1055.15
+915.29 , 9798.67 , 1115.27
+915.29 , 10314.39 , 1175.71
+972.50 , -11414.26 , -972.24
+972.50 , -10843.55 , -925.52
+972.50 , -10272.84 , -878.43
+972.50 , -9702.12 , -830.96
+972.50 , -9131.41 , -783.11
+972.50 , -8560.70 , -734.89
+972.50 , -7989.99 , -686.30
+972.50 , -7419.27 , -637.33
+972.50 , -6848.56 , -587.99
+972.50 , -6277.85 , -538.28
+972.50 , -5707.13 , -488.19
+972.50 , -5136.42 , -437.72
+972.50 , -4565.71 , -386.87
+972.50 , -3994.99 , -335.63
+972.50 , -3424.28 , -283.99
+972.50 , -2853.57 , -231.92
+972.50 , -2282.85 , -179.35
+972.50 , -1712.14 , -126.12
+972.50 , -1141.43 , -71.60
+972.50 , -570.71 , -6.45
+972.50 , -114.14 , 0.00
+972.50 , 103.14 , 33.08
+972.50 , 515.72 , 86.37
+972.50 , 1031.44 , 146.31
+972.50 , 1547.16 , 205.50
+972.50 , 2062.88 , 264.70
+972.50 , 2578.60 , 324.11
+972.50 , 3094.32 , 383.81
+972.50 , 3610.04 , 443.83
+972.50 , 4125.76 , 504.18
+972.50 , 4641.48 , 564.87
+972.50 , 5157.20 , 625.91
+972.50 , 5672.91 , 687.30
+972.50 , 6188.63 , 749.05
+972.50 , 6704.35 , 811.14
+972.50 , 7220.07 , 873.59
+972.50 , 7735.79 , 936.40
+972.50 , 8251.51 , 999.56
+972.50 , 8767.23 , 1063.07
+972.50 , 9282.95 , 1126.93
+972.50 , 9798.67 , 1191.14
+972.50 , 10314.39 , 1255.71
+1029.70 , -11414.26 , -1021.86
+1029.70 , -10843.55 , -972.81
+1029.70 , -10272.84 , -923.33
+1029.70 , -9702.12 , -873.44
+1029.70 , -9131.41 , -823.13
+1029.70 , -8560.70 , -772.39
+1029.70 , -7989.99 , -721.24
+1029.70 , -7419.27 , -669.67
+1029.70 , -6848.56 , -617.68
+1029.70 , -6277.85 , -565.27
+1029.70 , -5707.13 , -512.45
+1029.70 , -5136.42 , -459.19
+1029.70 , -4565.71 , -405.51
+1029.70 , -3994.99 , -351.39
+1029.70 , -3424.28 , -296.81
+1029.70 , -2853.57 , -241.73
+1029.70 , -2282.85 , -186.07
+1029.70 , -1712.14 , -129.61
+1029.70 , -1141.43 , -71.46
+1029.70 , -570.71 , 0.00
+1029.70 , -114.14 , 0.00
+1029.70 , 103.14 , 36.70
+1029.70 , 515.72 , 94.04
+1029.70 , 1031.44 , 157.85
+1029.70 , 1547.16 , 220.70
+1029.70 , 2062.88 , 283.52
+1029.70 , 2578.60 , 346.56
+1029.70 , 3094.32 , 409.90
+1029.70 , 3610.04 , 473.59
+1029.70 , 4125.76 , 537.65
+1029.70 , 4641.48 , 602.09
+1029.70 , 5157.20 , 666.91
+1029.70 , 5672.91 , 732.12
+1029.70 , 6188.63 , 797.72
+1029.70 , 6704.35 , 863.72
+1029.70 , 7220.07 , 930.10
+1029.70 , 7735.79 , 996.88
+1029.70 , 8251.51 , 1064.05
+1029.70 , 8767.23 , 1131.62
+1029.70 , 9282.95 , 1199.57
+1029.70 , 9798.67 , 1267.92
+1029.70 , 10314.39 , 1336.65
+1086.91 , -11414.26 , -1070.37
+1086.91 , -10843.55 , -1019.04
+1086.91 , -10272.84 , -967.24
+1086.91 , -9702.12 , -914.96
+1086.91 , -9131.41 , -862.23
+1086.91 , -8560.70 , -809.02
+1086.91 , -7989.99 , -755.35
+1086.91 , -7419.27 , -701.21
+1086.91 , -6848.56 , -646.60
+1086.91 , -6277.85 , -591.53
+1086.91 , -5707.13 , -535.99
+1086.91 , -5136.42 , -479.97
+1086.91 , -4565.71 , -423.47
+1086.91 , -3994.99 , -366.48
+1086.91 , -3424.28 , -308.96
+1086.91 , -2853.57 , -250.88
+1086.91 , -2282.85 , -192.11
+1086.91 , -1712.14 , -132.36
+1086.91 , -1141.43 , -70.38
+1086.91 , -570.71 , 0.00
+1086.91 , -114.14 , 0.00
+1086.91 , 103.14 , 40.53
+1086.91 , 515.72 , 102.10
+1086.91 , 1031.44 , 169.83
+1086.91 , 1547.16 , 236.37
+1086.91 , 2062.88 , 302.84
+1086.91 , 2578.60 , 369.53
+1086.91 , 3094.32 , 436.54
+1086.91 , 3610.04 , 503.92
+1086.91 , 4125.76 , 571.71
+1086.91 , 4641.48 , 639.91
+1086.91 , 5157.20 , 708.54
+1086.91 , 5672.91 , 777.59
+1086.91 , 6188.63 , 847.08
+1086.91 , 6704.35 , 917.00
+1086.91 , 7220.07 , 987.35
+1086.91 , 7735.79 , 1058.14
+1086.91 , 8251.51 , 1129.36
+1086.91 , 8767.23 , 1201.01
+1086.91 , 9282.95 , 1273.09
+1086.91 , 9798.67 , 1345.61
+1086.91 , 10314.39 , 1418.56
+1144.11 , -11414.26 , -1117.74
+1144.11 , -10843.55 , -1064.18
+1144.11 , -10272.84 , -1010.10
+1144.11 , -9702.12 , -955.49
+1144.11 , -9131.41 , -900.37
+1144.11 , -8560.70 , -844.73
+1144.11 , -7989.99 , -788.58
+1144.11 , -7419.27 , -731.90
+1144.11 , -6848.56 , -674.71
+1144.11 , -6277.85 , -617.00
+1144.11 , -5707.13 , -558.77
+1144.11 , -5136.42 , -500.01
+1144.11 , -4565.71 , -440.71
+1144.11 , -3994.99 , -380.85
+1144.11 , -3424.28 , -320.40
+1144.11 , -2853.57 , -259.31
+1144.11 , -2282.85 , -197.41
+1144.11 , -1712.14 , -134.30
+1144.11 , -1141.43 , -68.24
+1144.11 , -570.71 , 0.00
+1144.11 , -114.14 , 0.00
+1144.11 , 103.14 , 44.59
+1144.11 , 515.72 , 110.53
+1144.11 , 1031.44 , 182.27
+1144.11 , 1547.16 , 252.55
+1144.11 , 2062.88 , 322.69
+1144.11 , 2578.60 , 393.04
+1144.11 , 3094.32 , 463.74
+1144.11 , 3610.04 , 534.84
+1144.11 , 4125.76 , 606.37
+1144.11 , 4641.48 , 678.37
+1144.11 , 5157.20 , 750.82
+1144.11 , 5672.91 , 823.74
+1144.11 , 6188.63 , 897.14
+1144.11 , 6704.35 , 971.01
+1144.11 , 7220.07 , 1045.36
+1144.11 , 7735.79 , 1120.19
+1144.11 , 8251.51 , 1195.49
+1144.11 , 8767.23 , 1271.27
+1144.11 , 9282.95 , 1347.52
+1144.11 , 9798.67 , 1424.25
+1144.11 , 10314.39 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..a46cb34e6831d05626e67324b6a261bde045c857
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_drag.viepcd
@@ -0,0 +1,24 @@
+n_out , T_drag_out
+0.00 , -21.84
+5.72 , -22.52
+57.21 , -28.92
+114.41 , -35.99
+171.62 , -43.07
+228.82 , -50.22
+286.03 , -57.30
+343.23 , -64.38
+400.44 , -71.45
+457.65 , -78.53
+514.85 , -85.68
+572.06 , -92.76
+629.26 , -99.84
+686.47 , -106.91
+743.67 , -113.99
+800.88 , -121.14
+858.08 , -128.22
+915.29 , -135.30
+972.50 , -142.37
+1029.70 , -149.45
+1086.91 , -156.60
+1144.11 , -163.68
+
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..100936bf6a5a357b12e1f3c23c4e10d762325c19
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 21.9384
+ },
+ {
+ "Ratio": 12.276
+ },
+ {
+ "Ratio": 7.2336
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3Whl1_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl1_1.viepco",
+ "2": "IEPC_Gbx3Whl1_2.viepco",
+ "3": "IEPC_Gbx3Whl1_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3Whl1_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl1_1.viepco",
+ "2": "IEPC_Gbx3Whl1_2.viepco",
+ "3": "IEPC_Gbx3Whl1_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3Whl1_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_ENG_Gbx3Whl1.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_ENG_Gbx3Whl1.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..4e6fcefa3c70689d8a89bcd47a51d7a232e28799
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_ENG_Gbx3Whl1.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx3Whl1.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..94622846b552ed61d81fff828a3b68de9dae39c6
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3Whl1.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_1.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..7d9dd773ee374dc7a818143da159de20d758b556
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -17669.46 , 0.00
+0.00 , -16785.99 , 0.00
+0.00 , -15902.51 , 0.00
+0.00 , -15019.04 , 0.00
+0.00 , -14135.57 , 0.00
+0.00 , -13252.09 , 0.00
+0.00 , -12368.62 , -0.07
+0.00 , -11485.15 , -0.33
+0.00 , -10601.68 , -0.49
+0.00 , -9718.20 , -0.60
+0.00 , -8834.73 , -0.66
+0.00 , -7951.26 , -0.69
+0.00 , -7067.78 , -0.70
+0.00 , -6184.31 , -0.67
+0.00 , -5300.84 , -0.63
+0.00 , -4417.36 , -0.57
+0.00 , -3533.89 , -0.48
+0.00 , -2650.42 , -0.38
+0.00 , -1766.95 , -0.27
+0.00 , -883.47 , -0.13
+0.00 , -176.69 , -0.01
+0.00 , 153.22 , 0.06
+0.00 , 766.09 , 0.28
+0.00 , 1532.18 , 0.56
+0.00 , 2298.27 , 0.85
+0.00 , 3064.36 , 1.15
+0.00 , 3830.44 , 1.47
+0.00 , 4596.53 , 1.79
+0.00 , 5362.62 , 2.12
+0.00 , 6128.71 , 2.47
+0.00 , 6894.80 , 2.82
+0.00 , 7660.89 , 3.19
+0.00 , 8426.98 , 3.56
+0.00 , 9193.07 , 3.94
+0.00 , 9959.16 , 4.33
+0.00 , 10725.24 , 4.74
+0.00 , 11491.33 , 5.15
+0.00 , 12257.42 , 5.57
+0.00 , 13023.51 , 6.00
+0.00 , 13789.60 , 6.43
+0.00 , 14555.69 , 6.88
+0.00 , 15321.78 , 7.34
+1.89 , -17669.46 , 0.00
+1.89 , -16785.99 , 0.00
+1.89 , -15902.51 , 0.00
+1.89 , -15019.04 , 0.00
+1.89 , -14135.57 , 0.00
+1.89 , -13252.09 , 0.00
+1.89 , -12368.62 , -0.25
+1.89 , -11485.15 , -0.42
+1.89 , -10601.68 , -0.52
+1.89 , -9718.20 , -0.58
+1.89 , -8834.73 , -0.61
+1.89 , -7951.26 , -0.62
+1.89 , -7067.78 , -0.61
+1.89 , -6184.31 , -0.58
+1.89 , -5300.84 , -0.53
+1.89 , -4417.36 , -0.47
+1.89 , -3533.89 , -0.40
+1.89 , -2650.42 , -0.31
+1.89 , -1766.95 , -0.22
+1.89 , -883.47 , -0.11
+1.89 , -176.69 , -0.01
+1.89 , 153.22 , 0.05
+1.89 , 766.09 , 0.21
+1.89 , 1532.18 , 0.43
+1.89 , 2298.27 , 0.65
+1.89 , 3064.36 , 0.88
+1.89 , 3830.44 , 1.11
+1.89 , 4596.53 , 1.36
+1.89 , 5362.62 , 1.61
+1.89 , 6128.71 , 1.87
+1.89 , 6894.80 , 2.13
+1.89 , 7660.89 , 2.40
+1.89 , 8426.98 , 2.68
+1.89 , 9193.07 , 2.97
+1.89 , 9959.16 , 3.26
+1.89 , 10725.24 , 3.56
+1.89 , 11491.33 , 3.86
+1.89 , 12257.42 , 4.18
+1.89 , 13023.51 , 4.50
+1.89 , 13789.60 , 4.82
+1.89 , 14555.69 , 5.15
+1.89 , 15321.78 , 5.49
+18.86 , -17669.46 , -29.05
+18.86 , -16785.99 , -27.68
+18.86 , -15902.51 , -26.31
+18.86 , -15019.04 , -24.92
+18.86 , -14135.57 , -23.53
+18.86 , -13252.09 , -22.12
+18.86 , -12368.62 , -20.71
+18.86 , -11485.15 , -19.28
+18.86 , -10601.68 , -17.85
+18.86 , -9718.20 , -16.41
+18.86 , -8834.73 , -14.95
+18.86 , -7951.26 , -13.49
+18.86 , -7067.78 , -12.02
+18.86 , -6184.31 , -10.53
+18.86 , -5300.84 , -9.04
+18.86 , -4417.36 , -7.54
+18.86 , -3533.89 , -6.03
+18.86 , -2650.42 , -4.51
+18.86 , -1766.95 , -2.98
+18.86 , -883.47 , -1.44
+18.86 , -176.69 , -0.18
+18.86 , 153.22 , 0.45
+18.86 , 766.09 , 1.84
+18.86 , 1532.18 , 3.58
+18.86 , 2298.27 , 5.33
+18.86 , 3064.36 , 7.09
+18.86 , 3830.44 , 8.85
+18.86 , 4596.53 , 10.63
+18.86 , 5362.62 , 12.42
+18.86 , 6128.71 , 14.21
+18.86 , 6894.80 , 16.02
+18.86 , 7660.89 , 17.84
+18.86 , 8426.98 , 19.66
+18.86 , 9193.07 , 21.49
+18.86 , 9959.16 , 23.34
+18.86 , 10725.24 , 25.19
+18.86 , 11491.33 , 27.05
+18.86 , 12257.42 , 28.93
+18.86 , 13023.51 , 30.81
+18.86 , 13789.60 , 32.70
+18.86 , 14555.69 , 34.60
+18.86 , 15321.78 , 36.50
+37.72 , -17669.46 , -60.28
+37.72 , -16785.99 , -57.37
+37.72 , -15902.51 , -54.44
+37.72 , -15019.04 , -51.49
+37.72 , -14135.57 , -48.54
+37.72 , -13252.09 , -45.58
+37.72 , -12368.62 , -42.60
+37.72 , -11485.15 , -39.61
+37.72 , -10601.68 , -36.61
+37.72 , -9718.20 , -33.60
+37.72 , -8834.73 , -30.58
+37.72 , -7951.26 , -27.55
+37.72 , -7067.78 , -24.51
+37.72 , -6184.31 , -21.45
+37.72 , -5300.84 , -18.38
+37.72 , -4417.36 , -15.31
+37.72 , -3533.89 , -12.22
+37.72 , -2650.42 , -9.12
+37.72 , -1766.95 , -6.00
+37.72 , -883.47 , -2.88
+37.72 , -176.69 , -0.33
+37.72 , 153.22 , 0.92
+37.72 , 766.09 , 3.68
+37.72 , 1532.18 , 7.11
+37.72 , 2298.27 , 10.56
+37.72 , 3064.36 , 14.01
+37.72 , 3830.44 , 17.48
+37.72 , 4596.53 , 20.96
+37.72 , 5362.62 , 24.45
+37.72 , 6128.71 , 27.95
+37.72 , 6894.80 , 31.47
+37.72 , 7660.89 , 34.99
+37.72 , 8426.98 , 38.53
+37.72 , 9193.07 , 42.08
+37.72 , 9959.16 , 45.64
+37.72 , 10725.24 , 49.21
+37.72 , 11491.33 , 52.79
+37.72 , 12257.42 , 56.38
+37.72 , 13023.51 , 59.99
+37.72 , 13789.60 , 63.60
+37.72 , 14555.69 , 67.23
+37.72 , 15321.78 , 70.87
+56.59 , -17669.46 , -91.22
+56.59 , -16785.99 , -86.77
+56.59 , -15902.51 , -82.31
+56.59 , -15019.04 , -77.84
+56.59 , -14135.57 , -73.35
+56.59 , -13252.09 , -68.84
+56.59 , -12368.62 , -64.32
+56.59 , -11485.15 , -59.79
+56.59 , -10601.68 , -55.24
+56.59 , -9718.20 , -50.68
+56.59 , -8834.73 , -46.11
+56.59 , -7951.26 , -41.51
+56.59 , -7067.78 , -36.91
+56.59 , -6184.31 , -32.29
+56.59 , -5300.84 , -27.66
+56.59 , -4417.36 , -23.01
+56.59 , -3533.89 , -18.35
+56.59 , -2650.42 , -13.67
+56.59 , -1766.95 , -8.98
+56.59 , -883.47 , -4.27
+56.59 , -176.69 , -0.39
+56.59 , 153.22 , 1.43
+56.59 , 766.09 , 5.56
+56.59 , 1532.18 , 10.69
+56.59 , 2298.27 , 15.84
+56.59 , 3064.36 , 21.00
+56.59 , 3830.44 , 26.17
+56.59 , 4596.53 , 31.36
+56.59 , 5362.62 , 36.56
+56.59 , 6128.71 , 41.77
+56.59 , 6894.80 , 47.01
+56.59 , 7660.89 , 52.25
+56.59 , 8426.98 , 57.51
+56.59 , 9193.07 , 62.79
+56.59 , 9959.16 , 68.08
+56.59 , 10725.24 , 73.38
+56.59 , 11491.33 , 78.70
+56.59 , 12257.42 , 84.03
+56.59 , 13023.51 , 89.38
+56.59 , 13789.60 , 94.74
+56.59 , 14555.69 , 100.12
+56.59 , 15321.78 , 105.51
+75.45 , -17669.46 , -121.86
+75.45 , -16785.99 , -115.91
+75.45 , -15902.51 , -109.94
+75.45 , -15019.04 , -103.95
+75.45 , -14135.57 , -97.94
+75.45 , -13252.09 , -91.91
+75.45 , -12368.62 , -85.87
+75.45 , -11485.15 , -79.81
+75.45 , -10601.68 , -73.73
+75.45 , -9718.20 , -67.63
+75.45 , -8834.73 , -61.51
+75.45 , -7951.26 , -55.37
+75.45 , -7067.78 , -49.21
+75.45 , -6184.31 , -43.04
+75.45 , -5300.84 , -36.85
+75.45 , -4417.36 , -30.64
+75.45 , -3533.89 , -24.41
+75.45 , -2650.42 , -18.16
+75.45 , -1766.95 , -11.89
+75.45 , -883.47 , -5.59
+75.45 , -176.69 , -0.32
+75.45 , 153.22 , 1.99
+75.45 , 766.09 , 7.50
+75.45 , 1532.18 , 14.34
+75.45 , 2298.27 , 21.19
+75.45 , 3064.36 , 28.05
+75.45 , 3830.44 , 34.94
+75.45 , 4596.53 , 41.84
+75.45 , 5362.62 , 48.76
+75.45 , 6128.71 , 55.70
+75.45 , 6894.80 , 62.66
+75.45 , 7660.89 , 69.63
+75.45 , 8426.98 , 76.63
+75.45 , 9193.07 , 83.65
+75.45 , 9959.16 , 90.68
+75.45 , 10725.24 , 97.73
+75.45 , 11491.33 , 104.80
+75.45 , 12257.42 , 111.90
+75.45 , 13023.51 , 119.00
+75.45 , 13789.60 , 126.13
+75.45 , 14555.69 , 133.28
+75.45 , 15321.78 , 140.44
+94.31 , -17669.46 , -152.18
+94.31 , -16785.99 , -144.75
+94.31 , -15902.51 , -137.29
+94.31 , -15019.04 , -129.81
+94.31 , -14135.57 , -122.31
+94.31 , -13252.09 , -114.78
+94.31 , -12368.62 , -107.23
+94.31 , -11485.15 , -99.65
+94.31 , -10601.68 , -92.05
+94.31 , -9718.20 , -84.42
+94.31 , -8834.73 , -76.77
+94.31 , -7951.26 , -69.10
+94.31 , -7067.78 , -61.41
+94.31 , -6184.31 , -53.69
+94.31 , -5300.84 , -45.94
+94.31 , -4417.36 , -38.17
+94.31 , -3533.89 , -30.38
+94.31 , -2650.42 , -22.57
+94.31 , -1766.95 , -14.72
+94.31 , -883.47 , -6.84
+94.31 , -176.69 , 0.00
+94.31 , 153.22 , 2.61
+94.31 , 766.09 , 9.52
+94.31 , 1532.18 , 18.06
+94.31 , 2298.27 , 26.62
+94.31 , 3064.36 , 35.19
+94.31 , 3830.44 , 43.79
+94.31 , 4596.53 , 52.42
+94.31 , 5362.62 , 61.07
+94.31 , 6128.71 , 69.74
+94.31 , 6894.80 , 78.43
+94.31 , 7660.89 , 87.15
+94.31 , 8426.98 , 95.90
+94.31 , 9193.07 , 104.67
+94.31 , 9959.16 , 113.46
+94.31 , 10725.24 , 122.28
+94.31 , 11491.33 , 131.12
+94.31 , 12257.42 , 139.99
+94.31 , 13023.51 , 148.88
+94.31 , 13789.60 , 157.79
+94.31 , 14555.69 , 166.73
+94.31 , 15321.78 , 175.69
+113.17 , -17669.46 , -182.19
+113.17 , -16785.99 , -173.29
+113.17 , -15902.51 , -164.37
+113.17 , -15019.04 , -155.42
+113.17 , -14135.57 , -146.44
+113.17 , -13252.09 , -137.42
+113.17 , -12368.62 , -128.38
+113.17 , -11485.15 , -119.30
+113.17 , -10601.68 , -110.20
+113.17 , -9718.20 , -101.06
+113.17 , -8834.73 , -91.89
+113.17 , -7951.26 , -82.70
+113.17 , -7067.78 , -73.47
+113.17 , -6184.31 , -64.21
+113.17 , -5300.84 , -54.93
+113.17 , -4417.36 , -45.61
+113.17 , -3533.89 , -36.26
+113.17 , -2650.42 , -26.87
+113.17 , -1766.95 , -17.46
+113.17 , -883.47 , -7.98
+113.17 , -176.69 , 0.00
+113.17 , 153.22 , 3.29
+113.17 , 766.09 , 11.62
+113.17 , 1532.18 , 21.88
+113.17 , 2298.27 , 32.14
+113.17 , 3064.36 , 42.44
+113.17 , 3830.44 , 52.76
+113.17 , 4596.53 , 63.11
+113.17 , 5362.62 , 73.49
+113.17 , 6128.71 , 83.91
+113.17 , 6894.80 , 94.35
+113.17 , 7660.89 , 104.82
+113.17 , 8426.98 , 115.33
+113.17 , 9193.07 , 125.87
+113.17 , 9959.16 , 136.43
+113.17 , 10725.24 , 147.03
+113.17 , 11491.33 , 157.66
+113.17 , 12257.42 , 168.32
+113.17 , 13023.51 , 179.01
+113.17 , 13789.60 , 189.74
+113.17 , 14555.69 , 200.49
+113.17 , 15321.78 , 211.27
+132.03 , -17669.46 , -211.85
+132.03 , -16785.99 , -201.52
+132.03 , -15902.51 , -191.16
+132.03 , -15019.04 , -180.75
+132.03 , -14135.57 , -170.31
+132.03 , -13252.09 , -159.83
+132.03 , -12368.62 , -149.31
+132.03 , -11485.15 , -138.75
+132.03 , -10601.68 , -128.16
+132.03 , -9718.20 , -117.52
+132.03 , -8834.73 , -106.85
+132.03 , -7951.26 , -96.14
+132.03 , -7067.78 , -85.39
+132.03 , -6184.31 , -74.61
+132.03 , -5300.84 , -63.78
+132.03 , -4417.36 , -52.92
+132.03 , -3533.89 , -42.02
+132.03 , -2650.42 , -31.07
+132.03 , -1766.95 , -20.08
+132.03 , -883.47 , -9.00
+132.03 , -176.69 , 0.00
+132.03 , 153.22 , 4.05
+132.03 , 766.09 , 13.82
+132.03 , 1532.18 , 25.80
+132.03 , 2298.27 , 37.78
+132.03 , 3064.36 , 49.79
+132.03 , 3830.44 , 61.84
+132.03 , 4596.53 , 73.93
+132.03 , 5362.62 , 86.05
+132.03 , 6128.71 , 98.22
+132.03 , 6894.80 , 110.42
+132.03 , 7660.89 , 122.66
+132.03 , 8426.98 , 134.94
+132.03 , 9193.07 , 147.26
+132.03 , 9959.16 , 159.61
+132.03 , 10725.24 , 172.01
+132.03 , 11491.33 , 184.44
+132.03 , 12257.42 , 196.92
+132.03 , 13023.51 , 209.43
+132.03 , 13789.60 , 221.98
+132.03 , 14555.69 , 234.57
+132.03 , 15321.78 , 247.19
+150.90 , -17669.46 , -241.15
+150.90 , -16785.99 , -229.41
+150.90 , -15902.51 , -217.63
+150.90 , -15019.04 , -205.79
+150.90 , -14135.57 , -193.91
+150.90 , -13252.09 , -181.98
+150.90 , -12368.62 , -170.01
+150.90 , -11485.15 , -157.99
+150.90 , -10601.68 , -145.91
+150.90 , -9718.20 , -133.80
+150.90 , -8834.73 , -121.63
+150.90 , -7951.26 , -109.42
+150.90 , -7067.78 , -97.16
+150.90 , -6184.31 , -84.85
+150.90 , -5300.84 , -72.50
+150.90 , -4417.36 , -60.10
+150.90 , -3533.89 , -47.65
+150.90 , -2650.42 , -35.14
+150.90 , -1766.95 , -22.57
+150.90 , -883.47 , -9.88
+150.90 , -176.69 , 0.00
+150.90 , 153.22 , 4.88
+150.90 , 766.09 , 16.13
+150.90 , 1532.18 , 29.83
+150.90 , 2298.27 , 43.53
+150.90 , 3064.36 , 57.27
+150.90 , 3830.44 , 71.06
+150.90 , 4596.53 , 84.89
+150.90 , 5362.62 , 98.76
+150.90 , 6128.71 , 112.68
+150.90 , 6894.80 , 126.65
+150.90 , 7660.89 , 140.67
+150.90 , 8426.98 , 154.74
+150.90 , 9193.07 , 168.85
+150.90 , 9959.16 , 183.01
+150.90 , 10725.24 , 197.22
+150.90 , 11491.33 , 211.48
+150.90 , 12257.42 , 225.78
+150.90 , 13023.51 , 240.13
+150.90 , 13789.60 , 254.53
+150.90 , 14555.69 , 268.97
+150.90 , 15321.78 , 283.46
+169.76 , -17669.46 , -270.09
+169.76 , -16785.99 , -256.96
+169.76 , -15902.51 , -243.78
+169.76 , -15019.04 , -230.53
+169.76 , -14135.57 , -217.23
+169.76 , -13252.09 , -203.87
+169.76 , -12368.62 , -190.46
+169.76 , -11485.15 , -176.98
+169.76 , -10601.68 , -163.45
+169.76 , -9718.20 , -149.87
+169.76 , -8834.73 , -136.22
+169.76 , -7951.26 , -122.52
+169.76 , -7067.78 , -108.76
+169.76 , -6184.31 , -94.94
+169.76 , -5300.84 , -81.06
+169.76 , -4417.36 , -67.13
+169.76 , -3533.89 , -53.13
+169.76 , -2650.42 , -39.07
+169.76 , -1766.95 , -24.92
+169.76 , -883.47 , -10.59
+169.76 , -176.69 , 0.00
+169.76 , 153.22 , 5.80
+169.76 , 766.09 , 18.55
+169.76 , 1532.18 , 33.99
+169.76 , 2298.27 , 49.42
+169.76 , 3064.36 , 64.90
+169.76 , 3830.44 , 80.42
+169.76 , 4596.53 , 96.00
+169.76 , 5362.62 , 111.63
+169.76 , 6128.71 , 127.32
+169.76 , 6894.80 , 143.07
+169.76 , 7660.89 , 158.88
+169.76 , 8426.98 , 174.74
+169.76 , 9193.07 , 190.66
+169.76 , 9959.16 , 206.64
+169.76 , 10725.24 , 222.68
+169.76 , 11491.33 , 238.77
+169.76 , 12257.42 , 254.92
+169.76 , 13023.51 , 271.13
+169.76 , 13789.60 , 287.40
+169.76 , 14555.69 , 303.72
+169.76 , 15321.78 , 320.10
+188.62 , -17669.46 , -298.63
+188.62 , -16785.99 , -284.14
+188.62 , -15902.51 , -269.58
+188.62 , -15019.04 , -254.95
+188.62 , -14135.57 , -240.25
+188.62 , -13252.09 , -225.48
+188.62 , -12368.62 , -210.64
+188.62 , -11485.15 , -195.74
+188.62 , -10601.68 , -180.76
+188.62 , -9718.20 , -165.71
+188.62 , -8834.73 , -150.60
+188.62 , -7951.26 , -135.42
+188.62 , -7067.78 , -120.16
+188.62 , -6184.31 , -104.84
+188.62 , -5300.84 , -89.45
+188.62 , -4417.36 , -73.99
+188.62 , -3533.89 , -58.45
+188.62 , -2650.42 , -42.83
+188.62 , -1766.95 , -27.10
+188.62 , -883.47 , -11.12
+188.62 , -176.69 , 0.00
+188.62 , 153.22 , 6.80
+188.62 , 766.09 , 21.10
+188.62 , 1532.18 , 38.29
+188.62 , 2298.27 , 55.46
+188.62 , 3064.36 , 72.67
+188.62 , 3830.44 , 89.94
+188.62 , 4596.53 , 107.27
+188.62 , 5362.62 , 124.67
+188.62 , 6128.71 , 142.14
+188.62 , 6894.80 , 159.68
+188.62 , 7660.89 , 177.29
+188.62 , 8426.98 , 194.96
+188.62 , 9193.07 , 212.70
+188.62 , 9959.16 , 230.52
+188.62 , 10725.24 , 248.40
+188.62 , 11491.33 , 266.35
+188.62 , 12257.42 , 284.37
+188.62 , 13023.51 , 302.45
+188.62 , 13789.60 , 320.61
+188.62 , 14555.69 , 338.83
+188.62 , 15321.78 , 357.12
+207.48 , -17669.46 , -326.77
+207.48 , -16785.99 , -310.94
+207.48 , -15902.51 , -295.03
+207.48 , -15019.04 , -279.03
+207.48 , -14135.57 , -262.95
+207.48 , -13252.09 , -246.79
+207.48 , -12368.62 , -230.55
+207.48 , -11485.15 , -214.22
+207.48 , -10601.68 , -197.81
+207.48 , -9718.20 , -181.33
+207.48 , -8834.73 , -164.76
+207.48 , -7951.26 , -148.10
+207.48 , -7067.78 , -131.37
+207.48 , -6184.31 , -114.55
+207.48 , -5300.84 , -97.65
+207.48 , -4417.36 , -80.67
+207.48 , -3533.89 , -63.59
+207.48 , -2650.42 , -46.42
+207.48 , -1766.95 , -29.10
+207.48 , -883.47 , -11.41
+207.48 , -176.69 , 0.00
+207.48 , 153.22 , 7.90
+207.48 , 766.09 , 23.79
+207.48 , 1532.18 , 42.74
+207.48 , 2298.27 , 61.65
+207.48 , 3064.36 , 80.61
+207.48 , 3830.44 , 99.63
+207.48 , 4596.53 , 118.73
+207.48 , 5362.62 , 137.91
+207.48 , 6128.71 , 157.16
+207.48 , 6894.80 , 176.50
+207.48 , 7660.89 , 195.91
+207.48 , 8426.98 , 215.41
+207.48 , 9193.07 , 234.99
+207.48 , 9959.16 , 254.65
+207.48 , 10725.24 , 274.39
+207.48 , 11491.33 , 294.21
+207.48 , 12257.42 , 314.12
+207.48 , 13023.51 , 334.10
+207.48 , 13789.60 , 354.16
+207.48 , 14555.69 , 374.31
+207.48 , 15321.78 , 394.53
+226.34 , -17669.46 , -354.49
+226.34 , -16785.99 , -337.34
+226.34 , -15902.51 , -320.10
+226.34 , -15019.04 , -302.75
+226.34 , -14135.57 , -285.32
+226.34 , -13252.09 , -267.78
+226.34 , -12368.62 , -250.15
+226.34 , -11485.15 , -232.43
+226.34 , -10601.68 , -214.60
+226.34 , -9718.20 , -196.69
+226.34 , -8834.73 , -178.67
+226.34 , -7951.26 , -160.56
+226.34 , -7067.78 , -142.36
+226.34 , -6184.31 , -124.05
+226.34 , -5300.84 , -105.65
+226.34 , -4417.36 , -87.15
+226.34 , -3533.89 , -68.54
+226.34 , -2650.42 , -49.80
+226.34 , -1766.95 , -30.89
+226.34 , -883.47 , -11.43
+226.34 , -176.69 , 0.00
+226.34 , 153.22 , 9.08
+226.34 , 766.09 , 26.62
+226.34 , 1532.18 , 47.35
+226.34 , 2298.27 , 68.02
+226.34 , 3064.36 , 88.72
+226.34 , 3830.44 , 109.51
+226.34 , 4596.53 , 130.38
+226.34 , 5362.62 , 151.34
+226.34 , 6128.71 , 172.39
+226.34 , 6894.80 , 193.53
+226.34 , 7660.89 , 214.77
+226.34 , 8426.98 , 236.11
+226.34 , 9193.07 , 257.53
+226.34 , 9959.16 , 279.05
+226.34 , 10725.24 , 300.67
+226.34 , 11491.33 , 322.38
+226.34 , 12257.42 , 344.19
+226.34 , 13023.51 , 366.08
+226.34 , 13789.60 , 388.08
+226.34 , 14555.69 , 410.16
+226.34 , 15321.78 , 432.34
+245.21 , -17669.46 , -381.77
+245.21 , -16785.99 , -363.33
+245.21 , -15902.51 , -344.77
+245.21 , -15019.04 , -326.11
+245.21 , -14135.57 , -307.33
+245.21 , -13252.09 , -288.45
+245.21 , -12368.62 , -269.45
+245.21 , -11485.15 , -250.33
+245.21 , -10601.68 , -231.11
+245.21 , -9718.20 , -211.78
+245.21 , -8834.73 , -192.34
+245.21 , -7951.26 , -172.78
+245.21 , -7067.78 , -153.11
+245.21 , -6184.31 , -133.33
+245.21 , -5300.84 , -113.43
+245.21 , -4417.36 , -93.42
+245.21 , -3533.89 , -73.27
+245.21 , -2650.42 , -52.98
+245.21 , -1766.95 , -32.45
+245.21 , -883.47 , -11.12
+245.21 , -176.69 , 0.00
+245.21 , 153.22 , 10.37
+245.21 , 766.09 , 29.60
+245.21 , 1532.18 , 52.14
+245.21 , 2298.27 , 74.56
+245.21 , 3064.36 , 97.03
+245.21 , 3830.44 , 119.58
+245.21 , 4596.53 , 142.23
+245.21 , 5362.62 , 164.98
+245.21 , 6128.71 , 187.84
+245.21 , 6894.80 , 210.80
+245.21 , 7660.89 , 233.87
+245.21 , 8426.98 , 257.05
+245.21 , 9193.07 , 280.34
+245.21 , 9959.16 , 303.74
+245.21 , 10725.24 , 327.25
+245.21 , 11491.33 , 350.87
+245.21 , 12257.42 , 374.59
+245.21 , 13023.51 , 398.42
+245.21 , 13789.60 , 422.36
+245.21 , 14555.69 , 446.41
+245.21 , 15321.78 , 470.57
+264.07 , -17669.46 , -408.59
+264.07 , -16785.99 , -388.88
+264.07 , -15902.51 , -369.04
+264.07 , -15019.04 , -349.08
+264.07 , -14135.57 , -328.98
+264.07 , -13252.09 , -308.76
+264.07 , -12368.62 , -288.41
+264.07 , -11485.15 , -267.93
+264.07 , -10601.68 , -247.32
+264.07 , -9718.20 , -226.59
+264.07 , -8834.73 , -205.73
+264.07 , -7951.26 , -184.73
+264.07 , -7067.78 , -163.61
+264.07 , -6184.31 , -142.36
+264.07 , -5300.84 , -120.97
+264.07 , -4417.36 , -99.45
+264.07 , -3533.89 , -77.77
+264.07 , -2650.42 , -55.91
+264.07 , -1766.95 , -33.75
+264.07 , -883.47 , -10.40
+264.07 , -176.69 , 0.00
+264.07 , 153.22 , 11.76
+264.07 , 766.09 , 32.74
+264.07 , 1532.18 , 57.10
+264.07 , 2298.27 , 81.29
+264.07 , 3064.36 , 105.53
+264.07 , 3830.44 , 129.86
+264.07 , 4596.53 , 154.29
+264.07 , 5362.62 , 178.85
+264.07 , 6128.71 , 203.52
+264.07 , 6894.80 , 228.31
+264.07 , 7660.89 , 253.23
+264.07 , 8426.98 , 278.27
+264.07 , 9193.07 , 303.44
+264.07 , 9959.16 , 328.73
+264.07 , 10725.24 , 354.14
+264.07 , 11491.33 , 379.68
+264.07 , 12257.42 , 405.34
+264.07 , 13023.51 , 431.13
+264.07 , 13789.60 , 457.03
+264.07 , 14555.69 , 483.07
+264.07 , 15321.78 , 509.22
+282.93 , -17669.46 , -434.93
+282.93 , -16785.99 , -413.98
+282.93 , -15902.51 , -392.88
+282.93 , -15019.04 , -371.64
+282.93 , -14135.57 , -350.25
+282.93 , -13252.09 , -328.71
+282.93 , -12368.62 , -307.03
+282.93 , -11485.15 , -285.20
+282.93 , -10601.68 , -263.22
+282.93 , -9718.20 , -241.10
+282.93 , -8834.73 , -218.83
+282.93 , -7951.26 , -196.41
+282.93 , -7067.78 , -173.85
+282.93 , -6184.31 , -151.13
+282.93 , -5300.84 , -128.26
+282.93 , -4417.36 , -105.23
+282.93 , -3533.89 , -82.02
+282.93 , -2650.42 , -58.59
+282.93 , -1766.95 , -34.77
+282.93 , -883.47 , -9.14
+282.93 , -176.69 , 0.00
+282.93 , 153.22 , 13.25
+282.93 , 766.09 , 36.05
+282.93 , 1532.18 , 62.25
+282.93 , 2298.27 , 88.23
+282.93 , 3064.36 , 114.25
+282.93 , 3830.44 , 140.36
+282.93 , 4596.53 , 166.59
+282.93 , 5362.62 , 192.95
+282.93 , 6128.71 , 219.45
+282.93 , 6894.80 , 246.08
+282.93 , 7660.89 , 272.86
+282.93 , 8426.98 , 299.77
+282.93 , 9193.07 , 326.82
+282.93 , 9959.16 , 354.02
+282.93 , 10725.24 , 381.35
+282.93 , 11491.33 , 408.83
+282.93 , 12257.42 , 436.45
+282.93 , 13023.51 , 464.20
+282.93 , 13789.60 , 492.10
+282.93 , 14555.69 , 520.14
+282.93 , 15321.78 , 548.31
+301.79 , -17669.46 , -460.78
+301.79 , -16785.99 , -438.62
+301.79 , -15902.51 , -416.28
+301.79 , -15019.04 , -393.78
+301.79 , -14135.57 , -371.11
+301.79 , -13252.09 , -348.28
+301.79 , -12368.62 , -325.28
+301.79 , -11485.15 , -302.11
+301.79 , -10601.68 , -278.78
+301.79 , -9718.20 , -255.29
+301.79 , -8834.73 , -231.62
+301.79 , -7951.26 , -207.79
+301.79 , -7067.78 , -183.79
+301.79 , -6184.31 , -159.62
+301.79 , -5300.84 , -135.27
+301.79 , -4417.36 , -110.74
+301.79 , -3533.89 , -85.99
+301.79 , -2650.42 , -60.98
+301.79 , -1766.95 , -35.47
+301.79 , -883.47 , -7.05
+301.79 , -176.69 , 0.00
+301.79 , 153.22 , 14.84
+301.79 , 766.09 , 39.53
+301.79 , 1532.18 , 67.60
+301.79 , 2298.27 , 95.38
+301.79 , 3064.36 , 123.18
+301.79 , 3830.44 , 151.09
+301.79 , 4596.53 , 179.12
+301.79 , 5362.62 , 207.30
+301.79 , 6128.71 , 235.63
+301.79 , 6894.80 , 264.12
+301.79 , 7660.89 , 292.76
+301.79 , 8426.98 , 321.56
+301.79 , 9193.07 , 350.51
+301.79 , 9959.16 , 379.63
+301.79 , 10725.24 , 408.90
+301.79 , 11491.33 , 438.33
+301.79 , 12257.42 , 467.92
+301.79 , 13023.51 , 497.67
+301.79 , 13789.60 , 527.57
+301.79 , 14555.69 , 557.64
+301.79 , 15321.78 , 587.85
+320.65 , -17669.46 , -486.12
+320.65 , -16785.99 , -462.76
+320.65 , -15902.51 , -439.22
+320.65 , -15019.04 , -415.48
+320.65 , -14135.57 , -391.56
+320.65 , -13252.09 , -367.45
+320.65 , -12368.62 , -343.15
+320.65 , -11485.15 , -318.67
+320.65 , -10601.68 , -294.00
+320.65 , -9718.20 , -269.14
+320.65 , -8834.73 , -244.09
+320.65 , -7951.26 , -218.86
+320.65 , -7067.78 , -193.44
+320.65 , -6184.31 , -167.82
+320.65 , -5300.84 , -142.00
+320.65 , -4417.36 , -115.96
+320.65 , -3533.89 , -89.67
+320.65 , -2650.42 , -63.06
+320.65 , -1766.95 , -35.80
+320.65 , -883.47 , -3.22
+320.65 , -176.69 , 0.00
+320.65 , 153.22 , 16.54
+320.65 , 766.09 , 43.18
+320.65 , 1532.18 , 73.16
+320.65 , 2298.27 , 102.75
+320.65 , 3064.36 , 132.35
+320.65 , 3830.44 , 162.06
+320.65 , 4596.53 , 191.91
+320.65 , 5362.62 , 221.91
+320.65 , 6128.71 , 252.09
+320.65 , 6894.80 , 282.44
+320.65 , 7660.89 , 312.96
+320.65 , 8426.98 , 343.65
+320.65 , 9193.07 , 374.52
+320.65 , 9959.16 , 405.57
+320.65 , 10725.24 , 436.80
+320.65 , 11491.33 , 468.20
+320.65 , 12257.42 , 499.78
+320.65 , 13023.51 , 531.53
+320.65 , 13789.60 , 563.46
+320.65 , 14555.69 , 595.57
+320.65 , 15321.78 , 627.85
+339.52 , -17669.46 , -510.93
+339.52 , -16785.99 , -486.40
+339.52 , -15902.51 , -461.67
+339.52 , -15019.04 , -436.72
+339.52 , -14135.57 , -411.56
+339.52 , -13252.09 , -386.20
+339.52 , -12368.62 , -360.62
+339.52 , -11485.15 , -334.84
+339.52 , -10601.68 , -308.84
+339.52 , -9718.20 , -282.64
+339.52 , -8834.73 , -256.22
+339.52 , -7951.26 , -229.60
+339.52 , -7067.78 , -202.76
+339.52 , -6184.31 , -175.70
+339.52 , -5300.84 , -148.41
+339.52 , -4417.36 , -120.87
+339.52 , -3533.89 , -93.04
+339.52 , -2650.42 , -64.80
+339.52 , -1766.95 , -35.73
+339.52 , -883.47 , 0.00
+339.52 , -176.69 , 0.00
+339.52 , 153.22 , 18.35
+339.52 , 766.09 , 47.02
+339.52 , 1532.18 , 78.93
+339.52 , 2298.27 , 110.35
+339.52 , 3064.36 , 141.76
+339.52 , 3830.44 , 173.28
+339.52 , 4596.53 , 204.95
+339.52 , 5362.62 , 236.80
+339.52 , 6128.71 , 268.83
+339.52 , 6894.80 , 301.04
+339.52 , 7660.89 , 333.46
+339.52 , 8426.98 , 366.06
+339.52 , 9193.07 , 398.86
+339.52 , 9959.16 , 431.86
+339.52 , 10725.24 , 465.05
+339.52 , 11491.33 , 498.44
+339.52 , 12257.42 , 532.03
+339.52 , 13023.51 , 565.81
+339.52 , 13789.60 , 599.79
+339.52 , 14555.69 , 633.96
+339.52 , 15321.78 , 668.33
+358.38 , -17669.46 , -535.19
+358.38 , -16785.99 , -509.52
+358.38 , -15902.51 , -483.62
+358.38 , -15019.04 , -457.48
+358.38 , -14135.57 , -431.11
+358.38 , -13252.09 , -404.51
+358.38 , -12368.62 , -377.67
+358.38 , -11485.15 , -350.60
+358.38 , -10601.68 , -323.30
+358.38 , -9718.20 , -295.76
+358.38 , -8834.73 , -267.99
+358.38 , -7951.26 , -239.99
+358.38 , -7067.78 , -211.74
+358.38 , -6184.31 , -183.24
+358.38 , -5300.84 , -154.48
+358.38 , -4417.36 , -125.44
+358.38 , -3533.89 , -96.05
+358.38 , -2650.42 , -66.18
+358.38 , -1766.95 , -35.19
+358.38 , -883.47 , 0.00
+358.38 , -176.69 , 0.00
+358.38 , 153.22 , 20.27
+358.38 , 766.09 , 51.05
+358.38 , 1532.18 , 84.92
+358.38 , 2298.27 , 118.19
+358.38 , 3064.36 , 151.42
+358.38 , 3830.44 , 184.76
+358.38 , 4596.53 , 218.27
+358.38 , 5362.62 , 251.96
+358.38 , 6128.71 , 285.86
+358.38 , 6894.80 , 319.96
+358.38 , 7660.89 , 354.27
+358.38 , 8426.98 , 388.80
+358.38 , 9193.07 , 423.54
+358.38 , 9959.16 , 458.50
+358.38 , 10725.24 , 493.68
+358.38 , 11491.33 , 529.07
+358.38 , 12257.42 , 564.68
+358.38 , 13023.51 , 600.51
+358.38 , 13789.60 , 636.55
+358.38 , 14555.69 , 672.81
+358.38 , 15321.78 , 709.28
+377.24 , -17669.46 , -558.87
+377.24 , -16785.99 , -532.09
+377.24 , -15902.51 , -505.05
+377.24 , -15019.04 , -477.75
+377.24 , -14135.57 , -450.19
+377.24 , -13252.09 , -422.37
+377.24 , -12368.62 , -394.29
+377.24 , -11485.15 , -365.95
+377.24 , -10601.68 , -337.36
+377.24 , -9718.20 , -308.50
+377.24 , -8834.73 , -279.38
+377.24 , -7951.26 , -250.00
+377.24 , -7067.78 , -220.35
+377.24 , -6184.31 , -190.43
+377.24 , -5300.84 , -160.20
+377.24 , -4417.36 , -129.65
+377.24 , -3533.89 , -98.70
+377.24 , -2650.42 , -67.15
+377.24 , -1766.95 , -34.12
+377.24 , -883.47 , 0.00
+377.24 , -176.69 , 0.00
+377.24 , 153.22 , 22.30
+377.24 , 766.09 , 55.27
+377.24 , 1532.18 , 91.14
+377.24 , 2298.27 , 126.27
+377.24 , 3064.36 , 161.34
+377.24 , 3830.44 , 196.52
+377.24 , 4596.53 , 231.87
+377.24 , 5362.62 , 267.42
+377.24 , 6128.71 , 303.19
+377.24 , 6894.80 , 339.18
+377.24 , 7660.89 , 375.41
+377.24 , 8426.98 , 411.87
+377.24 , 9193.07 , 448.57
+377.24 , 9959.16 , 485.51
+377.24 , 10725.24 , 522.68
+377.24 , 11491.33 , 560.09
+377.24 , 12257.42 , 597.75
+377.24 , 13023.51 , 635.63
+377.24 , 13789.60 , 673.76
+377.24 , 14555.69 , 712.12
+377.24 , 15321.78 , 750.73
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_2.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..b5980ac32ff2f44452666e544ce91c462f5c5a7f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -9785.31 , 0.00
+0.00 , -9296.05 , 0.00
+0.00 , -8806.78 , 0.00
+0.00 , -8317.52 , 0.00
+0.00 , -7828.25 , 0.00
+0.00 , -7338.98 , 0.00
+0.00 , -6849.72 , -0.07
+0.00 , -6360.45 , -0.33
+0.00 , -5871.19 , -0.49
+0.00 , -5381.92 , -0.60
+0.00 , -4892.66 , -0.66
+0.00 , -4403.39 , -0.69
+0.00 , -3914.12 , -0.70
+0.00 , -3424.86 , -0.67
+0.00 , -2935.59 , -0.63
+0.00 , -2446.33 , -0.57
+0.00 , -1957.06 , -0.48
+0.00 , -1467.80 , -0.38
+0.00 , -978.53 , -0.27
+0.00 , -489.27 , -0.13
+0.00 , -97.85 , -0.01
+0.00 , 86.63 , 0.06
+0.00 , 433.14 , 0.28
+0.00 , 866.29 , 0.56
+0.00 , 1299.43 , 0.85
+0.00 , 1732.57 , 1.15
+0.00 , 2165.72 , 1.47
+0.00 , 2598.86 , 1.79
+0.00 , 3032.00 , 2.12
+0.00 , 3465.15 , 2.47
+0.00 , 3898.29 , 2.82
+0.00 , 4331.43 , 3.19
+0.00 , 4764.58 , 3.56
+0.00 , 5197.72 , 3.94
+0.00 , 5630.86 , 4.33
+0.00 , 6064.01 , 4.74
+0.00 , 6497.15 , 5.15
+0.00 , 6930.29 , 5.57
+0.00 , 7363.44 , 6.00
+0.00 , 7796.58 , 6.43
+0.00 , 8229.72 , 6.88
+0.00 , 8662.87 , 7.34
+3.37 , -9785.31 , 0.00
+3.37 , -9296.05 , 0.00
+3.37 , -8806.78 , 0.00
+3.37 , -8317.52 , 0.00
+3.37 , -7828.25 , 0.00
+3.37 , -7338.98 , 0.00
+3.37 , -6849.72 , -0.25
+3.37 , -6360.45 , -0.42
+3.37 , -5871.19 , -0.52
+3.37 , -5381.92 , -0.58
+3.37 , -4892.66 , -0.61
+3.37 , -4403.39 , -0.62
+3.37 , -3914.12 , -0.61
+3.37 , -3424.86 , -0.58
+3.37 , -2935.59 , -0.53
+3.37 , -2446.33 , -0.47
+3.37 , -1957.06 , -0.40
+3.37 , -1467.80 , -0.31
+3.37 , -978.53 , -0.22
+3.37 , -489.27 , -0.11
+3.37 , -97.85 , -0.01
+3.37 , 86.63 , 0.05
+3.37 , 433.14 , 0.21
+3.37 , 866.29 , 0.43
+3.37 , 1299.43 , 0.65
+3.37 , 1732.57 , 0.88
+3.37 , 2165.72 , 1.11
+3.37 , 2598.86 , 1.36
+3.37 , 3032.00 , 1.61
+3.37 , 3465.15 , 1.87
+3.37 , 3898.29 , 2.13
+3.37 , 4331.43 , 2.40
+3.37 , 4764.58 , 2.68
+3.37 , 5197.72 , 2.97
+3.37 , 5630.86 , 3.26
+3.37 , 6064.01 , 3.56
+3.37 , 6497.15 , 3.86
+3.37 , 6930.29 , 4.18
+3.37 , 7363.44 , 4.50
+3.37 , 7796.58 , 4.82
+3.37 , 8229.72 , 5.15
+3.37 , 8662.87 , 5.49
+33.71 , -9785.31 , -29.05
+33.71 , -9296.05 , -27.68
+33.71 , -8806.78 , -26.31
+33.71 , -8317.52 , -24.92
+33.71 , -7828.25 , -23.53
+33.71 , -7338.98 , -22.12
+33.71 , -6849.72 , -20.71
+33.71 , -6360.45 , -19.28
+33.71 , -5871.19 , -17.85
+33.71 , -5381.92 , -16.41
+33.71 , -4892.66 , -14.95
+33.71 , -4403.39 , -13.49
+33.71 , -3914.12 , -12.02
+33.71 , -3424.86 , -10.53
+33.71 , -2935.59 , -9.04
+33.71 , -2446.33 , -7.54
+33.71 , -1957.06 , -6.03
+33.71 , -1467.80 , -4.51
+33.71 , -978.53 , -2.98
+33.71 , -489.27 , -1.44
+33.71 , -97.85 , -0.18
+33.71 , 86.63 , 0.45
+33.71 , 433.14 , 1.84
+33.71 , 866.29 , 3.58
+33.71 , 1299.43 , 5.33
+33.71 , 1732.57 , 7.09
+33.71 , 2165.72 , 8.85
+33.71 , 2598.86 , 10.63
+33.71 , 3032.00 , 12.42
+33.71 , 3465.15 , 14.21
+33.71 , 3898.29 , 16.02
+33.71 , 4331.43 , 17.84
+33.71 , 4764.58 , 19.66
+33.71 , 5197.72 , 21.49
+33.71 , 5630.86 , 23.34
+33.71 , 6064.01 , 25.19
+33.71 , 6497.15 , 27.05
+33.71 , 6930.29 , 28.93
+33.71 , 7363.44 , 30.81
+33.71 , 7796.58 , 32.70
+33.71 , 8229.72 , 34.60
+33.71 , 8662.87 , 36.50
+67.42 , -9785.31 , -60.28
+67.42 , -9296.05 , -57.37
+67.42 , -8806.78 , -54.44
+67.42 , -8317.52 , -51.49
+67.42 , -7828.25 , -48.54
+67.42 , -7338.98 , -45.58
+67.42 , -6849.72 , -42.60
+67.42 , -6360.45 , -39.61
+67.42 , -5871.19 , -36.61
+67.42 , -5381.92 , -33.60
+67.42 , -4892.66 , -30.58
+67.42 , -4403.39 , -27.55
+67.42 , -3914.12 , -24.51
+67.42 , -3424.86 , -21.45
+67.42 , -2935.59 , -18.38
+67.42 , -2446.33 , -15.31
+67.42 , -1957.06 , -12.22
+67.42 , -1467.80 , -9.12
+67.42 , -978.53 , -6.00
+67.42 , -489.27 , -2.88
+67.42 , -97.85 , -0.33
+67.42 , 86.63 , 0.92
+67.42 , 433.14 , 3.68
+67.42 , 866.29 , 7.11
+67.42 , 1299.43 , 10.56
+67.42 , 1732.57 , 14.01
+67.42 , 2165.72 , 17.48
+67.42 , 2598.86 , 20.96
+67.42 , 3032.00 , 24.45
+67.42 , 3465.15 , 27.95
+67.42 , 3898.29 , 31.47
+67.42 , 4331.43 , 34.99
+67.42 , 4764.58 , 38.53
+67.42 , 5197.72 , 42.08
+67.42 , 5630.86 , 45.64
+67.42 , 6064.01 , 49.21
+67.42 , 6497.15 , 52.79
+67.42 , 6930.29 , 56.38
+67.42 , 7363.44 , 59.99
+67.42 , 7796.58 , 63.60
+67.42 , 8229.72 , 67.23
+67.42 , 8662.87 , 70.87
+101.12 , -9785.31 , -91.22
+101.12 , -9296.05 , -86.77
+101.12 , -8806.78 , -82.31
+101.12 , -8317.52 , -77.84
+101.12 , -7828.25 , -73.35
+101.12 , -7338.98 , -68.84
+101.12 , -6849.72 , -64.32
+101.12 , -6360.45 , -59.79
+101.12 , -5871.19 , -55.24
+101.12 , -5381.92 , -50.68
+101.12 , -4892.66 , -46.11
+101.12 , -4403.39 , -41.51
+101.12 , -3914.12 , -36.91
+101.12 , -3424.86 , -32.29
+101.12 , -2935.59 , -27.66
+101.12 , -2446.33 , -23.01
+101.12 , -1957.06 , -18.35
+101.12 , -1467.80 , -13.67
+101.12 , -978.53 , -8.98
+101.12 , -489.27 , -4.27
+101.12 , -97.85 , -0.39
+101.12 , 86.63 , 1.43
+101.12 , 433.14 , 5.56
+101.12 , 866.29 , 10.69
+101.12 , 1299.43 , 15.84
+101.12 , 1732.57 , 21.00
+101.12 , 2165.72 , 26.17
+101.12 , 2598.86 , 31.36
+101.12 , 3032.00 , 36.56
+101.12 , 3465.15 , 41.77
+101.12 , 3898.29 , 47.01
+101.12 , 4331.43 , 52.25
+101.12 , 4764.58 , 57.51
+101.12 , 5197.72 , 62.79
+101.12 , 5630.86 , 68.08
+101.12 , 6064.01 , 73.38
+101.12 , 6497.15 , 78.70
+101.12 , 6930.29 , 84.03
+101.12 , 7363.44 , 89.38
+101.12 , 7796.58 , 94.74
+101.12 , 8229.72 , 100.12
+101.12 , 8662.87 , 105.51
+134.83 , -9785.31 , -121.86
+134.83 , -9296.05 , -115.91
+134.83 , -8806.78 , -109.94
+134.83 , -8317.52 , -103.95
+134.83 , -7828.25 , -97.94
+134.83 , -7338.98 , -91.91
+134.83 , -6849.72 , -85.87
+134.83 , -6360.45 , -79.81
+134.83 , -5871.19 , -73.73
+134.83 , -5381.92 , -67.63
+134.83 , -4892.66 , -61.51
+134.83 , -4403.39 , -55.37
+134.83 , -3914.12 , -49.21
+134.83 , -3424.86 , -43.04
+134.83 , -2935.59 , -36.85
+134.83 , -2446.33 , -30.64
+134.83 , -1957.06 , -24.41
+134.83 , -1467.80 , -18.16
+134.83 , -978.53 , -11.89
+134.83 , -489.27 , -5.59
+134.83 , -97.85 , -0.32
+134.83 , 86.63 , 1.99
+134.83 , 433.14 , 7.50
+134.83 , 866.29 , 14.34
+134.83 , 1299.43 , 21.19
+134.83 , 1732.57 , 28.05
+134.83 , 2165.72 , 34.94
+134.83 , 2598.86 , 41.84
+134.83 , 3032.00 , 48.76
+134.83 , 3465.15 , 55.70
+134.83 , 3898.29 , 62.66
+134.83 , 4331.43 , 69.63
+134.83 , 4764.58 , 76.63
+134.83 , 5197.72 , 83.65
+134.83 , 5630.86 , 90.68
+134.83 , 6064.01 , 97.73
+134.83 , 6497.15 , 104.80
+134.83 , 6930.29 , 111.90
+134.83 , 7363.44 , 119.00
+134.83 , 7796.58 , 126.13
+134.83 , 8229.72 , 133.28
+134.83 , 8662.87 , 140.44
+168.54 , -9785.31 , -152.18
+168.54 , -9296.05 , -144.75
+168.54 , -8806.78 , -137.29
+168.54 , -8317.52 , -129.81
+168.54 , -7828.25 , -122.31
+168.54 , -7338.98 , -114.78
+168.54 , -6849.72 , -107.23
+168.54 , -6360.45 , -99.65
+168.54 , -5871.19 , -92.05
+168.54 , -5381.92 , -84.42
+168.54 , -4892.66 , -76.77
+168.54 , -4403.39 , -69.10
+168.54 , -3914.12 , -61.41
+168.54 , -3424.86 , -53.69
+168.54 , -2935.59 , -45.94
+168.54 , -2446.33 , -38.17
+168.54 , -1957.06 , -30.38
+168.54 , -1467.80 , -22.57
+168.54 , -978.53 , -14.72
+168.54 , -489.27 , -6.84
+168.54 , -97.85 , 0.00
+168.54 , 86.63 , 2.61
+168.54 , 433.14 , 9.52
+168.54 , 866.29 , 18.06
+168.54 , 1299.43 , 26.62
+168.54 , 1732.57 , 35.19
+168.54 , 2165.72 , 43.79
+168.54 , 2598.86 , 52.42
+168.54 , 3032.00 , 61.07
+168.54 , 3465.15 , 69.74
+168.54 , 3898.29 , 78.43
+168.54 , 4331.43 , 87.15
+168.54 , 4764.58 , 95.90
+168.54 , 5197.72 , 104.67
+168.54 , 5630.86 , 113.46
+168.54 , 6064.01 , 122.28
+168.54 , 6497.15 , 131.12
+168.54 , 6930.29 , 139.99
+168.54 , 7363.44 , 148.88
+168.54 , 7796.58 , 157.79
+168.54 , 8229.72 , 166.73
+168.54 , 8662.87 , 175.69
+202.25 , -9785.31 , -182.19
+202.25 , -9296.05 , -173.29
+202.25 , -8806.78 , -164.37
+202.25 , -8317.52 , -155.42
+202.25 , -7828.25 , -146.44
+202.25 , -7338.98 , -137.42
+202.25 , -6849.72 , -128.38
+202.25 , -6360.45 , -119.30
+202.25 , -5871.19 , -110.20
+202.25 , -5381.92 , -101.06
+202.25 , -4892.66 , -91.89
+202.25 , -4403.39 , -82.70
+202.25 , -3914.12 , -73.47
+202.25 , -3424.86 , -64.21
+202.25 , -2935.59 , -54.93
+202.25 , -2446.33 , -45.61
+202.25 , -1957.06 , -36.26
+202.25 , -1467.80 , -26.87
+202.25 , -978.53 , -17.46
+202.25 , -489.27 , -7.98
+202.25 , -97.85 , 0.00
+202.25 , 86.63 , 3.29
+202.25 , 433.14 , 11.62
+202.25 , 866.29 , 21.88
+202.25 , 1299.43 , 32.14
+202.25 , 1732.57 , 42.44
+202.25 , 2165.72 , 52.76
+202.25 , 2598.86 , 63.11
+202.25 , 3032.00 , 73.49
+202.25 , 3465.15 , 83.91
+202.25 , 3898.29 , 94.35
+202.25 , 4331.43 , 104.82
+202.25 , 4764.58 , 115.33
+202.25 , 5197.72 , 125.87
+202.25 , 5630.86 , 136.43
+202.25 , 6064.01 , 147.03
+202.25 , 6497.15 , 157.66
+202.25 , 6930.29 , 168.32
+202.25 , 7363.44 , 179.01
+202.25 , 7796.58 , 189.74
+202.25 , 8229.72 , 200.49
+202.25 , 8662.87 , 211.27
+235.96 , -9785.31 , -211.85
+235.96 , -9296.05 , -201.52
+235.96 , -8806.78 , -191.16
+235.96 , -8317.52 , -180.75
+235.96 , -7828.25 , -170.31
+235.96 , -7338.98 , -159.83
+235.96 , -6849.72 , -149.31
+235.96 , -6360.45 , -138.75
+235.96 , -5871.19 , -128.16
+235.96 , -5381.92 , -117.52
+235.96 , -4892.66 , -106.85
+235.96 , -4403.39 , -96.14
+235.96 , -3914.12 , -85.39
+235.96 , -3424.86 , -74.61
+235.96 , -2935.59 , -63.78
+235.96 , -2446.33 , -52.92
+235.96 , -1957.06 , -42.02
+235.96 , -1467.80 , -31.07
+235.96 , -978.53 , -20.08
+235.96 , -489.27 , -9.00
+235.96 , -97.85 , 0.00
+235.96 , 86.63 , 4.05
+235.96 , 433.14 , 13.82
+235.96 , 866.29 , 25.80
+235.96 , 1299.43 , 37.78
+235.96 , 1732.57 , 49.79
+235.96 , 2165.72 , 61.84
+235.96 , 2598.86 , 73.93
+235.96 , 3032.00 , 86.05
+235.96 , 3465.15 , 98.22
+235.96 , 3898.29 , 110.42
+235.96 , 4331.43 , 122.66
+235.96 , 4764.58 , 134.94
+235.96 , 5197.72 , 147.26
+235.96 , 5630.86 , 159.61
+235.96 , 6064.01 , 172.01
+235.96 , 6497.15 , 184.44
+235.96 , 6930.29 , 196.92
+235.96 , 7363.44 , 209.43
+235.96 , 7796.58 , 221.98
+235.96 , 8229.72 , 234.57
+235.96 , 8662.87 , 247.19
+269.67 , -9785.31 , -241.15
+269.67 , -9296.05 , -229.41
+269.67 , -8806.78 , -217.63
+269.67 , -8317.52 , -205.79
+269.67 , -7828.25 , -193.91
+269.67 , -7338.98 , -181.98
+269.67 , -6849.72 , -170.01
+269.67 , -6360.45 , -157.99
+269.67 , -5871.19 , -145.91
+269.67 , -5381.92 , -133.80
+269.67 , -4892.66 , -121.63
+269.67 , -4403.39 , -109.42
+269.67 , -3914.12 , -97.16
+269.67 , -3424.86 , -84.85
+269.67 , -2935.59 , -72.50
+269.67 , -2446.33 , -60.10
+269.67 , -1957.06 , -47.65
+269.67 , -1467.80 , -35.14
+269.67 , -978.53 , -22.57
+269.67 , -489.27 , -9.88
+269.67 , -97.85 , 0.00
+269.67 , 86.63 , 4.88
+269.67 , 433.14 , 16.13
+269.67 , 866.29 , 29.83
+269.67 , 1299.43 , 43.53
+269.67 , 1732.57 , 57.27
+269.67 , 2165.72 , 71.06
+269.67 , 2598.86 , 84.89
+269.67 , 3032.00 , 98.76
+269.67 , 3465.15 , 112.68
+269.67 , 3898.29 , 126.65
+269.67 , 4331.43 , 140.67
+269.67 , 4764.58 , 154.74
+269.67 , 5197.72 , 168.85
+269.67 , 5630.86 , 183.01
+269.67 , 6064.01 , 197.22
+269.67 , 6497.15 , 211.48
+269.67 , 6930.29 , 225.78
+269.67 , 7363.44 , 240.13
+269.67 , 7796.58 , 254.53
+269.67 , 8229.72 , 268.97
+269.67 , 8662.87 , 283.46
+303.37 , -9785.31 , -270.09
+303.37 , -9296.05 , -256.96
+303.37 , -8806.78 , -243.78
+303.37 , -8317.52 , -230.53
+303.37 , -7828.25 , -217.23
+303.37 , -7338.98 , -203.87
+303.37 , -6849.72 , -190.46
+303.37 , -6360.45 , -176.98
+303.37 , -5871.19 , -163.45
+303.37 , -5381.92 , -149.87
+303.37 , -4892.66 , -136.22
+303.37 , -4403.39 , -122.52
+303.37 , -3914.12 , -108.76
+303.37 , -3424.86 , -94.94
+303.37 , -2935.59 , -81.06
+303.37 , -2446.33 , -67.13
+303.37 , -1957.06 , -53.13
+303.37 , -1467.80 , -39.07
+303.37 , -978.53 , -24.92
+303.37 , -489.27 , -10.59
+303.37 , -97.85 , 0.00
+303.37 , 86.63 , 5.80
+303.37 , 433.14 , 18.55
+303.37 , 866.29 , 33.99
+303.37 , 1299.43 , 49.42
+303.37 , 1732.57 , 64.90
+303.37 , 2165.72 , 80.42
+303.37 , 2598.86 , 96.00
+303.37 , 3032.00 , 111.63
+303.37 , 3465.15 , 127.32
+303.37 , 3898.29 , 143.07
+303.37 , 4331.43 , 158.88
+303.37 , 4764.58 , 174.74
+303.37 , 5197.72 , 190.66
+303.37 , 5630.86 , 206.64
+303.37 , 6064.01 , 222.68
+303.37 , 6497.15 , 238.77
+303.37 , 6930.29 , 254.92
+303.37 , 7363.44 , 271.13
+303.37 , 7796.58 , 287.40
+303.37 , 8229.72 , 303.72
+303.37 , 8662.87 , 320.10
+337.08 , -9785.31 , -298.63
+337.08 , -9296.05 , -284.14
+337.08 , -8806.78 , -269.58
+337.08 , -8317.52 , -254.95
+337.08 , -7828.25 , -240.25
+337.08 , -7338.98 , -225.48
+337.08 , -6849.72 , -210.64
+337.08 , -6360.45 , -195.74
+337.08 , -5871.19 , -180.76
+337.08 , -5381.92 , -165.71
+337.08 , -4892.66 , -150.60
+337.08 , -4403.39 , -135.42
+337.08 , -3914.12 , -120.16
+337.08 , -3424.86 , -104.84
+337.08 , -2935.59 , -89.45
+337.08 , -2446.33 , -73.99
+337.08 , -1957.06 , -58.45
+337.08 , -1467.80 , -42.83
+337.08 , -978.53 , -27.10
+337.08 , -489.27 , -11.12
+337.08 , -97.85 , 0.00
+337.08 , 86.63 , 6.80
+337.08 , 433.14 , 21.10
+337.08 , 866.29 , 38.29
+337.08 , 1299.43 , 55.46
+337.08 , 1732.57 , 72.67
+337.08 , 2165.72 , 89.94
+337.08 , 2598.86 , 107.27
+337.08 , 3032.00 , 124.67
+337.08 , 3465.15 , 142.14
+337.08 , 3898.29 , 159.68
+337.08 , 4331.43 , 177.29
+337.08 , 4764.58 , 194.96
+337.08 , 5197.72 , 212.70
+337.08 , 5630.86 , 230.52
+337.08 , 6064.01 , 248.40
+337.08 , 6497.15 , 266.35
+337.08 , 6930.29 , 284.37
+337.08 , 7363.44 , 302.45
+337.08 , 7796.58 , 320.61
+337.08 , 8229.72 , 338.83
+337.08 , 8662.87 , 357.12
+370.79 , -9785.31 , -326.77
+370.79 , -9296.05 , -310.94
+370.79 , -8806.78 , -295.03
+370.79 , -8317.52 , -279.03
+370.79 , -7828.25 , -262.95
+370.79 , -7338.98 , -246.79
+370.79 , -6849.72 , -230.55
+370.79 , -6360.45 , -214.22
+370.79 , -5871.19 , -197.81
+370.79 , -5381.92 , -181.33
+370.79 , -4892.66 , -164.76
+370.79 , -4403.39 , -148.10
+370.79 , -3914.12 , -131.37
+370.79 , -3424.86 , -114.55
+370.79 , -2935.59 , -97.65
+370.79 , -2446.33 , -80.67
+370.79 , -1957.06 , -63.59
+370.79 , -1467.80 , -46.42
+370.79 , -978.53 , -29.10
+370.79 , -489.27 , -11.41
+370.79 , -97.85 , 0.00
+370.79 , 86.63 , 7.90
+370.79 , 433.14 , 23.79
+370.79 , 866.29 , 42.74
+370.79 , 1299.43 , 61.65
+370.79 , 1732.57 , 80.61
+370.79 , 2165.72 , 99.63
+370.79 , 2598.86 , 118.73
+370.79 , 3032.00 , 137.91
+370.79 , 3465.15 , 157.16
+370.79 , 3898.29 , 176.50
+370.79 , 4331.43 , 195.91
+370.79 , 4764.58 , 215.41
+370.79 , 5197.72 , 234.99
+370.79 , 5630.86 , 254.65
+370.79 , 6064.01 , 274.39
+370.79 , 6497.15 , 294.21
+370.79 , 6930.29 , 314.12
+370.79 , 7363.44 , 334.10
+370.79 , 7796.58 , 354.16
+370.79 , 8229.72 , 374.31
+370.79 , 8662.87 , 394.53
+404.50 , -9785.31 , -354.49
+404.50 , -9296.05 , -337.34
+404.50 , -8806.78 , -320.10
+404.50 , -8317.52 , -302.75
+404.50 , -7828.25 , -285.32
+404.50 , -7338.98 , -267.78
+404.50 , -6849.72 , -250.15
+404.50 , -6360.45 , -232.43
+404.50 , -5871.19 , -214.60
+404.50 , -5381.92 , -196.69
+404.50 , -4892.66 , -178.67
+404.50 , -4403.39 , -160.56
+404.50 , -3914.12 , -142.36
+404.50 , -3424.86 , -124.05
+404.50 , -2935.59 , -105.65
+404.50 , -2446.33 , -87.15
+404.50 , -1957.06 , -68.54
+404.50 , -1467.80 , -49.80
+404.50 , -978.53 , -30.89
+404.50 , -489.27 , -11.43
+404.50 , -97.85 , 0.00
+404.50 , 86.63 , 9.08
+404.50 , 433.14 , 26.62
+404.50 , 866.29 , 47.35
+404.50 , 1299.43 , 68.02
+404.50 , 1732.57 , 88.72
+404.50 , 2165.72 , 109.51
+404.50 , 2598.86 , 130.38
+404.50 , 3032.00 , 151.34
+404.50 , 3465.15 , 172.39
+404.50 , 3898.29 , 193.53
+404.50 , 4331.43 , 214.77
+404.50 , 4764.58 , 236.11
+404.50 , 5197.72 , 257.53
+404.50 , 5630.86 , 279.05
+404.50 , 6064.01 , 300.67
+404.50 , 6497.15 , 322.38
+404.50 , 6930.29 , 344.19
+404.50 , 7363.44 , 366.08
+404.50 , 7796.58 , 388.08
+404.50 , 8229.72 , 410.16
+404.50 , 8662.87 , 432.34
+438.21 , -9785.31 , -381.77
+438.21 , -9296.05 , -363.33
+438.21 , -8806.78 , -344.77
+438.21 , -8317.52 , -326.11
+438.21 , -7828.25 , -307.33
+438.21 , -7338.98 , -288.45
+438.21 , -6849.72 , -269.45
+438.21 , -6360.45 , -250.33
+438.21 , -5871.19 , -231.11
+438.21 , -5381.92 , -211.78
+438.21 , -4892.66 , -192.34
+438.21 , -4403.39 , -172.78
+438.21 , -3914.12 , -153.11
+438.21 , -3424.86 , -133.33
+438.21 , -2935.59 , -113.43
+438.21 , -2446.33 , -93.42
+438.21 , -1957.06 , -73.27
+438.21 , -1467.80 , -52.98
+438.21 , -978.53 , -32.45
+438.21 , -489.27 , -11.12
+438.21 , -97.85 , 0.00
+438.21 , 86.63 , 10.37
+438.21 , 433.14 , 29.60
+438.21 , 866.29 , 52.14
+438.21 , 1299.43 , 74.56
+438.21 , 1732.57 , 97.03
+438.21 , 2165.72 , 119.58
+438.21 , 2598.86 , 142.23
+438.21 , 3032.00 , 164.98
+438.21 , 3465.15 , 187.84
+438.21 , 3898.29 , 210.80
+438.21 , 4331.43 , 233.87
+438.21 , 4764.58 , 257.05
+438.21 , 5197.72 , 280.34
+438.21 , 5630.86 , 303.74
+438.21 , 6064.01 , 327.25
+438.21 , 6497.15 , 350.87
+438.21 , 6930.29 , 374.59
+438.21 , 7363.44 , 398.42
+438.21 , 7796.58 , 422.36
+438.21 , 8229.72 , 446.41
+438.21 , 8662.87 , 470.57
+471.92 , -9785.31 , -408.59
+471.92 , -9296.05 , -388.88
+471.92 , -8806.78 , -369.04
+471.92 , -8317.52 , -349.08
+471.92 , -7828.25 , -328.98
+471.92 , -7338.98 , -308.76
+471.92 , -6849.72 , -288.41
+471.92 , -6360.45 , -267.93
+471.92 , -5871.19 , -247.32
+471.92 , -5381.92 , -226.59
+471.92 , -4892.66 , -205.73
+471.92 , -4403.39 , -184.73
+471.92 , -3914.12 , -163.61
+471.92 , -3424.86 , -142.36
+471.92 , -2935.59 , -120.97
+471.92 , -2446.33 , -99.45
+471.92 , -1957.06 , -77.77
+471.92 , -1467.80 , -55.91
+471.92 , -978.53 , -33.75
+471.92 , -489.27 , -10.40
+471.92 , -97.85 , 0.00
+471.92 , 86.63 , 11.76
+471.92 , 433.14 , 32.74
+471.92 , 866.29 , 57.10
+471.92 , 1299.43 , 81.29
+471.92 , 1732.57 , 105.53
+471.92 , 2165.72 , 129.86
+471.92 , 2598.86 , 154.29
+471.92 , 3032.00 , 178.85
+471.92 , 3465.15 , 203.52
+471.92 , 3898.29 , 228.31
+471.92 , 4331.43 , 253.23
+471.92 , 4764.58 , 278.27
+471.92 , 5197.72 , 303.44
+471.92 , 5630.86 , 328.73
+471.92 , 6064.01 , 354.14
+471.92 , 6497.15 , 379.68
+471.92 , 6930.29 , 405.34
+471.92 , 7363.44 , 431.13
+471.92 , 7796.58 , 457.03
+471.92 , 8229.72 , 483.07
+471.92 , 8662.87 , 509.22
+505.62 , -9785.31 , -434.93
+505.62 , -9296.05 , -413.98
+505.62 , -8806.78 , -392.88
+505.62 , -8317.52 , -371.64
+505.62 , -7828.25 , -350.25
+505.62 , -7338.98 , -328.71
+505.62 , -6849.72 , -307.03
+505.62 , -6360.45 , -285.20
+505.62 , -5871.19 , -263.22
+505.62 , -5381.92 , -241.10
+505.62 , -4892.66 , -218.83
+505.62 , -4403.39 , -196.41
+505.62 , -3914.12 , -173.85
+505.62 , -3424.86 , -151.13
+505.62 , -2935.59 , -128.26
+505.62 , -2446.33 , -105.23
+505.62 , -1957.06 , -82.02
+505.62 , -1467.80 , -58.59
+505.62 , -978.53 , -34.77
+505.62 , -489.27 , -9.14
+505.62 , -97.85 , 0.00
+505.62 , 86.63 , 13.25
+505.62 , 433.14 , 36.05
+505.62 , 866.29 , 62.25
+505.62 , 1299.43 , 88.23
+505.62 , 1732.57 , 114.25
+505.62 , 2165.72 , 140.36
+505.62 , 2598.86 , 166.59
+505.62 , 3032.00 , 192.95
+505.62 , 3465.15 , 219.45
+505.62 , 3898.29 , 246.08
+505.62 , 4331.43 , 272.86
+505.62 , 4764.58 , 299.77
+505.62 , 5197.72 , 326.82
+505.62 , 5630.86 , 354.02
+505.62 , 6064.01 , 381.35
+505.62 , 6497.15 , 408.83
+505.62 , 6930.29 , 436.45
+505.62 , 7363.44 , 464.20
+505.62 , 7796.58 , 492.10
+505.62 , 8229.72 , 520.14
+505.62 , 8662.87 , 548.31
+539.33 , -9785.31 , -460.78
+539.33 , -9296.05 , -438.62
+539.33 , -8806.78 , -416.28
+539.33 , -8317.52 , -393.78
+539.33 , -7828.25 , -371.11
+539.33 , -7338.98 , -348.28
+539.33 , -6849.72 , -325.28
+539.33 , -6360.45 , -302.11
+539.33 , -5871.19 , -278.78
+539.33 , -5381.92 , -255.29
+539.33 , -4892.66 , -231.62
+539.33 , -4403.39 , -207.79
+539.33 , -3914.12 , -183.79
+539.33 , -3424.86 , -159.62
+539.33 , -2935.59 , -135.27
+539.33 , -2446.33 , -110.74
+539.33 , -1957.06 , -85.99
+539.33 , -1467.80 , -60.98
+539.33 , -978.53 , -35.47
+539.33 , -489.27 , -7.05
+539.33 , -97.85 , 0.00
+539.33 , 86.63 , 14.84
+539.33 , 433.14 , 39.53
+539.33 , 866.29 , 67.60
+539.33 , 1299.43 , 95.38
+539.33 , 1732.57 , 123.18
+539.33 , 2165.72 , 151.09
+539.33 , 2598.86 , 179.12
+539.33 , 3032.00 , 207.30
+539.33 , 3465.15 , 235.63
+539.33 , 3898.29 , 264.12
+539.33 , 4331.43 , 292.76
+539.33 , 4764.58 , 321.56
+539.33 , 5197.72 , 350.51
+539.33 , 5630.86 , 379.63
+539.33 , 6064.01 , 408.90
+539.33 , 6497.15 , 438.33
+539.33 , 6930.29 , 467.92
+539.33 , 7363.44 , 497.67
+539.33 , 7796.58 , 527.57
+539.33 , 8229.72 , 557.64
+539.33 , 8662.87 , 587.85
+573.04 , -9785.31 , -486.12
+573.04 , -9296.05 , -462.76
+573.04 , -8806.78 , -439.22
+573.04 , -8317.52 , -415.48
+573.04 , -7828.25 , -391.56
+573.04 , -7338.98 , -367.45
+573.04 , -6849.72 , -343.15
+573.04 , -6360.45 , -318.67
+573.04 , -5871.19 , -294.00
+573.04 , -5381.92 , -269.14
+573.04 , -4892.66 , -244.09
+573.04 , -4403.39 , -218.86
+573.04 , -3914.12 , -193.44
+573.04 , -3424.86 , -167.82
+573.04 , -2935.59 , -142.00
+573.04 , -2446.33 , -115.96
+573.04 , -1957.06 , -89.67
+573.04 , -1467.80 , -63.06
+573.04 , -978.53 , -35.80
+573.04 , -489.27 , -3.22
+573.04 , -97.85 , 0.00
+573.04 , 86.63 , 16.54
+573.04 , 433.14 , 43.18
+573.04 , 866.29 , 73.16
+573.04 , 1299.43 , 102.75
+573.04 , 1732.57 , 132.35
+573.04 , 2165.72 , 162.06
+573.04 , 2598.86 , 191.91
+573.04 , 3032.00 , 221.91
+573.04 , 3465.15 , 252.09
+573.04 , 3898.29 , 282.44
+573.04 , 4331.43 , 312.96
+573.04 , 4764.58 , 343.65
+573.04 , 5197.72 , 374.52
+573.04 , 5630.86 , 405.57
+573.04 , 6064.01 , 436.80
+573.04 , 6497.15 , 468.20
+573.04 , 6930.29 , 499.78
+573.04 , 7363.44 , 531.53
+573.04 , 7796.58 , 563.46
+573.04 , 8229.72 , 595.57
+573.04 , 8662.87 , 627.85
+606.75 , -9785.31 , -510.93
+606.75 , -9296.05 , -486.40
+606.75 , -8806.78 , -461.67
+606.75 , -8317.52 , -436.72
+606.75 , -7828.25 , -411.56
+606.75 , -7338.98 , -386.20
+606.75 , -6849.72 , -360.62
+606.75 , -6360.45 , -334.84
+606.75 , -5871.19 , -308.84
+606.75 , -5381.92 , -282.64
+606.75 , -4892.66 , -256.22
+606.75 , -4403.39 , -229.60
+606.75 , -3914.12 , -202.76
+606.75 , -3424.86 , -175.70
+606.75 , -2935.59 , -148.41
+606.75 , -2446.33 , -120.87
+606.75 , -1957.06 , -93.04
+606.75 , -1467.80 , -64.80
+606.75 , -978.53 , -35.73
+606.75 , -489.27 , 0.00
+606.75 , -97.85 , 0.00
+606.75 , 86.63 , 18.35
+606.75 , 433.14 , 47.02
+606.75 , 866.29 , 78.93
+606.75 , 1299.43 , 110.35
+606.75 , 1732.57 , 141.76
+606.75 , 2165.72 , 173.28
+606.75 , 2598.86 , 204.95
+606.75 , 3032.00 , 236.80
+606.75 , 3465.15 , 268.83
+606.75 , 3898.29 , 301.04
+606.75 , 4331.43 , 333.46
+606.75 , 4764.58 , 366.06
+606.75 , 5197.72 , 398.86
+606.75 , 5630.86 , 431.86
+606.75 , 6064.01 , 465.05
+606.75 , 6497.15 , 498.44
+606.75 , 6930.29 , 532.03
+606.75 , 7363.44 , 565.81
+606.75 , 7796.58 , 599.79
+606.75 , 8229.72 , 633.96
+606.75 , 8662.87 , 668.33
+640.46 , -9785.31 , -535.19
+640.46 , -9296.05 , -509.52
+640.46 , -8806.78 , -483.62
+640.46 , -8317.52 , -457.48
+640.46 , -7828.25 , -431.11
+640.46 , -7338.98 , -404.51
+640.46 , -6849.72 , -377.67
+640.46 , -6360.45 , -350.60
+640.46 , -5871.19 , -323.30
+640.46 , -5381.92 , -295.76
+640.46 , -4892.66 , -267.99
+640.46 , -4403.39 , -239.99
+640.46 , -3914.12 , -211.74
+640.46 , -3424.86 , -183.24
+640.46 , -2935.59 , -154.48
+640.46 , -2446.33 , -125.44
+640.46 , -1957.06 , -96.05
+640.46 , -1467.80 , -66.18
+640.46 , -978.53 , -35.19
+640.46 , -489.27 , 0.00
+640.46 , -97.85 , 0.00
+640.46 , 86.63 , 20.27
+640.46 , 433.14 , 51.05
+640.46 , 866.29 , 84.92
+640.46 , 1299.43 , 118.19
+640.46 , 1732.57 , 151.42
+640.46 , 2165.72 , 184.76
+640.46 , 2598.86 , 218.27
+640.46 , 3032.00 , 251.96
+640.46 , 3465.15 , 285.86
+640.46 , 3898.29 , 319.96
+640.46 , 4331.43 , 354.27
+640.46 , 4764.58 , 388.80
+640.46 , 5197.72 , 423.54
+640.46 , 5630.86 , 458.50
+640.46 , 6064.01 , 493.68
+640.46 , 6497.15 , 529.07
+640.46 , 6930.29 , 564.68
+640.46 , 7363.44 , 600.51
+640.46 , 7796.58 , 636.55
+640.46 , 8229.72 , 672.81
+640.46 , 8662.87 , 709.28
+674.17 , -9785.31 , -558.87
+674.17 , -9296.05 , -532.09
+674.17 , -8806.78 , -505.05
+674.17 , -8317.52 , -477.75
+674.17 , -7828.25 , -450.19
+674.17 , -7338.98 , -422.37
+674.17 , -6849.72 , -394.29
+674.17 , -6360.45 , -365.95
+674.17 , -5871.19 , -337.36
+674.17 , -5381.92 , -308.50
+674.17 , -4892.66 , -279.38
+674.17 , -4403.39 , -250.00
+674.17 , -3914.12 , -220.35
+674.17 , -3424.86 , -190.43
+674.17 , -2935.59 , -160.20
+674.17 , -2446.33 , -129.65
+674.17 , -1957.06 , -98.70
+674.17 , -1467.80 , -67.15
+674.17 , -978.53 , -34.12
+674.17 , -489.27 , 0.00
+674.17 , -97.85 , 0.00
+674.17 , 86.63 , 22.30
+674.17 , 433.14 , 55.27
+674.17 , 866.29 , 91.14
+674.17 , 1299.43 , 126.27
+674.17 , 1732.57 , 161.34
+674.17 , 2165.72 , 196.52
+674.17 , 2598.86 , 231.87
+674.17 , 3032.00 , 267.42
+674.17 , 3465.15 , 303.19
+674.17 , 3898.29 , 339.18
+674.17 , 4331.43 , 375.41
+674.17 , 4764.58 , 411.87
+674.17 , 5197.72 , 448.57
+674.17 , 5630.86 , 485.51
+674.17 , 6064.01 , 522.68
+674.17 , 6497.15 , 560.09
+674.17 , 6930.29 , 597.75
+674.17 , 7363.44 , 635.63
+674.17 , 7796.58 , 673.76
+674.17 , 8229.72 , 712.12
+674.17 , 8662.87 , 750.73
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_3.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..55066d31695ad3421b5ce6a0cac2b0ec831c3a20
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -5707.13 , 0.00
+0.00 , -5421.78 , 0.00
+0.00 , -5136.42 , 0.00
+0.00 , -4851.06 , 0.00
+0.00 , -4565.71 , 0.00
+0.00 , -4280.35 , 0.00
+0.00 , -3994.99 , -0.07
+0.00 , -3709.64 , -0.33
+0.00 , -3424.28 , -0.49
+0.00 , -3138.92 , -0.60
+0.00 , -2853.57 , -0.66
+0.00 , -2568.21 , -0.69
+0.00 , -2282.85 , -0.70
+0.00 , -1997.50 , -0.67
+0.00 , -1712.14 , -0.63
+0.00 , -1426.78 , -0.57
+0.00 , -1141.43 , -0.48
+0.00 , -856.07 , -0.38
+0.00 , -570.71 , -0.27
+0.00 , -285.36 , -0.13
+0.00 , -57.07 , -0.01
+0.00 , 51.57 , 0.06
+0.00 , 257.86 , 0.28
+0.00 , 515.72 , 0.56
+0.00 , 773.58 , 0.85
+0.00 , 1031.44 , 1.15
+0.00 , 1289.30 , 1.47
+0.00 , 1547.16 , 1.79
+0.00 , 1805.02 , 2.12
+0.00 , 2062.88 , 2.47
+0.00 , 2320.74 , 2.82
+0.00 , 2578.60 , 3.19
+0.00 , 2836.46 , 3.56
+0.00 , 3094.32 , 3.94
+0.00 , 3352.18 , 4.33
+0.00 , 3610.04 , 4.74
+0.00 , 3867.90 , 5.15
+0.00 , 4125.76 , 5.57
+0.00 , 4383.62 , 6.00
+0.00 , 4641.48 , 6.43
+0.00 , 4899.34 , 6.88
+0.00 , 5157.20 , 7.34
+5.72 , -5707.13 , 0.00
+5.72 , -5421.78 , 0.00
+5.72 , -5136.42 , 0.00
+5.72 , -4851.06 , 0.00
+5.72 , -4565.71 , 0.00
+5.72 , -4280.35 , 0.00
+5.72 , -3994.99 , -0.25
+5.72 , -3709.64 , -0.42
+5.72 , -3424.28 , -0.52
+5.72 , -3138.92 , -0.58
+5.72 , -2853.57 , -0.61
+5.72 , -2568.21 , -0.62
+5.72 , -2282.85 , -0.61
+5.72 , -1997.50 , -0.58
+5.72 , -1712.14 , -0.53
+5.72 , -1426.78 , -0.47
+5.72 , -1141.43 , -0.40
+5.72 , -856.07 , -0.31
+5.72 , -570.71 , -0.22
+5.72 , -285.36 , -0.11
+5.72 , -57.07 , -0.01
+5.72 , 51.57 , 0.05
+5.72 , 257.86 , 0.21
+5.72 , 515.72 , 0.43
+5.72 , 773.58 , 0.65
+5.72 , 1031.44 , 0.88
+5.72 , 1289.30 , 1.11
+5.72 , 1547.16 , 1.36
+5.72 , 1805.02 , 1.61
+5.72 , 2062.88 , 1.87
+5.72 , 2320.74 , 2.13
+5.72 , 2578.60 , 2.40
+5.72 , 2836.46 , 2.68
+5.72 , 3094.32 , 2.97
+5.72 , 3352.18 , 3.26
+5.72 , 3610.04 , 3.56
+5.72 , 3867.90 , 3.86
+5.72 , 4125.76 , 4.18
+5.72 , 4383.62 , 4.50
+5.72 , 4641.48 , 4.82
+5.72 , 4899.34 , 5.15
+5.72 , 5157.20 , 5.49
+57.21 , -5707.13 , -29.05
+57.21 , -5421.78 , -27.68
+57.21 , -5136.42 , -26.31
+57.21 , -4851.06 , -24.92
+57.21 , -4565.71 , -23.53
+57.21 , -4280.35 , -22.12
+57.21 , -3994.99 , -20.71
+57.21 , -3709.64 , -19.28
+57.21 , -3424.28 , -17.85
+57.21 , -3138.92 , -16.41
+57.21 , -2853.57 , -14.95
+57.21 , -2568.21 , -13.49
+57.21 , -2282.85 , -12.02
+57.21 , -1997.50 , -10.53
+57.21 , -1712.14 , -9.04
+57.21 , -1426.78 , -7.54
+57.21 , -1141.43 , -6.03
+57.21 , -856.07 , -4.51
+57.21 , -570.71 , -2.98
+57.21 , -285.36 , -1.44
+57.21 , -57.07 , -0.18
+57.21 , 51.57 , 0.45
+57.21 , 257.86 , 1.84
+57.21 , 515.72 , 3.58
+57.21 , 773.58 , 5.33
+57.21 , 1031.44 , 7.09
+57.21 , 1289.30 , 8.85
+57.21 , 1547.16 , 10.63
+57.21 , 1805.02 , 12.42
+57.21 , 2062.88 , 14.21
+57.21 , 2320.74 , 16.02
+57.21 , 2578.60 , 17.84
+57.21 , 2836.46 , 19.66
+57.21 , 3094.32 , 21.49
+57.21 , 3352.18 , 23.34
+57.21 , 3610.04 , 25.19
+57.21 , 3867.90 , 27.05
+57.21 , 4125.76 , 28.93
+57.21 , 4383.62 , 30.81
+57.21 , 4641.48 , 32.70
+57.21 , 4899.34 , 34.60
+57.21 , 5157.20 , 36.50
+114.41 , -5707.13 , -60.28
+114.41 , -5421.78 , -57.37
+114.41 , -5136.42 , -54.44
+114.41 , -4851.06 , -51.49
+114.41 , -4565.71 , -48.54
+114.41 , -4280.35 , -45.58
+114.41 , -3994.99 , -42.60
+114.41 , -3709.64 , -39.61
+114.41 , -3424.28 , -36.61
+114.41 , -3138.92 , -33.60
+114.41 , -2853.57 , -30.58
+114.41 , -2568.21 , -27.55
+114.41 , -2282.85 , -24.51
+114.41 , -1997.50 , -21.45
+114.41 , -1712.14 , -18.38
+114.41 , -1426.78 , -15.31
+114.41 , -1141.43 , -12.22
+114.41 , -856.07 , -9.12
+114.41 , -570.71 , -6.00
+114.41 , -285.36 , -2.88
+114.41 , -57.07 , -0.33
+114.41 , 51.57 , 0.92
+114.41 , 257.86 , 3.68
+114.41 , 515.72 , 7.11
+114.41 , 773.58 , 10.56
+114.41 , 1031.44 , 14.01
+114.41 , 1289.30 , 17.48
+114.41 , 1547.16 , 20.96
+114.41 , 1805.02 , 24.45
+114.41 , 2062.88 , 27.95
+114.41 , 2320.74 , 31.47
+114.41 , 2578.60 , 34.99
+114.41 , 2836.46 , 38.53
+114.41 , 3094.32 , 42.08
+114.41 , 3352.18 , 45.64
+114.41 , 3610.04 , 49.21
+114.41 , 3867.90 , 52.79
+114.41 , 4125.76 , 56.38
+114.41 , 4383.62 , 59.99
+114.41 , 4641.48 , 63.60
+114.41 , 4899.34 , 67.23
+114.41 , 5157.20 , 70.87
+171.62 , -5707.13 , -91.22
+171.62 , -5421.78 , -86.77
+171.62 , -5136.42 , -82.31
+171.62 , -4851.06 , -77.84
+171.62 , -4565.71 , -73.35
+171.62 , -4280.35 , -68.84
+171.62 , -3994.99 , -64.32
+171.62 , -3709.64 , -59.79
+171.62 , -3424.28 , -55.24
+171.62 , -3138.92 , -50.68
+171.62 , -2853.57 , -46.11
+171.62 , -2568.21 , -41.51
+171.62 , -2282.85 , -36.91
+171.62 , -1997.50 , -32.29
+171.62 , -1712.14 , -27.66
+171.62 , -1426.78 , -23.01
+171.62 , -1141.43 , -18.35
+171.62 , -856.07 , -13.67
+171.62 , -570.71 , -8.98
+171.62 , -285.36 , -4.27
+171.62 , -57.07 , -0.39
+171.62 , 51.57 , 1.43
+171.62 , 257.86 , 5.56
+171.62 , 515.72 , 10.69
+171.62 , 773.58 , 15.84
+171.62 , 1031.44 , 21.00
+171.62 , 1289.30 , 26.17
+171.62 , 1547.16 , 31.36
+171.62 , 1805.02 , 36.56
+171.62 , 2062.88 , 41.77
+171.62 , 2320.74 , 47.01
+171.62 , 2578.60 , 52.25
+171.62 , 2836.46 , 57.51
+171.62 , 3094.32 , 62.79
+171.62 , 3352.18 , 68.08
+171.62 , 3610.04 , 73.38
+171.62 , 3867.90 , 78.70
+171.62 , 4125.76 , 84.03
+171.62 , 4383.62 , 89.38
+171.62 , 4641.48 , 94.74
+171.62 , 4899.34 , 100.12
+171.62 , 5157.20 , 105.51
+228.82 , -5707.13 , -121.86
+228.82 , -5421.78 , -115.91
+228.82 , -5136.42 , -109.94
+228.82 , -4851.06 , -103.95
+228.82 , -4565.71 , -97.94
+228.82 , -4280.35 , -91.91
+228.82 , -3994.99 , -85.87
+228.82 , -3709.64 , -79.81
+228.82 , -3424.28 , -73.73
+228.82 , -3138.92 , -67.63
+228.82 , -2853.57 , -61.51
+228.82 , -2568.21 , -55.37
+228.82 , -2282.85 , -49.21
+228.82 , -1997.50 , -43.04
+228.82 , -1712.14 , -36.85
+228.82 , -1426.78 , -30.64
+228.82 , -1141.43 , -24.41
+228.82 , -856.07 , -18.16
+228.82 , -570.71 , -11.89
+228.82 , -285.36 , -5.59
+228.82 , -57.07 , -0.32
+228.82 , 51.57 , 1.99
+228.82 , 257.86 , 7.50
+228.82 , 515.72 , 14.34
+228.82 , 773.58 , 21.19
+228.82 , 1031.44 , 28.05
+228.82 , 1289.30 , 34.94
+228.82 , 1547.16 , 41.84
+228.82 , 1805.02 , 48.76
+228.82 , 2062.88 , 55.70
+228.82 , 2320.74 , 62.66
+228.82 , 2578.60 , 69.63
+228.82 , 2836.46 , 76.63
+228.82 , 3094.32 , 83.65
+228.82 , 3352.18 , 90.68
+228.82 , 3610.04 , 97.73
+228.82 , 3867.90 , 104.80
+228.82 , 4125.76 , 111.90
+228.82 , 4383.62 , 119.00
+228.82 , 4641.48 , 126.13
+228.82 , 4899.34 , 133.28
+228.82 , 5157.20 , 140.44
+286.03 , -5707.13 , -152.18
+286.03 , -5421.78 , -144.75
+286.03 , -5136.42 , -137.29
+286.03 , -4851.06 , -129.81
+286.03 , -4565.71 , -122.31
+286.03 , -4280.35 , -114.78
+286.03 , -3994.99 , -107.23
+286.03 , -3709.64 , -99.65
+286.03 , -3424.28 , -92.05
+286.03 , -3138.92 , -84.42
+286.03 , -2853.57 , -76.77
+286.03 , -2568.21 , -69.10
+286.03 , -2282.85 , -61.41
+286.03 , -1997.50 , -53.69
+286.03 , -1712.14 , -45.94
+286.03 , -1426.78 , -38.17
+286.03 , -1141.43 , -30.38
+286.03 , -856.07 , -22.57
+286.03 , -570.71 , -14.72
+286.03 , -285.36 , -6.84
+286.03 , -57.07 , 0.00
+286.03 , 51.57 , 2.61
+286.03 , 257.86 , 9.52
+286.03 , 515.72 , 18.06
+286.03 , 773.58 , 26.62
+286.03 , 1031.44 , 35.19
+286.03 , 1289.30 , 43.79
+286.03 , 1547.16 , 52.42
+286.03 , 1805.02 , 61.07
+286.03 , 2062.88 , 69.74
+286.03 , 2320.74 , 78.43
+286.03 , 2578.60 , 87.15
+286.03 , 2836.46 , 95.90
+286.03 , 3094.32 , 104.67
+286.03 , 3352.18 , 113.46
+286.03 , 3610.04 , 122.28
+286.03 , 3867.90 , 131.12
+286.03 , 4125.76 , 139.99
+286.03 , 4383.62 , 148.88
+286.03 , 4641.48 , 157.79
+286.03 , 4899.34 , 166.73
+286.03 , 5157.20 , 175.69
+343.23 , -5707.13 , -182.19
+343.23 , -5421.78 , -173.29
+343.23 , -5136.42 , -164.37
+343.23 , -4851.06 , -155.42
+343.23 , -4565.71 , -146.44
+343.23 , -4280.35 , -137.42
+343.23 , -3994.99 , -128.38
+343.23 , -3709.64 , -119.30
+343.23 , -3424.28 , -110.20
+343.23 , -3138.92 , -101.06
+343.23 , -2853.57 , -91.89
+343.23 , -2568.21 , -82.70
+343.23 , -2282.85 , -73.47
+343.23 , -1997.50 , -64.21
+343.23 , -1712.14 , -54.93
+343.23 , -1426.78 , -45.61
+343.23 , -1141.43 , -36.26
+343.23 , -856.07 , -26.87
+343.23 , -570.71 , -17.46
+343.23 , -285.36 , -7.98
+343.23 , -57.07 , 0.00
+343.23 , 51.57 , 3.29
+343.23 , 257.86 , 11.62
+343.23 , 515.72 , 21.88
+343.23 , 773.58 , 32.14
+343.23 , 1031.44 , 42.44
+343.23 , 1289.30 , 52.76
+343.23 , 1547.16 , 63.11
+343.23 , 1805.02 , 73.49
+343.23 , 2062.88 , 83.91
+343.23 , 2320.74 , 94.35
+343.23 , 2578.60 , 104.82
+343.23 , 2836.46 , 115.33
+343.23 , 3094.32 , 125.87
+343.23 , 3352.18 , 136.43
+343.23 , 3610.04 , 147.03
+343.23 , 3867.90 , 157.66
+343.23 , 4125.76 , 168.32
+343.23 , 4383.62 , 179.01
+343.23 , 4641.48 , 189.74
+343.23 , 4899.34 , 200.49
+343.23 , 5157.20 , 211.27
+400.44 , -5707.13 , -211.85
+400.44 , -5421.78 , -201.52
+400.44 , -5136.42 , -191.16
+400.44 , -4851.06 , -180.75
+400.44 , -4565.71 , -170.31
+400.44 , -4280.35 , -159.83
+400.44 , -3994.99 , -149.31
+400.44 , -3709.64 , -138.75
+400.44 , -3424.28 , -128.16
+400.44 , -3138.92 , -117.52
+400.44 , -2853.57 , -106.85
+400.44 , -2568.21 , -96.14
+400.44 , -2282.85 , -85.39
+400.44 , -1997.50 , -74.61
+400.44 , -1712.14 , -63.78
+400.44 , -1426.78 , -52.92
+400.44 , -1141.43 , -42.02
+400.44 , -856.07 , -31.07
+400.44 , -570.71 , -20.08
+400.44 , -285.36 , -9.00
+400.44 , -57.07 , 0.00
+400.44 , 51.57 , 4.05
+400.44 , 257.86 , 13.82
+400.44 , 515.72 , 25.80
+400.44 , 773.58 , 37.78
+400.44 , 1031.44 , 49.79
+400.44 , 1289.30 , 61.84
+400.44 , 1547.16 , 73.93
+400.44 , 1805.02 , 86.05
+400.44 , 2062.88 , 98.22
+400.44 , 2320.74 , 110.42
+400.44 , 2578.60 , 122.66
+400.44 , 2836.46 , 134.94
+400.44 , 3094.32 , 147.26
+400.44 , 3352.18 , 159.61
+400.44 , 3610.04 , 172.01
+400.44 , 3867.90 , 184.44
+400.44 , 4125.76 , 196.92
+400.44 , 4383.62 , 209.43
+400.44 , 4641.48 , 221.98
+400.44 , 4899.34 , 234.57
+400.44 , 5157.20 , 247.19
+457.64 , -5707.13 , -241.15
+457.64 , -5421.78 , -229.41
+457.64 , -5136.42 , -217.63
+457.64 , -4851.06 , -205.79
+457.64 , -4565.71 , -193.91
+457.64 , -4280.35 , -181.98
+457.64 , -3994.99 , -170.01
+457.64 , -3709.64 , -157.99
+457.64 , -3424.28 , -145.91
+457.64 , -3138.92 , -133.80
+457.64 , -2853.57 , -121.63
+457.64 , -2568.21 , -109.42
+457.64 , -2282.85 , -97.16
+457.64 , -1997.50 , -84.85
+457.64 , -1712.14 , -72.50
+457.64 , -1426.78 , -60.10
+457.64 , -1141.43 , -47.65
+457.64 , -856.07 , -35.14
+457.64 , -570.71 , -22.57
+457.64 , -285.36 , -9.88
+457.64 , -57.07 , 0.00
+457.64 , 51.57 , 4.88
+457.64 , 257.86 , 16.13
+457.64 , 515.72 , 29.83
+457.64 , 773.58 , 43.53
+457.64 , 1031.44 , 57.27
+457.64 , 1289.30 , 71.06
+457.64 , 1547.16 , 84.89
+457.64 , 1805.02 , 98.76
+457.64 , 2062.88 , 112.68
+457.64 , 2320.74 , 126.65
+457.64 , 2578.60 , 140.67
+457.64 , 2836.46 , 154.74
+457.64 , 3094.32 , 168.85
+457.64 , 3352.18 , 183.01
+457.64 , 3610.04 , 197.22
+457.64 , 3867.90 , 211.48
+457.64 , 4125.76 , 225.78
+457.64 , 4383.62 , 240.13
+457.64 , 4641.48 , 254.53
+457.64 , 4899.34 , 268.97
+457.64 , 5157.20 , 283.46
+514.85 , -5707.13 , -270.09
+514.85 , -5421.78 , -256.96
+514.85 , -5136.42 , -243.78
+514.85 , -4851.06 , -230.53
+514.85 , -4565.71 , -217.23
+514.85 , -4280.35 , -203.87
+514.85 , -3994.99 , -190.46
+514.85 , -3709.64 , -176.98
+514.85 , -3424.28 , -163.45
+514.85 , -3138.92 , -149.87
+514.85 , -2853.57 , -136.22
+514.85 , -2568.21 , -122.52
+514.85 , -2282.85 , -108.76
+514.85 , -1997.50 , -94.94
+514.85 , -1712.14 , -81.06
+514.85 , -1426.78 , -67.13
+514.85 , -1141.43 , -53.13
+514.85 , -856.07 , -39.07
+514.85 , -570.71 , -24.92
+514.85 , -285.36 , -10.59
+514.85 , -57.07 , 0.00
+514.85 , 51.57 , 5.80
+514.85 , 257.86 , 18.55
+514.85 , 515.72 , 33.99
+514.85 , 773.58 , 49.42
+514.85 , 1031.44 , 64.90
+514.85 , 1289.30 , 80.42
+514.85 , 1547.16 , 96.00
+514.85 , 1805.02 , 111.63
+514.85 , 2062.88 , 127.32
+514.85 , 2320.74 , 143.07
+514.85 , 2578.60 , 158.88
+514.85 , 2836.46 , 174.74
+514.85 , 3094.32 , 190.66
+514.85 , 3352.18 , 206.64
+514.85 , 3610.04 , 222.68
+514.85 , 3867.90 , 238.77
+514.85 , 4125.76 , 254.92
+514.85 , 4383.62 , 271.13
+514.85 , 4641.48 , 287.40
+514.85 , 4899.34 , 303.72
+514.85 , 5157.20 , 320.10
+572.06 , -5707.13 , -298.63
+572.06 , -5421.78 , -284.14
+572.06 , -5136.42 , -269.58
+572.06 , -4851.06 , -254.95
+572.06 , -4565.71 , -240.25
+572.06 , -4280.35 , -225.48
+572.06 , -3994.99 , -210.64
+572.06 , -3709.64 , -195.74
+572.06 , -3424.28 , -180.76
+572.06 , -3138.92 , -165.71
+572.06 , -2853.57 , -150.60
+572.06 , -2568.21 , -135.42
+572.06 , -2282.85 , -120.16
+572.06 , -1997.50 , -104.84
+572.06 , -1712.14 , -89.45
+572.06 , -1426.78 , -73.99
+572.06 , -1141.43 , -58.45
+572.06 , -856.07 , -42.83
+572.06 , -570.71 , -27.10
+572.06 , -285.36 , -11.12
+572.06 , -57.07 , 0.00
+572.06 , 51.57 , 6.80
+572.06 , 257.86 , 21.10
+572.06 , 515.72 , 38.29
+572.06 , 773.58 , 55.46
+572.06 , 1031.44 , 72.67
+572.06 , 1289.30 , 89.94
+572.06 , 1547.16 , 107.27
+572.06 , 1805.02 , 124.67
+572.06 , 2062.88 , 142.14
+572.06 , 2320.74 , 159.68
+572.06 , 2578.60 , 177.29
+572.06 , 2836.46 , 194.96
+572.06 , 3094.32 , 212.70
+572.06 , 3352.18 , 230.52
+572.06 , 3610.04 , 248.40
+572.06 , 3867.90 , 266.35
+572.06 , 4125.76 , 284.37
+572.06 , 4383.62 , 302.45
+572.06 , 4641.48 , 320.61
+572.06 , 4899.34 , 338.83
+572.06 , 5157.20 , 357.12
+629.26 , -5707.13 , -326.77
+629.26 , -5421.78 , -310.94
+629.26 , -5136.42 , -295.03
+629.26 , -4851.06 , -279.03
+629.26 , -4565.71 , -262.95
+629.26 , -4280.35 , -246.79
+629.26 , -3994.99 , -230.55
+629.26 , -3709.64 , -214.22
+629.26 , -3424.28 , -197.81
+629.26 , -3138.92 , -181.33
+629.26 , -2853.57 , -164.76
+629.26 , -2568.21 , -148.10
+629.26 , -2282.85 , -131.37
+629.26 , -1997.50 , -114.55
+629.26 , -1712.14 , -97.65
+629.26 , -1426.78 , -80.67
+629.26 , -1141.43 , -63.59
+629.26 , -856.07 , -46.42
+629.26 , -570.71 , -29.10
+629.26 , -285.36 , -11.41
+629.26 , -57.07 , 0.00
+629.26 , 51.57 , 7.90
+629.26 , 257.86 , 23.79
+629.26 , 515.72 , 42.74
+629.26 , 773.58 , 61.65
+629.26 , 1031.44 , 80.61
+629.26 , 1289.30 , 99.63
+629.26 , 1547.16 , 118.73
+629.26 , 1805.02 , 137.91
+629.26 , 2062.88 , 157.16
+629.26 , 2320.74 , 176.50
+629.26 , 2578.60 , 195.91
+629.26 , 2836.46 , 215.41
+629.26 , 3094.32 , 234.99
+629.26 , 3352.18 , 254.65
+629.26 , 3610.04 , 274.39
+629.26 , 3867.90 , 294.21
+629.26 , 4125.76 , 314.12
+629.26 , 4383.62 , 334.10
+629.26 , 4641.48 , 354.16
+629.26 , 4899.34 , 374.31
+629.26 , 5157.20 , 394.53
+686.47 , -5707.13 , -354.49
+686.47 , -5421.78 , -337.34
+686.47 , -5136.42 , -320.10
+686.47 , -4851.06 , -302.75
+686.47 , -4565.71 , -285.32
+686.47 , -4280.35 , -267.78
+686.47 , -3994.99 , -250.15
+686.47 , -3709.64 , -232.43
+686.47 , -3424.28 , -214.60
+686.47 , -3138.92 , -196.69
+686.47 , -2853.57 , -178.67
+686.47 , -2568.21 , -160.56
+686.47 , -2282.85 , -142.36
+686.47 , -1997.50 , -124.05
+686.47 , -1712.14 , -105.65
+686.47 , -1426.78 , -87.15
+686.47 , -1141.43 , -68.54
+686.47 , -856.07 , -49.80
+686.47 , -570.71 , -30.89
+686.47 , -285.36 , -11.43
+686.47 , -57.07 , 0.00
+686.47 , 51.57 , 9.08
+686.47 , 257.86 , 26.62
+686.47 , 515.72 , 47.35
+686.47 , 773.58 , 68.02
+686.47 , 1031.44 , 88.72
+686.47 , 1289.30 , 109.51
+686.47 , 1547.16 , 130.38
+686.47 , 1805.02 , 151.34
+686.47 , 2062.88 , 172.39
+686.47 , 2320.74 , 193.53
+686.47 , 2578.60 , 214.77
+686.47 , 2836.46 , 236.11
+686.47 , 3094.32 , 257.53
+686.47 , 3352.18 , 279.05
+686.47 , 3610.04 , 300.67
+686.47 , 3867.90 , 322.38
+686.47 , 4125.76 , 344.19
+686.47 , 4383.62 , 366.08
+686.47 , 4641.48 , 388.08
+686.47 , 4899.34 , 410.16
+686.47 , 5157.20 , 432.34
+743.67 , -5707.13 , -381.77
+743.67 , -5421.78 , -363.33
+743.67 , -5136.42 , -344.77
+743.67 , -4851.06 , -326.11
+743.67 , -4565.71 , -307.33
+743.67 , -4280.35 , -288.45
+743.67 , -3994.99 , -269.45
+743.67 , -3709.64 , -250.33
+743.67 , -3424.28 , -231.11
+743.67 , -3138.92 , -211.78
+743.67 , -2853.57 , -192.34
+743.67 , -2568.21 , -172.78
+743.67 , -2282.85 , -153.11
+743.67 , -1997.50 , -133.33
+743.67 , -1712.14 , -113.43
+743.67 , -1426.78 , -93.42
+743.67 , -1141.43 , -73.27
+743.67 , -856.07 , -52.98
+743.67 , -570.71 , -32.45
+743.67 , -285.36 , -11.12
+743.67 , -57.07 , 0.00
+743.67 , 51.57 , 10.37
+743.67 , 257.86 , 29.60
+743.67 , 515.72 , 52.14
+743.67 , 773.58 , 74.56
+743.67 , 1031.44 , 97.03
+743.67 , 1289.30 , 119.58
+743.67 , 1547.16 , 142.23
+743.67 , 1805.02 , 164.98
+743.67 , 2062.88 , 187.84
+743.67 , 2320.74 , 210.80
+743.67 , 2578.60 , 233.87
+743.67 , 2836.46 , 257.05
+743.67 , 3094.32 , 280.34
+743.67 , 3352.18 , 303.74
+743.67 , 3610.04 , 327.25
+743.67 , 3867.90 , 350.87
+743.67 , 4125.76 , 374.59
+743.67 , 4383.62 , 398.42
+743.67 , 4641.48 , 422.36
+743.67 , 4899.34 , 446.41
+743.67 , 5157.20 , 470.57
+800.88 , -5707.13 , -408.59
+800.88 , -5421.78 , -388.88
+800.88 , -5136.42 , -369.04
+800.88 , -4851.06 , -349.08
+800.88 , -4565.71 , -328.98
+800.88 , -4280.35 , -308.76
+800.88 , -3994.99 , -288.41
+800.88 , -3709.64 , -267.93
+800.88 , -3424.28 , -247.32
+800.88 , -3138.92 , -226.59
+800.88 , -2853.57 , -205.73
+800.88 , -2568.21 , -184.73
+800.88 , -2282.85 , -163.61
+800.88 , -1997.50 , -142.36
+800.88 , -1712.14 , -120.97
+800.88 , -1426.78 , -99.45
+800.88 , -1141.43 , -77.77
+800.88 , -856.07 , -55.91
+800.88 , -570.71 , -33.75
+800.88 , -285.36 , -10.40
+800.88 , -57.07 , 0.00
+800.88 , 51.57 , 11.76
+800.88 , 257.86 , 32.74
+800.88 , 515.72 , 57.10
+800.88 , 773.58 , 81.29
+800.88 , 1031.44 , 105.53
+800.88 , 1289.30 , 129.86
+800.88 , 1547.16 , 154.29
+800.88 , 1805.02 , 178.85
+800.88 , 2062.88 , 203.52
+800.88 , 2320.74 , 228.31
+800.88 , 2578.60 , 253.23
+800.88 , 2836.46 , 278.27
+800.88 , 3094.32 , 303.44
+800.88 , 3352.18 , 328.73
+800.88 , 3610.04 , 354.14
+800.88 , 3867.90 , 379.68
+800.88 , 4125.76 , 405.34
+800.88 , 4383.62 , 431.13
+800.88 , 4641.48 , 457.03
+800.88 , 4899.34 , 483.07
+800.88 , 5157.20 , 509.22
+858.08 , -5707.13 , -434.93
+858.08 , -5421.78 , -413.98
+858.08 , -5136.42 , -392.88
+858.08 , -4851.06 , -371.64
+858.08 , -4565.71 , -350.25
+858.08 , -4280.35 , -328.71
+858.08 , -3994.99 , -307.03
+858.08 , -3709.64 , -285.20
+858.08 , -3424.28 , -263.22
+858.08 , -3138.92 , -241.10
+858.08 , -2853.57 , -218.83
+858.08 , -2568.21 , -196.41
+858.08 , -2282.85 , -173.85
+858.08 , -1997.50 , -151.13
+858.08 , -1712.14 , -128.26
+858.08 , -1426.78 , -105.23
+858.08 , -1141.43 , -82.02
+858.08 , -856.07 , -58.59
+858.08 , -570.71 , -34.77
+858.08 , -285.36 , -9.14
+858.08 , -57.07 , 0.00
+858.08 , 51.57 , 13.25
+858.08 , 257.86 , 36.05
+858.08 , 515.72 , 62.25
+858.08 , 773.58 , 88.23
+858.08 , 1031.44 , 114.25
+858.08 , 1289.30 , 140.36
+858.08 , 1547.16 , 166.59
+858.08 , 1805.02 , 192.95
+858.08 , 2062.88 , 219.45
+858.08 , 2320.74 , 246.08
+858.08 , 2578.60 , 272.86
+858.08 , 2836.46 , 299.77
+858.08 , 3094.32 , 326.82
+858.08 , 3352.18 , 354.02
+858.08 , 3610.04 , 381.35
+858.08 , 3867.90 , 408.83
+858.08 , 4125.76 , 436.45
+858.08 , 4383.62 , 464.20
+858.08 , 4641.48 , 492.10
+858.08 , 4899.34 , 520.14
+858.08 , 5157.20 , 548.31
+915.29 , -5707.13 , -460.78
+915.29 , -5421.78 , -438.62
+915.29 , -5136.42 , -416.28
+915.29 , -4851.06 , -393.78
+915.29 , -4565.71 , -371.11
+915.29 , -4280.35 , -348.28
+915.29 , -3994.99 , -325.28
+915.29 , -3709.64 , -302.11
+915.29 , -3424.28 , -278.78
+915.29 , -3138.92 , -255.29
+915.29 , -2853.57 , -231.62
+915.29 , -2568.21 , -207.79
+915.29 , -2282.85 , -183.79
+915.29 , -1997.50 , -159.62
+915.29 , -1712.14 , -135.27
+915.29 , -1426.78 , -110.74
+915.29 , -1141.43 , -85.99
+915.29 , -856.07 , -60.98
+915.29 , -570.71 , -35.47
+915.29 , -285.36 , -7.05
+915.29 , -57.07 , 0.00
+915.29 , 51.57 , 14.84
+915.29 , 257.86 , 39.53
+915.29 , 515.72 , 67.60
+915.29 , 773.58 , 95.38
+915.29 , 1031.44 , 123.18
+915.29 , 1289.30 , 151.09
+915.29 , 1547.16 , 179.12
+915.29 , 1805.02 , 207.30
+915.29 , 2062.88 , 235.63
+915.29 , 2320.74 , 264.12
+915.29 , 2578.60 , 292.76
+915.29 , 2836.46 , 321.56
+915.29 , 3094.32 , 350.51
+915.29 , 3352.18 , 379.63
+915.29 , 3610.04 , 408.90
+915.29 , 3867.90 , 438.33
+915.29 , 4125.76 , 467.92
+915.29 , 4383.62 , 497.67
+915.29 , 4641.48 , 527.57
+915.29 , 4899.34 , 557.64
+915.29 , 5157.20 , 587.85
+972.50 , -5707.13 , -486.12
+972.50 , -5421.78 , -462.76
+972.50 , -5136.42 , -439.22
+972.50 , -4851.06 , -415.48
+972.50 , -4565.71 , -391.56
+972.50 , -4280.35 , -367.45
+972.50 , -3994.99 , -343.15
+972.50 , -3709.64 , -318.67
+972.50 , -3424.28 , -294.00
+972.50 , -3138.92 , -269.14
+972.50 , -2853.57 , -244.09
+972.50 , -2568.21 , -218.86
+972.50 , -2282.85 , -193.44
+972.50 , -1997.50 , -167.82
+972.50 , -1712.14 , -142.00
+972.50 , -1426.78 , -115.96
+972.50 , -1141.43 , -89.67
+972.50 , -856.07 , -63.06
+972.50 , -570.71 , -35.80
+972.50 , -285.36 , -3.22
+972.50 , -57.07 , 0.00
+972.50 , 51.57 , 16.54
+972.50 , 257.86 , 43.18
+972.50 , 515.72 , 73.16
+972.50 , 773.58 , 102.75
+972.50 , 1031.44 , 132.35
+972.50 , 1289.30 , 162.06
+972.50 , 1547.16 , 191.91
+972.50 , 1805.02 , 221.91
+972.50 , 2062.88 , 252.09
+972.50 , 2320.74 , 282.44
+972.50 , 2578.60 , 312.96
+972.50 , 2836.46 , 343.65
+972.50 , 3094.32 , 374.52
+972.50 , 3352.18 , 405.57
+972.50 , 3610.04 , 436.80
+972.50 , 3867.90 , 468.20
+972.50 , 4125.76 , 499.78
+972.50 , 4383.62 , 531.53
+972.50 , 4641.48 , 563.46
+972.50 , 4899.34 , 595.57
+972.50 , 5157.20 , 627.85
+1029.70 , -5707.13 , -510.93
+1029.70 , -5421.78 , -486.40
+1029.70 , -5136.42 , -461.67
+1029.70 , -4851.06 , -436.72
+1029.70 , -4565.71 , -411.56
+1029.70 , -4280.35 , -386.20
+1029.70 , -3994.99 , -360.62
+1029.70 , -3709.64 , -334.84
+1029.70 , -3424.28 , -308.84
+1029.70 , -3138.92 , -282.64
+1029.70 , -2853.57 , -256.22
+1029.70 , -2568.21 , -229.60
+1029.70 , -2282.85 , -202.76
+1029.70 , -1997.50 , -175.70
+1029.70 , -1712.14 , -148.41
+1029.70 , -1426.78 , -120.87
+1029.70 , -1141.43 , -93.04
+1029.70 , -856.07 , -64.80
+1029.70 , -570.71 , -35.73
+1029.70 , -285.36 , 0.00
+1029.70 , -57.07 , 0.00
+1029.70 , 51.57 , 18.35
+1029.70 , 257.86 , 47.02
+1029.70 , 515.72 , 78.93
+1029.70 , 773.58 , 110.35
+1029.70 , 1031.44 , 141.76
+1029.70 , 1289.30 , 173.28
+1029.70 , 1547.16 , 204.95
+1029.70 , 1805.02 , 236.80
+1029.70 , 2062.88 , 268.83
+1029.70 , 2320.74 , 301.04
+1029.70 , 2578.60 , 333.46
+1029.70 , 2836.46 , 366.06
+1029.70 , 3094.32 , 398.86
+1029.70 , 3352.18 , 431.86
+1029.70 , 3610.04 , 465.05
+1029.70 , 3867.90 , 498.44
+1029.70 , 4125.76 , 532.03
+1029.70 , 4383.62 , 565.81
+1029.70 , 4641.48 , 599.79
+1029.70 , 4899.34 , 633.96
+1029.70 , 5157.20 , 668.33
+1086.91 , -5707.13 , -535.19
+1086.91 , -5421.78 , -509.52
+1086.91 , -5136.42 , -483.62
+1086.91 , -4851.06 , -457.48
+1086.91 , -4565.71 , -431.11
+1086.91 , -4280.35 , -404.51
+1086.91 , -3994.99 , -377.67
+1086.91 , -3709.64 , -350.60
+1086.91 , -3424.28 , -323.30
+1086.91 , -3138.92 , -295.76
+1086.91 , -2853.57 , -267.99
+1086.91 , -2568.21 , -239.99
+1086.91 , -2282.85 , -211.74
+1086.91 , -1997.50 , -183.24
+1086.91 , -1712.14 , -154.48
+1086.91 , -1426.78 , -125.44
+1086.91 , -1141.43 , -96.05
+1086.91 , -856.07 , -66.18
+1086.91 , -570.71 , -35.19
+1086.91 , -285.36 , 0.00
+1086.91 , -57.07 , 0.00
+1086.91 , 51.57 , 20.27
+1086.91 , 257.86 , 51.05
+1086.91 , 515.72 , 84.92
+1086.91 , 773.58 , 118.19
+1086.91 , 1031.44 , 151.42
+1086.91 , 1289.30 , 184.76
+1086.91 , 1547.16 , 218.27
+1086.91 , 1805.02 , 251.96
+1086.91 , 2062.88 , 285.86
+1086.91 , 2320.74 , 319.96
+1086.91 , 2578.60 , 354.27
+1086.91 , 2836.46 , 388.80
+1086.91 , 3094.32 , 423.54
+1086.91 , 3352.18 , 458.50
+1086.91 , 3610.04 , 493.68
+1086.91 , 3867.90 , 529.07
+1086.91 , 4125.76 , 564.68
+1086.91 , 4383.62 , 600.51
+1086.91 , 4641.48 , 636.55
+1086.91 , 4899.34 , 672.81
+1086.91 , 5157.20 , 709.28
+1144.11 , -5707.13 , -558.87
+1144.11 , -5421.78 , -532.09
+1144.11 , -5136.42 , -505.05
+1144.11 , -4851.06 , -477.75
+1144.11 , -4565.71 , -450.19
+1144.11 , -4280.35 , -422.37
+1144.11 , -3994.99 , -394.29
+1144.11 , -3709.64 , -365.95
+1144.11 , -3424.28 , -337.36
+1144.11 , -3138.92 , -308.50
+1144.11 , -2853.57 , -279.38
+1144.11 , -2568.21 , -250.00
+1144.11 , -2282.85 , -220.35
+1144.11 , -1997.50 , -190.43
+1144.11 , -1712.14 , -160.20
+1144.11 , -1426.78 , -129.65
+1144.11 , -1141.43 , -98.70
+1144.11 , -856.07 , -67.15
+1144.11 , -570.71 , -34.12
+1144.11 , -285.36 , 0.00
+1144.11 , -57.07 , 0.00
+1144.11 , 51.57 , 22.30
+1144.11 , 257.86 , 55.27
+1144.11 , 515.72 , 91.14
+1144.11 , 773.58 , 126.27
+1144.11 , 1031.44 , 161.34
+1144.11 , 1289.30 , 196.52
+1144.11 , 1547.16 , 231.87
+1144.11 , 1805.02 , 267.42
+1144.11 , 2062.88 , 303.19
+1144.11 , 2320.74 , 339.18
+1144.11 , 2578.60 , 375.41
+1144.11 , 2836.46 , 411.87
+1144.11 , 3094.32 , 448.57
+1144.11 , 3352.18 , 485.51
+1144.11 , 3610.04 , 522.68
+1144.11 , 3867.90 , 560.09
+1144.11 , 4125.76 , 597.75
+1144.11 , 4383.62 , 635.63
+1144.11 , 4641.48 , 673.76
+1144.11 , 4899.34 , 712.12
+1144.11 , 5157.20 , 750.73
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..3c80c1e20b59f7eb9bf9944d96f50223c180d0ce
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 5157.20 , -5707.13
+5.67 , 5157.20 , -5707.13
+57.23 , 5157.20 , -5707.13
+114.47 , 5157.20 , -5707.13
+171.56 , 5157.20 , -5707.13
+228.79 , 5157.20 , -5707.13
+286.03 , 5157.20 , -5707.13
+343.26 , 4297.66 , -4755.94
+400.49 , 3683.68 , -4076.49
+457.59 , 3223.25 , -3566.96
+514.82 , 2865.13 , -3170.65
+572.05 , 2578.60 , -2853.57
+629.29 , 2344.19 , -2594.16
+686.52 , 2148.83 , -2377.97
+743.61 , 1983.53 , -2195.04
+800.85 , 1841.88 , -2038.28
+858.08 , 1719.07 , -1902.38
+915.31 , 1611.66 , -1783.52
+972.54 , 1516.83 , -1678.58
+1029.64 , 1432.53 , -1585.29
+1086.87 , 1357.17 , -1501.89
+1144.11 , 1289.30 , -1426.78
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..3c80c1e20b59f7eb9bf9944d96f50223c180d0ce
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 5157.20 , -5707.13
+5.67 , 5157.20 , -5707.13
+57.23 , 5157.20 , -5707.13
+114.47 , 5157.20 , -5707.13
+171.56 , 5157.20 , -5707.13
+228.79 , 5157.20 , -5707.13
+286.03 , 5157.20 , -5707.13
+343.26 , 4297.66 , -4755.94
+400.49 , 3683.68 , -4076.49
+457.59 , 3223.25 , -3566.96
+514.82 , 2865.13 , -3170.65
+572.05 , 2578.60 , -2853.57
+629.29 , 2344.19 , -2594.16
+686.52 , 2148.83 , -2377.97
+743.61 , 1983.53 , -2195.04
+800.85 , 1841.88 , -2038.28
+858.08 , 1719.07 , -1902.38
+915.31 , 1611.66 , -1783.52
+972.54 , 1516.83 , -1678.58
+1029.64 , 1432.53 , -1585.29
+1086.87 , 1357.17 , -1501.89
+1144.11 , 1289.30 , -1426.78
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..620f776f90668e47b3191d74c31059957ef5facb
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -10.92
+5.72 , -11.26
+57.21 , -14.46
+114.41 , -18.00
+171.62 , -21.53
+228.82 , -25.11
+286.03 , -28.65
+343.23 , -32.19
+400.44 , -35.73
+457.65 , -39.27
+514.85 , -42.84
+572.06 , -46.38
+629.26 , -49.92
+686.47 , -53.46
+743.67 , -57.00
+800.88 , -60.57
+858.08 , -64.11
+915.29 , -67.65
+972.50 , -71.19
+1029.70 , -74.73
+1086.91 , -78.30
+1144.11 , -81.84
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/GenericIEPC_Gbx3Whl2.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/GenericIEPC_Gbx3Whl2.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..47e3bfc6dd49ea605c5f474274d8e24a00f7791a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/GenericIEPC_Gbx3Whl2.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 2,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 21.9384
+ },
+ {
+ "Ratio": 12.276
+ },
+ {
+ "Ratio": 7.2336
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3Whl2_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl2_1.viepco",
+ "2": "IEPC_Gbx3Whl2_2.viepco",
+ "3": "IEPC_Gbx3Whl2_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3Whl2_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl2_1.viepco",
+ "2": "IEPC_Gbx3Whl2_2.viepco",
+ "3": "IEPC_Gbx3Whl2_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3Whl2_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_ENG_Gbx3Whl2.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_ENG_Gbx3Whl2.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..f402ce770e3afc13e7c5ea64530f48e7a1d7fbad
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_ENG_Gbx3Whl2.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx3Whl2.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_Vehicle_Gbx3Whl2.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_Vehicle_Gbx3Whl2.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..9edc0421106cb1f924a38de10540c860eb14b724
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_Vehicle_Gbx3Whl2.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3Whl2.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_1.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..6661444505d1f80e1b7ccf4680f069a1394f3e8d
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -35338.92 , 0.00
+0.00 , -33571.97 , 0.00
+0.00 , -31805.03 , 0.00
+0.00 , -30038.08 , 0.00
+0.00 , -28271.13 , 0.00
+0.00 , -26504.19 , 0.00
+0.00 , -24737.24 , -0.13
+0.00 , -22970.30 , -0.66
+0.00 , -21203.35 , -0.98
+0.00 , -19436.40 , -1.19
+0.00 , -17669.46 , -1.32
+0.00 , -15902.51 , -1.38
+0.00 , -14135.57 , -1.39
+0.00 , -12368.62 , -1.35
+0.00 , -10601.68 , -1.26
+0.00 , -8834.73 , -1.13
+0.00 , -7067.78 , -0.97
+0.00 , -5300.84 , -0.77
+0.00 , -3533.89 , -0.53
+0.00 , -1766.95 , -0.27
+0.00 , -353.39 , -0.02
+0.00 , 306.44 , 0.13
+0.00 , 1532.18 , 0.56
+0.00 , 3064.36 , 1.12
+0.00 , 4596.53 , 1.70
+0.00 , 6128.71 , 2.31
+0.00 , 7660.89 , 2.93
+0.00 , 9193.07 , 3.58
+0.00 , 10725.24 , 4.25
+0.00 , 12257.42 , 4.93
+0.00 , 13789.60 , 5.64
+0.00 , 15321.78 , 6.37
+0.00 , 16853.96 , 7.12
+0.00 , 18386.13 , 7.88
+0.00 , 19918.31 , 8.67
+0.00 , 21450.49 , 9.47
+0.00 , 22982.67 , 10.29
+0.00 , 24514.85 , 11.13
+0.00 , 26047.02 , 11.99
+0.00 , 27579.20 , 12.87
+0.00 , 29111.38 , 13.76
+0.00 , 30643.56 , 14.67
+1.89 , -35338.92 , 0.00
+1.89 , -33571.97 , 0.00
+1.89 , -31805.03 , 0.00
+1.89 , -30038.08 , 0.00
+1.89 , -28271.13 , 0.00
+1.89 , -26504.19 , 0.00
+1.89 , -24737.24 , -0.50
+1.89 , -22970.30 , -0.84
+1.89 , -21203.35 , -1.04
+1.89 , -19436.40 , -1.16
+1.89 , -17669.46 , -1.22
+1.89 , -15902.51 , -1.24
+1.89 , -14135.57 , -1.21
+1.89 , -12368.62 , -1.15
+1.89 , -10601.68 , -1.06
+1.89 , -8834.73 , -0.94
+1.89 , -7067.78 , -0.80
+1.89 , -5300.84 , -0.62
+1.89 , -3533.89 , -0.43
+1.89 , -1766.95 , -0.21
+1.89 , -353.39 , -0.02
+1.89 , 306.44 , 0.10
+1.89 , 1532.18 , 0.43
+1.89 , 3064.36 , 0.85
+1.89 , 4596.53 , 1.30
+1.89 , 6128.71 , 1.75
+1.89 , 7660.89 , 2.23
+1.89 , 9193.07 , 2.71
+1.89 , 10725.24 , 3.21
+1.89 , 12257.42 , 3.73
+1.89 , 13789.60 , 4.26
+1.89 , 15321.78 , 4.80
+1.89 , 16853.96 , 5.36
+1.89 , 18386.13 , 5.93
+1.89 , 19918.31 , 6.52
+1.89 , 21450.49 , 7.12
+1.89 , 22982.67 , 7.73
+1.89 , 24514.85 , 8.35
+1.89 , 26047.02 , 8.99
+1.89 , 27579.20 , 9.64
+1.89 , 29111.38 , 10.30
+1.89 , 30643.56 , 10.98
+18.86 , -35338.92 , -58.10
+18.86 , -33571.97 , -55.37
+18.86 , -31805.03 , -52.62
+18.86 , -30038.08 , -49.85
+18.86 , -28271.13 , -47.06
+18.86 , -26504.19 , -44.25
+18.86 , -24737.24 , -41.42
+18.86 , -22970.30 , -38.57
+18.86 , -21203.35 , -35.70
+18.86 , -19436.40 , -32.81
+18.86 , -17669.46 , -29.90
+18.86 , -15902.51 , -26.98
+18.86 , -14135.57 , -24.03
+18.86 , -12368.62 , -21.07
+18.86 , -10601.68 , -18.08
+18.86 , -8834.73 , -15.08
+18.86 , -7067.78 , -12.06
+18.86 , -5300.84 , -9.02
+18.86 , -3533.89 , -5.96
+18.86 , -1766.95 , -2.88
+18.86 , -353.39 , -0.37
+18.86 , 306.44 , 0.90
+18.86 , 1532.18 , 3.68
+18.86 , 3064.36 , 7.16
+18.86 , 4596.53 , 10.66
+18.86 , 6128.71 , 14.17
+18.86 , 7660.89 , 17.71
+18.86 , 9193.07 , 21.26
+18.86 , 10725.24 , 24.84
+18.86 , 12257.42 , 28.43
+18.86 , 13789.60 , 32.04
+18.86 , 15321.78 , 35.67
+18.86 , 16853.96 , 39.32
+18.86 , 18386.13 , 42.99
+18.86 , 19918.31 , 46.68
+18.86 , 21450.49 , 50.38
+18.86 , 22982.67 , 54.11
+18.86 , 24514.85 , 57.85
+18.86 , 26047.02 , 61.61
+18.86 , 27579.20 , 65.39
+18.86 , 29111.38 , 69.19
+18.86 , 30643.56 , 73.01
+37.72 , -35338.92 , -120.57
+37.72 , -33571.97 , -114.73
+37.72 , -31805.03 , -108.87
+37.72 , -30038.08 , -102.99
+37.72 , -28271.13 , -97.08
+37.72 , -26504.19 , -91.15
+37.72 , -24737.24 , -85.20
+37.72 , -22970.30 , -79.23
+37.72 , -21203.35 , -73.23
+37.72 , -19436.40 , -67.21
+37.72 , -17669.46 , -61.17
+37.72 , -15902.51 , -55.10
+37.72 , -14135.57 , -49.01
+37.72 , -12368.62 , -42.90
+37.72 , -10601.68 , -36.77
+37.72 , -8834.73 , -30.61
+37.72 , -7067.78 , -24.43
+37.72 , -5300.84 , -18.23
+37.72 , -3533.89 , -12.01
+37.72 , -1766.95 , -5.76
+37.72 , -353.39 , -0.66
+37.72 , 306.44 , 1.84
+37.72 , 1532.18 , 7.35
+37.72 , 3064.36 , 14.22
+37.72 , 4596.53 , 21.11
+37.72 , 6128.71 , 28.02
+37.72 , 7660.89 , 34.96
+37.72 , 9193.07 , 41.92
+37.72 , 10725.24 , 48.90
+37.72 , 12257.42 , 55.90
+37.72 , 13789.60 , 62.93
+37.72 , 15321.78 , 69.98
+37.72 , 16853.96 , 77.05
+37.72 , 18386.13 , 84.15
+37.72 , 19918.31 , 91.27
+37.72 , 21450.49 , 98.41
+37.72 , 22982.67 , 105.58
+37.72 , 24514.85 , 112.76
+37.72 , 26047.02 , 119.97
+37.72 , 27579.20 , 127.21
+37.72 , 29111.38 , 134.46
+37.72 , 30643.56 , 141.74
+56.59 , -35338.92 , -182.44
+56.59 , -33571.97 , -173.55
+56.59 , -31805.03 , -164.62
+56.59 , -30038.08 , -155.67
+56.59 , -28271.13 , -146.69
+56.59 , -26504.19 , -137.68
+56.59 , -24737.24 , -128.65
+56.59 , -22970.30 , -119.58
+56.59 , -21203.35 , -110.49
+56.59 , -19436.40 , -101.36
+56.59 , -17669.46 , -92.21
+56.59 , -15902.51 , -83.03
+56.59 , -14135.57 , -73.82
+56.59 , -12368.62 , -64.58
+56.59 , -10601.68 , -55.31
+56.59 , -8834.73 , -46.02
+56.59 , -7067.78 , -36.70
+56.59 , -5300.84 , -27.34
+56.59 , -3533.89 , -17.96
+56.59 , -1766.95 , -8.54
+56.59 , -353.39 , -0.79
+56.59 , 306.44 , 2.86
+56.59 , 1532.18 , 11.12
+56.59 , 3064.36 , 21.39
+56.59 , 4596.53 , 31.68
+56.59 , 6128.71 , 41.99
+56.59 , 7660.89 , 52.34
+56.59 , 9193.07 , 62.71
+56.59 , 10725.24 , 73.12
+56.59 , 12257.42 , 83.55
+56.59 , 13789.60 , 94.01
+56.59 , 15321.78 , 104.50
+56.59 , 16853.96 , 115.02
+56.59 , 18386.13 , 125.57
+56.59 , 19918.31 , 136.15
+56.59 , 21450.49 , 146.76
+56.59 , 22982.67 , 157.40
+56.59 , 24514.85 , 168.06
+56.59 , 26047.02 , 178.76
+56.59 , 27579.20 , 189.48
+56.59 , 29111.38 , 200.23
+56.59 , 30643.56 , 211.02
+75.45 , -35338.92 , -243.71
+75.45 , -33571.97 , -231.81
+75.45 , -31805.03 , -219.87
+75.45 , -30038.08 , -207.89
+75.45 , -28271.13 , -195.88
+75.45 , -26504.19 , -183.83
+75.45 , -24737.24 , -171.74
+75.45 , -22970.30 , -159.61
+75.45 , -21203.35 , -147.45
+75.45 , -19436.40 , -135.25
+75.45 , -17669.46 , -123.01
+75.45 , -15902.51 , -110.74
+75.45 , -14135.57 , -98.43
+75.45 , -12368.62 , -86.08
+75.45 , -10601.68 , -73.70
+75.45 , -8834.73 , -61.27
+75.45 , -7067.78 , -48.82
+75.45 , -5300.84 , -36.32
+75.45 , -3533.89 , -23.78
+75.45 , -1766.95 , -11.19
+75.45 , -353.39 , -0.63
+75.45 , 306.44 , 3.98
+75.45 , 1532.18 , 15.01
+75.45 , 3064.36 , 28.68
+75.45 , 4596.53 , 42.37
+75.45 , 6128.71 , 56.10
+75.45 , 7660.89 , 69.87
+75.45 , 9193.07 , 83.67
+75.45 , 10725.24 , 97.52
+75.45 , 12257.42 , 111.40
+75.45 , 13789.60 , 125.31
+75.45 , 15321.78 , 139.27
+75.45 , 16853.96 , 153.26
+75.45 , 18386.13 , 167.29
+75.45 , 19918.31 , 181.36
+75.45 , 21450.49 , 195.46
+75.45 , 22982.67 , 209.61
+75.45 , 24514.85 , 223.79
+75.45 , 26047.02 , 238.01
+75.45 , 27579.20 , 252.26
+75.45 , 29111.38 , 266.56
+75.45 , 30643.56 , 280.89
+94.31 , -35338.92 , -304.37
+94.31 , -33571.97 , -289.50
+94.31 , -31805.03 , -274.59
+94.31 , -30038.08 , -259.63
+94.31 , -28271.13 , -244.61
+94.31 , -26504.19 , -229.56
+94.31 , -24737.24 , -214.45
+94.31 , -22970.30 , -199.30
+94.31 , -21203.35 , -184.10
+94.31 , -19436.40 , -168.85
+94.31 , -17669.46 , -153.55
+94.31 , -15902.51 , -138.20
+94.31 , -14135.57 , -122.81
+94.31 , -12368.62 , -107.37
+94.31 , -10601.68 , -91.88
+94.31 , -8834.73 , -76.35
+94.31 , -7067.78 , -60.76
+94.31 , -5300.84 , -45.13
+94.31 , -3533.89 , -29.44
+94.31 , -1766.95 , -13.67
+94.31 , -353.39 , 0.00
+94.31 , 306.44 , 5.21
+94.31 , 1532.18 , 19.04
+94.31 , 3064.36 , 36.13
+94.31 , 4596.53 , 53.24
+94.31 , 6128.71 , 70.39
+94.31 , 7660.89 , 87.59
+94.31 , 9193.07 , 104.83
+94.31 , 10725.24 , 122.13
+94.31 , 12257.42 , 139.47
+94.31 , 13789.60 , 156.87
+94.31 , 15321.78 , 174.31
+94.31 , 16853.96 , 191.80
+94.31 , 18386.13 , 209.33
+94.31 , 19918.31 , 226.92
+94.31 , 21450.49 , 244.56
+94.31 , 22982.67 , 262.24
+94.31 , 24514.85 , 279.97
+94.31 , 26047.02 , 297.76
+94.31 , 27579.20 , 315.58
+94.31 , 29111.38 , 333.46
+94.31 , 30643.56 , 351.39
+113.17 , -35338.92 , -364.37
+113.17 , -33571.97 , -346.59
+113.17 , -31805.03 , -328.74
+113.17 , -30038.08 , -310.84
+113.17 , -28271.13 , -292.87
+113.17 , -26504.19 , -274.84
+113.17 , -24737.24 , -256.75
+113.17 , -22970.30 , -238.60
+113.17 , -21203.35 , -220.39
+113.17 , -19436.40 , -202.12
+113.17 , -17669.46 , -183.79
+113.17 , -15902.51 , -165.40
+113.17 , -14135.57 , -146.94
+113.17 , -12368.62 , -128.43
+113.17 , -10601.68 , -109.85
+113.17 , -8834.73 , -91.21
+113.17 , -7067.78 , -72.51
+113.17 , -5300.84 , -53.75
+113.17 , -3533.89 , -34.91
+113.17 , -1766.95 , -15.95
+113.17 , -353.39 , 0.00
+113.17 , 306.44 , 6.58
+113.17 , 1532.18 , 23.25
+113.17 , 3064.36 , 43.76
+113.17 , 4596.53 , 64.29
+113.17 , 6128.71 , 84.87
+113.17 , 7660.89 , 105.52
+113.17 , 9193.07 , 126.22
+113.17 , 10725.24 , 146.98
+113.17 , 12257.42 , 167.81
+113.17 , 13789.60 , 188.70
+113.17 , 15321.78 , 209.65
+113.17 , 16853.96 , 230.66
+113.17 , 18386.13 , 251.73
+113.17 , 19918.31 , 272.87
+113.17 , 21450.49 , 294.07
+113.17 , 22982.67 , 315.33
+113.17 , 24514.85 , 336.65
+113.17 , 26047.02 , 358.03
+113.17 , 27579.20 , 379.47
+113.17 , 29111.38 , 400.98
+113.17 , 30643.56 , 422.54
+132.03 , -35338.92 , -423.69
+132.03 , -33571.97 , -403.04
+132.03 , -31805.03 , -382.31
+132.03 , -30038.08 , -361.50
+132.03 , -28271.13 , -340.62
+132.03 , -26504.19 , -319.66
+132.03 , -24737.24 , -298.62
+132.03 , -22970.30 , -277.51
+132.03 , -21203.35 , -256.31
+132.03 , -19436.40 , -235.05
+132.03 , -17669.46 , -213.70
+132.03 , -15902.51 , -192.28
+132.03 , -14135.57 , -170.79
+132.03 , -12368.62 , -149.21
+132.03 , -10601.68 , -127.57
+132.03 , -8834.73 , -105.84
+132.03 , -7067.78 , -84.03
+132.03 , -5300.84 , -62.14
+132.03 , -3533.89 , -40.16
+132.03 , -1766.95 , -18.00
+132.03 , -353.39 , 0.00
+132.03 , 306.44 , 8.09
+132.03 , 1532.18 , 27.64
+132.03 , 3064.36 , 51.59
+132.03 , 4596.53 , 75.56
+132.03 , 6128.71 , 99.58
+132.03 , 7660.89 , 123.68
+132.03 , 9193.07 , 147.86
+132.03 , 10725.24 , 172.10
+132.03 , 12257.42 , 196.43
+132.03 , 13789.60 , 220.84
+132.03 , 15321.78 , 245.32
+132.03 , 16853.96 , 269.88
+132.03 , 18386.13 , 294.51
+132.03 , 19918.31 , 319.23
+132.03 , 21450.49 , 344.02
+132.03 , 22982.67 , 368.89
+132.03 , 24514.85 , 393.83
+132.03 , 26047.02 , 418.85
+132.03 , 27579.20 , 443.95
+132.03 , 29111.38 , 469.13
+132.03 , 30643.56 , 494.38
+150.90 , -35338.92 , -482.31
+150.90 , -33571.97 , -458.83
+150.90 , -31805.03 , -435.26
+150.90 , -30038.08 , -411.59
+150.90 , -28271.13 , -387.83
+150.90 , -26504.19 , -363.97
+150.90 , -24737.24 , -340.02
+150.90 , -22970.30 , -315.97
+150.90 , -21203.35 , -291.83
+150.90 , -19436.40 , -267.59
+150.90 , -17669.46 , -243.26
+150.90 , -15902.51 , -218.84
+150.90 , -14135.57 , -194.32
+150.90 , -12368.62 , -169.71
+150.90 , -10601.68 , -145.00
+150.90 , -8834.73 , -120.19
+150.90 , -7067.78 , -95.29
+150.90 , -5300.84 , -70.28
+150.90 , -3533.89 , -45.14
+150.90 , -1766.95 , -19.76
+150.90 , -353.39 , 0.00
+150.90 , 306.44 , 9.76
+150.90 , 1532.18 , 32.25
+150.90 , 3064.36 , 59.66
+150.90 , 4596.53 , 87.07
+150.90 , 6128.71 , 114.55
+150.90 , 7660.89 , 142.11
+150.90 , 9193.07 , 169.77
+150.90 , 10725.24 , 197.52
+150.90 , 12257.42 , 225.37
+150.90 , 13789.60 , 253.31
+150.90 , 15321.78 , 281.34
+150.90 , 16853.96 , 309.47
+150.90 , 18386.13 , 337.70
+150.90 , 19918.31 , 366.02
+150.90 , 21450.49 , 394.44
+150.90 , 22982.67 , 422.95
+150.90 , 24514.85 , 451.56
+150.90 , 26047.02 , 480.26
+150.90 , 27579.20 , 509.05
+150.90 , 29111.38 , 537.94
+150.90 , 30643.56 , 566.93
+169.76 , -35338.92 , -540.17
+169.76 , -33571.97 , -513.92
+169.76 , -31805.03 , -487.55
+169.76 , -30038.08 , -461.06
+169.76 , -28271.13 , -434.46
+169.76 , -26504.19 , -407.75
+169.76 , -24737.24 , -380.92
+169.76 , -22970.30 , -353.97
+169.76 , -21203.35 , -326.91
+169.76 , -19436.40 , -299.73
+169.76 , -17669.46 , -272.44
+169.76 , -15902.51 , -245.03
+169.76 , -14135.57 , -217.51
+169.76 , -12368.62 , -189.87
+169.76 , -10601.68 , -162.12
+169.76 , -8834.73 , -134.25
+169.76 , -7067.78 , -106.26
+169.76 , -5300.84 , -78.13
+169.76 , -3533.89 , -49.84
+169.76 , -1766.95 , -21.19
+169.76 , -353.39 , 0.00
+169.76 , 306.44 , 11.59
+169.76 , 1532.18 , 37.10
+169.76 , 3064.36 , 67.98
+169.76 , 4596.53 , 98.85
+169.76 , 6128.71 , 129.79
+169.76 , 7660.89 , 160.84
+169.76 , 9193.07 , 191.99
+169.76 , 10725.24 , 223.26
+169.76 , 12257.42 , 254.64
+169.76 , 13789.60 , 286.14
+169.76 , 15321.78 , 317.75
+169.76 , 16853.96 , 349.48
+169.76 , 18386.13 , 381.32
+169.76 , 19918.31 , 413.28
+169.76 , 21450.49 , 445.36
+169.76 , 22982.67 , 477.54
+169.76 , 24514.85 , 509.85
+169.76 , 26047.02 , 542.27
+169.76 , 27579.20 , 574.80
+169.76 , 29111.38 , 607.45
+169.76 , 30643.56 , 640.21
+188.62 , -35338.92 , -597.26
+188.62 , -33571.97 , -568.28
+188.62 , -31805.03 , -539.16
+188.62 , -30038.08 , -509.90
+188.62 , -28271.13 , -480.50
+188.62 , -26504.19 , -450.96
+188.62 , -24737.24 , -421.28
+188.62 , -22970.30 , -391.47
+188.62 , -21203.35 , -361.52
+188.62 , -19436.40 , -331.43
+188.62 , -17669.46 , -301.20
+188.62 , -15902.51 , -270.83
+188.62 , -14135.57 , -240.33
+188.62 , -12368.62 , -209.68
+188.62 , -10601.68 , -178.90
+188.62 , -8834.73 , -147.97
+188.62 , -7067.78 , -116.90
+188.62 , -5300.84 , -85.66
+188.62 , -3533.89 , -54.21
+188.62 , -1766.95 , -22.23
+188.62 , -353.39 , 0.00
+188.62 , 306.44 , 13.60
+188.62 , 1532.18 , 42.20
+188.62 , 3064.36 , 76.58
+188.62 , 4596.53 , 110.92
+188.62 , 6128.71 , 145.34
+188.62 , 7660.89 , 179.88
+188.62 , 9193.07 , 214.55
+188.62 , 10725.24 , 249.35
+188.62 , 12257.42 , 284.29
+188.62 , 13789.60 , 319.36
+188.62 , 15321.78 , 354.57
+188.62 , 16853.96 , 389.92
+188.62 , 18386.13 , 425.41
+188.62 , 19918.31 , 461.03
+188.62 , 21450.49 , 496.79
+188.62 , 22982.67 , 532.69
+188.62 , 24514.85 , 568.73
+188.62 , 26047.02 , 604.90
+188.62 , 27579.20 , 641.21
+188.62 , 29111.38 , 677.66
+188.62 , 30643.56 , 714.24
+207.48 , -35338.92 , -653.54
+207.48 , -33571.97 , -621.88
+207.48 , -31805.03 , -590.05
+207.48 , -30038.08 , -558.06
+207.48 , -28271.13 , -525.90
+207.48 , -26504.19 , -493.58
+207.48 , -24737.24 , -461.09
+207.48 , -22970.30 , -428.44
+207.48 , -21203.35 , -395.63
+207.48 , -19436.40 , -362.65
+207.48 , -17669.46 , -329.51
+207.48 , -15902.51 , -296.21
+207.48 , -14135.57 , -262.74
+207.48 , -12368.62 , -229.11
+207.48 , -10601.68 , -195.31
+207.48 , -8834.73 , -161.34
+207.48 , -7067.78 , -127.18
+207.48 , -5300.84 , -92.83
+207.48 , -3533.89 , -58.20
+207.48 , -1766.95 , -22.82
+207.48 , -353.39 , 0.00
+207.48 , 306.44 , 15.79
+207.48 , 1532.18 , 47.58
+207.48 , 3064.36 , 85.48
+207.48 , 4596.53 , 123.30
+207.48 , 6128.71 , 161.22
+207.48 , 7660.89 , 199.26
+207.48 , 9193.07 , 237.46
+207.48 , 10725.24 , 275.81
+207.48 , 12257.42 , 314.32
+207.48 , 13789.60 , 352.99
+207.48 , 15321.78 , 391.83
+207.48 , 16853.96 , 430.82
+207.48 , 18386.13 , 469.98
+207.48 , 19918.31 , 509.30
+207.48 , 21450.49 , 548.78
+207.48 , 22982.67 , 588.42
+207.48 , 24514.85 , 628.23
+207.48 , 26047.02 , 668.20
+207.48 , 27579.20 , 708.32
+207.48 , 29111.38 , 748.61
+207.48 , 30643.56 , 789.06
+226.34 , -35338.92 , -708.97
+226.34 , -33571.97 , -674.68
+226.34 , -31805.03 , -640.19
+226.34 , -30038.08 , -605.51
+226.34 , -28271.13 , -570.63
+226.34 , -26504.19 , -535.56
+226.34 , -24737.24 , -500.30
+226.34 , -22970.30 , -464.85
+226.34 , -21203.35 , -429.21
+226.34 , -19436.40 , -393.37
+226.34 , -17669.46 , -357.35
+226.34 , -15902.51 , -321.13
+226.34 , -14135.57 , -284.71
+226.34 , -12368.62 , -248.11
+226.34 , -10601.68 , -211.31
+226.34 , -8834.73 , -174.30
+226.34 , -7067.78 , -137.08
+226.34 , -5300.84 , -99.61
+226.34 , -3533.89 , -61.78
+226.34 , -1766.95 , -22.86
+226.34 , -353.39 , 0.00
+226.34 , 306.44 , 18.17
+226.34 , 1532.18 , 53.24
+226.34 , 3064.36 , 94.71
+226.34 , 4596.53 , 136.03
+226.34 , 6128.71 , 177.45
+226.34 , 7660.89 , 219.01
+226.34 , 9193.07 , 260.75
+226.34 , 10725.24 , 302.67
+226.34 , 12257.42 , 344.78
+226.34 , 13789.60 , 387.07
+226.34 , 15321.78 , 429.54
+226.34 , 16853.96 , 472.21
+226.34 , 18386.13 , 515.06
+226.34 , 19918.31 , 558.11
+226.34 , 21450.49 , 601.34
+226.34 , 22982.67 , 644.76
+226.34 , 24514.85 , 688.37
+226.34 , 26047.02 , 732.17
+226.34 , 27579.20 , 776.15
+226.34 , 29111.38 , 820.33
+226.34 , 30643.56 , 864.69
+245.21 , -35338.92 , -763.53
+245.21 , -33571.97 , -726.65
+245.21 , -31805.03 , -689.55
+245.21 , -30038.08 , -652.22
+245.21 , -28271.13 , -614.67
+245.21 , -26504.19 , -576.89
+245.21 , -24737.24 , -538.89
+245.21 , -22970.30 , -500.67
+245.21 , -21203.35 , -462.22
+245.21 , -19436.40 , -423.56
+245.21 , -17669.46 , -384.67
+245.21 , -15902.51 , -345.56
+245.21 , -14135.57 , -306.22
+245.21 , -12368.62 , -266.66
+245.21 , -10601.68 , -226.86
+245.21 , -8834.73 , -186.83
+245.21 , -7067.78 , -146.54
+245.21 , -5300.84 , -105.95
+245.21 , -3533.89 , -64.90
+245.21 , -1766.95 , -22.24
+245.21 , -353.39 , 0.00
+245.21 , 306.44 , 20.74
+245.21 , 1532.18 , 59.20
+245.21 , 3064.36 , 104.27
+245.21 , 4596.53 , 149.12
+245.21 , 6128.71 , 194.05
+245.21 , 7660.89 , 239.16
+245.21 , 9193.07 , 284.45
+245.21 , 10725.24 , 329.96
+245.21 , 12257.42 , 375.67
+245.21 , 13789.60 , 421.60
+245.21 , 15321.78 , 467.75
+245.21 , 16853.96 , 514.11
+245.21 , 18386.13 , 560.69
+245.21 , 19918.31 , 607.48
+245.21 , 21450.49 , 654.50
+245.21 , 22982.67 , 701.73
+245.21 , 24514.85 , 749.18
+245.21 , 26047.02 , 796.84
+245.21 , 27579.20 , 844.73
+245.21 , 29111.38 , 892.83
+245.21 , 30643.56 , 941.14
+264.07 , -35338.92 , -817.17
+264.07 , -33571.97 , -777.76
+264.07 , -31805.03 , -738.08
+264.07 , -30038.08 , -698.15
+264.07 , -28271.13 , -657.96
+264.07 , -26504.19 , -617.52
+264.07 , -24737.24 , -576.82
+264.07 , -22970.30 , -535.86
+264.07 , -21203.35 , -494.65
+264.07 , -19436.40 , -453.18
+264.07 , -17669.46 , -411.45
+264.07 , -15902.51 , -369.47
+264.07 , -14135.57 , -327.22
+264.07 , -12368.62 , -284.72
+264.07 , -10601.68 , -241.95
+264.07 , -8834.73 , -198.90
+264.07 , -7067.78 , -155.54
+264.07 , -5300.84 , -111.82
+264.07 , -3533.89 , -67.51
+264.07 , -1766.95 , -20.80
+264.07 , -353.39 , 0.00
+264.07 , 306.44 , 23.52
+264.07 , 1532.18 , 65.48
+264.07 , 3064.36 , 114.20
+264.07 , 4596.53 , 162.59
+264.07 , 6128.71 , 211.06
+264.07 , 7660.89 , 259.72
+264.07 , 9193.07 , 308.59
+264.07 , 10725.24 , 357.69
+264.07 , 12257.42 , 407.04
+264.07 , 13789.60 , 456.62
+264.07 , 15321.78 , 506.46
+264.07 , 16853.96 , 556.54
+264.07 , 18386.13 , 606.87
+264.07 , 19918.31 , 657.45
+264.07 , 21450.49 , 708.28
+264.07 , 22982.67 , 759.35
+264.07 , 24514.85 , 810.68
+264.07 , 26047.02 , 862.25
+264.07 , 27579.20 , 914.07
+264.07 , 29111.38 , 966.13
+264.07 , 30643.56 , 1018.44
+282.93 , -35338.92 , -869.86
+282.93 , -33571.97 , -827.96
+282.93 , -31805.03 , -785.77
+282.93 , -30038.08 , -743.28
+282.93 , -28271.13 , -700.50
+282.93 , -26504.19 , -657.42
+282.93 , -24737.24 , -614.05
+282.93 , -22970.30 , -570.39
+282.93 , -21203.35 , -526.44
+282.93 , -19436.40 , -482.19
+282.93 , -17669.46 , -437.65
+282.93 , -15902.51 , -392.82
+282.93 , -14135.57 , -347.69
+282.93 , -12368.62 , -302.26
+282.93 , -10601.68 , -256.52
+282.93 , -8834.73 , -210.46
+282.93 , -7067.78 , -164.04
+282.93 , -5300.84 , -117.17
+282.93 , -3533.89 , -69.54
+282.93 , -1766.95 , -18.27
+282.93 , -353.39 , 0.00
+282.93 , 306.44 , 26.49
+282.93 , 1532.18 , 72.10
+282.93 , 3064.36 , 124.50
+282.93 , 4596.53 , 176.46
+282.93 , 6128.71 , 228.49
+282.93 , 7660.89 , 280.71
+282.93 , 9193.07 , 333.18
+282.93 , 10725.24 , 385.90
+282.93 , 12257.42 , 438.89
+282.93 , 13789.60 , 492.16
+282.93 , 15321.78 , 545.71
+282.93 , 16853.96 , 599.54
+282.93 , 18386.13 , 653.64
+282.93 , 19918.31 , 708.03
+282.93 , 21450.49 , 762.71
+282.93 , 22982.67 , 817.66
+282.93 , 24514.85 , 872.89
+282.93 , 26047.02 , 928.41
+282.93 , 27579.20 , 984.20
+282.93 , 29111.38 , 1040.27
+282.93 , 30643.56 , 1096.63
+301.79 , -35338.92 , -921.56
+301.79 , -33571.97 , -877.23
+301.79 , -31805.03 , -832.56
+301.79 , -30038.08 , -787.56
+301.79 , -28271.13 , -742.22
+301.79 , -26504.19 , -696.56
+301.79 , -24737.24 , -650.56
+301.79 , -22970.30 , -604.23
+301.79 , -21203.35 , -557.56
+301.79 , -19436.40 , -510.57
+301.79 , -17669.46 , -463.24
+301.79 , -15902.51 , -415.58
+301.79 , -14135.57 , -367.58
+301.79 , -12368.62 , -319.24
+301.79 , -10601.68 , -270.55
+301.79 , -8834.73 , -221.48
+301.79 , -7067.78 , -171.99
+301.79 , -5300.84 , -121.95
+301.79 , -3533.89 , -70.93
+301.79 , -1766.95 , -14.10
+301.79 , -353.39 , 0.00
+301.79 , 306.44 , 29.68
+301.79 , 1532.18 , 79.05
+301.79 , 3064.36 , 135.20
+301.79 , 4596.53 , 190.76
+301.79 , 6128.71 , 246.36
+301.79 , 7660.89 , 302.17
+301.79 , 9193.07 , 358.24
+301.79 , 10725.24 , 414.60
+301.79 , 12257.42 , 471.27
+301.79 , 13789.60 , 528.24
+301.79 , 15321.78 , 585.52
+301.79 , 16853.96 , 643.12
+301.79 , 18386.13 , 701.03
+301.79 , 19918.31 , 759.26
+301.79 , 21450.49 , 817.80
+301.79 , 22982.67 , 876.66
+301.79 , 24514.85 , 935.84
+301.79 , 26047.02 , 995.34
+301.79 , 27579.20 , 1055.15
+301.79 , 29111.38 , 1115.27
+301.79 , 30643.56 , 1175.71
+320.65 , -35338.92 , -972.24
+320.65 , -33571.97 , -925.52
+320.65 , -31805.03 , -878.43
+320.65 , -30038.08 , -830.96
+320.65 , -28271.13 , -783.11
+320.65 , -26504.19 , -734.89
+320.65 , -24737.24 , -686.30
+320.65 , -22970.30 , -637.33
+320.65 , -21203.35 , -587.99
+320.65 , -19436.40 , -538.28
+320.65 , -17669.46 , -488.19
+320.65 , -15902.51 , -437.72
+320.65 , -14135.57 , -386.87
+320.65 , -12368.62 , -335.63
+320.65 , -10601.68 , -283.99
+320.65 , -8834.73 , -231.92
+320.65 , -7067.78 , -179.35
+320.65 , -5300.84 , -126.12
+320.65 , -3533.89 , -71.60
+320.65 , -1766.95 , -6.45
+320.65 , -353.39 , 0.00
+320.65 , 306.44 , 33.08
+320.65 , 1532.18 , 86.37
+320.65 , 3064.36 , 146.31
+320.65 , 4596.53 , 205.50
+320.65 , 6128.71 , 264.70
+320.65 , 7660.89 , 324.11
+320.65 , 9193.07 , 383.81
+320.65 , 10725.24 , 443.83
+320.65 , 12257.42 , 504.18
+320.65 , 13789.60 , 564.87
+320.65 , 15321.78 , 625.91
+320.65 , 16853.96 , 687.30
+320.65 , 18386.13 , 749.05
+320.65 , 19918.31 , 811.14
+320.65 , 21450.49 , 873.59
+320.65 , 22982.67 , 936.40
+320.65 , 24514.85 , 999.56
+320.65 , 26047.02 , 1063.07
+320.65 , 27579.20 , 1126.93
+320.65 , 29111.38 , 1191.14
+320.65 , 30643.56 , 1255.71
+339.52 , -35338.92 , -1021.86
+339.52 , -33571.97 , -972.81
+339.52 , -31805.03 , -923.33
+339.52 , -30038.08 , -873.44
+339.52 , -28271.13 , -823.13
+339.52 , -26504.19 , -772.39
+339.52 , -24737.24 , -721.24
+339.52 , -22970.30 , -669.67
+339.52 , -21203.35 , -617.68
+339.52 , -19436.40 , -565.27
+339.52 , -17669.46 , -512.45
+339.52 , -15902.51 , -459.19
+339.52 , -14135.57 , -405.51
+339.52 , -12368.62 , -351.39
+339.52 , -10601.68 , -296.81
+339.52 , -8834.73 , -241.73
+339.52 , -7067.78 , -186.07
+339.52 , -5300.84 , -129.61
+339.52 , -3533.89 , -71.46
+339.52 , -1766.95 , 0.00
+339.52 , -353.39 , 0.00
+339.52 , 306.44 , 36.70
+339.52 , 1532.18 , 94.04
+339.52 , 3064.36 , 157.85
+339.52 , 4596.53 , 220.70
+339.52 , 6128.71 , 283.52
+339.52 , 7660.89 , 346.56
+339.52 , 9193.07 , 409.90
+339.52 , 10725.24 , 473.59
+339.52 , 12257.42 , 537.65
+339.52 , 13789.60 , 602.09
+339.52 , 15321.78 , 666.91
+339.52 , 16853.96 , 732.12
+339.52 , 18386.13 , 797.72
+339.52 , 19918.31 , 863.72
+339.52 , 21450.49 , 930.10
+339.52 , 22982.67 , 996.88
+339.52 , 24514.85 , 1064.05
+339.52 , 26047.02 , 1131.62
+339.52 , 27579.20 , 1199.57
+339.52 , 29111.38 , 1267.92
+339.52 , 30643.56 , 1336.65
+358.38 , -35338.92 , -1070.37
+358.38 , -33571.97 , -1019.04
+358.38 , -31805.03 , -967.24
+358.38 , -30038.08 , -914.96
+358.38 , -28271.13 , -862.23
+358.38 , -26504.19 , -809.02
+358.38 , -24737.24 , -755.35
+358.38 , -22970.30 , -701.21
+358.38 , -21203.35 , -646.60
+358.38 , -19436.40 , -591.53
+358.38 , -17669.46 , -535.99
+358.38 , -15902.51 , -479.97
+358.38 , -14135.57 , -423.47
+358.38 , -12368.62 , -366.48
+358.38 , -10601.68 , -308.96
+358.38 , -8834.73 , -250.88
+358.38 , -7067.78 , -192.11
+358.38 , -5300.84 , -132.36
+358.38 , -3533.89 , -70.38
+358.38 , -1766.95 , 0.00
+358.38 , -353.39 , 0.00
+358.38 , 306.44 , 40.53
+358.38 , 1532.18 , 102.10
+358.38 , 3064.36 , 169.83
+358.38 , 4596.53 , 236.37
+358.38 , 6128.71 , 302.84
+358.38 , 7660.89 , 369.53
+358.38 , 9193.07 , 436.54
+358.38 , 10725.24 , 503.92
+358.38 , 12257.42 , 571.71
+358.38 , 13789.60 , 639.91
+358.38 , 15321.78 , 708.54
+358.38 , 16853.96 , 777.59
+358.38 , 18386.13 , 847.08
+358.38 , 19918.31 , 917.00
+358.38 , 21450.49 , 987.35
+358.38 , 22982.67 , 1058.14
+358.38 , 24514.85 , 1129.36
+358.38 , 26047.02 , 1201.01
+358.38 , 27579.20 , 1273.09
+358.38 , 29111.38 , 1345.61
+358.38 , 30643.56 , 1418.56
+377.24 , -35338.92 , -1117.74
+377.24 , -33571.97 , -1064.18
+377.24 , -31805.03 , -1010.10
+377.24 , -30038.08 , -955.49
+377.24 , -28271.13 , -900.37
+377.24 , -26504.19 , -844.73
+377.24 , -24737.24 , -788.58
+377.24 , -22970.30 , -731.90
+377.24 , -21203.35 , -674.71
+377.24 , -19436.40 , -617.00
+377.24 , -17669.46 , -558.77
+377.24 , -15902.51 , -500.01
+377.24 , -14135.57 , -440.71
+377.24 , -12368.62 , -380.85
+377.24 , -10601.68 , -320.40
+377.24 , -8834.73 , -259.31
+377.24 , -7067.78 , -197.41
+377.24 , -5300.84 , -134.30
+377.24 , -3533.89 , -68.24
+377.24 , -1766.95 , 0.00
+377.24 , -353.39 , 0.00
+377.24 , 306.44 , 44.59
+377.24 , 1532.18 , 110.53
+377.24 , 3064.36 , 182.27
+377.24 , 4596.53 , 252.55
+377.24 , 6128.71 , 322.69
+377.24 , 7660.89 , 393.04
+377.24 , 9193.07 , 463.74
+377.24 , 10725.24 , 534.84
+377.24 , 12257.42 , 606.37
+377.24 , 13789.60 , 678.37
+377.24 , 15321.78 , 750.82
+377.24 , 16853.96 , 823.74
+377.24 , 18386.13 , 897.14
+377.24 , 19918.31 , 971.01
+377.24 , 21450.49 , 1045.36
+377.24 , 22982.67 , 1120.19
+377.24 , 24514.85 , 1195.49
+377.24 , 26047.02 , 1271.27
+377.24 , 27579.20 , 1347.52
+377.24 , 29111.38 , 1424.25
+377.24 , 30643.56 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_2.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_3.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..07feb55aeb84a3946955f362d5131493fe83d565
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -11414.26 , 0.00
+0.00 , -10843.55 , 0.00
+0.00 , -10272.84 , 0.00
+0.00 , -9702.12 , 0.00
+0.00 , -9131.41 , 0.00
+0.00 , -8560.70 , 0.00
+0.00 , -7989.99 , -0.13
+0.00 , -7419.27 , -0.66
+0.00 , -6848.56 , -0.98
+0.00 , -6277.85 , -1.19
+0.00 , -5707.13 , -1.32
+0.00 , -5136.42 , -1.38
+0.00 , -4565.71 , -1.39
+0.00 , -3994.99 , -1.35
+0.00 , -3424.28 , -1.26
+0.00 , -2853.57 , -1.13
+0.00 , -2282.85 , -0.97
+0.00 , -1712.14 , -0.77
+0.00 , -1141.43 , -0.53
+0.00 , -570.71 , -0.27
+0.00 , -114.14 , -0.02
+0.00 , 103.14 , 0.13
+0.00 , 515.72 , 0.56
+0.00 , 1031.44 , 1.12
+0.00 , 1547.16 , 1.70
+0.00 , 2062.88 , 2.31
+0.00 , 2578.60 , 2.93
+0.00 , 3094.32 , 3.58
+0.00 , 3610.04 , 4.25
+0.00 , 4125.76 , 4.93
+0.00 , 4641.48 , 5.64
+0.00 , 5157.20 , 6.37
+0.00 , 5672.91 , 7.12
+0.00 , 6188.63 , 7.88
+0.00 , 6704.35 , 8.67
+0.00 , 7220.07 , 9.47
+0.00 , 7735.79 , 10.29
+0.00 , 8251.51 , 11.13
+0.00 , 8767.23 , 11.99
+0.00 , 9282.95 , 12.87
+0.00 , 9798.67 , 13.76
+0.00 , 10314.39 , 14.67
+5.72 , -11414.26 , 0.00
+5.72 , -10843.55 , 0.00
+5.72 , -10272.84 , 0.00
+5.72 , -9702.12 , 0.00
+5.72 , -9131.41 , 0.00
+5.72 , -8560.70 , 0.00
+5.72 , -7989.99 , -0.50
+5.72 , -7419.27 , -0.84
+5.72 , -6848.56 , -1.04
+5.72 , -6277.85 , -1.16
+5.72 , -5707.13 , -1.22
+5.72 , -5136.42 , -1.24
+5.72 , -4565.71 , -1.21
+5.72 , -3994.99 , -1.15
+5.72 , -3424.28 , -1.06
+5.72 , -2853.57 , -0.94
+5.72 , -2282.85 , -0.80
+5.72 , -1712.14 , -0.62
+5.72 , -1141.43 , -0.43
+5.72 , -570.71 , -0.21
+5.72 , -114.14 , -0.02
+5.72 , 103.14 , 0.10
+5.72 , 515.72 , 0.43
+5.72 , 1031.44 , 0.85
+5.72 , 1547.16 , 1.30
+5.72 , 2062.88 , 1.75
+5.72 , 2578.60 , 2.23
+5.72 , 3094.32 , 2.71
+5.72 , 3610.04 , 3.21
+5.72 , 4125.76 , 3.73
+5.72 , 4641.48 , 4.26
+5.72 , 5157.20 , 4.80
+5.72 , 5672.91 , 5.36
+5.72 , 6188.63 , 5.93
+5.72 , 6704.35 , 6.52
+5.72 , 7220.07 , 7.12
+5.72 , 7735.79 , 7.73
+5.72 , 8251.51 , 8.35
+5.72 , 8767.23 , 8.99
+5.72 , 9282.95 , 9.64
+5.72 , 9798.67 , 10.30
+5.72 , 10314.39 , 10.98
+57.21 , -11414.26 , -58.10
+57.21 , -10843.55 , -55.37
+57.21 , -10272.84 , -52.62
+57.21 , -9702.12 , -49.85
+57.21 , -9131.41 , -47.06
+57.21 , -8560.70 , -44.25
+57.21 , -7989.99 , -41.42
+57.21 , -7419.27 , -38.57
+57.21 , -6848.56 , -35.70
+57.21 , -6277.85 , -32.81
+57.21 , -5707.13 , -29.90
+57.21 , -5136.42 , -26.98
+57.21 , -4565.71 , -24.03
+57.21 , -3994.99 , -21.07
+57.21 , -3424.28 , -18.08
+57.21 , -2853.57 , -15.08
+57.21 , -2282.85 , -12.06
+57.21 , -1712.14 , -9.02
+57.21 , -1141.43 , -5.96
+57.21 , -570.71 , -2.88
+57.21 , -114.14 , -0.37
+57.21 , 103.14 , 0.90
+57.21 , 515.72 , 3.68
+57.21 , 1031.44 , 7.16
+57.21 , 1547.16 , 10.66
+57.21 , 2062.88 , 14.17
+57.21 , 2578.60 , 17.71
+57.21 , 3094.32 , 21.26
+57.21 , 3610.04 , 24.84
+57.21 , 4125.76 , 28.43
+57.21 , 4641.48 , 32.04
+57.21 , 5157.20 , 35.67
+57.21 , 5672.91 , 39.32
+57.21 , 6188.63 , 42.99
+57.21 , 6704.35 , 46.68
+57.21 , 7220.07 , 50.38
+57.21 , 7735.79 , 54.11
+57.21 , 8251.51 , 57.85
+57.21 , 8767.23 , 61.61
+57.21 , 9282.95 , 65.39
+57.21 , 9798.67 , 69.19
+57.21 , 10314.39 , 73.01
+114.41 , -11414.26 , -120.57
+114.41 , -10843.55 , -114.73
+114.41 , -10272.84 , -108.87
+114.41 , -9702.12 , -102.99
+114.41 , -9131.41 , -97.08
+114.41 , -8560.70 , -91.15
+114.41 , -7989.99 , -85.20
+114.41 , -7419.27 , -79.23
+114.41 , -6848.56 , -73.23
+114.41 , -6277.85 , -67.21
+114.41 , -5707.13 , -61.17
+114.41 , -5136.42 , -55.10
+114.41 , -4565.71 , -49.01
+114.41 , -3994.99 , -42.90
+114.41 , -3424.28 , -36.77
+114.41 , -2853.57 , -30.61
+114.41 , -2282.85 , -24.43
+114.41 , -1712.14 , -18.23
+114.41 , -1141.43 , -12.01
+114.41 , -570.71 , -5.76
+114.41 , -114.14 , -0.66
+114.41 , 103.14 , 1.84
+114.41 , 515.72 , 7.35
+114.41 , 1031.44 , 14.22
+114.41 , 1547.16 , 21.11
+114.41 , 2062.88 , 28.02
+114.41 , 2578.60 , 34.96
+114.41 , 3094.32 , 41.92
+114.41 , 3610.04 , 48.90
+114.41 , 4125.76 , 55.90
+114.41 , 4641.48 , 62.93
+114.41 , 5157.20 , 69.98
+114.41 , 5672.91 , 77.05
+114.41 , 6188.63 , 84.15
+114.41 , 6704.35 , 91.27
+114.41 , 7220.07 , 98.41
+114.41 , 7735.79 , 105.58
+114.41 , 8251.51 , 112.76
+114.41 , 8767.23 , 119.97
+114.41 , 9282.95 , 127.21
+114.41 , 9798.67 , 134.46
+114.41 , 10314.39 , 141.74
+171.62 , -11414.26 , -182.44
+171.62 , -10843.55 , -173.55
+171.62 , -10272.84 , -164.62
+171.62 , -9702.12 , -155.67
+171.62 , -9131.41 , -146.69
+171.62 , -8560.70 , -137.68
+171.62 , -7989.99 , -128.65
+171.62 , -7419.27 , -119.58
+171.62 , -6848.56 , -110.49
+171.62 , -6277.85 , -101.36
+171.62 , -5707.13 , -92.21
+171.62 , -5136.42 , -83.03
+171.62 , -4565.71 , -73.82
+171.62 , -3994.99 , -64.58
+171.62 , -3424.28 , -55.31
+171.62 , -2853.57 , -46.02
+171.62 , -2282.85 , -36.70
+171.62 , -1712.14 , -27.34
+171.62 , -1141.43 , -17.96
+171.62 , -570.71 , -8.54
+171.62 , -114.14 , -0.79
+171.62 , 103.14 , 2.86
+171.62 , 515.72 , 11.12
+171.62 , 1031.44 , 21.39
+171.62 , 1547.16 , 31.68
+171.62 , 2062.88 , 41.99
+171.62 , 2578.60 , 52.34
+171.62 , 3094.32 , 62.71
+171.62 , 3610.04 , 73.12
+171.62 , 4125.76 , 83.55
+171.62 , 4641.48 , 94.01
+171.62 , 5157.20 , 104.50
+171.62 , 5672.91 , 115.02
+171.62 , 6188.63 , 125.57
+171.62 , 6704.35 , 136.15
+171.62 , 7220.07 , 146.76
+171.62 , 7735.79 , 157.40
+171.62 , 8251.51 , 168.06
+171.62 , 8767.23 , 178.76
+171.62 , 9282.95 , 189.48
+171.62 , 9798.67 , 200.23
+171.62 , 10314.39 , 211.02
+228.82 , -11414.26 , -243.71
+228.82 , -10843.55 , -231.81
+228.82 , -10272.84 , -219.87
+228.82 , -9702.12 , -207.89
+228.82 , -9131.41 , -195.88
+228.82 , -8560.70 , -183.83
+228.82 , -7989.99 , -171.74
+228.82 , -7419.27 , -159.61
+228.82 , -6848.56 , -147.45
+228.82 , -6277.85 , -135.25
+228.82 , -5707.13 , -123.01
+228.82 , -5136.42 , -110.74
+228.82 , -4565.71 , -98.43
+228.82 , -3994.99 , -86.08
+228.82 , -3424.28 , -73.70
+228.82 , -2853.57 , -61.27
+228.82 , -2282.85 , -48.82
+228.82 , -1712.14 , -36.32
+228.82 , -1141.43 , -23.78
+228.82 , -570.71 , -11.19
+228.82 , -114.14 , -0.63
+228.82 , 103.14 , 3.98
+228.82 , 515.72 , 15.01
+228.82 , 1031.44 , 28.68
+228.82 , 1547.16 , 42.37
+228.82 , 2062.88 , 56.10
+228.82 , 2578.60 , 69.87
+228.82 , 3094.32 , 83.67
+228.82 , 3610.04 , 97.52
+228.82 , 4125.76 , 111.40
+228.82 , 4641.48 , 125.31
+228.82 , 5157.20 , 139.27
+228.82 , 5672.91 , 153.26
+228.82 , 6188.63 , 167.29
+228.82 , 6704.35 , 181.36
+228.82 , 7220.07 , 195.46
+228.82 , 7735.79 , 209.61
+228.82 , 8251.51 , 223.79
+228.82 , 8767.23 , 238.01
+228.82 , 9282.95 , 252.26
+228.82 , 9798.67 , 266.56
+228.82 , 10314.39 , 280.89
+286.03 , -11414.26 , -304.37
+286.03 , -10843.55 , -289.50
+286.03 , -10272.84 , -274.59
+286.03 , -9702.12 , -259.63
+286.03 , -9131.41 , -244.61
+286.03 , -8560.70 , -229.56
+286.03 , -7989.99 , -214.45
+286.03 , -7419.27 , -199.30
+286.03 , -6848.56 , -184.10
+286.03 , -6277.85 , -168.85
+286.03 , -5707.13 , -153.55
+286.03 , -5136.42 , -138.20
+286.03 , -4565.71 , -122.81
+286.03 , -3994.99 , -107.37
+286.03 , -3424.28 , -91.88
+286.03 , -2853.57 , -76.35
+286.03 , -2282.85 , -60.76
+286.03 , -1712.14 , -45.13
+286.03 , -1141.43 , -29.44
+286.03 , -570.71 , -13.67
+286.03 , -114.14 , 0.00
+286.03 , 103.14 , 5.21
+286.03 , 515.72 , 19.04
+286.03 , 1031.44 , 36.13
+286.03 , 1547.16 , 53.24
+286.03 , 2062.88 , 70.39
+286.03 , 2578.60 , 87.59
+286.03 , 3094.32 , 104.83
+286.03 , 3610.04 , 122.13
+286.03 , 4125.76 , 139.47
+286.03 , 4641.48 , 156.87
+286.03 , 5157.20 , 174.31
+286.03 , 5672.91 , 191.80
+286.03 , 6188.63 , 209.33
+286.03 , 6704.35 , 226.92
+286.03 , 7220.07 , 244.56
+286.03 , 7735.79 , 262.24
+286.03 , 8251.51 , 279.97
+286.03 , 8767.23 , 297.76
+286.03 , 9282.95 , 315.58
+286.03 , 9798.67 , 333.46
+286.03 , 10314.39 , 351.39
+343.23 , -11414.26 , -364.37
+343.23 , -10843.55 , -346.59
+343.23 , -10272.84 , -328.74
+343.23 , -9702.12 , -310.84
+343.23 , -9131.41 , -292.87
+343.23 , -8560.70 , -274.84
+343.23 , -7989.99 , -256.75
+343.23 , -7419.27 , -238.60
+343.23 , -6848.56 , -220.39
+343.23 , -6277.85 , -202.12
+343.23 , -5707.13 , -183.79
+343.23 , -5136.42 , -165.40
+343.23 , -4565.71 , -146.94
+343.23 , -3994.99 , -128.43
+343.23 , -3424.28 , -109.85
+343.23 , -2853.57 , -91.21
+343.23 , -2282.85 , -72.51
+343.23 , -1712.14 , -53.75
+343.23 , -1141.43 , -34.91
+343.23 , -570.71 , -15.95
+343.23 , -114.14 , 0.00
+343.23 , 103.14 , 6.58
+343.23 , 515.72 , 23.25
+343.23 , 1031.44 , 43.76
+343.23 , 1547.16 , 64.29
+343.23 , 2062.88 , 84.87
+343.23 , 2578.60 , 105.52
+343.23 , 3094.32 , 126.22
+343.23 , 3610.04 , 146.98
+343.23 , 4125.76 , 167.81
+343.23 , 4641.48 , 188.70
+343.23 , 5157.20 , 209.65
+343.23 , 5672.91 , 230.66
+343.23 , 6188.63 , 251.73
+343.23 , 6704.35 , 272.87
+343.23 , 7220.07 , 294.07
+343.23 , 7735.79 , 315.33
+343.23 , 8251.51 , 336.65
+343.23 , 8767.23 , 358.03
+343.23 , 9282.95 , 379.47
+343.23 , 9798.67 , 400.98
+343.23 , 10314.39 , 422.54
+400.44 , -11414.26 , -423.69
+400.44 , -10843.55 , -403.04
+400.44 , -10272.84 , -382.31
+400.44 , -9702.12 , -361.50
+400.44 , -9131.41 , -340.62
+400.44 , -8560.70 , -319.66
+400.44 , -7989.99 , -298.62
+400.44 , -7419.27 , -277.51
+400.44 , -6848.56 , -256.31
+400.44 , -6277.85 , -235.05
+400.44 , -5707.13 , -213.70
+400.44 , -5136.42 , -192.28
+400.44 , -4565.71 , -170.79
+400.44 , -3994.99 , -149.21
+400.44 , -3424.28 , -127.57
+400.44 , -2853.57 , -105.84
+400.44 , -2282.85 , -84.03
+400.44 , -1712.14 , -62.14
+400.44 , -1141.43 , -40.16
+400.44 , -570.71 , -18.00
+400.44 , -114.14 , 0.00
+400.44 , 103.14 , 8.09
+400.44 , 515.72 , 27.64
+400.44 , 1031.44 , 51.59
+400.44 , 1547.16 , 75.56
+400.44 , 2062.88 , 99.58
+400.44 , 2578.60 , 123.68
+400.44 , 3094.32 , 147.86
+400.44 , 3610.04 , 172.10
+400.44 , 4125.76 , 196.43
+400.44 , 4641.48 , 220.84
+400.44 , 5157.20 , 245.32
+400.44 , 5672.91 , 269.88
+400.44 , 6188.63 , 294.51
+400.44 , 6704.35 , 319.23
+400.44 , 7220.07 , 344.02
+400.44 , 7735.79 , 368.89
+400.44 , 8251.51 , 393.83
+400.44 , 8767.23 , 418.85
+400.44 , 9282.95 , 443.95
+400.44 , 9798.67 , 469.13
+400.44 , 10314.39 , 494.38
+457.64 , -11414.26 , -482.31
+457.64 , -10843.55 , -458.83
+457.64 , -10272.84 , -435.26
+457.64 , -9702.12 , -411.59
+457.64 , -9131.41 , -387.83
+457.64 , -8560.70 , -363.97
+457.64 , -7989.99 , -340.02
+457.64 , -7419.27 , -315.97
+457.64 , -6848.56 , -291.83
+457.64 , -6277.85 , -267.59
+457.64 , -5707.13 , -243.26
+457.64 , -5136.42 , -218.84
+457.64 , -4565.71 , -194.32
+457.64 , -3994.99 , -169.71
+457.64 , -3424.28 , -145.00
+457.64 , -2853.57 , -120.19
+457.64 , -2282.85 , -95.29
+457.64 , -1712.14 , -70.28
+457.64 , -1141.43 , -45.14
+457.64 , -570.71 , -19.76
+457.64 , -114.14 , 0.00
+457.64 , 103.14 , 9.76
+457.64 , 515.72 , 32.25
+457.64 , 1031.44 , 59.66
+457.64 , 1547.16 , 87.07
+457.64 , 2062.88 , 114.55
+457.64 , 2578.60 , 142.11
+457.64 , 3094.32 , 169.77
+457.64 , 3610.04 , 197.52
+457.64 , 4125.76 , 225.37
+457.64 , 4641.48 , 253.31
+457.64 , 5157.20 , 281.34
+457.64 , 5672.91 , 309.47
+457.64 , 6188.63 , 337.70
+457.64 , 6704.35 , 366.02
+457.64 , 7220.07 , 394.44
+457.64 , 7735.79 , 422.95
+457.64 , 8251.51 , 451.56
+457.64 , 8767.23 , 480.26
+457.64 , 9282.95 , 509.05
+457.64 , 9798.67 , 537.94
+457.64 , 10314.39 , 566.93
+514.85 , -11414.26 , -540.17
+514.85 , -10843.55 , -513.92
+514.85 , -10272.84 , -487.55
+514.85 , -9702.12 , -461.06
+514.85 , -9131.41 , -434.46
+514.85 , -8560.70 , -407.75
+514.85 , -7989.99 , -380.92
+514.85 , -7419.27 , -353.97
+514.85 , -6848.56 , -326.91
+514.85 , -6277.85 , -299.73
+514.85 , -5707.13 , -272.44
+514.85 , -5136.42 , -245.03
+514.85 , -4565.71 , -217.51
+514.85 , -3994.99 , -189.87
+514.85 , -3424.28 , -162.12
+514.85 , -2853.57 , -134.25
+514.85 , -2282.85 , -106.26
+514.85 , -1712.14 , -78.13
+514.85 , -1141.43 , -49.84
+514.85 , -570.71 , -21.19
+514.85 , -114.14 , 0.00
+514.85 , 103.14 , 11.59
+514.85 , 515.72 , 37.10
+514.85 , 1031.44 , 67.98
+514.85 , 1547.16 , 98.85
+514.85 , 2062.88 , 129.79
+514.85 , 2578.60 , 160.84
+514.85 , 3094.32 , 191.99
+514.85 , 3610.04 , 223.26
+514.85 , 4125.76 , 254.64
+514.85 , 4641.48 , 286.14
+514.85 , 5157.20 , 317.75
+514.85 , 5672.91 , 349.48
+514.85 , 6188.63 , 381.32
+514.85 , 6704.35 , 413.28
+514.85 , 7220.07 , 445.36
+514.85 , 7735.79 , 477.54
+514.85 , 8251.51 , 509.85
+514.85 , 8767.23 , 542.27
+514.85 , 9282.95 , 574.80
+514.85 , 9798.67 , 607.45
+514.85 , 10314.39 , 640.21
+572.06 , -11414.26 , -597.26
+572.06 , -10843.55 , -568.28
+572.06 , -10272.84 , -539.16
+572.06 , -9702.12 , -509.90
+572.06 , -9131.41 , -480.50
+572.06 , -8560.70 , -450.96
+572.06 , -7989.99 , -421.28
+572.06 , -7419.27 , -391.47
+572.06 , -6848.56 , -361.52
+572.06 , -6277.85 , -331.43
+572.06 , -5707.13 , -301.20
+572.06 , -5136.42 , -270.83
+572.06 , -4565.71 , -240.33
+572.06 , -3994.99 , -209.68
+572.06 , -3424.28 , -178.90
+572.06 , -2853.57 , -147.97
+572.06 , -2282.85 , -116.90
+572.06 , -1712.14 , -85.66
+572.06 , -1141.43 , -54.21
+572.06 , -570.71 , -22.23
+572.06 , -114.14 , 0.00
+572.06 , 103.14 , 13.60
+572.06 , 515.72 , 42.20
+572.06 , 1031.44 , 76.58
+572.06 , 1547.16 , 110.92
+572.06 , 2062.88 , 145.34
+572.06 , 2578.60 , 179.88
+572.06 , 3094.32 , 214.55
+572.06 , 3610.04 , 249.35
+572.06 , 4125.76 , 284.29
+572.06 , 4641.48 , 319.36
+572.06 , 5157.20 , 354.57
+572.06 , 5672.91 , 389.92
+572.06 , 6188.63 , 425.41
+572.06 , 6704.35 , 461.03
+572.06 , 7220.07 , 496.79
+572.06 , 7735.79 , 532.69
+572.06 , 8251.51 , 568.73
+572.06 , 8767.23 , 604.90
+572.06 , 9282.95 , 641.21
+572.06 , 9798.67 , 677.66
+572.06 , 10314.39 , 714.24
+629.26 , -11414.26 , -653.54
+629.26 , -10843.55 , -621.88
+629.26 , -10272.84 , -590.05
+629.26 , -9702.12 , -558.06
+629.26 , -9131.41 , -525.90
+629.26 , -8560.70 , -493.58
+629.26 , -7989.99 , -461.09
+629.26 , -7419.27 , -428.44
+629.26 , -6848.56 , -395.63
+629.26 , -6277.85 , -362.65
+629.26 , -5707.13 , -329.51
+629.26 , -5136.42 , -296.21
+629.26 , -4565.71 , -262.74
+629.26 , -3994.99 , -229.11
+629.26 , -3424.28 , -195.31
+629.26 , -2853.57 , -161.34
+629.26 , -2282.85 , -127.18
+629.26 , -1712.14 , -92.83
+629.26 , -1141.43 , -58.20
+629.26 , -570.71 , -22.82
+629.26 , -114.14 , 0.00
+629.26 , 103.14 , 15.79
+629.26 , 515.72 , 47.58
+629.26 , 1031.44 , 85.48
+629.26 , 1547.16 , 123.30
+629.26 , 2062.88 , 161.22
+629.26 , 2578.60 , 199.26
+629.26 , 3094.32 , 237.46
+629.26 , 3610.04 , 275.81
+629.26 , 4125.76 , 314.32
+629.26 , 4641.48 , 352.99
+629.26 , 5157.20 , 391.83
+629.26 , 5672.91 , 430.82
+629.26 , 6188.63 , 469.98
+629.26 , 6704.35 , 509.30
+629.26 , 7220.07 , 548.78
+629.26 , 7735.79 , 588.42
+629.26 , 8251.51 , 628.23
+629.26 , 8767.23 , 668.20
+629.26 , 9282.95 , 708.32
+629.26 , 9798.67 , 748.61
+629.26 , 10314.39 , 789.06
+686.47 , -11414.26 , -708.97
+686.47 , -10843.55 , -674.68
+686.47 , -10272.84 , -640.19
+686.47 , -9702.12 , -605.51
+686.47 , -9131.41 , -570.63
+686.47 , -8560.70 , -535.56
+686.47 , -7989.99 , -500.30
+686.47 , -7419.27 , -464.85
+686.47 , -6848.56 , -429.21
+686.47 , -6277.85 , -393.37
+686.47 , -5707.13 , -357.35
+686.47 , -5136.42 , -321.13
+686.47 , -4565.71 , -284.71
+686.47 , -3994.99 , -248.11
+686.47 , -3424.28 , -211.31
+686.47 , -2853.57 , -174.30
+686.47 , -2282.85 , -137.08
+686.47 , -1712.14 , -99.61
+686.47 , -1141.43 , -61.78
+686.47 , -570.71 , -22.86
+686.47 , -114.14 , 0.00
+686.47 , 103.14 , 18.17
+686.47 , 515.72 , 53.24
+686.47 , 1031.44 , 94.71
+686.47 , 1547.16 , 136.03
+686.47 , 2062.88 , 177.45
+686.47 , 2578.60 , 219.01
+686.47 , 3094.32 , 260.75
+686.47 , 3610.04 , 302.67
+686.47 , 4125.76 , 344.78
+686.47 , 4641.48 , 387.07
+686.47 , 5157.20 , 429.54
+686.47 , 5672.91 , 472.21
+686.47 , 6188.63 , 515.06
+686.47 , 6704.35 , 558.11
+686.47 , 7220.07 , 601.34
+686.47 , 7735.79 , 644.76
+686.47 , 8251.51 , 688.37
+686.47 , 8767.23 , 732.17
+686.47 , 9282.95 , 776.15
+686.47 , 9798.67 , 820.33
+686.47 , 10314.39 , 864.69
+743.67 , -11414.26 , -763.53
+743.67 , -10843.55 , -726.65
+743.67 , -10272.84 , -689.55
+743.67 , -9702.12 , -652.22
+743.67 , -9131.41 , -614.67
+743.67 , -8560.70 , -576.89
+743.67 , -7989.99 , -538.89
+743.67 , -7419.27 , -500.67
+743.67 , -6848.56 , -462.22
+743.67 , -6277.85 , -423.56
+743.67 , -5707.13 , -384.67
+743.67 , -5136.42 , -345.56
+743.67 , -4565.71 , -306.22
+743.67 , -3994.99 , -266.66
+743.67 , -3424.28 , -226.86
+743.67 , -2853.57 , -186.83
+743.67 , -2282.85 , -146.54
+743.67 , -1712.14 , -105.95
+743.67 , -1141.43 , -64.90
+743.67 , -570.71 , -22.24
+743.67 , -114.14 , 0.00
+743.67 , 103.14 , 20.74
+743.67 , 515.72 , 59.20
+743.67 , 1031.44 , 104.27
+743.67 , 1547.16 , 149.12
+743.67 , 2062.88 , 194.05
+743.67 , 2578.60 , 239.16
+743.67 , 3094.32 , 284.45
+743.67 , 3610.04 , 329.96
+743.67 , 4125.76 , 375.67
+743.67 , 4641.48 , 421.60
+743.67 , 5157.20 , 467.75
+743.67 , 5672.91 , 514.11
+743.67 , 6188.63 , 560.69
+743.67 , 6704.35 , 607.48
+743.67 , 7220.07 , 654.50
+743.67 , 7735.79 , 701.73
+743.67 , 8251.51 , 749.18
+743.67 , 8767.23 , 796.84
+743.67 , 9282.95 , 844.73
+743.67 , 9798.67 , 892.83
+743.67 , 10314.39 , 941.14
+800.88 , -11414.26 , -817.17
+800.88 , -10843.55 , -777.76
+800.88 , -10272.84 , -738.08
+800.88 , -9702.12 , -698.15
+800.88 , -9131.41 , -657.96
+800.88 , -8560.70 , -617.52
+800.88 , -7989.99 , -576.82
+800.88 , -7419.27 , -535.86
+800.88 , -6848.56 , -494.65
+800.88 , -6277.85 , -453.18
+800.88 , -5707.13 , -411.45
+800.88 , -5136.42 , -369.47
+800.88 , -4565.71 , -327.22
+800.88 , -3994.99 , -284.72
+800.88 , -3424.28 , -241.95
+800.88 , -2853.57 , -198.90
+800.88 , -2282.85 , -155.54
+800.88 , -1712.14 , -111.82
+800.88 , -1141.43 , -67.51
+800.88 , -570.71 , -20.80
+800.88 , -114.14 , 0.00
+800.88 , 103.14 , 23.52
+800.88 , 515.72 , 65.48
+800.88 , 1031.44 , 114.20
+800.88 , 1547.16 , 162.59
+800.88 , 2062.88 , 211.06
+800.88 , 2578.60 , 259.72
+800.88 , 3094.32 , 308.59
+800.88 , 3610.04 , 357.69
+800.88 , 4125.76 , 407.04
+800.88 , 4641.48 , 456.62
+800.88 , 5157.20 , 506.46
+800.88 , 5672.91 , 556.54
+800.88 , 6188.63 , 606.87
+800.88 , 6704.35 , 657.45
+800.88 , 7220.07 , 708.28
+800.88 , 7735.79 , 759.35
+800.88 , 8251.51 , 810.68
+800.88 , 8767.23 , 862.25
+800.88 , 9282.95 , 914.07
+800.88 , 9798.67 , 966.13
+800.88 , 10314.39 , 1018.44
+858.08 , -11414.26 , -869.86
+858.08 , -10843.55 , -827.96
+858.08 , -10272.84 , -785.77
+858.08 , -9702.12 , -743.28
+858.08 , -9131.41 , -700.50
+858.08 , -8560.70 , -657.42
+858.08 , -7989.99 , -614.05
+858.08 , -7419.27 , -570.39
+858.08 , -6848.56 , -526.44
+858.08 , -6277.85 , -482.19
+858.08 , -5707.13 , -437.65
+858.08 , -5136.42 , -392.82
+858.08 , -4565.71 , -347.69
+858.08 , -3994.99 , -302.26
+858.08 , -3424.28 , -256.52
+858.08 , -2853.57 , -210.46
+858.08 , -2282.85 , -164.04
+858.08 , -1712.14 , -117.17
+858.08 , -1141.43 , -69.54
+858.08 , -570.71 , -18.27
+858.08 , -114.14 , 0.00
+858.08 , 103.14 , 26.49
+858.08 , 515.72 , 72.10
+858.08 , 1031.44 , 124.50
+858.08 , 1547.16 , 176.46
+858.08 , 2062.88 , 228.49
+858.08 , 2578.60 , 280.71
+858.08 , 3094.32 , 333.18
+858.08 , 3610.04 , 385.90
+858.08 , 4125.76 , 438.89
+858.08 , 4641.48 , 492.16
+858.08 , 5157.20 , 545.71
+858.08 , 5672.91 , 599.54
+858.08 , 6188.63 , 653.64
+858.08 , 6704.35 , 708.03
+858.08 , 7220.07 , 762.71
+858.08 , 7735.79 , 817.66
+858.08 , 8251.51 , 872.89
+858.08 , 8767.23 , 928.41
+858.08 , 9282.95 , 984.20
+858.08 , 9798.67 , 1040.27
+858.08 , 10314.39 , 1096.63
+915.29 , -11414.26 , -921.56
+915.29 , -10843.55 , -877.23
+915.29 , -10272.84 , -832.56
+915.29 , -9702.12 , -787.56
+915.29 , -9131.41 , -742.22
+915.29 , -8560.70 , -696.56
+915.29 , -7989.99 , -650.56
+915.29 , -7419.27 , -604.23
+915.29 , -6848.56 , -557.56
+915.29 , -6277.85 , -510.57
+915.29 , -5707.13 , -463.24
+915.29 , -5136.42 , -415.58
+915.29 , -4565.71 , -367.58
+915.29 , -3994.99 , -319.24
+915.29 , -3424.28 , -270.55
+915.29 , -2853.57 , -221.48
+915.29 , -2282.85 , -171.99
+915.29 , -1712.14 , -121.95
+915.29 , -1141.43 , -70.93
+915.29 , -570.71 , -14.10
+915.29 , -114.14 , 0.00
+915.29 , 103.14 , 29.68
+915.29 , 515.72 , 79.05
+915.29 , 1031.44 , 135.20
+915.29 , 1547.16 , 190.76
+915.29 , 2062.88 , 246.36
+915.29 , 2578.60 , 302.17
+915.29 , 3094.32 , 358.24
+915.29 , 3610.04 , 414.60
+915.29 , 4125.76 , 471.27
+915.29 , 4641.48 , 528.24
+915.29 , 5157.20 , 585.52
+915.29 , 5672.91 , 643.12
+915.29 , 6188.63 , 701.03
+915.29 , 6704.35 , 759.26
+915.29 , 7220.07 , 817.80
+915.29 , 7735.79 , 876.66
+915.29 , 8251.51 , 935.84
+915.29 , 8767.23 , 995.34
+915.29 , 9282.95 , 1055.15
+915.29 , 9798.67 , 1115.27
+915.29 , 10314.39 , 1175.71
+972.50 , -11414.26 , -972.24
+972.50 , -10843.55 , -925.52
+972.50 , -10272.84 , -878.43
+972.50 , -9702.12 , -830.96
+972.50 , -9131.41 , -783.11
+972.50 , -8560.70 , -734.89
+972.50 , -7989.99 , -686.30
+972.50 , -7419.27 , -637.33
+972.50 , -6848.56 , -587.99
+972.50 , -6277.85 , -538.28
+972.50 , -5707.13 , -488.19
+972.50 , -5136.42 , -437.72
+972.50 , -4565.71 , -386.87
+972.50 , -3994.99 , -335.63
+972.50 , -3424.28 , -283.99
+972.50 , -2853.57 , -231.92
+972.50 , -2282.85 , -179.35
+972.50 , -1712.14 , -126.12
+972.50 , -1141.43 , -71.60
+972.50 , -570.71 , -6.45
+972.50 , -114.14 , 0.00
+972.50 , 103.14 , 33.08
+972.50 , 515.72 , 86.37
+972.50 , 1031.44 , 146.31
+972.50 , 1547.16 , 205.50
+972.50 , 2062.88 , 264.70
+972.50 , 2578.60 , 324.11
+972.50 , 3094.32 , 383.81
+972.50 , 3610.04 , 443.83
+972.50 , 4125.76 , 504.18
+972.50 , 4641.48 , 564.87
+972.50 , 5157.20 , 625.91
+972.50 , 5672.91 , 687.30
+972.50 , 6188.63 , 749.05
+972.50 , 6704.35 , 811.14
+972.50 , 7220.07 , 873.59
+972.50 , 7735.79 , 936.40
+972.50 , 8251.51 , 999.56
+972.50 , 8767.23 , 1063.07
+972.50 , 9282.95 , 1126.93
+972.50 , 9798.67 , 1191.14
+972.50 , 10314.39 , 1255.71
+1029.70 , -11414.26 , -1021.86
+1029.70 , -10843.55 , -972.81
+1029.70 , -10272.84 , -923.33
+1029.70 , -9702.12 , -873.44
+1029.70 , -9131.41 , -823.13
+1029.70 , -8560.70 , -772.39
+1029.70 , -7989.99 , -721.24
+1029.70 , -7419.27 , -669.67
+1029.70 , -6848.56 , -617.68
+1029.70 , -6277.85 , -565.27
+1029.70 , -5707.13 , -512.45
+1029.70 , -5136.42 , -459.19
+1029.70 , -4565.71 , -405.51
+1029.70 , -3994.99 , -351.39
+1029.70 , -3424.28 , -296.81
+1029.70 , -2853.57 , -241.73
+1029.70 , -2282.85 , -186.07
+1029.70 , -1712.14 , -129.61
+1029.70 , -1141.43 , -71.46
+1029.70 , -570.71 , 0.00
+1029.70 , -114.14 , 0.00
+1029.70 , 103.14 , 36.70
+1029.70 , 515.72 , 94.04
+1029.70 , 1031.44 , 157.85
+1029.70 , 1547.16 , 220.70
+1029.70 , 2062.88 , 283.52
+1029.70 , 2578.60 , 346.56
+1029.70 , 3094.32 , 409.90
+1029.70 , 3610.04 , 473.59
+1029.70 , 4125.76 , 537.65
+1029.70 , 4641.48 , 602.09
+1029.70 , 5157.20 , 666.91
+1029.70 , 5672.91 , 732.12
+1029.70 , 6188.63 , 797.72
+1029.70 , 6704.35 , 863.72
+1029.70 , 7220.07 , 930.10
+1029.70 , 7735.79 , 996.88
+1029.70 , 8251.51 , 1064.05
+1029.70 , 8767.23 , 1131.62
+1029.70 , 9282.95 , 1199.57
+1029.70 , 9798.67 , 1267.92
+1029.70 , 10314.39 , 1336.65
+1086.91 , -11414.26 , -1070.37
+1086.91 , -10843.55 , -1019.04
+1086.91 , -10272.84 , -967.24
+1086.91 , -9702.12 , -914.96
+1086.91 , -9131.41 , -862.23
+1086.91 , -8560.70 , -809.02
+1086.91 , -7989.99 , -755.35
+1086.91 , -7419.27 , -701.21
+1086.91 , -6848.56 , -646.60
+1086.91 , -6277.85 , -591.53
+1086.91 , -5707.13 , -535.99
+1086.91 , -5136.42 , -479.97
+1086.91 , -4565.71 , -423.47
+1086.91 , -3994.99 , -366.48
+1086.91 , -3424.28 , -308.96
+1086.91 , -2853.57 , -250.88
+1086.91 , -2282.85 , -192.11
+1086.91 , -1712.14 , -132.36
+1086.91 , -1141.43 , -70.38
+1086.91 , -570.71 , 0.00
+1086.91 , -114.14 , 0.00
+1086.91 , 103.14 , 40.53
+1086.91 , 515.72 , 102.10
+1086.91 , 1031.44 , 169.83
+1086.91 , 1547.16 , 236.37
+1086.91 , 2062.88 , 302.84
+1086.91 , 2578.60 , 369.53
+1086.91 , 3094.32 , 436.54
+1086.91 , 3610.04 , 503.92
+1086.91 , 4125.76 , 571.71
+1086.91 , 4641.48 , 639.91
+1086.91 , 5157.20 , 708.54
+1086.91 , 5672.91 , 777.59
+1086.91 , 6188.63 , 847.08
+1086.91 , 6704.35 , 917.00
+1086.91 , 7220.07 , 987.35
+1086.91 , 7735.79 , 1058.14
+1086.91 , 8251.51 , 1129.36
+1086.91 , 8767.23 , 1201.01
+1086.91 , 9282.95 , 1273.09
+1086.91 , 9798.67 , 1345.61
+1086.91 , 10314.39 , 1418.56
+1144.11 , -11414.26 , -1117.74
+1144.11 , -10843.55 , -1064.18
+1144.11 , -10272.84 , -1010.10
+1144.11 , -9702.12 , -955.49
+1144.11 , -9131.41 , -900.37
+1144.11 , -8560.70 , -844.73
+1144.11 , -7989.99 , -788.58
+1144.11 , -7419.27 , -731.90
+1144.11 , -6848.56 , -674.71
+1144.11 , -6277.85 , -617.00
+1144.11 , -5707.13 , -558.77
+1144.11 , -5136.42 , -500.01
+1144.11 , -4565.71 , -440.71
+1144.11 , -3994.99 , -380.85
+1144.11 , -3424.28 , -320.40
+1144.11 , -2853.57 , -259.31
+1144.11 , -2282.85 , -197.41
+1144.11 , -1712.14 , -134.30
+1144.11 , -1141.43 , -68.24
+1144.11 , -570.71 , 0.00
+1144.11 , -114.14 , 0.00
+1144.11 , 103.14 , 44.59
+1144.11 , 515.72 , 110.53
+1144.11 , 1031.44 , 182.27
+1144.11 , 1547.16 , 252.55
+1144.11 , 2062.88 , 322.69
+1144.11 , 2578.60 , 393.04
+1144.11 , 3094.32 , 463.74
+1144.11 , 3610.04 , 534.84
+1144.11 , 4125.76 , 606.37
+1144.11 , 4641.48 , 678.37
+1144.11 , 5157.20 , 750.82
+1144.11 , 5672.91 , 823.74
+1144.11 , 6188.63 , 897.14
+1144.11 , 6704.35 , 971.01
+1144.11 , 7220.07 , 1045.36
+1144.11 , 7735.79 , 1120.19
+1144.11 , 8251.51 , 1195.49
+1144.11 , 8767.23 , 1271.27
+1144.11 , 9282.95 , 1347.52
+1144.11 , 9798.67 , 1424.25
+1144.11 , 10314.39 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..102d2ba38dee164c86a6a611167df50fbf2d589a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -21.84
+5.72 , -22.52
+57.21 , -28.92
+114.41 , -35.99
+171.62 , -43.07
+228.82 , -50.22
+286.03 , -57.30
+343.23 , -64.38
+400.44 , -71.45
+457.65 , -78.53
+514.85 , -85.68
+572.06 , -92.76
+629.26 , -99.84
+686.47 , -106.91
+743.67 , -113.99
+800.88 , -121.14
+858.08 , -128.22
+915.29 , -135.30
+972.50 , -142.37
+1029.70 , -149.45
+1086.91 , -156.60
+1144.11 , -163.68
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/Axle_4x2_Tractor.vtlm b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/Axle_4x2_Tractor.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..e11cbf7cdde175e06ab8f6a0b79d46b84b3e0c1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/Axle_4x2_Tractor.vtlm
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/Axlegear.vgbx b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/Axlegear.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..8c4b5d9467fc9de8c168253de67633e521e24a0f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/Axlegear.vgbx
@@ -0,0 +1,33 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-11-03T14:19:09.9858299Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "3_speed_AMT",
+ "Inertia": 0.0,
+ "TracInt": 0.8,
+ "Gears": [
+ {
+ "Ratio": 2.64,
+ "LossMap": "Axle_4x2_Tractor.vtlm"
+ }
+ ],
+ "TqReserve": 0.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.22222222222222,
+ "StartAcc": 0.8,
+ "GearboxType": "AMT",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAfterUpshiftDelay": 6.0,
+ "UpshiftAfterDownshiftDelay": 6.0,
+ "UpshiftMinAcceleration": 0.1,
+ "PowershiftShiftTime": 0.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/GenericIEPC_Gbx3.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/GenericIEPC_Gbx3.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..863fb893954d209433b18cb5eefa1b054cda69f9
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/GenericIEPC_Gbx3.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 8.31
+ },
+ {
+ "Ratio": 4.65
+ },
+ {
+ "Ratio": 2.74
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/GenericIEPC_Gbx3_drag.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/GenericIEPC_Gbx3_drag.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..533a4a5e6a90b2c99b0ff3c0cf14b65eac3a9859
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/GenericIEPC_Gbx3_drag.viepc
@@ -0,0 +1,63 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 8.31
+ },
+ {
+ "Ratio": 4.65
+ },
+ {
+ "Ratio": 2.74
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3_drag1.viepcd",
+ "2": "IEPC_Gbx3_drag2.viepcd",
+ "3": "IEPC_Gbx3_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..72acd74aa5bf7b92fd7d255647930ba7d795b433
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx3.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "Axlegear.vgbx",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3_drag.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3_drag.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..aad5769a42aa7bd720108aafe4ffa096c0f3c056
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3_drag.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx3_drag.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "Axlegear.vgbx",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..d01a2b7415dd7d2d823bea04f9fae421271fe0b4
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3_drag.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3_drag.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..822cf72445696b6fa33bc07e254be7c82eefac17
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3_drag.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3_drag.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_1.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..52c23c595eece5b3cd06f8111e7c740348ddbf08
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -12984.38 , 0.00
+0.00 , -12335.16 , 0.00
+0.00 , -11685.94 , 0.00
+0.00 , -11036.72 , 0.00
+0.00 , -10387.50 , 0.00
+0.00 , -9738.28 , 0.00
+0.00 , -9089.06 , -0.13
+0.00 , -8439.84 , -0.66
+0.00 , -7790.63 , -0.98
+0.00 , -7141.41 , -1.19
+0.00 , -6492.19 , -1.32
+0.00 , -5842.97 , -1.38
+0.00 , -5193.75 , -1.39
+0.00 , -4544.53 , -1.35
+0.00 , -3895.31 , -1.26
+0.00 , -3246.09 , -1.13
+0.00 , -2596.88 , -0.97
+0.00 , -1947.66 , -0.77
+0.00 , -1298.44 , -0.53
+0.00 , -649.22 , -0.27
+0.00 , -129.84 , -0.02
+0.00 , 119.66 , 0.13
+0.00 , 598.32 , 0.56
+0.00 , 1196.64 , 1.12
+0.00 , 1794.96 , 1.70
+0.00 , 2393.28 , 2.31
+0.00 , 2991.60 , 2.93
+0.00 , 3589.92 , 3.58
+0.00 , 4188.24 , 4.25
+0.00 , 4786.56 , 4.93
+0.00 , 5384.88 , 5.64
+0.00 , 5983.20 , 6.37
+0.00 , 6581.52 , 7.12
+0.00 , 7179.84 , 7.88
+0.00 , 7778.16 , 8.67
+0.00 , 8376.48 , 9.47
+0.00 , 8974.80 , 10.29
+0.00 , 9573.12 , 11.13
+0.00 , 10171.44 , 11.99
+0.00 , 10769.76 , 12.87
+0.00 , 11368.08 , 13.76
+0.00 , 11966.40 , 14.67
+4.98 , -12984.38 , 0.00
+4.98 , -12335.16 , 0.00
+4.98 , -11685.94 , 0.00
+4.98 , -11036.72 , 0.00
+4.98 , -10387.50 , 0.00
+4.98 , -9738.28 , 0.00
+4.98 , -9089.06 , -0.50
+4.98 , -8439.84 , -0.84
+4.98 , -7790.63 , -1.04
+4.98 , -7141.41 , -1.16
+4.98 , -6492.19 , -1.22
+4.98 , -5842.97 , -1.24
+4.98 , -5193.75 , -1.21
+4.98 , -4544.53 , -1.15
+4.98 , -3895.31 , -1.06
+4.98 , -3246.09 , -0.94
+4.98 , -2596.88 , -0.80
+4.98 , -1947.66 , -0.62
+4.98 , -1298.44 , -0.43
+4.98 , -649.22 , -0.21
+4.98 , -129.84 , -0.02
+4.98 , 119.66 , 0.10
+4.98 , 598.32 , 0.43
+4.98 , 1196.64 , 0.85
+4.98 , 1794.96 , 1.30
+4.98 , 2393.28 , 1.75
+4.98 , 2991.60 , 2.23
+4.98 , 3589.92 , 2.71
+4.98 , 4188.24 , 3.21
+4.98 , 4786.56 , 3.73
+4.98 , 5384.88 , 4.26
+4.98 , 5983.20 , 4.80
+4.98 , 6581.52 , 5.36
+4.98 , 7179.84 , 5.93
+4.98 , 7778.16 , 6.52
+4.98 , 8376.48 , 7.12
+4.98 , 8974.80 , 7.73
+4.98 , 9573.12 , 8.35
+4.98 , 10171.44 , 8.99
+4.98 , 10769.76 , 9.64
+4.98 , 11368.08 , 10.30
+4.98 , 11966.40 , 10.98
+49.80 , -12984.38 , -58.10
+49.80 , -12335.16 , -55.37
+49.80 , -11685.94 , -52.62
+49.80 , -11036.72 , -49.85
+49.80 , -10387.50 , -47.06
+49.80 , -9738.28 , -44.25
+49.80 , -9089.06 , -41.42
+49.80 , -8439.84 , -38.57
+49.80 , -7790.63 , -35.70
+49.80 , -7141.41 , -32.81
+49.80 , -6492.19 , -29.90
+49.80 , -5842.97 , -26.98
+49.80 , -5193.75 , -24.03
+49.80 , -4544.53 , -21.07
+49.80 , -3895.31 , -18.08
+49.80 , -3246.09 , -15.08
+49.80 , -2596.88 , -12.06
+49.80 , -1947.66 , -9.02
+49.80 , -1298.44 , -5.96
+49.80 , -649.22 , -2.88
+49.80 , -129.84 , -0.37
+49.80 , 119.66 , 0.90
+49.80 , 598.32 , 3.68
+49.80 , 1196.64 , 7.16
+49.80 , 1794.96 , 10.66
+49.80 , 2393.28 , 14.17
+49.80 , 2991.60 , 17.71
+49.80 , 3589.92 , 21.26
+49.80 , 4188.24 , 24.84
+49.80 , 4786.56 , 28.43
+49.80 , 5384.88 , 32.04
+49.80 , 5983.20 , 35.67
+49.80 , 6581.52 , 39.32
+49.80 , 7179.84 , 42.99
+49.80 , 7778.16 , 46.68
+49.80 , 8376.48 , 50.38
+49.80 , 8974.80 , 54.11
+49.80 , 9573.12 , 57.85
+49.80 , 10171.44 , 61.61
+49.80 , 10769.76 , 65.39
+49.80 , 11368.08 , 69.19
+49.80 , 11966.40 , 73.01
+99.59 , -12984.38 , -120.57
+99.59 , -12335.16 , -114.73
+99.59 , -11685.94 , -108.87
+99.59 , -11036.72 , -102.99
+99.59 , -10387.50 , -97.08
+99.59 , -9738.28 , -91.15
+99.59 , -9089.06 , -85.20
+99.59 , -8439.84 , -79.23
+99.59 , -7790.63 , -73.23
+99.59 , -7141.41 , -67.21
+99.59 , -6492.19 , -61.17
+99.59 , -5842.97 , -55.10
+99.59 , -5193.75 , -49.01
+99.59 , -4544.53 , -42.90
+99.59 , -3895.31 , -36.77
+99.59 , -3246.09 , -30.61
+99.59 , -2596.88 , -24.43
+99.59 , -1947.66 , -18.23
+99.59 , -1298.44 , -12.01
+99.59 , -649.22 , -5.76
+99.59 , -129.84 , -0.66
+99.59 , 119.66 , 1.84
+99.59 , 598.32 , 7.35
+99.59 , 1196.64 , 14.22
+99.59 , 1794.96 , 21.11
+99.59 , 2393.28 , 28.02
+99.59 , 2991.60 , 34.96
+99.59 , 3589.92 , 41.92
+99.59 , 4188.24 , 48.90
+99.59 , 4786.56 , 55.90
+99.59 , 5384.88 , 62.93
+99.59 , 5983.20 , 69.98
+99.59 , 6581.52 , 77.05
+99.59 , 7179.84 , 84.15
+99.59 , 7778.16 , 91.27
+99.59 , 8376.48 , 98.41
+99.59 , 8974.80 , 105.58
+99.59 , 9573.12 , 112.76
+99.59 , 10171.44 , 119.97
+99.59 , 10769.76 , 127.21
+99.59 , 11368.08 , 134.46
+99.59 , 11966.40 , 141.74
+149.39 , -12984.38 , -182.44
+149.39 , -12335.16 , -173.55
+149.39 , -11685.94 , -164.62
+149.39 , -11036.72 , -155.67
+149.39 , -10387.50 , -146.69
+149.39 , -9738.28 , -137.68
+149.39 , -9089.06 , -128.65
+149.39 , -8439.84 , -119.58
+149.39 , -7790.63 , -110.49
+149.39 , -7141.41 , -101.36
+149.39 , -6492.19 , -92.21
+149.39 , -5842.97 , -83.03
+149.39 , -5193.75 , -73.82
+149.39 , -4544.53 , -64.58
+149.39 , -3895.31 , -55.31
+149.39 , -3246.09 , -46.02
+149.39 , -2596.88 , -36.70
+149.39 , -1947.66 , -27.34
+149.39 , -1298.44 , -17.96
+149.39 , -649.22 , -8.54
+149.39 , -129.84 , -0.79
+149.39 , 119.66 , 2.86
+149.39 , 598.32 , 11.12
+149.39 , 1196.64 , 21.39
+149.39 , 1794.96 , 31.68
+149.39 , 2393.28 , 41.99
+149.39 , 2991.60 , 52.34
+149.39 , 3589.92 , 62.71
+149.39 , 4188.24 , 73.12
+149.39 , 4786.56 , 83.55
+149.39 , 5384.88 , 94.01
+149.39 , 5983.20 , 104.50
+149.39 , 6581.52 , 115.02
+149.39 , 7179.84 , 125.57
+149.39 , 7778.16 , 136.15
+149.39 , 8376.48 , 146.76
+149.39 , 8974.80 , 157.40
+149.39 , 9573.12 , 168.06
+149.39 , 10171.44 , 178.76
+149.39 , 10769.76 , 189.48
+149.39 , 11368.08 , 200.23
+149.39 , 11966.40 , 211.02
+199.18 , -12984.38 , -243.71
+199.18 , -12335.16 , -231.81
+199.18 , -11685.94 , -219.87
+199.18 , -11036.72 , -207.89
+199.18 , -10387.50 , -195.88
+199.18 , -9738.28 , -183.83
+199.18 , -9089.06 , -171.74
+199.18 , -8439.84 , -159.61
+199.18 , -7790.63 , -147.45
+199.18 , -7141.41 , -135.25
+199.18 , -6492.19 , -123.01
+199.18 , -5842.97 , -110.74
+199.18 , -5193.75 , -98.43
+199.18 , -4544.53 , -86.08
+199.18 , -3895.31 , -73.70
+199.18 , -3246.09 , -61.27
+199.18 , -2596.88 , -48.82
+199.18 , -1947.66 , -36.32
+199.18 , -1298.44 , -23.78
+199.18 , -649.22 , -11.19
+199.18 , -129.84 , -0.63
+199.18 , 119.66 , 3.98
+199.18 , 598.32 , 15.01
+199.18 , 1196.64 , 28.68
+199.18 , 1794.96 , 42.37
+199.18 , 2393.28 , 56.10
+199.18 , 2991.60 , 69.87
+199.18 , 3589.92 , 83.67
+199.18 , 4188.24 , 97.52
+199.18 , 4786.56 , 111.40
+199.18 , 5384.88 , 125.31
+199.18 , 5983.20 , 139.27
+199.18 , 6581.52 , 153.26
+199.18 , 7179.84 , 167.29
+199.18 , 7778.16 , 181.36
+199.18 , 8376.48 , 195.46
+199.18 , 8974.80 , 209.61
+199.18 , 9573.12 , 223.79
+199.18 , 10171.44 , 238.01
+199.18 , 10769.76 , 252.26
+199.18 , 11368.08 , 266.56
+199.18 , 11966.40 , 280.89
+248.98 , -12984.38 , -304.37
+248.98 , -12335.16 , -289.50
+248.98 , -11685.94 , -274.59
+248.98 , -11036.72 , -259.63
+248.98 , -10387.50 , -244.61
+248.98 , -9738.28 , -229.56
+248.98 , -9089.06 , -214.45
+248.98 , -8439.84 , -199.30
+248.98 , -7790.63 , -184.10
+248.98 , -7141.41 , -168.85
+248.98 , -6492.19 , -153.55
+248.98 , -5842.97 , -138.20
+248.98 , -5193.75 , -122.81
+248.98 , -4544.53 , -107.37
+248.98 , -3895.31 , -91.88
+248.98 , -3246.09 , -76.35
+248.98 , -2596.88 , -60.76
+248.98 , -1947.66 , -45.13
+248.98 , -1298.44 , -29.44
+248.98 , -649.22 , -13.67
+248.98 , -129.84 , 0.00
+248.98 , 119.66 , 5.21
+248.98 , 598.32 , 19.04
+248.98 , 1196.64 , 36.13
+248.98 , 1794.96 , 53.24
+248.98 , 2393.28 , 70.39
+248.98 , 2991.60 , 87.59
+248.98 , 3589.92 , 104.83
+248.98 , 4188.24 , 122.13
+248.98 , 4786.56 , 139.47
+248.98 , 5384.88 , 156.87
+248.98 , 5983.20 , 174.31
+248.98 , 6581.52 , 191.80
+248.98 , 7179.84 , 209.33
+248.98 , 7778.16 , 226.92
+248.98 , 8376.48 , 244.56
+248.98 , 8974.80 , 262.24
+248.98 , 9573.12 , 279.97
+248.98 , 10171.44 , 297.76
+248.98 , 10769.76 , 315.58
+248.98 , 11368.08 , 333.46
+248.98 , 11966.40 , 351.39
+298.77 , -12984.38 , -364.37
+298.77 , -12335.16 , -346.59
+298.77 , -11685.94 , -328.74
+298.77 , -11036.72 , -310.84
+298.77 , -10387.50 , -292.87
+298.77 , -9738.28 , -274.84
+298.77 , -9089.06 , -256.75
+298.77 , -8439.84 , -238.60
+298.77 , -7790.63 , -220.39
+298.77 , -7141.41 , -202.12
+298.77 , -6492.19 , -183.79
+298.77 , -5842.97 , -165.40
+298.77 , -5193.75 , -146.94
+298.77 , -4544.53 , -128.43
+298.77 , -3895.31 , -109.85
+298.77 , -3246.09 , -91.21
+298.77 , -2596.88 , -72.51
+298.77 , -1947.66 , -53.75
+298.77 , -1298.44 , -34.91
+298.77 , -649.22 , -15.95
+298.77 , -129.84 , 0.00
+298.77 , 119.66 , 6.58
+298.77 , 598.32 , 23.25
+298.77 , 1196.64 , 43.76
+298.77 , 1794.96 , 64.29
+298.77 , 2393.28 , 84.87
+298.77 , 2991.60 , 105.52
+298.77 , 3589.92 , 126.22
+298.77 , 4188.24 , 146.98
+298.77 , 4786.56 , 167.81
+298.77 , 5384.88 , 188.70
+298.77 , 5983.20 , 209.65
+298.77 , 6581.52 , 230.66
+298.77 , 7179.84 , 251.73
+298.77 , 7778.16 , 272.87
+298.77 , 8376.48 , 294.07
+298.77 , 8974.80 , 315.33
+298.77 , 9573.12 , 336.65
+298.77 , 10171.44 , 358.03
+298.77 , 10769.76 , 379.47
+298.77 , 11368.08 , 400.98
+298.77 , 11966.40 , 422.54
+348.57 , -12984.38 , -423.69
+348.57 , -12335.16 , -403.04
+348.57 , -11685.94 , -382.31
+348.57 , -11036.72 , -361.50
+348.57 , -10387.50 , -340.62
+348.57 , -9738.28 , -319.66
+348.57 , -9089.06 , -298.62
+348.57 , -8439.84 , -277.51
+348.57 , -7790.63 , -256.31
+348.57 , -7141.41 , -235.05
+348.57 , -6492.19 , -213.70
+348.57 , -5842.97 , -192.28
+348.57 , -5193.75 , -170.79
+348.57 , -4544.53 , -149.21
+348.57 , -3895.31 , -127.57
+348.57 , -3246.09 , -105.84
+348.57 , -2596.88 , -84.03
+348.57 , -1947.66 , -62.14
+348.57 , -1298.44 , -40.16
+348.57 , -649.22 , -18.00
+348.57 , -129.84 , 0.00
+348.57 , 119.66 , 8.09
+348.57 , 598.32 , 27.64
+348.57 , 1196.64 , 51.59
+348.57 , 1794.96 , 75.56
+348.57 , 2393.28 , 99.58
+348.57 , 2991.60 , 123.68
+348.57 , 3589.92 , 147.86
+348.57 , 4188.24 , 172.10
+348.57 , 4786.56 , 196.43
+348.57 , 5384.88 , 220.84
+348.57 , 5983.20 , 245.32
+348.57 , 6581.52 , 269.88
+348.57 , 7179.84 , 294.51
+348.57 , 7778.16 , 319.23
+348.57 , 8376.48 , 344.02
+348.57 , 8974.80 , 368.89
+348.57 , 9573.12 , 393.83
+348.57 , 10171.44 , 418.85
+348.57 , 10769.76 , 443.95
+348.57 , 11368.08 , 469.13
+348.57 , 11966.40 , 494.38
+398.37 , -12984.38 , -482.31
+398.37 , -12335.16 , -458.83
+398.37 , -11685.94 , -435.26
+398.37 , -11036.72 , -411.59
+398.37 , -10387.50 , -387.83
+398.37 , -9738.28 , -363.97
+398.37 , -9089.06 , -340.02
+398.37 , -8439.84 , -315.97
+398.37 , -7790.63 , -291.83
+398.37 , -7141.41 , -267.59
+398.37 , -6492.19 , -243.26
+398.37 , -5842.97 , -218.84
+398.37 , -5193.75 , -194.32
+398.37 , -4544.53 , -169.71
+398.37 , -3895.31 , -145.00
+398.37 , -3246.09 , -120.19
+398.37 , -2596.88 , -95.29
+398.37 , -1947.66 , -70.28
+398.37 , -1298.44 , -45.14
+398.37 , -649.22 , -19.76
+398.37 , -129.84 , 0.00
+398.37 , 119.66 , 9.76
+398.37 , 598.32 , 32.25
+398.37 , 1196.64 , 59.66
+398.37 , 1794.96 , 87.07
+398.37 , 2393.28 , 114.55
+398.37 , 2991.60 , 142.11
+398.37 , 3589.92 , 169.77
+398.37 , 4188.24 , 197.52
+398.37 , 4786.56 , 225.37
+398.37 , 5384.88 , 253.31
+398.37 , 5983.20 , 281.34
+398.37 , 6581.52 , 309.47
+398.37 , 7179.84 , 337.70
+398.37 , 7778.16 , 366.02
+398.37 , 8376.48 , 394.44
+398.37 , 8974.80 , 422.95
+398.37 , 9573.12 , 451.56
+398.37 , 10171.44 , 480.26
+398.37 , 10769.76 , 509.05
+398.37 , 11368.08 , 537.94
+398.37 , 11966.40 , 566.93
+448.16 , -12984.38 , -540.17
+448.16 , -12335.16 , -513.92
+448.16 , -11685.94 , -487.55
+448.16 , -11036.72 , -461.06
+448.16 , -10387.50 , -434.46
+448.16 , -9738.28 , -407.75
+448.16 , -9089.06 , -380.92
+448.16 , -8439.84 , -353.97
+448.16 , -7790.63 , -326.91
+448.16 , -7141.41 , -299.73
+448.16 , -6492.19 , -272.44
+448.16 , -5842.97 , -245.03
+448.16 , -5193.75 , -217.51
+448.16 , -4544.53 , -189.87
+448.16 , -3895.31 , -162.12
+448.16 , -3246.09 , -134.25
+448.16 , -2596.88 , -106.26
+448.16 , -1947.66 , -78.13
+448.16 , -1298.44 , -49.84
+448.16 , -649.22 , -21.19
+448.16 , -129.84 , 0.00
+448.16 , 119.66 , 11.59
+448.16 , 598.32 , 37.10
+448.16 , 1196.64 , 67.98
+448.16 , 1794.96 , 98.85
+448.16 , 2393.28 , 129.79
+448.16 , 2991.60 , 160.84
+448.16 , 3589.92 , 191.99
+448.16 , 4188.24 , 223.26
+448.16 , 4786.56 , 254.64
+448.16 , 5384.88 , 286.14
+448.16 , 5983.20 , 317.75
+448.16 , 6581.52 , 349.48
+448.16 , 7179.84 , 381.32
+448.16 , 7778.16 , 413.28
+448.16 , 8376.48 , 445.36
+448.16 , 8974.80 , 477.54
+448.16 , 9573.12 , 509.85
+448.16 , 10171.44 , 542.27
+448.16 , 10769.76 , 574.80
+448.16 , 11368.08 , 607.45
+448.16 , 11966.40 , 640.21
+497.96 , -12984.38 , -597.26
+497.96 , -12335.16 , -568.28
+497.96 , -11685.94 , -539.16
+497.96 , -11036.72 , -509.90
+497.96 , -10387.50 , -480.50
+497.96 , -9738.28 , -450.96
+497.96 , -9089.06 , -421.28
+497.96 , -8439.84 , -391.47
+497.96 , -7790.63 , -361.52
+497.96 , -7141.41 , -331.43
+497.96 , -6492.19 , -301.20
+497.96 , -5842.97 , -270.83
+497.96 , -5193.75 , -240.33
+497.96 , -4544.53 , -209.68
+497.96 , -3895.31 , -178.90
+497.96 , -3246.09 , -147.97
+497.96 , -2596.88 , -116.90
+497.96 , -1947.66 , -85.66
+497.96 , -1298.44 , -54.21
+497.96 , -649.22 , -22.23
+497.96 , -129.84 , 0.00
+497.96 , 119.66 , 13.60
+497.96 , 598.32 , 42.20
+497.96 , 1196.64 , 76.58
+497.96 , 1794.96 , 110.92
+497.96 , 2393.28 , 145.34
+497.96 , 2991.60 , 179.88
+497.96 , 3589.92 , 214.55
+497.96 , 4188.24 , 249.35
+497.96 , 4786.56 , 284.29
+497.96 , 5384.88 , 319.36
+497.96 , 5983.20 , 354.57
+497.96 , 6581.52 , 389.92
+497.96 , 7179.84 , 425.41
+497.96 , 7778.16 , 461.03
+497.96 , 8376.48 , 496.79
+497.96 , 8974.80 , 532.69
+497.96 , 9573.12 , 568.73
+497.96 , 10171.44 , 604.90
+497.96 , 10769.76 , 641.21
+497.96 , 11368.08 , 677.66
+497.96 , 11966.40 , 714.24
+547.75 , -12984.38 , -653.54
+547.75 , -12335.16 , -621.88
+547.75 , -11685.94 , -590.05
+547.75 , -11036.72 , -558.06
+547.75 , -10387.50 , -525.90
+547.75 , -9738.28 , -493.58
+547.75 , -9089.06 , -461.09
+547.75 , -8439.84 , -428.44
+547.75 , -7790.63 , -395.63
+547.75 , -7141.41 , -362.65
+547.75 , -6492.19 , -329.51
+547.75 , -5842.97 , -296.21
+547.75 , -5193.75 , -262.74
+547.75 , -4544.53 , -229.11
+547.75 , -3895.31 , -195.31
+547.75 , -3246.09 , -161.34
+547.75 , -2596.88 , -127.18
+547.75 , -1947.66 , -92.83
+547.75 , -1298.44 , -58.20
+547.75 , -649.22 , -22.82
+547.75 , -129.84 , 0.00
+547.75 , 119.66 , 15.79
+547.75 , 598.32 , 47.58
+547.75 , 1196.64 , 85.48
+547.75 , 1794.96 , 123.30
+547.75 , 2393.28 , 161.22
+547.75 , 2991.60 , 199.26
+547.75 , 3589.92 , 237.46
+547.75 , 4188.24 , 275.81
+547.75 , 4786.56 , 314.32
+547.75 , 5384.88 , 352.99
+547.75 , 5983.20 , 391.83
+547.75 , 6581.52 , 430.82
+547.75 , 7179.84 , 469.98
+547.75 , 7778.16 , 509.30
+547.75 , 8376.48 , 548.78
+547.75 , 8974.80 , 588.42
+547.75 , 9573.12 , 628.23
+547.75 , 10171.44 , 668.20
+547.75 , 10769.76 , 708.32
+547.75 , 11368.08 , 748.61
+547.75 , 11966.40 , 789.06
+597.55 , -12984.38 , -708.97
+597.55 , -12335.16 , -674.68
+597.55 , -11685.94 , -640.19
+597.55 , -11036.72 , -605.51
+597.55 , -10387.50 , -570.63
+597.55 , -9738.28 , -535.56
+597.55 , -9089.06 , -500.30
+597.55 , -8439.84 , -464.85
+597.55 , -7790.63 , -429.21
+597.55 , -7141.41 , -393.37
+597.55 , -6492.19 , -357.35
+597.55 , -5842.97 , -321.13
+597.55 , -5193.75 , -284.71
+597.55 , -4544.53 , -248.11
+597.55 , -3895.31 , -211.31
+597.55 , -3246.09 , -174.30
+597.55 , -2596.88 , -137.08
+597.55 , -1947.66 , -99.61
+597.55 , -1298.44 , -61.78
+597.55 , -649.22 , -22.86
+597.55 , -129.84 , 0.00
+597.55 , 119.66 , 18.17
+597.55 , 598.32 , 53.24
+597.55 , 1196.64 , 94.71
+597.55 , 1794.96 , 136.03
+597.55 , 2393.28 , 177.45
+597.55 , 2991.60 , 219.01
+597.55 , 3589.92 , 260.75
+597.55 , 4188.24 , 302.67
+597.55 , 4786.56 , 344.78
+597.55 , 5384.88 , 387.07
+597.55 , 5983.20 , 429.54
+597.55 , 6581.52 , 472.21
+597.55 , 7179.84 , 515.06
+597.55 , 7778.16 , 558.11
+597.55 , 8376.48 , 601.34
+597.55 , 8974.80 , 644.76
+597.55 , 9573.12 , 688.37
+597.55 , 10171.44 , 732.17
+597.55 , 10769.76 , 776.15
+597.55 , 11368.08 , 820.33
+597.55 , 11966.40 , 864.69
+647.35 , -12984.38 , -763.53
+647.35 , -12335.16 , -726.65
+647.35 , -11685.94 , -689.55
+647.35 , -11036.72 , -652.22
+647.35 , -10387.50 , -614.67
+647.35 , -9738.28 , -576.89
+647.35 , -9089.06 , -538.89
+647.35 , -8439.84 , -500.67
+647.35 , -7790.63 , -462.22
+647.35 , -7141.41 , -423.56
+647.35 , -6492.19 , -384.67
+647.35 , -5842.97 , -345.56
+647.35 , -5193.75 , -306.22
+647.35 , -4544.53 , -266.66
+647.35 , -3895.31 , -226.86
+647.35 , -3246.09 , -186.83
+647.35 , -2596.88 , -146.54
+647.35 , -1947.66 , -105.95
+647.35 , -1298.44 , -64.90
+647.35 , -649.22 , -22.24
+647.35 , -129.84 , 0.00
+647.35 , 119.66 , 20.74
+647.35 , 598.32 , 59.20
+647.35 , 1196.64 , 104.27
+647.35 , 1794.96 , 149.12
+647.35 , 2393.28 , 194.05
+647.35 , 2991.60 , 239.16
+647.35 , 3589.92 , 284.45
+647.35 , 4188.24 , 329.96
+647.35 , 4786.56 , 375.67
+647.35 , 5384.88 , 421.60
+647.35 , 5983.20 , 467.75
+647.35 , 6581.52 , 514.11
+647.35 , 7179.84 , 560.69
+647.35 , 7778.16 , 607.48
+647.35 , 8376.48 , 654.50
+647.35 , 8974.80 , 701.73
+647.35 , 9573.12 , 749.18
+647.35 , 10171.44 , 796.84
+647.35 , 10769.76 , 844.73
+647.35 , 11368.08 , 892.83
+647.35 , 11966.40 , 941.14
+697.14 , -12984.38 , -817.17
+697.14 , -12335.16 , -777.76
+697.14 , -11685.94 , -738.08
+697.14 , -11036.72 , -698.15
+697.14 , -10387.50 , -657.96
+697.14 , -9738.28 , -617.52
+697.14 , -9089.06 , -576.82
+697.14 , -8439.84 , -535.86
+697.14 , -7790.63 , -494.65
+697.14 , -7141.41 , -453.18
+697.14 , -6492.19 , -411.45
+697.14 , -5842.97 , -369.47
+697.14 , -5193.75 , -327.22
+697.14 , -4544.53 , -284.72
+697.14 , -3895.31 , -241.95
+697.14 , -3246.09 , -198.90
+697.14 , -2596.88 , -155.54
+697.14 , -1947.66 , -111.82
+697.14 , -1298.44 , -67.51
+697.14 , -649.22 , -20.80
+697.14 , -129.84 , 0.00
+697.14 , 119.66 , 23.52
+697.14 , 598.32 , 65.48
+697.14 , 1196.64 , 114.20
+697.14 , 1794.96 , 162.59
+697.14 , 2393.28 , 211.06
+697.14 , 2991.60 , 259.72
+697.14 , 3589.92 , 308.59
+697.14 , 4188.24 , 357.69
+697.14 , 4786.56 , 407.04
+697.14 , 5384.88 , 456.62
+697.14 , 5983.20 , 506.46
+697.14 , 6581.52 , 556.54
+697.14 , 7179.84 , 606.87
+697.14 , 7778.16 , 657.45
+697.14 , 8376.48 , 708.28
+697.14 , 8974.80 , 759.35
+697.14 , 9573.12 , 810.68
+697.14 , 10171.44 , 862.25
+697.14 , 10769.76 , 914.07
+697.14 , 11368.08 , 966.13
+697.14 , 11966.40 , 1018.44
+746.94 , -12984.38 , -869.86
+746.94 , -12335.16 , -827.96
+746.94 , -11685.94 , -785.77
+746.94 , -11036.72 , -743.28
+746.94 , -10387.50 , -700.50
+746.94 , -9738.28 , -657.42
+746.94 , -9089.06 , -614.05
+746.94 , -8439.84 , -570.39
+746.94 , -7790.63 , -526.44
+746.94 , -7141.41 , -482.19
+746.94 , -6492.19 , -437.65
+746.94 , -5842.97 , -392.82
+746.94 , -5193.75 , -347.69
+746.94 , -4544.53 , -302.26
+746.94 , -3895.31 , -256.52
+746.94 , -3246.09 , -210.46
+746.94 , -2596.88 , -164.04
+746.94 , -1947.66 , -117.17
+746.94 , -1298.44 , -69.54
+746.94 , -649.22 , -18.27
+746.94 , -129.84 , 0.00
+746.94 , 119.66 , 26.49
+746.94 , 598.32 , 72.10
+746.94 , 1196.64 , 124.50
+746.94 , 1794.96 , 176.46
+746.94 , 2393.28 , 228.49
+746.94 , 2991.60 , 280.71
+746.94 , 3589.92 , 333.18
+746.94 , 4188.24 , 385.90
+746.94 , 4786.56 , 438.89
+746.94 , 5384.88 , 492.16
+746.94 , 5983.20 , 545.71
+746.94 , 6581.52 , 599.54
+746.94 , 7179.84 , 653.64
+746.94 , 7778.16 , 708.03
+746.94 , 8376.48 , 762.71
+746.94 , 8974.80 , 817.66
+746.94 , 9573.12 , 872.89
+746.94 , 10171.44 , 928.41
+746.94 , 10769.76 , 984.20
+746.94 , 11368.08 , 1040.27
+746.94 , 11966.40 , 1096.63
+796.73 , -12984.38 , -921.56
+796.73 , -12335.16 , -877.23
+796.73 , -11685.94 , -832.56
+796.73 , -11036.72 , -787.56
+796.73 , -10387.50 , -742.22
+796.73 , -9738.28 , -696.56
+796.73 , -9089.06 , -650.56
+796.73 , -8439.84 , -604.23
+796.73 , -7790.63 , -557.56
+796.73 , -7141.41 , -510.57
+796.73 , -6492.19 , -463.24
+796.73 , -5842.97 , -415.58
+796.73 , -5193.75 , -367.58
+796.73 , -4544.53 , -319.24
+796.73 , -3895.31 , -270.55
+796.73 , -3246.09 , -221.48
+796.73 , -2596.88 , -171.99
+796.73 , -1947.66 , -121.95
+796.73 , -1298.44 , -70.93
+796.73 , -649.22 , -14.10
+796.73 , -129.84 , 0.00
+796.73 , 119.66 , 29.68
+796.73 , 598.32 , 79.05
+796.73 , 1196.64 , 135.20
+796.73 , 1794.96 , 190.76
+796.73 , 2393.28 , 246.36
+796.73 , 2991.60 , 302.17
+796.73 , 3589.92 , 358.24
+796.73 , 4188.24 , 414.60
+796.73 , 4786.56 , 471.27
+796.73 , 5384.88 , 528.24
+796.73 , 5983.20 , 585.52
+796.73 , 6581.52 , 643.12
+796.73 , 7179.84 , 701.03
+796.73 , 7778.16 , 759.26
+796.73 , 8376.48 , 817.80
+796.73 , 8974.80 , 876.66
+796.73 , 9573.12 , 935.84
+796.73 , 10171.44 , 995.34
+796.73 , 10769.76 , 1055.15
+796.73 , 11368.08 , 1115.27
+796.73 , 11966.40 , 1175.71
+846.53 , -12984.38 , -972.24
+846.53 , -12335.16 , -925.52
+846.53 , -11685.94 , -878.43
+846.53 , -11036.72 , -830.96
+846.53 , -10387.50 , -783.11
+846.53 , -9738.28 , -734.89
+846.53 , -9089.06 , -686.30
+846.53 , -8439.84 , -637.33
+846.53 , -7790.63 , -587.99
+846.53 , -7141.41 , -538.28
+846.53 , -6492.19 , -488.19
+846.53 , -5842.97 , -437.72
+846.53 , -5193.75 , -386.87
+846.53 , -4544.53 , -335.63
+846.53 , -3895.31 , -283.99
+846.53 , -3246.09 , -231.92
+846.53 , -2596.88 , -179.35
+846.53 , -1947.66 , -126.12
+846.53 , -1298.44 , -71.60
+846.53 , -649.22 , -6.45
+846.53 , -129.84 , 0.00
+846.53 , 119.66 , 33.08
+846.53 , 598.32 , 86.37
+846.53 , 1196.64 , 146.31
+846.53 , 1794.96 , 205.50
+846.53 , 2393.28 , 264.70
+846.53 , 2991.60 , 324.11
+846.53 , 3589.92 , 383.81
+846.53 , 4188.24 , 443.83
+846.53 , 4786.56 , 504.18
+846.53 , 5384.88 , 564.87
+846.53 , 5983.20 , 625.91
+846.53 , 6581.52 , 687.30
+846.53 , 7179.84 , 749.05
+846.53 , 7778.16 , 811.14
+846.53 , 8376.48 , 873.59
+846.53 , 8974.80 , 936.40
+846.53 , 9573.12 , 999.56
+846.53 , 10171.44 , 1063.07
+846.53 , 10769.76 , 1126.93
+846.53 , 11368.08 , 1191.14
+846.53 , 11966.40 , 1255.71
+896.32 , -12984.38 , -1021.86
+896.32 , -12335.16 , -972.81
+896.32 , -11685.94 , -923.33
+896.32 , -11036.72 , -873.44
+896.32 , -10387.50 , -823.13
+896.32 , -9738.28 , -772.39
+896.32 , -9089.06 , -721.24
+896.32 , -8439.84 , -669.67
+896.32 , -7790.63 , -617.68
+896.32 , -7141.41 , -565.27
+896.32 , -6492.19 , -512.45
+896.32 , -5842.97 , -459.19
+896.32 , -5193.75 , -405.51
+896.32 , -4544.53 , -351.39
+896.32 , -3895.31 , -296.81
+896.32 , -3246.09 , -241.73
+896.32 , -2596.88 , -186.07
+896.32 , -1947.66 , -129.61
+896.32 , -1298.44 , -71.46
+896.32 , -649.22 , 0.00
+896.32 , -129.84 , 0.00
+896.32 , 119.66 , 36.70
+896.32 , 598.32 , 94.04
+896.32 , 1196.64 , 157.85
+896.32 , 1794.96 , 220.70
+896.32 , 2393.28 , 283.52
+896.32 , 2991.60 , 346.56
+896.32 , 3589.92 , 409.90
+896.32 , 4188.24 , 473.59
+896.32 , 4786.56 , 537.65
+896.32 , 5384.88 , 602.09
+896.32 , 5983.20 , 666.91
+896.32 , 6581.52 , 732.12
+896.32 , 7179.84 , 797.72
+896.32 , 7778.16 , 863.72
+896.32 , 8376.48 , 930.10
+896.32 , 8974.80 , 996.88
+896.32 , 9573.12 , 1064.05
+896.32 , 10171.44 , 1131.62
+896.32 , 10769.76 , 1199.57
+896.32 , 11368.08 , 1267.92
+896.32 , 11966.40 , 1336.65
+946.12 , -12984.38 , -1070.37
+946.12 , -12335.16 , -1019.04
+946.12 , -11685.94 , -967.24
+946.12 , -11036.72 , -914.96
+946.12 , -10387.50 , -862.23
+946.12 , -9738.28 , -809.02
+946.12 , -9089.06 , -755.35
+946.12 , -8439.84 , -701.21
+946.12 , -7790.63 , -646.60
+946.12 , -7141.41 , -591.53
+946.12 , -6492.19 , -535.99
+946.12 , -5842.97 , -479.97
+946.12 , -5193.75 , -423.47
+946.12 , -4544.53 , -366.48
+946.12 , -3895.31 , -308.96
+946.12 , -3246.09 , -250.88
+946.12 , -2596.88 , -192.11
+946.12 , -1947.66 , -132.36
+946.12 , -1298.44 , -70.38
+946.12 , -649.22 , 0.00
+946.12 , -129.84 , 0.00
+946.12 , 119.66 , 40.53
+946.12 , 598.32 , 102.10
+946.12 , 1196.64 , 169.83
+946.12 , 1794.96 , 236.37
+946.12 , 2393.28 , 302.84
+946.12 , 2991.60 , 369.53
+946.12 , 3589.92 , 436.54
+946.12 , 4188.24 , 503.92
+946.12 , 4786.56 , 571.71
+946.12 , 5384.88 , 639.91
+946.12 , 5983.20 , 708.54
+946.12 , 6581.52 , 777.59
+946.12 , 7179.84 , 847.08
+946.12 , 7778.16 , 917.00
+946.12 , 8376.48 , 987.35
+946.12 , 8974.80 , 1058.14
+946.12 , 9573.12 , 1129.36
+946.12 , 10171.44 , 1201.01
+946.12 , 10769.76 , 1273.09
+946.12 , 11368.08 , 1345.61
+946.12 , 11966.40 , 1418.56
+995.92 , -12984.38 , -1117.74
+995.92 , -12335.16 , -1064.18
+995.92 , -11685.94 , -1010.10
+995.92 , -11036.72 , -955.49
+995.92 , -10387.50 , -900.37
+995.92 , -9738.28 , -844.73
+995.92 , -9089.06 , -788.58
+995.92 , -8439.84 , -731.90
+995.92 , -7790.63 , -674.71
+995.92 , -7141.41 , -617.00
+995.92 , -6492.19 , -558.77
+995.92 , -5842.97 , -500.01
+995.92 , -5193.75 , -440.71
+995.92 , -4544.53 , -380.85
+995.92 , -3895.31 , -320.40
+995.92 , -3246.09 , -259.31
+995.92 , -2596.88 , -197.41
+995.92 , -1947.66 , -134.30
+995.92 , -1298.44 , -68.24
+995.92 , -649.22 , 0.00
+995.92 , -129.84 , 0.00
+995.92 , 119.66 , 44.59
+995.92 , 598.32 , 110.53
+995.92 , 1196.64 , 182.27
+995.92 , 1794.96 , 252.55
+995.92 , 2393.28 , 322.69
+995.92 , 2991.60 , 393.04
+995.92 , 3589.92 , 463.74
+995.92 , 4188.24 , 534.84
+995.92 , 4786.56 , 606.37
+995.92 , 5384.88 , 678.37
+995.92 , 5983.20 , 750.82
+995.92 , 6581.52 , 823.74
+995.92 , 7179.84 , 897.14
+995.92 , 7778.16 , 971.01
+995.92 , 8376.48 , 1045.36
+995.92 , 8974.80 , 1120.19
+995.92 , 9573.12 , 1195.49
+995.92 , 10171.44 , 1271.27
+995.92 , 10769.76 , 1347.52
+995.92 , 11368.08 , 1424.25
+995.92 , 11966.40 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_2.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..e4be1e22ede233c40afa5a00eeb1292d2cad8f78
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -7190.72 , 0.00
+0.00 , -6831.19 , 0.00
+0.00 , -6471.65 , 0.00
+0.00 , -6112.11 , 0.00
+0.00 , -5752.58 , 0.00
+0.00 , -5393.04 , 0.00
+0.00 , -5033.51 , -0.13
+0.00 , -4673.97 , -0.66
+0.00 , -4314.43 , -0.98
+0.00 , -3954.90 , -1.19
+0.00 , -3595.36 , -1.32
+0.00 , -3235.82 , -1.38
+0.00 , -2876.29 , -1.39
+0.00 , -2516.75 , -1.35
+0.00 , -2157.22 , -1.26
+0.00 , -1797.68 , -1.13
+0.00 , -1438.14 , -0.97
+0.00 , -1078.61 , -0.77
+0.00 , -719.07 , -0.53
+0.00 , -359.54 , -0.27
+0.00 , -71.91 , -0.02
+0.00 , 67.66 , 0.13
+0.00 , 338.29 , 0.56
+0.00 , 676.58 , 1.12
+0.00 , 1014.86 , 1.70
+0.00 , 1353.15 , 2.31
+0.00 , 1691.44 , 2.93
+0.00 , 2029.73 , 3.58
+0.00 , 2368.01 , 4.25
+0.00 , 2706.30 , 4.93
+0.00 , 3044.59 , 5.64
+0.00 , 3382.88 , 6.37
+0.00 , 3721.16 , 7.12
+0.00 , 4059.45 , 7.88
+0.00 , 4397.74 , 8.67
+0.00 , 4736.03 , 9.47
+0.00 , 5074.31 , 10.29
+0.00 , 5412.60 , 11.13
+0.00 , 5750.89 , 11.99
+0.00 , 6089.18 , 12.87
+0.00 , 6427.46 , 13.76
+0.00 , 6765.75 , 14.67
+8.90 , -7190.72 , 0.00
+8.90 , -6831.19 , 0.00
+8.90 , -6471.65 , 0.00
+8.90 , -6112.11 , 0.00
+8.90 , -5752.58 , 0.00
+8.90 , -5393.04 , 0.00
+8.90 , -5033.51 , -0.50
+8.90 , -4673.97 , -0.84
+8.90 , -4314.43 , -1.04
+8.90 , -3954.90 , -1.16
+8.90 , -3595.36 , -1.22
+8.90 , -3235.82 , -1.24
+8.90 , -2876.29 , -1.21
+8.90 , -2516.75 , -1.15
+8.90 , -2157.22 , -1.06
+8.90 , -1797.68 , -0.94
+8.90 , -1438.14 , -0.80
+8.90 , -1078.61 , -0.62
+8.90 , -719.07 , -0.43
+8.90 , -359.54 , -0.21
+8.90 , -71.91 , -0.02
+8.90 , 67.66 , 0.10
+8.90 , 338.29 , 0.43
+8.90 , 676.58 , 0.85
+8.90 , 1014.86 , 1.30
+8.90 , 1353.15 , 1.75
+8.90 , 1691.44 , 2.23
+8.90 , 2029.73 , 2.71
+8.90 , 2368.01 , 3.21
+8.90 , 2706.30 , 3.73
+8.90 , 3044.59 , 4.26
+8.90 , 3382.88 , 4.80
+8.90 , 3721.16 , 5.36
+8.90 , 4059.45 , 5.93
+8.90 , 4397.74 , 6.52
+8.90 , 4736.03 , 7.12
+8.90 , 5074.31 , 7.73
+8.90 , 5412.60 , 8.35
+8.90 , 5750.89 , 8.99
+8.90 , 6089.18 , 9.64
+8.90 , 6427.46 , 10.30
+8.90 , 6765.75 , 10.98
+88.99 , -7190.72 , -58.10
+88.99 , -6831.19 , -55.37
+88.99 , -6471.65 , -52.62
+88.99 , -6112.11 , -49.85
+88.99 , -5752.58 , -47.06
+88.99 , -5393.04 , -44.25
+88.99 , -5033.51 , -41.42
+88.99 , -4673.97 , -38.57
+88.99 , -4314.43 , -35.70
+88.99 , -3954.90 , -32.81
+88.99 , -3595.36 , -29.90
+88.99 , -3235.82 , -26.98
+88.99 , -2876.29 , -24.03
+88.99 , -2516.75 , -21.07
+88.99 , -2157.22 , -18.08
+88.99 , -1797.68 , -15.08
+88.99 , -1438.14 , -12.06
+88.99 , -1078.61 , -9.02
+88.99 , -719.07 , -5.96
+88.99 , -359.54 , -2.88
+88.99 , -71.91 , -0.37
+88.99 , 67.66 , 0.90
+88.99 , 338.29 , 3.68
+88.99 , 676.58 , 7.16
+88.99 , 1014.86 , 10.66
+88.99 , 1353.15 , 14.17
+88.99 , 1691.44 , 17.71
+88.99 , 2029.73 , 21.26
+88.99 , 2368.01 , 24.84
+88.99 , 2706.30 , 28.43
+88.99 , 3044.59 , 32.04
+88.99 , 3382.88 , 35.67
+88.99 , 3721.16 , 39.32
+88.99 , 4059.45 , 42.99
+88.99 , 4397.74 , 46.68
+88.99 , 4736.03 , 50.38
+88.99 , 5074.31 , 54.11
+88.99 , 5412.60 , 57.85
+88.99 , 5750.89 , 61.61
+88.99 , 6089.18 , 65.39
+88.99 , 6427.46 , 69.19
+88.99 , 6765.75 , 73.01
+177.98 , -7190.72 , -120.57
+177.98 , -6831.19 , -114.73
+177.98 , -6471.65 , -108.87
+177.98 , -6112.11 , -102.99
+177.98 , -5752.58 , -97.08
+177.98 , -5393.04 , -91.15
+177.98 , -5033.51 , -85.20
+177.98 , -4673.97 , -79.23
+177.98 , -4314.43 , -73.23
+177.98 , -3954.90 , -67.21
+177.98 , -3595.36 , -61.17
+177.98 , -3235.82 , -55.10
+177.98 , -2876.29 , -49.01
+177.98 , -2516.75 , -42.90
+177.98 , -2157.22 , -36.77
+177.98 , -1797.68 , -30.61
+177.98 , -1438.14 , -24.43
+177.98 , -1078.61 , -18.23
+177.98 , -719.07 , -12.01
+177.98 , -359.54 , -5.76
+177.98 , -71.91 , -0.66
+177.98 , 67.66 , 1.84
+177.98 , 338.29 , 7.35
+177.98 , 676.58 , 14.22
+177.98 , 1014.86 , 21.11
+177.98 , 1353.15 , 28.02
+177.98 , 1691.44 , 34.96
+177.98 , 2029.73 , 41.92
+177.98 , 2368.01 , 48.90
+177.98 , 2706.30 , 55.90
+177.98 , 3044.59 , 62.93
+177.98 , 3382.88 , 69.98
+177.98 , 3721.16 , 77.05
+177.98 , 4059.45 , 84.15
+177.98 , 4397.74 , 91.27
+177.98 , 4736.03 , 98.41
+177.98 , 5074.31 , 105.58
+177.98 , 5412.60 , 112.76
+177.98 , 5750.89 , 119.97
+177.98 , 6089.18 , 127.21
+177.98 , 6427.46 , 134.46
+177.98 , 6765.75 , 141.74
+266.97 , -7190.72 , -182.44
+266.97 , -6831.19 , -173.55
+266.97 , -6471.65 , -164.62
+266.97 , -6112.11 , -155.67
+266.97 , -5752.58 , -146.69
+266.97 , -5393.04 , -137.68
+266.97 , -5033.51 , -128.65
+266.97 , -4673.97 , -119.58
+266.97 , -4314.43 , -110.49
+266.97 , -3954.90 , -101.36
+266.97 , -3595.36 , -92.21
+266.97 , -3235.82 , -83.03
+266.97 , -2876.29 , -73.82
+266.97 , -2516.75 , -64.58
+266.97 , -2157.22 , -55.31
+266.97 , -1797.68 , -46.02
+266.97 , -1438.14 , -36.70
+266.97 , -1078.61 , -27.34
+266.97 , -719.07 , -17.96
+266.97 , -359.54 , -8.54
+266.97 , -71.91 , -0.79
+266.97 , 67.66 , 2.86
+266.97 , 338.29 , 11.12
+266.97 , 676.58 , 21.39
+266.97 , 1014.86 , 31.68
+266.97 , 1353.15 , 41.99
+266.97 , 1691.44 , 52.34
+266.97 , 2029.73 , 62.71
+266.97 , 2368.01 , 73.12
+266.97 , 2706.30 , 83.55
+266.97 , 3044.59 , 94.01
+266.97 , 3382.88 , 104.50
+266.97 , 3721.16 , 115.02
+266.97 , 4059.45 , 125.57
+266.97 , 4397.74 , 136.15
+266.97 , 4736.03 , 146.76
+266.97 , 5074.31 , 157.40
+266.97 , 5412.60 , 168.06
+266.97 , 5750.89 , 178.76
+266.97 , 6089.18 , 189.48
+266.97 , 6427.46 , 200.23
+266.97 , 6765.75 , 211.02
+355.96 , -7190.72 , -243.71
+355.96 , -6831.19 , -231.81
+355.96 , -6471.65 , -219.87
+355.96 , -6112.11 , -207.89
+355.96 , -5752.58 , -195.88
+355.96 , -5393.04 , -183.83
+355.96 , -5033.51 , -171.74
+355.96 , -4673.97 , -159.61
+355.96 , -4314.43 , -147.45
+355.96 , -3954.90 , -135.25
+355.96 , -3595.36 , -123.01
+355.96 , -3235.82 , -110.74
+355.96 , -2876.29 , -98.43
+355.96 , -2516.75 , -86.08
+355.96 , -2157.22 , -73.70
+355.96 , -1797.68 , -61.27
+355.96 , -1438.14 , -48.82
+355.96 , -1078.61 , -36.32
+355.96 , -719.07 , -23.78
+355.96 , -359.54 , -11.19
+355.96 , -71.91 , -0.63
+355.96 , 67.66 , 3.98
+355.96 , 338.29 , 15.01
+355.96 , 676.58 , 28.68
+355.96 , 1014.86 , 42.37
+355.96 , 1353.15 , 56.10
+355.96 , 1691.44 , 69.87
+355.96 , 2029.73 , 83.67
+355.96 , 2368.01 , 97.52
+355.96 , 2706.30 , 111.40
+355.96 , 3044.59 , 125.31
+355.96 , 3382.88 , 139.27
+355.96 , 3721.16 , 153.26
+355.96 , 4059.45 , 167.29
+355.96 , 4397.74 , 181.36
+355.96 , 4736.03 , 195.46
+355.96 , 5074.31 , 209.61
+355.96 , 5412.60 , 223.79
+355.96 , 5750.89 , 238.01
+355.96 , 6089.18 , 252.26
+355.96 , 6427.46 , 266.56
+355.96 , 6765.75 , 280.89
+444.95 , -7190.72 , -304.37
+444.95 , -6831.19 , -289.50
+444.95 , -6471.65 , -274.59
+444.95 , -6112.11 , -259.63
+444.95 , -5752.58 , -244.61
+444.95 , -5393.04 , -229.56
+444.95 , -5033.51 , -214.45
+444.95 , -4673.97 , -199.30
+444.95 , -4314.43 , -184.10
+444.95 , -3954.90 , -168.85
+444.95 , -3595.36 , -153.55
+444.95 , -3235.82 , -138.20
+444.95 , -2876.29 , -122.81
+444.95 , -2516.75 , -107.37
+444.95 , -2157.22 , -91.88
+444.95 , -1797.68 , -76.35
+444.95 , -1438.14 , -60.76
+444.95 , -1078.61 , -45.13
+444.95 , -719.07 , -29.44
+444.95 , -359.54 , -13.67
+444.95 , -71.91 , 0.00
+444.95 , 67.66 , 5.21
+444.95 , 338.29 , 19.04
+444.95 , 676.58 , 36.13
+444.95 , 1014.86 , 53.24
+444.95 , 1353.15 , 70.39
+444.95 , 1691.44 , 87.59
+444.95 , 2029.73 , 104.83
+444.95 , 2368.01 , 122.13
+444.95 , 2706.30 , 139.47
+444.95 , 3044.59 , 156.87
+444.95 , 3382.88 , 174.31
+444.95 , 3721.16 , 191.80
+444.95 , 4059.45 , 209.33
+444.95 , 4397.74 , 226.92
+444.95 , 4736.03 , 244.56
+444.95 , 5074.31 , 262.24
+444.95 , 5412.60 , 279.97
+444.95 , 5750.89 , 297.76
+444.95 , 6089.18 , 315.58
+444.95 , 6427.46 , 333.46
+444.95 , 6765.75 , 351.39
+533.94 , -7190.72 , -364.37
+533.94 , -6831.19 , -346.59
+533.94 , -6471.65 , -328.74
+533.94 , -6112.11 , -310.84
+533.94 , -5752.58 , -292.87
+533.94 , -5393.04 , -274.84
+533.94 , -5033.51 , -256.75
+533.94 , -4673.97 , -238.60
+533.94 , -4314.43 , -220.39
+533.94 , -3954.90 , -202.12
+533.94 , -3595.36 , -183.79
+533.94 , -3235.82 , -165.40
+533.94 , -2876.29 , -146.94
+533.94 , -2516.75 , -128.43
+533.94 , -2157.22 , -109.85
+533.94 , -1797.68 , -91.21
+533.94 , -1438.14 , -72.51
+533.94 , -1078.61 , -53.75
+533.94 , -719.07 , -34.91
+533.94 , -359.54 , -15.95
+533.94 , -71.91 , 0.00
+533.94 , 67.66 , 6.58
+533.94 , 338.29 , 23.25
+533.94 , 676.58 , 43.76
+533.94 , 1014.86 , 64.29
+533.94 , 1353.15 , 84.87
+533.94 , 1691.44 , 105.52
+533.94 , 2029.73 , 126.22
+533.94 , 2368.01 , 146.98
+533.94 , 2706.30 , 167.81
+533.94 , 3044.59 , 188.70
+533.94 , 3382.88 , 209.65
+533.94 , 3721.16 , 230.66
+533.94 , 4059.45 , 251.73
+533.94 , 4397.74 , 272.87
+533.94 , 4736.03 , 294.07
+533.94 , 5074.31 , 315.33
+533.94 , 5412.60 , 336.65
+533.94 , 5750.89 , 358.03
+533.94 , 6089.18 , 379.47
+533.94 , 6427.46 , 400.98
+533.94 , 6765.75 , 422.54
+622.93 , -7190.72 , -423.69
+622.93 , -6831.19 , -403.04
+622.93 , -6471.65 , -382.31
+622.93 , -6112.11 , -361.50
+622.93 , -5752.58 , -340.62
+622.93 , -5393.04 , -319.66
+622.93 , -5033.51 , -298.62
+622.93 , -4673.97 , -277.51
+622.93 , -4314.43 , -256.31
+622.93 , -3954.90 , -235.05
+622.93 , -3595.36 , -213.70
+622.93 , -3235.82 , -192.28
+622.93 , -2876.29 , -170.79
+622.93 , -2516.75 , -149.21
+622.93 , -2157.22 , -127.57
+622.93 , -1797.68 , -105.84
+622.93 , -1438.14 , -84.03
+622.93 , -1078.61 , -62.14
+622.93 , -719.07 , -40.16
+622.93 , -359.54 , -18.00
+622.93 , -71.91 , 0.00
+622.93 , 67.66 , 8.09
+622.93 , 338.29 , 27.64
+622.93 , 676.58 , 51.59
+622.93 , 1014.86 , 75.56
+622.93 , 1353.15 , 99.58
+622.93 , 1691.44 , 123.68
+622.93 , 2029.73 , 147.86
+622.93 , 2368.01 , 172.10
+622.93 , 2706.30 , 196.43
+622.93 , 3044.59 , 220.84
+622.93 , 3382.88 , 245.32
+622.93 , 3721.16 , 269.88
+622.93 , 4059.45 , 294.51
+622.93 , 4397.74 , 319.23
+622.93 , 4736.03 , 344.02
+622.93 , 5074.31 , 368.89
+622.93 , 5412.60 , 393.83
+622.93 , 5750.89 , 418.85
+622.93 , 6089.18 , 443.95
+622.93 , 6427.46 , 469.13
+622.93 , 6765.75 , 494.38
+711.92 , -7190.72 , -482.31
+711.92 , -6831.19 , -458.83
+711.92 , -6471.65 , -435.26
+711.92 , -6112.11 , -411.59
+711.92 , -5752.58 , -387.83
+711.92 , -5393.04 , -363.97
+711.92 , -5033.51 , -340.02
+711.92 , -4673.97 , -315.97
+711.92 , -4314.43 , -291.83
+711.92 , -3954.90 , -267.59
+711.92 , -3595.36 , -243.26
+711.92 , -3235.82 , -218.84
+711.92 , -2876.29 , -194.32
+711.92 , -2516.75 , -169.71
+711.92 , -2157.22 , -145.00
+711.92 , -1797.68 , -120.19
+711.92 , -1438.14 , -95.29
+711.92 , -1078.61 , -70.28
+711.92 , -719.07 , -45.14
+711.92 , -359.54 , -19.76
+711.92 , -71.91 , 0.00
+711.92 , 67.66 , 9.76
+711.92 , 338.29 , 32.25
+711.92 , 676.58 , 59.66
+711.92 , 1014.86 , 87.07
+711.92 , 1353.15 , 114.55
+711.92 , 1691.44 , 142.11
+711.92 , 2029.73 , 169.77
+711.92 , 2368.01 , 197.52
+711.92 , 2706.30 , 225.37
+711.92 , 3044.59 , 253.31
+711.92 , 3382.88 , 281.34
+711.92 , 3721.16 , 309.47
+711.92 , 4059.45 , 337.70
+711.92 , 4397.74 , 366.02
+711.92 , 4736.03 , 394.44
+711.92 , 5074.31 , 422.95
+711.92 , 5412.60 , 451.56
+711.92 , 5750.89 , 480.26
+711.92 , 6089.18 , 509.05
+711.92 , 6427.46 , 537.94
+711.92 , 6765.75 , 566.93
+800.91 , -7190.72 , -540.17
+800.91 , -6831.19 , -513.92
+800.91 , -6471.65 , -487.55
+800.91 , -6112.11 , -461.06
+800.91 , -5752.58 , -434.46
+800.91 , -5393.04 , -407.75
+800.91 , -5033.51 , -380.92
+800.91 , -4673.97 , -353.97
+800.91 , -4314.43 , -326.91
+800.91 , -3954.90 , -299.73
+800.91 , -3595.36 , -272.44
+800.91 , -3235.82 , -245.03
+800.91 , -2876.29 , -217.51
+800.91 , -2516.75 , -189.87
+800.91 , -2157.22 , -162.12
+800.91 , -1797.68 , -134.25
+800.91 , -1438.14 , -106.26
+800.91 , -1078.61 , -78.13
+800.91 , -719.07 , -49.84
+800.91 , -359.54 , -21.19
+800.91 , -71.91 , 0.00
+800.91 , 67.66 , 11.59
+800.91 , 338.29 , 37.10
+800.91 , 676.58 , 67.98
+800.91 , 1014.86 , 98.85
+800.91 , 1353.15 , 129.79
+800.91 , 1691.44 , 160.84
+800.91 , 2029.73 , 191.99
+800.91 , 2368.01 , 223.26
+800.91 , 2706.30 , 254.64
+800.91 , 3044.59 , 286.14
+800.91 , 3382.88 , 317.75
+800.91 , 3721.16 , 349.48
+800.91 , 4059.45 , 381.32
+800.91 , 4397.74 , 413.28
+800.91 , 4736.03 , 445.36
+800.91 , 5074.31 , 477.54
+800.91 , 5412.60 , 509.85
+800.91 , 5750.89 , 542.27
+800.91 , 6089.18 , 574.80
+800.91 , 6427.46 , 607.45
+800.91 , 6765.75 , 640.21
+889.90 , -7190.72 , -597.26
+889.90 , -6831.19 , -568.28
+889.90 , -6471.65 , -539.16
+889.90 , -6112.11 , -509.90
+889.90 , -5752.58 , -480.50
+889.90 , -5393.04 , -450.96
+889.90 , -5033.51 , -421.28
+889.90 , -4673.97 , -391.47
+889.90 , -4314.43 , -361.52
+889.90 , -3954.90 , -331.43
+889.90 , -3595.36 , -301.20
+889.90 , -3235.82 , -270.83
+889.90 , -2876.29 , -240.33
+889.90 , -2516.75 , -209.68
+889.90 , -2157.22 , -178.90
+889.90 , -1797.68 , -147.97
+889.90 , -1438.14 , -116.90
+889.90 , -1078.61 , -85.66
+889.90 , -719.07 , -54.21
+889.90 , -359.54 , -22.23
+889.90 , -71.91 , 0.00
+889.90 , 67.66 , 13.60
+889.90 , 338.29 , 42.20
+889.90 , 676.58 , 76.58
+889.90 , 1014.86 , 110.92
+889.90 , 1353.15 , 145.34
+889.90 , 1691.44 , 179.88
+889.90 , 2029.73 , 214.55
+889.90 , 2368.01 , 249.35
+889.90 , 2706.30 , 284.29
+889.90 , 3044.59 , 319.36
+889.90 , 3382.88 , 354.57
+889.90 , 3721.16 , 389.92
+889.90 , 4059.45 , 425.41
+889.90 , 4397.74 , 461.03
+889.90 , 4736.03 , 496.79
+889.90 , 5074.31 , 532.69
+889.90 , 5412.60 , 568.73
+889.90 , 5750.89 , 604.90
+889.90 , 6089.18 , 641.21
+889.90 , 6427.46 , 677.66
+889.90 , 6765.75 , 714.24
+978.89 , -7190.72 , -653.54
+978.89 , -6831.19 , -621.88
+978.89 , -6471.65 , -590.05
+978.89 , -6112.11 , -558.06
+978.89 , -5752.58 , -525.90
+978.89 , -5393.04 , -493.58
+978.89 , -5033.51 , -461.09
+978.89 , -4673.97 , -428.44
+978.89 , -4314.43 , -395.63
+978.89 , -3954.90 , -362.65
+978.89 , -3595.36 , -329.51
+978.89 , -3235.82 , -296.21
+978.89 , -2876.29 , -262.74
+978.89 , -2516.75 , -229.11
+978.89 , -2157.22 , -195.31
+978.89 , -1797.68 , -161.34
+978.89 , -1438.14 , -127.18
+978.89 , -1078.61 , -92.83
+978.89 , -719.07 , -58.20
+978.89 , -359.54 , -22.82
+978.89 , -71.91 , 0.00
+978.89 , 67.66 , 15.79
+978.89 , 338.29 , 47.58
+978.89 , 676.58 , 85.48
+978.89 , 1014.86 , 123.30
+978.89 , 1353.15 , 161.22
+978.89 , 1691.44 , 199.26
+978.89 , 2029.73 , 237.46
+978.89 , 2368.01 , 275.81
+978.89 , 2706.30 , 314.32
+978.89 , 3044.59 , 352.99
+978.89 , 3382.88 , 391.83
+978.89 , 3721.16 , 430.82
+978.89 , 4059.45 , 469.98
+978.89 , 4397.74 , 509.30
+978.89 , 4736.03 , 548.78
+978.89 , 5074.31 , 588.42
+978.89 , 5412.60 , 628.23
+978.89 , 5750.89 , 668.20
+978.89 , 6089.18 , 708.32
+978.89 , 6427.46 , 748.61
+978.89 , 6765.75 , 789.06
+1067.88 , -7190.72 , -708.97
+1067.88 , -6831.19 , -674.68
+1067.88 , -6471.65 , -640.19
+1067.88 , -6112.11 , -605.51
+1067.88 , -5752.58 , -570.63
+1067.88 , -5393.04 , -535.56
+1067.88 , -5033.51 , -500.30
+1067.88 , -4673.97 , -464.85
+1067.88 , -4314.43 , -429.21
+1067.88 , -3954.90 , -393.37
+1067.88 , -3595.36 , -357.35
+1067.88 , -3235.82 , -321.13
+1067.88 , -2876.29 , -284.71
+1067.88 , -2516.75 , -248.11
+1067.88 , -2157.22 , -211.31
+1067.88 , -1797.68 , -174.30
+1067.88 , -1438.14 , -137.08
+1067.88 , -1078.61 , -99.61
+1067.88 , -719.07 , -61.78
+1067.88 , -359.54 , -22.86
+1067.88 , -71.91 , 0.00
+1067.88 , 67.66 , 18.17
+1067.88 , 338.29 , 53.24
+1067.88 , 676.58 , 94.71
+1067.88 , 1014.86 , 136.03
+1067.88 , 1353.15 , 177.45
+1067.88 , 1691.44 , 219.01
+1067.88 , 2029.73 , 260.75
+1067.88 , 2368.01 , 302.67
+1067.88 , 2706.30 , 344.78
+1067.88 , 3044.59 , 387.07
+1067.88 , 3382.88 , 429.54
+1067.88 , 3721.16 , 472.21
+1067.88 , 4059.45 , 515.06
+1067.88 , 4397.74 , 558.11
+1067.88 , 4736.03 , 601.34
+1067.88 , 5074.31 , 644.76
+1067.88 , 5412.60 , 688.37
+1067.88 , 5750.89 , 732.17
+1067.88 , 6089.18 , 776.15
+1067.88 , 6427.46 , 820.33
+1067.88 , 6765.75 , 864.69
+1156.87 , -7190.72 , -763.53
+1156.87 , -6831.19 , -726.65
+1156.87 , -6471.65 , -689.55
+1156.87 , -6112.11 , -652.22
+1156.87 , -5752.58 , -614.67
+1156.87 , -5393.04 , -576.89
+1156.87 , -5033.51 , -538.89
+1156.87 , -4673.97 , -500.67
+1156.87 , -4314.43 , -462.22
+1156.87 , -3954.90 , -423.56
+1156.87 , -3595.36 , -384.67
+1156.87 , -3235.82 , -345.56
+1156.87 , -2876.29 , -306.22
+1156.87 , -2516.75 , -266.66
+1156.87 , -2157.22 , -226.86
+1156.87 , -1797.68 , -186.83
+1156.87 , -1438.14 , -146.54
+1156.87 , -1078.61 , -105.95
+1156.87 , -719.07 , -64.90
+1156.87 , -359.54 , -22.24
+1156.87 , -71.91 , 0.00
+1156.87 , 67.66 , 20.74
+1156.87 , 338.29 , 59.20
+1156.87 , 676.58 , 104.27
+1156.87 , 1014.86 , 149.12
+1156.87 , 1353.15 , 194.05
+1156.87 , 1691.44 , 239.16
+1156.87 , 2029.73 , 284.45
+1156.87 , 2368.01 , 329.96
+1156.87 , 2706.30 , 375.67
+1156.87 , 3044.59 , 421.60
+1156.87 , 3382.88 , 467.75
+1156.87 , 3721.16 , 514.11
+1156.87 , 4059.45 , 560.69
+1156.87 , 4397.74 , 607.48
+1156.87 , 4736.03 , 654.50
+1156.87 , 5074.31 , 701.73
+1156.87 , 5412.60 , 749.18
+1156.87 , 5750.89 , 796.84
+1156.87 , 6089.18 , 844.73
+1156.87 , 6427.46 , 892.83
+1156.87 , 6765.75 , 941.14
+1245.86 , -7190.72 , -817.17
+1245.86 , -6831.19 , -777.76
+1245.86 , -6471.65 , -738.08
+1245.86 , -6112.11 , -698.15
+1245.86 , -5752.58 , -657.96
+1245.86 , -5393.04 , -617.52
+1245.86 , -5033.51 , -576.82
+1245.86 , -4673.97 , -535.86
+1245.86 , -4314.43 , -494.65
+1245.86 , -3954.90 , -453.18
+1245.86 , -3595.36 , -411.45
+1245.86 , -3235.82 , -369.47
+1245.86 , -2876.29 , -327.22
+1245.86 , -2516.75 , -284.72
+1245.86 , -2157.22 , -241.95
+1245.86 , -1797.68 , -198.90
+1245.86 , -1438.14 , -155.54
+1245.86 , -1078.61 , -111.82
+1245.86 , -719.07 , -67.51
+1245.86 , -359.54 , -20.80
+1245.86 , -71.91 , 0.00
+1245.86 , 67.66 , 23.52
+1245.86 , 338.29 , 65.48
+1245.86 , 676.58 , 114.20
+1245.86 , 1014.86 , 162.59
+1245.86 , 1353.15 , 211.06
+1245.86 , 1691.44 , 259.72
+1245.86 , 2029.73 , 308.59
+1245.86 , 2368.01 , 357.69
+1245.86 , 2706.30 , 407.04
+1245.86 , 3044.59 , 456.62
+1245.86 , 3382.88 , 506.46
+1245.86 , 3721.16 , 556.54
+1245.86 , 4059.45 , 606.87
+1245.86 , 4397.74 , 657.45
+1245.86 , 4736.03 , 708.28
+1245.86 , 5074.31 , 759.35
+1245.86 , 5412.60 , 810.68
+1245.86 , 5750.89 , 862.25
+1245.86 , 6089.18 , 914.07
+1245.86 , 6427.46 , 966.13
+1245.86 , 6765.75 , 1018.44
+1334.85 , -7190.72 , -869.86
+1334.85 , -6831.19 , -827.96
+1334.85 , -6471.65 , -785.77
+1334.85 , -6112.11 , -743.28
+1334.85 , -5752.58 , -700.50
+1334.85 , -5393.04 , -657.42
+1334.85 , -5033.51 , -614.05
+1334.85 , -4673.97 , -570.39
+1334.85 , -4314.43 , -526.44
+1334.85 , -3954.90 , -482.19
+1334.85 , -3595.36 , -437.65
+1334.85 , -3235.82 , -392.82
+1334.85 , -2876.29 , -347.69
+1334.85 , -2516.75 , -302.26
+1334.85 , -2157.22 , -256.52
+1334.85 , -1797.68 , -210.46
+1334.85 , -1438.14 , -164.04
+1334.85 , -1078.61 , -117.17
+1334.85 , -719.07 , -69.54
+1334.85 , -359.54 , -18.27
+1334.85 , -71.91 , 0.00
+1334.85 , 67.66 , 26.49
+1334.85 , 338.29 , 72.10
+1334.85 , 676.58 , 124.50
+1334.85 , 1014.86 , 176.46
+1334.85 , 1353.15 , 228.49
+1334.85 , 1691.44 , 280.71
+1334.85 , 2029.73 , 333.18
+1334.85 , 2368.01 , 385.90
+1334.85 , 2706.30 , 438.89
+1334.85 , 3044.59 , 492.16
+1334.85 , 3382.88 , 545.71
+1334.85 , 3721.16 , 599.54
+1334.85 , 4059.45 , 653.64
+1334.85 , 4397.74 , 708.03
+1334.85 , 4736.03 , 762.71
+1334.85 , 5074.31 , 817.66
+1334.85 , 5412.60 , 872.89
+1334.85 , 5750.89 , 928.41
+1334.85 , 6089.18 , 984.20
+1334.85 , 6427.46 , 1040.27
+1334.85 , 6765.75 , 1096.63
+1423.84 , -7190.72 , -921.56
+1423.84 , -6831.19 , -877.23
+1423.84 , -6471.65 , -832.56
+1423.84 , -6112.11 , -787.56
+1423.84 , -5752.58 , -742.22
+1423.84 , -5393.04 , -696.56
+1423.84 , -5033.51 , -650.56
+1423.84 , -4673.97 , -604.23
+1423.84 , -4314.43 , -557.56
+1423.84 , -3954.90 , -510.57
+1423.84 , -3595.36 , -463.24
+1423.84 , -3235.82 , -415.58
+1423.84 , -2876.29 , -367.58
+1423.84 , -2516.75 , -319.24
+1423.84 , -2157.22 , -270.55
+1423.84 , -1797.68 , -221.48
+1423.84 , -1438.14 , -171.99
+1423.84 , -1078.61 , -121.95
+1423.84 , -719.07 , -70.93
+1423.84 , -359.54 , -14.10
+1423.84 , -71.91 , 0.00
+1423.84 , 67.66 , 29.68
+1423.84 , 338.29 , 79.05
+1423.84 , 676.58 , 135.20
+1423.84 , 1014.86 , 190.76
+1423.84 , 1353.15 , 246.36
+1423.84 , 1691.44 , 302.17
+1423.84 , 2029.73 , 358.24
+1423.84 , 2368.01 , 414.60
+1423.84 , 2706.30 , 471.27
+1423.84 , 3044.59 , 528.24
+1423.84 , 3382.88 , 585.52
+1423.84 , 3721.16 , 643.12
+1423.84 , 4059.45 , 701.03
+1423.84 , 4397.74 , 759.26
+1423.84 , 4736.03 , 817.80
+1423.84 , 5074.31 , 876.66
+1423.84 , 5412.60 , 935.84
+1423.84 , 5750.89 , 995.34
+1423.84 , 6089.18 , 1055.15
+1423.84 , 6427.46 , 1115.27
+1423.84 , 6765.75 , 1175.71
+1512.83 , -7190.72 , -972.24
+1512.83 , -6831.19 , -925.52
+1512.83 , -6471.65 , -878.43
+1512.83 , -6112.11 , -830.96
+1512.83 , -5752.58 , -783.11
+1512.83 , -5393.04 , -734.89
+1512.83 , -5033.51 , -686.30
+1512.83 , -4673.97 , -637.33
+1512.83 , -4314.43 , -587.99
+1512.83 , -3954.90 , -538.28
+1512.83 , -3595.36 , -488.19
+1512.83 , -3235.82 , -437.72
+1512.83 , -2876.29 , -386.87
+1512.83 , -2516.75 , -335.63
+1512.83 , -2157.22 , -283.99
+1512.83 , -1797.68 , -231.92
+1512.83 , -1438.14 , -179.35
+1512.83 , -1078.61 , -126.12
+1512.83 , -719.07 , -71.60
+1512.83 , -359.54 , -6.45
+1512.83 , -71.91 , 0.00
+1512.83 , 67.66 , 33.08
+1512.83 , 338.29 , 86.37
+1512.83 , 676.58 , 146.31
+1512.83 , 1014.86 , 205.50
+1512.83 , 1353.15 , 264.70
+1512.83 , 1691.44 , 324.11
+1512.83 , 2029.73 , 383.81
+1512.83 , 2368.01 , 443.83
+1512.83 , 2706.30 , 504.18
+1512.83 , 3044.59 , 564.87
+1512.83 , 3382.88 , 625.91
+1512.83 , 3721.16 , 687.30
+1512.83 , 4059.45 , 749.05
+1512.83 , 4397.74 , 811.14
+1512.83 , 4736.03 , 873.59
+1512.83 , 5074.31 , 936.40
+1512.83 , 5412.60 , 999.56
+1512.83 , 5750.89 , 1063.07
+1512.83 , 6089.18 , 1126.93
+1512.83 , 6427.46 , 1191.14
+1512.83 , 6765.75 , 1255.71
+1601.82 , -7190.72 , -1021.86
+1601.82 , -6831.19 , -972.81
+1601.82 , -6471.65 , -923.33
+1601.82 , -6112.11 , -873.44
+1601.82 , -5752.58 , -823.13
+1601.82 , -5393.04 , -772.39
+1601.82 , -5033.51 , -721.24
+1601.82 , -4673.97 , -669.67
+1601.82 , -4314.43 , -617.68
+1601.82 , -3954.90 , -565.27
+1601.82 , -3595.36 , -512.45
+1601.82 , -3235.82 , -459.19
+1601.82 , -2876.29 , -405.51
+1601.82 , -2516.75 , -351.39
+1601.82 , -2157.22 , -296.81
+1601.82 , -1797.68 , -241.73
+1601.82 , -1438.14 , -186.07
+1601.82 , -1078.61 , -129.61
+1601.82 , -719.07 , -71.46
+1601.82 , -359.54 , 0.00
+1601.82 , -71.91 , 0.00
+1601.82 , 67.66 , 36.70
+1601.82 , 338.29 , 94.04
+1601.82 , 676.58 , 157.85
+1601.82 , 1014.86 , 220.70
+1601.82 , 1353.15 , 283.52
+1601.82 , 1691.44 , 346.56
+1601.82 , 2029.73 , 409.90
+1601.82 , 2368.01 , 473.59
+1601.82 , 2706.30 , 537.65
+1601.82 , 3044.59 , 602.09
+1601.82 , 3382.88 , 666.91
+1601.82 , 3721.16 , 732.12
+1601.82 , 4059.45 , 797.72
+1601.82 , 4397.74 , 863.72
+1601.82 , 4736.03 , 930.10
+1601.82 , 5074.31 , 996.88
+1601.82 , 5412.60 , 1064.05
+1601.82 , 5750.89 , 1131.62
+1601.82 , 6089.18 , 1199.57
+1601.82 , 6427.46 , 1267.92
+1601.82 , 6765.75 , 1336.65
+1690.81 , -7190.72 , -1070.37
+1690.81 , -6831.19 , -1019.04
+1690.81 , -6471.65 , -967.24
+1690.81 , -6112.11 , -914.96
+1690.81 , -5752.58 , -862.23
+1690.81 , -5393.04 , -809.02
+1690.81 , -5033.51 , -755.35
+1690.81 , -4673.97 , -701.21
+1690.81 , -4314.43 , -646.60
+1690.81 , -3954.90 , -591.53
+1690.81 , -3595.36 , -535.99
+1690.81 , -3235.82 , -479.97
+1690.81 , -2876.29 , -423.47
+1690.81 , -2516.75 , -366.48
+1690.81 , -2157.22 , -308.96
+1690.81 , -1797.68 , -250.88
+1690.81 , -1438.14 , -192.11
+1690.81 , -1078.61 , -132.36
+1690.81 , -719.07 , -70.38
+1690.81 , -359.54 , 0.00
+1690.81 , -71.91 , 0.00
+1690.81 , 67.66 , 40.53
+1690.81 , 338.29 , 102.10
+1690.81 , 676.58 , 169.83
+1690.81 , 1014.86 , 236.37
+1690.81 , 1353.15 , 302.84
+1690.81 , 1691.44 , 369.53
+1690.81 , 2029.73 , 436.54
+1690.81 , 2368.01 , 503.92
+1690.81 , 2706.30 , 571.71
+1690.81 , 3044.59 , 639.91
+1690.81 , 3382.88 , 708.54
+1690.81 , 3721.16 , 777.59
+1690.81 , 4059.45 , 847.08
+1690.81 , 4397.74 , 917.00
+1690.81 , 4736.03 , 987.35
+1690.81 , 5074.31 , 1058.14
+1690.81 , 5412.60 , 1129.36
+1690.81 , 5750.89 , 1201.01
+1690.81 , 6089.18 , 1273.09
+1690.81 , 6427.46 , 1345.61
+1690.81 , 6765.75 , 1418.56
+1779.80 , -7190.72 , -1117.74
+1779.80 , -6831.19 , -1064.18
+1779.80 , -6471.65 , -1010.10
+1779.80 , -6112.11 , -955.49
+1779.80 , -5752.58 , -900.37
+1779.80 , -5393.04 , -844.73
+1779.80 , -5033.51 , -788.58
+1779.80 , -4673.97 , -731.90
+1779.80 , -4314.43 , -674.71
+1779.80 , -3954.90 , -617.00
+1779.80 , -3595.36 , -558.77
+1779.80 , -3235.82 , -500.01
+1779.80 , -2876.29 , -440.71
+1779.80 , -2516.75 , -380.85
+1779.80 , -2157.22 , -320.40
+1779.80 , -1797.68 , -259.31
+1779.80 , -1438.14 , -197.41
+1779.80 , -1078.61 , -134.30
+1779.80 , -719.07 , -68.24
+1779.80 , -359.54 , 0.00
+1779.80 , -71.91 , 0.00
+1779.80 , 67.66 , 44.59
+1779.80 , 338.29 , 110.53
+1779.80 , 676.58 , 182.27
+1779.80 , 1014.86 , 252.55
+1779.80 , 1353.15 , 322.69
+1779.80 , 1691.44 , 393.04
+1779.80 , 2029.73 , 463.74
+1779.80 , 2368.01 , 534.84
+1779.80 , 2706.30 , 606.37
+1779.80 , 3044.59 , 678.37
+1779.80 , 3382.88 , 750.82
+1779.80 , 3721.16 , 823.74
+1779.80 , 4059.45 , 897.14
+1779.80 , 4397.74 , 971.01
+1779.80 , 4736.03 , 1045.36
+1779.80 , 5074.31 , 1120.19
+1779.80 , 5412.60 , 1195.49
+1779.80 , 5750.89 , 1271.27
+1779.80 , 6089.18 , 1347.52
+1779.80 , 6427.46 , 1424.25
+1779.80 , 6765.75 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_3.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..0bcfef3ae913c68f305349289ee722f6d8f67f8f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -4193.88 , 0.00
+0.00 , -3984.18 , 0.00
+0.00 , -3774.49 , 0.00
+0.00 , -3564.80 , 0.00
+0.00 , -3355.10 , 0.00
+0.00 , -3145.41 , 0.00
+0.00 , -2935.71 , -0.13
+0.00 , -2726.02 , -0.66
+0.00 , -2516.33 , -0.98
+0.00 , -2306.63 , -1.19
+0.00 , -2096.94 , -1.32
+0.00 , -1887.24 , -1.38
+0.00 , -1677.55 , -1.39
+0.00 , -1467.86 , -1.35
+0.00 , -1258.16 , -1.26
+0.00 , -1048.47 , -1.13
+0.00 , -838.78 , -0.97
+0.00 , -629.08 , -0.77
+0.00 , -419.39 , -0.53
+0.00 , -209.69 , -0.27
+0.00 , -41.94 , -0.02
+0.00 , 40.28 , 0.13
+0.00 , 201.39 , 0.56
+0.00 , 402.78 , 1.12
+0.00 , 604.17 , 1.70
+0.00 , 805.56 , 2.31
+0.00 , 1006.95 , 2.93
+0.00 , 1208.34 , 3.58
+0.00 , 1409.73 , 4.25
+0.00 , 1611.12 , 4.93
+0.00 , 1812.51 , 5.64
+0.00 , 2013.90 , 6.37
+0.00 , 2215.29 , 7.12
+0.00 , 2416.68 , 7.88
+0.00 , 2618.07 , 8.67
+0.00 , 2819.46 , 9.47
+0.00 , 3020.85 , 10.29
+0.00 , 3222.24 , 11.13
+0.00 , 3423.63 , 11.99
+0.00 , 3625.02 , 12.87
+0.00 , 3826.41 , 13.76
+0.00 , 4027.80 , 14.67
+15.10 , -4193.88 , 0.00
+15.10 , -3984.18 , 0.00
+15.10 , -3774.49 , 0.00
+15.10 , -3564.80 , 0.00
+15.10 , -3355.10 , 0.00
+15.10 , -3145.41 , 0.00
+15.10 , -2935.71 , -0.50
+15.10 , -2726.02 , -0.84
+15.10 , -2516.33 , -1.04
+15.10 , -2306.63 , -1.16
+15.10 , -2096.94 , -1.22
+15.10 , -1887.24 , -1.24
+15.10 , -1677.55 , -1.21
+15.10 , -1467.86 , -1.15
+15.10 , -1258.16 , -1.06
+15.10 , -1048.47 , -0.94
+15.10 , -838.78 , -0.80
+15.10 , -629.08 , -0.62
+15.10 , -419.39 , -0.43
+15.10 , -209.69 , -0.21
+15.10 , -41.94 , -0.02
+15.10 , 40.28 , 0.10
+15.10 , 201.39 , 0.43
+15.10 , 402.78 , 0.85
+15.10 , 604.17 , 1.30
+15.10 , 805.56 , 1.75
+15.10 , 1006.95 , 2.23
+15.10 , 1208.34 , 2.71
+15.10 , 1409.73 , 3.21
+15.10 , 1611.12 , 3.73
+15.10 , 1812.51 , 4.26
+15.10 , 2013.90 , 4.80
+15.10 , 2215.29 , 5.36
+15.10 , 2416.68 , 5.93
+15.10 , 2618.07 , 6.52
+15.10 , 2819.46 , 7.12
+15.10 , 3020.85 , 7.73
+15.10 , 3222.24 , 8.35
+15.10 , 3423.63 , 8.99
+15.10 , 3625.02 , 9.64
+15.10 , 3826.41 , 10.30
+15.10 , 4027.80 , 10.98
+151.02 , -4193.88 , -58.10
+151.02 , -3984.18 , -55.37
+151.02 , -3774.49 , -52.62
+151.02 , -3564.80 , -49.85
+151.02 , -3355.10 , -47.06
+151.02 , -3145.41 , -44.25
+151.02 , -2935.71 , -41.42
+151.02 , -2726.02 , -38.57
+151.02 , -2516.33 , -35.70
+151.02 , -2306.63 , -32.81
+151.02 , -2096.94 , -29.90
+151.02 , -1887.24 , -26.98
+151.02 , -1677.55 , -24.03
+151.02 , -1467.86 , -21.07
+151.02 , -1258.16 , -18.08
+151.02 , -1048.47 , -15.08
+151.02 , -838.78 , -12.06
+151.02 , -629.08 , -9.02
+151.02 , -419.39 , -5.96
+151.02 , -209.69 , -2.88
+151.02 , -41.94 , -0.37
+151.02 , 40.28 , 0.90
+151.02 , 201.39 , 3.68
+151.02 , 402.78 , 7.16
+151.02 , 604.17 , 10.66
+151.02 , 805.56 , 14.17
+151.02 , 1006.95 , 17.71
+151.02 , 1208.34 , 21.26
+151.02 , 1409.73 , 24.84
+151.02 , 1611.12 , 28.43
+151.02 , 1812.51 , 32.04
+151.02 , 2013.90 , 35.67
+151.02 , 2215.29 , 39.32
+151.02 , 2416.68 , 42.99
+151.02 , 2618.07 , 46.68
+151.02 , 2819.46 , 50.38
+151.02 , 3020.85 , 54.11
+151.02 , 3222.24 , 57.85
+151.02 , 3423.63 , 61.61
+151.02 , 3625.02 , 65.39
+151.02 , 3826.41 , 69.19
+151.02 , 4027.80 , 73.01
+302.05 , -4193.88 , -120.57
+302.05 , -3984.18 , -114.73
+302.05 , -3774.49 , -108.87
+302.05 , -3564.80 , -102.99
+302.05 , -3355.10 , -97.08
+302.05 , -3145.41 , -91.15
+302.05 , -2935.71 , -85.20
+302.05 , -2726.02 , -79.23
+302.05 , -2516.33 , -73.23
+302.05 , -2306.63 , -67.21
+302.05 , -2096.94 , -61.17
+302.05 , -1887.24 , -55.10
+302.05 , -1677.55 , -49.01
+302.05 , -1467.86 , -42.90
+302.05 , -1258.16 , -36.77
+302.05 , -1048.47 , -30.61
+302.05 , -838.78 , -24.43
+302.05 , -629.08 , -18.23
+302.05 , -419.39 , -12.01
+302.05 , -209.69 , -5.76
+302.05 , -41.94 , -0.66
+302.05 , 40.28 , 1.84
+302.05 , 201.39 , 7.35
+302.05 , 402.78 , 14.22
+302.05 , 604.17 , 21.11
+302.05 , 805.56 , 28.02
+302.05 , 1006.95 , 34.96
+302.05 , 1208.34 , 41.92
+302.05 , 1409.73 , 48.90
+302.05 , 1611.12 , 55.90
+302.05 , 1812.51 , 62.93
+302.05 , 2013.90 , 69.98
+302.05 , 2215.29 , 77.05
+302.05 , 2416.68 , 84.15
+302.05 , 2618.07 , 91.27
+302.05 , 2819.46 , 98.41
+302.05 , 3020.85 , 105.58
+302.05 , 3222.24 , 112.76
+302.05 , 3423.63 , 119.97
+302.05 , 3625.02 , 127.21
+302.05 , 3826.41 , 134.46
+302.05 , 4027.80 , 141.74
+453.07 , -4193.88 , -182.44
+453.07 , -3984.18 , -173.55
+453.07 , -3774.49 , -164.62
+453.07 , -3564.80 , -155.67
+453.07 , -3355.10 , -146.69
+453.07 , -3145.41 , -137.68
+453.07 , -2935.71 , -128.65
+453.07 , -2726.02 , -119.58
+453.07 , -2516.33 , -110.49
+453.07 , -2306.63 , -101.36
+453.07 , -2096.94 , -92.21
+453.07 , -1887.24 , -83.03
+453.07 , -1677.55 , -73.82
+453.07 , -1467.86 , -64.58
+453.07 , -1258.16 , -55.31
+453.07 , -1048.47 , -46.02
+453.07 , -838.78 , -36.70
+453.07 , -629.08 , -27.34
+453.07 , -419.39 , -17.96
+453.07 , -209.69 , -8.54
+453.07 , -41.94 , -0.79
+453.07 , 40.28 , 2.86
+453.07 , 201.39 , 11.12
+453.07 , 402.78 , 21.39
+453.07 , 604.17 , 31.68
+453.07 , 805.56 , 41.99
+453.07 , 1006.95 , 52.34
+453.07 , 1208.34 , 62.71
+453.07 , 1409.73 , 73.12
+453.07 , 1611.12 , 83.55
+453.07 , 1812.51 , 94.01
+453.07 , 2013.90 , 104.50
+453.07 , 2215.29 , 115.02
+453.07 , 2416.68 , 125.57
+453.07 , 2618.07 , 136.15
+453.07 , 2819.46 , 146.76
+453.07 , 3020.85 , 157.40
+453.07 , 3222.24 , 168.06
+453.07 , 3423.63 , 178.76
+453.07 , 3625.02 , 189.48
+453.07 , 3826.41 , 200.23
+453.07 , 4027.80 , 211.02
+604.09 , -4193.88 , -243.71
+604.09 , -3984.18 , -231.81
+604.09 , -3774.49 , -219.87
+604.09 , -3564.80 , -207.89
+604.09 , -3355.10 , -195.88
+604.09 , -3145.41 , -183.83
+604.09 , -2935.71 , -171.74
+604.09 , -2726.02 , -159.61
+604.09 , -2516.33 , -147.45
+604.09 , -2306.63 , -135.25
+604.09 , -2096.94 , -123.01
+604.09 , -1887.24 , -110.74
+604.09 , -1677.55 , -98.43
+604.09 , -1467.86 , -86.08
+604.09 , -1258.16 , -73.70
+604.09 , -1048.47 , -61.27
+604.09 , -838.78 , -48.82
+604.09 , -629.08 , -36.32
+604.09 , -419.39 , -23.78
+604.09 , -209.69 , -11.19
+604.09 , -41.94 , -0.63
+604.09 , 40.28 , 3.98
+604.09 , 201.39 , 15.01
+604.09 , 402.78 , 28.68
+604.09 , 604.17 , 42.37
+604.09 , 805.56 , 56.10
+604.09 , 1006.95 , 69.87
+604.09 , 1208.34 , 83.67
+604.09 , 1409.73 , 97.52
+604.09 , 1611.12 , 111.40
+604.09 , 1812.51 , 125.31
+604.09 , 2013.90 , 139.27
+604.09 , 2215.29 , 153.26
+604.09 , 2416.68 , 167.29
+604.09 , 2618.07 , 181.36
+604.09 , 2819.46 , 195.46
+604.09 , 3020.85 , 209.61
+604.09 , 3222.24 , 223.79
+604.09 , 3423.63 , 238.01
+604.09 , 3625.02 , 252.26
+604.09 , 3826.41 , 266.56
+604.09 , 4027.80 , 280.89
+755.11 , -4193.88 , -304.37
+755.11 , -3984.18 , -289.50
+755.11 , -3774.49 , -274.59
+755.11 , -3564.80 , -259.63
+755.11 , -3355.10 , -244.61
+755.11 , -3145.41 , -229.56
+755.11 , -2935.71 , -214.45
+755.11 , -2726.02 , -199.30
+755.11 , -2516.33 , -184.10
+755.11 , -2306.63 , -168.85
+755.11 , -2096.94 , -153.55
+755.11 , -1887.24 , -138.20
+755.11 , -1677.55 , -122.81
+755.11 , -1467.86 , -107.37
+755.11 , -1258.16 , -91.88
+755.11 , -1048.47 , -76.35
+755.11 , -838.78 , -60.76
+755.11 , -629.08 , -45.13
+755.11 , -419.39 , -29.44
+755.11 , -209.69 , -13.67
+755.11 , -41.94 , 0.00
+755.11 , 40.28 , 5.21
+755.11 , 201.39 , 19.04
+755.11 , 402.78 , 36.13
+755.11 , 604.17 , 53.24
+755.11 , 805.56 , 70.39
+755.11 , 1006.95 , 87.59
+755.11 , 1208.34 , 104.83
+755.11 , 1409.73 , 122.13
+755.11 , 1611.12 , 139.47
+755.11 , 1812.51 , 156.87
+755.11 , 2013.90 , 174.31
+755.11 , 2215.29 , 191.80
+755.11 , 2416.68 , 209.33
+755.11 , 2618.07 , 226.92
+755.11 , 2819.46 , 244.56
+755.11 , 3020.85 , 262.24
+755.11 , 3222.24 , 279.97
+755.11 , 3423.63 , 297.76
+755.11 , 3625.02 , 315.58
+755.11 , 3826.41 , 333.46
+755.11 , 4027.80 , 351.39
+906.14 , -4193.88 , -364.37
+906.14 , -3984.18 , -346.59
+906.14 , -3774.49 , -328.74
+906.14 , -3564.80 , -310.84
+906.14 , -3355.10 , -292.87
+906.14 , -3145.41 , -274.84
+906.14 , -2935.71 , -256.75
+906.14 , -2726.02 , -238.60
+906.14 , -2516.33 , -220.39
+906.14 , -2306.63 , -202.12
+906.14 , -2096.94 , -183.79
+906.14 , -1887.24 , -165.40
+906.14 , -1677.55 , -146.94
+906.14 , -1467.86 , -128.43
+906.14 , -1258.16 , -109.85
+906.14 , -1048.47 , -91.21
+906.14 , -838.78 , -72.51
+906.14 , -629.08 , -53.75
+906.14 , -419.39 , -34.91
+906.14 , -209.69 , -15.95
+906.14 , -41.94 , 0.00
+906.14 , 40.28 , 6.58
+906.14 , 201.39 , 23.25
+906.14 , 402.78 , 43.76
+906.14 , 604.17 , 64.29
+906.14 , 805.56 , 84.87
+906.14 , 1006.95 , 105.52
+906.14 , 1208.34 , 126.22
+906.14 , 1409.73 , 146.98
+906.14 , 1611.12 , 167.81
+906.14 , 1812.51 , 188.70
+906.14 , 2013.90 , 209.65
+906.14 , 2215.29 , 230.66
+906.14 , 2416.68 , 251.73
+906.14 , 2618.07 , 272.87
+906.14 , 2819.46 , 294.07
+906.14 , 3020.85 , 315.33
+906.14 , 3222.24 , 336.65
+906.14 , 3423.63 , 358.03
+906.14 , 3625.02 , 379.47
+906.14 , 3826.41 , 400.98
+906.14 , 4027.80 , 422.54
+1057.16 , -4193.88 , -423.69
+1057.16 , -3984.18 , -403.04
+1057.16 , -3774.49 , -382.31
+1057.16 , -3564.80 , -361.50
+1057.16 , -3355.10 , -340.62
+1057.16 , -3145.41 , -319.66
+1057.16 , -2935.71 , -298.62
+1057.16 , -2726.02 , -277.51
+1057.16 , -2516.33 , -256.31
+1057.16 , -2306.63 , -235.05
+1057.16 , -2096.94 , -213.70
+1057.16 , -1887.24 , -192.28
+1057.16 , -1677.55 , -170.79
+1057.16 , -1467.86 , -149.21
+1057.16 , -1258.16 , -127.57
+1057.16 , -1048.47 , -105.84
+1057.16 , -838.78 , -84.03
+1057.16 , -629.08 , -62.14
+1057.16 , -419.39 , -40.16
+1057.16 , -209.69 , -18.00
+1057.16 , -41.94 , 0.00
+1057.16 , 40.28 , 8.09
+1057.16 , 201.39 , 27.64
+1057.16 , 402.78 , 51.59
+1057.16 , 604.17 , 75.56
+1057.16 , 805.56 , 99.58
+1057.16 , 1006.95 , 123.68
+1057.16 , 1208.34 , 147.86
+1057.16 , 1409.73 , 172.10
+1057.16 , 1611.12 , 196.43
+1057.16 , 1812.51 , 220.84
+1057.16 , 2013.90 , 245.32
+1057.16 , 2215.29 , 269.88
+1057.16 , 2416.68 , 294.51
+1057.16 , 2618.07 , 319.23
+1057.16 , 2819.46 , 344.02
+1057.16 , 3020.85 , 368.89
+1057.16 , 3222.24 , 393.83
+1057.16 , 3423.63 , 418.85
+1057.16 , 3625.02 , 443.95
+1057.16 , 3826.41 , 469.13
+1057.16 , 4027.80 , 494.38
+1208.18 , -4193.88 , -482.31
+1208.18 , -3984.18 , -458.83
+1208.18 , -3774.49 , -435.26
+1208.18 , -3564.80 , -411.59
+1208.18 , -3355.10 , -387.83
+1208.18 , -3145.41 , -363.97
+1208.18 , -2935.71 , -340.02
+1208.18 , -2726.02 , -315.97
+1208.18 , -2516.33 , -291.83
+1208.18 , -2306.63 , -267.59
+1208.18 , -2096.94 , -243.26
+1208.18 , -1887.24 , -218.84
+1208.18 , -1677.55 , -194.32
+1208.18 , -1467.86 , -169.71
+1208.18 , -1258.16 , -145.00
+1208.18 , -1048.47 , -120.19
+1208.18 , -838.78 , -95.29
+1208.18 , -629.08 , -70.28
+1208.18 , -419.39 , -45.14
+1208.18 , -209.69 , -19.76
+1208.18 , -41.94 , 0.00
+1208.18 , 40.28 , 9.76
+1208.18 , 201.39 , 32.25
+1208.18 , 402.78 , 59.66
+1208.18 , 604.17 , 87.07
+1208.18 , 805.56 , 114.55
+1208.18 , 1006.95 , 142.11
+1208.18 , 1208.34 , 169.77
+1208.18 , 1409.73 , 197.52
+1208.18 , 1611.12 , 225.37
+1208.18 , 1812.51 , 253.31
+1208.18 , 2013.90 , 281.34
+1208.18 , 2215.29 , 309.47
+1208.18 , 2416.68 , 337.70
+1208.18 , 2618.07 , 366.02
+1208.18 , 2819.46 , 394.44
+1208.18 , 3020.85 , 422.95
+1208.18 , 3222.24 , 451.56
+1208.18 , 3423.63 , 480.26
+1208.18 , 3625.02 , 509.05
+1208.18 , 3826.41 , 537.94
+1208.18 , 4027.80 , 566.93
+1359.21 , -4193.88 , -540.17
+1359.21 , -3984.18 , -513.92
+1359.21 , -3774.49 , -487.55
+1359.21 , -3564.80 , -461.06
+1359.21 , -3355.10 , -434.46
+1359.21 , -3145.41 , -407.75
+1359.21 , -2935.71 , -380.92
+1359.21 , -2726.02 , -353.97
+1359.21 , -2516.33 , -326.91
+1359.21 , -2306.63 , -299.73
+1359.21 , -2096.94 , -272.44
+1359.21 , -1887.24 , -245.03
+1359.21 , -1677.55 , -217.51
+1359.21 , -1467.86 , -189.87
+1359.21 , -1258.16 , -162.12
+1359.21 , -1048.47 , -134.25
+1359.21 , -838.78 , -106.26
+1359.21 , -629.08 , -78.13
+1359.21 , -419.39 , -49.84
+1359.21 , -209.69 , -21.19
+1359.21 , -41.94 , 0.00
+1359.21 , 40.28 , 11.59
+1359.21 , 201.39 , 37.10
+1359.21 , 402.78 , 67.98
+1359.21 , 604.17 , 98.85
+1359.21 , 805.56 , 129.79
+1359.21 , 1006.95 , 160.84
+1359.21 , 1208.34 , 191.99
+1359.21 , 1409.73 , 223.26
+1359.21 , 1611.12 , 254.64
+1359.21 , 1812.51 , 286.14
+1359.21 , 2013.90 , 317.75
+1359.21 , 2215.29 , 349.48
+1359.21 , 2416.68 , 381.32
+1359.21 , 2618.07 , 413.28
+1359.21 , 2819.46 , 445.36
+1359.21 , 3020.85 , 477.54
+1359.21 , 3222.24 , 509.85
+1359.21 , 3423.63 , 542.27
+1359.21 , 3625.02 , 574.80
+1359.21 , 3826.41 , 607.45
+1359.21 , 4027.80 , 640.21
+1510.23 , -4193.88 , -597.26
+1510.23 , -3984.18 , -568.28
+1510.23 , -3774.49 , -539.16
+1510.23 , -3564.80 , -509.90
+1510.23 , -3355.10 , -480.50
+1510.23 , -3145.41 , -450.96
+1510.23 , -2935.71 , -421.28
+1510.23 , -2726.02 , -391.47
+1510.23 , -2516.33 , -361.52
+1510.23 , -2306.63 , -331.43
+1510.23 , -2096.94 , -301.20
+1510.23 , -1887.24 , -270.83
+1510.23 , -1677.55 , -240.33
+1510.23 , -1467.86 , -209.68
+1510.23 , -1258.16 , -178.90
+1510.23 , -1048.47 , -147.97
+1510.23 , -838.78 , -116.90
+1510.23 , -629.08 , -85.66
+1510.23 , -419.39 , -54.21
+1510.23 , -209.69 , -22.23
+1510.23 , -41.94 , 0.00
+1510.23 , 40.28 , 13.60
+1510.23 , 201.39 , 42.20
+1510.23 , 402.78 , 76.58
+1510.23 , 604.17 , 110.92
+1510.23 , 805.56 , 145.34
+1510.23 , 1006.95 , 179.88
+1510.23 , 1208.34 , 214.55
+1510.23 , 1409.73 , 249.35
+1510.23 , 1611.12 , 284.29
+1510.23 , 1812.51 , 319.36
+1510.23 , 2013.90 , 354.57
+1510.23 , 2215.29 , 389.92
+1510.23 , 2416.68 , 425.41
+1510.23 , 2618.07 , 461.03
+1510.23 , 2819.46 , 496.79
+1510.23 , 3020.85 , 532.69
+1510.23 , 3222.24 , 568.73
+1510.23 , 3423.63 , 604.90
+1510.23 , 3625.02 , 641.21
+1510.23 , 3826.41 , 677.66
+1510.23 , 4027.80 , 714.24
+1661.25 , -4193.88 , -653.54
+1661.25 , -3984.18 , -621.88
+1661.25 , -3774.49 , -590.05
+1661.25 , -3564.80 , -558.06
+1661.25 , -3355.10 , -525.90
+1661.25 , -3145.41 , -493.58
+1661.25 , -2935.71 , -461.09
+1661.25 , -2726.02 , -428.44
+1661.25 , -2516.33 , -395.63
+1661.25 , -2306.63 , -362.65
+1661.25 , -2096.94 , -329.51
+1661.25 , -1887.24 , -296.21
+1661.25 , -1677.55 , -262.74
+1661.25 , -1467.86 , -229.11
+1661.25 , -1258.16 , -195.31
+1661.25 , -1048.47 , -161.34
+1661.25 , -838.78 , -127.18
+1661.25 , -629.08 , -92.83
+1661.25 , -419.39 , -58.20
+1661.25 , -209.69 , -22.82
+1661.25 , -41.94 , 0.00
+1661.25 , 40.28 , 15.79
+1661.25 , 201.39 , 47.58
+1661.25 , 402.78 , 85.48
+1661.25 , 604.17 , 123.30
+1661.25 , 805.56 , 161.22
+1661.25 , 1006.95 , 199.26
+1661.25 , 1208.34 , 237.46
+1661.25 , 1409.73 , 275.81
+1661.25 , 1611.12 , 314.32
+1661.25 , 1812.51 , 352.99
+1661.25 , 2013.90 , 391.83
+1661.25 , 2215.29 , 430.82
+1661.25 , 2416.68 , 469.98
+1661.25 , 2618.07 , 509.30
+1661.25 , 2819.46 , 548.78
+1661.25 , 3020.85 , 588.42
+1661.25 , 3222.24 , 628.23
+1661.25 , 3423.63 , 668.20
+1661.25 , 3625.02 , 708.32
+1661.25 , 3826.41 , 748.61
+1661.25 , 4027.80 , 789.06
+1812.27 , -4193.88 , -708.97
+1812.27 , -3984.18 , -674.68
+1812.27 , -3774.49 , -640.19
+1812.27 , -3564.80 , -605.51
+1812.27 , -3355.10 , -570.63
+1812.27 , -3145.41 , -535.56
+1812.27 , -2935.71 , -500.30
+1812.27 , -2726.02 , -464.85
+1812.27 , -2516.33 , -429.21
+1812.27 , -2306.63 , -393.37
+1812.27 , -2096.94 , -357.35
+1812.27 , -1887.24 , -321.13
+1812.27 , -1677.55 , -284.71
+1812.27 , -1467.86 , -248.11
+1812.27 , -1258.16 , -211.31
+1812.27 , -1048.47 , -174.30
+1812.27 , -838.78 , -137.08
+1812.27 , -629.08 , -99.61
+1812.27 , -419.39 , -61.78
+1812.27 , -209.69 , -22.86
+1812.27 , -41.94 , 0.00
+1812.27 , 40.28 , 18.17
+1812.27 , 201.39 , 53.24
+1812.27 , 402.78 , 94.71
+1812.27 , 604.17 , 136.03
+1812.27 , 805.56 , 177.45
+1812.27 , 1006.95 , 219.01
+1812.27 , 1208.34 , 260.75
+1812.27 , 1409.73 , 302.67
+1812.27 , 1611.12 , 344.78
+1812.27 , 1812.51 , 387.07
+1812.27 , 2013.90 , 429.54
+1812.27 , 2215.29 , 472.21
+1812.27 , 2416.68 , 515.06
+1812.27 , 2618.07 , 558.11
+1812.27 , 2819.46 , 601.34
+1812.27 , 3020.85 , 644.76
+1812.27 , 3222.24 , 688.37
+1812.27 , 3423.63 , 732.17
+1812.27 , 3625.02 , 776.15
+1812.27 , 3826.41 , 820.33
+1812.27 , 4027.80 , 864.69
+1963.30 , -4193.88 , -763.53
+1963.30 , -3984.18 , -726.65
+1963.30 , -3774.49 , -689.55
+1963.30 , -3564.80 , -652.22
+1963.30 , -3355.10 , -614.67
+1963.30 , -3145.41 , -576.89
+1963.30 , -2935.71 , -538.89
+1963.30 , -2726.02 , -500.67
+1963.30 , -2516.33 , -462.22
+1963.30 , -2306.63 , -423.56
+1963.30 , -2096.94 , -384.67
+1963.30 , -1887.24 , -345.56
+1963.30 , -1677.55 , -306.22
+1963.30 , -1467.86 , -266.66
+1963.30 , -1258.16 , -226.86
+1963.30 , -1048.47 , -186.83
+1963.30 , -838.78 , -146.54
+1963.30 , -629.08 , -105.95
+1963.30 , -419.39 , -64.90
+1963.30 , -209.69 , -22.24
+1963.30 , -41.94 , 0.00
+1963.30 , 40.28 , 20.74
+1963.30 , 201.39 , 59.20
+1963.30 , 402.78 , 104.27
+1963.30 , 604.17 , 149.12
+1963.30 , 805.56 , 194.05
+1963.30 , 1006.95 , 239.16
+1963.30 , 1208.34 , 284.45
+1963.30 , 1409.73 , 329.96
+1963.30 , 1611.12 , 375.67
+1963.30 , 1812.51 , 421.60
+1963.30 , 2013.90 , 467.75
+1963.30 , 2215.29 , 514.11
+1963.30 , 2416.68 , 560.69
+1963.30 , 2618.07 , 607.48
+1963.30 , 2819.46 , 654.50
+1963.30 , 3020.85 , 701.73
+1963.30 , 3222.24 , 749.18
+1963.30 , 3423.63 , 796.84
+1963.30 , 3625.02 , 844.73
+1963.30 , 3826.41 , 892.83
+1963.30 , 4027.80 , 941.14
+2114.32 , -4193.88 , -817.17
+2114.32 , -3984.18 , -777.76
+2114.32 , -3774.49 , -738.08
+2114.32 , -3564.80 , -698.15
+2114.32 , -3355.10 , -657.96
+2114.32 , -3145.41 , -617.52
+2114.32 , -2935.71 , -576.82
+2114.32 , -2726.02 , -535.86
+2114.32 , -2516.33 , -494.65
+2114.32 , -2306.63 , -453.18
+2114.32 , -2096.94 , -411.45
+2114.32 , -1887.24 , -369.47
+2114.32 , -1677.55 , -327.22
+2114.32 , -1467.86 , -284.72
+2114.32 , -1258.16 , -241.95
+2114.32 , -1048.47 , -198.90
+2114.32 , -838.78 , -155.54
+2114.32 , -629.08 , -111.82
+2114.32 , -419.39 , -67.51
+2114.32 , -209.69 , -20.80
+2114.32 , -41.94 , 0.00
+2114.32 , 40.28 , 23.52
+2114.32 , 201.39 , 65.48
+2114.32 , 402.78 , 114.20
+2114.32 , 604.17 , 162.59
+2114.32 , 805.56 , 211.06
+2114.32 , 1006.95 , 259.72
+2114.32 , 1208.34 , 308.59
+2114.32 , 1409.73 , 357.69
+2114.32 , 1611.12 , 407.04
+2114.32 , 1812.51 , 456.62
+2114.32 , 2013.90 , 506.46
+2114.32 , 2215.29 , 556.54
+2114.32 , 2416.68 , 606.87
+2114.32 , 2618.07 , 657.45
+2114.32 , 2819.46 , 708.28
+2114.32 , 3020.85 , 759.35
+2114.32 , 3222.24 , 810.68
+2114.32 , 3423.63 , 862.25
+2114.32 , 3625.02 , 914.07
+2114.32 , 3826.41 , 966.13
+2114.32 , 4027.80 , 1018.44
+2265.34 , -4193.88 , -869.86
+2265.34 , -3984.18 , -827.96
+2265.34 , -3774.49 , -785.77
+2265.34 , -3564.80 , -743.28
+2265.34 , -3355.10 , -700.50
+2265.34 , -3145.41 , -657.42
+2265.34 , -2935.71 , -614.05
+2265.34 , -2726.02 , -570.39
+2265.34 , -2516.33 , -526.44
+2265.34 , -2306.63 , -482.19
+2265.34 , -2096.94 , -437.65
+2265.34 , -1887.24 , -392.82
+2265.34 , -1677.55 , -347.69
+2265.34 , -1467.86 , -302.26
+2265.34 , -1258.16 , -256.52
+2265.34 , -1048.47 , -210.46
+2265.34 , -838.78 , -164.04
+2265.34 , -629.08 , -117.17
+2265.34 , -419.39 , -69.54
+2265.34 , -209.69 , -18.27
+2265.34 , -41.94 , 0.00
+2265.34 , 40.28 , 26.49
+2265.34 , 201.39 , 72.10
+2265.34 , 402.78 , 124.50
+2265.34 , 604.17 , 176.46
+2265.34 , 805.56 , 228.49
+2265.34 , 1006.95 , 280.71
+2265.34 , 1208.34 , 333.18
+2265.34 , 1409.73 , 385.90
+2265.34 , 1611.12 , 438.89
+2265.34 , 1812.51 , 492.16
+2265.34 , 2013.90 , 545.71
+2265.34 , 2215.29 , 599.54
+2265.34 , 2416.68 , 653.64
+2265.34 , 2618.07 , 708.03
+2265.34 , 2819.46 , 762.71
+2265.34 , 3020.85 , 817.66
+2265.34 , 3222.24 , 872.89
+2265.34 , 3423.63 , 928.41
+2265.34 , 3625.02 , 984.20
+2265.34 , 3826.41 , 1040.27
+2265.34 , 4027.80 , 1096.63
+2416.37 , -4193.88 , -921.56
+2416.37 , -3984.18 , -877.23
+2416.37 , -3774.49 , -832.56
+2416.37 , -3564.80 , -787.56
+2416.37 , -3355.10 , -742.22
+2416.37 , -3145.41 , -696.56
+2416.37 , -2935.71 , -650.56
+2416.37 , -2726.02 , -604.23
+2416.37 , -2516.33 , -557.56
+2416.37 , -2306.63 , -510.57
+2416.37 , -2096.94 , -463.24
+2416.37 , -1887.24 , -415.58
+2416.37 , -1677.55 , -367.58
+2416.37 , -1467.86 , -319.24
+2416.37 , -1258.16 , -270.55
+2416.37 , -1048.47 , -221.48
+2416.37 , -838.78 , -171.99
+2416.37 , -629.08 , -121.95
+2416.37 , -419.39 , -70.93
+2416.37 , -209.69 , -14.10
+2416.37 , -41.94 , 0.00
+2416.37 , 40.28 , 29.68
+2416.37 , 201.39 , 79.05
+2416.37 , 402.78 , 135.20
+2416.37 , 604.17 , 190.76
+2416.37 , 805.56 , 246.36
+2416.37 , 1006.95 , 302.17
+2416.37 , 1208.34 , 358.24
+2416.37 , 1409.73 , 414.60
+2416.37 , 1611.12 , 471.27
+2416.37 , 1812.51 , 528.24
+2416.37 , 2013.90 , 585.52
+2416.37 , 2215.29 , 643.12
+2416.37 , 2416.68 , 701.03
+2416.37 , 2618.07 , 759.26
+2416.37 , 2819.46 , 817.80
+2416.37 , 3020.85 , 876.66
+2416.37 , 3222.24 , 935.84
+2416.37 , 3423.63 , 995.34
+2416.37 , 3625.02 , 1055.15
+2416.37 , 3826.41 , 1115.27
+2416.37 , 4027.80 , 1175.71
+2567.39 , -4193.88 , -972.24
+2567.39 , -3984.18 , -925.52
+2567.39 , -3774.49 , -878.43
+2567.39 , -3564.80 , -830.96
+2567.39 , -3355.10 , -783.11
+2567.39 , -3145.41 , -734.89
+2567.39 , -2935.71 , -686.30
+2567.39 , -2726.02 , -637.33
+2567.39 , -2516.33 , -587.99
+2567.39 , -2306.63 , -538.28
+2567.39 , -2096.94 , -488.19
+2567.39 , -1887.24 , -437.72
+2567.39 , -1677.55 , -386.87
+2567.39 , -1467.86 , -335.63
+2567.39 , -1258.16 , -283.99
+2567.39 , -1048.47 , -231.92
+2567.39 , -838.78 , -179.35
+2567.39 , -629.08 , -126.12
+2567.39 , -419.39 , -71.60
+2567.39 , -209.69 , -6.45
+2567.39 , -41.94 , 0.00
+2567.39 , 40.28 , 33.08
+2567.39 , 201.39 , 86.37
+2567.39 , 402.78 , 146.31
+2567.39 , 604.17 , 205.50
+2567.39 , 805.56 , 264.70
+2567.39 , 1006.95 , 324.11
+2567.39 , 1208.34 , 383.81
+2567.39 , 1409.73 , 443.83
+2567.39 , 1611.12 , 504.18
+2567.39 , 1812.51 , 564.87
+2567.39 , 2013.90 , 625.91
+2567.39 , 2215.29 , 687.30
+2567.39 , 2416.68 , 749.05
+2567.39 , 2618.07 , 811.14
+2567.39 , 2819.46 , 873.59
+2567.39 , 3020.85 , 936.40
+2567.39 , 3222.24 , 999.56
+2567.39 , 3423.63 , 1063.07
+2567.39 , 3625.02 , 1126.93
+2567.39 , 3826.41 , 1191.14
+2567.39 , 4027.80 , 1255.71
+2718.41 , -4193.88 , -1021.86
+2718.41 , -3984.18 , -972.81
+2718.41 , -3774.49 , -923.33
+2718.41 , -3564.80 , -873.44
+2718.41 , -3355.10 , -823.13
+2718.41 , -3145.41 , -772.39
+2718.41 , -2935.71 , -721.24
+2718.41 , -2726.02 , -669.67
+2718.41 , -2516.33 , -617.68
+2718.41 , -2306.63 , -565.27
+2718.41 , -2096.94 , -512.45
+2718.41 , -1887.24 , -459.19
+2718.41 , -1677.55 , -405.51
+2718.41 , -1467.86 , -351.39
+2718.41 , -1258.16 , -296.81
+2718.41 , -1048.47 , -241.73
+2718.41 , -838.78 , -186.07
+2718.41 , -629.08 , -129.61
+2718.41 , -419.39 , -71.46
+2718.41 , -209.69 , 0.00
+2718.41 , -41.94 , 0.00
+2718.41 , 40.28 , 36.70
+2718.41 , 201.39 , 94.04
+2718.41 , 402.78 , 157.85
+2718.41 , 604.17 , 220.70
+2718.41 , 805.56 , 283.52
+2718.41 , 1006.95 , 346.56
+2718.41 , 1208.34 , 409.90
+2718.41 , 1409.73 , 473.59
+2718.41 , 1611.12 , 537.65
+2718.41 , 1812.51 , 602.09
+2718.41 , 2013.90 , 666.91
+2718.41 , 2215.29 , 732.12
+2718.41 , 2416.68 , 797.72
+2718.41 , 2618.07 , 863.72
+2718.41 , 2819.46 , 930.10
+2718.41 , 3020.85 , 996.88
+2718.41 , 3222.24 , 1064.05
+2718.41 , 3423.63 , 1131.62
+2718.41 , 3625.02 , 1199.57
+2718.41 , 3826.41 , 1267.92
+2718.41 , 4027.80 , 1336.65
+2869.43 , -4193.88 , -1070.37
+2869.43 , -3984.18 , -1019.04
+2869.43 , -3774.49 , -967.24
+2869.43 , -3564.80 , -914.96
+2869.43 , -3355.10 , -862.23
+2869.43 , -3145.41 , -809.02
+2869.43 , -2935.71 , -755.35
+2869.43 , -2726.02 , -701.21
+2869.43 , -2516.33 , -646.60
+2869.43 , -2306.63 , -591.53
+2869.43 , -2096.94 , -535.99
+2869.43 , -1887.24 , -479.97
+2869.43 , -1677.55 , -423.47
+2869.43 , -1467.86 , -366.48
+2869.43 , -1258.16 , -308.96
+2869.43 , -1048.47 , -250.88
+2869.43 , -838.78 , -192.11
+2869.43 , -629.08 , -132.36
+2869.43 , -419.39 , -70.38
+2869.43 , -209.69 , 0.00
+2869.43 , -41.94 , 0.00
+2869.43 , 40.28 , 40.53
+2869.43 , 201.39 , 102.10
+2869.43 , 402.78 , 169.83
+2869.43 , 604.17 , 236.37
+2869.43 , 805.56 , 302.84
+2869.43 , 1006.95 , 369.53
+2869.43 , 1208.34 , 436.54
+2869.43 , 1409.73 , 503.92
+2869.43 , 1611.12 , 571.71
+2869.43 , 1812.51 , 639.91
+2869.43 , 2013.90 , 708.54
+2869.43 , 2215.29 , 777.59
+2869.43 , 2416.68 , 847.08
+2869.43 , 2618.07 , 917.00
+2869.43 , 2819.46 , 987.35
+2869.43 , 3020.85 , 1058.14
+2869.43 , 3222.24 , 1129.36
+2869.43 , 3423.63 , 1201.01
+2869.43 , 3625.02 , 1273.09
+2869.43 , 3826.41 , 1345.61
+2869.43 , 4027.80 , 1418.56
+3020.46 , -4193.88 , -1117.74
+3020.46 , -3984.18 , -1064.18
+3020.46 , -3774.49 , -1010.10
+3020.46 , -3564.80 , -955.49
+3020.46 , -3355.10 , -900.37
+3020.46 , -3145.41 , -844.73
+3020.46 , -2935.71 , -788.58
+3020.46 , -2726.02 , -731.90
+3020.46 , -2516.33 , -674.71
+3020.46 , -2306.63 , -617.00
+3020.46 , -2096.94 , -558.77
+3020.46 , -1887.24 , -500.01
+3020.46 , -1677.55 , -440.71
+3020.46 , -1467.86 , -380.85
+3020.46 , -1258.16 , -320.40
+3020.46 , -1048.47 , -259.31
+3020.46 , -838.78 , -197.41
+3020.46 , -629.08 , -134.30
+3020.46 , -419.39 , -68.24
+3020.46 , -209.69 , 0.00
+3020.46 , -41.94 , 0.00
+3020.46 , 40.28 , 44.59
+3020.46 , 201.39 , 110.53
+3020.46 , 402.78 , 182.27
+3020.46 , 604.17 , 252.55
+3020.46 , 805.56 , 322.69
+3020.46 , 1006.95 , 393.04
+3020.46 , 1208.34 , 463.74
+3020.46 , 1409.73 , 534.84
+3020.46 , 1611.12 , 606.37
+3020.46 , 1812.51 , 678.37
+3020.46 , 2013.90 , 750.82
+3020.46 , 2215.29 , 823.74
+3020.46 , 2416.68 , 897.14
+3020.46 , 2618.07 , 971.01
+3020.46 , 2819.46 , 1045.36
+3020.46 , 3020.85 , 1120.19
+3020.46 , 3222.24 , 1195.49
+3020.46 , 3423.63 , 1271.27
+3020.46 , 3625.02 , 1347.52
+3020.46 , 3826.41 , 1424.25
+3020.46 , 4027.80 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..2c22528593c65014558a41670cf09448bd99eebb
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_FLD_max.viepcp
@@ -0,0 +1,24 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 4027.80 , -4193.88
+14.96 , 4027.80 , -4193.88
+151.09 , 4027.80 , -4193.88
+302.19 , 4027.80 , -4193.88
+452.92 , 4027.80 , -4193.88
+604.01 , 4027.80 , -4193.88
+755.11 , 4027.80 , -4193.88
+906.20 , 3356.50 , -3494.90
+1057.30 , 2876.98 , -2995.60
+1208.03 , 2517.38 , -2621.17
+1359.12 , 2237.68 , -2329.95
+1510.22 , 2013.90 , -2096.94
+1661.31 , 1830.82 , -1906.31
+1812.41 , 1678.25 , -1747.45
+1963.14 , 1549.15 , -1613.02
+2114.23 , 1438.52 , -1497.83
+2265.33 , 1342.60 , -1397.96
+2416.42 , 1258.71 , -1310.61
+2567.52 , 1184.66 , -1233.50
+2718.25 , 1118.82 , -1164.95
+2869.34 , 1059.96 , -1103.66
+3020.44 , 1006.95 , -1048.47
+
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..1c40e34f4c8b390982508509b839a7cc766f8bd1
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 4027.80 , -4193.88
+14.96 , 4027.80 , -4193.88
+151.09 , 4027.80 , -4193.88
+302.19 , 4027.80 , -4193.88
+452.92 , 4027.80 , -4193.88
+604.01 , 4027.80 , -4193.88
+755.11 , 4027.80 , -4193.88
+906.20 , 3356.50 , -3494.90
+1057.30 , 2876.98 , -2995.60
+1208.03 , 2517.38 , -2621.17
+1359.12 , 2237.68 , -2329.95
+1510.22 , 2013.90 , -2096.94
+1661.31 , 1830.82 , -1906.31
+1812.41 , 1678.25 , -1747.45
+1963.14 , 1549.15 , -1613.02
+2114.23 , 1438.52 , -1497.83
+2265.33 , 1342.60 , -1397.96
+2416.42 , 1258.71 , -1310.61
+2567.52 , 1184.66 , -1233.50
+2718.25 , 1118.82 , -1164.95
+2869.34 , 1059.96 , -1103.66
+3020.44 , 1006.95 , -1048.47
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..841a118a18b289b3d124302d4931e8de455c6793
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -8.02
+15.10 , -8.28
+151.02 , -10.62
+302.05 , -13.22
+453.07 , -15.82
+604.09 , -18.45
+755.11 , -21.05
+906.14 , -23.65
+1057.16 , -26.25
+1208.18 , -28.85
+1359.21 , -31.48
+1510.23 , -34.08
+1661.25 , -36.68
+1812.28 , -39.28
+1963.30 , -41.88
+2114.32 , -44.51
+2265.34 , -47.11
+2416.37 , -49.71
+2567.39 , -52.31
+2718.41 , -54.91
+2869.44 , -57.54
+3020.46 , -60.14
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag1.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag1.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..69fa4188eac5b7a1325b80e75dcd3b202e9afd60
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag1.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -24.84
+4.98 , -25.62
+49.80 , -32.89
+99.59 , -40.94
+149.39 , -48.99
+199.18 , -57.13
+248.98 , -65.18
+298.77 , -73.23
+348.57 , -81.28
+398.37 , -89.33
+448.16 , -97.47
+497.96 , -105.52
+547.75 , -113.57
+597.55 , -121.62
+647.35 , -129.67
+697.14 , -137.81
+746.94 , -145.86
+796.73 , -153.91
+846.53 , -161.96
+896.32 , -170.01
+946.12 , -178.15
+995.92 , -186.20
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag2.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag2.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..ffb4883b312afeed23be5a96783b2b92e3c03bed
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag2.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -13.76
+8.90 , -14.19
+88.99 , -18.22
+177.98 , -22.67
+266.97 , -27.13
+355.96 , -31.64
+444.95 , -36.10
+533.94 , -40.56
+622.93 , -45.01
+711.92 , -49.47
+800.91 , -53.98
+889.90 , -58.44
+978.89 , -62.89
+1067.88 , -67.35
+1156.87 , -71.81
+1245.86 , -76.32
+1334.85 , -80.78
+1423.84 , -85.23
+1512.83 , -89.69
+1601.82 , -94.15
+1690.81 , -98.66
+1779.80 , -103.11
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/Common/GenericBattery_243kWh.vbatr b/Generic Vehicles/Engineering Mode/GenericIEPC/Common/GenericBattery_243kWh.vbatr
new file mode 100644
index 0000000000000000000000000000000000000000..953f417ac43d9bc1432971034d22d3ab15d5e1a2
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/Common/GenericBattery_243kWh.vbatr
@@ -0,0 +1,3 @@
+SoC, Ri
+0, 0.04
+100, 0.04
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/Common/GenericBattery_243kWh.vbatv b/Generic Vehicles/Engineering Mode/GenericIEPC/Common/GenericBattery_243kWh.vbatv
new file mode 100644
index 0000000000000000000000000000000000000000..28376e3632a1a24d0631665c19822b66f0310257
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/Common/GenericBattery_243kWh.vbatv
@@ -0,0 +1,12 @@
+SOC, V
+0, 673.5
+10, 700.2
+20, 715.4
+30, 723.6
+40, 727.7
+50, 730.0
+60, 731.6
+70, 733.8
+80, 737.1
+90, 742.2
+100, 750.2
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/Common/GenericBattery_243kWh_750V.vbat b/Generic Vehicles/Engineering Mode/GenericIEPC/Common/GenericBattery_243kWh_750V.vbat
new file mode 100644
index 0000000000000000000000000000000000000000..381fba7f96c98f97dac07cd5ce5fcbd03711f2ec
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/Common/GenericBattery_243kWh_750V.vbat
@@ -0,0 +1,18 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic Battery",
+ "InternalResistanceCurve": "GenericBattery_243kWh.vbatr",
+ "SOC_min": 10,
+ "SOC_max": 90,
+ "MaxCurrentMap": "MaxCurrent.vimax",
+ "Capacity": 324,
+ "SoCCurve": "GenericBattery_243kWh.vbatv"
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/Common/MaxCurrent.vimax b/Generic Vehicles/Engineering Mode/GenericIEPC/Common/MaxCurrent.vimax
new file mode 100644
index 0000000000000000000000000000000000000000..adf28fb9b5ced83296d2634fc6727e2d1b82357e
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/Common/MaxCurrent.vimax
@@ -0,0 +1,3 @@
+SOC, I_charge, I_discharge
+0, 1620, 1620
+100, 1620, 1620
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/Common/ShiftParameters.vtcu b/Generic Vehicles/Engineering Mode/GenericIEPC/Common/ShiftParameters.vtcu
new file mode 100644
index 0000000000000000000000000000000000000000..a26e0e50f9e03240a8ddf18d296b8edbcda8bdcb
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/Common/ShiftParameters.vtcu
@@ -0,0 +1,14 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T15:52:04.0766564Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "Rating_current_gear": 0.995,
+ "RatioEarlyUpshiftFC" : 24,
+ "RatioEarlyDownshiftFC" : 24
+
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/Common/Truck.vacc b/Generic Vehicles/Engineering Mode/GenericIEPC/Common/Truck.vacc
new file mode 100644
index 0000000000000000000000000000000000000000..54e77864874d21d67e8f8d69a97b35c5c6031749
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/Common/Truck.vacc
@@ -0,0 +1,6 @@
+v [km/h],acc [m/s²],dec [m/s²]
+0,1,-1
+25,1,-1
+50,0.642857143,-1
+60,0.5,-0.5
+120,0.5,-0.5
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..6e4c104a21b4bf31fa7bc80e95c8c53d69437d5f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": true,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 12.276
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 13860.59,
+ "ContinuousTorqueSpeed": 166.99,
+ "OverloadTorque": 16517.20,
+ "OverloadTorqueSpeed": 166.01,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1Axl_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Axl.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 15015.63,
+ "ContinuousTorqueSpeed": 168.62,
+ "OverloadTorque": 17325.73,
+ "OverloadTorqueSpeed": 170.17,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1Axl_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Axl.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1Axl_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..3ecc37bf709586789c7718efe3864b38a702ea37
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1Axl.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_ENG_Gbx1Axl.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_ENG_Gbx1Axl.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..e19150c83618395c69db102b100b2b5f86454850
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_ENG_Gbx1Axl.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx1Axl.vveh",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..07eb40e197c27c23aea5f69c3200e3b799688102
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -37.45
+3.37 , -38.62
+33.71 , -49.58
+67.42 , -61.71
+101.12 , -73.85
+134.83 , -86.11
+168.54 , -98.24
+202.25 , -110.38
+235.96 , -122.51
+269.67 , -134.65
+303.37 , -146.91
+337.08 , -159.04
+370.79 , -171.18
+404.50 , -183.31
+438.21 , -195.45
+471.92 , -207.71
+505.62 , -219.84
+539.33 , -231.98
+573.04 , -244.11
+606.75 , -256.24
+640.46 , -268.51
+674.17 , -280.64
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/GenericIEPC_Gbx1Whl1.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/GenericIEPC_Gbx1Whl1.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..5b924aea7e507dab781c6727c70efd7ef3105ee9
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/GenericIEPC_Gbx1Whl1.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 12.276
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 6930.29,
+ "ContinuousTorqueSpeed": 166.99,
+ "OverloadTorque": 8258.60,
+ "OverloadTorqueSpeed": 166.01,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1Whl1_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl1.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 7507.82,
+ "ContinuousTorqueSpeed": 168.62,
+ "OverloadTorque": 8662.87,
+ "OverloadTorqueSpeed": 170.17,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1Whl1_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl1.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1Whl1_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..bfe9e793fdb6c0629e8d938b4375baa36eb15063
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1Whl1.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_ENG_Gbx1Whl1.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_ENG_Gbx1Whl1.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..6cc64ff5def0f1da6b0d8886c28e8766af675975
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_ENG_Gbx1Whl1.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx1Whl1.vveh",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..b5980ac32ff2f44452666e544ce91c462f5c5a7f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -9785.31 , 0.00
+0.00 , -9296.05 , 0.00
+0.00 , -8806.78 , 0.00
+0.00 , -8317.52 , 0.00
+0.00 , -7828.25 , 0.00
+0.00 , -7338.98 , 0.00
+0.00 , -6849.72 , -0.07
+0.00 , -6360.45 , -0.33
+0.00 , -5871.19 , -0.49
+0.00 , -5381.92 , -0.60
+0.00 , -4892.66 , -0.66
+0.00 , -4403.39 , -0.69
+0.00 , -3914.12 , -0.70
+0.00 , -3424.86 , -0.67
+0.00 , -2935.59 , -0.63
+0.00 , -2446.33 , -0.57
+0.00 , -1957.06 , -0.48
+0.00 , -1467.80 , -0.38
+0.00 , -978.53 , -0.27
+0.00 , -489.27 , -0.13
+0.00 , -97.85 , -0.01
+0.00 , 86.63 , 0.06
+0.00 , 433.14 , 0.28
+0.00 , 866.29 , 0.56
+0.00 , 1299.43 , 0.85
+0.00 , 1732.57 , 1.15
+0.00 , 2165.72 , 1.47
+0.00 , 2598.86 , 1.79
+0.00 , 3032.00 , 2.12
+0.00 , 3465.15 , 2.47
+0.00 , 3898.29 , 2.82
+0.00 , 4331.43 , 3.19
+0.00 , 4764.58 , 3.56
+0.00 , 5197.72 , 3.94
+0.00 , 5630.86 , 4.33
+0.00 , 6064.01 , 4.74
+0.00 , 6497.15 , 5.15
+0.00 , 6930.29 , 5.57
+0.00 , 7363.44 , 6.00
+0.00 , 7796.58 , 6.43
+0.00 , 8229.72 , 6.88
+0.00 , 8662.87 , 7.34
+3.37 , -9785.31 , 0.00
+3.37 , -9296.05 , 0.00
+3.37 , -8806.78 , 0.00
+3.37 , -8317.52 , 0.00
+3.37 , -7828.25 , 0.00
+3.37 , -7338.98 , 0.00
+3.37 , -6849.72 , -0.25
+3.37 , -6360.45 , -0.42
+3.37 , -5871.19 , -0.52
+3.37 , -5381.92 , -0.58
+3.37 , -4892.66 , -0.61
+3.37 , -4403.39 , -0.62
+3.37 , -3914.12 , -0.61
+3.37 , -3424.86 , -0.58
+3.37 , -2935.59 , -0.53
+3.37 , -2446.33 , -0.47
+3.37 , -1957.06 , -0.40
+3.37 , -1467.80 , -0.31
+3.37 , -978.53 , -0.22
+3.37 , -489.27 , -0.11
+3.37 , -97.85 , -0.01
+3.37 , 86.63 , 0.05
+3.37 , 433.14 , 0.21
+3.37 , 866.29 , 0.43
+3.37 , 1299.43 , 0.65
+3.37 , 1732.57 , 0.88
+3.37 , 2165.72 , 1.11
+3.37 , 2598.86 , 1.36
+3.37 , 3032.00 , 1.61
+3.37 , 3465.15 , 1.87
+3.37 , 3898.29 , 2.13
+3.37 , 4331.43 , 2.40
+3.37 , 4764.58 , 2.68
+3.37 , 5197.72 , 2.97
+3.37 , 5630.86 , 3.26
+3.37 , 6064.01 , 3.56
+3.37 , 6497.15 , 3.86
+3.37 , 6930.29 , 4.18
+3.37 , 7363.44 , 4.50
+3.37 , 7796.58 , 4.82
+3.37 , 8229.72 , 5.15
+3.37 , 8662.87 , 5.49
+33.71 , -9785.31 , -29.05
+33.71 , -9296.05 , -27.68
+33.71 , -8806.78 , -26.31
+33.71 , -8317.52 , -24.92
+33.71 , -7828.25 , -23.53
+33.71 , -7338.98 , -22.12
+33.71 , -6849.72 , -20.71
+33.71 , -6360.45 , -19.28
+33.71 , -5871.19 , -17.85
+33.71 , -5381.92 , -16.41
+33.71 , -4892.66 , -14.95
+33.71 , -4403.39 , -13.49
+33.71 , -3914.12 , -12.02
+33.71 , -3424.86 , -10.53
+33.71 , -2935.59 , -9.04
+33.71 , -2446.33 , -7.54
+33.71 , -1957.06 , -6.03
+33.71 , -1467.80 , -4.51
+33.71 , -978.53 , -2.98
+33.71 , -489.27 , -1.44
+33.71 , -97.85 , -0.18
+33.71 , 86.63 , 0.45
+33.71 , 433.14 , 1.84
+33.71 , 866.29 , 3.58
+33.71 , 1299.43 , 5.33
+33.71 , 1732.57 , 7.09
+33.71 , 2165.72 , 8.85
+33.71 , 2598.86 , 10.63
+33.71 , 3032.00 , 12.42
+33.71 , 3465.15 , 14.21
+33.71 , 3898.29 , 16.02
+33.71 , 4331.43 , 17.84
+33.71 , 4764.58 , 19.66
+33.71 , 5197.72 , 21.49
+33.71 , 5630.86 , 23.34
+33.71 , 6064.01 , 25.19
+33.71 , 6497.15 , 27.05
+33.71 , 6930.29 , 28.93
+33.71 , 7363.44 , 30.81
+33.71 , 7796.58 , 32.70
+33.71 , 8229.72 , 34.60
+33.71 , 8662.87 , 36.50
+67.42 , -9785.31 , -60.28
+67.42 , -9296.05 , -57.37
+67.42 , -8806.78 , -54.44
+67.42 , -8317.52 , -51.49
+67.42 , -7828.25 , -48.54
+67.42 , -7338.98 , -45.58
+67.42 , -6849.72 , -42.60
+67.42 , -6360.45 , -39.61
+67.42 , -5871.19 , -36.61
+67.42 , -5381.92 , -33.60
+67.42 , -4892.66 , -30.58
+67.42 , -4403.39 , -27.55
+67.42 , -3914.12 , -24.51
+67.42 , -3424.86 , -21.45
+67.42 , -2935.59 , -18.38
+67.42 , -2446.33 , -15.31
+67.42 , -1957.06 , -12.22
+67.42 , -1467.80 , -9.12
+67.42 , -978.53 , -6.00
+67.42 , -489.27 , -2.88
+67.42 , -97.85 , -0.33
+67.42 , 86.63 , 0.92
+67.42 , 433.14 , 3.68
+67.42 , 866.29 , 7.11
+67.42 , 1299.43 , 10.56
+67.42 , 1732.57 , 14.01
+67.42 , 2165.72 , 17.48
+67.42 , 2598.86 , 20.96
+67.42 , 3032.00 , 24.45
+67.42 , 3465.15 , 27.95
+67.42 , 3898.29 , 31.47
+67.42 , 4331.43 , 34.99
+67.42 , 4764.58 , 38.53
+67.42 , 5197.72 , 42.08
+67.42 , 5630.86 , 45.64
+67.42 , 6064.01 , 49.21
+67.42 , 6497.15 , 52.79
+67.42 , 6930.29 , 56.38
+67.42 , 7363.44 , 59.99
+67.42 , 7796.58 , 63.60
+67.42 , 8229.72 , 67.23
+67.42 , 8662.87 , 70.87
+101.12 , -9785.31 , -91.22
+101.12 , -9296.05 , -86.77
+101.12 , -8806.78 , -82.31
+101.12 , -8317.52 , -77.84
+101.12 , -7828.25 , -73.35
+101.12 , -7338.98 , -68.84
+101.12 , -6849.72 , -64.32
+101.12 , -6360.45 , -59.79
+101.12 , -5871.19 , -55.24
+101.12 , -5381.92 , -50.68
+101.12 , -4892.66 , -46.11
+101.12 , -4403.39 , -41.51
+101.12 , -3914.12 , -36.91
+101.12 , -3424.86 , -32.29
+101.12 , -2935.59 , -27.66
+101.12 , -2446.33 , -23.01
+101.12 , -1957.06 , -18.35
+101.12 , -1467.80 , -13.67
+101.12 , -978.53 , -8.98
+101.12 , -489.27 , -4.27
+101.12 , -97.85 , -0.39
+101.12 , 86.63 , 1.43
+101.12 , 433.14 , 5.56
+101.12 , 866.29 , 10.69
+101.12 , 1299.43 , 15.84
+101.12 , 1732.57 , 21.00
+101.12 , 2165.72 , 26.17
+101.12 , 2598.86 , 31.36
+101.12 , 3032.00 , 36.56
+101.12 , 3465.15 , 41.77
+101.12 , 3898.29 , 47.01
+101.12 , 4331.43 , 52.25
+101.12 , 4764.58 , 57.51
+101.12 , 5197.72 , 62.79
+101.12 , 5630.86 , 68.08
+101.12 , 6064.01 , 73.38
+101.12 , 6497.15 , 78.70
+101.12 , 6930.29 , 84.03
+101.12 , 7363.44 , 89.38
+101.12 , 7796.58 , 94.74
+101.12 , 8229.72 , 100.12
+101.12 , 8662.87 , 105.51
+134.83 , -9785.31 , -121.86
+134.83 , -9296.05 , -115.91
+134.83 , -8806.78 , -109.94
+134.83 , -8317.52 , -103.95
+134.83 , -7828.25 , -97.94
+134.83 , -7338.98 , -91.91
+134.83 , -6849.72 , -85.87
+134.83 , -6360.45 , -79.81
+134.83 , -5871.19 , -73.73
+134.83 , -5381.92 , -67.63
+134.83 , -4892.66 , -61.51
+134.83 , -4403.39 , -55.37
+134.83 , -3914.12 , -49.21
+134.83 , -3424.86 , -43.04
+134.83 , -2935.59 , -36.85
+134.83 , -2446.33 , -30.64
+134.83 , -1957.06 , -24.41
+134.83 , -1467.80 , -18.16
+134.83 , -978.53 , -11.89
+134.83 , -489.27 , -5.59
+134.83 , -97.85 , -0.32
+134.83 , 86.63 , 1.99
+134.83 , 433.14 , 7.50
+134.83 , 866.29 , 14.34
+134.83 , 1299.43 , 21.19
+134.83 , 1732.57 , 28.05
+134.83 , 2165.72 , 34.94
+134.83 , 2598.86 , 41.84
+134.83 , 3032.00 , 48.76
+134.83 , 3465.15 , 55.70
+134.83 , 3898.29 , 62.66
+134.83 , 4331.43 , 69.63
+134.83 , 4764.58 , 76.63
+134.83 , 5197.72 , 83.65
+134.83 , 5630.86 , 90.68
+134.83 , 6064.01 , 97.73
+134.83 , 6497.15 , 104.80
+134.83 , 6930.29 , 111.90
+134.83 , 7363.44 , 119.00
+134.83 , 7796.58 , 126.13
+134.83 , 8229.72 , 133.28
+134.83 , 8662.87 , 140.44
+168.54 , -9785.31 , -152.18
+168.54 , -9296.05 , -144.75
+168.54 , -8806.78 , -137.29
+168.54 , -8317.52 , -129.81
+168.54 , -7828.25 , -122.31
+168.54 , -7338.98 , -114.78
+168.54 , -6849.72 , -107.23
+168.54 , -6360.45 , -99.65
+168.54 , -5871.19 , -92.05
+168.54 , -5381.92 , -84.42
+168.54 , -4892.66 , -76.77
+168.54 , -4403.39 , -69.10
+168.54 , -3914.12 , -61.41
+168.54 , -3424.86 , -53.69
+168.54 , -2935.59 , -45.94
+168.54 , -2446.33 , -38.17
+168.54 , -1957.06 , -30.38
+168.54 , -1467.80 , -22.57
+168.54 , -978.53 , -14.72
+168.54 , -489.27 , -6.84
+168.54 , -97.85 , 0.00
+168.54 , 86.63 , 2.61
+168.54 , 433.14 , 9.52
+168.54 , 866.29 , 18.06
+168.54 , 1299.43 , 26.62
+168.54 , 1732.57 , 35.19
+168.54 , 2165.72 , 43.79
+168.54 , 2598.86 , 52.42
+168.54 , 3032.00 , 61.07
+168.54 , 3465.15 , 69.74
+168.54 , 3898.29 , 78.43
+168.54 , 4331.43 , 87.15
+168.54 , 4764.58 , 95.90
+168.54 , 5197.72 , 104.67
+168.54 , 5630.86 , 113.46
+168.54 , 6064.01 , 122.28
+168.54 , 6497.15 , 131.12
+168.54 , 6930.29 , 139.99
+168.54 , 7363.44 , 148.88
+168.54 , 7796.58 , 157.79
+168.54 , 8229.72 , 166.73
+168.54 , 8662.87 , 175.69
+202.25 , -9785.31 , -182.19
+202.25 , -9296.05 , -173.29
+202.25 , -8806.78 , -164.37
+202.25 , -8317.52 , -155.42
+202.25 , -7828.25 , -146.44
+202.25 , -7338.98 , -137.42
+202.25 , -6849.72 , -128.38
+202.25 , -6360.45 , -119.30
+202.25 , -5871.19 , -110.20
+202.25 , -5381.92 , -101.06
+202.25 , -4892.66 , -91.89
+202.25 , -4403.39 , -82.70
+202.25 , -3914.12 , -73.47
+202.25 , -3424.86 , -64.21
+202.25 , -2935.59 , -54.93
+202.25 , -2446.33 , -45.61
+202.25 , -1957.06 , -36.26
+202.25 , -1467.80 , -26.87
+202.25 , -978.53 , -17.46
+202.25 , -489.27 , -7.98
+202.25 , -97.85 , 0.00
+202.25 , 86.63 , 3.29
+202.25 , 433.14 , 11.62
+202.25 , 866.29 , 21.88
+202.25 , 1299.43 , 32.14
+202.25 , 1732.57 , 42.44
+202.25 , 2165.72 , 52.76
+202.25 , 2598.86 , 63.11
+202.25 , 3032.00 , 73.49
+202.25 , 3465.15 , 83.91
+202.25 , 3898.29 , 94.35
+202.25 , 4331.43 , 104.82
+202.25 , 4764.58 , 115.33
+202.25 , 5197.72 , 125.87
+202.25 , 5630.86 , 136.43
+202.25 , 6064.01 , 147.03
+202.25 , 6497.15 , 157.66
+202.25 , 6930.29 , 168.32
+202.25 , 7363.44 , 179.01
+202.25 , 7796.58 , 189.74
+202.25 , 8229.72 , 200.49
+202.25 , 8662.87 , 211.27
+235.96 , -9785.31 , -211.85
+235.96 , -9296.05 , -201.52
+235.96 , -8806.78 , -191.16
+235.96 , -8317.52 , -180.75
+235.96 , -7828.25 , -170.31
+235.96 , -7338.98 , -159.83
+235.96 , -6849.72 , -149.31
+235.96 , -6360.45 , -138.75
+235.96 , -5871.19 , -128.16
+235.96 , -5381.92 , -117.52
+235.96 , -4892.66 , -106.85
+235.96 , -4403.39 , -96.14
+235.96 , -3914.12 , -85.39
+235.96 , -3424.86 , -74.61
+235.96 , -2935.59 , -63.78
+235.96 , -2446.33 , -52.92
+235.96 , -1957.06 , -42.02
+235.96 , -1467.80 , -31.07
+235.96 , -978.53 , -20.08
+235.96 , -489.27 , -9.00
+235.96 , -97.85 , 0.00
+235.96 , 86.63 , 4.05
+235.96 , 433.14 , 13.82
+235.96 , 866.29 , 25.80
+235.96 , 1299.43 , 37.78
+235.96 , 1732.57 , 49.79
+235.96 , 2165.72 , 61.84
+235.96 , 2598.86 , 73.93
+235.96 , 3032.00 , 86.05
+235.96 , 3465.15 , 98.22
+235.96 , 3898.29 , 110.42
+235.96 , 4331.43 , 122.66
+235.96 , 4764.58 , 134.94
+235.96 , 5197.72 , 147.26
+235.96 , 5630.86 , 159.61
+235.96 , 6064.01 , 172.01
+235.96 , 6497.15 , 184.44
+235.96 , 6930.29 , 196.92
+235.96 , 7363.44 , 209.43
+235.96 , 7796.58 , 221.98
+235.96 , 8229.72 , 234.57
+235.96 , 8662.87 , 247.19
+269.67 , -9785.31 , -241.15
+269.67 , -9296.05 , -229.41
+269.67 , -8806.78 , -217.63
+269.67 , -8317.52 , -205.79
+269.67 , -7828.25 , -193.91
+269.67 , -7338.98 , -181.98
+269.67 , -6849.72 , -170.01
+269.67 , -6360.45 , -157.99
+269.67 , -5871.19 , -145.91
+269.67 , -5381.92 , -133.80
+269.67 , -4892.66 , -121.63
+269.67 , -4403.39 , -109.42
+269.67 , -3914.12 , -97.16
+269.67 , -3424.86 , -84.85
+269.67 , -2935.59 , -72.50
+269.67 , -2446.33 , -60.10
+269.67 , -1957.06 , -47.65
+269.67 , -1467.80 , -35.14
+269.67 , -978.53 , -22.57
+269.67 , -489.27 , -9.88
+269.67 , -97.85 , 0.00
+269.67 , 86.63 , 4.88
+269.67 , 433.14 , 16.13
+269.67 , 866.29 , 29.83
+269.67 , 1299.43 , 43.53
+269.67 , 1732.57 , 57.27
+269.67 , 2165.72 , 71.06
+269.67 , 2598.86 , 84.89
+269.67 , 3032.00 , 98.76
+269.67 , 3465.15 , 112.68
+269.67 , 3898.29 , 126.65
+269.67 , 4331.43 , 140.67
+269.67 , 4764.58 , 154.74
+269.67 , 5197.72 , 168.85
+269.67 , 5630.86 , 183.01
+269.67 , 6064.01 , 197.22
+269.67 , 6497.15 , 211.48
+269.67 , 6930.29 , 225.78
+269.67 , 7363.44 , 240.13
+269.67 , 7796.58 , 254.53
+269.67 , 8229.72 , 268.97
+269.67 , 8662.87 , 283.46
+303.37 , -9785.31 , -270.09
+303.37 , -9296.05 , -256.96
+303.37 , -8806.78 , -243.78
+303.37 , -8317.52 , -230.53
+303.37 , -7828.25 , -217.23
+303.37 , -7338.98 , -203.87
+303.37 , -6849.72 , -190.46
+303.37 , -6360.45 , -176.98
+303.37 , -5871.19 , -163.45
+303.37 , -5381.92 , -149.87
+303.37 , -4892.66 , -136.22
+303.37 , -4403.39 , -122.52
+303.37 , -3914.12 , -108.76
+303.37 , -3424.86 , -94.94
+303.37 , -2935.59 , -81.06
+303.37 , -2446.33 , -67.13
+303.37 , -1957.06 , -53.13
+303.37 , -1467.80 , -39.07
+303.37 , -978.53 , -24.92
+303.37 , -489.27 , -10.59
+303.37 , -97.85 , 0.00
+303.37 , 86.63 , 5.80
+303.37 , 433.14 , 18.55
+303.37 , 866.29 , 33.99
+303.37 , 1299.43 , 49.42
+303.37 , 1732.57 , 64.90
+303.37 , 2165.72 , 80.42
+303.37 , 2598.86 , 96.00
+303.37 , 3032.00 , 111.63
+303.37 , 3465.15 , 127.32
+303.37 , 3898.29 , 143.07
+303.37 , 4331.43 , 158.88
+303.37 , 4764.58 , 174.74
+303.37 , 5197.72 , 190.66
+303.37 , 5630.86 , 206.64
+303.37 , 6064.01 , 222.68
+303.37 , 6497.15 , 238.77
+303.37 , 6930.29 , 254.92
+303.37 , 7363.44 , 271.13
+303.37 , 7796.58 , 287.40
+303.37 , 8229.72 , 303.72
+303.37 , 8662.87 , 320.10
+337.08 , -9785.31 , -298.63
+337.08 , -9296.05 , -284.14
+337.08 , -8806.78 , -269.58
+337.08 , -8317.52 , -254.95
+337.08 , -7828.25 , -240.25
+337.08 , -7338.98 , -225.48
+337.08 , -6849.72 , -210.64
+337.08 , -6360.45 , -195.74
+337.08 , -5871.19 , -180.76
+337.08 , -5381.92 , -165.71
+337.08 , -4892.66 , -150.60
+337.08 , -4403.39 , -135.42
+337.08 , -3914.12 , -120.16
+337.08 , -3424.86 , -104.84
+337.08 , -2935.59 , -89.45
+337.08 , -2446.33 , -73.99
+337.08 , -1957.06 , -58.45
+337.08 , -1467.80 , -42.83
+337.08 , -978.53 , -27.10
+337.08 , -489.27 , -11.12
+337.08 , -97.85 , 0.00
+337.08 , 86.63 , 6.80
+337.08 , 433.14 , 21.10
+337.08 , 866.29 , 38.29
+337.08 , 1299.43 , 55.46
+337.08 , 1732.57 , 72.67
+337.08 , 2165.72 , 89.94
+337.08 , 2598.86 , 107.27
+337.08 , 3032.00 , 124.67
+337.08 , 3465.15 , 142.14
+337.08 , 3898.29 , 159.68
+337.08 , 4331.43 , 177.29
+337.08 , 4764.58 , 194.96
+337.08 , 5197.72 , 212.70
+337.08 , 5630.86 , 230.52
+337.08 , 6064.01 , 248.40
+337.08 , 6497.15 , 266.35
+337.08 , 6930.29 , 284.37
+337.08 , 7363.44 , 302.45
+337.08 , 7796.58 , 320.61
+337.08 , 8229.72 , 338.83
+337.08 , 8662.87 , 357.12
+370.79 , -9785.31 , -326.77
+370.79 , -9296.05 , -310.94
+370.79 , -8806.78 , -295.03
+370.79 , -8317.52 , -279.03
+370.79 , -7828.25 , -262.95
+370.79 , -7338.98 , -246.79
+370.79 , -6849.72 , -230.55
+370.79 , -6360.45 , -214.22
+370.79 , -5871.19 , -197.81
+370.79 , -5381.92 , -181.33
+370.79 , -4892.66 , -164.76
+370.79 , -4403.39 , -148.10
+370.79 , -3914.12 , -131.37
+370.79 , -3424.86 , -114.55
+370.79 , -2935.59 , -97.65
+370.79 , -2446.33 , -80.67
+370.79 , -1957.06 , -63.59
+370.79 , -1467.80 , -46.42
+370.79 , -978.53 , -29.10
+370.79 , -489.27 , -11.41
+370.79 , -97.85 , 0.00
+370.79 , 86.63 , 7.90
+370.79 , 433.14 , 23.79
+370.79 , 866.29 , 42.74
+370.79 , 1299.43 , 61.65
+370.79 , 1732.57 , 80.61
+370.79 , 2165.72 , 99.63
+370.79 , 2598.86 , 118.73
+370.79 , 3032.00 , 137.91
+370.79 , 3465.15 , 157.16
+370.79 , 3898.29 , 176.50
+370.79 , 4331.43 , 195.91
+370.79 , 4764.58 , 215.41
+370.79 , 5197.72 , 234.99
+370.79 , 5630.86 , 254.65
+370.79 , 6064.01 , 274.39
+370.79 , 6497.15 , 294.21
+370.79 , 6930.29 , 314.12
+370.79 , 7363.44 , 334.10
+370.79 , 7796.58 , 354.16
+370.79 , 8229.72 , 374.31
+370.79 , 8662.87 , 394.53
+404.50 , -9785.31 , -354.49
+404.50 , -9296.05 , -337.34
+404.50 , -8806.78 , -320.10
+404.50 , -8317.52 , -302.75
+404.50 , -7828.25 , -285.32
+404.50 , -7338.98 , -267.78
+404.50 , -6849.72 , -250.15
+404.50 , -6360.45 , -232.43
+404.50 , -5871.19 , -214.60
+404.50 , -5381.92 , -196.69
+404.50 , -4892.66 , -178.67
+404.50 , -4403.39 , -160.56
+404.50 , -3914.12 , -142.36
+404.50 , -3424.86 , -124.05
+404.50 , -2935.59 , -105.65
+404.50 , -2446.33 , -87.15
+404.50 , -1957.06 , -68.54
+404.50 , -1467.80 , -49.80
+404.50 , -978.53 , -30.89
+404.50 , -489.27 , -11.43
+404.50 , -97.85 , 0.00
+404.50 , 86.63 , 9.08
+404.50 , 433.14 , 26.62
+404.50 , 866.29 , 47.35
+404.50 , 1299.43 , 68.02
+404.50 , 1732.57 , 88.72
+404.50 , 2165.72 , 109.51
+404.50 , 2598.86 , 130.38
+404.50 , 3032.00 , 151.34
+404.50 , 3465.15 , 172.39
+404.50 , 3898.29 , 193.53
+404.50 , 4331.43 , 214.77
+404.50 , 4764.58 , 236.11
+404.50 , 5197.72 , 257.53
+404.50 , 5630.86 , 279.05
+404.50 , 6064.01 , 300.67
+404.50 , 6497.15 , 322.38
+404.50 , 6930.29 , 344.19
+404.50 , 7363.44 , 366.08
+404.50 , 7796.58 , 388.08
+404.50 , 8229.72 , 410.16
+404.50 , 8662.87 , 432.34
+438.21 , -9785.31 , -381.77
+438.21 , -9296.05 , -363.33
+438.21 , -8806.78 , -344.77
+438.21 , -8317.52 , -326.11
+438.21 , -7828.25 , -307.33
+438.21 , -7338.98 , -288.45
+438.21 , -6849.72 , -269.45
+438.21 , -6360.45 , -250.33
+438.21 , -5871.19 , -231.11
+438.21 , -5381.92 , -211.78
+438.21 , -4892.66 , -192.34
+438.21 , -4403.39 , -172.78
+438.21 , -3914.12 , -153.11
+438.21 , -3424.86 , -133.33
+438.21 , -2935.59 , -113.43
+438.21 , -2446.33 , -93.42
+438.21 , -1957.06 , -73.27
+438.21 , -1467.80 , -52.98
+438.21 , -978.53 , -32.45
+438.21 , -489.27 , -11.12
+438.21 , -97.85 , 0.00
+438.21 , 86.63 , 10.37
+438.21 , 433.14 , 29.60
+438.21 , 866.29 , 52.14
+438.21 , 1299.43 , 74.56
+438.21 , 1732.57 , 97.03
+438.21 , 2165.72 , 119.58
+438.21 , 2598.86 , 142.23
+438.21 , 3032.00 , 164.98
+438.21 , 3465.15 , 187.84
+438.21 , 3898.29 , 210.80
+438.21 , 4331.43 , 233.87
+438.21 , 4764.58 , 257.05
+438.21 , 5197.72 , 280.34
+438.21 , 5630.86 , 303.74
+438.21 , 6064.01 , 327.25
+438.21 , 6497.15 , 350.87
+438.21 , 6930.29 , 374.59
+438.21 , 7363.44 , 398.42
+438.21 , 7796.58 , 422.36
+438.21 , 8229.72 , 446.41
+438.21 , 8662.87 , 470.57
+471.92 , -9785.31 , -408.59
+471.92 , -9296.05 , -388.88
+471.92 , -8806.78 , -369.04
+471.92 , -8317.52 , -349.08
+471.92 , -7828.25 , -328.98
+471.92 , -7338.98 , -308.76
+471.92 , -6849.72 , -288.41
+471.92 , -6360.45 , -267.93
+471.92 , -5871.19 , -247.32
+471.92 , -5381.92 , -226.59
+471.92 , -4892.66 , -205.73
+471.92 , -4403.39 , -184.73
+471.92 , -3914.12 , -163.61
+471.92 , -3424.86 , -142.36
+471.92 , -2935.59 , -120.97
+471.92 , -2446.33 , -99.45
+471.92 , -1957.06 , -77.77
+471.92 , -1467.80 , -55.91
+471.92 , -978.53 , -33.75
+471.92 , -489.27 , -10.40
+471.92 , -97.85 , 0.00
+471.92 , 86.63 , 11.76
+471.92 , 433.14 , 32.74
+471.92 , 866.29 , 57.10
+471.92 , 1299.43 , 81.29
+471.92 , 1732.57 , 105.53
+471.92 , 2165.72 , 129.86
+471.92 , 2598.86 , 154.29
+471.92 , 3032.00 , 178.85
+471.92 , 3465.15 , 203.52
+471.92 , 3898.29 , 228.31
+471.92 , 4331.43 , 253.23
+471.92 , 4764.58 , 278.27
+471.92 , 5197.72 , 303.44
+471.92 , 5630.86 , 328.73
+471.92 , 6064.01 , 354.14
+471.92 , 6497.15 , 379.68
+471.92 , 6930.29 , 405.34
+471.92 , 7363.44 , 431.13
+471.92 , 7796.58 , 457.03
+471.92 , 8229.72 , 483.07
+471.92 , 8662.87 , 509.22
+505.62 , -9785.31 , -434.93
+505.62 , -9296.05 , -413.98
+505.62 , -8806.78 , -392.88
+505.62 , -8317.52 , -371.64
+505.62 , -7828.25 , -350.25
+505.62 , -7338.98 , -328.71
+505.62 , -6849.72 , -307.03
+505.62 , -6360.45 , -285.20
+505.62 , -5871.19 , -263.22
+505.62 , -5381.92 , -241.10
+505.62 , -4892.66 , -218.83
+505.62 , -4403.39 , -196.41
+505.62 , -3914.12 , -173.85
+505.62 , -3424.86 , -151.13
+505.62 , -2935.59 , -128.26
+505.62 , -2446.33 , -105.23
+505.62 , -1957.06 , -82.02
+505.62 , -1467.80 , -58.59
+505.62 , -978.53 , -34.77
+505.62 , -489.27 , -9.14
+505.62 , -97.85 , 0.00
+505.62 , 86.63 , 13.25
+505.62 , 433.14 , 36.05
+505.62 , 866.29 , 62.25
+505.62 , 1299.43 , 88.23
+505.62 , 1732.57 , 114.25
+505.62 , 2165.72 , 140.36
+505.62 , 2598.86 , 166.59
+505.62 , 3032.00 , 192.95
+505.62 , 3465.15 , 219.45
+505.62 , 3898.29 , 246.08
+505.62 , 4331.43 , 272.86
+505.62 , 4764.58 , 299.77
+505.62 , 5197.72 , 326.82
+505.62 , 5630.86 , 354.02
+505.62 , 6064.01 , 381.35
+505.62 , 6497.15 , 408.83
+505.62 , 6930.29 , 436.45
+505.62 , 7363.44 , 464.20
+505.62 , 7796.58 , 492.10
+505.62 , 8229.72 , 520.14
+505.62 , 8662.87 , 548.31
+539.33 , -9785.31 , -460.78
+539.33 , -9296.05 , -438.62
+539.33 , -8806.78 , -416.28
+539.33 , -8317.52 , -393.78
+539.33 , -7828.25 , -371.11
+539.33 , -7338.98 , -348.28
+539.33 , -6849.72 , -325.28
+539.33 , -6360.45 , -302.11
+539.33 , -5871.19 , -278.78
+539.33 , -5381.92 , -255.29
+539.33 , -4892.66 , -231.62
+539.33 , -4403.39 , -207.79
+539.33 , -3914.12 , -183.79
+539.33 , -3424.86 , -159.62
+539.33 , -2935.59 , -135.27
+539.33 , -2446.33 , -110.74
+539.33 , -1957.06 , -85.99
+539.33 , -1467.80 , -60.98
+539.33 , -978.53 , -35.47
+539.33 , -489.27 , -7.05
+539.33 , -97.85 , 0.00
+539.33 , 86.63 , 14.84
+539.33 , 433.14 , 39.53
+539.33 , 866.29 , 67.60
+539.33 , 1299.43 , 95.38
+539.33 , 1732.57 , 123.18
+539.33 , 2165.72 , 151.09
+539.33 , 2598.86 , 179.12
+539.33 , 3032.00 , 207.30
+539.33 , 3465.15 , 235.63
+539.33 , 3898.29 , 264.12
+539.33 , 4331.43 , 292.76
+539.33 , 4764.58 , 321.56
+539.33 , 5197.72 , 350.51
+539.33 , 5630.86 , 379.63
+539.33 , 6064.01 , 408.90
+539.33 , 6497.15 , 438.33
+539.33 , 6930.29 , 467.92
+539.33 , 7363.44 , 497.67
+539.33 , 7796.58 , 527.57
+539.33 , 8229.72 , 557.64
+539.33 , 8662.87 , 587.85
+573.04 , -9785.31 , -486.12
+573.04 , -9296.05 , -462.76
+573.04 , -8806.78 , -439.22
+573.04 , -8317.52 , -415.48
+573.04 , -7828.25 , -391.56
+573.04 , -7338.98 , -367.45
+573.04 , -6849.72 , -343.15
+573.04 , -6360.45 , -318.67
+573.04 , -5871.19 , -294.00
+573.04 , -5381.92 , -269.14
+573.04 , -4892.66 , -244.09
+573.04 , -4403.39 , -218.86
+573.04 , -3914.12 , -193.44
+573.04 , -3424.86 , -167.82
+573.04 , -2935.59 , -142.00
+573.04 , -2446.33 , -115.96
+573.04 , -1957.06 , -89.67
+573.04 , -1467.80 , -63.06
+573.04 , -978.53 , -35.80
+573.04 , -489.27 , -3.22
+573.04 , -97.85 , 0.00
+573.04 , 86.63 , 16.54
+573.04 , 433.14 , 43.18
+573.04 , 866.29 , 73.16
+573.04 , 1299.43 , 102.75
+573.04 , 1732.57 , 132.35
+573.04 , 2165.72 , 162.06
+573.04 , 2598.86 , 191.91
+573.04 , 3032.00 , 221.91
+573.04 , 3465.15 , 252.09
+573.04 , 3898.29 , 282.44
+573.04 , 4331.43 , 312.96
+573.04 , 4764.58 , 343.65
+573.04 , 5197.72 , 374.52
+573.04 , 5630.86 , 405.57
+573.04 , 6064.01 , 436.80
+573.04 , 6497.15 , 468.20
+573.04 , 6930.29 , 499.78
+573.04 , 7363.44 , 531.53
+573.04 , 7796.58 , 563.46
+573.04 , 8229.72 , 595.57
+573.04 , 8662.87 , 627.85
+606.75 , -9785.31 , -510.93
+606.75 , -9296.05 , -486.40
+606.75 , -8806.78 , -461.67
+606.75 , -8317.52 , -436.72
+606.75 , -7828.25 , -411.56
+606.75 , -7338.98 , -386.20
+606.75 , -6849.72 , -360.62
+606.75 , -6360.45 , -334.84
+606.75 , -5871.19 , -308.84
+606.75 , -5381.92 , -282.64
+606.75 , -4892.66 , -256.22
+606.75 , -4403.39 , -229.60
+606.75 , -3914.12 , -202.76
+606.75 , -3424.86 , -175.70
+606.75 , -2935.59 , -148.41
+606.75 , -2446.33 , -120.87
+606.75 , -1957.06 , -93.04
+606.75 , -1467.80 , -64.80
+606.75 , -978.53 , -35.73
+606.75 , -489.27 , 0.00
+606.75 , -97.85 , 0.00
+606.75 , 86.63 , 18.35
+606.75 , 433.14 , 47.02
+606.75 , 866.29 , 78.93
+606.75 , 1299.43 , 110.35
+606.75 , 1732.57 , 141.76
+606.75 , 2165.72 , 173.28
+606.75 , 2598.86 , 204.95
+606.75 , 3032.00 , 236.80
+606.75 , 3465.15 , 268.83
+606.75 , 3898.29 , 301.04
+606.75 , 4331.43 , 333.46
+606.75 , 4764.58 , 366.06
+606.75 , 5197.72 , 398.86
+606.75 , 5630.86 , 431.86
+606.75 , 6064.01 , 465.05
+606.75 , 6497.15 , 498.44
+606.75 , 6930.29 , 532.03
+606.75 , 7363.44 , 565.81
+606.75 , 7796.58 , 599.79
+606.75 , 8229.72 , 633.96
+606.75 , 8662.87 , 668.33
+640.46 , -9785.31 , -535.19
+640.46 , -9296.05 , -509.52
+640.46 , -8806.78 , -483.62
+640.46 , -8317.52 , -457.48
+640.46 , -7828.25 , -431.11
+640.46 , -7338.98 , -404.51
+640.46 , -6849.72 , -377.67
+640.46 , -6360.45 , -350.60
+640.46 , -5871.19 , -323.30
+640.46 , -5381.92 , -295.76
+640.46 , -4892.66 , -267.99
+640.46 , -4403.39 , -239.99
+640.46 , -3914.12 , -211.74
+640.46 , -3424.86 , -183.24
+640.46 , -2935.59 , -154.48
+640.46 , -2446.33 , -125.44
+640.46 , -1957.06 , -96.05
+640.46 , -1467.80 , -66.18
+640.46 , -978.53 , -35.19
+640.46 , -489.27 , 0.00
+640.46 , -97.85 , 0.00
+640.46 , 86.63 , 20.27
+640.46 , 433.14 , 51.05
+640.46 , 866.29 , 84.92
+640.46 , 1299.43 , 118.19
+640.46 , 1732.57 , 151.42
+640.46 , 2165.72 , 184.76
+640.46 , 2598.86 , 218.27
+640.46 , 3032.00 , 251.96
+640.46 , 3465.15 , 285.86
+640.46 , 3898.29 , 319.96
+640.46 , 4331.43 , 354.27
+640.46 , 4764.58 , 388.80
+640.46 , 5197.72 , 423.54
+640.46 , 5630.86 , 458.50
+640.46 , 6064.01 , 493.68
+640.46 , 6497.15 , 529.07
+640.46 , 6930.29 , 564.68
+640.46 , 7363.44 , 600.51
+640.46 , 7796.58 , 636.55
+640.46 , 8229.72 , 672.81
+640.46 , 8662.87 , 709.28
+674.17 , -9785.31 , -558.87
+674.17 , -9296.05 , -532.09
+674.17 , -8806.78 , -505.05
+674.17 , -8317.52 , -477.75
+674.17 , -7828.25 , -450.19
+674.17 , -7338.98 , -422.37
+674.17 , -6849.72 , -394.29
+674.17 , -6360.45 , -365.95
+674.17 , -5871.19 , -337.36
+674.17 , -5381.92 , -308.50
+674.17 , -4892.66 , -279.38
+674.17 , -4403.39 , -250.00
+674.17 , -3914.12 , -220.35
+674.17 , -3424.86 , -190.43
+674.17 , -2935.59 , -160.20
+674.17 , -2446.33 , -129.65
+674.17 , -1957.06 , -98.70
+674.17 , -1467.80 , -67.15
+674.17 , -978.53 , -34.12
+674.17 , -489.27 , 0.00
+674.17 , -97.85 , 0.00
+674.17 , 86.63 , 22.30
+674.17 , 433.14 , 55.27
+674.17 , 866.29 , 91.14
+674.17 , 1299.43 , 126.27
+674.17 , 1732.57 , 161.34
+674.17 , 2165.72 , 196.52
+674.17 , 2598.86 , 231.87
+674.17 , 3032.00 , 267.42
+674.17 , 3465.15 , 303.19
+674.17 , 3898.29 , 339.18
+674.17 , 4331.43 , 375.41
+674.17 , 4764.58 , 411.87
+674.17 , 5197.72 , 448.57
+674.17 , 5630.86 , 485.51
+674.17 , 6064.01 , 522.68
+674.17 , 6497.15 , 560.09
+674.17 , 6930.29 , 597.75
+674.17 , 7363.44 , 635.63
+674.17 , 7796.58 , 673.76
+674.17 , 8229.72 , 712.12
+674.17 , 8662.87 , 750.73
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..cf325529f23837579dfd10ebea1c609e97a60f77
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 8662.87 , -9785.31
+3.34 , 8662.87 , -9785.31
+33.72 , 8662.87 , -9785.31
+67.45 , 8662.87 , -9785.31
+101.09 , 8662.87 , -9785.31
+134.82 , 8662.87 , -9785.31
+168.54 , 8662.87 , -9785.31
+202.26 , 7219.06 , -8154.43
+235.99 , 6187.71 , -6989.45
+269.63 , 5414.29 , -6115.82
+303.36 , 4812.74 , -5436.33
+337.08 , 4331.43 , -4892.66
+370.80 , 3937.68 , -4447.88
+404.53 , 3609.53 , -4077.21
+438.17 , 3331.85 , -3763.56
+471.90 , 3093.91 , -3494.79
+505.62 , 2887.62 , -3261.77
+539.35 , 2707.20 , -3057.98
+573.07 , 2547.92 , -2878.06
+606.71 , 2406.31 , -2718.10
+640.44 , 2279.72 , -2575.10
+674.16 , 2165.72 , -2446.33
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..cf325529f23837579dfd10ebea1c609e97a60f77
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 8662.87 , -9785.31
+3.34 , 8662.87 , -9785.31
+33.72 , 8662.87 , -9785.31
+67.45 , 8662.87 , -9785.31
+101.09 , 8662.87 , -9785.31
+134.82 , 8662.87 , -9785.31
+168.54 , 8662.87 , -9785.31
+202.26 , 7219.06 , -8154.43
+235.99 , 6187.71 , -6989.45
+269.63 , 5414.29 , -6115.82
+303.36 , 4812.74 , -5436.33
+337.08 , 4331.43 , -4892.66
+370.80 , 3937.68 , -4447.88
+404.53 , 3609.53 , -4077.21
+438.17 , 3331.85 , -3763.56
+471.90 , 3093.91 , -3494.79
+505.62 , 2887.62 , -3261.77
+539.35 , 2707.20 , -3057.98
+573.07 , 2547.92 , -2878.06
+606.71 , 2406.31 , -2718.10
+640.44 , 2279.72 , -2575.10
+674.16 , 2165.72 , -2446.33
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..02b9cfdf04fa8e9596deed86f2453d35136592f2
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -18.72
+3.37 , -19.31
+33.71 , -24.79
+67.42 , -30.86
+101.12 , -36.92
+134.83 , -43.06
+168.54 , -49.12
+202.25 , -55.19
+235.96 , -61.26
+269.67 , -67.32
+303.37 , -73.46
+337.08 , -79.52
+370.79 , -85.59
+404.50 , -91.66
+438.21 , -97.72
+471.92 , -103.85
+505.62 , -109.92
+539.33 , -115.99
+573.04 , -122.06
+606.75 , -128.12
+640.46 , -134.25
+674.17 , -140.32
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/GenericIEPC_Gbx1Whl2.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/GenericIEPC_Gbx1Whl2.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..77bb834401f33bc4b2a25ae51ca8f4a67a6b6d51
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/GenericIEPC_Gbx1Whl2.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 2,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 12.276
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 13860.59,
+ "ContinuousTorqueSpeed": 166.99,
+ "OverloadTorque": 16517.20,
+ "OverloadTorqueSpeed": 166.01,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1Whl2_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl2.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 15015.63,
+ "ContinuousTorqueSpeed": 168.62,
+ "OverloadTorque": 17325.73,
+ "OverloadTorqueSpeed": 170.17,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1Whl2_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl2.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1Whl2_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..d24e3cc1fb92ddfdcc8135e45d96e4c10c58e6e2
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1Whl2.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_ENG_Gbx1Whl2.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_ENG_Gbx1Whl2.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..588039a710bb50e1812a6280716bfd2d173aa006
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_ENG_Gbx1Whl2.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx1Whl2.vveh",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..07eb40e197c27c23aea5f69c3200e3b799688102
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -37.45
+3.37 , -38.62
+33.71 , -49.58
+67.42 , -61.71
+101.12 , -73.85
+134.83 , -86.11
+168.54 , -98.24
+202.25 , -110.38
+235.96 , -122.51
+269.67 , -134.65
+303.37 , -146.91
+337.08 , -159.04
+370.79 , -171.18
+404.50 , -183.31
+438.21 , -195.45
+471.92 , -207.71
+505.62 , -219.84
+539.33 , -231.98
+573.04 , -244.11
+606.75 , -256.24
+640.46 , -268.51
+674.17 , -280.64
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/Axle_4x2_Tractor.vtlm b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/Axle_4x2_Tractor.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..e11cbf7cdde175e06ab8f6a0b79d46b84b3e0c1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/Axle_4x2_Tractor.vtlm
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/Axlegear.vgbx b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/Axlegear.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..8c4b5d9467fc9de8c168253de67633e521e24a0f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/Axlegear.vgbx
@@ -0,0 +1,33 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-11-03T14:19:09.9858299Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "3_speed_AMT",
+ "Inertia": 0.0,
+ "TracInt": 0.8,
+ "Gears": [
+ {
+ "Ratio": 2.64,
+ "LossMap": "Axle_4x2_Tractor.vtlm"
+ }
+ ],
+ "TqReserve": 0.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.22222222222222,
+ "StartAcc": 0.8,
+ "GearboxType": "AMT",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAfterUpshiftDelay": 6.0,
+ "UpshiftAfterDownshiftDelay": 6.0,
+ "UpshiftMinAcceleration": 0.1,
+ "PowershiftShiftTime": 0.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/GenericIEPC_Gbx1.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/GenericIEPC_Gbx1.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..8fcddfd0904b8b3f8c53039ee4aa55372733a70b
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/GenericIEPC_Gbx1.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 4.65
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 5412.60,
+ "ContinuousTorqueSpeed": 440.86,
+ "OverloadTorque": 6450.02,
+ "OverloadTorqueSpeed": 438.28,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 5863.65,
+ "ContinuousTorqueSpeed": 445.16,
+ "OverloadTorque": 6765.75,
+ "OverloadTorqueSpeed": 449.25,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..304087ef77a7bc0228d3cc739fd662c7b0c325c6
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPC_ENG_Gbx1.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPC_ENG_Gbx1.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..cbac5f5b98ffd3ea3898e10e3c21a2bdefb0fd8b
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPC_ENG_Gbx1.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx1.vveh",
+ "GearboxFile": "Axlegear.vgbx",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..e4be1e22ede233c40afa5a00eeb1292d2cad8f78
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -7190.72 , 0.00
+0.00 , -6831.19 , 0.00
+0.00 , -6471.65 , 0.00
+0.00 , -6112.11 , 0.00
+0.00 , -5752.58 , 0.00
+0.00 , -5393.04 , 0.00
+0.00 , -5033.51 , -0.13
+0.00 , -4673.97 , -0.66
+0.00 , -4314.43 , -0.98
+0.00 , -3954.90 , -1.19
+0.00 , -3595.36 , -1.32
+0.00 , -3235.82 , -1.38
+0.00 , -2876.29 , -1.39
+0.00 , -2516.75 , -1.35
+0.00 , -2157.22 , -1.26
+0.00 , -1797.68 , -1.13
+0.00 , -1438.14 , -0.97
+0.00 , -1078.61 , -0.77
+0.00 , -719.07 , -0.53
+0.00 , -359.54 , -0.27
+0.00 , -71.91 , -0.02
+0.00 , 67.66 , 0.13
+0.00 , 338.29 , 0.56
+0.00 , 676.58 , 1.12
+0.00 , 1014.86 , 1.70
+0.00 , 1353.15 , 2.31
+0.00 , 1691.44 , 2.93
+0.00 , 2029.73 , 3.58
+0.00 , 2368.01 , 4.25
+0.00 , 2706.30 , 4.93
+0.00 , 3044.59 , 5.64
+0.00 , 3382.88 , 6.37
+0.00 , 3721.16 , 7.12
+0.00 , 4059.45 , 7.88
+0.00 , 4397.74 , 8.67
+0.00 , 4736.03 , 9.47
+0.00 , 5074.31 , 10.29
+0.00 , 5412.60 , 11.13
+0.00 , 5750.89 , 11.99
+0.00 , 6089.18 , 12.87
+0.00 , 6427.46 , 13.76
+0.00 , 6765.75 , 14.67
+8.90 , -7190.72 , 0.00
+8.90 , -6831.19 , 0.00
+8.90 , -6471.65 , 0.00
+8.90 , -6112.11 , 0.00
+8.90 , -5752.58 , 0.00
+8.90 , -5393.04 , 0.00
+8.90 , -5033.51 , -0.50
+8.90 , -4673.97 , -0.84
+8.90 , -4314.43 , -1.04
+8.90 , -3954.90 , -1.16
+8.90 , -3595.36 , -1.22
+8.90 , -3235.82 , -1.24
+8.90 , -2876.29 , -1.21
+8.90 , -2516.75 , -1.15
+8.90 , -2157.22 , -1.06
+8.90 , -1797.68 , -0.94
+8.90 , -1438.14 , -0.80
+8.90 , -1078.61 , -0.62
+8.90 , -719.07 , -0.43
+8.90 , -359.54 , -0.21
+8.90 , -71.91 , -0.02
+8.90 , 67.66 , 0.10
+8.90 , 338.29 , 0.43
+8.90 , 676.58 , 0.85
+8.90 , 1014.86 , 1.30
+8.90 , 1353.15 , 1.75
+8.90 , 1691.44 , 2.23
+8.90 , 2029.73 , 2.71
+8.90 , 2368.01 , 3.21
+8.90 , 2706.30 , 3.73
+8.90 , 3044.59 , 4.26
+8.90 , 3382.88 , 4.80
+8.90 , 3721.16 , 5.36
+8.90 , 4059.45 , 5.93
+8.90 , 4397.74 , 6.52
+8.90 , 4736.03 , 7.12
+8.90 , 5074.31 , 7.73
+8.90 , 5412.60 , 8.35
+8.90 , 5750.89 , 8.99
+8.90 , 6089.18 , 9.64
+8.90 , 6427.46 , 10.30
+8.90 , 6765.75 , 10.98
+88.99 , -7190.72 , -58.10
+88.99 , -6831.19 , -55.37
+88.99 , -6471.65 , -52.62
+88.99 , -6112.11 , -49.85
+88.99 , -5752.58 , -47.06
+88.99 , -5393.04 , -44.25
+88.99 , -5033.51 , -41.42
+88.99 , -4673.97 , -38.57
+88.99 , -4314.43 , -35.70
+88.99 , -3954.90 , -32.81
+88.99 , -3595.36 , -29.90
+88.99 , -3235.82 , -26.98
+88.99 , -2876.29 , -24.03
+88.99 , -2516.75 , -21.07
+88.99 , -2157.22 , -18.08
+88.99 , -1797.68 , -15.08
+88.99 , -1438.14 , -12.06
+88.99 , -1078.61 , -9.02
+88.99 , -719.07 , -5.96
+88.99 , -359.54 , -2.88
+88.99 , -71.91 , -0.37
+88.99 , 67.66 , 0.90
+88.99 , 338.29 , 3.68
+88.99 , 676.58 , 7.16
+88.99 , 1014.86 , 10.66
+88.99 , 1353.15 , 14.17
+88.99 , 1691.44 , 17.71
+88.99 , 2029.73 , 21.26
+88.99 , 2368.01 , 24.84
+88.99 , 2706.30 , 28.43
+88.99 , 3044.59 , 32.04
+88.99 , 3382.88 , 35.67
+88.99 , 3721.16 , 39.32
+88.99 , 4059.45 , 42.99
+88.99 , 4397.74 , 46.68
+88.99 , 4736.03 , 50.38
+88.99 , 5074.31 , 54.11
+88.99 , 5412.60 , 57.85
+88.99 , 5750.89 , 61.61
+88.99 , 6089.18 , 65.39
+88.99 , 6427.46 , 69.19
+88.99 , 6765.75 , 73.01
+177.98 , -7190.72 , -120.57
+177.98 , -6831.19 , -114.73
+177.98 , -6471.65 , -108.87
+177.98 , -6112.11 , -102.99
+177.98 , -5752.58 , -97.08
+177.98 , -5393.04 , -91.15
+177.98 , -5033.51 , -85.20
+177.98 , -4673.97 , -79.23
+177.98 , -4314.43 , -73.23
+177.98 , -3954.90 , -67.21
+177.98 , -3595.36 , -61.17
+177.98 , -3235.82 , -55.10
+177.98 , -2876.29 , -49.01
+177.98 , -2516.75 , -42.90
+177.98 , -2157.22 , -36.77
+177.98 , -1797.68 , -30.61
+177.98 , -1438.14 , -24.43
+177.98 , -1078.61 , -18.23
+177.98 , -719.07 , -12.01
+177.98 , -359.54 , -5.76
+177.98 , -71.91 , -0.66
+177.98 , 67.66 , 1.84
+177.98 , 338.29 , 7.35
+177.98 , 676.58 , 14.22
+177.98 , 1014.86 , 21.11
+177.98 , 1353.15 , 28.02
+177.98 , 1691.44 , 34.96
+177.98 , 2029.73 , 41.92
+177.98 , 2368.01 , 48.90
+177.98 , 2706.30 , 55.90
+177.98 , 3044.59 , 62.93
+177.98 , 3382.88 , 69.98
+177.98 , 3721.16 , 77.05
+177.98 , 4059.45 , 84.15
+177.98 , 4397.74 , 91.27
+177.98 , 4736.03 , 98.41
+177.98 , 5074.31 , 105.58
+177.98 , 5412.60 , 112.76
+177.98 , 5750.89 , 119.97
+177.98 , 6089.18 , 127.21
+177.98 , 6427.46 , 134.46
+177.98 , 6765.75 , 141.74
+266.97 , -7190.72 , -182.44
+266.97 , -6831.19 , -173.55
+266.97 , -6471.65 , -164.62
+266.97 , -6112.11 , -155.67
+266.97 , -5752.58 , -146.69
+266.97 , -5393.04 , -137.68
+266.97 , -5033.51 , -128.65
+266.97 , -4673.97 , -119.58
+266.97 , -4314.43 , -110.49
+266.97 , -3954.90 , -101.36
+266.97 , -3595.36 , -92.21
+266.97 , -3235.82 , -83.03
+266.97 , -2876.29 , -73.82
+266.97 , -2516.75 , -64.58
+266.97 , -2157.22 , -55.31
+266.97 , -1797.68 , -46.02
+266.97 , -1438.14 , -36.70
+266.97 , -1078.61 , -27.34
+266.97 , -719.07 , -17.96
+266.97 , -359.54 , -8.54
+266.97 , -71.91 , -0.79
+266.97 , 67.66 , 2.86
+266.97 , 338.29 , 11.12
+266.97 , 676.58 , 21.39
+266.97 , 1014.86 , 31.68
+266.97 , 1353.15 , 41.99
+266.97 , 1691.44 , 52.34
+266.97 , 2029.73 , 62.71
+266.97 , 2368.01 , 73.12
+266.97 , 2706.30 , 83.55
+266.97 , 3044.59 , 94.01
+266.97 , 3382.88 , 104.50
+266.97 , 3721.16 , 115.02
+266.97 , 4059.45 , 125.57
+266.97 , 4397.74 , 136.15
+266.97 , 4736.03 , 146.76
+266.97 , 5074.31 , 157.40
+266.97 , 5412.60 , 168.06
+266.97 , 5750.89 , 178.76
+266.97 , 6089.18 , 189.48
+266.97 , 6427.46 , 200.23
+266.97 , 6765.75 , 211.02
+355.96 , -7190.72 , -243.71
+355.96 , -6831.19 , -231.81
+355.96 , -6471.65 , -219.87
+355.96 , -6112.11 , -207.89
+355.96 , -5752.58 , -195.88
+355.96 , -5393.04 , -183.83
+355.96 , -5033.51 , -171.74
+355.96 , -4673.97 , -159.61
+355.96 , -4314.43 , -147.45
+355.96 , -3954.90 , -135.25
+355.96 , -3595.36 , -123.01
+355.96 , -3235.82 , -110.74
+355.96 , -2876.29 , -98.43
+355.96 , -2516.75 , -86.08
+355.96 , -2157.22 , -73.70
+355.96 , -1797.68 , -61.27
+355.96 , -1438.14 , -48.82
+355.96 , -1078.61 , -36.32
+355.96 , -719.07 , -23.78
+355.96 , -359.54 , -11.19
+355.96 , -71.91 , -0.63
+355.96 , 67.66 , 3.98
+355.96 , 338.29 , 15.01
+355.96 , 676.58 , 28.68
+355.96 , 1014.86 , 42.37
+355.96 , 1353.15 , 56.10
+355.96 , 1691.44 , 69.87
+355.96 , 2029.73 , 83.67
+355.96 , 2368.01 , 97.52
+355.96 , 2706.30 , 111.40
+355.96 , 3044.59 , 125.31
+355.96 , 3382.88 , 139.27
+355.96 , 3721.16 , 153.26
+355.96 , 4059.45 , 167.29
+355.96 , 4397.74 , 181.36
+355.96 , 4736.03 , 195.46
+355.96 , 5074.31 , 209.61
+355.96 , 5412.60 , 223.79
+355.96 , 5750.89 , 238.01
+355.96 , 6089.18 , 252.26
+355.96 , 6427.46 , 266.56
+355.96 , 6765.75 , 280.89
+444.95 , -7190.72 , -304.37
+444.95 , -6831.19 , -289.50
+444.95 , -6471.65 , -274.59
+444.95 , -6112.11 , -259.63
+444.95 , -5752.58 , -244.61
+444.95 , -5393.04 , -229.56
+444.95 , -5033.51 , -214.45
+444.95 , -4673.97 , -199.30
+444.95 , -4314.43 , -184.10
+444.95 , -3954.90 , -168.85
+444.95 , -3595.36 , -153.55
+444.95 , -3235.82 , -138.20
+444.95 , -2876.29 , -122.81
+444.95 , -2516.75 , -107.37
+444.95 , -2157.22 , -91.88
+444.95 , -1797.68 , -76.35
+444.95 , -1438.14 , -60.76
+444.95 , -1078.61 , -45.13
+444.95 , -719.07 , -29.44
+444.95 , -359.54 , -13.67
+444.95 , -71.91 , 0.00
+444.95 , 67.66 , 5.21
+444.95 , 338.29 , 19.04
+444.95 , 676.58 , 36.13
+444.95 , 1014.86 , 53.24
+444.95 , 1353.15 , 70.39
+444.95 , 1691.44 , 87.59
+444.95 , 2029.73 , 104.83
+444.95 , 2368.01 , 122.13
+444.95 , 2706.30 , 139.47
+444.95 , 3044.59 , 156.87
+444.95 , 3382.88 , 174.31
+444.95 , 3721.16 , 191.80
+444.95 , 4059.45 , 209.33
+444.95 , 4397.74 , 226.92
+444.95 , 4736.03 , 244.56
+444.95 , 5074.31 , 262.24
+444.95 , 5412.60 , 279.97
+444.95 , 5750.89 , 297.76
+444.95 , 6089.18 , 315.58
+444.95 , 6427.46 , 333.46
+444.95 , 6765.75 , 351.39
+533.94 , -7190.72 , -364.37
+533.94 , -6831.19 , -346.59
+533.94 , -6471.65 , -328.74
+533.94 , -6112.11 , -310.84
+533.94 , -5752.58 , -292.87
+533.94 , -5393.04 , -274.84
+533.94 , -5033.51 , -256.75
+533.94 , -4673.97 , -238.60
+533.94 , -4314.43 , -220.39
+533.94 , -3954.90 , -202.12
+533.94 , -3595.36 , -183.79
+533.94 , -3235.82 , -165.40
+533.94 , -2876.29 , -146.94
+533.94 , -2516.75 , -128.43
+533.94 , -2157.22 , -109.85
+533.94 , -1797.68 , -91.21
+533.94 , -1438.14 , -72.51
+533.94 , -1078.61 , -53.75
+533.94 , -719.07 , -34.91
+533.94 , -359.54 , -15.95
+533.94 , -71.91 , 0.00
+533.94 , 67.66 , 6.58
+533.94 , 338.29 , 23.25
+533.94 , 676.58 , 43.76
+533.94 , 1014.86 , 64.29
+533.94 , 1353.15 , 84.87
+533.94 , 1691.44 , 105.52
+533.94 , 2029.73 , 126.22
+533.94 , 2368.01 , 146.98
+533.94 , 2706.30 , 167.81
+533.94 , 3044.59 , 188.70
+533.94 , 3382.88 , 209.65
+533.94 , 3721.16 , 230.66
+533.94 , 4059.45 , 251.73
+533.94 , 4397.74 , 272.87
+533.94 , 4736.03 , 294.07
+533.94 , 5074.31 , 315.33
+533.94 , 5412.60 , 336.65
+533.94 , 5750.89 , 358.03
+533.94 , 6089.18 , 379.47
+533.94 , 6427.46 , 400.98
+533.94 , 6765.75 , 422.54
+622.93 , -7190.72 , -423.69
+622.93 , -6831.19 , -403.04
+622.93 , -6471.65 , -382.31
+622.93 , -6112.11 , -361.50
+622.93 , -5752.58 , -340.62
+622.93 , -5393.04 , -319.66
+622.93 , -5033.51 , -298.62
+622.93 , -4673.97 , -277.51
+622.93 , -4314.43 , -256.31
+622.93 , -3954.90 , -235.05
+622.93 , -3595.36 , -213.70
+622.93 , -3235.82 , -192.28
+622.93 , -2876.29 , -170.79
+622.93 , -2516.75 , -149.21
+622.93 , -2157.22 , -127.57
+622.93 , -1797.68 , -105.84
+622.93 , -1438.14 , -84.03
+622.93 , -1078.61 , -62.14
+622.93 , -719.07 , -40.16
+622.93 , -359.54 , -18.00
+622.93 , -71.91 , 0.00
+622.93 , 67.66 , 8.09
+622.93 , 338.29 , 27.64
+622.93 , 676.58 , 51.59
+622.93 , 1014.86 , 75.56
+622.93 , 1353.15 , 99.58
+622.93 , 1691.44 , 123.68
+622.93 , 2029.73 , 147.86
+622.93 , 2368.01 , 172.10
+622.93 , 2706.30 , 196.43
+622.93 , 3044.59 , 220.84
+622.93 , 3382.88 , 245.32
+622.93 , 3721.16 , 269.88
+622.93 , 4059.45 , 294.51
+622.93 , 4397.74 , 319.23
+622.93 , 4736.03 , 344.02
+622.93 , 5074.31 , 368.89
+622.93 , 5412.60 , 393.83
+622.93 , 5750.89 , 418.85
+622.93 , 6089.18 , 443.95
+622.93 , 6427.46 , 469.13
+622.93 , 6765.75 , 494.38
+711.92 , -7190.72 , -482.31
+711.92 , -6831.19 , -458.83
+711.92 , -6471.65 , -435.26
+711.92 , -6112.11 , -411.59
+711.92 , -5752.58 , -387.83
+711.92 , -5393.04 , -363.97
+711.92 , -5033.51 , -340.02
+711.92 , -4673.97 , -315.97
+711.92 , -4314.43 , -291.83
+711.92 , -3954.90 , -267.59
+711.92 , -3595.36 , -243.26
+711.92 , -3235.82 , -218.84
+711.92 , -2876.29 , -194.32
+711.92 , -2516.75 , -169.71
+711.92 , -2157.22 , -145.00
+711.92 , -1797.68 , -120.19
+711.92 , -1438.14 , -95.29
+711.92 , -1078.61 , -70.28
+711.92 , -719.07 , -45.14
+711.92 , -359.54 , -19.76
+711.92 , -71.91 , 0.00
+711.92 , 67.66 , 9.76
+711.92 , 338.29 , 32.25
+711.92 , 676.58 , 59.66
+711.92 , 1014.86 , 87.07
+711.92 , 1353.15 , 114.55
+711.92 , 1691.44 , 142.11
+711.92 , 2029.73 , 169.77
+711.92 , 2368.01 , 197.52
+711.92 , 2706.30 , 225.37
+711.92 , 3044.59 , 253.31
+711.92 , 3382.88 , 281.34
+711.92 , 3721.16 , 309.47
+711.92 , 4059.45 , 337.70
+711.92 , 4397.74 , 366.02
+711.92 , 4736.03 , 394.44
+711.92 , 5074.31 , 422.95
+711.92 , 5412.60 , 451.56
+711.92 , 5750.89 , 480.26
+711.92 , 6089.18 , 509.05
+711.92 , 6427.46 , 537.94
+711.92 , 6765.75 , 566.93
+800.91 , -7190.72 , -540.17
+800.91 , -6831.19 , -513.92
+800.91 , -6471.65 , -487.55
+800.91 , -6112.11 , -461.06
+800.91 , -5752.58 , -434.46
+800.91 , -5393.04 , -407.75
+800.91 , -5033.51 , -380.92
+800.91 , -4673.97 , -353.97
+800.91 , -4314.43 , -326.91
+800.91 , -3954.90 , -299.73
+800.91 , -3595.36 , -272.44
+800.91 , -3235.82 , -245.03
+800.91 , -2876.29 , -217.51
+800.91 , -2516.75 , -189.87
+800.91 , -2157.22 , -162.12
+800.91 , -1797.68 , -134.25
+800.91 , -1438.14 , -106.26
+800.91 , -1078.61 , -78.13
+800.91 , -719.07 , -49.84
+800.91 , -359.54 , -21.19
+800.91 , -71.91 , 0.00
+800.91 , 67.66 , 11.59
+800.91 , 338.29 , 37.10
+800.91 , 676.58 , 67.98
+800.91 , 1014.86 , 98.85
+800.91 , 1353.15 , 129.79
+800.91 , 1691.44 , 160.84
+800.91 , 2029.73 , 191.99
+800.91 , 2368.01 , 223.26
+800.91 , 2706.30 , 254.64
+800.91 , 3044.59 , 286.14
+800.91 , 3382.88 , 317.75
+800.91 , 3721.16 , 349.48
+800.91 , 4059.45 , 381.32
+800.91 , 4397.74 , 413.28
+800.91 , 4736.03 , 445.36
+800.91 , 5074.31 , 477.54
+800.91 , 5412.60 , 509.85
+800.91 , 5750.89 , 542.27
+800.91 , 6089.18 , 574.80
+800.91 , 6427.46 , 607.45
+800.91 , 6765.75 , 640.21
+889.90 , -7190.72 , -597.26
+889.90 , -6831.19 , -568.28
+889.90 , -6471.65 , -539.16
+889.90 , -6112.11 , -509.90
+889.90 , -5752.58 , -480.50
+889.90 , -5393.04 , -450.96
+889.90 , -5033.51 , -421.28
+889.90 , -4673.97 , -391.47
+889.90 , -4314.43 , -361.52
+889.90 , -3954.90 , -331.43
+889.90 , -3595.36 , -301.20
+889.90 , -3235.82 , -270.83
+889.90 , -2876.29 , -240.33
+889.90 , -2516.75 , -209.68
+889.90 , -2157.22 , -178.90
+889.90 , -1797.68 , -147.97
+889.90 , -1438.14 , -116.90
+889.90 , -1078.61 , -85.66
+889.90 , -719.07 , -54.21
+889.90 , -359.54 , -22.23
+889.90 , -71.91 , 0.00
+889.90 , 67.66 , 13.60
+889.90 , 338.29 , 42.20
+889.90 , 676.58 , 76.58
+889.90 , 1014.86 , 110.92
+889.90 , 1353.15 , 145.34
+889.90 , 1691.44 , 179.88
+889.90 , 2029.73 , 214.55
+889.90 , 2368.01 , 249.35
+889.90 , 2706.30 , 284.29
+889.90 , 3044.59 , 319.36
+889.90 , 3382.88 , 354.57
+889.90 , 3721.16 , 389.92
+889.90 , 4059.45 , 425.41
+889.90 , 4397.74 , 461.03
+889.90 , 4736.03 , 496.79
+889.90 , 5074.31 , 532.69
+889.90 , 5412.60 , 568.73
+889.90 , 5750.89 , 604.90
+889.90 , 6089.18 , 641.21
+889.90 , 6427.46 , 677.66
+889.90 , 6765.75 , 714.24
+978.89 , -7190.72 , -653.54
+978.89 , -6831.19 , -621.88
+978.89 , -6471.65 , -590.05
+978.89 , -6112.11 , -558.06
+978.89 , -5752.58 , -525.90
+978.89 , -5393.04 , -493.58
+978.89 , -5033.51 , -461.09
+978.89 , -4673.97 , -428.44
+978.89 , -4314.43 , -395.63
+978.89 , -3954.90 , -362.65
+978.89 , -3595.36 , -329.51
+978.89 , -3235.82 , -296.21
+978.89 , -2876.29 , -262.74
+978.89 , -2516.75 , -229.11
+978.89 , -2157.22 , -195.31
+978.89 , -1797.68 , -161.34
+978.89 , -1438.14 , -127.18
+978.89 , -1078.61 , -92.83
+978.89 , -719.07 , -58.20
+978.89 , -359.54 , -22.82
+978.89 , -71.91 , 0.00
+978.89 , 67.66 , 15.79
+978.89 , 338.29 , 47.58
+978.89 , 676.58 , 85.48
+978.89 , 1014.86 , 123.30
+978.89 , 1353.15 , 161.22
+978.89 , 1691.44 , 199.26
+978.89 , 2029.73 , 237.46
+978.89 , 2368.01 , 275.81
+978.89 , 2706.30 , 314.32
+978.89 , 3044.59 , 352.99
+978.89 , 3382.88 , 391.83
+978.89 , 3721.16 , 430.82
+978.89 , 4059.45 , 469.98
+978.89 , 4397.74 , 509.30
+978.89 , 4736.03 , 548.78
+978.89 , 5074.31 , 588.42
+978.89 , 5412.60 , 628.23
+978.89 , 5750.89 , 668.20
+978.89 , 6089.18 , 708.32
+978.89 , 6427.46 , 748.61
+978.89 , 6765.75 , 789.06
+1067.88 , -7190.72 , -708.97
+1067.88 , -6831.19 , -674.68
+1067.88 , -6471.65 , -640.19
+1067.88 , -6112.11 , -605.51
+1067.88 , -5752.58 , -570.63
+1067.88 , -5393.04 , -535.56
+1067.88 , -5033.51 , -500.30
+1067.88 , -4673.97 , -464.85
+1067.88 , -4314.43 , -429.21
+1067.88 , -3954.90 , -393.37
+1067.88 , -3595.36 , -357.35
+1067.88 , -3235.82 , -321.13
+1067.88 , -2876.29 , -284.71
+1067.88 , -2516.75 , -248.11
+1067.88 , -2157.22 , -211.31
+1067.88 , -1797.68 , -174.30
+1067.88 , -1438.14 , -137.08
+1067.88 , -1078.61 , -99.61
+1067.88 , -719.07 , -61.78
+1067.88 , -359.54 , -22.86
+1067.88 , -71.91 , 0.00
+1067.88 , 67.66 , 18.17
+1067.88 , 338.29 , 53.24
+1067.88 , 676.58 , 94.71
+1067.88 , 1014.86 , 136.03
+1067.88 , 1353.15 , 177.45
+1067.88 , 1691.44 , 219.01
+1067.88 , 2029.73 , 260.75
+1067.88 , 2368.01 , 302.67
+1067.88 , 2706.30 , 344.78
+1067.88 , 3044.59 , 387.07
+1067.88 , 3382.88 , 429.54
+1067.88 , 3721.16 , 472.21
+1067.88 , 4059.45 , 515.06
+1067.88 , 4397.74 , 558.11
+1067.88 , 4736.03 , 601.34
+1067.88 , 5074.31 , 644.76
+1067.88 , 5412.60 , 688.37
+1067.88 , 5750.89 , 732.17
+1067.88 , 6089.18 , 776.15
+1067.88 , 6427.46 , 820.33
+1067.88 , 6765.75 , 864.69
+1156.87 , -7190.72 , -763.53
+1156.87 , -6831.19 , -726.65
+1156.87 , -6471.65 , -689.55
+1156.87 , -6112.11 , -652.22
+1156.87 , -5752.58 , -614.67
+1156.87 , -5393.04 , -576.89
+1156.87 , -5033.51 , -538.89
+1156.87 , -4673.97 , -500.67
+1156.87 , -4314.43 , -462.22
+1156.87 , -3954.90 , -423.56
+1156.87 , -3595.36 , -384.67
+1156.87 , -3235.82 , -345.56
+1156.87 , -2876.29 , -306.22
+1156.87 , -2516.75 , -266.66
+1156.87 , -2157.22 , -226.86
+1156.87 , -1797.68 , -186.83
+1156.87 , -1438.14 , -146.54
+1156.87 , -1078.61 , -105.95
+1156.87 , -719.07 , -64.90
+1156.87 , -359.54 , -22.24
+1156.87 , -71.91 , 0.00
+1156.87 , 67.66 , 20.74
+1156.87 , 338.29 , 59.20
+1156.87 , 676.58 , 104.27
+1156.87 , 1014.86 , 149.12
+1156.87 , 1353.15 , 194.05
+1156.87 , 1691.44 , 239.16
+1156.87 , 2029.73 , 284.45
+1156.87 , 2368.01 , 329.96
+1156.87 , 2706.30 , 375.67
+1156.87 , 3044.59 , 421.60
+1156.87 , 3382.88 , 467.75
+1156.87 , 3721.16 , 514.11
+1156.87 , 4059.45 , 560.69
+1156.87 , 4397.74 , 607.48
+1156.87 , 4736.03 , 654.50
+1156.87 , 5074.31 , 701.73
+1156.87 , 5412.60 , 749.18
+1156.87 , 5750.89 , 796.84
+1156.87 , 6089.18 , 844.73
+1156.87 , 6427.46 , 892.83
+1156.87 , 6765.75 , 941.14
+1245.86 , -7190.72 , -817.17
+1245.86 , -6831.19 , -777.76
+1245.86 , -6471.65 , -738.08
+1245.86 , -6112.11 , -698.15
+1245.86 , -5752.58 , -657.96
+1245.86 , -5393.04 , -617.52
+1245.86 , -5033.51 , -576.82
+1245.86 , -4673.97 , -535.86
+1245.86 , -4314.43 , -494.65
+1245.86 , -3954.90 , -453.18
+1245.86 , -3595.36 , -411.45
+1245.86 , -3235.82 , -369.47
+1245.86 , -2876.29 , -327.22
+1245.86 , -2516.75 , -284.72
+1245.86 , -2157.22 , -241.95
+1245.86 , -1797.68 , -198.90
+1245.86 , -1438.14 , -155.54
+1245.86 , -1078.61 , -111.82
+1245.86 , -719.07 , -67.51
+1245.86 , -359.54 , -20.80
+1245.86 , -71.91 , 0.00
+1245.86 , 67.66 , 23.52
+1245.86 , 338.29 , 65.48
+1245.86 , 676.58 , 114.20
+1245.86 , 1014.86 , 162.59
+1245.86 , 1353.15 , 211.06
+1245.86 , 1691.44 , 259.72
+1245.86 , 2029.73 , 308.59
+1245.86 , 2368.01 , 357.69
+1245.86 , 2706.30 , 407.04
+1245.86 , 3044.59 , 456.62
+1245.86 , 3382.88 , 506.46
+1245.86 , 3721.16 , 556.54
+1245.86 , 4059.45 , 606.87
+1245.86 , 4397.74 , 657.45
+1245.86 , 4736.03 , 708.28
+1245.86 , 5074.31 , 759.35
+1245.86 , 5412.60 , 810.68
+1245.86 , 5750.89 , 862.25
+1245.86 , 6089.18 , 914.07
+1245.86 , 6427.46 , 966.13
+1245.86 , 6765.75 , 1018.44
+1334.85 , -7190.72 , -869.86
+1334.85 , -6831.19 , -827.96
+1334.85 , -6471.65 , -785.77
+1334.85 , -6112.11 , -743.28
+1334.85 , -5752.58 , -700.50
+1334.85 , -5393.04 , -657.42
+1334.85 , -5033.51 , -614.05
+1334.85 , -4673.97 , -570.39
+1334.85 , -4314.43 , -526.44
+1334.85 , -3954.90 , -482.19
+1334.85 , -3595.36 , -437.65
+1334.85 , -3235.82 , -392.82
+1334.85 , -2876.29 , -347.69
+1334.85 , -2516.75 , -302.26
+1334.85 , -2157.22 , -256.52
+1334.85 , -1797.68 , -210.46
+1334.85 , -1438.14 , -164.04
+1334.85 , -1078.61 , -117.17
+1334.85 , -719.07 , -69.54
+1334.85 , -359.54 , -18.27
+1334.85 , -71.91 , 0.00
+1334.85 , 67.66 , 26.49
+1334.85 , 338.29 , 72.10
+1334.85 , 676.58 , 124.50
+1334.85 , 1014.86 , 176.46
+1334.85 , 1353.15 , 228.49
+1334.85 , 1691.44 , 280.71
+1334.85 , 2029.73 , 333.18
+1334.85 , 2368.01 , 385.90
+1334.85 , 2706.30 , 438.89
+1334.85 , 3044.59 , 492.16
+1334.85 , 3382.88 , 545.71
+1334.85 , 3721.16 , 599.54
+1334.85 , 4059.45 , 653.64
+1334.85 , 4397.74 , 708.03
+1334.85 , 4736.03 , 762.71
+1334.85 , 5074.31 , 817.66
+1334.85 , 5412.60 , 872.89
+1334.85 , 5750.89 , 928.41
+1334.85 , 6089.18 , 984.20
+1334.85 , 6427.46 , 1040.27
+1334.85 , 6765.75 , 1096.63
+1423.84 , -7190.72 , -921.56
+1423.84 , -6831.19 , -877.23
+1423.84 , -6471.65 , -832.56
+1423.84 , -6112.11 , -787.56
+1423.84 , -5752.58 , -742.22
+1423.84 , -5393.04 , -696.56
+1423.84 , -5033.51 , -650.56
+1423.84 , -4673.97 , -604.23
+1423.84 , -4314.43 , -557.56
+1423.84 , -3954.90 , -510.57
+1423.84 , -3595.36 , -463.24
+1423.84 , -3235.82 , -415.58
+1423.84 , -2876.29 , -367.58
+1423.84 , -2516.75 , -319.24
+1423.84 , -2157.22 , -270.55
+1423.84 , -1797.68 , -221.48
+1423.84 , -1438.14 , -171.99
+1423.84 , -1078.61 , -121.95
+1423.84 , -719.07 , -70.93
+1423.84 , -359.54 , -14.10
+1423.84 , -71.91 , 0.00
+1423.84 , 67.66 , 29.68
+1423.84 , 338.29 , 79.05
+1423.84 , 676.58 , 135.20
+1423.84 , 1014.86 , 190.76
+1423.84 , 1353.15 , 246.36
+1423.84 , 1691.44 , 302.17
+1423.84 , 2029.73 , 358.24
+1423.84 , 2368.01 , 414.60
+1423.84 , 2706.30 , 471.27
+1423.84 , 3044.59 , 528.24
+1423.84 , 3382.88 , 585.52
+1423.84 , 3721.16 , 643.12
+1423.84 , 4059.45 , 701.03
+1423.84 , 4397.74 , 759.26
+1423.84 , 4736.03 , 817.80
+1423.84 , 5074.31 , 876.66
+1423.84 , 5412.60 , 935.84
+1423.84 , 5750.89 , 995.34
+1423.84 , 6089.18 , 1055.15
+1423.84 , 6427.46 , 1115.27
+1423.84 , 6765.75 , 1175.71
+1512.83 , -7190.72 , -972.24
+1512.83 , -6831.19 , -925.52
+1512.83 , -6471.65 , -878.43
+1512.83 , -6112.11 , -830.96
+1512.83 , -5752.58 , -783.11
+1512.83 , -5393.04 , -734.89
+1512.83 , -5033.51 , -686.30
+1512.83 , -4673.97 , -637.33
+1512.83 , -4314.43 , -587.99
+1512.83 , -3954.90 , -538.28
+1512.83 , -3595.36 , -488.19
+1512.83 , -3235.82 , -437.72
+1512.83 , -2876.29 , -386.87
+1512.83 , -2516.75 , -335.63
+1512.83 , -2157.22 , -283.99
+1512.83 , -1797.68 , -231.92
+1512.83 , -1438.14 , -179.35
+1512.83 , -1078.61 , -126.12
+1512.83 , -719.07 , -71.60
+1512.83 , -359.54 , -6.45
+1512.83 , -71.91 , 0.00
+1512.83 , 67.66 , 33.08
+1512.83 , 338.29 , 86.37
+1512.83 , 676.58 , 146.31
+1512.83 , 1014.86 , 205.50
+1512.83 , 1353.15 , 264.70
+1512.83 , 1691.44 , 324.11
+1512.83 , 2029.73 , 383.81
+1512.83 , 2368.01 , 443.83
+1512.83 , 2706.30 , 504.18
+1512.83 , 3044.59 , 564.87
+1512.83 , 3382.88 , 625.91
+1512.83 , 3721.16 , 687.30
+1512.83 , 4059.45 , 749.05
+1512.83 , 4397.74 , 811.14
+1512.83 , 4736.03 , 873.59
+1512.83 , 5074.31 , 936.40
+1512.83 , 5412.60 , 999.56
+1512.83 , 5750.89 , 1063.07
+1512.83 , 6089.18 , 1126.93
+1512.83 , 6427.46 , 1191.14
+1512.83 , 6765.75 , 1255.71
+1601.82 , -7190.72 , -1021.86
+1601.82 , -6831.19 , -972.81
+1601.82 , -6471.65 , -923.33
+1601.82 , -6112.11 , -873.44
+1601.82 , -5752.58 , -823.13
+1601.82 , -5393.04 , -772.39
+1601.82 , -5033.51 , -721.24
+1601.82 , -4673.97 , -669.67
+1601.82 , -4314.43 , -617.68
+1601.82 , -3954.90 , -565.27
+1601.82 , -3595.36 , -512.45
+1601.82 , -3235.82 , -459.19
+1601.82 , -2876.29 , -405.51
+1601.82 , -2516.75 , -351.39
+1601.82 , -2157.22 , -296.81
+1601.82 , -1797.68 , -241.73
+1601.82 , -1438.14 , -186.07
+1601.82 , -1078.61 , -129.61
+1601.82 , -719.07 , -71.46
+1601.82 , -359.54 , 0.00
+1601.82 , -71.91 , 0.00
+1601.82 , 67.66 , 36.70
+1601.82 , 338.29 , 94.04
+1601.82 , 676.58 , 157.85
+1601.82 , 1014.86 , 220.70
+1601.82 , 1353.15 , 283.52
+1601.82 , 1691.44 , 346.56
+1601.82 , 2029.73 , 409.90
+1601.82 , 2368.01 , 473.59
+1601.82 , 2706.30 , 537.65
+1601.82 , 3044.59 , 602.09
+1601.82 , 3382.88 , 666.91
+1601.82 , 3721.16 , 732.12
+1601.82 , 4059.45 , 797.72
+1601.82 , 4397.74 , 863.72
+1601.82 , 4736.03 , 930.10
+1601.82 , 5074.31 , 996.88
+1601.82 , 5412.60 , 1064.05
+1601.82 , 5750.89 , 1131.62
+1601.82 , 6089.18 , 1199.57
+1601.82 , 6427.46 , 1267.92
+1601.82 , 6765.75 , 1336.65
+1690.81 , -7190.72 , -1070.37
+1690.81 , -6831.19 , -1019.04
+1690.81 , -6471.65 , -967.24
+1690.81 , -6112.11 , -914.96
+1690.81 , -5752.58 , -862.23
+1690.81 , -5393.04 , -809.02
+1690.81 , -5033.51 , -755.35
+1690.81 , -4673.97 , -701.21
+1690.81 , -4314.43 , -646.60
+1690.81 , -3954.90 , -591.53
+1690.81 , -3595.36 , -535.99
+1690.81 , -3235.82 , -479.97
+1690.81 , -2876.29 , -423.47
+1690.81 , -2516.75 , -366.48
+1690.81 , -2157.22 , -308.96
+1690.81 , -1797.68 , -250.88
+1690.81 , -1438.14 , -192.11
+1690.81 , -1078.61 , -132.36
+1690.81 , -719.07 , -70.38
+1690.81 , -359.54 , 0.00
+1690.81 , -71.91 , 0.00
+1690.81 , 67.66 , 40.53
+1690.81 , 338.29 , 102.10
+1690.81 , 676.58 , 169.83
+1690.81 , 1014.86 , 236.37
+1690.81 , 1353.15 , 302.84
+1690.81 , 1691.44 , 369.53
+1690.81 , 2029.73 , 436.54
+1690.81 , 2368.01 , 503.92
+1690.81 , 2706.30 , 571.71
+1690.81 , 3044.59 , 639.91
+1690.81 , 3382.88 , 708.54
+1690.81 , 3721.16 , 777.59
+1690.81 , 4059.45 , 847.08
+1690.81 , 4397.74 , 917.00
+1690.81 , 4736.03 , 987.35
+1690.81 , 5074.31 , 1058.14
+1690.81 , 5412.60 , 1129.36
+1690.81 , 5750.89 , 1201.01
+1690.81 , 6089.18 , 1273.09
+1690.81 , 6427.46 , 1345.61
+1690.81 , 6765.75 , 1418.56
+1779.80 , -7190.72 , -1117.74
+1779.80 , -6831.19 , -1064.18
+1779.80 , -6471.65 , -1010.10
+1779.80 , -6112.11 , -955.49
+1779.80 , -5752.58 , -900.37
+1779.80 , -5393.04 , -844.73
+1779.80 , -5033.51 , -788.58
+1779.80 , -4673.97 , -731.90
+1779.80 , -4314.43 , -674.71
+1779.80 , -3954.90 , -617.00
+1779.80 , -3595.36 , -558.77
+1779.80 , -3235.82 , -500.01
+1779.80 , -2876.29 , -440.71
+1779.80 , -2516.75 , -380.85
+1779.80 , -2157.22 , -320.40
+1779.80 , -1797.68 , -259.31
+1779.80 , -1438.14 , -197.41
+1779.80 , -1078.61 , -134.30
+1779.80 , -719.07 , -68.24
+1779.80 , -359.54 , 0.00
+1779.80 , -71.91 , 0.00
+1779.80 , 67.66 , 44.59
+1779.80 , 338.29 , 110.53
+1779.80 , 676.58 , 182.27
+1779.80 , 1014.86 , 252.55
+1779.80 , 1353.15 , 322.69
+1779.80 , 1691.44 , 393.04
+1779.80 , 2029.73 , 463.74
+1779.80 , 2368.01 , 534.84
+1779.80 , 2706.30 , 606.37
+1779.80 , 3044.59 , 678.37
+1779.80 , 3382.88 , 750.82
+1779.80 , 3721.16 , 823.74
+1779.80 , 4059.45 , 897.14
+1779.80 , 4397.74 , 971.01
+1779.80 , 4736.03 , 1045.36
+1779.80 , 5074.31 , 1120.19
+1779.80 , 5412.60 , 1195.49
+1779.80 , 5750.89 , 1271.27
+1779.80 , 6089.18 , 1347.52
+1779.80 , 6427.46 , 1424.25
+1779.80 , 6765.75 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..14358b02ff657904b67a1a81913128b0ff6bad78
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 6765.75 , -7190.72
+8.82 , 6765.75 , -7190.72
+89.03 , 6765.75 , -7190.72
+178.06 , 6765.75 , -7190.72
+266.88 , 6765.75 , -7190.72
+355.91 , 6765.75 , -7190.72
+444.95 , 6765.75 , -7190.72
+533.98 , 5638.13 , -5992.27
+623.01 , 4832.64 , -5136.19
+711.83 , 4228.59 , -4494.20
+800.86 , 3758.78 , -3994.88
+889.89 , 3382.88 , -3595.36
+978.92 , 3075.35 , -3268.52
+1067.96 , 2819.06 , -2996.13
+1156.77 , 2602.20 , -2765.65
+1245.81 , 2416.37 , -2568.14
+1334.84 , 2255.25 , -2396.91
+1423.87 , 2114.34 , -2247.15
+1512.90 , 1989.94 , -2114.94
+1601.72 , 1879.34 , -1997.39
+1690.75 , 1780.47 , -1892.31
+1779.78 , 1691.44 , -1797.68
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..14358b02ff657904b67a1a81913128b0ff6bad78
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 6765.75 , -7190.72
+8.82 , 6765.75 , -7190.72
+89.03 , 6765.75 , -7190.72
+178.06 , 6765.75 , -7190.72
+266.88 , 6765.75 , -7190.72
+355.91 , 6765.75 , -7190.72
+444.95 , 6765.75 , -7190.72
+533.98 , 5638.13 , -5992.27
+623.01 , 4832.64 , -5136.19
+711.83 , 4228.59 , -4494.20
+800.86 , 3758.78 , -3994.88
+889.89 , 3382.88 , -3595.36
+978.92 , 3075.35 , -3268.52
+1067.96 , 2819.06 , -2996.13
+1156.77 , 2602.20 , -2765.65
+1245.81 , 2416.37 , -2568.14
+1334.84 , 2255.25 , -2396.91
+1423.87 , 2114.34 , -2247.15
+1512.90 , 1989.94 , -2114.94
+1601.72 , 1879.34 , -1997.39
+1690.75 , 1780.47 , -1892.31
+1779.78 , 1691.44 , -1797.68
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..ffb4883b312afeed23be5a96783b2b92e3c03bed
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -13.76
+8.90 , -14.19
+88.99 , -18.22
+177.98 , -22.67
+266.97 , -27.13
+355.96 , -31.64
+444.95 , -36.10
+533.94 , -40.56
+622.93 , -45.01
+711.92 , -49.47
+800.91 , -53.98
+889.90 , -58.44
+978.89 , -62.89
+1067.88 , -67.35
+1156.87 , -71.81
+1245.86 , -76.32
+1334.85 , -80.78
+1423.84 , -85.23
+1512.83 , -89.69
+1601.82 , -94.15
+1690.81 , -98.66
+1779.80 , -103.11
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/GenericIEPC_Gbx3Axl.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/GenericIEPC_Gbx3Axl.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..960168f579fdda05ed04d0089c7fb128803c6922
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/GenericIEPC_Gbx3Axl.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": true,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 21.9384
+ },
+ {
+ "Ratio": 12.276
+ },
+ {
+ "Ratio": 7.2336
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3Axl_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Axl_1.viepco",
+ "2": "IEPC_Gbx3Axl_2.viepco",
+ "3": "IEPC_Gbx3Axl_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3Axl_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Axl_1.viepco",
+ "2": "IEPC_Gbx3Axl_2.viepco",
+ "3": "IEPC_Gbx3Axl_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3Axl_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..3bf156969e9b30846e6765fca601a6e3cc99b35b
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3Axl.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_ENG_Gbx3Axl.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_ENG_Gbx3Axl.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..18db3d71b4ebdaa1349292d4d437a40c9a80f158
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_ENG_Gbx3Axl.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx3Axl.vveh",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_1.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..6661444505d1f80e1b7ccf4680f069a1394f3e8d
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -35338.92 , 0.00
+0.00 , -33571.97 , 0.00
+0.00 , -31805.03 , 0.00
+0.00 , -30038.08 , 0.00
+0.00 , -28271.13 , 0.00
+0.00 , -26504.19 , 0.00
+0.00 , -24737.24 , -0.13
+0.00 , -22970.30 , -0.66
+0.00 , -21203.35 , -0.98
+0.00 , -19436.40 , -1.19
+0.00 , -17669.46 , -1.32
+0.00 , -15902.51 , -1.38
+0.00 , -14135.57 , -1.39
+0.00 , -12368.62 , -1.35
+0.00 , -10601.68 , -1.26
+0.00 , -8834.73 , -1.13
+0.00 , -7067.78 , -0.97
+0.00 , -5300.84 , -0.77
+0.00 , -3533.89 , -0.53
+0.00 , -1766.95 , -0.27
+0.00 , -353.39 , -0.02
+0.00 , 306.44 , 0.13
+0.00 , 1532.18 , 0.56
+0.00 , 3064.36 , 1.12
+0.00 , 4596.53 , 1.70
+0.00 , 6128.71 , 2.31
+0.00 , 7660.89 , 2.93
+0.00 , 9193.07 , 3.58
+0.00 , 10725.24 , 4.25
+0.00 , 12257.42 , 4.93
+0.00 , 13789.60 , 5.64
+0.00 , 15321.78 , 6.37
+0.00 , 16853.96 , 7.12
+0.00 , 18386.13 , 7.88
+0.00 , 19918.31 , 8.67
+0.00 , 21450.49 , 9.47
+0.00 , 22982.67 , 10.29
+0.00 , 24514.85 , 11.13
+0.00 , 26047.02 , 11.99
+0.00 , 27579.20 , 12.87
+0.00 , 29111.38 , 13.76
+0.00 , 30643.56 , 14.67
+1.89 , -35338.92 , 0.00
+1.89 , -33571.97 , 0.00
+1.89 , -31805.03 , 0.00
+1.89 , -30038.08 , 0.00
+1.89 , -28271.13 , 0.00
+1.89 , -26504.19 , 0.00
+1.89 , -24737.24 , -0.50
+1.89 , -22970.30 , -0.84
+1.89 , -21203.35 , -1.04
+1.89 , -19436.40 , -1.16
+1.89 , -17669.46 , -1.22
+1.89 , -15902.51 , -1.24
+1.89 , -14135.57 , -1.21
+1.89 , -12368.62 , -1.15
+1.89 , -10601.68 , -1.06
+1.89 , -8834.73 , -0.94
+1.89 , -7067.78 , -0.80
+1.89 , -5300.84 , -0.62
+1.89 , -3533.89 , -0.43
+1.89 , -1766.95 , -0.21
+1.89 , -353.39 , -0.02
+1.89 , 306.44 , 0.10
+1.89 , 1532.18 , 0.43
+1.89 , 3064.36 , 0.85
+1.89 , 4596.53 , 1.30
+1.89 , 6128.71 , 1.75
+1.89 , 7660.89 , 2.23
+1.89 , 9193.07 , 2.71
+1.89 , 10725.24 , 3.21
+1.89 , 12257.42 , 3.73
+1.89 , 13789.60 , 4.26
+1.89 , 15321.78 , 4.80
+1.89 , 16853.96 , 5.36
+1.89 , 18386.13 , 5.93
+1.89 , 19918.31 , 6.52
+1.89 , 21450.49 , 7.12
+1.89 , 22982.67 , 7.73
+1.89 , 24514.85 , 8.35
+1.89 , 26047.02 , 8.99
+1.89 , 27579.20 , 9.64
+1.89 , 29111.38 , 10.30
+1.89 , 30643.56 , 10.98
+18.86 , -35338.92 , -58.10
+18.86 , -33571.97 , -55.37
+18.86 , -31805.03 , -52.62
+18.86 , -30038.08 , -49.85
+18.86 , -28271.13 , -47.06
+18.86 , -26504.19 , -44.25
+18.86 , -24737.24 , -41.42
+18.86 , -22970.30 , -38.57
+18.86 , -21203.35 , -35.70
+18.86 , -19436.40 , -32.81
+18.86 , -17669.46 , -29.90
+18.86 , -15902.51 , -26.98
+18.86 , -14135.57 , -24.03
+18.86 , -12368.62 , -21.07
+18.86 , -10601.68 , -18.08
+18.86 , -8834.73 , -15.08
+18.86 , -7067.78 , -12.06
+18.86 , -5300.84 , -9.02
+18.86 , -3533.89 , -5.96
+18.86 , -1766.95 , -2.88
+18.86 , -353.39 , -0.37
+18.86 , 306.44 , 0.90
+18.86 , 1532.18 , 3.68
+18.86 , 3064.36 , 7.16
+18.86 , 4596.53 , 10.66
+18.86 , 6128.71 , 14.17
+18.86 , 7660.89 , 17.71
+18.86 , 9193.07 , 21.26
+18.86 , 10725.24 , 24.84
+18.86 , 12257.42 , 28.43
+18.86 , 13789.60 , 32.04
+18.86 , 15321.78 , 35.67
+18.86 , 16853.96 , 39.32
+18.86 , 18386.13 , 42.99
+18.86 , 19918.31 , 46.68
+18.86 , 21450.49 , 50.38
+18.86 , 22982.67 , 54.11
+18.86 , 24514.85 , 57.85
+18.86 , 26047.02 , 61.61
+18.86 , 27579.20 , 65.39
+18.86 , 29111.38 , 69.19
+18.86 , 30643.56 , 73.01
+37.72 , -35338.92 , -120.57
+37.72 , -33571.97 , -114.73
+37.72 , -31805.03 , -108.87
+37.72 , -30038.08 , -102.99
+37.72 , -28271.13 , -97.08
+37.72 , -26504.19 , -91.15
+37.72 , -24737.24 , -85.20
+37.72 , -22970.30 , -79.23
+37.72 , -21203.35 , -73.23
+37.72 , -19436.40 , -67.21
+37.72 , -17669.46 , -61.17
+37.72 , -15902.51 , -55.10
+37.72 , -14135.57 , -49.01
+37.72 , -12368.62 , -42.90
+37.72 , -10601.68 , -36.77
+37.72 , -8834.73 , -30.61
+37.72 , -7067.78 , -24.43
+37.72 , -5300.84 , -18.23
+37.72 , -3533.89 , -12.01
+37.72 , -1766.95 , -5.76
+37.72 , -353.39 , -0.66
+37.72 , 306.44 , 1.84
+37.72 , 1532.18 , 7.35
+37.72 , 3064.36 , 14.22
+37.72 , 4596.53 , 21.11
+37.72 , 6128.71 , 28.02
+37.72 , 7660.89 , 34.96
+37.72 , 9193.07 , 41.92
+37.72 , 10725.24 , 48.90
+37.72 , 12257.42 , 55.90
+37.72 , 13789.60 , 62.93
+37.72 , 15321.78 , 69.98
+37.72 , 16853.96 , 77.05
+37.72 , 18386.13 , 84.15
+37.72 , 19918.31 , 91.27
+37.72 , 21450.49 , 98.41
+37.72 , 22982.67 , 105.58
+37.72 , 24514.85 , 112.76
+37.72 , 26047.02 , 119.97
+37.72 , 27579.20 , 127.21
+37.72 , 29111.38 , 134.46
+37.72 , 30643.56 , 141.74
+56.59 , -35338.92 , -182.44
+56.59 , -33571.97 , -173.55
+56.59 , -31805.03 , -164.62
+56.59 , -30038.08 , -155.67
+56.59 , -28271.13 , -146.69
+56.59 , -26504.19 , -137.68
+56.59 , -24737.24 , -128.65
+56.59 , -22970.30 , -119.58
+56.59 , -21203.35 , -110.49
+56.59 , -19436.40 , -101.36
+56.59 , -17669.46 , -92.21
+56.59 , -15902.51 , -83.03
+56.59 , -14135.57 , -73.82
+56.59 , -12368.62 , -64.58
+56.59 , -10601.68 , -55.31
+56.59 , -8834.73 , -46.02
+56.59 , -7067.78 , -36.70
+56.59 , -5300.84 , -27.34
+56.59 , -3533.89 , -17.96
+56.59 , -1766.95 , -8.54
+56.59 , -353.39 , -0.79
+56.59 , 306.44 , 2.86
+56.59 , 1532.18 , 11.12
+56.59 , 3064.36 , 21.39
+56.59 , 4596.53 , 31.68
+56.59 , 6128.71 , 41.99
+56.59 , 7660.89 , 52.34
+56.59 , 9193.07 , 62.71
+56.59 , 10725.24 , 73.12
+56.59 , 12257.42 , 83.55
+56.59 , 13789.60 , 94.01
+56.59 , 15321.78 , 104.50
+56.59 , 16853.96 , 115.02
+56.59 , 18386.13 , 125.57
+56.59 , 19918.31 , 136.15
+56.59 , 21450.49 , 146.76
+56.59 , 22982.67 , 157.40
+56.59 , 24514.85 , 168.06
+56.59 , 26047.02 , 178.76
+56.59 , 27579.20 , 189.48
+56.59 , 29111.38 , 200.23
+56.59 , 30643.56 , 211.02
+75.45 , -35338.92 , -243.71
+75.45 , -33571.97 , -231.81
+75.45 , -31805.03 , -219.87
+75.45 , -30038.08 , -207.89
+75.45 , -28271.13 , -195.88
+75.45 , -26504.19 , -183.83
+75.45 , -24737.24 , -171.74
+75.45 , -22970.30 , -159.61
+75.45 , -21203.35 , -147.45
+75.45 , -19436.40 , -135.25
+75.45 , -17669.46 , -123.01
+75.45 , -15902.51 , -110.74
+75.45 , -14135.57 , -98.43
+75.45 , -12368.62 , -86.08
+75.45 , -10601.68 , -73.70
+75.45 , -8834.73 , -61.27
+75.45 , -7067.78 , -48.82
+75.45 , -5300.84 , -36.32
+75.45 , -3533.89 , -23.78
+75.45 , -1766.95 , -11.19
+75.45 , -353.39 , -0.63
+75.45 , 306.44 , 3.98
+75.45 , 1532.18 , 15.01
+75.45 , 3064.36 , 28.68
+75.45 , 4596.53 , 42.37
+75.45 , 6128.71 , 56.10
+75.45 , 7660.89 , 69.87
+75.45 , 9193.07 , 83.67
+75.45 , 10725.24 , 97.52
+75.45 , 12257.42 , 111.40
+75.45 , 13789.60 , 125.31
+75.45 , 15321.78 , 139.27
+75.45 , 16853.96 , 153.26
+75.45 , 18386.13 , 167.29
+75.45 , 19918.31 , 181.36
+75.45 , 21450.49 , 195.46
+75.45 , 22982.67 , 209.61
+75.45 , 24514.85 , 223.79
+75.45 , 26047.02 , 238.01
+75.45 , 27579.20 , 252.26
+75.45 , 29111.38 , 266.56
+75.45 , 30643.56 , 280.89
+94.31 , -35338.92 , -304.37
+94.31 , -33571.97 , -289.50
+94.31 , -31805.03 , -274.59
+94.31 , -30038.08 , -259.63
+94.31 , -28271.13 , -244.61
+94.31 , -26504.19 , -229.56
+94.31 , -24737.24 , -214.45
+94.31 , -22970.30 , -199.30
+94.31 , -21203.35 , -184.10
+94.31 , -19436.40 , -168.85
+94.31 , -17669.46 , -153.55
+94.31 , -15902.51 , -138.20
+94.31 , -14135.57 , -122.81
+94.31 , -12368.62 , -107.37
+94.31 , -10601.68 , -91.88
+94.31 , -8834.73 , -76.35
+94.31 , -7067.78 , -60.76
+94.31 , -5300.84 , -45.13
+94.31 , -3533.89 , -29.44
+94.31 , -1766.95 , -13.67
+94.31 , -353.39 , 0.00
+94.31 , 306.44 , 5.21
+94.31 , 1532.18 , 19.04
+94.31 , 3064.36 , 36.13
+94.31 , 4596.53 , 53.24
+94.31 , 6128.71 , 70.39
+94.31 , 7660.89 , 87.59
+94.31 , 9193.07 , 104.83
+94.31 , 10725.24 , 122.13
+94.31 , 12257.42 , 139.47
+94.31 , 13789.60 , 156.87
+94.31 , 15321.78 , 174.31
+94.31 , 16853.96 , 191.80
+94.31 , 18386.13 , 209.33
+94.31 , 19918.31 , 226.92
+94.31 , 21450.49 , 244.56
+94.31 , 22982.67 , 262.24
+94.31 , 24514.85 , 279.97
+94.31 , 26047.02 , 297.76
+94.31 , 27579.20 , 315.58
+94.31 , 29111.38 , 333.46
+94.31 , 30643.56 , 351.39
+113.17 , -35338.92 , -364.37
+113.17 , -33571.97 , -346.59
+113.17 , -31805.03 , -328.74
+113.17 , -30038.08 , -310.84
+113.17 , -28271.13 , -292.87
+113.17 , -26504.19 , -274.84
+113.17 , -24737.24 , -256.75
+113.17 , -22970.30 , -238.60
+113.17 , -21203.35 , -220.39
+113.17 , -19436.40 , -202.12
+113.17 , -17669.46 , -183.79
+113.17 , -15902.51 , -165.40
+113.17 , -14135.57 , -146.94
+113.17 , -12368.62 , -128.43
+113.17 , -10601.68 , -109.85
+113.17 , -8834.73 , -91.21
+113.17 , -7067.78 , -72.51
+113.17 , -5300.84 , -53.75
+113.17 , -3533.89 , -34.91
+113.17 , -1766.95 , -15.95
+113.17 , -353.39 , 0.00
+113.17 , 306.44 , 6.58
+113.17 , 1532.18 , 23.25
+113.17 , 3064.36 , 43.76
+113.17 , 4596.53 , 64.29
+113.17 , 6128.71 , 84.87
+113.17 , 7660.89 , 105.52
+113.17 , 9193.07 , 126.22
+113.17 , 10725.24 , 146.98
+113.17 , 12257.42 , 167.81
+113.17 , 13789.60 , 188.70
+113.17 , 15321.78 , 209.65
+113.17 , 16853.96 , 230.66
+113.17 , 18386.13 , 251.73
+113.17 , 19918.31 , 272.87
+113.17 , 21450.49 , 294.07
+113.17 , 22982.67 , 315.33
+113.17 , 24514.85 , 336.65
+113.17 , 26047.02 , 358.03
+113.17 , 27579.20 , 379.47
+113.17 , 29111.38 , 400.98
+113.17 , 30643.56 , 422.54
+132.03 , -35338.92 , -423.69
+132.03 , -33571.97 , -403.04
+132.03 , -31805.03 , -382.31
+132.03 , -30038.08 , -361.50
+132.03 , -28271.13 , -340.62
+132.03 , -26504.19 , -319.66
+132.03 , -24737.24 , -298.62
+132.03 , -22970.30 , -277.51
+132.03 , -21203.35 , -256.31
+132.03 , -19436.40 , -235.05
+132.03 , -17669.46 , -213.70
+132.03 , -15902.51 , -192.28
+132.03 , -14135.57 , -170.79
+132.03 , -12368.62 , -149.21
+132.03 , -10601.68 , -127.57
+132.03 , -8834.73 , -105.84
+132.03 , -7067.78 , -84.03
+132.03 , -5300.84 , -62.14
+132.03 , -3533.89 , -40.16
+132.03 , -1766.95 , -18.00
+132.03 , -353.39 , 0.00
+132.03 , 306.44 , 8.09
+132.03 , 1532.18 , 27.64
+132.03 , 3064.36 , 51.59
+132.03 , 4596.53 , 75.56
+132.03 , 6128.71 , 99.58
+132.03 , 7660.89 , 123.68
+132.03 , 9193.07 , 147.86
+132.03 , 10725.24 , 172.10
+132.03 , 12257.42 , 196.43
+132.03 , 13789.60 , 220.84
+132.03 , 15321.78 , 245.32
+132.03 , 16853.96 , 269.88
+132.03 , 18386.13 , 294.51
+132.03 , 19918.31 , 319.23
+132.03 , 21450.49 , 344.02
+132.03 , 22982.67 , 368.89
+132.03 , 24514.85 , 393.83
+132.03 , 26047.02 , 418.85
+132.03 , 27579.20 , 443.95
+132.03 , 29111.38 , 469.13
+132.03 , 30643.56 , 494.38
+150.90 , -35338.92 , -482.31
+150.90 , -33571.97 , -458.83
+150.90 , -31805.03 , -435.26
+150.90 , -30038.08 , -411.59
+150.90 , -28271.13 , -387.83
+150.90 , -26504.19 , -363.97
+150.90 , -24737.24 , -340.02
+150.90 , -22970.30 , -315.97
+150.90 , -21203.35 , -291.83
+150.90 , -19436.40 , -267.59
+150.90 , -17669.46 , -243.26
+150.90 , -15902.51 , -218.84
+150.90 , -14135.57 , -194.32
+150.90 , -12368.62 , -169.71
+150.90 , -10601.68 , -145.00
+150.90 , -8834.73 , -120.19
+150.90 , -7067.78 , -95.29
+150.90 , -5300.84 , -70.28
+150.90 , -3533.89 , -45.14
+150.90 , -1766.95 , -19.76
+150.90 , -353.39 , 0.00
+150.90 , 306.44 , 9.76
+150.90 , 1532.18 , 32.25
+150.90 , 3064.36 , 59.66
+150.90 , 4596.53 , 87.07
+150.90 , 6128.71 , 114.55
+150.90 , 7660.89 , 142.11
+150.90 , 9193.07 , 169.77
+150.90 , 10725.24 , 197.52
+150.90 , 12257.42 , 225.37
+150.90 , 13789.60 , 253.31
+150.90 , 15321.78 , 281.34
+150.90 , 16853.96 , 309.47
+150.90 , 18386.13 , 337.70
+150.90 , 19918.31 , 366.02
+150.90 , 21450.49 , 394.44
+150.90 , 22982.67 , 422.95
+150.90 , 24514.85 , 451.56
+150.90 , 26047.02 , 480.26
+150.90 , 27579.20 , 509.05
+150.90 , 29111.38 , 537.94
+150.90 , 30643.56 , 566.93
+169.76 , -35338.92 , -540.17
+169.76 , -33571.97 , -513.92
+169.76 , -31805.03 , -487.55
+169.76 , -30038.08 , -461.06
+169.76 , -28271.13 , -434.46
+169.76 , -26504.19 , -407.75
+169.76 , -24737.24 , -380.92
+169.76 , -22970.30 , -353.97
+169.76 , -21203.35 , -326.91
+169.76 , -19436.40 , -299.73
+169.76 , -17669.46 , -272.44
+169.76 , -15902.51 , -245.03
+169.76 , -14135.57 , -217.51
+169.76 , -12368.62 , -189.87
+169.76 , -10601.68 , -162.12
+169.76 , -8834.73 , -134.25
+169.76 , -7067.78 , -106.26
+169.76 , -5300.84 , -78.13
+169.76 , -3533.89 , -49.84
+169.76 , -1766.95 , -21.19
+169.76 , -353.39 , 0.00
+169.76 , 306.44 , 11.59
+169.76 , 1532.18 , 37.10
+169.76 , 3064.36 , 67.98
+169.76 , 4596.53 , 98.85
+169.76 , 6128.71 , 129.79
+169.76 , 7660.89 , 160.84
+169.76 , 9193.07 , 191.99
+169.76 , 10725.24 , 223.26
+169.76 , 12257.42 , 254.64
+169.76 , 13789.60 , 286.14
+169.76 , 15321.78 , 317.75
+169.76 , 16853.96 , 349.48
+169.76 , 18386.13 , 381.32
+169.76 , 19918.31 , 413.28
+169.76 , 21450.49 , 445.36
+169.76 , 22982.67 , 477.54
+169.76 , 24514.85 , 509.85
+169.76 , 26047.02 , 542.27
+169.76 , 27579.20 , 574.80
+169.76 , 29111.38 , 607.45
+169.76 , 30643.56 , 640.21
+188.62 , -35338.92 , -597.26
+188.62 , -33571.97 , -568.28
+188.62 , -31805.03 , -539.16
+188.62 , -30038.08 , -509.90
+188.62 , -28271.13 , -480.50
+188.62 , -26504.19 , -450.96
+188.62 , -24737.24 , -421.28
+188.62 , -22970.30 , -391.47
+188.62 , -21203.35 , -361.52
+188.62 , -19436.40 , -331.43
+188.62 , -17669.46 , -301.20
+188.62 , -15902.51 , -270.83
+188.62 , -14135.57 , -240.33
+188.62 , -12368.62 , -209.68
+188.62 , -10601.68 , -178.90
+188.62 , -8834.73 , -147.97
+188.62 , -7067.78 , -116.90
+188.62 , -5300.84 , -85.66
+188.62 , -3533.89 , -54.21
+188.62 , -1766.95 , -22.23
+188.62 , -353.39 , 0.00
+188.62 , 306.44 , 13.60
+188.62 , 1532.18 , 42.20
+188.62 , 3064.36 , 76.58
+188.62 , 4596.53 , 110.92
+188.62 , 6128.71 , 145.34
+188.62 , 7660.89 , 179.88
+188.62 , 9193.07 , 214.55
+188.62 , 10725.24 , 249.35
+188.62 , 12257.42 , 284.29
+188.62 , 13789.60 , 319.36
+188.62 , 15321.78 , 354.57
+188.62 , 16853.96 , 389.92
+188.62 , 18386.13 , 425.41
+188.62 , 19918.31 , 461.03
+188.62 , 21450.49 , 496.79
+188.62 , 22982.67 , 532.69
+188.62 , 24514.85 , 568.73
+188.62 , 26047.02 , 604.90
+188.62 , 27579.20 , 641.21
+188.62 , 29111.38 , 677.66
+188.62 , 30643.56 , 714.24
+207.48 , -35338.92 , -653.54
+207.48 , -33571.97 , -621.88
+207.48 , -31805.03 , -590.05
+207.48 , -30038.08 , -558.06
+207.48 , -28271.13 , -525.90
+207.48 , -26504.19 , -493.58
+207.48 , -24737.24 , -461.09
+207.48 , -22970.30 , -428.44
+207.48 , -21203.35 , -395.63
+207.48 , -19436.40 , -362.65
+207.48 , -17669.46 , -329.51
+207.48 , -15902.51 , -296.21
+207.48 , -14135.57 , -262.74
+207.48 , -12368.62 , -229.11
+207.48 , -10601.68 , -195.31
+207.48 , -8834.73 , -161.34
+207.48 , -7067.78 , -127.18
+207.48 , -5300.84 , -92.83
+207.48 , -3533.89 , -58.20
+207.48 , -1766.95 , -22.82
+207.48 , -353.39 , 0.00
+207.48 , 306.44 , 15.79
+207.48 , 1532.18 , 47.58
+207.48 , 3064.36 , 85.48
+207.48 , 4596.53 , 123.30
+207.48 , 6128.71 , 161.22
+207.48 , 7660.89 , 199.26
+207.48 , 9193.07 , 237.46
+207.48 , 10725.24 , 275.81
+207.48 , 12257.42 , 314.32
+207.48 , 13789.60 , 352.99
+207.48 , 15321.78 , 391.83
+207.48 , 16853.96 , 430.82
+207.48 , 18386.13 , 469.98
+207.48 , 19918.31 , 509.30
+207.48 , 21450.49 , 548.78
+207.48 , 22982.67 , 588.42
+207.48 , 24514.85 , 628.23
+207.48 , 26047.02 , 668.20
+207.48 , 27579.20 , 708.32
+207.48 , 29111.38 , 748.61
+207.48 , 30643.56 , 789.06
+226.34 , -35338.92 , -708.97
+226.34 , -33571.97 , -674.68
+226.34 , -31805.03 , -640.19
+226.34 , -30038.08 , -605.51
+226.34 , -28271.13 , -570.63
+226.34 , -26504.19 , -535.56
+226.34 , -24737.24 , -500.30
+226.34 , -22970.30 , -464.85
+226.34 , -21203.35 , -429.21
+226.34 , -19436.40 , -393.37
+226.34 , -17669.46 , -357.35
+226.34 , -15902.51 , -321.13
+226.34 , -14135.57 , -284.71
+226.34 , -12368.62 , -248.11
+226.34 , -10601.68 , -211.31
+226.34 , -8834.73 , -174.30
+226.34 , -7067.78 , -137.08
+226.34 , -5300.84 , -99.61
+226.34 , -3533.89 , -61.78
+226.34 , -1766.95 , -22.86
+226.34 , -353.39 , 0.00
+226.34 , 306.44 , 18.17
+226.34 , 1532.18 , 53.24
+226.34 , 3064.36 , 94.71
+226.34 , 4596.53 , 136.03
+226.34 , 6128.71 , 177.45
+226.34 , 7660.89 , 219.01
+226.34 , 9193.07 , 260.75
+226.34 , 10725.24 , 302.67
+226.34 , 12257.42 , 344.78
+226.34 , 13789.60 , 387.07
+226.34 , 15321.78 , 429.54
+226.34 , 16853.96 , 472.21
+226.34 , 18386.13 , 515.06
+226.34 , 19918.31 , 558.11
+226.34 , 21450.49 , 601.34
+226.34 , 22982.67 , 644.76
+226.34 , 24514.85 , 688.37
+226.34 , 26047.02 , 732.17
+226.34 , 27579.20 , 776.15
+226.34 , 29111.38 , 820.33
+226.34 , 30643.56 , 864.69
+245.21 , -35338.92 , -763.53
+245.21 , -33571.97 , -726.65
+245.21 , -31805.03 , -689.55
+245.21 , -30038.08 , -652.22
+245.21 , -28271.13 , -614.67
+245.21 , -26504.19 , -576.89
+245.21 , -24737.24 , -538.89
+245.21 , -22970.30 , -500.67
+245.21 , -21203.35 , -462.22
+245.21 , -19436.40 , -423.56
+245.21 , -17669.46 , -384.67
+245.21 , -15902.51 , -345.56
+245.21 , -14135.57 , -306.22
+245.21 , -12368.62 , -266.66
+245.21 , -10601.68 , -226.86
+245.21 , -8834.73 , -186.83
+245.21 , -7067.78 , -146.54
+245.21 , -5300.84 , -105.95
+245.21 , -3533.89 , -64.90
+245.21 , -1766.95 , -22.24
+245.21 , -353.39 , 0.00
+245.21 , 306.44 , 20.74
+245.21 , 1532.18 , 59.20
+245.21 , 3064.36 , 104.27
+245.21 , 4596.53 , 149.12
+245.21 , 6128.71 , 194.05
+245.21 , 7660.89 , 239.16
+245.21 , 9193.07 , 284.45
+245.21 , 10725.24 , 329.96
+245.21 , 12257.42 , 375.67
+245.21 , 13789.60 , 421.60
+245.21 , 15321.78 , 467.75
+245.21 , 16853.96 , 514.11
+245.21 , 18386.13 , 560.69
+245.21 , 19918.31 , 607.48
+245.21 , 21450.49 , 654.50
+245.21 , 22982.67 , 701.73
+245.21 , 24514.85 , 749.18
+245.21 , 26047.02 , 796.84
+245.21 , 27579.20 , 844.73
+245.21 , 29111.38 , 892.83
+245.21 , 30643.56 , 941.14
+264.07 , -35338.92 , -817.17
+264.07 , -33571.97 , -777.76
+264.07 , -31805.03 , -738.08
+264.07 , -30038.08 , -698.15
+264.07 , -28271.13 , -657.96
+264.07 , -26504.19 , -617.52
+264.07 , -24737.24 , -576.82
+264.07 , -22970.30 , -535.86
+264.07 , -21203.35 , -494.65
+264.07 , -19436.40 , -453.18
+264.07 , -17669.46 , -411.45
+264.07 , -15902.51 , -369.47
+264.07 , -14135.57 , -327.22
+264.07 , -12368.62 , -284.72
+264.07 , -10601.68 , -241.95
+264.07 , -8834.73 , -198.90
+264.07 , -7067.78 , -155.54
+264.07 , -5300.84 , -111.82
+264.07 , -3533.89 , -67.51
+264.07 , -1766.95 , -20.80
+264.07 , -353.39 , 0.00
+264.07 , 306.44 , 23.52
+264.07 , 1532.18 , 65.48
+264.07 , 3064.36 , 114.20
+264.07 , 4596.53 , 162.59
+264.07 , 6128.71 , 211.06
+264.07 , 7660.89 , 259.72
+264.07 , 9193.07 , 308.59
+264.07 , 10725.24 , 357.69
+264.07 , 12257.42 , 407.04
+264.07 , 13789.60 , 456.62
+264.07 , 15321.78 , 506.46
+264.07 , 16853.96 , 556.54
+264.07 , 18386.13 , 606.87
+264.07 , 19918.31 , 657.45
+264.07 , 21450.49 , 708.28
+264.07 , 22982.67 , 759.35
+264.07 , 24514.85 , 810.68
+264.07 , 26047.02 , 862.25
+264.07 , 27579.20 , 914.07
+264.07 , 29111.38 , 966.13
+264.07 , 30643.56 , 1018.44
+282.93 , -35338.92 , -869.86
+282.93 , -33571.97 , -827.96
+282.93 , -31805.03 , -785.77
+282.93 , -30038.08 , -743.28
+282.93 , -28271.13 , -700.50
+282.93 , -26504.19 , -657.42
+282.93 , -24737.24 , -614.05
+282.93 , -22970.30 , -570.39
+282.93 , -21203.35 , -526.44
+282.93 , -19436.40 , -482.19
+282.93 , -17669.46 , -437.65
+282.93 , -15902.51 , -392.82
+282.93 , -14135.57 , -347.69
+282.93 , -12368.62 , -302.26
+282.93 , -10601.68 , -256.52
+282.93 , -8834.73 , -210.46
+282.93 , -7067.78 , -164.04
+282.93 , -5300.84 , -117.17
+282.93 , -3533.89 , -69.54
+282.93 , -1766.95 , -18.27
+282.93 , -353.39 , 0.00
+282.93 , 306.44 , 26.49
+282.93 , 1532.18 , 72.10
+282.93 , 3064.36 , 124.50
+282.93 , 4596.53 , 176.46
+282.93 , 6128.71 , 228.49
+282.93 , 7660.89 , 280.71
+282.93 , 9193.07 , 333.18
+282.93 , 10725.24 , 385.90
+282.93 , 12257.42 , 438.89
+282.93 , 13789.60 , 492.16
+282.93 , 15321.78 , 545.71
+282.93 , 16853.96 , 599.54
+282.93 , 18386.13 , 653.64
+282.93 , 19918.31 , 708.03
+282.93 , 21450.49 , 762.71
+282.93 , 22982.67 , 817.66
+282.93 , 24514.85 , 872.89
+282.93 , 26047.02 , 928.41
+282.93 , 27579.20 , 984.20
+282.93 , 29111.38 , 1040.27
+282.93 , 30643.56 , 1096.63
+301.79 , -35338.92 , -921.56
+301.79 , -33571.97 , -877.23
+301.79 , -31805.03 , -832.56
+301.79 , -30038.08 , -787.56
+301.79 , -28271.13 , -742.22
+301.79 , -26504.19 , -696.56
+301.79 , -24737.24 , -650.56
+301.79 , -22970.30 , -604.23
+301.79 , -21203.35 , -557.56
+301.79 , -19436.40 , -510.57
+301.79 , -17669.46 , -463.24
+301.79 , -15902.51 , -415.58
+301.79 , -14135.57 , -367.58
+301.79 , -12368.62 , -319.24
+301.79 , -10601.68 , -270.55
+301.79 , -8834.73 , -221.48
+301.79 , -7067.78 , -171.99
+301.79 , -5300.84 , -121.95
+301.79 , -3533.89 , -70.93
+301.79 , -1766.95 , -14.10
+301.79 , -353.39 , 0.00
+301.79 , 306.44 , 29.68
+301.79 , 1532.18 , 79.05
+301.79 , 3064.36 , 135.20
+301.79 , 4596.53 , 190.76
+301.79 , 6128.71 , 246.36
+301.79 , 7660.89 , 302.17
+301.79 , 9193.07 , 358.24
+301.79 , 10725.24 , 414.60
+301.79 , 12257.42 , 471.27
+301.79 , 13789.60 , 528.24
+301.79 , 15321.78 , 585.52
+301.79 , 16853.96 , 643.12
+301.79 , 18386.13 , 701.03
+301.79 , 19918.31 , 759.26
+301.79 , 21450.49 , 817.80
+301.79 , 22982.67 , 876.66
+301.79 , 24514.85 , 935.84
+301.79 , 26047.02 , 995.34
+301.79 , 27579.20 , 1055.15
+301.79 , 29111.38 , 1115.27
+301.79 , 30643.56 , 1175.71
+320.65 , -35338.92 , -972.24
+320.65 , -33571.97 , -925.52
+320.65 , -31805.03 , -878.43
+320.65 , -30038.08 , -830.96
+320.65 , -28271.13 , -783.11
+320.65 , -26504.19 , -734.89
+320.65 , -24737.24 , -686.30
+320.65 , -22970.30 , -637.33
+320.65 , -21203.35 , -587.99
+320.65 , -19436.40 , -538.28
+320.65 , -17669.46 , -488.19
+320.65 , -15902.51 , -437.72
+320.65 , -14135.57 , -386.87
+320.65 , -12368.62 , -335.63
+320.65 , -10601.68 , -283.99
+320.65 , -8834.73 , -231.92
+320.65 , -7067.78 , -179.35
+320.65 , -5300.84 , -126.12
+320.65 , -3533.89 , -71.60
+320.65 , -1766.95 , -6.45
+320.65 , -353.39 , 0.00
+320.65 , 306.44 , 33.08
+320.65 , 1532.18 , 86.37
+320.65 , 3064.36 , 146.31
+320.65 , 4596.53 , 205.50
+320.65 , 6128.71 , 264.70
+320.65 , 7660.89 , 324.11
+320.65 , 9193.07 , 383.81
+320.65 , 10725.24 , 443.83
+320.65 , 12257.42 , 504.18
+320.65 , 13789.60 , 564.87
+320.65 , 15321.78 , 625.91
+320.65 , 16853.96 , 687.30
+320.65 , 18386.13 , 749.05
+320.65 , 19918.31 , 811.14
+320.65 , 21450.49 , 873.59
+320.65 , 22982.67 , 936.40
+320.65 , 24514.85 , 999.56
+320.65 , 26047.02 , 1063.07
+320.65 , 27579.20 , 1126.93
+320.65 , 29111.38 , 1191.14
+320.65 , 30643.56 , 1255.71
+339.52 , -35338.92 , -1021.86
+339.52 , -33571.97 , -972.81
+339.52 , -31805.03 , -923.33
+339.52 , -30038.08 , -873.44
+339.52 , -28271.13 , -823.13
+339.52 , -26504.19 , -772.39
+339.52 , -24737.24 , -721.24
+339.52 , -22970.30 , -669.67
+339.52 , -21203.35 , -617.68
+339.52 , -19436.40 , -565.27
+339.52 , -17669.46 , -512.45
+339.52 , -15902.51 , -459.19
+339.52 , -14135.57 , -405.51
+339.52 , -12368.62 , -351.39
+339.52 , -10601.68 , -296.81
+339.52 , -8834.73 , -241.73
+339.52 , -7067.78 , -186.07
+339.52 , -5300.84 , -129.61
+339.52 , -3533.89 , -71.46
+339.52 , -1766.95 , 0.00
+339.52 , -353.39 , 0.00
+339.52 , 306.44 , 36.70
+339.52 , 1532.18 , 94.04
+339.52 , 3064.36 , 157.85
+339.52 , 4596.53 , 220.70
+339.52 , 6128.71 , 283.52
+339.52 , 7660.89 , 346.56
+339.52 , 9193.07 , 409.90
+339.52 , 10725.24 , 473.59
+339.52 , 12257.42 , 537.65
+339.52 , 13789.60 , 602.09
+339.52 , 15321.78 , 666.91
+339.52 , 16853.96 , 732.12
+339.52 , 18386.13 , 797.72
+339.52 , 19918.31 , 863.72
+339.52 , 21450.49 , 930.10
+339.52 , 22982.67 , 996.88
+339.52 , 24514.85 , 1064.05
+339.52 , 26047.02 , 1131.62
+339.52 , 27579.20 , 1199.57
+339.52 , 29111.38 , 1267.92
+339.52 , 30643.56 , 1336.65
+358.38 , -35338.92 , -1070.37
+358.38 , -33571.97 , -1019.04
+358.38 , -31805.03 , -967.24
+358.38 , -30038.08 , -914.96
+358.38 , -28271.13 , -862.23
+358.38 , -26504.19 , -809.02
+358.38 , -24737.24 , -755.35
+358.38 , -22970.30 , -701.21
+358.38 , -21203.35 , -646.60
+358.38 , -19436.40 , -591.53
+358.38 , -17669.46 , -535.99
+358.38 , -15902.51 , -479.97
+358.38 , -14135.57 , -423.47
+358.38 , -12368.62 , -366.48
+358.38 , -10601.68 , -308.96
+358.38 , -8834.73 , -250.88
+358.38 , -7067.78 , -192.11
+358.38 , -5300.84 , -132.36
+358.38 , -3533.89 , -70.38
+358.38 , -1766.95 , 0.00
+358.38 , -353.39 , 0.00
+358.38 , 306.44 , 40.53
+358.38 , 1532.18 , 102.10
+358.38 , 3064.36 , 169.83
+358.38 , 4596.53 , 236.37
+358.38 , 6128.71 , 302.84
+358.38 , 7660.89 , 369.53
+358.38 , 9193.07 , 436.54
+358.38 , 10725.24 , 503.92
+358.38 , 12257.42 , 571.71
+358.38 , 13789.60 , 639.91
+358.38 , 15321.78 , 708.54
+358.38 , 16853.96 , 777.59
+358.38 , 18386.13 , 847.08
+358.38 , 19918.31 , 917.00
+358.38 , 21450.49 , 987.35
+358.38 , 22982.67 , 1058.14
+358.38 , 24514.85 , 1129.36
+358.38 , 26047.02 , 1201.01
+358.38 , 27579.20 , 1273.09
+358.38 , 29111.38 , 1345.61
+358.38 , 30643.56 , 1418.56
+377.24 , -35338.92 , -1117.74
+377.24 , -33571.97 , -1064.18
+377.24 , -31805.03 , -1010.10
+377.24 , -30038.08 , -955.49
+377.24 , -28271.13 , -900.37
+377.24 , -26504.19 , -844.73
+377.24 , -24737.24 , -788.58
+377.24 , -22970.30 , -731.90
+377.24 , -21203.35 , -674.71
+377.24 , -19436.40 , -617.00
+377.24 , -17669.46 , -558.77
+377.24 , -15902.51 , -500.01
+377.24 , -14135.57 , -440.71
+377.24 , -12368.62 , -380.85
+377.24 , -10601.68 , -320.40
+377.24 , -8834.73 , -259.31
+377.24 , -7067.78 , -197.41
+377.24 , -5300.84 , -134.30
+377.24 , -3533.89 , -68.24
+377.24 , -1766.95 , 0.00
+377.24 , -353.39 , 0.00
+377.24 , 306.44 , 44.59
+377.24 , 1532.18 , 110.53
+377.24 , 3064.36 , 182.27
+377.24 , 4596.53 , 252.55
+377.24 , 6128.71 , 322.69
+377.24 , 7660.89 , 393.04
+377.24 , 9193.07 , 463.74
+377.24 , 10725.24 , 534.84
+377.24 , 12257.42 , 606.37
+377.24 , 13789.60 , 678.37
+377.24 , 15321.78 , 750.82
+377.24 , 16853.96 , 823.74
+377.24 , 18386.13 , 897.14
+377.24 , 19918.31 , 971.01
+377.24 , 21450.49 , 1045.36
+377.24 , 22982.67 , 1120.19
+377.24 , 24514.85 , 1195.49
+377.24 , 26047.02 , 1271.27
+377.24 , 27579.20 , 1347.52
+377.24 , 29111.38 , 1424.25
+377.24 , 30643.56 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_2.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_3.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..07feb55aeb84a3946955f362d5131493fe83d565
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -11414.26 , 0.00
+0.00 , -10843.55 , 0.00
+0.00 , -10272.84 , 0.00
+0.00 , -9702.12 , 0.00
+0.00 , -9131.41 , 0.00
+0.00 , -8560.70 , 0.00
+0.00 , -7989.99 , -0.13
+0.00 , -7419.27 , -0.66
+0.00 , -6848.56 , -0.98
+0.00 , -6277.85 , -1.19
+0.00 , -5707.13 , -1.32
+0.00 , -5136.42 , -1.38
+0.00 , -4565.71 , -1.39
+0.00 , -3994.99 , -1.35
+0.00 , -3424.28 , -1.26
+0.00 , -2853.57 , -1.13
+0.00 , -2282.85 , -0.97
+0.00 , -1712.14 , -0.77
+0.00 , -1141.43 , -0.53
+0.00 , -570.71 , -0.27
+0.00 , -114.14 , -0.02
+0.00 , 103.14 , 0.13
+0.00 , 515.72 , 0.56
+0.00 , 1031.44 , 1.12
+0.00 , 1547.16 , 1.70
+0.00 , 2062.88 , 2.31
+0.00 , 2578.60 , 2.93
+0.00 , 3094.32 , 3.58
+0.00 , 3610.04 , 4.25
+0.00 , 4125.76 , 4.93
+0.00 , 4641.48 , 5.64
+0.00 , 5157.20 , 6.37
+0.00 , 5672.91 , 7.12
+0.00 , 6188.63 , 7.88
+0.00 , 6704.35 , 8.67
+0.00 , 7220.07 , 9.47
+0.00 , 7735.79 , 10.29
+0.00 , 8251.51 , 11.13
+0.00 , 8767.23 , 11.99
+0.00 , 9282.95 , 12.87
+0.00 , 9798.67 , 13.76
+0.00 , 10314.39 , 14.67
+5.72 , -11414.26 , 0.00
+5.72 , -10843.55 , 0.00
+5.72 , -10272.84 , 0.00
+5.72 , -9702.12 , 0.00
+5.72 , -9131.41 , 0.00
+5.72 , -8560.70 , 0.00
+5.72 , -7989.99 , -0.50
+5.72 , -7419.27 , -0.84
+5.72 , -6848.56 , -1.04
+5.72 , -6277.85 , -1.16
+5.72 , -5707.13 , -1.22
+5.72 , -5136.42 , -1.24
+5.72 , -4565.71 , -1.21
+5.72 , -3994.99 , -1.15
+5.72 , -3424.28 , -1.06
+5.72 , -2853.57 , -0.94
+5.72 , -2282.85 , -0.80
+5.72 , -1712.14 , -0.62
+5.72 , -1141.43 , -0.43
+5.72 , -570.71 , -0.21
+5.72 , -114.14 , -0.02
+5.72 , 103.14 , 0.10
+5.72 , 515.72 , 0.43
+5.72 , 1031.44 , 0.85
+5.72 , 1547.16 , 1.30
+5.72 , 2062.88 , 1.75
+5.72 , 2578.60 , 2.23
+5.72 , 3094.32 , 2.71
+5.72 , 3610.04 , 3.21
+5.72 , 4125.76 , 3.73
+5.72 , 4641.48 , 4.26
+5.72 , 5157.20 , 4.80
+5.72 , 5672.91 , 5.36
+5.72 , 6188.63 , 5.93
+5.72 , 6704.35 , 6.52
+5.72 , 7220.07 , 7.12
+5.72 , 7735.79 , 7.73
+5.72 , 8251.51 , 8.35
+5.72 , 8767.23 , 8.99
+5.72 , 9282.95 , 9.64
+5.72 , 9798.67 , 10.30
+5.72 , 10314.39 , 10.98
+57.21 , -11414.26 , -58.10
+57.21 , -10843.55 , -55.37
+57.21 , -10272.84 , -52.62
+57.21 , -9702.12 , -49.85
+57.21 , -9131.41 , -47.06
+57.21 , -8560.70 , -44.25
+57.21 , -7989.99 , -41.42
+57.21 , -7419.27 , -38.57
+57.21 , -6848.56 , -35.70
+57.21 , -6277.85 , -32.81
+57.21 , -5707.13 , -29.90
+57.21 , -5136.42 , -26.98
+57.21 , -4565.71 , -24.03
+57.21 , -3994.99 , -21.07
+57.21 , -3424.28 , -18.08
+57.21 , -2853.57 , -15.08
+57.21 , -2282.85 , -12.06
+57.21 , -1712.14 , -9.02
+57.21 , -1141.43 , -5.96
+57.21 , -570.71 , -2.88
+57.21 , -114.14 , -0.37
+57.21 , 103.14 , 0.90
+57.21 , 515.72 , 3.68
+57.21 , 1031.44 , 7.16
+57.21 , 1547.16 , 10.66
+57.21 , 2062.88 , 14.17
+57.21 , 2578.60 , 17.71
+57.21 , 3094.32 , 21.26
+57.21 , 3610.04 , 24.84
+57.21 , 4125.76 , 28.43
+57.21 , 4641.48 , 32.04
+57.21 , 5157.20 , 35.67
+57.21 , 5672.91 , 39.32
+57.21 , 6188.63 , 42.99
+57.21 , 6704.35 , 46.68
+57.21 , 7220.07 , 50.38
+57.21 , 7735.79 , 54.11
+57.21 , 8251.51 , 57.85
+57.21 , 8767.23 , 61.61
+57.21 , 9282.95 , 65.39
+57.21 , 9798.67 , 69.19
+57.21 , 10314.39 , 73.01
+114.41 , -11414.26 , -120.57
+114.41 , -10843.55 , -114.73
+114.41 , -10272.84 , -108.87
+114.41 , -9702.12 , -102.99
+114.41 , -9131.41 , -97.08
+114.41 , -8560.70 , -91.15
+114.41 , -7989.99 , -85.20
+114.41 , -7419.27 , -79.23
+114.41 , -6848.56 , -73.23
+114.41 , -6277.85 , -67.21
+114.41 , -5707.13 , -61.17
+114.41 , -5136.42 , -55.10
+114.41 , -4565.71 , -49.01
+114.41 , -3994.99 , -42.90
+114.41 , -3424.28 , -36.77
+114.41 , -2853.57 , -30.61
+114.41 , -2282.85 , -24.43
+114.41 , -1712.14 , -18.23
+114.41 , -1141.43 , -12.01
+114.41 , -570.71 , -5.76
+114.41 , -114.14 , -0.66
+114.41 , 103.14 , 1.84
+114.41 , 515.72 , 7.35
+114.41 , 1031.44 , 14.22
+114.41 , 1547.16 , 21.11
+114.41 , 2062.88 , 28.02
+114.41 , 2578.60 , 34.96
+114.41 , 3094.32 , 41.92
+114.41 , 3610.04 , 48.90
+114.41 , 4125.76 , 55.90
+114.41 , 4641.48 , 62.93
+114.41 , 5157.20 , 69.98
+114.41 , 5672.91 , 77.05
+114.41 , 6188.63 , 84.15
+114.41 , 6704.35 , 91.27
+114.41 , 7220.07 , 98.41
+114.41 , 7735.79 , 105.58
+114.41 , 8251.51 , 112.76
+114.41 , 8767.23 , 119.97
+114.41 , 9282.95 , 127.21
+114.41 , 9798.67 , 134.46
+114.41 , 10314.39 , 141.74
+171.62 , -11414.26 , -182.44
+171.62 , -10843.55 , -173.55
+171.62 , -10272.84 , -164.62
+171.62 , -9702.12 , -155.67
+171.62 , -9131.41 , -146.69
+171.62 , -8560.70 , -137.68
+171.62 , -7989.99 , -128.65
+171.62 , -7419.27 , -119.58
+171.62 , -6848.56 , -110.49
+171.62 , -6277.85 , -101.36
+171.62 , -5707.13 , -92.21
+171.62 , -5136.42 , -83.03
+171.62 , -4565.71 , -73.82
+171.62 , -3994.99 , -64.58
+171.62 , -3424.28 , -55.31
+171.62 , -2853.57 , -46.02
+171.62 , -2282.85 , -36.70
+171.62 , -1712.14 , -27.34
+171.62 , -1141.43 , -17.96
+171.62 , -570.71 , -8.54
+171.62 , -114.14 , -0.79
+171.62 , 103.14 , 2.86
+171.62 , 515.72 , 11.12
+171.62 , 1031.44 , 21.39
+171.62 , 1547.16 , 31.68
+171.62 , 2062.88 , 41.99
+171.62 , 2578.60 , 52.34
+171.62 , 3094.32 , 62.71
+171.62 , 3610.04 , 73.12
+171.62 , 4125.76 , 83.55
+171.62 , 4641.48 , 94.01
+171.62 , 5157.20 , 104.50
+171.62 , 5672.91 , 115.02
+171.62 , 6188.63 , 125.57
+171.62 , 6704.35 , 136.15
+171.62 , 7220.07 , 146.76
+171.62 , 7735.79 , 157.40
+171.62 , 8251.51 , 168.06
+171.62 , 8767.23 , 178.76
+171.62 , 9282.95 , 189.48
+171.62 , 9798.67 , 200.23
+171.62 , 10314.39 , 211.02
+228.82 , -11414.26 , -243.71
+228.82 , -10843.55 , -231.81
+228.82 , -10272.84 , -219.87
+228.82 , -9702.12 , -207.89
+228.82 , -9131.41 , -195.88
+228.82 , -8560.70 , -183.83
+228.82 , -7989.99 , -171.74
+228.82 , -7419.27 , -159.61
+228.82 , -6848.56 , -147.45
+228.82 , -6277.85 , -135.25
+228.82 , -5707.13 , -123.01
+228.82 , -5136.42 , -110.74
+228.82 , -4565.71 , -98.43
+228.82 , -3994.99 , -86.08
+228.82 , -3424.28 , -73.70
+228.82 , -2853.57 , -61.27
+228.82 , -2282.85 , -48.82
+228.82 , -1712.14 , -36.32
+228.82 , -1141.43 , -23.78
+228.82 , -570.71 , -11.19
+228.82 , -114.14 , -0.63
+228.82 , 103.14 , 3.98
+228.82 , 515.72 , 15.01
+228.82 , 1031.44 , 28.68
+228.82 , 1547.16 , 42.37
+228.82 , 2062.88 , 56.10
+228.82 , 2578.60 , 69.87
+228.82 , 3094.32 , 83.67
+228.82 , 3610.04 , 97.52
+228.82 , 4125.76 , 111.40
+228.82 , 4641.48 , 125.31
+228.82 , 5157.20 , 139.27
+228.82 , 5672.91 , 153.26
+228.82 , 6188.63 , 167.29
+228.82 , 6704.35 , 181.36
+228.82 , 7220.07 , 195.46
+228.82 , 7735.79 , 209.61
+228.82 , 8251.51 , 223.79
+228.82 , 8767.23 , 238.01
+228.82 , 9282.95 , 252.26
+228.82 , 9798.67 , 266.56
+228.82 , 10314.39 , 280.89
+286.03 , -11414.26 , -304.37
+286.03 , -10843.55 , -289.50
+286.03 , -10272.84 , -274.59
+286.03 , -9702.12 , -259.63
+286.03 , -9131.41 , -244.61
+286.03 , -8560.70 , -229.56
+286.03 , -7989.99 , -214.45
+286.03 , -7419.27 , -199.30
+286.03 , -6848.56 , -184.10
+286.03 , -6277.85 , -168.85
+286.03 , -5707.13 , -153.55
+286.03 , -5136.42 , -138.20
+286.03 , -4565.71 , -122.81
+286.03 , -3994.99 , -107.37
+286.03 , -3424.28 , -91.88
+286.03 , -2853.57 , -76.35
+286.03 , -2282.85 , -60.76
+286.03 , -1712.14 , -45.13
+286.03 , -1141.43 , -29.44
+286.03 , -570.71 , -13.67
+286.03 , -114.14 , 0.00
+286.03 , 103.14 , 5.21
+286.03 , 515.72 , 19.04
+286.03 , 1031.44 , 36.13
+286.03 , 1547.16 , 53.24
+286.03 , 2062.88 , 70.39
+286.03 , 2578.60 , 87.59
+286.03 , 3094.32 , 104.83
+286.03 , 3610.04 , 122.13
+286.03 , 4125.76 , 139.47
+286.03 , 4641.48 , 156.87
+286.03 , 5157.20 , 174.31
+286.03 , 5672.91 , 191.80
+286.03 , 6188.63 , 209.33
+286.03 , 6704.35 , 226.92
+286.03 , 7220.07 , 244.56
+286.03 , 7735.79 , 262.24
+286.03 , 8251.51 , 279.97
+286.03 , 8767.23 , 297.76
+286.03 , 9282.95 , 315.58
+286.03 , 9798.67 , 333.46
+286.03 , 10314.39 , 351.39
+343.23 , -11414.26 , -364.37
+343.23 , -10843.55 , -346.59
+343.23 , -10272.84 , -328.74
+343.23 , -9702.12 , -310.84
+343.23 , -9131.41 , -292.87
+343.23 , -8560.70 , -274.84
+343.23 , -7989.99 , -256.75
+343.23 , -7419.27 , -238.60
+343.23 , -6848.56 , -220.39
+343.23 , -6277.85 , -202.12
+343.23 , -5707.13 , -183.79
+343.23 , -5136.42 , -165.40
+343.23 , -4565.71 , -146.94
+343.23 , -3994.99 , -128.43
+343.23 , -3424.28 , -109.85
+343.23 , -2853.57 , -91.21
+343.23 , -2282.85 , -72.51
+343.23 , -1712.14 , -53.75
+343.23 , -1141.43 , -34.91
+343.23 , -570.71 , -15.95
+343.23 , -114.14 , 0.00
+343.23 , 103.14 , 6.58
+343.23 , 515.72 , 23.25
+343.23 , 1031.44 , 43.76
+343.23 , 1547.16 , 64.29
+343.23 , 2062.88 , 84.87
+343.23 , 2578.60 , 105.52
+343.23 , 3094.32 , 126.22
+343.23 , 3610.04 , 146.98
+343.23 , 4125.76 , 167.81
+343.23 , 4641.48 , 188.70
+343.23 , 5157.20 , 209.65
+343.23 , 5672.91 , 230.66
+343.23 , 6188.63 , 251.73
+343.23 , 6704.35 , 272.87
+343.23 , 7220.07 , 294.07
+343.23 , 7735.79 , 315.33
+343.23 , 8251.51 , 336.65
+343.23 , 8767.23 , 358.03
+343.23 , 9282.95 , 379.47
+343.23 , 9798.67 , 400.98
+343.23 , 10314.39 , 422.54
+400.44 , -11414.26 , -423.69
+400.44 , -10843.55 , -403.04
+400.44 , -10272.84 , -382.31
+400.44 , -9702.12 , -361.50
+400.44 , -9131.41 , -340.62
+400.44 , -8560.70 , -319.66
+400.44 , -7989.99 , -298.62
+400.44 , -7419.27 , -277.51
+400.44 , -6848.56 , -256.31
+400.44 , -6277.85 , -235.05
+400.44 , -5707.13 , -213.70
+400.44 , -5136.42 , -192.28
+400.44 , -4565.71 , -170.79
+400.44 , -3994.99 , -149.21
+400.44 , -3424.28 , -127.57
+400.44 , -2853.57 , -105.84
+400.44 , -2282.85 , -84.03
+400.44 , -1712.14 , -62.14
+400.44 , -1141.43 , -40.16
+400.44 , -570.71 , -18.00
+400.44 , -114.14 , 0.00
+400.44 , 103.14 , 8.09
+400.44 , 515.72 , 27.64
+400.44 , 1031.44 , 51.59
+400.44 , 1547.16 , 75.56
+400.44 , 2062.88 , 99.58
+400.44 , 2578.60 , 123.68
+400.44 , 3094.32 , 147.86
+400.44 , 3610.04 , 172.10
+400.44 , 4125.76 , 196.43
+400.44 , 4641.48 , 220.84
+400.44 , 5157.20 , 245.32
+400.44 , 5672.91 , 269.88
+400.44 , 6188.63 , 294.51
+400.44 , 6704.35 , 319.23
+400.44 , 7220.07 , 344.02
+400.44 , 7735.79 , 368.89
+400.44 , 8251.51 , 393.83
+400.44 , 8767.23 , 418.85
+400.44 , 9282.95 , 443.95
+400.44 , 9798.67 , 469.13
+400.44 , 10314.39 , 494.38
+457.64 , -11414.26 , -482.31
+457.64 , -10843.55 , -458.83
+457.64 , -10272.84 , -435.26
+457.64 , -9702.12 , -411.59
+457.64 , -9131.41 , -387.83
+457.64 , -8560.70 , -363.97
+457.64 , -7989.99 , -340.02
+457.64 , -7419.27 , -315.97
+457.64 , -6848.56 , -291.83
+457.64 , -6277.85 , -267.59
+457.64 , -5707.13 , -243.26
+457.64 , -5136.42 , -218.84
+457.64 , -4565.71 , -194.32
+457.64 , -3994.99 , -169.71
+457.64 , -3424.28 , -145.00
+457.64 , -2853.57 , -120.19
+457.64 , -2282.85 , -95.29
+457.64 , -1712.14 , -70.28
+457.64 , -1141.43 , -45.14
+457.64 , -570.71 , -19.76
+457.64 , -114.14 , 0.00
+457.64 , 103.14 , 9.76
+457.64 , 515.72 , 32.25
+457.64 , 1031.44 , 59.66
+457.64 , 1547.16 , 87.07
+457.64 , 2062.88 , 114.55
+457.64 , 2578.60 , 142.11
+457.64 , 3094.32 , 169.77
+457.64 , 3610.04 , 197.52
+457.64 , 4125.76 , 225.37
+457.64 , 4641.48 , 253.31
+457.64 , 5157.20 , 281.34
+457.64 , 5672.91 , 309.47
+457.64 , 6188.63 , 337.70
+457.64 , 6704.35 , 366.02
+457.64 , 7220.07 , 394.44
+457.64 , 7735.79 , 422.95
+457.64 , 8251.51 , 451.56
+457.64 , 8767.23 , 480.26
+457.64 , 9282.95 , 509.05
+457.64 , 9798.67 , 537.94
+457.64 , 10314.39 , 566.93
+514.85 , -11414.26 , -540.17
+514.85 , -10843.55 , -513.92
+514.85 , -10272.84 , -487.55
+514.85 , -9702.12 , -461.06
+514.85 , -9131.41 , -434.46
+514.85 , -8560.70 , -407.75
+514.85 , -7989.99 , -380.92
+514.85 , -7419.27 , -353.97
+514.85 , -6848.56 , -326.91
+514.85 , -6277.85 , -299.73
+514.85 , -5707.13 , -272.44
+514.85 , -5136.42 , -245.03
+514.85 , -4565.71 , -217.51
+514.85 , -3994.99 , -189.87
+514.85 , -3424.28 , -162.12
+514.85 , -2853.57 , -134.25
+514.85 , -2282.85 , -106.26
+514.85 , -1712.14 , -78.13
+514.85 , -1141.43 , -49.84
+514.85 , -570.71 , -21.19
+514.85 , -114.14 , 0.00
+514.85 , 103.14 , 11.59
+514.85 , 515.72 , 37.10
+514.85 , 1031.44 , 67.98
+514.85 , 1547.16 , 98.85
+514.85 , 2062.88 , 129.79
+514.85 , 2578.60 , 160.84
+514.85 , 3094.32 , 191.99
+514.85 , 3610.04 , 223.26
+514.85 , 4125.76 , 254.64
+514.85 , 4641.48 , 286.14
+514.85 , 5157.20 , 317.75
+514.85 , 5672.91 , 349.48
+514.85 , 6188.63 , 381.32
+514.85 , 6704.35 , 413.28
+514.85 , 7220.07 , 445.36
+514.85 , 7735.79 , 477.54
+514.85 , 8251.51 , 509.85
+514.85 , 8767.23 , 542.27
+514.85 , 9282.95 , 574.80
+514.85 , 9798.67 , 607.45
+514.85 , 10314.39 , 640.21
+572.06 , -11414.26 , -597.26
+572.06 , -10843.55 , -568.28
+572.06 , -10272.84 , -539.16
+572.06 , -9702.12 , -509.90
+572.06 , -9131.41 , -480.50
+572.06 , -8560.70 , -450.96
+572.06 , -7989.99 , -421.28
+572.06 , -7419.27 , -391.47
+572.06 , -6848.56 , -361.52
+572.06 , -6277.85 , -331.43
+572.06 , -5707.13 , -301.20
+572.06 , -5136.42 , -270.83
+572.06 , -4565.71 , -240.33
+572.06 , -3994.99 , -209.68
+572.06 , -3424.28 , -178.90
+572.06 , -2853.57 , -147.97
+572.06 , -2282.85 , -116.90
+572.06 , -1712.14 , -85.66
+572.06 , -1141.43 , -54.21
+572.06 , -570.71 , -22.23
+572.06 , -114.14 , 0.00
+572.06 , 103.14 , 13.60
+572.06 , 515.72 , 42.20
+572.06 , 1031.44 , 76.58
+572.06 , 1547.16 , 110.92
+572.06 , 2062.88 , 145.34
+572.06 , 2578.60 , 179.88
+572.06 , 3094.32 , 214.55
+572.06 , 3610.04 , 249.35
+572.06 , 4125.76 , 284.29
+572.06 , 4641.48 , 319.36
+572.06 , 5157.20 , 354.57
+572.06 , 5672.91 , 389.92
+572.06 , 6188.63 , 425.41
+572.06 , 6704.35 , 461.03
+572.06 , 7220.07 , 496.79
+572.06 , 7735.79 , 532.69
+572.06 , 8251.51 , 568.73
+572.06 , 8767.23 , 604.90
+572.06 , 9282.95 , 641.21
+572.06 , 9798.67 , 677.66
+572.06 , 10314.39 , 714.24
+629.26 , -11414.26 , -653.54
+629.26 , -10843.55 , -621.88
+629.26 , -10272.84 , -590.05
+629.26 , -9702.12 , -558.06
+629.26 , -9131.41 , -525.90
+629.26 , -8560.70 , -493.58
+629.26 , -7989.99 , -461.09
+629.26 , -7419.27 , -428.44
+629.26 , -6848.56 , -395.63
+629.26 , -6277.85 , -362.65
+629.26 , -5707.13 , -329.51
+629.26 , -5136.42 , -296.21
+629.26 , -4565.71 , -262.74
+629.26 , -3994.99 , -229.11
+629.26 , -3424.28 , -195.31
+629.26 , -2853.57 , -161.34
+629.26 , -2282.85 , -127.18
+629.26 , -1712.14 , -92.83
+629.26 , -1141.43 , -58.20
+629.26 , -570.71 , -22.82
+629.26 , -114.14 , 0.00
+629.26 , 103.14 , 15.79
+629.26 , 515.72 , 47.58
+629.26 , 1031.44 , 85.48
+629.26 , 1547.16 , 123.30
+629.26 , 2062.88 , 161.22
+629.26 , 2578.60 , 199.26
+629.26 , 3094.32 , 237.46
+629.26 , 3610.04 , 275.81
+629.26 , 4125.76 , 314.32
+629.26 , 4641.48 , 352.99
+629.26 , 5157.20 , 391.83
+629.26 , 5672.91 , 430.82
+629.26 , 6188.63 , 469.98
+629.26 , 6704.35 , 509.30
+629.26 , 7220.07 , 548.78
+629.26 , 7735.79 , 588.42
+629.26 , 8251.51 , 628.23
+629.26 , 8767.23 , 668.20
+629.26 , 9282.95 , 708.32
+629.26 , 9798.67 , 748.61
+629.26 , 10314.39 , 789.06
+686.47 , -11414.26 , -708.97
+686.47 , -10843.55 , -674.68
+686.47 , -10272.84 , -640.19
+686.47 , -9702.12 , -605.51
+686.47 , -9131.41 , -570.63
+686.47 , -8560.70 , -535.56
+686.47 , -7989.99 , -500.30
+686.47 , -7419.27 , -464.85
+686.47 , -6848.56 , -429.21
+686.47 , -6277.85 , -393.37
+686.47 , -5707.13 , -357.35
+686.47 , -5136.42 , -321.13
+686.47 , -4565.71 , -284.71
+686.47 , -3994.99 , -248.11
+686.47 , -3424.28 , -211.31
+686.47 , -2853.57 , -174.30
+686.47 , -2282.85 , -137.08
+686.47 , -1712.14 , -99.61
+686.47 , -1141.43 , -61.78
+686.47 , -570.71 , -22.86
+686.47 , -114.14 , 0.00
+686.47 , 103.14 , 18.17
+686.47 , 515.72 , 53.24
+686.47 , 1031.44 , 94.71
+686.47 , 1547.16 , 136.03
+686.47 , 2062.88 , 177.45
+686.47 , 2578.60 , 219.01
+686.47 , 3094.32 , 260.75
+686.47 , 3610.04 , 302.67
+686.47 , 4125.76 , 344.78
+686.47 , 4641.48 , 387.07
+686.47 , 5157.20 , 429.54
+686.47 , 5672.91 , 472.21
+686.47 , 6188.63 , 515.06
+686.47 , 6704.35 , 558.11
+686.47 , 7220.07 , 601.34
+686.47 , 7735.79 , 644.76
+686.47 , 8251.51 , 688.37
+686.47 , 8767.23 , 732.17
+686.47 , 9282.95 , 776.15
+686.47 , 9798.67 , 820.33
+686.47 , 10314.39 , 864.69
+743.67 , -11414.26 , -763.53
+743.67 , -10843.55 , -726.65
+743.67 , -10272.84 , -689.55
+743.67 , -9702.12 , -652.22
+743.67 , -9131.41 , -614.67
+743.67 , -8560.70 , -576.89
+743.67 , -7989.99 , -538.89
+743.67 , -7419.27 , -500.67
+743.67 , -6848.56 , -462.22
+743.67 , -6277.85 , -423.56
+743.67 , -5707.13 , -384.67
+743.67 , -5136.42 , -345.56
+743.67 , -4565.71 , -306.22
+743.67 , -3994.99 , -266.66
+743.67 , -3424.28 , -226.86
+743.67 , -2853.57 , -186.83
+743.67 , -2282.85 , -146.54
+743.67 , -1712.14 , -105.95
+743.67 , -1141.43 , -64.90
+743.67 , -570.71 , -22.24
+743.67 , -114.14 , 0.00
+743.67 , 103.14 , 20.74
+743.67 , 515.72 , 59.20
+743.67 , 1031.44 , 104.27
+743.67 , 1547.16 , 149.12
+743.67 , 2062.88 , 194.05
+743.67 , 2578.60 , 239.16
+743.67 , 3094.32 , 284.45
+743.67 , 3610.04 , 329.96
+743.67 , 4125.76 , 375.67
+743.67 , 4641.48 , 421.60
+743.67 , 5157.20 , 467.75
+743.67 , 5672.91 , 514.11
+743.67 , 6188.63 , 560.69
+743.67 , 6704.35 , 607.48
+743.67 , 7220.07 , 654.50
+743.67 , 7735.79 , 701.73
+743.67 , 8251.51 , 749.18
+743.67 , 8767.23 , 796.84
+743.67 , 9282.95 , 844.73
+743.67 , 9798.67 , 892.83
+743.67 , 10314.39 , 941.14
+800.88 , -11414.26 , -817.17
+800.88 , -10843.55 , -777.76
+800.88 , -10272.84 , -738.08
+800.88 , -9702.12 , -698.15
+800.88 , -9131.41 , -657.96
+800.88 , -8560.70 , -617.52
+800.88 , -7989.99 , -576.82
+800.88 , -7419.27 , -535.86
+800.88 , -6848.56 , -494.65
+800.88 , -6277.85 , -453.18
+800.88 , -5707.13 , -411.45
+800.88 , -5136.42 , -369.47
+800.88 , -4565.71 , -327.22
+800.88 , -3994.99 , -284.72
+800.88 , -3424.28 , -241.95
+800.88 , -2853.57 , -198.90
+800.88 , -2282.85 , -155.54
+800.88 , -1712.14 , -111.82
+800.88 , -1141.43 , -67.51
+800.88 , -570.71 , -20.80
+800.88 , -114.14 , 0.00
+800.88 , 103.14 , 23.52
+800.88 , 515.72 , 65.48
+800.88 , 1031.44 , 114.20
+800.88 , 1547.16 , 162.59
+800.88 , 2062.88 , 211.06
+800.88 , 2578.60 , 259.72
+800.88 , 3094.32 , 308.59
+800.88 , 3610.04 , 357.69
+800.88 , 4125.76 , 407.04
+800.88 , 4641.48 , 456.62
+800.88 , 5157.20 , 506.46
+800.88 , 5672.91 , 556.54
+800.88 , 6188.63 , 606.87
+800.88 , 6704.35 , 657.45
+800.88 , 7220.07 , 708.28
+800.88 , 7735.79 , 759.35
+800.88 , 8251.51 , 810.68
+800.88 , 8767.23 , 862.25
+800.88 , 9282.95 , 914.07
+800.88 , 9798.67 , 966.13
+800.88 , 10314.39 , 1018.44
+858.08 , -11414.26 , -869.86
+858.08 , -10843.55 , -827.96
+858.08 , -10272.84 , -785.77
+858.08 , -9702.12 , -743.28
+858.08 , -9131.41 , -700.50
+858.08 , -8560.70 , -657.42
+858.08 , -7989.99 , -614.05
+858.08 , -7419.27 , -570.39
+858.08 , -6848.56 , -526.44
+858.08 , -6277.85 , -482.19
+858.08 , -5707.13 , -437.65
+858.08 , -5136.42 , -392.82
+858.08 , -4565.71 , -347.69
+858.08 , -3994.99 , -302.26
+858.08 , -3424.28 , -256.52
+858.08 , -2853.57 , -210.46
+858.08 , -2282.85 , -164.04
+858.08 , -1712.14 , -117.17
+858.08 , -1141.43 , -69.54
+858.08 , -570.71 , -18.27
+858.08 , -114.14 , 0.00
+858.08 , 103.14 , 26.49
+858.08 , 515.72 , 72.10
+858.08 , 1031.44 , 124.50
+858.08 , 1547.16 , 176.46
+858.08 , 2062.88 , 228.49
+858.08 , 2578.60 , 280.71
+858.08 , 3094.32 , 333.18
+858.08 , 3610.04 , 385.90
+858.08 , 4125.76 , 438.89
+858.08 , 4641.48 , 492.16
+858.08 , 5157.20 , 545.71
+858.08 , 5672.91 , 599.54
+858.08 , 6188.63 , 653.64
+858.08 , 6704.35 , 708.03
+858.08 , 7220.07 , 762.71
+858.08 , 7735.79 , 817.66
+858.08 , 8251.51 , 872.89
+858.08 , 8767.23 , 928.41
+858.08 , 9282.95 , 984.20
+858.08 , 9798.67 , 1040.27
+858.08 , 10314.39 , 1096.63
+915.29 , -11414.26 , -921.56
+915.29 , -10843.55 , -877.23
+915.29 , -10272.84 , -832.56
+915.29 , -9702.12 , -787.56
+915.29 , -9131.41 , -742.22
+915.29 , -8560.70 , -696.56
+915.29 , -7989.99 , -650.56
+915.29 , -7419.27 , -604.23
+915.29 , -6848.56 , -557.56
+915.29 , -6277.85 , -510.57
+915.29 , -5707.13 , -463.24
+915.29 , -5136.42 , -415.58
+915.29 , -4565.71 , -367.58
+915.29 , -3994.99 , -319.24
+915.29 , -3424.28 , -270.55
+915.29 , -2853.57 , -221.48
+915.29 , -2282.85 , -171.99
+915.29 , -1712.14 , -121.95
+915.29 , -1141.43 , -70.93
+915.29 , -570.71 , -14.10
+915.29 , -114.14 , 0.00
+915.29 , 103.14 , 29.68
+915.29 , 515.72 , 79.05
+915.29 , 1031.44 , 135.20
+915.29 , 1547.16 , 190.76
+915.29 , 2062.88 , 246.36
+915.29 , 2578.60 , 302.17
+915.29 , 3094.32 , 358.24
+915.29 , 3610.04 , 414.60
+915.29 , 4125.76 , 471.27
+915.29 , 4641.48 , 528.24
+915.29 , 5157.20 , 585.52
+915.29 , 5672.91 , 643.12
+915.29 , 6188.63 , 701.03
+915.29 , 6704.35 , 759.26
+915.29 , 7220.07 , 817.80
+915.29 , 7735.79 , 876.66
+915.29 , 8251.51 , 935.84
+915.29 , 8767.23 , 995.34
+915.29 , 9282.95 , 1055.15
+915.29 , 9798.67 , 1115.27
+915.29 , 10314.39 , 1175.71
+972.50 , -11414.26 , -972.24
+972.50 , -10843.55 , -925.52
+972.50 , -10272.84 , -878.43
+972.50 , -9702.12 , -830.96
+972.50 , -9131.41 , -783.11
+972.50 , -8560.70 , -734.89
+972.50 , -7989.99 , -686.30
+972.50 , -7419.27 , -637.33
+972.50 , -6848.56 , -587.99
+972.50 , -6277.85 , -538.28
+972.50 , -5707.13 , -488.19
+972.50 , -5136.42 , -437.72
+972.50 , -4565.71 , -386.87
+972.50 , -3994.99 , -335.63
+972.50 , -3424.28 , -283.99
+972.50 , -2853.57 , -231.92
+972.50 , -2282.85 , -179.35
+972.50 , -1712.14 , -126.12
+972.50 , -1141.43 , -71.60
+972.50 , -570.71 , -6.45
+972.50 , -114.14 , 0.00
+972.50 , 103.14 , 33.08
+972.50 , 515.72 , 86.37
+972.50 , 1031.44 , 146.31
+972.50 , 1547.16 , 205.50
+972.50 , 2062.88 , 264.70
+972.50 , 2578.60 , 324.11
+972.50 , 3094.32 , 383.81
+972.50 , 3610.04 , 443.83
+972.50 , 4125.76 , 504.18
+972.50 , 4641.48 , 564.87
+972.50 , 5157.20 , 625.91
+972.50 , 5672.91 , 687.30
+972.50 , 6188.63 , 749.05
+972.50 , 6704.35 , 811.14
+972.50 , 7220.07 , 873.59
+972.50 , 7735.79 , 936.40
+972.50 , 8251.51 , 999.56
+972.50 , 8767.23 , 1063.07
+972.50 , 9282.95 , 1126.93
+972.50 , 9798.67 , 1191.14
+972.50 , 10314.39 , 1255.71
+1029.70 , -11414.26 , -1021.86
+1029.70 , -10843.55 , -972.81
+1029.70 , -10272.84 , -923.33
+1029.70 , -9702.12 , -873.44
+1029.70 , -9131.41 , -823.13
+1029.70 , -8560.70 , -772.39
+1029.70 , -7989.99 , -721.24
+1029.70 , -7419.27 , -669.67
+1029.70 , -6848.56 , -617.68
+1029.70 , -6277.85 , -565.27
+1029.70 , -5707.13 , -512.45
+1029.70 , -5136.42 , -459.19
+1029.70 , -4565.71 , -405.51
+1029.70 , -3994.99 , -351.39
+1029.70 , -3424.28 , -296.81
+1029.70 , -2853.57 , -241.73
+1029.70 , -2282.85 , -186.07
+1029.70 , -1712.14 , -129.61
+1029.70 , -1141.43 , -71.46
+1029.70 , -570.71 , 0.00
+1029.70 , -114.14 , 0.00
+1029.70 , 103.14 , 36.70
+1029.70 , 515.72 , 94.04
+1029.70 , 1031.44 , 157.85
+1029.70 , 1547.16 , 220.70
+1029.70 , 2062.88 , 283.52
+1029.70 , 2578.60 , 346.56
+1029.70 , 3094.32 , 409.90
+1029.70 , 3610.04 , 473.59
+1029.70 , 4125.76 , 537.65
+1029.70 , 4641.48 , 602.09
+1029.70 , 5157.20 , 666.91
+1029.70 , 5672.91 , 732.12
+1029.70 , 6188.63 , 797.72
+1029.70 , 6704.35 , 863.72
+1029.70 , 7220.07 , 930.10
+1029.70 , 7735.79 , 996.88
+1029.70 , 8251.51 , 1064.05
+1029.70 , 8767.23 , 1131.62
+1029.70 , 9282.95 , 1199.57
+1029.70 , 9798.67 , 1267.92
+1029.70 , 10314.39 , 1336.65
+1086.91 , -11414.26 , -1070.37
+1086.91 , -10843.55 , -1019.04
+1086.91 , -10272.84 , -967.24
+1086.91 , -9702.12 , -914.96
+1086.91 , -9131.41 , -862.23
+1086.91 , -8560.70 , -809.02
+1086.91 , -7989.99 , -755.35
+1086.91 , -7419.27 , -701.21
+1086.91 , -6848.56 , -646.60
+1086.91 , -6277.85 , -591.53
+1086.91 , -5707.13 , -535.99
+1086.91 , -5136.42 , -479.97
+1086.91 , -4565.71 , -423.47
+1086.91 , -3994.99 , -366.48
+1086.91 , -3424.28 , -308.96
+1086.91 , -2853.57 , -250.88
+1086.91 , -2282.85 , -192.11
+1086.91 , -1712.14 , -132.36
+1086.91 , -1141.43 , -70.38
+1086.91 , -570.71 , 0.00
+1086.91 , -114.14 , 0.00
+1086.91 , 103.14 , 40.53
+1086.91 , 515.72 , 102.10
+1086.91 , 1031.44 , 169.83
+1086.91 , 1547.16 , 236.37
+1086.91 , 2062.88 , 302.84
+1086.91 , 2578.60 , 369.53
+1086.91 , 3094.32 , 436.54
+1086.91 , 3610.04 , 503.92
+1086.91 , 4125.76 , 571.71
+1086.91 , 4641.48 , 639.91
+1086.91 , 5157.20 , 708.54
+1086.91 , 5672.91 , 777.59
+1086.91 , 6188.63 , 847.08
+1086.91 , 6704.35 , 917.00
+1086.91 , 7220.07 , 987.35
+1086.91 , 7735.79 , 1058.14
+1086.91 , 8251.51 , 1129.36
+1086.91 , 8767.23 , 1201.01
+1086.91 , 9282.95 , 1273.09
+1086.91 , 9798.67 , 1345.61
+1086.91 , 10314.39 , 1418.56
+1144.11 , -11414.26 , -1117.74
+1144.11 , -10843.55 , -1064.18
+1144.11 , -10272.84 , -1010.10
+1144.11 , -9702.12 , -955.49
+1144.11 , -9131.41 , -900.37
+1144.11 , -8560.70 , -844.73
+1144.11 , -7989.99 , -788.58
+1144.11 , -7419.27 , -731.90
+1144.11 , -6848.56 , -674.71
+1144.11 , -6277.85 , -617.00
+1144.11 , -5707.13 , -558.77
+1144.11 , -5136.42 , -500.01
+1144.11 , -4565.71 , -440.71
+1144.11 , -3994.99 , -380.85
+1144.11 , -3424.28 , -320.40
+1144.11 , -2853.57 , -259.31
+1144.11 , -2282.85 , -197.41
+1144.11 , -1712.14 , -134.30
+1144.11 , -1141.43 , -68.24
+1144.11 , -570.71 , 0.00
+1144.11 , -114.14 , 0.00
+1144.11 , 103.14 , 44.59
+1144.11 , 515.72 , 110.53
+1144.11 , 1031.44 , 182.27
+1144.11 , 1547.16 , 252.55
+1144.11 , 2062.88 , 322.69
+1144.11 , 2578.60 , 393.04
+1144.11 , 3094.32 , 463.74
+1144.11 , 3610.04 , 534.84
+1144.11 , 4125.76 , 606.37
+1144.11 , 4641.48 , 678.37
+1144.11 , 5157.20 , 750.82
+1144.11 , 5672.91 , 823.74
+1144.11 , 6188.63 , 897.14
+1144.11 , 6704.35 , 971.01
+1144.11 , 7220.07 , 1045.36
+1144.11 , 7735.79 , 1120.19
+1144.11 , 8251.51 , 1195.49
+1144.11 , 8767.23 , 1271.27
+1144.11 , 9282.95 , 1347.52
+1144.11 , 9798.67 , 1424.25
+1144.11 , 10314.39 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..a46cb34e6831d05626e67324b6a261bde045c857
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_drag.viepcd
@@ -0,0 +1,24 @@
+n_out , T_drag_out
+0.00 , -21.84
+5.72 , -22.52
+57.21 , -28.92
+114.41 , -35.99
+171.62 , -43.07
+228.82 , -50.22
+286.03 , -57.30
+343.23 , -64.38
+400.44 , -71.45
+457.65 , -78.53
+514.85 , -85.68
+572.06 , -92.76
+629.26 , -99.84
+686.47 , -106.91
+743.67 , -113.99
+800.88 , -121.14
+858.08 , -128.22
+915.29 , -135.30
+972.50 , -142.37
+1029.70 , -149.45
+1086.91 , -156.60
+1144.11 , -163.68
+
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..100936bf6a5a357b12e1f3c23c4e10d762325c19
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 21.9384
+ },
+ {
+ "Ratio": 12.276
+ },
+ {
+ "Ratio": 7.2336
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3Whl1_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl1_1.viepco",
+ "2": "IEPC_Gbx3Whl1_2.viepco",
+ "3": "IEPC_Gbx3Whl1_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3Whl1_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl1_1.viepco",
+ "2": "IEPC_Gbx3Whl1_2.viepco",
+ "3": "IEPC_Gbx3Whl1_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3Whl1_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..3ca2ea6a86b60aca80b60c4736ccc0708437997a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3Whl1.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..9690d09aa289af9262fcbb00b8ec99eadcce93bf
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx3Whl1.vveh",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_1.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..7d9dd773ee374dc7a818143da159de20d758b556
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -17669.46 , 0.00
+0.00 , -16785.99 , 0.00
+0.00 , -15902.51 , 0.00
+0.00 , -15019.04 , 0.00
+0.00 , -14135.57 , 0.00
+0.00 , -13252.09 , 0.00
+0.00 , -12368.62 , -0.07
+0.00 , -11485.15 , -0.33
+0.00 , -10601.68 , -0.49
+0.00 , -9718.20 , -0.60
+0.00 , -8834.73 , -0.66
+0.00 , -7951.26 , -0.69
+0.00 , -7067.78 , -0.70
+0.00 , -6184.31 , -0.67
+0.00 , -5300.84 , -0.63
+0.00 , -4417.36 , -0.57
+0.00 , -3533.89 , -0.48
+0.00 , -2650.42 , -0.38
+0.00 , -1766.95 , -0.27
+0.00 , -883.47 , -0.13
+0.00 , -176.69 , -0.01
+0.00 , 153.22 , 0.06
+0.00 , 766.09 , 0.28
+0.00 , 1532.18 , 0.56
+0.00 , 2298.27 , 0.85
+0.00 , 3064.36 , 1.15
+0.00 , 3830.44 , 1.47
+0.00 , 4596.53 , 1.79
+0.00 , 5362.62 , 2.12
+0.00 , 6128.71 , 2.47
+0.00 , 6894.80 , 2.82
+0.00 , 7660.89 , 3.19
+0.00 , 8426.98 , 3.56
+0.00 , 9193.07 , 3.94
+0.00 , 9959.16 , 4.33
+0.00 , 10725.24 , 4.74
+0.00 , 11491.33 , 5.15
+0.00 , 12257.42 , 5.57
+0.00 , 13023.51 , 6.00
+0.00 , 13789.60 , 6.43
+0.00 , 14555.69 , 6.88
+0.00 , 15321.78 , 7.34
+1.89 , -17669.46 , 0.00
+1.89 , -16785.99 , 0.00
+1.89 , -15902.51 , 0.00
+1.89 , -15019.04 , 0.00
+1.89 , -14135.57 , 0.00
+1.89 , -13252.09 , 0.00
+1.89 , -12368.62 , -0.25
+1.89 , -11485.15 , -0.42
+1.89 , -10601.68 , -0.52
+1.89 , -9718.20 , -0.58
+1.89 , -8834.73 , -0.61
+1.89 , -7951.26 , -0.62
+1.89 , -7067.78 , -0.61
+1.89 , -6184.31 , -0.58
+1.89 , -5300.84 , -0.53
+1.89 , -4417.36 , -0.47
+1.89 , -3533.89 , -0.40
+1.89 , -2650.42 , -0.31
+1.89 , -1766.95 , -0.22
+1.89 , -883.47 , -0.11
+1.89 , -176.69 , -0.01
+1.89 , 153.22 , 0.05
+1.89 , 766.09 , 0.21
+1.89 , 1532.18 , 0.43
+1.89 , 2298.27 , 0.65
+1.89 , 3064.36 , 0.88
+1.89 , 3830.44 , 1.11
+1.89 , 4596.53 , 1.36
+1.89 , 5362.62 , 1.61
+1.89 , 6128.71 , 1.87
+1.89 , 6894.80 , 2.13
+1.89 , 7660.89 , 2.40
+1.89 , 8426.98 , 2.68
+1.89 , 9193.07 , 2.97
+1.89 , 9959.16 , 3.26
+1.89 , 10725.24 , 3.56
+1.89 , 11491.33 , 3.86
+1.89 , 12257.42 , 4.18
+1.89 , 13023.51 , 4.50
+1.89 , 13789.60 , 4.82
+1.89 , 14555.69 , 5.15
+1.89 , 15321.78 , 5.49
+18.86 , -17669.46 , -29.05
+18.86 , -16785.99 , -27.68
+18.86 , -15902.51 , -26.31
+18.86 , -15019.04 , -24.92
+18.86 , -14135.57 , -23.53
+18.86 , -13252.09 , -22.12
+18.86 , -12368.62 , -20.71
+18.86 , -11485.15 , -19.28
+18.86 , -10601.68 , -17.85
+18.86 , -9718.20 , -16.41
+18.86 , -8834.73 , -14.95
+18.86 , -7951.26 , -13.49
+18.86 , -7067.78 , -12.02
+18.86 , -6184.31 , -10.53
+18.86 , -5300.84 , -9.04
+18.86 , -4417.36 , -7.54
+18.86 , -3533.89 , -6.03
+18.86 , -2650.42 , -4.51
+18.86 , -1766.95 , -2.98
+18.86 , -883.47 , -1.44
+18.86 , -176.69 , -0.18
+18.86 , 153.22 , 0.45
+18.86 , 766.09 , 1.84
+18.86 , 1532.18 , 3.58
+18.86 , 2298.27 , 5.33
+18.86 , 3064.36 , 7.09
+18.86 , 3830.44 , 8.85
+18.86 , 4596.53 , 10.63
+18.86 , 5362.62 , 12.42
+18.86 , 6128.71 , 14.21
+18.86 , 6894.80 , 16.02
+18.86 , 7660.89 , 17.84
+18.86 , 8426.98 , 19.66
+18.86 , 9193.07 , 21.49
+18.86 , 9959.16 , 23.34
+18.86 , 10725.24 , 25.19
+18.86 , 11491.33 , 27.05
+18.86 , 12257.42 , 28.93
+18.86 , 13023.51 , 30.81
+18.86 , 13789.60 , 32.70
+18.86 , 14555.69 , 34.60
+18.86 , 15321.78 , 36.50
+37.72 , -17669.46 , -60.28
+37.72 , -16785.99 , -57.37
+37.72 , -15902.51 , -54.44
+37.72 , -15019.04 , -51.49
+37.72 , -14135.57 , -48.54
+37.72 , -13252.09 , -45.58
+37.72 , -12368.62 , -42.60
+37.72 , -11485.15 , -39.61
+37.72 , -10601.68 , -36.61
+37.72 , -9718.20 , -33.60
+37.72 , -8834.73 , -30.58
+37.72 , -7951.26 , -27.55
+37.72 , -7067.78 , -24.51
+37.72 , -6184.31 , -21.45
+37.72 , -5300.84 , -18.38
+37.72 , -4417.36 , -15.31
+37.72 , -3533.89 , -12.22
+37.72 , -2650.42 , -9.12
+37.72 , -1766.95 , -6.00
+37.72 , -883.47 , -2.88
+37.72 , -176.69 , -0.33
+37.72 , 153.22 , 0.92
+37.72 , 766.09 , 3.68
+37.72 , 1532.18 , 7.11
+37.72 , 2298.27 , 10.56
+37.72 , 3064.36 , 14.01
+37.72 , 3830.44 , 17.48
+37.72 , 4596.53 , 20.96
+37.72 , 5362.62 , 24.45
+37.72 , 6128.71 , 27.95
+37.72 , 6894.80 , 31.47
+37.72 , 7660.89 , 34.99
+37.72 , 8426.98 , 38.53
+37.72 , 9193.07 , 42.08
+37.72 , 9959.16 , 45.64
+37.72 , 10725.24 , 49.21
+37.72 , 11491.33 , 52.79
+37.72 , 12257.42 , 56.38
+37.72 , 13023.51 , 59.99
+37.72 , 13789.60 , 63.60
+37.72 , 14555.69 , 67.23
+37.72 , 15321.78 , 70.87
+56.59 , -17669.46 , -91.22
+56.59 , -16785.99 , -86.77
+56.59 , -15902.51 , -82.31
+56.59 , -15019.04 , -77.84
+56.59 , -14135.57 , -73.35
+56.59 , -13252.09 , -68.84
+56.59 , -12368.62 , -64.32
+56.59 , -11485.15 , -59.79
+56.59 , -10601.68 , -55.24
+56.59 , -9718.20 , -50.68
+56.59 , -8834.73 , -46.11
+56.59 , -7951.26 , -41.51
+56.59 , -7067.78 , -36.91
+56.59 , -6184.31 , -32.29
+56.59 , -5300.84 , -27.66
+56.59 , -4417.36 , -23.01
+56.59 , -3533.89 , -18.35
+56.59 , -2650.42 , -13.67
+56.59 , -1766.95 , -8.98
+56.59 , -883.47 , -4.27
+56.59 , -176.69 , -0.39
+56.59 , 153.22 , 1.43
+56.59 , 766.09 , 5.56
+56.59 , 1532.18 , 10.69
+56.59 , 2298.27 , 15.84
+56.59 , 3064.36 , 21.00
+56.59 , 3830.44 , 26.17
+56.59 , 4596.53 , 31.36
+56.59 , 5362.62 , 36.56
+56.59 , 6128.71 , 41.77
+56.59 , 6894.80 , 47.01
+56.59 , 7660.89 , 52.25
+56.59 , 8426.98 , 57.51
+56.59 , 9193.07 , 62.79
+56.59 , 9959.16 , 68.08
+56.59 , 10725.24 , 73.38
+56.59 , 11491.33 , 78.70
+56.59 , 12257.42 , 84.03
+56.59 , 13023.51 , 89.38
+56.59 , 13789.60 , 94.74
+56.59 , 14555.69 , 100.12
+56.59 , 15321.78 , 105.51
+75.45 , -17669.46 , -121.86
+75.45 , -16785.99 , -115.91
+75.45 , -15902.51 , -109.94
+75.45 , -15019.04 , -103.95
+75.45 , -14135.57 , -97.94
+75.45 , -13252.09 , -91.91
+75.45 , -12368.62 , -85.87
+75.45 , -11485.15 , -79.81
+75.45 , -10601.68 , -73.73
+75.45 , -9718.20 , -67.63
+75.45 , -8834.73 , -61.51
+75.45 , -7951.26 , -55.37
+75.45 , -7067.78 , -49.21
+75.45 , -6184.31 , -43.04
+75.45 , -5300.84 , -36.85
+75.45 , -4417.36 , -30.64
+75.45 , -3533.89 , -24.41
+75.45 , -2650.42 , -18.16
+75.45 , -1766.95 , -11.89
+75.45 , -883.47 , -5.59
+75.45 , -176.69 , -0.32
+75.45 , 153.22 , 1.99
+75.45 , 766.09 , 7.50
+75.45 , 1532.18 , 14.34
+75.45 , 2298.27 , 21.19
+75.45 , 3064.36 , 28.05
+75.45 , 3830.44 , 34.94
+75.45 , 4596.53 , 41.84
+75.45 , 5362.62 , 48.76
+75.45 , 6128.71 , 55.70
+75.45 , 6894.80 , 62.66
+75.45 , 7660.89 , 69.63
+75.45 , 8426.98 , 76.63
+75.45 , 9193.07 , 83.65
+75.45 , 9959.16 , 90.68
+75.45 , 10725.24 , 97.73
+75.45 , 11491.33 , 104.80
+75.45 , 12257.42 , 111.90
+75.45 , 13023.51 , 119.00
+75.45 , 13789.60 , 126.13
+75.45 , 14555.69 , 133.28
+75.45 , 15321.78 , 140.44
+94.31 , -17669.46 , -152.18
+94.31 , -16785.99 , -144.75
+94.31 , -15902.51 , -137.29
+94.31 , -15019.04 , -129.81
+94.31 , -14135.57 , -122.31
+94.31 , -13252.09 , -114.78
+94.31 , -12368.62 , -107.23
+94.31 , -11485.15 , -99.65
+94.31 , -10601.68 , -92.05
+94.31 , -9718.20 , -84.42
+94.31 , -8834.73 , -76.77
+94.31 , -7951.26 , -69.10
+94.31 , -7067.78 , -61.41
+94.31 , -6184.31 , -53.69
+94.31 , -5300.84 , -45.94
+94.31 , -4417.36 , -38.17
+94.31 , -3533.89 , -30.38
+94.31 , -2650.42 , -22.57
+94.31 , -1766.95 , -14.72
+94.31 , -883.47 , -6.84
+94.31 , -176.69 , 0.00
+94.31 , 153.22 , 2.61
+94.31 , 766.09 , 9.52
+94.31 , 1532.18 , 18.06
+94.31 , 2298.27 , 26.62
+94.31 , 3064.36 , 35.19
+94.31 , 3830.44 , 43.79
+94.31 , 4596.53 , 52.42
+94.31 , 5362.62 , 61.07
+94.31 , 6128.71 , 69.74
+94.31 , 6894.80 , 78.43
+94.31 , 7660.89 , 87.15
+94.31 , 8426.98 , 95.90
+94.31 , 9193.07 , 104.67
+94.31 , 9959.16 , 113.46
+94.31 , 10725.24 , 122.28
+94.31 , 11491.33 , 131.12
+94.31 , 12257.42 , 139.99
+94.31 , 13023.51 , 148.88
+94.31 , 13789.60 , 157.79
+94.31 , 14555.69 , 166.73
+94.31 , 15321.78 , 175.69
+113.17 , -17669.46 , -182.19
+113.17 , -16785.99 , -173.29
+113.17 , -15902.51 , -164.37
+113.17 , -15019.04 , -155.42
+113.17 , -14135.57 , -146.44
+113.17 , -13252.09 , -137.42
+113.17 , -12368.62 , -128.38
+113.17 , -11485.15 , -119.30
+113.17 , -10601.68 , -110.20
+113.17 , -9718.20 , -101.06
+113.17 , -8834.73 , -91.89
+113.17 , -7951.26 , -82.70
+113.17 , -7067.78 , -73.47
+113.17 , -6184.31 , -64.21
+113.17 , -5300.84 , -54.93
+113.17 , -4417.36 , -45.61
+113.17 , -3533.89 , -36.26
+113.17 , -2650.42 , -26.87
+113.17 , -1766.95 , -17.46
+113.17 , -883.47 , -7.98
+113.17 , -176.69 , 0.00
+113.17 , 153.22 , 3.29
+113.17 , 766.09 , 11.62
+113.17 , 1532.18 , 21.88
+113.17 , 2298.27 , 32.14
+113.17 , 3064.36 , 42.44
+113.17 , 3830.44 , 52.76
+113.17 , 4596.53 , 63.11
+113.17 , 5362.62 , 73.49
+113.17 , 6128.71 , 83.91
+113.17 , 6894.80 , 94.35
+113.17 , 7660.89 , 104.82
+113.17 , 8426.98 , 115.33
+113.17 , 9193.07 , 125.87
+113.17 , 9959.16 , 136.43
+113.17 , 10725.24 , 147.03
+113.17 , 11491.33 , 157.66
+113.17 , 12257.42 , 168.32
+113.17 , 13023.51 , 179.01
+113.17 , 13789.60 , 189.74
+113.17 , 14555.69 , 200.49
+113.17 , 15321.78 , 211.27
+132.03 , -17669.46 , -211.85
+132.03 , -16785.99 , -201.52
+132.03 , -15902.51 , -191.16
+132.03 , -15019.04 , -180.75
+132.03 , -14135.57 , -170.31
+132.03 , -13252.09 , -159.83
+132.03 , -12368.62 , -149.31
+132.03 , -11485.15 , -138.75
+132.03 , -10601.68 , -128.16
+132.03 , -9718.20 , -117.52
+132.03 , -8834.73 , -106.85
+132.03 , -7951.26 , -96.14
+132.03 , -7067.78 , -85.39
+132.03 , -6184.31 , -74.61
+132.03 , -5300.84 , -63.78
+132.03 , -4417.36 , -52.92
+132.03 , -3533.89 , -42.02
+132.03 , -2650.42 , -31.07
+132.03 , -1766.95 , -20.08
+132.03 , -883.47 , -9.00
+132.03 , -176.69 , 0.00
+132.03 , 153.22 , 4.05
+132.03 , 766.09 , 13.82
+132.03 , 1532.18 , 25.80
+132.03 , 2298.27 , 37.78
+132.03 , 3064.36 , 49.79
+132.03 , 3830.44 , 61.84
+132.03 , 4596.53 , 73.93
+132.03 , 5362.62 , 86.05
+132.03 , 6128.71 , 98.22
+132.03 , 6894.80 , 110.42
+132.03 , 7660.89 , 122.66
+132.03 , 8426.98 , 134.94
+132.03 , 9193.07 , 147.26
+132.03 , 9959.16 , 159.61
+132.03 , 10725.24 , 172.01
+132.03 , 11491.33 , 184.44
+132.03 , 12257.42 , 196.92
+132.03 , 13023.51 , 209.43
+132.03 , 13789.60 , 221.98
+132.03 , 14555.69 , 234.57
+132.03 , 15321.78 , 247.19
+150.90 , -17669.46 , -241.15
+150.90 , -16785.99 , -229.41
+150.90 , -15902.51 , -217.63
+150.90 , -15019.04 , -205.79
+150.90 , -14135.57 , -193.91
+150.90 , -13252.09 , -181.98
+150.90 , -12368.62 , -170.01
+150.90 , -11485.15 , -157.99
+150.90 , -10601.68 , -145.91
+150.90 , -9718.20 , -133.80
+150.90 , -8834.73 , -121.63
+150.90 , -7951.26 , -109.42
+150.90 , -7067.78 , -97.16
+150.90 , -6184.31 , -84.85
+150.90 , -5300.84 , -72.50
+150.90 , -4417.36 , -60.10
+150.90 , -3533.89 , -47.65
+150.90 , -2650.42 , -35.14
+150.90 , -1766.95 , -22.57
+150.90 , -883.47 , -9.88
+150.90 , -176.69 , 0.00
+150.90 , 153.22 , 4.88
+150.90 , 766.09 , 16.13
+150.90 , 1532.18 , 29.83
+150.90 , 2298.27 , 43.53
+150.90 , 3064.36 , 57.27
+150.90 , 3830.44 , 71.06
+150.90 , 4596.53 , 84.89
+150.90 , 5362.62 , 98.76
+150.90 , 6128.71 , 112.68
+150.90 , 6894.80 , 126.65
+150.90 , 7660.89 , 140.67
+150.90 , 8426.98 , 154.74
+150.90 , 9193.07 , 168.85
+150.90 , 9959.16 , 183.01
+150.90 , 10725.24 , 197.22
+150.90 , 11491.33 , 211.48
+150.90 , 12257.42 , 225.78
+150.90 , 13023.51 , 240.13
+150.90 , 13789.60 , 254.53
+150.90 , 14555.69 , 268.97
+150.90 , 15321.78 , 283.46
+169.76 , -17669.46 , -270.09
+169.76 , -16785.99 , -256.96
+169.76 , -15902.51 , -243.78
+169.76 , -15019.04 , -230.53
+169.76 , -14135.57 , -217.23
+169.76 , -13252.09 , -203.87
+169.76 , -12368.62 , -190.46
+169.76 , -11485.15 , -176.98
+169.76 , -10601.68 , -163.45
+169.76 , -9718.20 , -149.87
+169.76 , -8834.73 , -136.22
+169.76 , -7951.26 , -122.52
+169.76 , -7067.78 , -108.76
+169.76 , -6184.31 , -94.94
+169.76 , -5300.84 , -81.06
+169.76 , -4417.36 , -67.13
+169.76 , -3533.89 , -53.13
+169.76 , -2650.42 , -39.07
+169.76 , -1766.95 , -24.92
+169.76 , -883.47 , -10.59
+169.76 , -176.69 , 0.00
+169.76 , 153.22 , 5.80
+169.76 , 766.09 , 18.55
+169.76 , 1532.18 , 33.99
+169.76 , 2298.27 , 49.42
+169.76 , 3064.36 , 64.90
+169.76 , 3830.44 , 80.42
+169.76 , 4596.53 , 96.00
+169.76 , 5362.62 , 111.63
+169.76 , 6128.71 , 127.32
+169.76 , 6894.80 , 143.07
+169.76 , 7660.89 , 158.88
+169.76 , 8426.98 , 174.74
+169.76 , 9193.07 , 190.66
+169.76 , 9959.16 , 206.64
+169.76 , 10725.24 , 222.68
+169.76 , 11491.33 , 238.77
+169.76 , 12257.42 , 254.92
+169.76 , 13023.51 , 271.13
+169.76 , 13789.60 , 287.40
+169.76 , 14555.69 , 303.72
+169.76 , 15321.78 , 320.10
+188.62 , -17669.46 , -298.63
+188.62 , -16785.99 , -284.14
+188.62 , -15902.51 , -269.58
+188.62 , -15019.04 , -254.95
+188.62 , -14135.57 , -240.25
+188.62 , -13252.09 , -225.48
+188.62 , -12368.62 , -210.64
+188.62 , -11485.15 , -195.74
+188.62 , -10601.68 , -180.76
+188.62 , -9718.20 , -165.71
+188.62 , -8834.73 , -150.60
+188.62 , -7951.26 , -135.42
+188.62 , -7067.78 , -120.16
+188.62 , -6184.31 , -104.84
+188.62 , -5300.84 , -89.45
+188.62 , -4417.36 , -73.99
+188.62 , -3533.89 , -58.45
+188.62 , -2650.42 , -42.83
+188.62 , -1766.95 , -27.10
+188.62 , -883.47 , -11.12
+188.62 , -176.69 , 0.00
+188.62 , 153.22 , 6.80
+188.62 , 766.09 , 21.10
+188.62 , 1532.18 , 38.29
+188.62 , 2298.27 , 55.46
+188.62 , 3064.36 , 72.67
+188.62 , 3830.44 , 89.94
+188.62 , 4596.53 , 107.27
+188.62 , 5362.62 , 124.67
+188.62 , 6128.71 , 142.14
+188.62 , 6894.80 , 159.68
+188.62 , 7660.89 , 177.29
+188.62 , 8426.98 , 194.96
+188.62 , 9193.07 , 212.70
+188.62 , 9959.16 , 230.52
+188.62 , 10725.24 , 248.40
+188.62 , 11491.33 , 266.35
+188.62 , 12257.42 , 284.37
+188.62 , 13023.51 , 302.45
+188.62 , 13789.60 , 320.61
+188.62 , 14555.69 , 338.83
+188.62 , 15321.78 , 357.12
+207.48 , -17669.46 , -326.77
+207.48 , -16785.99 , -310.94
+207.48 , -15902.51 , -295.03
+207.48 , -15019.04 , -279.03
+207.48 , -14135.57 , -262.95
+207.48 , -13252.09 , -246.79
+207.48 , -12368.62 , -230.55
+207.48 , -11485.15 , -214.22
+207.48 , -10601.68 , -197.81
+207.48 , -9718.20 , -181.33
+207.48 , -8834.73 , -164.76
+207.48 , -7951.26 , -148.10
+207.48 , -7067.78 , -131.37
+207.48 , -6184.31 , -114.55
+207.48 , -5300.84 , -97.65
+207.48 , -4417.36 , -80.67
+207.48 , -3533.89 , -63.59
+207.48 , -2650.42 , -46.42
+207.48 , -1766.95 , -29.10
+207.48 , -883.47 , -11.41
+207.48 , -176.69 , 0.00
+207.48 , 153.22 , 7.90
+207.48 , 766.09 , 23.79
+207.48 , 1532.18 , 42.74
+207.48 , 2298.27 , 61.65
+207.48 , 3064.36 , 80.61
+207.48 , 3830.44 , 99.63
+207.48 , 4596.53 , 118.73
+207.48 , 5362.62 , 137.91
+207.48 , 6128.71 , 157.16
+207.48 , 6894.80 , 176.50
+207.48 , 7660.89 , 195.91
+207.48 , 8426.98 , 215.41
+207.48 , 9193.07 , 234.99
+207.48 , 9959.16 , 254.65
+207.48 , 10725.24 , 274.39
+207.48 , 11491.33 , 294.21
+207.48 , 12257.42 , 314.12
+207.48 , 13023.51 , 334.10
+207.48 , 13789.60 , 354.16
+207.48 , 14555.69 , 374.31
+207.48 , 15321.78 , 394.53
+226.34 , -17669.46 , -354.49
+226.34 , -16785.99 , -337.34
+226.34 , -15902.51 , -320.10
+226.34 , -15019.04 , -302.75
+226.34 , -14135.57 , -285.32
+226.34 , -13252.09 , -267.78
+226.34 , -12368.62 , -250.15
+226.34 , -11485.15 , -232.43
+226.34 , -10601.68 , -214.60
+226.34 , -9718.20 , -196.69
+226.34 , -8834.73 , -178.67
+226.34 , -7951.26 , -160.56
+226.34 , -7067.78 , -142.36
+226.34 , -6184.31 , -124.05
+226.34 , -5300.84 , -105.65
+226.34 , -4417.36 , -87.15
+226.34 , -3533.89 , -68.54
+226.34 , -2650.42 , -49.80
+226.34 , -1766.95 , -30.89
+226.34 , -883.47 , -11.43
+226.34 , -176.69 , 0.00
+226.34 , 153.22 , 9.08
+226.34 , 766.09 , 26.62
+226.34 , 1532.18 , 47.35
+226.34 , 2298.27 , 68.02
+226.34 , 3064.36 , 88.72
+226.34 , 3830.44 , 109.51
+226.34 , 4596.53 , 130.38
+226.34 , 5362.62 , 151.34
+226.34 , 6128.71 , 172.39
+226.34 , 6894.80 , 193.53
+226.34 , 7660.89 , 214.77
+226.34 , 8426.98 , 236.11
+226.34 , 9193.07 , 257.53
+226.34 , 9959.16 , 279.05
+226.34 , 10725.24 , 300.67
+226.34 , 11491.33 , 322.38
+226.34 , 12257.42 , 344.19
+226.34 , 13023.51 , 366.08
+226.34 , 13789.60 , 388.08
+226.34 , 14555.69 , 410.16
+226.34 , 15321.78 , 432.34
+245.21 , -17669.46 , -381.77
+245.21 , -16785.99 , -363.33
+245.21 , -15902.51 , -344.77
+245.21 , -15019.04 , -326.11
+245.21 , -14135.57 , -307.33
+245.21 , -13252.09 , -288.45
+245.21 , -12368.62 , -269.45
+245.21 , -11485.15 , -250.33
+245.21 , -10601.68 , -231.11
+245.21 , -9718.20 , -211.78
+245.21 , -8834.73 , -192.34
+245.21 , -7951.26 , -172.78
+245.21 , -7067.78 , -153.11
+245.21 , -6184.31 , -133.33
+245.21 , -5300.84 , -113.43
+245.21 , -4417.36 , -93.42
+245.21 , -3533.89 , -73.27
+245.21 , -2650.42 , -52.98
+245.21 , -1766.95 , -32.45
+245.21 , -883.47 , -11.12
+245.21 , -176.69 , 0.00
+245.21 , 153.22 , 10.37
+245.21 , 766.09 , 29.60
+245.21 , 1532.18 , 52.14
+245.21 , 2298.27 , 74.56
+245.21 , 3064.36 , 97.03
+245.21 , 3830.44 , 119.58
+245.21 , 4596.53 , 142.23
+245.21 , 5362.62 , 164.98
+245.21 , 6128.71 , 187.84
+245.21 , 6894.80 , 210.80
+245.21 , 7660.89 , 233.87
+245.21 , 8426.98 , 257.05
+245.21 , 9193.07 , 280.34
+245.21 , 9959.16 , 303.74
+245.21 , 10725.24 , 327.25
+245.21 , 11491.33 , 350.87
+245.21 , 12257.42 , 374.59
+245.21 , 13023.51 , 398.42
+245.21 , 13789.60 , 422.36
+245.21 , 14555.69 , 446.41
+245.21 , 15321.78 , 470.57
+264.07 , -17669.46 , -408.59
+264.07 , -16785.99 , -388.88
+264.07 , -15902.51 , -369.04
+264.07 , -15019.04 , -349.08
+264.07 , -14135.57 , -328.98
+264.07 , -13252.09 , -308.76
+264.07 , -12368.62 , -288.41
+264.07 , -11485.15 , -267.93
+264.07 , -10601.68 , -247.32
+264.07 , -9718.20 , -226.59
+264.07 , -8834.73 , -205.73
+264.07 , -7951.26 , -184.73
+264.07 , -7067.78 , -163.61
+264.07 , -6184.31 , -142.36
+264.07 , -5300.84 , -120.97
+264.07 , -4417.36 , -99.45
+264.07 , -3533.89 , -77.77
+264.07 , -2650.42 , -55.91
+264.07 , -1766.95 , -33.75
+264.07 , -883.47 , -10.40
+264.07 , -176.69 , 0.00
+264.07 , 153.22 , 11.76
+264.07 , 766.09 , 32.74
+264.07 , 1532.18 , 57.10
+264.07 , 2298.27 , 81.29
+264.07 , 3064.36 , 105.53
+264.07 , 3830.44 , 129.86
+264.07 , 4596.53 , 154.29
+264.07 , 5362.62 , 178.85
+264.07 , 6128.71 , 203.52
+264.07 , 6894.80 , 228.31
+264.07 , 7660.89 , 253.23
+264.07 , 8426.98 , 278.27
+264.07 , 9193.07 , 303.44
+264.07 , 9959.16 , 328.73
+264.07 , 10725.24 , 354.14
+264.07 , 11491.33 , 379.68
+264.07 , 12257.42 , 405.34
+264.07 , 13023.51 , 431.13
+264.07 , 13789.60 , 457.03
+264.07 , 14555.69 , 483.07
+264.07 , 15321.78 , 509.22
+282.93 , -17669.46 , -434.93
+282.93 , -16785.99 , -413.98
+282.93 , -15902.51 , -392.88
+282.93 , -15019.04 , -371.64
+282.93 , -14135.57 , -350.25
+282.93 , -13252.09 , -328.71
+282.93 , -12368.62 , -307.03
+282.93 , -11485.15 , -285.20
+282.93 , -10601.68 , -263.22
+282.93 , -9718.20 , -241.10
+282.93 , -8834.73 , -218.83
+282.93 , -7951.26 , -196.41
+282.93 , -7067.78 , -173.85
+282.93 , -6184.31 , -151.13
+282.93 , -5300.84 , -128.26
+282.93 , -4417.36 , -105.23
+282.93 , -3533.89 , -82.02
+282.93 , -2650.42 , -58.59
+282.93 , -1766.95 , -34.77
+282.93 , -883.47 , -9.14
+282.93 , -176.69 , 0.00
+282.93 , 153.22 , 13.25
+282.93 , 766.09 , 36.05
+282.93 , 1532.18 , 62.25
+282.93 , 2298.27 , 88.23
+282.93 , 3064.36 , 114.25
+282.93 , 3830.44 , 140.36
+282.93 , 4596.53 , 166.59
+282.93 , 5362.62 , 192.95
+282.93 , 6128.71 , 219.45
+282.93 , 6894.80 , 246.08
+282.93 , 7660.89 , 272.86
+282.93 , 8426.98 , 299.77
+282.93 , 9193.07 , 326.82
+282.93 , 9959.16 , 354.02
+282.93 , 10725.24 , 381.35
+282.93 , 11491.33 , 408.83
+282.93 , 12257.42 , 436.45
+282.93 , 13023.51 , 464.20
+282.93 , 13789.60 , 492.10
+282.93 , 14555.69 , 520.14
+282.93 , 15321.78 , 548.31
+301.79 , -17669.46 , -460.78
+301.79 , -16785.99 , -438.62
+301.79 , -15902.51 , -416.28
+301.79 , -15019.04 , -393.78
+301.79 , -14135.57 , -371.11
+301.79 , -13252.09 , -348.28
+301.79 , -12368.62 , -325.28
+301.79 , -11485.15 , -302.11
+301.79 , -10601.68 , -278.78
+301.79 , -9718.20 , -255.29
+301.79 , -8834.73 , -231.62
+301.79 , -7951.26 , -207.79
+301.79 , -7067.78 , -183.79
+301.79 , -6184.31 , -159.62
+301.79 , -5300.84 , -135.27
+301.79 , -4417.36 , -110.74
+301.79 , -3533.89 , -85.99
+301.79 , -2650.42 , -60.98
+301.79 , -1766.95 , -35.47
+301.79 , -883.47 , -7.05
+301.79 , -176.69 , 0.00
+301.79 , 153.22 , 14.84
+301.79 , 766.09 , 39.53
+301.79 , 1532.18 , 67.60
+301.79 , 2298.27 , 95.38
+301.79 , 3064.36 , 123.18
+301.79 , 3830.44 , 151.09
+301.79 , 4596.53 , 179.12
+301.79 , 5362.62 , 207.30
+301.79 , 6128.71 , 235.63
+301.79 , 6894.80 , 264.12
+301.79 , 7660.89 , 292.76
+301.79 , 8426.98 , 321.56
+301.79 , 9193.07 , 350.51
+301.79 , 9959.16 , 379.63
+301.79 , 10725.24 , 408.90
+301.79 , 11491.33 , 438.33
+301.79 , 12257.42 , 467.92
+301.79 , 13023.51 , 497.67
+301.79 , 13789.60 , 527.57
+301.79 , 14555.69 , 557.64
+301.79 , 15321.78 , 587.85
+320.65 , -17669.46 , -486.12
+320.65 , -16785.99 , -462.76
+320.65 , -15902.51 , -439.22
+320.65 , -15019.04 , -415.48
+320.65 , -14135.57 , -391.56
+320.65 , -13252.09 , -367.45
+320.65 , -12368.62 , -343.15
+320.65 , -11485.15 , -318.67
+320.65 , -10601.68 , -294.00
+320.65 , -9718.20 , -269.14
+320.65 , -8834.73 , -244.09
+320.65 , -7951.26 , -218.86
+320.65 , -7067.78 , -193.44
+320.65 , -6184.31 , -167.82
+320.65 , -5300.84 , -142.00
+320.65 , -4417.36 , -115.96
+320.65 , -3533.89 , -89.67
+320.65 , -2650.42 , -63.06
+320.65 , -1766.95 , -35.80
+320.65 , -883.47 , -3.22
+320.65 , -176.69 , 0.00
+320.65 , 153.22 , 16.54
+320.65 , 766.09 , 43.18
+320.65 , 1532.18 , 73.16
+320.65 , 2298.27 , 102.75
+320.65 , 3064.36 , 132.35
+320.65 , 3830.44 , 162.06
+320.65 , 4596.53 , 191.91
+320.65 , 5362.62 , 221.91
+320.65 , 6128.71 , 252.09
+320.65 , 6894.80 , 282.44
+320.65 , 7660.89 , 312.96
+320.65 , 8426.98 , 343.65
+320.65 , 9193.07 , 374.52
+320.65 , 9959.16 , 405.57
+320.65 , 10725.24 , 436.80
+320.65 , 11491.33 , 468.20
+320.65 , 12257.42 , 499.78
+320.65 , 13023.51 , 531.53
+320.65 , 13789.60 , 563.46
+320.65 , 14555.69 , 595.57
+320.65 , 15321.78 , 627.85
+339.52 , -17669.46 , -510.93
+339.52 , -16785.99 , -486.40
+339.52 , -15902.51 , -461.67
+339.52 , -15019.04 , -436.72
+339.52 , -14135.57 , -411.56
+339.52 , -13252.09 , -386.20
+339.52 , -12368.62 , -360.62
+339.52 , -11485.15 , -334.84
+339.52 , -10601.68 , -308.84
+339.52 , -9718.20 , -282.64
+339.52 , -8834.73 , -256.22
+339.52 , -7951.26 , -229.60
+339.52 , -7067.78 , -202.76
+339.52 , -6184.31 , -175.70
+339.52 , -5300.84 , -148.41
+339.52 , -4417.36 , -120.87
+339.52 , -3533.89 , -93.04
+339.52 , -2650.42 , -64.80
+339.52 , -1766.95 , -35.73
+339.52 , -883.47 , 0.00
+339.52 , -176.69 , 0.00
+339.52 , 153.22 , 18.35
+339.52 , 766.09 , 47.02
+339.52 , 1532.18 , 78.93
+339.52 , 2298.27 , 110.35
+339.52 , 3064.36 , 141.76
+339.52 , 3830.44 , 173.28
+339.52 , 4596.53 , 204.95
+339.52 , 5362.62 , 236.80
+339.52 , 6128.71 , 268.83
+339.52 , 6894.80 , 301.04
+339.52 , 7660.89 , 333.46
+339.52 , 8426.98 , 366.06
+339.52 , 9193.07 , 398.86
+339.52 , 9959.16 , 431.86
+339.52 , 10725.24 , 465.05
+339.52 , 11491.33 , 498.44
+339.52 , 12257.42 , 532.03
+339.52 , 13023.51 , 565.81
+339.52 , 13789.60 , 599.79
+339.52 , 14555.69 , 633.96
+339.52 , 15321.78 , 668.33
+358.38 , -17669.46 , -535.19
+358.38 , -16785.99 , -509.52
+358.38 , -15902.51 , -483.62
+358.38 , -15019.04 , -457.48
+358.38 , -14135.57 , -431.11
+358.38 , -13252.09 , -404.51
+358.38 , -12368.62 , -377.67
+358.38 , -11485.15 , -350.60
+358.38 , -10601.68 , -323.30
+358.38 , -9718.20 , -295.76
+358.38 , -8834.73 , -267.99
+358.38 , -7951.26 , -239.99
+358.38 , -7067.78 , -211.74
+358.38 , -6184.31 , -183.24
+358.38 , -5300.84 , -154.48
+358.38 , -4417.36 , -125.44
+358.38 , -3533.89 , -96.05
+358.38 , -2650.42 , -66.18
+358.38 , -1766.95 , -35.19
+358.38 , -883.47 , 0.00
+358.38 , -176.69 , 0.00
+358.38 , 153.22 , 20.27
+358.38 , 766.09 , 51.05
+358.38 , 1532.18 , 84.92
+358.38 , 2298.27 , 118.19
+358.38 , 3064.36 , 151.42
+358.38 , 3830.44 , 184.76
+358.38 , 4596.53 , 218.27
+358.38 , 5362.62 , 251.96
+358.38 , 6128.71 , 285.86
+358.38 , 6894.80 , 319.96
+358.38 , 7660.89 , 354.27
+358.38 , 8426.98 , 388.80
+358.38 , 9193.07 , 423.54
+358.38 , 9959.16 , 458.50
+358.38 , 10725.24 , 493.68
+358.38 , 11491.33 , 529.07
+358.38 , 12257.42 , 564.68
+358.38 , 13023.51 , 600.51
+358.38 , 13789.60 , 636.55
+358.38 , 14555.69 , 672.81
+358.38 , 15321.78 , 709.28
+377.24 , -17669.46 , -558.87
+377.24 , -16785.99 , -532.09
+377.24 , -15902.51 , -505.05
+377.24 , -15019.04 , -477.75
+377.24 , -14135.57 , -450.19
+377.24 , -13252.09 , -422.37
+377.24 , -12368.62 , -394.29
+377.24 , -11485.15 , -365.95
+377.24 , -10601.68 , -337.36
+377.24 , -9718.20 , -308.50
+377.24 , -8834.73 , -279.38
+377.24 , -7951.26 , -250.00
+377.24 , -7067.78 , -220.35
+377.24 , -6184.31 , -190.43
+377.24 , -5300.84 , -160.20
+377.24 , -4417.36 , -129.65
+377.24 , -3533.89 , -98.70
+377.24 , -2650.42 , -67.15
+377.24 , -1766.95 , -34.12
+377.24 , -883.47 , 0.00
+377.24 , -176.69 , 0.00
+377.24 , 153.22 , 22.30
+377.24 , 766.09 , 55.27
+377.24 , 1532.18 , 91.14
+377.24 , 2298.27 , 126.27
+377.24 , 3064.36 , 161.34
+377.24 , 3830.44 , 196.52
+377.24 , 4596.53 , 231.87
+377.24 , 5362.62 , 267.42
+377.24 , 6128.71 , 303.19
+377.24 , 6894.80 , 339.18
+377.24 , 7660.89 , 375.41
+377.24 , 8426.98 , 411.87
+377.24 , 9193.07 , 448.57
+377.24 , 9959.16 , 485.51
+377.24 , 10725.24 , 522.68
+377.24 , 11491.33 , 560.09
+377.24 , 12257.42 , 597.75
+377.24 , 13023.51 , 635.63
+377.24 , 13789.60 , 673.76
+377.24 , 14555.69 , 712.12
+377.24 , 15321.78 , 750.73
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_2.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..b5980ac32ff2f44452666e544ce91c462f5c5a7f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -9785.31 , 0.00
+0.00 , -9296.05 , 0.00
+0.00 , -8806.78 , 0.00
+0.00 , -8317.52 , 0.00
+0.00 , -7828.25 , 0.00
+0.00 , -7338.98 , 0.00
+0.00 , -6849.72 , -0.07
+0.00 , -6360.45 , -0.33
+0.00 , -5871.19 , -0.49
+0.00 , -5381.92 , -0.60
+0.00 , -4892.66 , -0.66
+0.00 , -4403.39 , -0.69
+0.00 , -3914.12 , -0.70
+0.00 , -3424.86 , -0.67
+0.00 , -2935.59 , -0.63
+0.00 , -2446.33 , -0.57
+0.00 , -1957.06 , -0.48
+0.00 , -1467.80 , -0.38
+0.00 , -978.53 , -0.27
+0.00 , -489.27 , -0.13
+0.00 , -97.85 , -0.01
+0.00 , 86.63 , 0.06
+0.00 , 433.14 , 0.28
+0.00 , 866.29 , 0.56
+0.00 , 1299.43 , 0.85
+0.00 , 1732.57 , 1.15
+0.00 , 2165.72 , 1.47
+0.00 , 2598.86 , 1.79
+0.00 , 3032.00 , 2.12
+0.00 , 3465.15 , 2.47
+0.00 , 3898.29 , 2.82
+0.00 , 4331.43 , 3.19
+0.00 , 4764.58 , 3.56
+0.00 , 5197.72 , 3.94
+0.00 , 5630.86 , 4.33
+0.00 , 6064.01 , 4.74
+0.00 , 6497.15 , 5.15
+0.00 , 6930.29 , 5.57
+0.00 , 7363.44 , 6.00
+0.00 , 7796.58 , 6.43
+0.00 , 8229.72 , 6.88
+0.00 , 8662.87 , 7.34
+3.37 , -9785.31 , 0.00
+3.37 , -9296.05 , 0.00
+3.37 , -8806.78 , 0.00
+3.37 , -8317.52 , 0.00
+3.37 , -7828.25 , 0.00
+3.37 , -7338.98 , 0.00
+3.37 , -6849.72 , -0.25
+3.37 , -6360.45 , -0.42
+3.37 , -5871.19 , -0.52
+3.37 , -5381.92 , -0.58
+3.37 , -4892.66 , -0.61
+3.37 , -4403.39 , -0.62
+3.37 , -3914.12 , -0.61
+3.37 , -3424.86 , -0.58
+3.37 , -2935.59 , -0.53
+3.37 , -2446.33 , -0.47
+3.37 , -1957.06 , -0.40
+3.37 , -1467.80 , -0.31
+3.37 , -978.53 , -0.22
+3.37 , -489.27 , -0.11
+3.37 , -97.85 , -0.01
+3.37 , 86.63 , 0.05
+3.37 , 433.14 , 0.21
+3.37 , 866.29 , 0.43
+3.37 , 1299.43 , 0.65
+3.37 , 1732.57 , 0.88
+3.37 , 2165.72 , 1.11
+3.37 , 2598.86 , 1.36
+3.37 , 3032.00 , 1.61
+3.37 , 3465.15 , 1.87
+3.37 , 3898.29 , 2.13
+3.37 , 4331.43 , 2.40
+3.37 , 4764.58 , 2.68
+3.37 , 5197.72 , 2.97
+3.37 , 5630.86 , 3.26
+3.37 , 6064.01 , 3.56
+3.37 , 6497.15 , 3.86
+3.37 , 6930.29 , 4.18
+3.37 , 7363.44 , 4.50
+3.37 , 7796.58 , 4.82
+3.37 , 8229.72 , 5.15
+3.37 , 8662.87 , 5.49
+33.71 , -9785.31 , -29.05
+33.71 , -9296.05 , -27.68
+33.71 , -8806.78 , -26.31
+33.71 , -8317.52 , -24.92
+33.71 , -7828.25 , -23.53
+33.71 , -7338.98 , -22.12
+33.71 , -6849.72 , -20.71
+33.71 , -6360.45 , -19.28
+33.71 , -5871.19 , -17.85
+33.71 , -5381.92 , -16.41
+33.71 , -4892.66 , -14.95
+33.71 , -4403.39 , -13.49
+33.71 , -3914.12 , -12.02
+33.71 , -3424.86 , -10.53
+33.71 , -2935.59 , -9.04
+33.71 , -2446.33 , -7.54
+33.71 , -1957.06 , -6.03
+33.71 , -1467.80 , -4.51
+33.71 , -978.53 , -2.98
+33.71 , -489.27 , -1.44
+33.71 , -97.85 , -0.18
+33.71 , 86.63 , 0.45
+33.71 , 433.14 , 1.84
+33.71 , 866.29 , 3.58
+33.71 , 1299.43 , 5.33
+33.71 , 1732.57 , 7.09
+33.71 , 2165.72 , 8.85
+33.71 , 2598.86 , 10.63
+33.71 , 3032.00 , 12.42
+33.71 , 3465.15 , 14.21
+33.71 , 3898.29 , 16.02
+33.71 , 4331.43 , 17.84
+33.71 , 4764.58 , 19.66
+33.71 , 5197.72 , 21.49
+33.71 , 5630.86 , 23.34
+33.71 , 6064.01 , 25.19
+33.71 , 6497.15 , 27.05
+33.71 , 6930.29 , 28.93
+33.71 , 7363.44 , 30.81
+33.71 , 7796.58 , 32.70
+33.71 , 8229.72 , 34.60
+33.71 , 8662.87 , 36.50
+67.42 , -9785.31 , -60.28
+67.42 , -9296.05 , -57.37
+67.42 , -8806.78 , -54.44
+67.42 , -8317.52 , -51.49
+67.42 , -7828.25 , -48.54
+67.42 , -7338.98 , -45.58
+67.42 , -6849.72 , -42.60
+67.42 , -6360.45 , -39.61
+67.42 , -5871.19 , -36.61
+67.42 , -5381.92 , -33.60
+67.42 , -4892.66 , -30.58
+67.42 , -4403.39 , -27.55
+67.42 , -3914.12 , -24.51
+67.42 , -3424.86 , -21.45
+67.42 , -2935.59 , -18.38
+67.42 , -2446.33 , -15.31
+67.42 , -1957.06 , -12.22
+67.42 , -1467.80 , -9.12
+67.42 , -978.53 , -6.00
+67.42 , -489.27 , -2.88
+67.42 , -97.85 , -0.33
+67.42 , 86.63 , 0.92
+67.42 , 433.14 , 3.68
+67.42 , 866.29 , 7.11
+67.42 , 1299.43 , 10.56
+67.42 , 1732.57 , 14.01
+67.42 , 2165.72 , 17.48
+67.42 , 2598.86 , 20.96
+67.42 , 3032.00 , 24.45
+67.42 , 3465.15 , 27.95
+67.42 , 3898.29 , 31.47
+67.42 , 4331.43 , 34.99
+67.42 , 4764.58 , 38.53
+67.42 , 5197.72 , 42.08
+67.42 , 5630.86 , 45.64
+67.42 , 6064.01 , 49.21
+67.42 , 6497.15 , 52.79
+67.42 , 6930.29 , 56.38
+67.42 , 7363.44 , 59.99
+67.42 , 7796.58 , 63.60
+67.42 , 8229.72 , 67.23
+67.42 , 8662.87 , 70.87
+101.12 , -9785.31 , -91.22
+101.12 , -9296.05 , -86.77
+101.12 , -8806.78 , -82.31
+101.12 , -8317.52 , -77.84
+101.12 , -7828.25 , -73.35
+101.12 , -7338.98 , -68.84
+101.12 , -6849.72 , -64.32
+101.12 , -6360.45 , -59.79
+101.12 , -5871.19 , -55.24
+101.12 , -5381.92 , -50.68
+101.12 , -4892.66 , -46.11
+101.12 , -4403.39 , -41.51
+101.12 , -3914.12 , -36.91
+101.12 , -3424.86 , -32.29
+101.12 , -2935.59 , -27.66
+101.12 , -2446.33 , -23.01
+101.12 , -1957.06 , -18.35
+101.12 , -1467.80 , -13.67
+101.12 , -978.53 , -8.98
+101.12 , -489.27 , -4.27
+101.12 , -97.85 , -0.39
+101.12 , 86.63 , 1.43
+101.12 , 433.14 , 5.56
+101.12 , 866.29 , 10.69
+101.12 , 1299.43 , 15.84
+101.12 , 1732.57 , 21.00
+101.12 , 2165.72 , 26.17
+101.12 , 2598.86 , 31.36
+101.12 , 3032.00 , 36.56
+101.12 , 3465.15 , 41.77
+101.12 , 3898.29 , 47.01
+101.12 , 4331.43 , 52.25
+101.12 , 4764.58 , 57.51
+101.12 , 5197.72 , 62.79
+101.12 , 5630.86 , 68.08
+101.12 , 6064.01 , 73.38
+101.12 , 6497.15 , 78.70
+101.12 , 6930.29 , 84.03
+101.12 , 7363.44 , 89.38
+101.12 , 7796.58 , 94.74
+101.12 , 8229.72 , 100.12
+101.12 , 8662.87 , 105.51
+134.83 , -9785.31 , -121.86
+134.83 , -9296.05 , -115.91
+134.83 , -8806.78 , -109.94
+134.83 , -8317.52 , -103.95
+134.83 , -7828.25 , -97.94
+134.83 , -7338.98 , -91.91
+134.83 , -6849.72 , -85.87
+134.83 , -6360.45 , -79.81
+134.83 , -5871.19 , -73.73
+134.83 , -5381.92 , -67.63
+134.83 , -4892.66 , -61.51
+134.83 , -4403.39 , -55.37
+134.83 , -3914.12 , -49.21
+134.83 , -3424.86 , -43.04
+134.83 , -2935.59 , -36.85
+134.83 , -2446.33 , -30.64
+134.83 , -1957.06 , -24.41
+134.83 , -1467.80 , -18.16
+134.83 , -978.53 , -11.89
+134.83 , -489.27 , -5.59
+134.83 , -97.85 , -0.32
+134.83 , 86.63 , 1.99
+134.83 , 433.14 , 7.50
+134.83 , 866.29 , 14.34
+134.83 , 1299.43 , 21.19
+134.83 , 1732.57 , 28.05
+134.83 , 2165.72 , 34.94
+134.83 , 2598.86 , 41.84
+134.83 , 3032.00 , 48.76
+134.83 , 3465.15 , 55.70
+134.83 , 3898.29 , 62.66
+134.83 , 4331.43 , 69.63
+134.83 , 4764.58 , 76.63
+134.83 , 5197.72 , 83.65
+134.83 , 5630.86 , 90.68
+134.83 , 6064.01 , 97.73
+134.83 , 6497.15 , 104.80
+134.83 , 6930.29 , 111.90
+134.83 , 7363.44 , 119.00
+134.83 , 7796.58 , 126.13
+134.83 , 8229.72 , 133.28
+134.83 , 8662.87 , 140.44
+168.54 , -9785.31 , -152.18
+168.54 , -9296.05 , -144.75
+168.54 , -8806.78 , -137.29
+168.54 , -8317.52 , -129.81
+168.54 , -7828.25 , -122.31
+168.54 , -7338.98 , -114.78
+168.54 , -6849.72 , -107.23
+168.54 , -6360.45 , -99.65
+168.54 , -5871.19 , -92.05
+168.54 , -5381.92 , -84.42
+168.54 , -4892.66 , -76.77
+168.54 , -4403.39 , -69.10
+168.54 , -3914.12 , -61.41
+168.54 , -3424.86 , -53.69
+168.54 , -2935.59 , -45.94
+168.54 , -2446.33 , -38.17
+168.54 , -1957.06 , -30.38
+168.54 , -1467.80 , -22.57
+168.54 , -978.53 , -14.72
+168.54 , -489.27 , -6.84
+168.54 , -97.85 , 0.00
+168.54 , 86.63 , 2.61
+168.54 , 433.14 , 9.52
+168.54 , 866.29 , 18.06
+168.54 , 1299.43 , 26.62
+168.54 , 1732.57 , 35.19
+168.54 , 2165.72 , 43.79
+168.54 , 2598.86 , 52.42
+168.54 , 3032.00 , 61.07
+168.54 , 3465.15 , 69.74
+168.54 , 3898.29 , 78.43
+168.54 , 4331.43 , 87.15
+168.54 , 4764.58 , 95.90
+168.54 , 5197.72 , 104.67
+168.54 , 5630.86 , 113.46
+168.54 , 6064.01 , 122.28
+168.54 , 6497.15 , 131.12
+168.54 , 6930.29 , 139.99
+168.54 , 7363.44 , 148.88
+168.54 , 7796.58 , 157.79
+168.54 , 8229.72 , 166.73
+168.54 , 8662.87 , 175.69
+202.25 , -9785.31 , -182.19
+202.25 , -9296.05 , -173.29
+202.25 , -8806.78 , -164.37
+202.25 , -8317.52 , -155.42
+202.25 , -7828.25 , -146.44
+202.25 , -7338.98 , -137.42
+202.25 , -6849.72 , -128.38
+202.25 , -6360.45 , -119.30
+202.25 , -5871.19 , -110.20
+202.25 , -5381.92 , -101.06
+202.25 , -4892.66 , -91.89
+202.25 , -4403.39 , -82.70
+202.25 , -3914.12 , -73.47
+202.25 , -3424.86 , -64.21
+202.25 , -2935.59 , -54.93
+202.25 , -2446.33 , -45.61
+202.25 , -1957.06 , -36.26
+202.25 , -1467.80 , -26.87
+202.25 , -978.53 , -17.46
+202.25 , -489.27 , -7.98
+202.25 , -97.85 , 0.00
+202.25 , 86.63 , 3.29
+202.25 , 433.14 , 11.62
+202.25 , 866.29 , 21.88
+202.25 , 1299.43 , 32.14
+202.25 , 1732.57 , 42.44
+202.25 , 2165.72 , 52.76
+202.25 , 2598.86 , 63.11
+202.25 , 3032.00 , 73.49
+202.25 , 3465.15 , 83.91
+202.25 , 3898.29 , 94.35
+202.25 , 4331.43 , 104.82
+202.25 , 4764.58 , 115.33
+202.25 , 5197.72 , 125.87
+202.25 , 5630.86 , 136.43
+202.25 , 6064.01 , 147.03
+202.25 , 6497.15 , 157.66
+202.25 , 6930.29 , 168.32
+202.25 , 7363.44 , 179.01
+202.25 , 7796.58 , 189.74
+202.25 , 8229.72 , 200.49
+202.25 , 8662.87 , 211.27
+235.96 , -9785.31 , -211.85
+235.96 , -9296.05 , -201.52
+235.96 , -8806.78 , -191.16
+235.96 , -8317.52 , -180.75
+235.96 , -7828.25 , -170.31
+235.96 , -7338.98 , -159.83
+235.96 , -6849.72 , -149.31
+235.96 , -6360.45 , -138.75
+235.96 , -5871.19 , -128.16
+235.96 , -5381.92 , -117.52
+235.96 , -4892.66 , -106.85
+235.96 , -4403.39 , -96.14
+235.96 , -3914.12 , -85.39
+235.96 , -3424.86 , -74.61
+235.96 , -2935.59 , -63.78
+235.96 , -2446.33 , -52.92
+235.96 , -1957.06 , -42.02
+235.96 , -1467.80 , -31.07
+235.96 , -978.53 , -20.08
+235.96 , -489.27 , -9.00
+235.96 , -97.85 , 0.00
+235.96 , 86.63 , 4.05
+235.96 , 433.14 , 13.82
+235.96 , 866.29 , 25.80
+235.96 , 1299.43 , 37.78
+235.96 , 1732.57 , 49.79
+235.96 , 2165.72 , 61.84
+235.96 , 2598.86 , 73.93
+235.96 , 3032.00 , 86.05
+235.96 , 3465.15 , 98.22
+235.96 , 3898.29 , 110.42
+235.96 , 4331.43 , 122.66
+235.96 , 4764.58 , 134.94
+235.96 , 5197.72 , 147.26
+235.96 , 5630.86 , 159.61
+235.96 , 6064.01 , 172.01
+235.96 , 6497.15 , 184.44
+235.96 , 6930.29 , 196.92
+235.96 , 7363.44 , 209.43
+235.96 , 7796.58 , 221.98
+235.96 , 8229.72 , 234.57
+235.96 , 8662.87 , 247.19
+269.67 , -9785.31 , -241.15
+269.67 , -9296.05 , -229.41
+269.67 , -8806.78 , -217.63
+269.67 , -8317.52 , -205.79
+269.67 , -7828.25 , -193.91
+269.67 , -7338.98 , -181.98
+269.67 , -6849.72 , -170.01
+269.67 , -6360.45 , -157.99
+269.67 , -5871.19 , -145.91
+269.67 , -5381.92 , -133.80
+269.67 , -4892.66 , -121.63
+269.67 , -4403.39 , -109.42
+269.67 , -3914.12 , -97.16
+269.67 , -3424.86 , -84.85
+269.67 , -2935.59 , -72.50
+269.67 , -2446.33 , -60.10
+269.67 , -1957.06 , -47.65
+269.67 , -1467.80 , -35.14
+269.67 , -978.53 , -22.57
+269.67 , -489.27 , -9.88
+269.67 , -97.85 , 0.00
+269.67 , 86.63 , 4.88
+269.67 , 433.14 , 16.13
+269.67 , 866.29 , 29.83
+269.67 , 1299.43 , 43.53
+269.67 , 1732.57 , 57.27
+269.67 , 2165.72 , 71.06
+269.67 , 2598.86 , 84.89
+269.67 , 3032.00 , 98.76
+269.67 , 3465.15 , 112.68
+269.67 , 3898.29 , 126.65
+269.67 , 4331.43 , 140.67
+269.67 , 4764.58 , 154.74
+269.67 , 5197.72 , 168.85
+269.67 , 5630.86 , 183.01
+269.67 , 6064.01 , 197.22
+269.67 , 6497.15 , 211.48
+269.67 , 6930.29 , 225.78
+269.67 , 7363.44 , 240.13
+269.67 , 7796.58 , 254.53
+269.67 , 8229.72 , 268.97
+269.67 , 8662.87 , 283.46
+303.37 , -9785.31 , -270.09
+303.37 , -9296.05 , -256.96
+303.37 , -8806.78 , -243.78
+303.37 , -8317.52 , -230.53
+303.37 , -7828.25 , -217.23
+303.37 , -7338.98 , -203.87
+303.37 , -6849.72 , -190.46
+303.37 , -6360.45 , -176.98
+303.37 , -5871.19 , -163.45
+303.37 , -5381.92 , -149.87
+303.37 , -4892.66 , -136.22
+303.37 , -4403.39 , -122.52
+303.37 , -3914.12 , -108.76
+303.37 , -3424.86 , -94.94
+303.37 , -2935.59 , -81.06
+303.37 , -2446.33 , -67.13
+303.37 , -1957.06 , -53.13
+303.37 , -1467.80 , -39.07
+303.37 , -978.53 , -24.92
+303.37 , -489.27 , -10.59
+303.37 , -97.85 , 0.00
+303.37 , 86.63 , 5.80
+303.37 , 433.14 , 18.55
+303.37 , 866.29 , 33.99
+303.37 , 1299.43 , 49.42
+303.37 , 1732.57 , 64.90
+303.37 , 2165.72 , 80.42
+303.37 , 2598.86 , 96.00
+303.37 , 3032.00 , 111.63
+303.37 , 3465.15 , 127.32
+303.37 , 3898.29 , 143.07
+303.37 , 4331.43 , 158.88
+303.37 , 4764.58 , 174.74
+303.37 , 5197.72 , 190.66
+303.37 , 5630.86 , 206.64
+303.37 , 6064.01 , 222.68
+303.37 , 6497.15 , 238.77
+303.37 , 6930.29 , 254.92
+303.37 , 7363.44 , 271.13
+303.37 , 7796.58 , 287.40
+303.37 , 8229.72 , 303.72
+303.37 , 8662.87 , 320.10
+337.08 , -9785.31 , -298.63
+337.08 , -9296.05 , -284.14
+337.08 , -8806.78 , -269.58
+337.08 , -8317.52 , -254.95
+337.08 , -7828.25 , -240.25
+337.08 , -7338.98 , -225.48
+337.08 , -6849.72 , -210.64
+337.08 , -6360.45 , -195.74
+337.08 , -5871.19 , -180.76
+337.08 , -5381.92 , -165.71
+337.08 , -4892.66 , -150.60
+337.08 , -4403.39 , -135.42
+337.08 , -3914.12 , -120.16
+337.08 , -3424.86 , -104.84
+337.08 , -2935.59 , -89.45
+337.08 , -2446.33 , -73.99
+337.08 , -1957.06 , -58.45
+337.08 , -1467.80 , -42.83
+337.08 , -978.53 , -27.10
+337.08 , -489.27 , -11.12
+337.08 , -97.85 , 0.00
+337.08 , 86.63 , 6.80
+337.08 , 433.14 , 21.10
+337.08 , 866.29 , 38.29
+337.08 , 1299.43 , 55.46
+337.08 , 1732.57 , 72.67
+337.08 , 2165.72 , 89.94
+337.08 , 2598.86 , 107.27
+337.08 , 3032.00 , 124.67
+337.08 , 3465.15 , 142.14
+337.08 , 3898.29 , 159.68
+337.08 , 4331.43 , 177.29
+337.08 , 4764.58 , 194.96
+337.08 , 5197.72 , 212.70
+337.08 , 5630.86 , 230.52
+337.08 , 6064.01 , 248.40
+337.08 , 6497.15 , 266.35
+337.08 , 6930.29 , 284.37
+337.08 , 7363.44 , 302.45
+337.08 , 7796.58 , 320.61
+337.08 , 8229.72 , 338.83
+337.08 , 8662.87 , 357.12
+370.79 , -9785.31 , -326.77
+370.79 , -9296.05 , -310.94
+370.79 , -8806.78 , -295.03
+370.79 , -8317.52 , -279.03
+370.79 , -7828.25 , -262.95
+370.79 , -7338.98 , -246.79
+370.79 , -6849.72 , -230.55
+370.79 , -6360.45 , -214.22
+370.79 , -5871.19 , -197.81
+370.79 , -5381.92 , -181.33
+370.79 , -4892.66 , -164.76
+370.79 , -4403.39 , -148.10
+370.79 , -3914.12 , -131.37
+370.79 , -3424.86 , -114.55
+370.79 , -2935.59 , -97.65
+370.79 , -2446.33 , -80.67
+370.79 , -1957.06 , -63.59
+370.79 , -1467.80 , -46.42
+370.79 , -978.53 , -29.10
+370.79 , -489.27 , -11.41
+370.79 , -97.85 , 0.00
+370.79 , 86.63 , 7.90
+370.79 , 433.14 , 23.79
+370.79 , 866.29 , 42.74
+370.79 , 1299.43 , 61.65
+370.79 , 1732.57 , 80.61
+370.79 , 2165.72 , 99.63
+370.79 , 2598.86 , 118.73
+370.79 , 3032.00 , 137.91
+370.79 , 3465.15 , 157.16
+370.79 , 3898.29 , 176.50
+370.79 , 4331.43 , 195.91
+370.79 , 4764.58 , 215.41
+370.79 , 5197.72 , 234.99
+370.79 , 5630.86 , 254.65
+370.79 , 6064.01 , 274.39
+370.79 , 6497.15 , 294.21
+370.79 , 6930.29 , 314.12
+370.79 , 7363.44 , 334.10
+370.79 , 7796.58 , 354.16
+370.79 , 8229.72 , 374.31
+370.79 , 8662.87 , 394.53
+404.50 , -9785.31 , -354.49
+404.50 , -9296.05 , -337.34
+404.50 , -8806.78 , -320.10
+404.50 , -8317.52 , -302.75
+404.50 , -7828.25 , -285.32
+404.50 , -7338.98 , -267.78
+404.50 , -6849.72 , -250.15
+404.50 , -6360.45 , -232.43
+404.50 , -5871.19 , -214.60
+404.50 , -5381.92 , -196.69
+404.50 , -4892.66 , -178.67
+404.50 , -4403.39 , -160.56
+404.50 , -3914.12 , -142.36
+404.50 , -3424.86 , -124.05
+404.50 , -2935.59 , -105.65
+404.50 , -2446.33 , -87.15
+404.50 , -1957.06 , -68.54
+404.50 , -1467.80 , -49.80
+404.50 , -978.53 , -30.89
+404.50 , -489.27 , -11.43
+404.50 , -97.85 , 0.00
+404.50 , 86.63 , 9.08
+404.50 , 433.14 , 26.62
+404.50 , 866.29 , 47.35
+404.50 , 1299.43 , 68.02
+404.50 , 1732.57 , 88.72
+404.50 , 2165.72 , 109.51
+404.50 , 2598.86 , 130.38
+404.50 , 3032.00 , 151.34
+404.50 , 3465.15 , 172.39
+404.50 , 3898.29 , 193.53
+404.50 , 4331.43 , 214.77
+404.50 , 4764.58 , 236.11
+404.50 , 5197.72 , 257.53
+404.50 , 5630.86 , 279.05
+404.50 , 6064.01 , 300.67
+404.50 , 6497.15 , 322.38
+404.50 , 6930.29 , 344.19
+404.50 , 7363.44 , 366.08
+404.50 , 7796.58 , 388.08
+404.50 , 8229.72 , 410.16
+404.50 , 8662.87 , 432.34
+438.21 , -9785.31 , -381.77
+438.21 , -9296.05 , -363.33
+438.21 , -8806.78 , -344.77
+438.21 , -8317.52 , -326.11
+438.21 , -7828.25 , -307.33
+438.21 , -7338.98 , -288.45
+438.21 , -6849.72 , -269.45
+438.21 , -6360.45 , -250.33
+438.21 , -5871.19 , -231.11
+438.21 , -5381.92 , -211.78
+438.21 , -4892.66 , -192.34
+438.21 , -4403.39 , -172.78
+438.21 , -3914.12 , -153.11
+438.21 , -3424.86 , -133.33
+438.21 , -2935.59 , -113.43
+438.21 , -2446.33 , -93.42
+438.21 , -1957.06 , -73.27
+438.21 , -1467.80 , -52.98
+438.21 , -978.53 , -32.45
+438.21 , -489.27 , -11.12
+438.21 , -97.85 , 0.00
+438.21 , 86.63 , 10.37
+438.21 , 433.14 , 29.60
+438.21 , 866.29 , 52.14
+438.21 , 1299.43 , 74.56
+438.21 , 1732.57 , 97.03
+438.21 , 2165.72 , 119.58
+438.21 , 2598.86 , 142.23
+438.21 , 3032.00 , 164.98
+438.21 , 3465.15 , 187.84
+438.21 , 3898.29 , 210.80
+438.21 , 4331.43 , 233.87
+438.21 , 4764.58 , 257.05
+438.21 , 5197.72 , 280.34
+438.21 , 5630.86 , 303.74
+438.21 , 6064.01 , 327.25
+438.21 , 6497.15 , 350.87
+438.21 , 6930.29 , 374.59
+438.21 , 7363.44 , 398.42
+438.21 , 7796.58 , 422.36
+438.21 , 8229.72 , 446.41
+438.21 , 8662.87 , 470.57
+471.92 , -9785.31 , -408.59
+471.92 , -9296.05 , -388.88
+471.92 , -8806.78 , -369.04
+471.92 , -8317.52 , -349.08
+471.92 , -7828.25 , -328.98
+471.92 , -7338.98 , -308.76
+471.92 , -6849.72 , -288.41
+471.92 , -6360.45 , -267.93
+471.92 , -5871.19 , -247.32
+471.92 , -5381.92 , -226.59
+471.92 , -4892.66 , -205.73
+471.92 , -4403.39 , -184.73
+471.92 , -3914.12 , -163.61
+471.92 , -3424.86 , -142.36
+471.92 , -2935.59 , -120.97
+471.92 , -2446.33 , -99.45
+471.92 , -1957.06 , -77.77
+471.92 , -1467.80 , -55.91
+471.92 , -978.53 , -33.75
+471.92 , -489.27 , -10.40
+471.92 , -97.85 , 0.00
+471.92 , 86.63 , 11.76
+471.92 , 433.14 , 32.74
+471.92 , 866.29 , 57.10
+471.92 , 1299.43 , 81.29
+471.92 , 1732.57 , 105.53
+471.92 , 2165.72 , 129.86
+471.92 , 2598.86 , 154.29
+471.92 , 3032.00 , 178.85
+471.92 , 3465.15 , 203.52
+471.92 , 3898.29 , 228.31
+471.92 , 4331.43 , 253.23
+471.92 , 4764.58 , 278.27
+471.92 , 5197.72 , 303.44
+471.92 , 5630.86 , 328.73
+471.92 , 6064.01 , 354.14
+471.92 , 6497.15 , 379.68
+471.92 , 6930.29 , 405.34
+471.92 , 7363.44 , 431.13
+471.92 , 7796.58 , 457.03
+471.92 , 8229.72 , 483.07
+471.92 , 8662.87 , 509.22
+505.62 , -9785.31 , -434.93
+505.62 , -9296.05 , -413.98
+505.62 , -8806.78 , -392.88
+505.62 , -8317.52 , -371.64
+505.62 , -7828.25 , -350.25
+505.62 , -7338.98 , -328.71
+505.62 , -6849.72 , -307.03
+505.62 , -6360.45 , -285.20
+505.62 , -5871.19 , -263.22
+505.62 , -5381.92 , -241.10
+505.62 , -4892.66 , -218.83
+505.62 , -4403.39 , -196.41
+505.62 , -3914.12 , -173.85
+505.62 , -3424.86 , -151.13
+505.62 , -2935.59 , -128.26
+505.62 , -2446.33 , -105.23
+505.62 , -1957.06 , -82.02
+505.62 , -1467.80 , -58.59
+505.62 , -978.53 , -34.77
+505.62 , -489.27 , -9.14
+505.62 , -97.85 , 0.00
+505.62 , 86.63 , 13.25
+505.62 , 433.14 , 36.05
+505.62 , 866.29 , 62.25
+505.62 , 1299.43 , 88.23
+505.62 , 1732.57 , 114.25
+505.62 , 2165.72 , 140.36
+505.62 , 2598.86 , 166.59
+505.62 , 3032.00 , 192.95
+505.62 , 3465.15 , 219.45
+505.62 , 3898.29 , 246.08
+505.62 , 4331.43 , 272.86
+505.62 , 4764.58 , 299.77
+505.62 , 5197.72 , 326.82
+505.62 , 5630.86 , 354.02
+505.62 , 6064.01 , 381.35
+505.62 , 6497.15 , 408.83
+505.62 , 6930.29 , 436.45
+505.62 , 7363.44 , 464.20
+505.62 , 7796.58 , 492.10
+505.62 , 8229.72 , 520.14
+505.62 , 8662.87 , 548.31
+539.33 , -9785.31 , -460.78
+539.33 , -9296.05 , -438.62
+539.33 , -8806.78 , -416.28
+539.33 , -8317.52 , -393.78
+539.33 , -7828.25 , -371.11
+539.33 , -7338.98 , -348.28
+539.33 , -6849.72 , -325.28
+539.33 , -6360.45 , -302.11
+539.33 , -5871.19 , -278.78
+539.33 , -5381.92 , -255.29
+539.33 , -4892.66 , -231.62
+539.33 , -4403.39 , -207.79
+539.33 , -3914.12 , -183.79
+539.33 , -3424.86 , -159.62
+539.33 , -2935.59 , -135.27
+539.33 , -2446.33 , -110.74
+539.33 , -1957.06 , -85.99
+539.33 , -1467.80 , -60.98
+539.33 , -978.53 , -35.47
+539.33 , -489.27 , -7.05
+539.33 , -97.85 , 0.00
+539.33 , 86.63 , 14.84
+539.33 , 433.14 , 39.53
+539.33 , 866.29 , 67.60
+539.33 , 1299.43 , 95.38
+539.33 , 1732.57 , 123.18
+539.33 , 2165.72 , 151.09
+539.33 , 2598.86 , 179.12
+539.33 , 3032.00 , 207.30
+539.33 , 3465.15 , 235.63
+539.33 , 3898.29 , 264.12
+539.33 , 4331.43 , 292.76
+539.33 , 4764.58 , 321.56
+539.33 , 5197.72 , 350.51
+539.33 , 5630.86 , 379.63
+539.33 , 6064.01 , 408.90
+539.33 , 6497.15 , 438.33
+539.33 , 6930.29 , 467.92
+539.33 , 7363.44 , 497.67
+539.33 , 7796.58 , 527.57
+539.33 , 8229.72 , 557.64
+539.33 , 8662.87 , 587.85
+573.04 , -9785.31 , -486.12
+573.04 , -9296.05 , -462.76
+573.04 , -8806.78 , -439.22
+573.04 , -8317.52 , -415.48
+573.04 , -7828.25 , -391.56
+573.04 , -7338.98 , -367.45
+573.04 , -6849.72 , -343.15
+573.04 , -6360.45 , -318.67
+573.04 , -5871.19 , -294.00
+573.04 , -5381.92 , -269.14
+573.04 , -4892.66 , -244.09
+573.04 , -4403.39 , -218.86
+573.04 , -3914.12 , -193.44
+573.04 , -3424.86 , -167.82
+573.04 , -2935.59 , -142.00
+573.04 , -2446.33 , -115.96
+573.04 , -1957.06 , -89.67
+573.04 , -1467.80 , -63.06
+573.04 , -978.53 , -35.80
+573.04 , -489.27 , -3.22
+573.04 , -97.85 , 0.00
+573.04 , 86.63 , 16.54
+573.04 , 433.14 , 43.18
+573.04 , 866.29 , 73.16
+573.04 , 1299.43 , 102.75
+573.04 , 1732.57 , 132.35
+573.04 , 2165.72 , 162.06
+573.04 , 2598.86 , 191.91
+573.04 , 3032.00 , 221.91
+573.04 , 3465.15 , 252.09
+573.04 , 3898.29 , 282.44
+573.04 , 4331.43 , 312.96
+573.04 , 4764.58 , 343.65
+573.04 , 5197.72 , 374.52
+573.04 , 5630.86 , 405.57
+573.04 , 6064.01 , 436.80
+573.04 , 6497.15 , 468.20
+573.04 , 6930.29 , 499.78
+573.04 , 7363.44 , 531.53
+573.04 , 7796.58 , 563.46
+573.04 , 8229.72 , 595.57
+573.04 , 8662.87 , 627.85
+606.75 , -9785.31 , -510.93
+606.75 , -9296.05 , -486.40
+606.75 , -8806.78 , -461.67
+606.75 , -8317.52 , -436.72
+606.75 , -7828.25 , -411.56
+606.75 , -7338.98 , -386.20
+606.75 , -6849.72 , -360.62
+606.75 , -6360.45 , -334.84
+606.75 , -5871.19 , -308.84
+606.75 , -5381.92 , -282.64
+606.75 , -4892.66 , -256.22
+606.75 , -4403.39 , -229.60
+606.75 , -3914.12 , -202.76
+606.75 , -3424.86 , -175.70
+606.75 , -2935.59 , -148.41
+606.75 , -2446.33 , -120.87
+606.75 , -1957.06 , -93.04
+606.75 , -1467.80 , -64.80
+606.75 , -978.53 , -35.73
+606.75 , -489.27 , 0.00
+606.75 , -97.85 , 0.00
+606.75 , 86.63 , 18.35
+606.75 , 433.14 , 47.02
+606.75 , 866.29 , 78.93
+606.75 , 1299.43 , 110.35
+606.75 , 1732.57 , 141.76
+606.75 , 2165.72 , 173.28
+606.75 , 2598.86 , 204.95
+606.75 , 3032.00 , 236.80
+606.75 , 3465.15 , 268.83
+606.75 , 3898.29 , 301.04
+606.75 , 4331.43 , 333.46
+606.75 , 4764.58 , 366.06
+606.75 , 5197.72 , 398.86
+606.75 , 5630.86 , 431.86
+606.75 , 6064.01 , 465.05
+606.75 , 6497.15 , 498.44
+606.75 , 6930.29 , 532.03
+606.75 , 7363.44 , 565.81
+606.75 , 7796.58 , 599.79
+606.75 , 8229.72 , 633.96
+606.75 , 8662.87 , 668.33
+640.46 , -9785.31 , -535.19
+640.46 , -9296.05 , -509.52
+640.46 , -8806.78 , -483.62
+640.46 , -8317.52 , -457.48
+640.46 , -7828.25 , -431.11
+640.46 , -7338.98 , -404.51
+640.46 , -6849.72 , -377.67
+640.46 , -6360.45 , -350.60
+640.46 , -5871.19 , -323.30
+640.46 , -5381.92 , -295.76
+640.46 , -4892.66 , -267.99
+640.46 , -4403.39 , -239.99
+640.46 , -3914.12 , -211.74
+640.46 , -3424.86 , -183.24
+640.46 , -2935.59 , -154.48
+640.46 , -2446.33 , -125.44
+640.46 , -1957.06 , -96.05
+640.46 , -1467.80 , -66.18
+640.46 , -978.53 , -35.19
+640.46 , -489.27 , 0.00
+640.46 , -97.85 , 0.00
+640.46 , 86.63 , 20.27
+640.46 , 433.14 , 51.05
+640.46 , 866.29 , 84.92
+640.46 , 1299.43 , 118.19
+640.46 , 1732.57 , 151.42
+640.46 , 2165.72 , 184.76
+640.46 , 2598.86 , 218.27
+640.46 , 3032.00 , 251.96
+640.46 , 3465.15 , 285.86
+640.46 , 3898.29 , 319.96
+640.46 , 4331.43 , 354.27
+640.46 , 4764.58 , 388.80
+640.46 , 5197.72 , 423.54
+640.46 , 5630.86 , 458.50
+640.46 , 6064.01 , 493.68
+640.46 , 6497.15 , 529.07
+640.46 , 6930.29 , 564.68
+640.46 , 7363.44 , 600.51
+640.46 , 7796.58 , 636.55
+640.46 , 8229.72 , 672.81
+640.46 , 8662.87 , 709.28
+674.17 , -9785.31 , -558.87
+674.17 , -9296.05 , -532.09
+674.17 , -8806.78 , -505.05
+674.17 , -8317.52 , -477.75
+674.17 , -7828.25 , -450.19
+674.17 , -7338.98 , -422.37
+674.17 , -6849.72 , -394.29
+674.17 , -6360.45 , -365.95
+674.17 , -5871.19 , -337.36
+674.17 , -5381.92 , -308.50
+674.17 , -4892.66 , -279.38
+674.17 , -4403.39 , -250.00
+674.17 , -3914.12 , -220.35
+674.17 , -3424.86 , -190.43
+674.17 , -2935.59 , -160.20
+674.17 , -2446.33 , -129.65
+674.17 , -1957.06 , -98.70
+674.17 , -1467.80 , -67.15
+674.17 , -978.53 , -34.12
+674.17 , -489.27 , 0.00
+674.17 , -97.85 , 0.00
+674.17 , 86.63 , 22.30
+674.17 , 433.14 , 55.27
+674.17 , 866.29 , 91.14
+674.17 , 1299.43 , 126.27
+674.17 , 1732.57 , 161.34
+674.17 , 2165.72 , 196.52
+674.17 , 2598.86 , 231.87
+674.17 , 3032.00 , 267.42
+674.17 , 3465.15 , 303.19
+674.17 , 3898.29 , 339.18
+674.17 , 4331.43 , 375.41
+674.17 , 4764.58 , 411.87
+674.17 , 5197.72 , 448.57
+674.17 , 5630.86 , 485.51
+674.17 , 6064.01 , 522.68
+674.17 , 6497.15 , 560.09
+674.17 , 6930.29 , 597.75
+674.17 , 7363.44 , 635.63
+674.17 , 7796.58 , 673.76
+674.17 , 8229.72 , 712.12
+674.17 , 8662.87 , 750.73
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_3.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..55066d31695ad3421b5ce6a0cac2b0ec831c3a20
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -5707.13 , 0.00
+0.00 , -5421.78 , 0.00
+0.00 , -5136.42 , 0.00
+0.00 , -4851.06 , 0.00
+0.00 , -4565.71 , 0.00
+0.00 , -4280.35 , 0.00
+0.00 , -3994.99 , -0.07
+0.00 , -3709.64 , -0.33
+0.00 , -3424.28 , -0.49
+0.00 , -3138.92 , -0.60
+0.00 , -2853.57 , -0.66
+0.00 , -2568.21 , -0.69
+0.00 , -2282.85 , -0.70
+0.00 , -1997.50 , -0.67
+0.00 , -1712.14 , -0.63
+0.00 , -1426.78 , -0.57
+0.00 , -1141.43 , -0.48
+0.00 , -856.07 , -0.38
+0.00 , -570.71 , -0.27
+0.00 , -285.36 , -0.13
+0.00 , -57.07 , -0.01
+0.00 , 51.57 , 0.06
+0.00 , 257.86 , 0.28
+0.00 , 515.72 , 0.56
+0.00 , 773.58 , 0.85
+0.00 , 1031.44 , 1.15
+0.00 , 1289.30 , 1.47
+0.00 , 1547.16 , 1.79
+0.00 , 1805.02 , 2.12
+0.00 , 2062.88 , 2.47
+0.00 , 2320.74 , 2.82
+0.00 , 2578.60 , 3.19
+0.00 , 2836.46 , 3.56
+0.00 , 3094.32 , 3.94
+0.00 , 3352.18 , 4.33
+0.00 , 3610.04 , 4.74
+0.00 , 3867.90 , 5.15
+0.00 , 4125.76 , 5.57
+0.00 , 4383.62 , 6.00
+0.00 , 4641.48 , 6.43
+0.00 , 4899.34 , 6.88
+0.00 , 5157.20 , 7.34
+5.72 , -5707.13 , 0.00
+5.72 , -5421.78 , 0.00
+5.72 , -5136.42 , 0.00
+5.72 , -4851.06 , 0.00
+5.72 , -4565.71 , 0.00
+5.72 , -4280.35 , 0.00
+5.72 , -3994.99 , -0.25
+5.72 , -3709.64 , -0.42
+5.72 , -3424.28 , -0.52
+5.72 , -3138.92 , -0.58
+5.72 , -2853.57 , -0.61
+5.72 , -2568.21 , -0.62
+5.72 , -2282.85 , -0.61
+5.72 , -1997.50 , -0.58
+5.72 , -1712.14 , -0.53
+5.72 , -1426.78 , -0.47
+5.72 , -1141.43 , -0.40
+5.72 , -856.07 , -0.31
+5.72 , -570.71 , -0.22
+5.72 , -285.36 , -0.11
+5.72 , -57.07 , -0.01
+5.72 , 51.57 , 0.05
+5.72 , 257.86 , 0.21
+5.72 , 515.72 , 0.43
+5.72 , 773.58 , 0.65
+5.72 , 1031.44 , 0.88
+5.72 , 1289.30 , 1.11
+5.72 , 1547.16 , 1.36
+5.72 , 1805.02 , 1.61
+5.72 , 2062.88 , 1.87
+5.72 , 2320.74 , 2.13
+5.72 , 2578.60 , 2.40
+5.72 , 2836.46 , 2.68
+5.72 , 3094.32 , 2.97
+5.72 , 3352.18 , 3.26
+5.72 , 3610.04 , 3.56
+5.72 , 3867.90 , 3.86
+5.72 , 4125.76 , 4.18
+5.72 , 4383.62 , 4.50
+5.72 , 4641.48 , 4.82
+5.72 , 4899.34 , 5.15
+5.72 , 5157.20 , 5.49
+57.21 , -5707.13 , -29.05
+57.21 , -5421.78 , -27.68
+57.21 , -5136.42 , -26.31
+57.21 , -4851.06 , -24.92
+57.21 , -4565.71 , -23.53
+57.21 , -4280.35 , -22.12
+57.21 , -3994.99 , -20.71
+57.21 , -3709.64 , -19.28
+57.21 , -3424.28 , -17.85
+57.21 , -3138.92 , -16.41
+57.21 , -2853.57 , -14.95
+57.21 , -2568.21 , -13.49
+57.21 , -2282.85 , -12.02
+57.21 , -1997.50 , -10.53
+57.21 , -1712.14 , -9.04
+57.21 , -1426.78 , -7.54
+57.21 , -1141.43 , -6.03
+57.21 , -856.07 , -4.51
+57.21 , -570.71 , -2.98
+57.21 , -285.36 , -1.44
+57.21 , -57.07 , -0.18
+57.21 , 51.57 , 0.45
+57.21 , 257.86 , 1.84
+57.21 , 515.72 , 3.58
+57.21 , 773.58 , 5.33
+57.21 , 1031.44 , 7.09
+57.21 , 1289.30 , 8.85
+57.21 , 1547.16 , 10.63
+57.21 , 1805.02 , 12.42
+57.21 , 2062.88 , 14.21
+57.21 , 2320.74 , 16.02
+57.21 , 2578.60 , 17.84
+57.21 , 2836.46 , 19.66
+57.21 , 3094.32 , 21.49
+57.21 , 3352.18 , 23.34
+57.21 , 3610.04 , 25.19
+57.21 , 3867.90 , 27.05
+57.21 , 4125.76 , 28.93
+57.21 , 4383.62 , 30.81
+57.21 , 4641.48 , 32.70
+57.21 , 4899.34 , 34.60
+57.21 , 5157.20 , 36.50
+114.41 , -5707.13 , -60.28
+114.41 , -5421.78 , -57.37
+114.41 , -5136.42 , -54.44
+114.41 , -4851.06 , -51.49
+114.41 , -4565.71 , -48.54
+114.41 , -4280.35 , -45.58
+114.41 , -3994.99 , -42.60
+114.41 , -3709.64 , -39.61
+114.41 , -3424.28 , -36.61
+114.41 , -3138.92 , -33.60
+114.41 , -2853.57 , -30.58
+114.41 , -2568.21 , -27.55
+114.41 , -2282.85 , -24.51
+114.41 , -1997.50 , -21.45
+114.41 , -1712.14 , -18.38
+114.41 , -1426.78 , -15.31
+114.41 , -1141.43 , -12.22
+114.41 , -856.07 , -9.12
+114.41 , -570.71 , -6.00
+114.41 , -285.36 , -2.88
+114.41 , -57.07 , -0.33
+114.41 , 51.57 , 0.92
+114.41 , 257.86 , 3.68
+114.41 , 515.72 , 7.11
+114.41 , 773.58 , 10.56
+114.41 , 1031.44 , 14.01
+114.41 , 1289.30 , 17.48
+114.41 , 1547.16 , 20.96
+114.41 , 1805.02 , 24.45
+114.41 , 2062.88 , 27.95
+114.41 , 2320.74 , 31.47
+114.41 , 2578.60 , 34.99
+114.41 , 2836.46 , 38.53
+114.41 , 3094.32 , 42.08
+114.41 , 3352.18 , 45.64
+114.41 , 3610.04 , 49.21
+114.41 , 3867.90 , 52.79
+114.41 , 4125.76 , 56.38
+114.41 , 4383.62 , 59.99
+114.41 , 4641.48 , 63.60
+114.41 , 4899.34 , 67.23
+114.41 , 5157.20 , 70.87
+171.62 , -5707.13 , -91.22
+171.62 , -5421.78 , -86.77
+171.62 , -5136.42 , -82.31
+171.62 , -4851.06 , -77.84
+171.62 , -4565.71 , -73.35
+171.62 , -4280.35 , -68.84
+171.62 , -3994.99 , -64.32
+171.62 , -3709.64 , -59.79
+171.62 , -3424.28 , -55.24
+171.62 , -3138.92 , -50.68
+171.62 , -2853.57 , -46.11
+171.62 , -2568.21 , -41.51
+171.62 , -2282.85 , -36.91
+171.62 , -1997.50 , -32.29
+171.62 , -1712.14 , -27.66
+171.62 , -1426.78 , -23.01
+171.62 , -1141.43 , -18.35
+171.62 , -856.07 , -13.67
+171.62 , -570.71 , -8.98
+171.62 , -285.36 , -4.27
+171.62 , -57.07 , -0.39
+171.62 , 51.57 , 1.43
+171.62 , 257.86 , 5.56
+171.62 , 515.72 , 10.69
+171.62 , 773.58 , 15.84
+171.62 , 1031.44 , 21.00
+171.62 , 1289.30 , 26.17
+171.62 , 1547.16 , 31.36
+171.62 , 1805.02 , 36.56
+171.62 , 2062.88 , 41.77
+171.62 , 2320.74 , 47.01
+171.62 , 2578.60 , 52.25
+171.62 , 2836.46 , 57.51
+171.62 , 3094.32 , 62.79
+171.62 , 3352.18 , 68.08
+171.62 , 3610.04 , 73.38
+171.62 , 3867.90 , 78.70
+171.62 , 4125.76 , 84.03
+171.62 , 4383.62 , 89.38
+171.62 , 4641.48 , 94.74
+171.62 , 4899.34 , 100.12
+171.62 , 5157.20 , 105.51
+228.82 , -5707.13 , -121.86
+228.82 , -5421.78 , -115.91
+228.82 , -5136.42 , -109.94
+228.82 , -4851.06 , -103.95
+228.82 , -4565.71 , -97.94
+228.82 , -4280.35 , -91.91
+228.82 , -3994.99 , -85.87
+228.82 , -3709.64 , -79.81
+228.82 , -3424.28 , -73.73
+228.82 , -3138.92 , -67.63
+228.82 , -2853.57 , -61.51
+228.82 , -2568.21 , -55.37
+228.82 , -2282.85 , -49.21
+228.82 , -1997.50 , -43.04
+228.82 , -1712.14 , -36.85
+228.82 , -1426.78 , -30.64
+228.82 , -1141.43 , -24.41
+228.82 , -856.07 , -18.16
+228.82 , -570.71 , -11.89
+228.82 , -285.36 , -5.59
+228.82 , -57.07 , -0.32
+228.82 , 51.57 , 1.99
+228.82 , 257.86 , 7.50
+228.82 , 515.72 , 14.34
+228.82 , 773.58 , 21.19
+228.82 , 1031.44 , 28.05
+228.82 , 1289.30 , 34.94
+228.82 , 1547.16 , 41.84
+228.82 , 1805.02 , 48.76
+228.82 , 2062.88 , 55.70
+228.82 , 2320.74 , 62.66
+228.82 , 2578.60 , 69.63
+228.82 , 2836.46 , 76.63
+228.82 , 3094.32 , 83.65
+228.82 , 3352.18 , 90.68
+228.82 , 3610.04 , 97.73
+228.82 , 3867.90 , 104.80
+228.82 , 4125.76 , 111.90
+228.82 , 4383.62 , 119.00
+228.82 , 4641.48 , 126.13
+228.82 , 4899.34 , 133.28
+228.82 , 5157.20 , 140.44
+286.03 , -5707.13 , -152.18
+286.03 , -5421.78 , -144.75
+286.03 , -5136.42 , -137.29
+286.03 , -4851.06 , -129.81
+286.03 , -4565.71 , -122.31
+286.03 , -4280.35 , -114.78
+286.03 , -3994.99 , -107.23
+286.03 , -3709.64 , -99.65
+286.03 , -3424.28 , -92.05
+286.03 , -3138.92 , -84.42
+286.03 , -2853.57 , -76.77
+286.03 , -2568.21 , -69.10
+286.03 , -2282.85 , -61.41
+286.03 , -1997.50 , -53.69
+286.03 , -1712.14 , -45.94
+286.03 , -1426.78 , -38.17
+286.03 , -1141.43 , -30.38
+286.03 , -856.07 , -22.57
+286.03 , -570.71 , -14.72
+286.03 , -285.36 , -6.84
+286.03 , -57.07 , 0.00
+286.03 , 51.57 , 2.61
+286.03 , 257.86 , 9.52
+286.03 , 515.72 , 18.06
+286.03 , 773.58 , 26.62
+286.03 , 1031.44 , 35.19
+286.03 , 1289.30 , 43.79
+286.03 , 1547.16 , 52.42
+286.03 , 1805.02 , 61.07
+286.03 , 2062.88 , 69.74
+286.03 , 2320.74 , 78.43
+286.03 , 2578.60 , 87.15
+286.03 , 2836.46 , 95.90
+286.03 , 3094.32 , 104.67
+286.03 , 3352.18 , 113.46
+286.03 , 3610.04 , 122.28
+286.03 , 3867.90 , 131.12
+286.03 , 4125.76 , 139.99
+286.03 , 4383.62 , 148.88
+286.03 , 4641.48 , 157.79
+286.03 , 4899.34 , 166.73
+286.03 , 5157.20 , 175.69
+343.23 , -5707.13 , -182.19
+343.23 , -5421.78 , -173.29
+343.23 , -5136.42 , -164.37
+343.23 , -4851.06 , -155.42
+343.23 , -4565.71 , -146.44
+343.23 , -4280.35 , -137.42
+343.23 , -3994.99 , -128.38
+343.23 , -3709.64 , -119.30
+343.23 , -3424.28 , -110.20
+343.23 , -3138.92 , -101.06
+343.23 , -2853.57 , -91.89
+343.23 , -2568.21 , -82.70
+343.23 , -2282.85 , -73.47
+343.23 , -1997.50 , -64.21
+343.23 , -1712.14 , -54.93
+343.23 , -1426.78 , -45.61
+343.23 , -1141.43 , -36.26
+343.23 , -856.07 , -26.87
+343.23 , -570.71 , -17.46
+343.23 , -285.36 , -7.98
+343.23 , -57.07 , 0.00
+343.23 , 51.57 , 3.29
+343.23 , 257.86 , 11.62
+343.23 , 515.72 , 21.88
+343.23 , 773.58 , 32.14
+343.23 , 1031.44 , 42.44
+343.23 , 1289.30 , 52.76
+343.23 , 1547.16 , 63.11
+343.23 , 1805.02 , 73.49
+343.23 , 2062.88 , 83.91
+343.23 , 2320.74 , 94.35
+343.23 , 2578.60 , 104.82
+343.23 , 2836.46 , 115.33
+343.23 , 3094.32 , 125.87
+343.23 , 3352.18 , 136.43
+343.23 , 3610.04 , 147.03
+343.23 , 3867.90 , 157.66
+343.23 , 4125.76 , 168.32
+343.23 , 4383.62 , 179.01
+343.23 , 4641.48 , 189.74
+343.23 , 4899.34 , 200.49
+343.23 , 5157.20 , 211.27
+400.44 , -5707.13 , -211.85
+400.44 , -5421.78 , -201.52
+400.44 , -5136.42 , -191.16
+400.44 , -4851.06 , -180.75
+400.44 , -4565.71 , -170.31
+400.44 , -4280.35 , -159.83
+400.44 , -3994.99 , -149.31
+400.44 , -3709.64 , -138.75
+400.44 , -3424.28 , -128.16
+400.44 , -3138.92 , -117.52
+400.44 , -2853.57 , -106.85
+400.44 , -2568.21 , -96.14
+400.44 , -2282.85 , -85.39
+400.44 , -1997.50 , -74.61
+400.44 , -1712.14 , -63.78
+400.44 , -1426.78 , -52.92
+400.44 , -1141.43 , -42.02
+400.44 , -856.07 , -31.07
+400.44 , -570.71 , -20.08
+400.44 , -285.36 , -9.00
+400.44 , -57.07 , 0.00
+400.44 , 51.57 , 4.05
+400.44 , 257.86 , 13.82
+400.44 , 515.72 , 25.80
+400.44 , 773.58 , 37.78
+400.44 , 1031.44 , 49.79
+400.44 , 1289.30 , 61.84
+400.44 , 1547.16 , 73.93
+400.44 , 1805.02 , 86.05
+400.44 , 2062.88 , 98.22
+400.44 , 2320.74 , 110.42
+400.44 , 2578.60 , 122.66
+400.44 , 2836.46 , 134.94
+400.44 , 3094.32 , 147.26
+400.44 , 3352.18 , 159.61
+400.44 , 3610.04 , 172.01
+400.44 , 3867.90 , 184.44
+400.44 , 4125.76 , 196.92
+400.44 , 4383.62 , 209.43
+400.44 , 4641.48 , 221.98
+400.44 , 4899.34 , 234.57
+400.44 , 5157.20 , 247.19
+457.64 , -5707.13 , -241.15
+457.64 , -5421.78 , -229.41
+457.64 , -5136.42 , -217.63
+457.64 , -4851.06 , -205.79
+457.64 , -4565.71 , -193.91
+457.64 , -4280.35 , -181.98
+457.64 , -3994.99 , -170.01
+457.64 , -3709.64 , -157.99
+457.64 , -3424.28 , -145.91
+457.64 , -3138.92 , -133.80
+457.64 , -2853.57 , -121.63
+457.64 , -2568.21 , -109.42
+457.64 , -2282.85 , -97.16
+457.64 , -1997.50 , -84.85
+457.64 , -1712.14 , -72.50
+457.64 , -1426.78 , -60.10
+457.64 , -1141.43 , -47.65
+457.64 , -856.07 , -35.14
+457.64 , -570.71 , -22.57
+457.64 , -285.36 , -9.88
+457.64 , -57.07 , 0.00
+457.64 , 51.57 , 4.88
+457.64 , 257.86 , 16.13
+457.64 , 515.72 , 29.83
+457.64 , 773.58 , 43.53
+457.64 , 1031.44 , 57.27
+457.64 , 1289.30 , 71.06
+457.64 , 1547.16 , 84.89
+457.64 , 1805.02 , 98.76
+457.64 , 2062.88 , 112.68
+457.64 , 2320.74 , 126.65
+457.64 , 2578.60 , 140.67
+457.64 , 2836.46 , 154.74
+457.64 , 3094.32 , 168.85
+457.64 , 3352.18 , 183.01
+457.64 , 3610.04 , 197.22
+457.64 , 3867.90 , 211.48
+457.64 , 4125.76 , 225.78
+457.64 , 4383.62 , 240.13
+457.64 , 4641.48 , 254.53
+457.64 , 4899.34 , 268.97
+457.64 , 5157.20 , 283.46
+514.85 , -5707.13 , -270.09
+514.85 , -5421.78 , -256.96
+514.85 , -5136.42 , -243.78
+514.85 , -4851.06 , -230.53
+514.85 , -4565.71 , -217.23
+514.85 , -4280.35 , -203.87
+514.85 , -3994.99 , -190.46
+514.85 , -3709.64 , -176.98
+514.85 , -3424.28 , -163.45
+514.85 , -3138.92 , -149.87
+514.85 , -2853.57 , -136.22
+514.85 , -2568.21 , -122.52
+514.85 , -2282.85 , -108.76
+514.85 , -1997.50 , -94.94
+514.85 , -1712.14 , -81.06
+514.85 , -1426.78 , -67.13
+514.85 , -1141.43 , -53.13
+514.85 , -856.07 , -39.07
+514.85 , -570.71 , -24.92
+514.85 , -285.36 , -10.59
+514.85 , -57.07 , 0.00
+514.85 , 51.57 , 5.80
+514.85 , 257.86 , 18.55
+514.85 , 515.72 , 33.99
+514.85 , 773.58 , 49.42
+514.85 , 1031.44 , 64.90
+514.85 , 1289.30 , 80.42
+514.85 , 1547.16 , 96.00
+514.85 , 1805.02 , 111.63
+514.85 , 2062.88 , 127.32
+514.85 , 2320.74 , 143.07
+514.85 , 2578.60 , 158.88
+514.85 , 2836.46 , 174.74
+514.85 , 3094.32 , 190.66
+514.85 , 3352.18 , 206.64
+514.85 , 3610.04 , 222.68
+514.85 , 3867.90 , 238.77
+514.85 , 4125.76 , 254.92
+514.85 , 4383.62 , 271.13
+514.85 , 4641.48 , 287.40
+514.85 , 4899.34 , 303.72
+514.85 , 5157.20 , 320.10
+572.06 , -5707.13 , -298.63
+572.06 , -5421.78 , -284.14
+572.06 , -5136.42 , -269.58
+572.06 , -4851.06 , -254.95
+572.06 , -4565.71 , -240.25
+572.06 , -4280.35 , -225.48
+572.06 , -3994.99 , -210.64
+572.06 , -3709.64 , -195.74
+572.06 , -3424.28 , -180.76
+572.06 , -3138.92 , -165.71
+572.06 , -2853.57 , -150.60
+572.06 , -2568.21 , -135.42
+572.06 , -2282.85 , -120.16
+572.06 , -1997.50 , -104.84
+572.06 , -1712.14 , -89.45
+572.06 , -1426.78 , -73.99
+572.06 , -1141.43 , -58.45
+572.06 , -856.07 , -42.83
+572.06 , -570.71 , -27.10
+572.06 , -285.36 , -11.12
+572.06 , -57.07 , 0.00
+572.06 , 51.57 , 6.80
+572.06 , 257.86 , 21.10
+572.06 , 515.72 , 38.29
+572.06 , 773.58 , 55.46
+572.06 , 1031.44 , 72.67
+572.06 , 1289.30 , 89.94
+572.06 , 1547.16 , 107.27
+572.06 , 1805.02 , 124.67
+572.06 , 2062.88 , 142.14
+572.06 , 2320.74 , 159.68
+572.06 , 2578.60 , 177.29
+572.06 , 2836.46 , 194.96
+572.06 , 3094.32 , 212.70
+572.06 , 3352.18 , 230.52
+572.06 , 3610.04 , 248.40
+572.06 , 3867.90 , 266.35
+572.06 , 4125.76 , 284.37
+572.06 , 4383.62 , 302.45
+572.06 , 4641.48 , 320.61
+572.06 , 4899.34 , 338.83
+572.06 , 5157.20 , 357.12
+629.26 , -5707.13 , -326.77
+629.26 , -5421.78 , -310.94
+629.26 , -5136.42 , -295.03
+629.26 , -4851.06 , -279.03
+629.26 , -4565.71 , -262.95
+629.26 , -4280.35 , -246.79
+629.26 , -3994.99 , -230.55
+629.26 , -3709.64 , -214.22
+629.26 , -3424.28 , -197.81
+629.26 , -3138.92 , -181.33
+629.26 , -2853.57 , -164.76
+629.26 , -2568.21 , -148.10
+629.26 , -2282.85 , -131.37
+629.26 , -1997.50 , -114.55
+629.26 , -1712.14 , -97.65
+629.26 , -1426.78 , -80.67
+629.26 , -1141.43 , -63.59
+629.26 , -856.07 , -46.42
+629.26 , -570.71 , -29.10
+629.26 , -285.36 , -11.41
+629.26 , -57.07 , 0.00
+629.26 , 51.57 , 7.90
+629.26 , 257.86 , 23.79
+629.26 , 515.72 , 42.74
+629.26 , 773.58 , 61.65
+629.26 , 1031.44 , 80.61
+629.26 , 1289.30 , 99.63
+629.26 , 1547.16 , 118.73
+629.26 , 1805.02 , 137.91
+629.26 , 2062.88 , 157.16
+629.26 , 2320.74 , 176.50
+629.26 , 2578.60 , 195.91
+629.26 , 2836.46 , 215.41
+629.26 , 3094.32 , 234.99
+629.26 , 3352.18 , 254.65
+629.26 , 3610.04 , 274.39
+629.26 , 3867.90 , 294.21
+629.26 , 4125.76 , 314.12
+629.26 , 4383.62 , 334.10
+629.26 , 4641.48 , 354.16
+629.26 , 4899.34 , 374.31
+629.26 , 5157.20 , 394.53
+686.47 , -5707.13 , -354.49
+686.47 , -5421.78 , -337.34
+686.47 , -5136.42 , -320.10
+686.47 , -4851.06 , -302.75
+686.47 , -4565.71 , -285.32
+686.47 , -4280.35 , -267.78
+686.47 , -3994.99 , -250.15
+686.47 , -3709.64 , -232.43
+686.47 , -3424.28 , -214.60
+686.47 , -3138.92 , -196.69
+686.47 , -2853.57 , -178.67
+686.47 , -2568.21 , -160.56
+686.47 , -2282.85 , -142.36
+686.47 , -1997.50 , -124.05
+686.47 , -1712.14 , -105.65
+686.47 , -1426.78 , -87.15
+686.47 , -1141.43 , -68.54
+686.47 , -856.07 , -49.80
+686.47 , -570.71 , -30.89
+686.47 , -285.36 , -11.43
+686.47 , -57.07 , 0.00
+686.47 , 51.57 , 9.08
+686.47 , 257.86 , 26.62
+686.47 , 515.72 , 47.35
+686.47 , 773.58 , 68.02
+686.47 , 1031.44 , 88.72
+686.47 , 1289.30 , 109.51
+686.47 , 1547.16 , 130.38
+686.47 , 1805.02 , 151.34
+686.47 , 2062.88 , 172.39
+686.47 , 2320.74 , 193.53
+686.47 , 2578.60 , 214.77
+686.47 , 2836.46 , 236.11
+686.47 , 3094.32 , 257.53
+686.47 , 3352.18 , 279.05
+686.47 , 3610.04 , 300.67
+686.47 , 3867.90 , 322.38
+686.47 , 4125.76 , 344.19
+686.47 , 4383.62 , 366.08
+686.47 , 4641.48 , 388.08
+686.47 , 4899.34 , 410.16
+686.47 , 5157.20 , 432.34
+743.67 , -5707.13 , -381.77
+743.67 , -5421.78 , -363.33
+743.67 , -5136.42 , -344.77
+743.67 , -4851.06 , -326.11
+743.67 , -4565.71 , -307.33
+743.67 , -4280.35 , -288.45
+743.67 , -3994.99 , -269.45
+743.67 , -3709.64 , -250.33
+743.67 , -3424.28 , -231.11
+743.67 , -3138.92 , -211.78
+743.67 , -2853.57 , -192.34
+743.67 , -2568.21 , -172.78
+743.67 , -2282.85 , -153.11
+743.67 , -1997.50 , -133.33
+743.67 , -1712.14 , -113.43
+743.67 , -1426.78 , -93.42
+743.67 , -1141.43 , -73.27
+743.67 , -856.07 , -52.98
+743.67 , -570.71 , -32.45
+743.67 , -285.36 , -11.12
+743.67 , -57.07 , 0.00
+743.67 , 51.57 , 10.37
+743.67 , 257.86 , 29.60
+743.67 , 515.72 , 52.14
+743.67 , 773.58 , 74.56
+743.67 , 1031.44 , 97.03
+743.67 , 1289.30 , 119.58
+743.67 , 1547.16 , 142.23
+743.67 , 1805.02 , 164.98
+743.67 , 2062.88 , 187.84
+743.67 , 2320.74 , 210.80
+743.67 , 2578.60 , 233.87
+743.67 , 2836.46 , 257.05
+743.67 , 3094.32 , 280.34
+743.67 , 3352.18 , 303.74
+743.67 , 3610.04 , 327.25
+743.67 , 3867.90 , 350.87
+743.67 , 4125.76 , 374.59
+743.67 , 4383.62 , 398.42
+743.67 , 4641.48 , 422.36
+743.67 , 4899.34 , 446.41
+743.67 , 5157.20 , 470.57
+800.88 , -5707.13 , -408.59
+800.88 , -5421.78 , -388.88
+800.88 , -5136.42 , -369.04
+800.88 , -4851.06 , -349.08
+800.88 , -4565.71 , -328.98
+800.88 , -4280.35 , -308.76
+800.88 , -3994.99 , -288.41
+800.88 , -3709.64 , -267.93
+800.88 , -3424.28 , -247.32
+800.88 , -3138.92 , -226.59
+800.88 , -2853.57 , -205.73
+800.88 , -2568.21 , -184.73
+800.88 , -2282.85 , -163.61
+800.88 , -1997.50 , -142.36
+800.88 , -1712.14 , -120.97
+800.88 , -1426.78 , -99.45
+800.88 , -1141.43 , -77.77
+800.88 , -856.07 , -55.91
+800.88 , -570.71 , -33.75
+800.88 , -285.36 , -10.40
+800.88 , -57.07 , 0.00
+800.88 , 51.57 , 11.76
+800.88 , 257.86 , 32.74
+800.88 , 515.72 , 57.10
+800.88 , 773.58 , 81.29
+800.88 , 1031.44 , 105.53
+800.88 , 1289.30 , 129.86
+800.88 , 1547.16 , 154.29
+800.88 , 1805.02 , 178.85
+800.88 , 2062.88 , 203.52
+800.88 , 2320.74 , 228.31
+800.88 , 2578.60 , 253.23
+800.88 , 2836.46 , 278.27
+800.88 , 3094.32 , 303.44
+800.88 , 3352.18 , 328.73
+800.88 , 3610.04 , 354.14
+800.88 , 3867.90 , 379.68
+800.88 , 4125.76 , 405.34
+800.88 , 4383.62 , 431.13
+800.88 , 4641.48 , 457.03
+800.88 , 4899.34 , 483.07
+800.88 , 5157.20 , 509.22
+858.08 , -5707.13 , -434.93
+858.08 , -5421.78 , -413.98
+858.08 , -5136.42 , -392.88
+858.08 , -4851.06 , -371.64
+858.08 , -4565.71 , -350.25
+858.08 , -4280.35 , -328.71
+858.08 , -3994.99 , -307.03
+858.08 , -3709.64 , -285.20
+858.08 , -3424.28 , -263.22
+858.08 , -3138.92 , -241.10
+858.08 , -2853.57 , -218.83
+858.08 , -2568.21 , -196.41
+858.08 , -2282.85 , -173.85
+858.08 , -1997.50 , -151.13
+858.08 , -1712.14 , -128.26
+858.08 , -1426.78 , -105.23
+858.08 , -1141.43 , -82.02
+858.08 , -856.07 , -58.59
+858.08 , -570.71 , -34.77
+858.08 , -285.36 , -9.14
+858.08 , -57.07 , 0.00
+858.08 , 51.57 , 13.25
+858.08 , 257.86 , 36.05
+858.08 , 515.72 , 62.25
+858.08 , 773.58 , 88.23
+858.08 , 1031.44 , 114.25
+858.08 , 1289.30 , 140.36
+858.08 , 1547.16 , 166.59
+858.08 , 1805.02 , 192.95
+858.08 , 2062.88 , 219.45
+858.08 , 2320.74 , 246.08
+858.08 , 2578.60 , 272.86
+858.08 , 2836.46 , 299.77
+858.08 , 3094.32 , 326.82
+858.08 , 3352.18 , 354.02
+858.08 , 3610.04 , 381.35
+858.08 , 3867.90 , 408.83
+858.08 , 4125.76 , 436.45
+858.08 , 4383.62 , 464.20
+858.08 , 4641.48 , 492.10
+858.08 , 4899.34 , 520.14
+858.08 , 5157.20 , 548.31
+915.29 , -5707.13 , -460.78
+915.29 , -5421.78 , -438.62
+915.29 , -5136.42 , -416.28
+915.29 , -4851.06 , -393.78
+915.29 , -4565.71 , -371.11
+915.29 , -4280.35 , -348.28
+915.29 , -3994.99 , -325.28
+915.29 , -3709.64 , -302.11
+915.29 , -3424.28 , -278.78
+915.29 , -3138.92 , -255.29
+915.29 , -2853.57 , -231.62
+915.29 , -2568.21 , -207.79
+915.29 , -2282.85 , -183.79
+915.29 , -1997.50 , -159.62
+915.29 , -1712.14 , -135.27
+915.29 , -1426.78 , -110.74
+915.29 , -1141.43 , -85.99
+915.29 , -856.07 , -60.98
+915.29 , -570.71 , -35.47
+915.29 , -285.36 , -7.05
+915.29 , -57.07 , 0.00
+915.29 , 51.57 , 14.84
+915.29 , 257.86 , 39.53
+915.29 , 515.72 , 67.60
+915.29 , 773.58 , 95.38
+915.29 , 1031.44 , 123.18
+915.29 , 1289.30 , 151.09
+915.29 , 1547.16 , 179.12
+915.29 , 1805.02 , 207.30
+915.29 , 2062.88 , 235.63
+915.29 , 2320.74 , 264.12
+915.29 , 2578.60 , 292.76
+915.29 , 2836.46 , 321.56
+915.29 , 3094.32 , 350.51
+915.29 , 3352.18 , 379.63
+915.29 , 3610.04 , 408.90
+915.29 , 3867.90 , 438.33
+915.29 , 4125.76 , 467.92
+915.29 , 4383.62 , 497.67
+915.29 , 4641.48 , 527.57
+915.29 , 4899.34 , 557.64
+915.29 , 5157.20 , 587.85
+972.50 , -5707.13 , -486.12
+972.50 , -5421.78 , -462.76
+972.50 , -5136.42 , -439.22
+972.50 , -4851.06 , -415.48
+972.50 , -4565.71 , -391.56
+972.50 , -4280.35 , -367.45
+972.50 , -3994.99 , -343.15
+972.50 , -3709.64 , -318.67
+972.50 , -3424.28 , -294.00
+972.50 , -3138.92 , -269.14
+972.50 , -2853.57 , -244.09
+972.50 , -2568.21 , -218.86
+972.50 , -2282.85 , -193.44
+972.50 , -1997.50 , -167.82
+972.50 , -1712.14 , -142.00
+972.50 , -1426.78 , -115.96
+972.50 , -1141.43 , -89.67
+972.50 , -856.07 , -63.06
+972.50 , -570.71 , -35.80
+972.50 , -285.36 , -3.22
+972.50 , -57.07 , 0.00
+972.50 , 51.57 , 16.54
+972.50 , 257.86 , 43.18
+972.50 , 515.72 , 73.16
+972.50 , 773.58 , 102.75
+972.50 , 1031.44 , 132.35
+972.50 , 1289.30 , 162.06
+972.50 , 1547.16 , 191.91
+972.50 , 1805.02 , 221.91
+972.50 , 2062.88 , 252.09
+972.50 , 2320.74 , 282.44
+972.50 , 2578.60 , 312.96
+972.50 , 2836.46 , 343.65
+972.50 , 3094.32 , 374.52
+972.50 , 3352.18 , 405.57
+972.50 , 3610.04 , 436.80
+972.50 , 3867.90 , 468.20
+972.50 , 4125.76 , 499.78
+972.50 , 4383.62 , 531.53
+972.50 , 4641.48 , 563.46
+972.50 , 4899.34 , 595.57
+972.50 , 5157.20 , 627.85
+1029.70 , -5707.13 , -510.93
+1029.70 , -5421.78 , -486.40
+1029.70 , -5136.42 , -461.67
+1029.70 , -4851.06 , -436.72
+1029.70 , -4565.71 , -411.56
+1029.70 , -4280.35 , -386.20
+1029.70 , -3994.99 , -360.62
+1029.70 , -3709.64 , -334.84
+1029.70 , -3424.28 , -308.84
+1029.70 , -3138.92 , -282.64
+1029.70 , -2853.57 , -256.22
+1029.70 , -2568.21 , -229.60
+1029.70 , -2282.85 , -202.76
+1029.70 , -1997.50 , -175.70
+1029.70 , -1712.14 , -148.41
+1029.70 , -1426.78 , -120.87
+1029.70 , -1141.43 , -93.04
+1029.70 , -856.07 , -64.80
+1029.70 , -570.71 , -35.73
+1029.70 , -285.36 , 0.00
+1029.70 , -57.07 , 0.00
+1029.70 , 51.57 , 18.35
+1029.70 , 257.86 , 47.02
+1029.70 , 515.72 , 78.93
+1029.70 , 773.58 , 110.35
+1029.70 , 1031.44 , 141.76
+1029.70 , 1289.30 , 173.28
+1029.70 , 1547.16 , 204.95
+1029.70 , 1805.02 , 236.80
+1029.70 , 2062.88 , 268.83
+1029.70 , 2320.74 , 301.04
+1029.70 , 2578.60 , 333.46
+1029.70 , 2836.46 , 366.06
+1029.70 , 3094.32 , 398.86
+1029.70 , 3352.18 , 431.86
+1029.70 , 3610.04 , 465.05
+1029.70 , 3867.90 , 498.44
+1029.70 , 4125.76 , 532.03
+1029.70 , 4383.62 , 565.81
+1029.70 , 4641.48 , 599.79
+1029.70 , 4899.34 , 633.96
+1029.70 , 5157.20 , 668.33
+1086.91 , -5707.13 , -535.19
+1086.91 , -5421.78 , -509.52
+1086.91 , -5136.42 , -483.62
+1086.91 , -4851.06 , -457.48
+1086.91 , -4565.71 , -431.11
+1086.91 , -4280.35 , -404.51
+1086.91 , -3994.99 , -377.67
+1086.91 , -3709.64 , -350.60
+1086.91 , -3424.28 , -323.30
+1086.91 , -3138.92 , -295.76
+1086.91 , -2853.57 , -267.99
+1086.91 , -2568.21 , -239.99
+1086.91 , -2282.85 , -211.74
+1086.91 , -1997.50 , -183.24
+1086.91 , -1712.14 , -154.48
+1086.91 , -1426.78 , -125.44
+1086.91 , -1141.43 , -96.05
+1086.91 , -856.07 , -66.18
+1086.91 , -570.71 , -35.19
+1086.91 , -285.36 , 0.00
+1086.91 , -57.07 , 0.00
+1086.91 , 51.57 , 20.27
+1086.91 , 257.86 , 51.05
+1086.91 , 515.72 , 84.92
+1086.91 , 773.58 , 118.19
+1086.91 , 1031.44 , 151.42
+1086.91 , 1289.30 , 184.76
+1086.91 , 1547.16 , 218.27
+1086.91 , 1805.02 , 251.96
+1086.91 , 2062.88 , 285.86
+1086.91 , 2320.74 , 319.96
+1086.91 , 2578.60 , 354.27
+1086.91 , 2836.46 , 388.80
+1086.91 , 3094.32 , 423.54
+1086.91 , 3352.18 , 458.50
+1086.91 , 3610.04 , 493.68
+1086.91 , 3867.90 , 529.07
+1086.91 , 4125.76 , 564.68
+1086.91 , 4383.62 , 600.51
+1086.91 , 4641.48 , 636.55
+1086.91 , 4899.34 , 672.81
+1086.91 , 5157.20 , 709.28
+1144.11 , -5707.13 , -558.87
+1144.11 , -5421.78 , -532.09
+1144.11 , -5136.42 , -505.05
+1144.11 , -4851.06 , -477.75
+1144.11 , -4565.71 , -450.19
+1144.11 , -4280.35 , -422.37
+1144.11 , -3994.99 , -394.29
+1144.11 , -3709.64 , -365.95
+1144.11 , -3424.28 , -337.36
+1144.11 , -3138.92 , -308.50
+1144.11 , -2853.57 , -279.38
+1144.11 , -2568.21 , -250.00
+1144.11 , -2282.85 , -220.35
+1144.11 , -1997.50 , -190.43
+1144.11 , -1712.14 , -160.20
+1144.11 , -1426.78 , -129.65
+1144.11 , -1141.43 , -98.70
+1144.11 , -856.07 , -67.15
+1144.11 , -570.71 , -34.12
+1144.11 , -285.36 , 0.00
+1144.11 , -57.07 , 0.00
+1144.11 , 51.57 , 22.30
+1144.11 , 257.86 , 55.27
+1144.11 , 515.72 , 91.14
+1144.11 , 773.58 , 126.27
+1144.11 , 1031.44 , 161.34
+1144.11 , 1289.30 , 196.52
+1144.11 , 1547.16 , 231.87
+1144.11 , 1805.02 , 267.42
+1144.11 , 2062.88 , 303.19
+1144.11 , 2320.74 , 339.18
+1144.11 , 2578.60 , 375.41
+1144.11 , 2836.46 , 411.87
+1144.11 , 3094.32 , 448.57
+1144.11 , 3352.18 , 485.51
+1144.11 , 3610.04 , 522.68
+1144.11 , 3867.90 , 560.09
+1144.11 , 4125.76 , 597.75
+1144.11 , 4383.62 , 635.63
+1144.11 , 4641.48 , 673.76
+1144.11 , 4899.34 , 712.12
+1144.11 , 5157.20 , 750.73
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..3c80c1e20b59f7eb9bf9944d96f50223c180d0ce
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 5157.20 , -5707.13
+5.67 , 5157.20 , -5707.13
+57.23 , 5157.20 , -5707.13
+114.47 , 5157.20 , -5707.13
+171.56 , 5157.20 , -5707.13
+228.79 , 5157.20 , -5707.13
+286.03 , 5157.20 , -5707.13
+343.26 , 4297.66 , -4755.94
+400.49 , 3683.68 , -4076.49
+457.59 , 3223.25 , -3566.96
+514.82 , 2865.13 , -3170.65
+572.05 , 2578.60 , -2853.57
+629.29 , 2344.19 , -2594.16
+686.52 , 2148.83 , -2377.97
+743.61 , 1983.53 , -2195.04
+800.85 , 1841.88 , -2038.28
+858.08 , 1719.07 , -1902.38
+915.31 , 1611.66 , -1783.52
+972.54 , 1516.83 , -1678.58
+1029.64 , 1432.53 , -1585.29
+1086.87 , 1357.17 , -1501.89
+1144.11 , 1289.30 , -1426.78
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..3c80c1e20b59f7eb9bf9944d96f50223c180d0ce
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 5157.20 , -5707.13
+5.67 , 5157.20 , -5707.13
+57.23 , 5157.20 , -5707.13
+114.47 , 5157.20 , -5707.13
+171.56 , 5157.20 , -5707.13
+228.79 , 5157.20 , -5707.13
+286.03 , 5157.20 , -5707.13
+343.26 , 4297.66 , -4755.94
+400.49 , 3683.68 , -4076.49
+457.59 , 3223.25 , -3566.96
+514.82 , 2865.13 , -3170.65
+572.05 , 2578.60 , -2853.57
+629.29 , 2344.19 , -2594.16
+686.52 , 2148.83 , -2377.97
+743.61 , 1983.53 , -2195.04
+800.85 , 1841.88 , -2038.28
+858.08 , 1719.07 , -1902.38
+915.31 , 1611.66 , -1783.52
+972.54 , 1516.83 , -1678.58
+1029.64 , 1432.53 , -1585.29
+1086.87 , 1357.17 , -1501.89
+1144.11 , 1289.30 , -1426.78
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..620f776f90668e47b3191d74c31059957ef5facb
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -10.92
+5.72 , -11.26
+57.21 , -14.46
+114.41 , -18.00
+171.62 , -21.53
+228.82 , -25.11
+286.03 , -28.65
+343.23 , -32.19
+400.44 , -35.73
+457.65 , -39.27
+514.85 , -42.84
+572.06 , -46.38
+629.26 , -49.92
+686.47 , -53.46
+743.67 , -57.00
+800.88 , -60.57
+858.08 , -64.11
+915.29 , -67.65
+972.50 , -71.19
+1029.70 , -74.73
+1086.91 , -78.30
+1144.11 , -81.84
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/GenericIEPC_Gbx3Whl2.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/GenericIEPC_Gbx3Whl2.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..47e3bfc6dd49ea605c5f474274d8e24a00f7791a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/GenericIEPC_Gbx3Whl2.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 2,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 21.9384
+ },
+ {
+ "Ratio": 12.276
+ },
+ {
+ "Ratio": 7.2336
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3Whl2_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl2_1.viepco",
+ "2": "IEPC_Gbx3Whl2_2.viepco",
+ "3": "IEPC_Gbx3Whl2_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3Whl2_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl2_1.viepco",
+ "2": "IEPC_Gbx3Whl2_2.viepco",
+ "3": "IEPC_Gbx3Whl2_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3Whl2_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..7ea4e7402ab9fb94f0d1cb78e250176c035e8a9d
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3Whl2.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_ENG_Gbx3Whl2.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_ENG_Gbx3Whl2.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..e8e507aeeaae83a7255e425e2b9134ac82860c7f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_ENG_Gbx3Whl2.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx3Whl2.vveh",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_1.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..6661444505d1f80e1b7ccf4680f069a1394f3e8d
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -35338.92 , 0.00
+0.00 , -33571.97 , 0.00
+0.00 , -31805.03 , 0.00
+0.00 , -30038.08 , 0.00
+0.00 , -28271.13 , 0.00
+0.00 , -26504.19 , 0.00
+0.00 , -24737.24 , -0.13
+0.00 , -22970.30 , -0.66
+0.00 , -21203.35 , -0.98
+0.00 , -19436.40 , -1.19
+0.00 , -17669.46 , -1.32
+0.00 , -15902.51 , -1.38
+0.00 , -14135.57 , -1.39
+0.00 , -12368.62 , -1.35
+0.00 , -10601.68 , -1.26
+0.00 , -8834.73 , -1.13
+0.00 , -7067.78 , -0.97
+0.00 , -5300.84 , -0.77
+0.00 , -3533.89 , -0.53
+0.00 , -1766.95 , -0.27
+0.00 , -353.39 , -0.02
+0.00 , 306.44 , 0.13
+0.00 , 1532.18 , 0.56
+0.00 , 3064.36 , 1.12
+0.00 , 4596.53 , 1.70
+0.00 , 6128.71 , 2.31
+0.00 , 7660.89 , 2.93
+0.00 , 9193.07 , 3.58
+0.00 , 10725.24 , 4.25
+0.00 , 12257.42 , 4.93
+0.00 , 13789.60 , 5.64
+0.00 , 15321.78 , 6.37
+0.00 , 16853.96 , 7.12
+0.00 , 18386.13 , 7.88
+0.00 , 19918.31 , 8.67
+0.00 , 21450.49 , 9.47
+0.00 , 22982.67 , 10.29
+0.00 , 24514.85 , 11.13
+0.00 , 26047.02 , 11.99
+0.00 , 27579.20 , 12.87
+0.00 , 29111.38 , 13.76
+0.00 , 30643.56 , 14.67
+1.89 , -35338.92 , 0.00
+1.89 , -33571.97 , 0.00
+1.89 , -31805.03 , 0.00
+1.89 , -30038.08 , 0.00
+1.89 , -28271.13 , 0.00
+1.89 , -26504.19 , 0.00
+1.89 , -24737.24 , -0.50
+1.89 , -22970.30 , -0.84
+1.89 , -21203.35 , -1.04
+1.89 , -19436.40 , -1.16
+1.89 , -17669.46 , -1.22
+1.89 , -15902.51 , -1.24
+1.89 , -14135.57 , -1.21
+1.89 , -12368.62 , -1.15
+1.89 , -10601.68 , -1.06
+1.89 , -8834.73 , -0.94
+1.89 , -7067.78 , -0.80
+1.89 , -5300.84 , -0.62
+1.89 , -3533.89 , -0.43
+1.89 , -1766.95 , -0.21
+1.89 , -353.39 , -0.02
+1.89 , 306.44 , 0.10
+1.89 , 1532.18 , 0.43
+1.89 , 3064.36 , 0.85
+1.89 , 4596.53 , 1.30
+1.89 , 6128.71 , 1.75
+1.89 , 7660.89 , 2.23
+1.89 , 9193.07 , 2.71
+1.89 , 10725.24 , 3.21
+1.89 , 12257.42 , 3.73
+1.89 , 13789.60 , 4.26
+1.89 , 15321.78 , 4.80
+1.89 , 16853.96 , 5.36
+1.89 , 18386.13 , 5.93
+1.89 , 19918.31 , 6.52
+1.89 , 21450.49 , 7.12
+1.89 , 22982.67 , 7.73
+1.89 , 24514.85 , 8.35
+1.89 , 26047.02 , 8.99
+1.89 , 27579.20 , 9.64
+1.89 , 29111.38 , 10.30
+1.89 , 30643.56 , 10.98
+18.86 , -35338.92 , -58.10
+18.86 , -33571.97 , -55.37
+18.86 , -31805.03 , -52.62
+18.86 , -30038.08 , -49.85
+18.86 , -28271.13 , -47.06
+18.86 , -26504.19 , -44.25
+18.86 , -24737.24 , -41.42
+18.86 , -22970.30 , -38.57
+18.86 , -21203.35 , -35.70
+18.86 , -19436.40 , -32.81
+18.86 , -17669.46 , -29.90
+18.86 , -15902.51 , -26.98
+18.86 , -14135.57 , -24.03
+18.86 , -12368.62 , -21.07
+18.86 , -10601.68 , -18.08
+18.86 , -8834.73 , -15.08
+18.86 , -7067.78 , -12.06
+18.86 , -5300.84 , -9.02
+18.86 , -3533.89 , -5.96
+18.86 , -1766.95 , -2.88
+18.86 , -353.39 , -0.37
+18.86 , 306.44 , 0.90
+18.86 , 1532.18 , 3.68
+18.86 , 3064.36 , 7.16
+18.86 , 4596.53 , 10.66
+18.86 , 6128.71 , 14.17
+18.86 , 7660.89 , 17.71
+18.86 , 9193.07 , 21.26
+18.86 , 10725.24 , 24.84
+18.86 , 12257.42 , 28.43
+18.86 , 13789.60 , 32.04
+18.86 , 15321.78 , 35.67
+18.86 , 16853.96 , 39.32
+18.86 , 18386.13 , 42.99
+18.86 , 19918.31 , 46.68
+18.86 , 21450.49 , 50.38
+18.86 , 22982.67 , 54.11
+18.86 , 24514.85 , 57.85
+18.86 , 26047.02 , 61.61
+18.86 , 27579.20 , 65.39
+18.86 , 29111.38 , 69.19
+18.86 , 30643.56 , 73.01
+37.72 , -35338.92 , -120.57
+37.72 , -33571.97 , -114.73
+37.72 , -31805.03 , -108.87
+37.72 , -30038.08 , -102.99
+37.72 , -28271.13 , -97.08
+37.72 , -26504.19 , -91.15
+37.72 , -24737.24 , -85.20
+37.72 , -22970.30 , -79.23
+37.72 , -21203.35 , -73.23
+37.72 , -19436.40 , -67.21
+37.72 , -17669.46 , -61.17
+37.72 , -15902.51 , -55.10
+37.72 , -14135.57 , -49.01
+37.72 , -12368.62 , -42.90
+37.72 , -10601.68 , -36.77
+37.72 , -8834.73 , -30.61
+37.72 , -7067.78 , -24.43
+37.72 , -5300.84 , -18.23
+37.72 , -3533.89 , -12.01
+37.72 , -1766.95 , -5.76
+37.72 , -353.39 , -0.66
+37.72 , 306.44 , 1.84
+37.72 , 1532.18 , 7.35
+37.72 , 3064.36 , 14.22
+37.72 , 4596.53 , 21.11
+37.72 , 6128.71 , 28.02
+37.72 , 7660.89 , 34.96
+37.72 , 9193.07 , 41.92
+37.72 , 10725.24 , 48.90
+37.72 , 12257.42 , 55.90
+37.72 , 13789.60 , 62.93
+37.72 , 15321.78 , 69.98
+37.72 , 16853.96 , 77.05
+37.72 , 18386.13 , 84.15
+37.72 , 19918.31 , 91.27
+37.72 , 21450.49 , 98.41
+37.72 , 22982.67 , 105.58
+37.72 , 24514.85 , 112.76
+37.72 , 26047.02 , 119.97
+37.72 , 27579.20 , 127.21
+37.72 , 29111.38 , 134.46
+37.72 , 30643.56 , 141.74
+56.59 , -35338.92 , -182.44
+56.59 , -33571.97 , -173.55
+56.59 , -31805.03 , -164.62
+56.59 , -30038.08 , -155.67
+56.59 , -28271.13 , -146.69
+56.59 , -26504.19 , -137.68
+56.59 , -24737.24 , -128.65
+56.59 , -22970.30 , -119.58
+56.59 , -21203.35 , -110.49
+56.59 , -19436.40 , -101.36
+56.59 , -17669.46 , -92.21
+56.59 , -15902.51 , -83.03
+56.59 , -14135.57 , -73.82
+56.59 , -12368.62 , -64.58
+56.59 , -10601.68 , -55.31
+56.59 , -8834.73 , -46.02
+56.59 , -7067.78 , -36.70
+56.59 , -5300.84 , -27.34
+56.59 , -3533.89 , -17.96
+56.59 , -1766.95 , -8.54
+56.59 , -353.39 , -0.79
+56.59 , 306.44 , 2.86
+56.59 , 1532.18 , 11.12
+56.59 , 3064.36 , 21.39
+56.59 , 4596.53 , 31.68
+56.59 , 6128.71 , 41.99
+56.59 , 7660.89 , 52.34
+56.59 , 9193.07 , 62.71
+56.59 , 10725.24 , 73.12
+56.59 , 12257.42 , 83.55
+56.59 , 13789.60 , 94.01
+56.59 , 15321.78 , 104.50
+56.59 , 16853.96 , 115.02
+56.59 , 18386.13 , 125.57
+56.59 , 19918.31 , 136.15
+56.59 , 21450.49 , 146.76
+56.59 , 22982.67 , 157.40
+56.59 , 24514.85 , 168.06
+56.59 , 26047.02 , 178.76
+56.59 , 27579.20 , 189.48
+56.59 , 29111.38 , 200.23
+56.59 , 30643.56 , 211.02
+75.45 , -35338.92 , -243.71
+75.45 , -33571.97 , -231.81
+75.45 , -31805.03 , -219.87
+75.45 , -30038.08 , -207.89
+75.45 , -28271.13 , -195.88
+75.45 , -26504.19 , -183.83
+75.45 , -24737.24 , -171.74
+75.45 , -22970.30 , -159.61
+75.45 , -21203.35 , -147.45
+75.45 , -19436.40 , -135.25
+75.45 , -17669.46 , -123.01
+75.45 , -15902.51 , -110.74
+75.45 , -14135.57 , -98.43
+75.45 , -12368.62 , -86.08
+75.45 , -10601.68 , -73.70
+75.45 , -8834.73 , -61.27
+75.45 , -7067.78 , -48.82
+75.45 , -5300.84 , -36.32
+75.45 , -3533.89 , -23.78
+75.45 , -1766.95 , -11.19
+75.45 , -353.39 , -0.63
+75.45 , 306.44 , 3.98
+75.45 , 1532.18 , 15.01
+75.45 , 3064.36 , 28.68
+75.45 , 4596.53 , 42.37
+75.45 , 6128.71 , 56.10
+75.45 , 7660.89 , 69.87
+75.45 , 9193.07 , 83.67
+75.45 , 10725.24 , 97.52
+75.45 , 12257.42 , 111.40
+75.45 , 13789.60 , 125.31
+75.45 , 15321.78 , 139.27
+75.45 , 16853.96 , 153.26
+75.45 , 18386.13 , 167.29
+75.45 , 19918.31 , 181.36
+75.45 , 21450.49 , 195.46
+75.45 , 22982.67 , 209.61
+75.45 , 24514.85 , 223.79
+75.45 , 26047.02 , 238.01
+75.45 , 27579.20 , 252.26
+75.45 , 29111.38 , 266.56
+75.45 , 30643.56 , 280.89
+94.31 , -35338.92 , -304.37
+94.31 , -33571.97 , -289.50
+94.31 , -31805.03 , -274.59
+94.31 , -30038.08 , -259.63
+94.31 , -28271.13 , -244.61
+94.31 , -26504.19 , -229.56
+94.31 , -24737.24 , -214.45
+94.31 , -22970.30 , -199.30
+94.31 , -21203.35 , -184.10
+94.31 , -19436.40 , -168.85
+94.31 , -17669.46 , -153.55
+94.31 , -15902.51 , -138.20
+94.31 , -14135.57 , -122.81
+94.31 , -12368.62 , -107.37
+94.31 , -10601.68 , -91.88
+94.31 , -8834.73 , -76.35
+94.31 , -7067.78 , -60.76
+94.31 , -5300.84 , -45.13
+94.31 , -3533.89 , -29.44
+94.31 , -1766.95 , -13.67
+94.31 , -353.39 , 0.00
+94.31 , 306.44 , 5.21
+94.31 , 1532.18 , 19.04
+94.31 , 3064.36 , 36.13
+94.31 , 4596.53 , 53.24
+94.31 , 6128.71 , 70.39
+94.31 , 7660.89 , 87.59
+94.31 , 9193.07 , 104.83
+94.31 , 10725.24 , 122.13
+94.31 , 12257.42 , 139.47
+94.31 , 13789.60 , 156.87
+94.31 , 15321.78 , 174.31
+94.31 , 16853.96 , 191.80
+94.31 , 18386.13 , 209.33
+94.31 , 19918.31 , 226.92
+94.31 , 21450.49 , 244.56
+94.31 , 22982.67 , 262.24
+94.31 , 24514.85 , 279.97
+94.31 , 26047.02 , 297.76
+94.31 , 27579.20 , 315.58
+94.31 , 29111.38 , 333.46
+94.31 , 30643.56 , 351.39
+113.17 , -35338.92 , -364.37
+113.17 , -33571.97 , -346.59
+113.17 , -31805.03 , -328.74
+113.17 , -30038.08 , -310.84
+113.17 , -28271.13 , -292.87
+113.17 , -26504.19 , -274.84
+113.17 , -24737.24 , -256.75
+113.17 , -22970.30 , -238.60
+113.17 , -21203.35 , -220.39
+113.17 , -19436.40 , -202.12
+113.17 , -17669.46 , -183.79
+113.17 , -15902.51 , -165.40
+113.17 , -14135.57 , -146.94
+113.17 , -12368.62 , -128.43
+113.17 , -10601.68 , -109.85
+113.17 , -8834.73 , -91.21
+113.17 , -7067.78 , -72.51
+113.17 , -5300.84 , -53.75
+113.17 , -3533.89 , -34.91
+113.17 , -1766.95 , -15.95
+113.17 , -353.39 , 0.00
+113.17 , 306.44 , 6.58
+113.17 , 1532.18 , 23.25
+113.17 , 3064.36 , 43.76
+113.17 , 4596.53 , 64.29
+113.17 , 6128.71 , 84.87
+113.17 , 7660.89 , 105.52
+113.17 , 9193.07 , 126.22
+113.17 , 10725.24 , 146.98
+113.17 , 12257.42 , 167.81
+113.17 , 13789.60 , 188.70
+113.17 , 15321.78 , 209.65
+113.17 , 16853.96 , 230.66
+113.17 , 18386.13 , 251.73
+113.17 , 19918.31 , 272.87
+113.17 , 21450.49 , 294.07
+113.17 , 22982.67 , 315.33
+113.17 , 24514.85 , 336.65
+113.17 , 26047.02 , 358.03
+113.17 , 27579.20 , 379.47
+113.17 , 29111.38 , 400.98
+113.17 , 30643.56 , 422.54
+132.03 , -35338.92 , -423.69
+132.03 , -33571.97 , -403.04
+132.03 , -31805.03 , -382.31
+132.03 , -30038.08 , -361.50
+132.03 , -28271.13 , -340.62
+132.03 , -26504.19 , -319.66
+132.03 , -24737.24 , -298.62
+132.03 , -22970.30 , -277.51
+132.03 , -21203.35 , -256.31
+132.03 , -19436.40 , -235.05
+132.03 , -17669.46 , -213.70
+132.03 , -15902.51 , -192.28
+132.03 , -14135.57 , -170.79
+132.03 , -12368.62 , -149.21
+132.03 , -10601.68 , -127.57
+132.03 , -8834.73 , -105.84
+132.03 , -7067.78 , -84.03
+132.03 , -5300.84 , -62.14
+132.03 , -3533.89 , -40.16
+132.03 , -1766.95 , -18.00
+132.03 , -353.39 , 0.00
+132.03 , 306.44 , 8.09
+132.03 , 1532.18 , 27.64
+132.03 , 3064.36 , 51.59
+132.03 , 4596.53 , 75.56
+132.03 , 6128.71 , 99.58
+132.03 , 7660.89 , 123.68
+132.03 , 9193.07 , 147.86
+132.03 , 10725.24 , 172.10
+132.03 , 12257.42 , 196.43
+132.03 , 13789.60 , 220.84
+132.03 , 15321.78 , 245.32
+132.03 , 16853.96 , 269.88
+132.03 , 18386.13 , 294.51
+132.03 , 19918.31 , 319.23
+132.03 , 21450.49 , 344.02
+132.03 , 22982.67 , 368.89
+132.03 , 24514.85 , 393.83
+132.03 , 26047.02 , 418.85
+132.03 , 27579.20 , 443.95
+132.03 , 29111.38 , 469.13
+132.03 , 30643.56 , 494.38
+150.90 , -35338.92 , -482.31
+150.90 , -33571.97 , -458.83
+150.90 , -31805.03 , -435.26
+150.90 , -30038.08 , -411.59
+150.90 , -28271.13 , -387.83
+150.90 , -26504.19 , -363.97
+150.90 , -24737.24 , -340.02
+150.90 , -22970.30 , -315.97
+150.90 , -21203.35 , -291.83
+150.90 , -19436.40 , -267.59
+150.90 , -17669.46 , -243.26
+150.90 , -15902.51 , -218.84
+150.90 , -14135.57 , -194.32
+150.90 , -12368.62 , -169.71
+150.90 , -10601.68 , -145.00
+150.90 , -8834.73 , -120.19
+150.90 , -7067.78 , -95.29
+150.90 , -5300.84 , -70.28
+150.90 , -3533.89 , -45.14
+150.90 , -1766.95 , -19.76
+150.90 , -353.39 , 0.00
+150.90 , 306.44 , 9.76
+150.90 , 1532.18 , 32.25
+150.90 , 3064.36 , 59.66
+150.90 , 4596.53 , 87.07
+150.90 , 6128.71 , 114.55
+150.90 , 7660.89 , 142.11
+150.90 , 9193.07 , 169.77
+150.90 , 10725.24 , 197.52
+150.90 , 12257.42 , 225.37
+150.90 , 13789.60 , 253.31
+150.90 , 15321.78 , 281.34
+150.90 , 16853.96 , 309.47
+150.90 , 18386.13 , 337.70
+150.90 , 19918.31 , 366.02
+150.90 , 21450.49 , 394.44
+150.90 , 22982.67 , 422.95
+150.90 , 24514.85 , 451.56
+150.90 , 26047.02 , 480.26
+150.90 , 27579.20 , 509.05
+150.90 , 29111.38 , 537.94
+150.90 , 30643.56 , 566.93
+169.76 , -35338.92 , -540.17
+169.76 , -33571.97 , -513.92
+169.76 , -31805.03 , -487.55
+169.76 , -30038.08 , -461.06
+169.76 , -28271.13 , -434.46
+169.76 , -26504.19 , -407.75
+169.76 , -24737.24 , -380.92
+169.76 , -22970.30 , -353.97
+169.76 , -21203.35 , -326.91
+169.76 , -19436.40 , -299.73
+169.76 , -17669.46 , -272.44
+169.76 , -15902.51 , -245.03
+169.76 , -14135.57 , -217.51
+169.76 , -12368.62 , -189.87
+169.76 , -10601.68 , -162.12
+169.76 , -8834.73 , -134.25
+169.76 , -7067.78 , -106.26
+169.76 , -5300.84 , -78.13
+169.76 , -3533.89 , -49.84
+169.76 , -1766.95 , -21.19
+169.76 , -353.39 , 0.00
+169.76 , 306.44 , 11.59
+169.76 , 1532.18 , 37.10
+169.76 , 3064.36 , 67.98
+169.76 , 4596.53 , 98.85
+169.76 , 6128.71 , 129.79
+169.76 , 7660.89 , 160.84
+169.76 , 9193.07 , 191.99
+169.76 , 10725.24 , 223.26
+169.76 , 12257.42 , 254.64
+169.76 , 13789.60 , 286.14
+169.76 , 15321.78 , 317.75
+169.76 , 16853.96 , 349.48
+169.76 , 18386.13 , 381.32
+169.76 , 19918.31 , 413.28
+169.76 , 21450.49 , 445.36
+169.76 , 22982.67 , 477.54
+169.76 , 24514.85 , 509.85
+169.76 , 26047.02 , 542.27
+169.76 , 27579.20 , 574.80
+169.76 , 29111.38 , 607.45
+169.76 , 30643.56 , 640.21
+188.62 , -35338.92 , -597.26
+188.62 , -33571.97 , -568.28
+188.62 , -31805.03 , -539.16
+188.62 , -30038.08 , -509.90
+188.62 , -28271.13 , -480.50
+188.62 , -26504.19 , -450.96
+188.62 , -24737.24 , -421.28
+188.62 , -22970.30 , -391.47
+188.62 , -21203.35 , -361.52
+188.62 , -19436.40 , -331.43
+188.62 , -17669.46 , -301.20
+188.62 , -15902.51 , -270.83
+188.62 , -14135.57 , -240.33
+188.62 , -12368.62 , -209.68
+188.62 , -10601.68 , -178.90
+188.62 , -8834.73 , -147.97
+188.62 , -7067.78 , -116.90
+188.62 , -5300.84 , -85.66
+188.62 , -3533.89 , -54.21
+188.62 , -1766.95 , -22.23
+188.62 , -353.39 , 0.00
+188.62 , 306.44 , 13.60
+188.62 , 1532.18 , 42.20
+188.62 , 3064.36 , 76.58
+188.62 , 4596.53 , 110.92
+188.62 , 6128.71 , 145.34
+188.62 , 7660.89 , 179.88
+188.62 , 9193.07 , 214.55
+188.62 , 10725.24 , 249.35
+188.62 , 12257.42 , 284.29
+188.62 , 13789.60 , 319.36
+188.62 , 15321.78 , 354.57
+188.62 , 16853.96 , 389.92
+188.62 , 18386.13 , 425.41
+188.62 , 19918.31 , 461.03
+188.62 , 21450.49 , 496.79
+188.62 , 22982.67 , 532.69
+188.62 , 24514.85 , 568.73
+188.62 , 26047.02 , 604.90
+188.62 , 27579.20 , 641.21
+188.62 , 29111.38 , 677.66
+188.62 , 30643.56 , 714.24
+207.48 , -35338.92 , -653.54
+207.48 , -33571.97 , -621.88
+207.48 , -31805.03 , -590.05
+207.48 , -30038.08 , -558.06
+207.48 , -28271.13 , -525.90
+207.48 , -26504.19 , -493.58
+207.48 , -24737.24 , -461.09
+207.48 , -22970.30 , -428.44
+207.48 , -21203.35 , -395.63
+207.48 , -19436.40 , -362.65
+207.48 , -17669.46 , -329.51
+207.48 , -15902.51 , -296.21
+207.48 , -14135.57 , -262.74
+207.48 , -12368.62 , -229.11
+207.48 , -10601.68 , -195.31
+207.48 , -8834.73 , -161.34
+207.48 , -7067.78 , -127.18
+207.48 , -5300.84 , -92.83
+207.48 , -3533.89 , -58.20
+207.48 , -1766.95 , -22.82
+207.48 , -353.39 , 0.00
+207.48 , 306.44 , 15.79
+207.48 , 1532.18 , 47.58
+207.48 , 3064.36 , 85.48
+207.48 , 4596.53 , 123.30
+207.48 , 6128.71 , 161.22
+207.48 , 7660.89 , 199.26
+207.48 , 9193.07 , 237.46
+207.48 , 10725.24 , 275.81
+207.48 , 12257.42 , 314.32
+207.48 , 13789.60 , 352.99
+207.48 , 15321.78 , 391.83
+207.48 , 16853.96 , 430.82
+207.48 , 18386.13 , 469.98
+207.48 , 19918.31 , 509.30
+207.48 , 21450.49 , 548.78
+207.48 , 22982.67 , 588.42
+207.48 , 24514.85 , 628.23
+207.48 , 26047.02 , 668.20
+207.48 , 27579.20 , 708.32
+207.48 , 29111.38 , 748.61
+207.48 , 30643.56 , 789.06
+226.34 , -35338.92 , -708.97
+226.34 , -33571.97 , -674.68
+226.34 , -31805.03 , -640.19
+226.34 , -30038.08 , -605.51
+226.34 , -28271.13 , -570.63
+226.34 , -26504.19 , -535.56
+226.34 , -24737.24 , -500.30
+226.34 , -22970.30 , -464.85
+226.34 , -21203.35 , -429.21
+226.34 , -19436.40 , -393.37
+226.34 , -17669.46 , -357.35
+226.34 , -15902.51 , -321.13
+226.34 , -14135.57 , -284.71
+226.34 , -12368.62 , -248.11
+226.34 , -10601.68 , -211.31
+226.34 , -8834.73 , -174.30
+226.34 , -7067.78 , -137.08
+226.34 , -5300.84 , -99.61
+226.34 , -3533.89 , -61.78
+226.34 , -1766.95 , -22.86
+226.34 , -353.39 , 0.00
+226.34 , 306.44 , 18.17
+226.34 , 1532.18 , 53.24
+226.34 , 3064.36 , 94.71
+226.34 , 4596.53 , 136.03
+226.34 , 6128.71 , 177.45
+226.34 , 7660.89 , 219.01
+226.34 , 9193.07 , 260.75
+226.34 , 10725.24 , 302.67
+226.34 , 12257.42 , 344.78
+226.34 , 13789.60 , 387.07
+226.34 , 15321.78 , 429.54
+226.34 , 16853.96 , 472.21
+226.34 , 18386.13 , 515.06
+226.34 , 19918.31 , 558.11
+226.34 , 21450.49 , 601.34
+226.34 , 22982.67 , 644.76
+226.34 , 24514.85 , 688.37
+226.34 , 26047.02 , 732.17
+226.34 , 27579.20 , 776.15
+226.34 , 29111.38 , 820.33
+226.34 , 30643.56 , 864.69
+245.21 , -35338.92 , -763.53
+245.21 , -33571.97 , -726.65
+245.21 , -31805.03 , -689.55
+245.21 , -30038.08 , -652.22
+245.21 , -28271.13 , -614.67
+245.21 , -26504.19 , -576.89
+245.21 , -24737.24 , -538.89
+245.21 , -22970.30 , -500.67
+245.21 , -21203.35 , -462.22
+245.21 , -19436.40 , -423.56
+245.21 , -17669.46 , -384.67
+245.21 , -15902.51 , -345.56
+245.21 , -14135.57 , -306.22
+245.21 , -12368.62 , -266.66
+245.21 , -10601.68 , -226.86
+245.21 , -8834.73 , -186.83
+245.21 , -7067.78 , -146.54
+245.21 , -5300.84 , -105.95
+245.21 , -3533.89 , -64.90
+245.21 , -1766.95 , -22.24
+245.21 , -353.39 , 0.00
+245.21 , 306.44 , 20.74
+245.21 , 1532.18 , 59.20
+245.21 , 3064.36 , 104.27
+245.21 , 4596.53 , 149.12
+245.21 , 6128.71 , 194.05
+245.21 , 7660.89 , 239.16
+245.21 , 9193.07 , 284.45
+245.21 , 10725.24 , 329.96
+245.21 , 12257.42 , 375.67
+245.21 , 13789.60 , 421.60
+245.21 , 15321.78 , 467.75
+245.21 , 16853.96 , 514.11
+245.21 , 18386.13 , 560.69
+245.21 , 19918.31 , 607.48
+245.21 , 21450.49 , 654.50
+245.21 , 22982.67 , 701.73
+245.21 , 24514.85 , 749.18
+245.21 , 26047.02 , 796.84
+245.21 , 27579.20 , 844.73
+245.21 , 29111.38 , 892.83
+245.21 , 30643.56 , 941.14
+264.07 , -35338.92 , -817.17
+264.07 , -33571.97 , -777.76
+264.07 , -31805.03 , -738.08
+264.07 , -30038.08 , -698.15
+264.07 , -28271.13 , -657.96
+264.07 , -26504.19 , -617.52
+264.07 , -24737.24 , -576.82
+264.07 , -22970.30 , -535.86
+264.07 , -21203.35 , -494.65
+264.07 , -19436.40 , -453.18
+264.07 , -17669.46 , -411.45
+264.07 , -15902.51 , -369.47
+264.07 , -14135.57 , -327.22
+264.07 , -12368.62 , -284.72
+264.07 , -10601.68 , -241.95
+264.07 , -8834.73 , -198.90
+264.07 , -7067.78 , -155.54
+264.07 , -5300.84 , -111.82
+264.07 , -3533.89 , -67.51
+264.07 , -1766.95 , -20.80
+264.07 , -353.39 , 0.00
+264.07 , 306.44 , 23.52
+264.07 , 1532.18 , 65.48
+264.07 , 3064.36 , 114.20
+264.07 , 4596.53 , 162.59
+264.07 , 6128.71 , 211.06
+264.07 , 7660.89 , 259.72
+264.07 , 9193.07 , 308.59
+264.07 , 10725.24 , 357.69
+264.07 , 12257.42 , 407.04
+264.07 , 13789.60 , 456.62
+264.07 , 15321.78 , 506.46
+264.07 , 16853.96 , 556.54
+264.07 , 18386.13 , 606.87
+264.07 , 19918.31 , 657.45
+264.07 , 21450.49 , 708.28
+264.07 , 22982.67 , 759.35
+264.07 , 24514.85 , 810.68
+264.07 , 26047.02 , 862.25
+264.07 , 27579.20 , 914.07
+264.07 , 29111.38 , 966.13
+264.07 , 30643.56 , 1018.44
+282.93 , -35338.92 , -869.86
+282.93 , -33571.97 , -827.96
+282.93 , -31805.03 , -785.77
+282.93 , -30038.08 , -743.28
+282.93 , -28271.13 , -700.50
+282.93 , -26504.19 , -657.42
+282.93 , -24737.24 , -614.05
+282.93 , -22970.30 , -570.39
+282.93 , -21203.35 , -526.44
+282.93 , -19436.40 , -482.19
+282.93 , -17669.46 , -437.65
+282.93 , -15902.51 , -392.82
+282.93 , -14135.57 , -347.69
+282.93 , -12368.62 , -302.26
+282.93 , -10601.68 , -256.52
+282.93 , -8834.73 , -210.46
+282.93 , -7067.78 , -164.04
+282.93 , -5300.84 , -117.17
+282.93 , -3533.89 , -69.54
+282.93 , -1766.95 , -18.27
+282.93 , -353.39 , 0.00
+282.93 , 306.44 , 26.49
+282.93 , 1532.18 , 72.10
+282.93 , 3064.36 , 124.50
+282.93 , 4596.53 , 176.46
+282.93 , 6128.71 , 228.49
+282.93 , 7660.89 , 280.71
+282.93 , 9193.07 , 333.18
+282.93 , 10725.24 , 385.90
+282.93 , 12257.42 , 438.89
+282.93 , 13789.60 , 492.16
+282.93 , 15321.78 , 545.71
+282.93 , 16853.96 , 599.54
+282.93 , 18386.13 , 653.64
+282.93 , 19918.31 , 708.03
+282.93 , 21450.49 , 762.71
+282.93 , 22982.67 , 817.66
+282.93 , 24514.85 , 872.89
+282.93 , 26047.02 , 928.41
+282.93 , 27579.20 , 984.20
+282.93 , 29111.38 , 1040.27
+282.93 , 30643.56 , 1096.63
+301.79 , -35338.92 , -921.56
+301.79 , -33571.97 , -877.23
+301.79 , -31805.03 , -832.56
+301.79 , -30038.08 , -787.56
+301.79 , -28271.13 , -742.22
+301.79 , -26504.19 , -696.56
+301.79 , -24737.24 , -650.56
+301.79 , -22970.30 , -604.23
+301.79 , -21203.35 , -557.56
+301.79 , -19436.40 , -510.57
+301.79 , -17669.46 , -463.24
+301.79 , -15902.51 , -415.58
+301.79 , -14135.57 , -367.58
+301.79 , -12368.62 , -319.24
+301.79 , -10601.68 , -270.55
+301.79 , -8834.73 , -221.48
+301.79 , -7067.78 , -171.99
+301.79 , -5300.84 , -121.95
+301.79 , -3533.89 , -70.93
+301.79 , -1766.95 , -14.10
+301.79 , -353.39 , 0.00
+301.79 , 306.44 , 29.68
+301.79 , 1532.18 , 79.05
+301.79 , 3064.36 , 135.20
+301.79 , 4596.53 , 190.76
+301.79 , 6128.71 , 246.36
+301.79 , 7660.89 , 302.17
+301.79 , 9193.07 , 358.24
+301.79 , 10725.24 , 414.60
+301.79 , 12257.42 , 471.27
+301.79 , 13789.60 , 528.24
+301.79 , 15321.78 , 585.52
+301.79 , 16853.96 , 643.12
+301.79 , 18386.13 , 701.03
+301.79 , 19918.31 , 759.26
+301.79 , 21450.49 , 817.80
+301.79 , 22982.67 , 876.66
+301.79 , 24514.85 , 935.84
+301.79 , 26047.02 , 995.34
+301.79 , 27579.20 , 1055.15
+301.79 , 29111.38 , 1115.27
+301.79 , 30643.56 , 1175.71
+320.65 , -35338.92 , -972.24
+320.65 , -33571.97 , -925.52
+320.65 , -31805.03 , -878.43
+320.65 , -30038.08 , -830.96
+320.65 , -28271.13 , -783.11
+320.65 , -26504.19 , -734.89
+320.65 , -24737.24 , -686.30
+320.65 , -22970.30 , -637.33
+320.65 , -21203.35 , -587.99
+320.65 , -19436.40 , -538.28
+320.65 , -17669.46 , -488.19
+320.65 , -15902.51 , -437.72
+320.65 , -14135.57 , -386.87
+320.65 , -12368.62 , -335.63
+320.65 , -10601.68 , -283.99
+320.65 , -8834.73 , -231.92
+320.65 , -7067.78 , -179.35
+320.65 , -5300.84 , -126.12
+320.65 , -3533.89 , -71.60
+320.65 , -1766.95 , -6.45
+320.65 , -353.39 , 0.00
+320.65 , 306.44 , 33.08
+320.65 , 1532.18 , 86.37
+320.65 , 3064.36 , 146.31
+320.65 , 4596.53 , 205.50
+320.65 , 6128.71 , 264.70
+320.65 , 7660.89 , 324.11
+320.65 , 9193.07 , 383.81
+320.65 , 10725.24 , 443.83
+320.65 , 12257.42 , 504.18
+320.65 , 13789.60 , 564.87
+320.65 , 15321.78 , 625.91
+320.65 , 16853.96 , 687.30
+320.65 , 18386.13 , 749.05
+320.65 , 19918.31 , 811.14
+320.65 , 21450.49 , 873.59
+320.65 , 22982.67 , 936.40
+320.65 , 24514.85 , 999.56
+320.65 , 26047.02 , 1063.07
+320.65 , 27579.20 , 1126.93
+320.65 , 29111.38 , 1191.14
+320.65 , 30643.56 , 1255.71
+339.52 , -35338.92 , -1021.86
+339.52 , -33571.97 , -972.81
+339.52 , -31805.03 , -923.33
+339.52 , -30038.08 , -873.44
+339.52 , -28271.13 , -823.13
+339.52 , -26504.19 , -772.39
+339.52 , -24737.24 , -721.24
+339.52 , -22970.30 , -669.67
+339.52 , -21203.35 , -617.68
+339.52 , -19436.40 , -565.27
+339.52 , -17669.46 , -512.45
+339.52 , -15902.51 , -459.19
+339.52 , -14135.57 , -405.51
+339.52 , -12368.62 , -351.39
+339.52 , -10601.68 , -296.81
+339.52 , -8834.73 , -241.73
+339.52 , -7067.78 , -186.07
+339.52 , -5300.84 , -129.61
+339.52 , -3533.89 , -71.46
+339.52 , -1766.95 , 0.00
+339.52 , -353.39 , 0.00
+339.52 , 306.44 , 36.70
+339.52 , 1532.18 , 94.04
+339.52 , 3064.36 , 157.85
+339.52 , 4596.53 , 220.70
+339.52 , 6128.71 , 283.52
+339.52 , 7660.89 , 346.56
+339.52 , 9193.07 , 409.90
+339.52 , 10725.24 , 473.59
+339.52 , 12257.42 , 537.65
+339.52 , 13789.60 , 602.09
+339.52 , 15321.78 , 666.91
+339.52 , 16853.96 , 732.12
+339.52 , 18386.13 , 797.72
+339.52 , 19918.31 , 863.72
+339.52 , 21450.49 , 930.10
+339.52 , 22982.67 , 996.88
+339.52 , 24514.85 , 1064.05
+339.52 , 26047.02 , 1131.62
+339.52 , 27579.20 , 1199.57
+339.52 , 29111.38 , 1267.92
+339.52 , 30643.56 , 1336.65
+358.38 , -35338.92 , -1070.37
+358.38 , -33571.97 , -1019.04
+358.38 , -31805.03 , -967.24
+358.38 , -30038.08 , -914.96
+358.38 , -28271.13 , -862.23
+358.38 , -26504.19 , -809.02
+358.38 , -24737.24 , -755.35
+358.38 , -22970.30 , -701.21
+358.38 , -21203.35 , -646.60
+358.38 , -19436.40 , -591.53
+358.38 , -17669.46 , -535.99
+358.38 , -15902.51 , -479.97
+358.38 , -14135.57 , -423.47
+358.38 , -12368.62 , -366.48
+358.38 , -10601.68 , -308.96
+358.38 , -8834.73 , -250.88
+358.38 , -7067.78 , -192.11
+358.38 , -5300.84 , -132.36
+358.38 , -3533.89 , -70.38
+358.38 , -1766.95 , 0.00
+358.38 , -353.39 , 0.00
+358.38 , 306.44 , 40.53
+358.38 , 1532.18 , 102.10
+358.38 , 3064.36 , 169.83
+358.38 , 4596.53 , 236.37
+358.38 , 6128.71 , 302.84
+358.38 , 7660.89 , 369.53
+358.38 , 9193.07 , 436.54
+358.38 , 10725.24 , 503.92
+358.38 , 12257.42 , 571.71
+358.38 , 13789.60 , 639.91
+358.38 , 15321.78 , 708.54
+358.38 , 16853.96 , 777.59
+358.38 , 18386.13 , 847.08
+358.38 , 19918.31 , 917.00
+358.38 , 21450.49 , 987.35
+358.38 , 22982.67 , 1058.14
+358.38 , 24514.85 , 1129.36
+358.38 , 26047.02 , 1201.01
+358.38 , 27579.20 , 1273.09
+358.38 , 29111.38 , 1345.61
+358.38 , 30643.56 , 1418.56
+377.24 , -35338.92 , -1117.74
+377.24 , -33571.97 , -1064.18
+377.24 , -31805.03 , -1010.10
+377.24 , -30038.08 , -955.49
+377.24 , -28271.13 , -900.37
+377.24 , -26504.19 , -844.73
+377.24 , -24737.24 , -788.58
+377.24 , -22970.30 , -731.90
+377.24 , -21203.35 , -674.71
+377.24 , -19436.40 , -617.00
+377.24 , -17669.46 , -558.77
+377.24 , -15902.51 , -500.01
+377.24 , -14135.57 , -440.71
+377.24 , -12368.62 , -380.85
+377.24 , -10601.68 , -320.40
+377.24 , -8834.73 , -259.31
+377.24 , -7067.78 , -197.41
+377.24 , -5300.84 , -134.30
+377.24 , -3533.89 , -68.24
+377.24 , -1766.95 , 0.00
+377.24 , -353.39 , 0.00
+377.24 , 306.44 , 44.59
+377.24 , 1532.18 , 110.53
+377.24 , 3064.36 , 182.27
+377.24 , 4596.53 , 252.55
+377.24 , 6128.71 , 322.69
+377.24 , 7660.89 , 393.04
+377.24 , 9193.07 , 463.74
+377.24 , 10725.24 , 534.84
+377.24 , 12257.42 , 606.37
+377.24 , 13789.60 , 678.37
+377.24 , 15321.78 , 750.82
+377.24 , 16853.96 , 823.74
+377.24 , 18386.13 , 897.14
+377.24 , 19918.31 , 971.01
+377.24 , 21450.49 , 1045.36
+377.24 , 22982.67 , 1120.19
+377.24 , 24514.85 , 1195.49
+377.24 , 26047.02 , 1271.27
+377.24 , 27579.20 , 1347.52
+377.24 , 29111.38 , 1424.25
+377.24 , 30643.56 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_2.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_3.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..07feb55aeb84a3946955f362d5131493fe83d565
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -11414.26 , 0.00
+0.00 , -10843.55 , 0.00
+0.00 , -10272.84 , 0.00
+0.00 , -9702.12 , 0.00
+0.00 , -9131.41 , 0.00
+0.00 , -8560.70 , 0.00
+0.00 , -7989.99 , -0.13
+0.00 , -7419.27 , -0.66
+0.00 , -6848.56 , -0.98
+0.00 , -6277.85 , -1.19
+0.00 , -5707.13 , -1.32
+0.00 , -5136.42 , -1.38
+0.00 , -4565.71 , -1.39
+0.00 , -3994.99 , -1.35
+0.00 , -3424.28 , -1.26
+0.00 , -2853.57 , -1.13
+0.00 , -2282.85 , -0.97
+0.00 , -1712.14 , -0.77
+0.00 , -1141.43 , -0.53
+0.00 , -570.71 , -0.27
+0.00 , -114.14 , -0.02
+0.00 , 103.14 , 0.13
+0.00 , 515.72 , 0.56
+0.00 , 1031.44 , 1.12
+0.00 , 1547.16 , 1.70
+0.00 , 2062.88 , 2.31
+0.00 , 2578.60 , 2.93
+0.00 , 3094.32 , 3.58
+0.00 , 3610.04 , 4.25
+0.00 , 4125.76 , 4.93
+0.00 , 4641.48 , 5.64
+0.00 , 5157.20 , 6.37
+0.00 , 5672.91 , 7.12
+0.00 , 6188.63 , 7.88
+0.00 , 6704.35 , 8.67
+0.00 , 7220.07 , 9.47
+0.00 , 7735.79 , 10.29
+0.00 , 8251.51 , 11.13
+0.00 , 8767.23 , 11.99
+0.00 , 9282.95 , 12.87
+0.00 , 9798.67 , 13.76
+0.00 , 10314.39 , 14.67
+5.72 , -11414.26 , 0.00
+5.72 , -10843.55 , 0.00
+5.72 , -10272.84 , 0.00
+5.72 , -9702.12 , 0.00
+5.72 , -9131.41 , 0.00
+5.72 , -8560.70 , 0.00
+5.72 , -7989.99 , -0.50
+5.72 , -7419.27 , -0.84
+5.72 , -6848.56 , -1.04
+5.72 , -6277.85 , -1.16
+5.72 , -5707.13 , -1.22
+5.72 , -5136.42 , -1.24
+5.72 , -4565.71 , -1.21
+5.72 , -3994.99 , -1.15
+5.72 , -3424.28 , -1.06
+5.72 , -2853.57 , -0.94
+5.72 , -2282.85 , -0.80
+5.72 , -1712.14 , -0.62
+5.72 , -1141.43 , -0.43
+5.72 , -570.71 , -0.21
+5.72 , -114.14 , -0.02
+5.72 , 103.14 , 0.10
+5.72 , 515.72 , 0.43
+5.72 , 1031.44 , 0.85
+5.72 , 1547.16 , 1.30
+5.72 , 2062.88 , 1.75
+5.72 , 2578.60 , 2.23
+5.72 , 3094.32 , 2.71
+5.72 , 3610.04 , 3.21
+5.72 , 4125.76 , 3.73
+5.72 , 4641.48 , 4.26
+5.72 , 5157.20 , 4.80
+5.72 , 5672.91 , 5.36
+5.72 , 6188.63 , 5.93
+5.72 , 6704.35 , 6.52
+5.72 , 7220.07 , 7.12
+5.72 , 7735.79 , 7.73
+5.72 , 8251.51 , 8.35
+5.72 , 8767.23 , 8.99
+5.72 , 9282.95 , 9.64
+5.72 , 9798.67 , 10.30
+5.72 , 10314.39 , 10.98
+57.21 , -11414.26 , -58.10
+57.21 , -10843.55 , -55.37
+57.21 , -10272.84 , -52.62
+57.21 , -9702.12 , -49.85
+57.21 , -9131.41 , -47.06
+57.21 , -8560.70 , -44.25
+57.21 , -7989.99 , -41.42
+57.21 , -7419.27 , -38.57
+57.21 , -6848.56 , -35.70
+57.21 , -6277.85 , -32.81
+57.21 , -5707.13 , -29.90
+57.21 , -5136.42 , -26.98
+57.21 , -4565.71 , -24.03
+57.21 , -3994.99 , -21.07
+57.21 , -3424.28 , -18.08
+57.21 , -2853.57 , -15.08
+57.21 , -2282.85 , -12.06
+57.21 , -1712.14 , -9.02
+57.21 , -1141.43 , -5.96
+57.21 , -570.71 , -2.88
+57.21 , -114.14 , -0.37
+57.21 , 103.14 , 0.90
+57.21 , 515.72 , 3.68
+57.21 , 1031.44 , 7.16
+57.21 , 1547.16 , 10.66
+57.21 , 2062.88 , 14.17
+57.21 , 2578.60 , 17.71
+57.21 , 3094.32 , 21.26
+57.21 , 3610.04 , 24.84
+57.21 , 4125.76 , 28.43
+57.21 , 4641.48 , 32.04
+57.21 , 5157.20 , 35.67
+57.21 , 5672.91 , 39.32
+57.21 , 6188.63 , 42.99
+57.21 , 6704.35 , 46.68
+57.21 , 7220.07 , 50.38
+57.21 , 7735.79 , 54.11
+57.21 , 8251.51 , 57.85
+57.21 , 8767.23 , 61.61
+57.21 , 9282.95 , 65.39
+57.21 , 9798.67 , 69.19
+57.21 , 10314.39 , 73.01
+114.41 , -11414.26 , -120.57
+114.41 , -10843.55 , -114.73
+114.41 , -10272.84 , -108.87
+114.41 , -9702.12 , -102.99
+114.41 , -9131.41 , -97.08
+114.41 , -8560.70 , -91.15
+114.41 , -7989.99 , -85.20
+114.41 , -7419.27 , -79.23
+114.41 , -6848.56 , -73.23
+114.41 , -6277.85 , -67.21
+114.41 , -5707.13 , -61.17
+114.41 , -5136.42 , -55.10
+114.41 , -4565.71 , -49.01
+114.41 , -3994.99 , -42.90
+114.41 , -3424.28 , -36.77
+114.41 , -2853.57 , -30.61
+114.41 , -2282.85 , -24.43
+114.41 , -1712.14 , -18.23
+114.41 , -1141.43 , -12.01
+114.41 , -570.71 , -5.76
+114.41 , -114.14 , -0.66
+114.41 , 103.14 , 1.84
+114.41 , 515.72 , 7.35
+114.41 , 1031.44 , 14.22
+114.41 , 1547.16 , 21.11
+114.41 , 2062.88 , 28.02
+114.41 , 2578.60 , 34.96
+114.41 , 3094.32 , 41.92
+114.41 , 3610.04 , 48.90
+114.41 , 4125.76 , 55.90
+114.41 , 4641.48 , 62.93
+114.41 , 5157.20 , 69.98
+114.41 , 5672.91 , 77.05
+114.41 , 6188.63 , 84.15
+114.41 , 6704.35 , 91.27
+114.41 , 7220.07 , 98.41
+114.41 , 7735.79 , 105.58
+114.41 , 8251.51 , 112.76
+114.41 , 8767.23 , 119.97
+114.41 , 9282.95 , 127.21
+114.41 , 9798.67 , 134.46
+114.41 , 10314.39 , 141.74
+171.62 , -11414.26 , -182.44
+171.62 , -10843.55 , -173.55
+171.62 , -10272.84 , -164.62
+171.62 , -9702.12 , -155.67
+171.62 , -9131.41 , -146.69
+171.62 , -8560.70 , -137.68
+171.62 , -7989.99 , -128.65
+171.62 , -7419.27 , -119.58
+171.62 , -6848.56 , -110.49
+171.62 , -6277.85 , -101.36
+171.62 , -5707.13 , -92.21
+171.62 , -5136.42 , -83.03
+171.62 , -4565.71 , -73.82
+171.62 , -3994.99 , -64.58
+171.62 , -3424.28 , -55.31
+171.62 , -2853.57 , -46.02
+171.62 , -2282.85 , -36.70
+171.62 , -1712.14 , -27.34
+171.62 , -1141.43 , -17.96
+171.62 , -570.71 , -8.54
+171.62 , -114.14 , -0.79
+171.62 , 103.14 , 2.86
+171.62 , 515.72 , 11.12
+171.62 , 1031.44 , 21.39
+171.62 , 1547.16 , 31.68
+171.62 , 2062.88 , 41.99
+171.62 , 2578.60 , 52.34
+171.62 , 3094.32 , 62.71
+171.62 , 3610.04 , 73.12
+171.62 , 4125.76 , 83.55
+171.62 , 4641.48 , 94.01
+171.62 , 5157.20 , 104.50
+171.62 , 5672.91 , 115.02
+171.62 , 6188.63 , 125.57
+171.62 , 6704.35 , 136.15
+171.62 , 7220.07 , 146.76
+171.62 , 7735.79 , 157.40
+171.62 , 8251.51 , 168.06
+171.62 , 8767.23 , 178.76
+171.62 , 9282.95 , 189.48
+171.62 , 9798.67 , 200.23
+171.62 , 10314.39 , 211.02
+228.82 , -11414.26 , -243.71
+228.82 , -10843.55 , -231.81
+228.82 , -10272.84 , -219.87
+228.82 , -9702.12 , -207.89
+228.82 , -9131.41 , -195.88
+228.82 , -8560.70 , -183.83
+228.82 , -7989.99 , -171.74
+228.82 , -7419.27 , -159.61
+228.82 , -6848.56 , -147.45
+228.82 , -6277.85 , -135.25
+228.82 , -5707.13 , -123.01
+228.82 , -5136.42 , -110.74
+228.82 , -4565.71 , -98.43
+228.82 , -3994.99 , -86.08
+228.82 , -3424.28 , -73.70
+228.82 , -2853.57 , -61.27
+228.82 , -2282.85 , -48.82
+228.82 , -1712.14 , -36.32
+228.82 , -1141.43 , -23.78
+228.82 , -570.71 , -11.19
+228.82 , -114.14 , -0.63
+228.82 , 103.14 , 3.98
+228.82 , 515.72 , 15.01
+228.82 , 1031.44 , 28.68
+228.82 , 1547.16 , 42.37
+228.82 , 2062.88 , 56.10
+228.82 , 2578.60 , 69.87
+228.82 , 3094.32 , 83.67
+228.82 , 3610.04 , 97.52
+228.82 , 4125.76 , 111.40
+228.82 , 4641.48 , 125.31
+228.82 , 5157.20 , 139.27
+228.82 , 5672.91 , 153.26
+228.82 , 6188.63 , 167.29
+228.82 , 6704.35 , 181.36
+228.82 , 7220.07 , 195.46
+228.82 , 7735.79 , 209.61
+228.82 , 8251.51 , 223.79
+228.82 , 8767.23 , 238.01
+228.82 , 9282.95 , 252.26
+228.82 , 9798.67 , 266.56
+228.82 , 10314.39 , 280.89
+286.03 , -11414.26 , -304.37
+286.03 , -10843.55 , -289.50
+286.03 , -10272.84 , -274.59
+286.03 , -9702.12 , -259.63
+286.03 , -9131.41 , -244.61
+286.03 , -8560.70 , -229.56
+286.03 , -7989.99 , -214.45
+286.03 , -7419.27 , -199.30
+286.03 , -6848.56 , -184.10
+286.03 , -6277.85 , -168.85
+286.03 , -5707.13 , -153.55
+286.03 , -5136.42 , -138.20
+286.03 , -4565.71 , -122.81
+286.03 , -3994.99 , -107.37
+286.03 , -3424.28 , -91.88
+286.03 , -2853.57 , -76.35
+286.03 , -2282.85 , -60.76
+286.03 , -1712.14 , -45.13
+286.03 , -1141.43 , -29.44
+286.03 , -570.71 , -13.67
+286.03 , -114.14 , 0.00
+286.03 , 103.14 , 5.21
+286.03 , 515.72 , 19.04
+286.03 , 1031.44 , 36.13
+286.03 , 1547.16 , 53.24
+286.03 , 2062.88 , 70.39
+286.03 , 2578.60 , 87.59
+286.03 , 3094.32 , 104.83
+286.03 , 3610.04 , 122.13
+286.03 , 4125.76 , 139.47
+286.03 , 4641.48 , 156.87
+286.03 , 5157.20 , 174.31
+286.03 , 5672.91 , 191.80
+286.03 , 6188.63 , 209.33
+286.03 , 6704.35 , 226.92
+286.03 , 7220.07 , 244.56
+286.03 , 7735.79 , 262.24
+286.03 , 8251.51 , 279.97
+286.03 , 8767.23 , 297.76
+286.03 , 9282.95 , 315.58
+286.03 , 9798.67 , 333.46
+286.03 , 10314.39 , 351.39
+343.23 , -11414.26 , -364.37
+343.23 , -10843.55 , -346.59
+343.23 , -10272.84 , -328.74
+343.23 , -9702.12 , -310.84
+343.23 , -9131.41 , -292.87
+343.23 , -8560.70 , -274.84
+343.23 , -7989.99 , -256.75
+343.23 , -7419.27 , -238.60
+343.23 , -6848.56 , -220.39
+343.23 , -6277.85 , -202.12
+343.23 , -5707.13 , -183.79
+343.23 , -5136.42 , -165.40
+343.23 , -4565.71 , -146.94
+343.23 , -3994.99 , -128.43
+343.23 , -3424.28 , -109.85
+343.23 , -2853.57 , -91.21
+343.23 , -2282.85 , -72.51
+343.23 , -1712.14 , -53.75
+343.23 , -1141.43 , -34.91
+343.23 , -570.71 , -15.95
+343.23 , -114.14 , 0.00
+343.23 , 103.14 , 6.58
+343.23 , 515.72 , 23.25
+343.23 , 1031.44 , 43.76
+343.23 , 1547.16 , 64.29
+343.23 , 2062.88 , 84.87
+343.23 , 2578.60 , 105.52
+343.23 , 3094.32 , 126.22
+343.23 , 3610.04 , 146.98
+343.23 , 4125.76 , 167.81
+343.23 , 4641.48 , 188.70
+343.23 , 5157.20 , 209.65
+343.23 , 5672.91 , 230.66
+343.23 , 6188.63 , 251.73
+343.23 , 6704.35 , 272.87
+343.23 , 7220.07 , 294.07
+343.23 , 7735.79 , 315.33
+343.23 , 8251.51 , 336.65
+343.23 , 8767.23 , 358.03
+343.23 , 9282.95 , 379.47
+343.23 , 9798.67 , 400.98
+343.23 , 10314.39 , 422.54
+400.44 , -11414.26 , -423.69
+400.44 , -10843.55 , -403.04
+400.44 , -10272.84 , -382.31
+400.44 , -9702.12 , -361.50
+400.44 , -9131.41 , -340.62
+400.44 , -8560.70 , -319.66
+400.44 , -7989.99 , -298.62
+400.44 , -7419.27 , -277.51
+400.44 , -6848.56 , -256.31
+400.44 , -6277.85 , -235.05
+400.44 , -5707.13 , -213.70
+400.44 , -5136.42 , -192.28
+400.44 , -4565.71 , -170.79
+400.44 , -3994.99 , -149.21
+400.44 , -3424.28 , -127.57
+400.44 , -2853.57 , -105.84
+400.44 , -2282.85 , -84.03
+400.44 , -1712.14 , -62.14
+400.44 , -1141.43 , -40.16
+400.44 , -570.71 , -18.00
+400.44 , -114.14 , 0.00
+400.44 , 103.14 , 8.09
+400.44 , 515.72 , 27.64
+400.44 , 1031.44 , 51.59
+400.44 , 1547.16 , 75.56
+400.44 , 2062.88 , 99.58
+400.44 , 2578.60 , 123.68
+400.44 , 3094.32 , 147.86
+400.44 , 3610.04 , 172.10
+400.44 , 4125.76 , 196.43
+400.44 , 4641.48 , 220.84
+400.44 , 5157.20 , 245.32
+400.44 , 5672.91 , 269.88
+400.44 , 6188.63 , 294.51
+400.44 , 6704.35 , 319.23
+400.44 , 7220.07 , 344.02
+400.44 , 7735.79 , 368.89
+400.44 , 8251.51 , 393.83
+400.44 , 8767.23 , 418.85
+400.44 , 9282.95 , 443.95
+400.44 , 9798.67 , 469.13
+400.44 , 10314.39 , 494.38
+457.64 , -11414.26 , -482.31
+457.64 , -10843.55 , -458.83
+457.64 , -10272.84 , -435.26
+457.64 , -9702.12 , -411.59
+457.64 , -9131.41 , -387.83
+457.64 , -8560.70 , -363.97
+457.64 , -7989.99 , -340.02
+457.64 , -7419.27 , -315.97
+457.64 , -6848.56 , -291.83
+457.64 , -6277.85 , -267.59
+457.64 , -5707.13 , -243.26
+457.64 , -5136.42 , -218.84
+457.64 , -4565.71 , -194.32
+457.64 , -3994.99 , -169.71
+457.64 , -3424.28 , -145.00
+457.64 , -2853.57 , -120.19
+457.64 , -2282.85 , -95.29
+457.64 , -1712.14 , -70.28
+457.64 , -1141.43 , -45.14
+457.64 , -570.71 , -19.76
+457.64 , -114.14 , 0.00
+457.64 , 103.14 , 9.76
+457.64 , 515.72 , 32.25
+457.64 , 1031.44 , 59.66
+457.64 , 1547.16 , 87.07
+457.64 , 2062.88 , 114.55
+457.64 , 2578.60 , 142.11
+457.64 , 3094.32 , 169.77
+457.64 , 3610.04 , 197.52
+457.64 , 4125.76 , 225.37
+457.64 , 4641.48 , 253.31
+457.64 , 5157.20 , 281.34
+457.64 , 5672.91 , 309.47
+457.64 , 6188.63 , 337.70
+457.64 , 6704.35 , 366.02
+457.64 , 7220.07 , 394.44
+457.64 , 7735.79 , 422.95
+457.64 , 8251.51 , 451.56
+457.64 , 8767.23 , 480.26
+457.64 , 9282.95 , 509.05
+457.64 , 9798.67 , 537.94
+457.64 , 10314.39 , 566.93
+514.85 , -11414.26 , -540.17
+514.85 , -10843.55 , -513.92
+514.85 , -10272.84 , -487.55
+514.85 , -9702.12 , -461.06
+514.85 , -9131.41 , -434.46
+514.85 , -8560.70 , -407.75
+514.85 , -7989.99 , -380.92
+514.85 , -7419.27 , -353.97
+514.85 , -6848.56 , -326.91
+514.85 , -6277.85 , -299.73
+514.85 , -5707.13 , -272.44
+514.85 , -5136.42 , -245.03
+514.85 , -4565.71 , -217.51
+514.85 , -3994.99 , -189.87
+514.85 , -3424.28 , -162.12
+514.85 , -2853.57 , -134.25
+514.85 , -2282.85 , -106.26
+514.85 , -1712.14 , -78.13
+514.85 , -1141.43 , -49.84
+514.85 , -570.71 , -21.19
+514.85 , -114.14 , 0.00
+514.85 , 103.14 , 11.59
+514.85 , 515.72 , 37.10
+514.85 , 1031.44 , 67.98
+514.85 , 1547.16 , 98.85
+514.85 , 2062.88 , 129.79
+514.85 , 2578.60 , 160.84
+514.85 , 3094.32 , 191.99
+514.85 , 3610.04 , 223.26
+514.85 , 4125.76 , 254.64
+514.85 , 4641.48 , 286.14
+514.85 , 5157.20 , 317.75
+514.85 , 5672.91 , 349.48
+514.85 , 6188.63 , 381.32
+514.85 , 6704.35 , 413.28
+514.85 , 7220.07 , 445.36
+514.85 , 7735.79 , 477.54
+514.85 , 8251.51 , 509.85
+514.85 , 8767.23 , 542.27
+514.85 , 9282.95 , 574.80
+514.85 , 9798.67 , 607.45
+514.85 , 10314.39 , 640.21
+572.06 , -11414.26 , -597.26
+572.06 , -10843.55 , -568.28
+572.06 , -10272.84 , -539.16
+572.06 , -9702.12 , -509.90
+572.06 , -9131.41 , -480.50
+572.06 , -8560.70 , -450.96
+572.06 , -7989.99 , -421.28
+572.06 , -7419.27 , -391.47
+572.06 , -6848.56 , -361.52
+572.06 , -6277.85 , -331.43
+572.06 , -5707.13 , -301.20
+572.06 , -5136.42 , -270.83
+572.06 , -4565.71 , -240.33
+572.06 , -3994.99 , -209.68
+572.06 , -3424.28 , -178.90
+572.06 , -2853.57 , -147.97
+572.06 , -2282.85 , -116.90
+572.06 , -1712.14 , -85.66
+572.06 , -1141.43 , -54.21
+572.06 , -570.71 , -22.23
+572.06 , -114.14 , 0.00
+572.06 , 103.14 , 13.60
+572.06 , 515.72 , 42.20
+572.06 , 1031.44 , 76.58
+572.06 , 1547.16 , 110.92
+572.06 , 2062.88 , 145.34
+572.06 , 2578.60 , 179.88
+572.06 , 3094.32 , 214.55
+572.06 , 3610.04 , 249.35
+572.06 , 4125.76 , 284.29
+572.06 , 4641.48 , 319.36
+572.06 , 5157.20 , 354.57
+572.06 , 5672.91 , 389.92
+572.06 , 6188.63 , 425.41
+572.06 , 6704.35 , 461.03
+572.06 , 7220.07 , 496.79
+572.06 , 7735.79 , 532.69
+572.06 , 8251.51 , 568.73
+572.06 , 8767.23 , 604.90
+572.06 , 9282.95 , 641.21
+572.06 , 9798.67 , 677.66
+572.06 , 10314.39 , 714.24
+629.26 , -11414.26 , -653.54
+629.26 , -10843.55 , -621.88
+629.26 , -10272.84 , -590.05
+629.26 , -9702.12 , -558.06
+629.26 , -9131.41 , -525.90
+629.26 , -8560.70 , -493.58
+629.26 , -7989.99 , -461.09
+629.26 , -7419.27 , -428.44
+629.26 , -6848.56 , -395.63
+629.26 , -6277.85 , -362.65
+629.26 , -5707.13 , -329.51
+629.26 , -5136.42 , -296.21
+629.26 , -4565.71 , -262.74
+629.26 , -3994.99 , -229.11
+629.26 , -3424.28 , -195.31
+629.26 , -2853.57 , -161.34
+629.26 , -2282.85 , -127.18
+629.26 , -1712.14 , -92.83
+629.26 , -1141.43 , -58.20
+629.26 , -570.71 , -22.82
+629.26 , -114.14 , 0.00
+629.26 , 103.14 , 15.79
+629.26 , 515.72 , 47.58
+629.26 , 1031.44 , 85.48
+629.26 , 1547.16 , 123.30
+629.26 , 2062.88 , 161.22
+629.26 , 2578.60 , 199.26
+629.26 , 3094.32 , 237.46
+629.26 , 3610.04 , 275.81
+629.26 , 4125.76 , 314.32
+629.26 , 4641.48 , 352.99
+629.26 , 5157.20 , 391.83
+629.26 , 5672.91 , 430.82
+629.26 , 6188.63 , 469.98
+629.26 , 6704.35 , 509.30
+629.26 , 7220.07 , 548.78
+629.26 , 7735.79 , 588.42
+629.26 , 8251.51 , 628.23
+629.26 , 8767.23 , 668.20
+629.26 , 9282.95 , 708.32
+629.26 , 9798.67 , 748.61
+629.26 , 10314.39 , 789.06
+686.47 , -11414.26 , -708.97
+686.47 , -10843.55 , -674.68
+686.47 , -10272.84 , -640.19
+686.47 , -9702.12 , -605.51
+686.47 , -9131.41 , -570.63
+686.47 , -8560.70 , -535.56
+686.47 , -7989.99 , -500.30
+686.47 , -7419.27 , -464.85
+686.47 , -6848.56 , -429.21
+686.47 , -6277.85 , -393.37
+686.47 , -5707.13 , -357.35
+686.47 , -5136.42 , -321.13
+686.47 , -4565.71 , -284.71
+686.47 , -3994.99 , -248.11
+686.47 , -3424.28 , -211.31
+686.47 , -2853.57 , -174.30
+686.47 , -2282.85 , -137.08
+686.47 , -1712.14 , -99.61
+686.47 , -1141.43 , -61.78
+686.47 , -570.71 , -22.86
+686.47 , -114.14 , 0.00
+686.47 , 103.14 , 18.17
+686.47 , 515.72 , 53.24
+686.47 , 1031.44 , 94.71
+686.47 , 1547.16 , 136.03
+686.47 , 2062.88 , 177.45
+686.47 , 2578.60 , 219.01
+686.47 , 3094.32 , 260.75
+686.47 , 3610.04 , 302.67
+686.47 , 4125.76 , 344.78
+686.47 , 4641.48 , 387.07
+686.47 , 5157.20 , 429.54
+686.47 , 5672.91 , 472.21
+686.47 , 6188.63 , 515.06
+686.47 , 6704.35 , 558.11
+686.47 , 7220.07 , 601.34
+686.47 , 7735.79 , 644.76
+686.47 , 8251.51 , 688.37
+686.47 , 8767.23 , 732.17
+686.47 , 9282.95 , 776.15
+686.47 , 9798.67 , 820.33
+686.47 , 10314.39 , 864.69
+743.67 , -11414.26 , -763.53
+743.67 , -10843.55 , -726.65
+743.67 , -10272.84 , -689.55
+743.67 , -9702.12 , -652.22
+743.67 , -9131.41 , -614.67
+743.67 , -8560.70 , -576.89
+743.67 , -7989.99 , -538.89
+743.67 , -7419.27 , -500.67
+743.67 , -6848.56 , -462.22
+743.67 , -6277.85 , -423.56
+743.67 , -5707.13 , -384.67
+743.67 , -5136.42 , -345.56
+743.67 , -4565.71 , -306.22
+743.67 , -3994.99 , -266.66
+743.67 , -3424.28 , -226.86
+743.67 , -2853.57 , -186.83
+743.67 , -2282.85 , -146.54
+743.67 , -1712.14 , -105.95
+743.67 , -1141.43 , -64.90
+743.67 , -570.71 , -22.24
+743.67 , -114.14 , 0.00
+743.67 , 103.14 , 20.74
+743.67 , 515.72 , 59.20
+743.67 , 1031.44 , 104.27
+743.67 , 1547.16 , 149.12
+743.67 , 2062.88 , 194.05
+743.67 , 2578.60 , 239.16
+743.67 , 3094.32 , 284.45
+743.67 , 3610.04 , 329.96
+743.67 , 4125.76 , 375.67
+743.67 , 4641.48 , 421.60
+743.67 , 5157.20 , 467.75
+743.67 , 5672.91 , 514.11
+743.67 , 6188.63 , 560.69
+743.67 , 6704.35 , 607.48
+743.67 , 7220.07 , 654.50
+743.67 , 7735.79 , 701.73
+743.67 , 8251.51 , 749.18
+743.67 , 8767.23 , 796.84
+743.67 , 9282.95 , 844.73
+743.67 , 9798.67 , 892.83
+743.67 , 10314.39 , 941.14
+800.88 , -11414.26 , -817.17
+800.88 , -10843.55 , -777.76
+800.88 , -10272.84 , -738.08
+800.88 , -9702.12 , -698.15
+800.88 , -9131.41 , -657.96
+800.88 , -8560.70 , -617.52
+800.88 , -7989.99 , -576.82
+800.88 , -7419.27 , -535.86
+800.88 , -6848.56 , -494.65
+800.88 , -6277.85 , -453.18
+800.88 , -5707.13 , -411.45
+800.88 , -5136.42 , -369.47
+800.88 , -4565.71 , -327.22
+800.88 , -3994.99 , -284.72
+800.88 , -3424.28 , -241.95
+800.88 , -2853.57 , -198.90
+800.88 , -2282.85 , -155.54
+800.88 , -1712.14 , -111.82
+800.88 , -1141.43 , -67.51
+800.88 , -570.71 , -20.80
+800.88 , -114.14 , 0.00
+800.88 , 103.14 , 23.52
+800.88 , 515.72 , 65.48
+800.88 , 1031.44 , 114.20
+800.88 , 1547.16 , 162.59
+800.88 , 2062.88 , 211.06
+800.88 , 2578.60 , 259.72
+800.88 , 3094.32 , 308.59
+800.88 , 3610.04 , 357.69
+800.88 , 4125.76 , 407.04
+800.88 , 4641.48 , 456.62
+800.88 , 5157.20 , 506.46
+800.88 , 5672.91 , 556.54
+800.88 , 6188.63 , 606.87
+800.88 , 6704.35 , 657.45
+800.88 , 7220.07 , 708.28
+800.88 , 7735.79 , 759.35
+800.88 , 8251.51 , 810.68
+800.88 , 8767.23 , 862.25
+800.88 , 9282.95 , 914.07
+800.88 , 9798.67 , 966.13
+800.88 , 10314.39 , 1018.44
+858.08 , -11414.26 , -869.86
+858.08 , -10843.55 , -827.96
+858.08 , -10272.84 , -785.77
+858.08 , -9702.12 , -743.28
+858.08 , -9131.41 , -700.50
+858.08 , -8560.70 , -657.42
+858.08 , -7989.99 , -614.05
+858.08 , -7419.27 , -570.39
+858.08 , -6848.56 , -526.44
+858.08 , -6277.85 , -482.19
+858.08 , -5707.13 , -437.65
+858.08 , -5136.42 , -392.82
+858.08 , -4565.71 , -347.69
+858.08 , -3994.99 , -302.26
+858.08 , -3424.28 , -256.52
+858.08 , -2853.57 , -210.46
+858.08 , -2282.85 , -164.04
+858.08 , -1712.14 , -117.17
+858.08 , -1141.43 , -69.54
+858.08 , -570.71 , -18.27
+858.08 , -114.14 , 0.00
+858.08 , 103.14 , 26.49
+858.08 , 515.72 , 72.10
+858.08 , 1031.44 , 124.50
+858.08 , 1547.16 , 176.46
+858.08 , 2062.88 , 228.49
+858.08 , 2578.60 , 280.71
+858.08 , 3094.32 , 333.18
+858.08 , 3610.04 , 385.90
+858.08 , 4125.76 , 438.89
+858.08 , 4641.48 , 492.16
+858.08 , 5157.20 , 545.71
+858.08 , 5672.91 , 599.54
+858.08 , 6188.63 , 653.64
+858.08 , 6704.35 , 708.03
+858.08 , 7220.07 , 762.71
+858.08 , 7735.79 , 817.66
+858.08 , 8251.51 , 872.89
+858.08 , 8767.23 , 928.41
+858.08 , 9282.95 , 984.20
+858.08 , 9798.67 , 1040.27
+858.08 , 10314.39 , 1096.63
+915.29 , -11414.26 , -921.56
+915.29 , -10843.55 , -877.23
+915.29 , -10272.84 , -832.56
+915.29 , -9702.12 , -787.56
+915.29 , -9131.41 , -742.22
+915.29 , -8560.70 , -696.56
+915.29 , -7989.99 , -650.56
+915.29 , -7419.27 , -604.23
+915.29 , -6848.56 , -557.56
+915.29 , -6277.85 , -510.57
+915.29 , -5707.13 , -463.24
+915.29 , -5136.42 , -415.58
+915.29 , -4565.71 , -367.58
+915.29 , -3994.99 , -319.24
+915.29 , -3424.28 , -270.55
+915.29 , -2853.57 , -221.48
+915.29 , -2282.85 , -171.99
+915.29 , -1712.14 , -121.95
+915.29 , -1141.43 , -70.93
+915.29 , -570.71 , -14.10
+915.29 , -114.14 , 0.00
+915.29 , 103.14 , 29.68
+915.29 , 515.72 , 79.05
+915.29 , 1031.44 , 135.20
+915.29 , 1547.16 , 190.76
+915.29 , 2062.88 , 246.36
+915.29 , 2578.60 , 302.17
+915.29 , 3094.32 , 358.24
+915.29 , 3610.04 , 414.60
+915.29 , 4125.76 , 471.27
+915.29 , 4641.48 , 528.24
+915.29 , 5157.20 , 585.52
+915.29 , 5672.91 , 643.12
+915.29 , 6188.63 , 701.03
+915.29 , 6704.35 , 759.26
+915.29 , 7220.07 , 817.80
+915.29 , 7735.79 , 876.66
+915.29 , 8251.51 , 935.84
+915.29 , 8767.23 , 995.34
+915.29 , 9282.95 , 1055.15
+915.29 , 9798.67 , 1115.27
+915.29 , 10314.39 , 1175.71
+972.50 , -11414.26 , -972.24
+972.50 , -10843.55 , -925.52
+972.50 , -10272.84 , -878.43
+972.50 , -9702.12 , -830.96
+972.50 , -9131.41 , -783.11
+972.50 , -8560.70 , -734.89
+972.50 , -7989.99 , -686.30
+972.50 , -7419.27 , -637.33
+972.50 , -6848.56 , -587.99
+972.50 , -6277.85 , -538.28
+972.50 , -5707.13 , -488.19
+972.50 , -5136.42 , -437.72
+972.50 , -4565.71 , -386.87
+972.50 , -3994.99 , -335.63
+972.50 , -3424.28 , -283.99
+972.50 , -2853.57 , -231.92
+972.50 , -2282.85 , -179.35
+972.50 , -1712.14 , -126.12
+972.50 , -1141.43 , -71.60
+972.50 , -570.71 , -6.45
+972.50 , -114.14 , 0.00
+972.50 , 103.14 , 33.08
+972.50 , 515.72 , 86.37
+972.50 , 1031.44 , 146.31
+972.50 , 1547.16 , 205.50
+972.50 , 2062.88 , 264.70
+972.50 , 2578.60 , 324.11
+972.50 , 3094.32 , 383.81
+972.50 , 3610.04 , 443.83
+972.50 , 4125.76 , 504.18
+972.50 , 4641.48 , 564.87
+972.50 , 5157.20 , 625.91
+972.50 , 5672.91 , 687.30
+972.50 , 6188.63 , 749.05
+972.50 , 6704.35 , 811.14
+972.50 , 7220.07 , 873.59
+972.50 , 7735.79 , 936.40
+972.50 , 8251.51 , 999.56
+972.50 , 8767.23 , 1063.07
+972.50 , 9282.95 , 1126.93
+972.50 , 9798.67 , 1191.14
+972.50 , 10314.39 , 1255.71
+1029.70 , -11414.26 , -1021.86
+1029.70 , -10843.55 , -972.81
+1029.70 , -10272.84 , -923.33
+1029.70 , -9702.12 , -873.44
+1029.70 , -9131.41 , -823.13
+1029.70 , -8560.70 , -772.39
+1029.70 , -7989.99 , -721.24
+1029.70 , -7419.27 , -669.67
+1029.70 , -6848.56 , -617.68
+1029.70 , -6277.85 , -565.27
+1029.70 , -5707.13 , -512.45
+1029.70 , -5136.42 , -459.19
+1029.70 , -4565.71 , -405.51
+1029.70 , -3994.99 , -351.39
+1029.70 , -3424.28 , -296.81
+1029.70 , -2853.57 , -241.73
+1029.70 , -2282.85 , -186.07
+1029.70 , -1712.14 , -129.61
+1029.70 , -1141.43 , -71.46
+1029.70 , -570.71 , 0.00
+1029.70 , -114.14 , 0.00
+1029.70 , 103.14 , 36.70
+1029.70 , 515.72 , 94.04
+1029.70 , 1031.44 , 157.85
+1029.70 , 1547.16 , 220.70
+1029.70 , 2062.88 , 283.52
+1029.70 , 2578.60 , 346.56
+1029.70 , 3094.32 , 409.90
+1029.70 , 3610.04 , 473.59
+1029.70 , 4125.76 , 537.65
+1029.70 , 4641.48 , 602.09
+1029.70 , 5157.20 , 666.91
+1029.70 , 5672.91 , 732.12
+1029.70 , 6188.63 , 797.72
+1029.70 , 6704.35 , 863.72
+1029.70 , 7220.07 , 930.10
+1029.70 , 7735.79 , 996.88
+1029.70 , 8251.51 , 1064.05
+1029.70 , 8767.23 , 1131.62
+1029.70 , 9282.95 , 1199.57
+1029.70 , 9798.67 , 1267.92
+1029.70 , 10314.39 , 1336.65
+1086.91 , -11414.26 , -1070.37
+1086.91 , -10843.55 , -1019.04
+1086.91 , -10272.84 , -967.24
+1086.91 , -9702.12 , -914.96
+1086.91 , -9131.41 , -862.23
+1086.91 , -8560.70 , -809.02
+1086.91 , -7989.99 , -755.35
+1086.91 , -7419.27 , -701.21
+1086.91 , -6848.56 , -646.60
+1086.91 , -6277.85 , -591.53
+1086.91 , -5707.13 , -535.99
+1086.91 , -5136.42 , -479.97
+1086.91 , -4565.71 , -423.47
+1086.91 , -3994.99 , -366.48
+1086.91 , -3424.28 , -308.96
+1086.91 , -2853.57 , -250.88
+1086.91 , -2282.85 , -192.11
+1086.91 , -1712.14 , -132.36
+1086.91 , -1141.43 , -70.38
+1086.91 , -570.71 , 0.00
+1086.91 , -114.14 , 0.00
+1086.91 , 103.14 , 40.53
+1086.91 , 515.72 , 102.10
+1086.91 , 1031.44 , 169.83
+1086.91 , 1547.16 , 236.37
+1086.91 , 2062.88 , 302.84
+1086.91 , 2578.60 , 369.53
+1086.91 , 3094.32 , 436.54
+1086.91 , 3610.04 , 503.92
+1086.91 , 4125.76 , 571.71
+1086.91 , 4641.48 , 639.91
+1086.91 , 5157.20 , 708.54
+1086.91 , 5672.91 , 777.59
+1086.91 , 6188.63 , 847.08
+1086.91 , 6704.35 , 917.00
+1086.91 , 7220.07 , 987.35
+1086.91 , 7735.79 , 1058.14
+1086.91 , 8251.51 , 1129.36
+1086.91 , 8767.23 , 1201.01
+1086.91 , 9282.95 , 1273.09
+1086.91 , 9798.67 , 1345.61
+1086.91 , 10314.39 , 1418.56
+1144.11 , -11414.26 , -1117.74
+1144.11 , -10843.55 , -1064.18
+1144.11 , -10272.84 , -1010.10
+1144.11 , -9702.12 , -955.49
+1144.11 , -9131.41 , -900.37
+1144.11 , -8560.70 , -844.73
+1144.11 , -7989.99 , -788.58
+1144.11 , -7419.27 , -731.90
+1144.11 , -6848.56 , -674.71
+1144.11 , -6277.85 , -617.00
+1144.11 , -5707.13 , -558.77
+1144.11 , -5136.42 , -500.01
+1144.11 , -4565.71 , -440.71
+1144.11 , -3994.99 , -380.85
+1144.11 , -3424.28 , -320.40
+1144.11 , -2853.57 , -259.31
+1144.11 , -2282.85 , -197.41
+1144.11 , -1712.14 , -134.30
+1144.11 , -1141.43 , -68.24
+1144.11 , -570.71 , 0.00
+1144.11 , -114.14 , 0.00
+1144.11 , 103.14 , 44.59
+1144.11 , 515.72 , 110.53
+1144.11 , 1031.44 , 182.27
+1144.11 , 1547.16 , 252.55
+1144.11 , 2062.88 , 322.69
+1144.11 , 2578.60 , 393.04
+1144.11 , 3094.32 , 463.74
+1144.11 , 3610.04 , 534.84
+1144.11 , 4125.76 , 606.37
+1144.11 , 4641.48 , 678.37
+1144.11 , 5157.20 , 750.82
+1144.11 , 5672.91 , 823.74
+1144.11 , 6188.63 , 897.14
+1144.11 , 6704.35 , 971.01
+1144.11 , 7220.07 , 1045.36
+1144.11 , 7735.79 , 1120.19
+1144.11 , 8251.51 , 1195.49
+1144.11 , 8767.23 , 1271.27
+1144.11 , 9282.95 , 1347.52
+1144.11 , 9798.67 , 1424.25
+1144.11 , 10314.39 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..102d2ba38dee164c86a6a611167df50fbf2d589a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -21.84
+5.72 , -22.52
+57.21 , -28.92
+114.41 , -35.99
+171.62 , -43.07
+228.82 , -50.22
+286.03 , -57.30
+343.23 , -64.38
+400.44 , -71.45
+457.65 , -78.53
+514.85 , -85.68
+572.06 , -92.76
+629.26 , -99.84
+686.47 , -106.91
+743.67 , -113.99
+800.88 , -121.14
+858.08 , -128.22
+915.29 , -135.30
+972.50 , -142.37
+1029.70 , -149.45
+1086.91 , -156.60
+1144.11 , -163.68
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/Axle_4x2_Tractor.vtlm b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/Axle_4x2_Tractor.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..e11cbf7cdde175e06ab8f6a0b79d46b84b3e0c1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/Axle_4x2_Tractor.vtlm
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/Axlegear.vgbx b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/Axlegear.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..96a5496c2e5141440ff16906fcf3c3554e0503d3
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/Axlegear.vgbx
@@ -0,0 +1,33 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-11-03T14:19:09.9858299Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "3_speed_AMT",
+ "Inertia": 0.0,
+ "TracInt": 0.8,
+ "Gears": [
+ {
+ "Ratio": 2.64,
+ "LossMap": "Axle_4x2_Tractor.vtlm"
+ }
+ ],
+ "TqReserve": 0.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.22222222222222,
+ "StartAcc": 0.8,
+ "GearboxType": "IEPC",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAfterUpshiftDelay": 6.0,
+ "UpshiftAfterDownshiftDelay": 6.0,
+ "UpshiftMinAcceleration": 0.1,
+ "PowershiftShiftTime": 0.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/GenericIEPC_Gbx3.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/GenericIEPC_Gbx3.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..863fb893954d209433b18cb5eefa1b054cda69f9
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/GenericIEPC_Gbx3.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 8.31
+ },
+ {
+ "Ratio": 4.65
+ },
+ {
+ "Ratio": 2.74
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/GenericIEPC_Gbx3_drag.viepc b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/GenericIEPC_Gbx3_drag.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..533a4a5e6a90b2c99b0ff3c0cf14b65eac3a9859
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/GenericIEPC_Gbx3_drag.viepc
@@ -0,0 +1,63 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 8.31
+ },
+ {
+ "Ratio": 4.65
+ },
+ {
+ "Ratio": 2.74
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3_drag1.viepcd",
+ "2": "IEPC_Gbx3_drag2.viepcd",
+ "3": "IEPC_Gbx3_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..596d5f768f377ef723c5e35cd12ede22dc1d012e
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..d3b99d52c9d58fcc9c78ddaaacee45be25c9123c
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3_drag.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..146dfc42c35740688df216b61ebf31ead92f1074
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx3.vveh",
+ "GearboxFile": "Axlegear.vgbx",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3_drag.vecto b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3_drag.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..33adc6edc976be6d12ddeee3b5bdbfab21a3078d
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3_drag.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx3_drag.vveh",
+ "GearboxFile": "Axlegear.vgbx",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_1.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..52c23c595eece5b3cd06f8111e7c740348ddbf08
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -12984.38 , 0.00
+0.00 , -12335.16 , 0.00
+0.00 , -11685.94 , 0.00
+0.00 , -11036.72 , 0.00
+0.00 , -10387.50 , 0.00
+0.00 , -9738.28 , 0.00
+0.00 , -9089.06 , -0.13
+0.00 , -8439.84 , -0.66
+0.00 , -7790.63 , -0.98
+0.00 , -7141.41 , -1.19
+0.00 , -6492.19 , -1.32
+0.00 , -5842.97 , -1.38
+0.00 , -5193.75 , -1.39
+0.00 , -4544.53 , -1.35
+0.00 , -3895.31 , -1.26
+0.00 , -3246.09 , -1.13
+0.00 , -2596.88 , -0.97
+0.00 , -1947.66 , -0.77
+0.00 , -1298.44 , -0.53
+0.00 , -649.22 , -0.27
+0.00 , -129.84 , -0.02
+0.00 , 119.66 , 0.13
+0.00 , 598.32 , 0.56
+0.00 , 1196.64 , 1.12
+0.00 , 1794.96 , 1.70
+0.00 , 2393.28 , 2.31
+0.00 , 2991.60 , 2.93
+0.00 , 3589.92 , 3.58
+0.00 , 4188.24 , 4.25
+0.00 , 4786.56 , 4.93
+0.00 , 5384.88 , 5.64
+0.00 , 5983.20 , 6.37
+0.00 , 6581.52 , 7.12
+0.00 , 7179.84 , 7.88
+0.00 , 7778.16 , 8.67
+0.00 , 8376.48 , 9.47
+0.00 , 8974.80 , 10.29
+0.00 , 9573.12 , 11.13
+0.00 , 10171.44 , 11.99
+0.00 , 10769.76 , 12.87
+0.00 , 11368.08 , 13.76
+0.00 , 11966.40 , 14.67
+4.98 , -12984.38 , 0.00
+4.98 , -12335.16 , 0.00
+4.98 , -11685.94 , 0.00
+4.98 , -11036.72 , 0.00
+4.98 , -10387.50 , 0.00
+4.98 , -9738.28 , 0.00
+4.98 , -9089.06 , -0.50
+4.98 , -8439.84 , -0.84
+4.98 , -7790.63 , -1.04
+4.98 , -7141.41 , -1.16
+4.98 , -6492.19 , -1.22
+4.98 , -5842.97 , -1.24
+4.98 , -5193.75 , -1.21
+4.98 , -4544.53 , -1.15
+4.98 , -3895.31 , -1.06
+4.98 , -3246.09 , -0.94
+4.98 , -2596.88 , -0.80
+4.98 , -1947.66 , -0.62
+4.98 , -1298.44 , -0.43
+4.98 , -649.22 , -0.21
+4.98 , -129.84 , -0.02
+4.98 , 119.66 , 0.10
+4.98 , 598.32 , 0.43
+4.98 , 1196.64 , 0.85
+4.98 , 1794.96 , 1.30
+4.98 , 2393.28 , 1.75
+4.98 , 2991.60 , 2.23
+4.98 , 3589.92 , 2.71
+4.98 , 4188.24 , 3.21
+4.98 , 4786.56 , 3.73
+4.98 , 5384.88 , 4.26
+4.98 , 5983.20 , 4.80
+4.98 , 6581.52 , 5.36
+4.98 , 7179.84 , 5.93
+4.98 , 7778.16 , 6.52
+4.98 , 8376.48 , 7.12
+4.98 , 8974.80 , 7.73
+4.98 , 9573.12 , 8.35
+4.98 , 10171.44 , 8.99
+4.98 , 10769.76 , 9.64
+4.98 , 11368.08 , 10.30
+4.98 , 11966.40 , 10.98
+49.80 , -12984.38 , -58.10
+49.80 , -12335.16 , -55.37
+49.80 , -11685.94 , -52.62
+49.80 , -11036.72 , -49.85
+49.80 , -10387.50 , -47.06
+49.80 , -9738.28 , -44.25
+49.80 , -9089.06 , -41.42
+49.80 , -8439.84 , -38.57
+49.80 , -7790.63 , -35.70
+49.80 , -7141.41 , -32.81
+49.80 , -6492.19 , -29.90
+49.80 , -5842.97 , -26.98
+49.80 , -5193.75 , -24.03
+49.80 , -4544.53 , -21.07
+49.80 , -3895.31 , -18.08
+49.80 , -3246.09 , -15.08
+49.80 , -2596.88 , -12.06
+49.80 , -1947.66 , -9.02
+49.80 , -1298.44 , -5.96
+49.80 , -649.22 , -2.88
+49.80 , -129.84 , -0.37
+49.80 , 119.66 , 0.90
+49.80 , 598.32 , 3.68
+49.80 , 1196.64 , 7.16
+49.80 , 1794.96 , 10.66
+49.80 , 2393.28 , 14.17
+49.80 , 2991.60 , 17.71
+49.80 , 3589.92 , 21.26
+49.80 , 4188.24 , 24.84
+49.80 , 4786.56 , 28.43
+49.80 , 5384.88 , 32.04
+49.80 , 5983.20 , 35.67
+49.80 , 6581.52 , 39.32
+49.80 , 7179.84 , 42.99
+49.80 , 7778.16 , 46.68
+49.80 , 8376.48 , 50.38
+49.80 , 8974.80 , 54.11
+49.80 , 9573.12 , 57.85
+49.80 , 10171.44 , 61.61
+49.80 , 10769.76 , 65.39
+49.80 , 11368.08 , 69.19
+49.80 , 11966.40 , 73.01
+99.59 , -12984.38 , -120.57
+99.59 , -12335.16 , -114.73
+99.59 , -11685.94 , -108.87
+99.59 , -11036.72 , -102.99
+99.59 , -10387.50 , -97.08
+99.59 , -9738.28 , -91.15
+99.59 , -9089.06 , -85.20
+99.59 , -8439.84 , -79.23
+99.59 , -7790.63 , -73.23
+99.59 , -7141.41 , -67.21
+99.59 , -6492.19 , -61.17
+99.59 , -5842.97 , -55.10
+99.59 , -5193.75 , -49.01
+99.59 , -4544.53 , -42.90
+99.59 , -3895.31 , -36.77
+99.59 , -3246.09 , -30.61
+99.59 , -2596.88 , -24.43
+99.59 , -1947.66 , -18.23
+99.59 , -1298.44 , -12.01
+99.59 , -649.22 , -5.76
+99.59 , -129.84 , -0.66
+99.59 , 119.66 , 1.84
+99.59 , 598.32 , 7.35
+99.59 , 1196.64 , 14.22
+99.59 , 1794.96 , 21.11
+99.59 , 2393.28 , 28.02
+99.59 , 2991.60 , 34.96
+99.59 , 3589.92 , 41.92
+99.59 , 4188.24 , 48.90
+99.59 , 4786.56 , 55.90
+99.59 , 5384.88 , 62.93
+99.59 , 5983.20 , 69.98
+99.59 , 6581.52 , 77.05
+99.59 , 7179.84 , 84.15
+99.59 , 7778.16 , 91.27
+99.59 , 8376.48 , 98.41
+99.59 , 8974.80 , 105.58
+99.59 , 9573.12 , 112.76
+99.59 , 10171.44 , 119.97
+99.59 , 10769.76 , 127.21
+99.59 , 11368.08 , 134.46
+99.59 , 11966.40 , 141.74
+149.39 , -12984.38 , -182.44
+149.39 , -12335.16 , -173.55
+149.39 , -11685.94 , -164.62
+149.39 , -11036.72 , -155.67
+149.39 , -10387.50 , -146.69
+149.39 , -9738.28 , -137.68
+149.39 , -9089.06 , -128.65
+149.39 , -8439.84 , -119.58
+149.39 , -7790.63 , -110.49
+149.39 , -7141.41 , -101.36
+149.39 , -6492.19 , -92.21
+149.39 , -5842.97 , -83.03
+149.39 , -5193.75 , -73.82
+149.39 , -4544.53 , -64.58
+149.39 , -3895.31 , -55.31
+149.39 , -3246.09 , -46.02
+149.39 , -2596.88 , -36.70
+149.39 , -1947.66 , -27.34
+149.39 , -1298.44 , -17.96
+149.39 , -649.22 , -8.54
+149.39 , -129.84 , -0.79
+149.39 , 119.66 , 2.86
+149.39 , 598.32 , 11.12
+149.39 , 1196.64 , 21.39
+149.39 , 1794.96 , 31.68
+149.39 , 2393.28 , 41.99
+149.39 , 2991.60 , 52.34
+149.39 , 3589.92 , 62.71
+149.39 , 4188.24 , 73.12
+149.39 , 4786.56 , 83.55
+149.39 , 5384.88 , 94.01
+149.39 , 5983.20 , 104.50
+149.39 , 6581.52 , 115.02
+149.39 , 7179.84 , 125.57
+149.39 , 7778.16 , 136.15
+149.39 , 8376.48 , 146.76
+149.39 , 8974.80 , 157.40
+149.39 , 9573.12 , 168.06
+149.39 , 10171.44 , 178.76
+149.39 , 10769.76 , 189.48
+149.39 , 11368.08 , 200.23
+149.39 , 11966.40 , 211.02
+199.18 , -12984.38 , -243.71
+199.18 , -12335.16 , -231.81
+199.18 , -11685.94 , -219.87
+199.18 , -11036.72 , -207.89
+199.18 , -10387.50 , -195.88
+199.18 , -9738.28 , -183.83
+199.18 , -9089.06 , -171.74
+199.18 , -8439.84 , -159.61
+199.18 , -7790.63 , -147.45
+199.18 , -7141.41 , -135.25
+199.18 , -6492.19 , -123.01
+199.18 , -5842.97 , -110.74
+199.18 , -5193.75 , -98.43
+199.18 , -4544.53 , -86.08
+199.18 , -3895.31 , -73.70
+199.18 , -3246.09 , -61.27
+199.18 , -2596.88 , -48.82
+199.18 , -1947.66 , -36.32
+199.18 , -1298.44 , -23.78
+199.18 , -649.22 , -11.19
+199.18 , -129.84 , -0.63
+199.18 , 119.66 , 3.98
+199.18 , 598.32 , 15.01
+199.18 , 1196.64 , 28.68
+199.18 , 1794.96 , 42.37
+199.18 , 2393.28 , 56.10
+199.18 , 2991.60 , 69.87
+199.18 , 3589.92 , 83.67
+199.18 , 4188.24 , 97.52
+199.18 , 4786.56 , 111.40
+199.18 , 5384.88 , 125.31
+199.18 , 5983.20 , 139.27
+199.18 , 6581.52 , 153.26
+199.18 , 7179.84 , 167.29
+199.18 , 7778.16 , 181.36
+199.18 , 8376.48 , 195.46
+199.18 , 8974.80 , 209.61
+199.18 , 9573.12 , 223.79
+199.18 , 10171.44 , 238.01
+199.18 , 10769.76 , 252.26
+199.18 , 11368.08 , 266.56
+199.18 , 11966.40 , 280.89
+248.98 , -12984.38 , -304.37
+248.98 , -12335.16 , -289.50
+248.98 , -11685.94 , -274.59
+248.98 , -11036.72 , -259.63
+248.98 , -10387.50 , -244.61
+248.98 , -9738.28 , -229.56
+248.98 , -9089.06 , -214.45
+248.98 , -8439.84 , -199.30
+248.98 , -7790.63 , -184.10
+248.98 , -7141.41 , -168.85
+248.98 , -6492.19 , -153.55
+248.98 , -5842.97 , -138.20
+248.98 , -5193.75 , -122.81
+248.98 , -4544.53 , -107.37
+248.98 , -3895.31 , -91.88
+248.98 , -3246.09 , -76.35
+248.98 , -2596.88 , -60.76
+248.98 , -1947.66 , -45.13
+248.98 , -1298.44 , -29.44
+248.98 , -649.22 , -13.67
+248.98 , -129.84 , 0.00
+248.98 , 119.66 , 5.21
+248.98 , 598.32 , 19.04
+248.98 , 1196.64 , 36.13
+248.98 , 1794.96 , 53.24
+248.98 , 2393.28 , 70.39
+248.98 , 2991.60 , 87.59
+248.98 , 3589.92 , 104.83
+248.98 , 4188.24 , 122.13
+248.98 , 4786.56 , 139.47
+248.98 , 5384.88 , 156.87
+248.98 , 5983.20 , 174.31
+248.98 , 6581.52 , 191.80
+248.98 , 7179.84 , 209.33
+248.98 , 7778.16 , 226.92
+248.98 , 8376.48 , 244.56
+248.98 , 8974.80 , 262.24
+248.98 , 9573.12 , 279.97
+248.98 , 10171.44 , 297.76
+248.98 , 10769.76 , 315.58
+248.98 , 11368.08 , 333.46
+248.98 , 11966.40 , 351.39
+298.77 , -12984.38 , -364.37
+298.77 , -12335.16 , -346.59
+298.77 , -11685.94 , -328.74
+298.77 , -11036.72 , -310.84
+298.77 , -10387.50 , -292.87
+298.77 , -9738.28 , -274.84
+298.77 , -9089.06 , -256.75
+298.77 , -8439.84 , -238.60
+298.77 , -7790.63 , -220.39
+298.77 , -7141.41 , -202.12
+298.77 , -6492.19 , -183.79
+298.77 , -5842.97 , -165.40
+298.77 , -5193.75 , -146.94
+298.77 , -4544.53 , -128.43
+298.77 , -3895.31 , -109.85
+298.77 , -3246.09 , -91.21
+298.77 , -2596.88 , -72.51
+298.77 , -1947.66 , -53.75
+298.77 , -1298.44 , -34.91
+298.77 , -649.22 , -15.95
+298.77 , -129.84 , 0.00
+298.77 , 119.66 , 6.58
+298.77 , 598.32 , 23.25
+298.77 , 1196.64 , 43.76
+298.77 , 1794.96 , 64.29
+298.77 , 2393.28 , 84.87
+298.77 , 2991.60 , 105.52
+298.77 , 3589.92 , 126.22
+298.77 , 4188.24 , 146.98
+298.77 , 4786.56 , 167.81
+298.77 , 5384.88 , 188.70
+298.77 , 5983.20 , 209.65
+298.77 , 6581.52 , 230.66
+298.77 , 7179.84 , 251.73
+298.77 , 7778.16 , 272.87
+298.77 , 8376.48 , 294.07
+298.77 , 8974.80 , 315.33
+298.77 , 9573.12 , 336.65
+298.77 , 10171.44 , 358.03
+298.77 , 10769.76 , 379.47
+298.77 , 11368.08 , 400.98
+298.77 , 11966.40 , 422.54
+348.57 , -12984.38 , -423.69
+348.57 , -12335.16 , -403.04
+348.57 , -11685.94 , -382.31
+348.57 , -11036.72 , -361.50
+348.57 , -10387.50 , -340.62
+348.57 , -9738.28 , -319.66
+348.57 , -9089.06 , -298.62
+348.57 , -8439.84 , -277.51
+348.57 , -7790.63 , -256.31
+348.57 , -7141.41 , -235.05
+348.57 , -6492.19 , -213.70
+348.57 , -5842.97 , -192.28
+348.57 , -5193.75 , -170.79
+348.57 , -4544.53 , -149.21
+348.57 , -3895.31 , -127.57
+348.57 , -3246.09 , -105.84
+348.57 , -2596.88 , -84.03
+348.57 , -1947.66 , -62.14
+348.57 , -1298.44 , -40.16
+348.57 , -649.22 , -18.00
+348.57 , -129.84 , 0.00
+348.57 , 119.66 , 8.09
+348.57 , 598.32 , 27.64
+348.57 , 1196.64 , 51.59
+348.57 , 1794.96 , 75.56
+348.57 , 2393.28 , 99.58
+348.57 , 2991.60 , 123.68
+348.57 , 3589.92 , 147.86
+348.57 , 4188.24 , 172.10
+348.57 , 4786.56 , 196.43
+348.57 , 5384.88 , 220.84
+348.57 , 5983.20 , 245.32
+348.57 , 6581.52 , 269.88
+348.57 , 7179.84 , 294.51
+348.57 , 7778.16 , 319.23
+348.57 , 8376.48 , 344.02
+348.57 , 8974.80 , 368.89
+348.57 , 9573.12 , 393.83
+348.57 , 10171.44 , 418.85
+348.57 , 10769.76 , 443.95
+348.57 , 11368.08 , 469.13
+348.57 , 11966.40 , 494.38
+398.37 , -12984.38 , -482.31
+398.37 , -12335.16 , -458.83
+398.37 , -11685.94 , -435.26
+398.37 , -11036.72 , -411.59
+398.37 , -10387.50 , -387.83
+398.37 , -9738.28 , -363.97
+398.37 , -9089.06 , -340.02
+398.37 , -8439.84 , -315.97
+398.37 , -7790.63 , -291.83
+398.37 , -7141.41 , -267.59
+398.37 , -6492.19 , -243.26
+398.37 , -5842.97 , -218.84
+398.37 , -5193.75 , -194.32
+398.37 , -4544.53 , -169.71
+398.37 , -3895.31 , -145.00
+398.37 , -3246.09 , -120.19
+398.37 , -2596.88 , -95.29
+398.37 , -1947.66 , -70.28
+398.37 , -1298.44 , -45.14
+398.37 , -649.22 , -19.76
+398.37 , -129.84 , 0.00
+398.37 , 119.66 , 9.76
+398.37 , 598.32 , 32.25
+398.37 , 1196.64 , 59.66
+398.37 , 1794.96 , 87.07
+398.37 , 2393.28 , 114.55
+398.37 , 2991.60 , 142.11
+398.37 , 3589.92 , 169.77
+398.37 , 4188.24 , 197.52
+398.37 , 4786.56 , 225.37
+398.37 , 5384.88 , 253.31
+398.37 , 5983.20 , 281.34
+398.37 , 6581.52 , 309.47
+398.37 , 7179.84 , 337.70
+398.37 , 7778.16 , 366.02
+398.37 , 8376.48 , 394.44
+398.37 , 8974.80 , 422.95
+398.37 , 9573.12 , 451.56
+398.37 , 10171.44 , 480.26
+398.37 , 10769.76 , 509.05
+398.37 , 11368.08 , 537.94
+398.37 , 11966.40 , 566.93
+448.16 , -12984.38 , -540.17
+448.16 , -12335.16 , -513.92
+448.16 , -11685.94 , -487.55
+448.16 , -11036.72 , -461.06
+448.16 , -10387.50 , -434.46
+448.16 , -9738.28 , -407.75
+448.16 , -9089.06 , -380.92
+448.16 , -8439.84 , -353.97
+448.16 , -7790.63 , -326.91
+448.16 , -7141.41 , -299.73
+448.16 , -6492.19 , -272.44
+448.16 , -5842.97 , -245.03
+448.16 , -5193.75 , -217.51
+448.16 , -4544.53 , -189.87
+448.16 , -3895.31 , -162.12
+448.16 , -3246.09 , -134.25
+448.16 , -2596.88 , -106.26
+448.16 , -1947.66 , -78.13
+448.16 , -1298.44 , -49.84
+448.16 , -649.22 , -21.19
+448.16 , -129.84 , 0.00
+448.16 , 119.66 , 11.59
+448.16 , 598.32 , 37.10
+448.16 , 1196.64 , 67.98
+448.16 , 1794.96 , 98.85
+448.16 , 2393.28 , 129.79
+448.16 , 2991.60 , 160.84
+448.16 , 3589.92 , 191.99
+448.16 , 4188.24 , 223.26
+448.16 , 4786.56 , 254.64
+448.16 , 5384.88 , 286.14
+448.16 , 5983.20 , 317.75
+448.16 , 6581.52 , 349.48
+448.16 , 7179.84 , 381.32
+448.16 , 7778.16 , 413.28
+448.16 , 8376.48 , 445.36
+448.16 , 8974.80 , 477.54
+448.16 , 9573.12 , 509.85
+448.16 , 10171.44 , 542.27
+448.16 , 10769.76 , 574.80
+448.16 , 11368.08 , 607.45
+448.16 , 11966.40 , 640.21
+497.96 , -12984.38 , -597.26
+497.96 , -12335.16 , -568.28
+497.96 , -11685.94 , -539.16
+497.96 , -11036.72 , -509.90
+497.96 , -10387.50 , -480.50
+497.96 , -9738.28 , -450.96
+497.96 , -9089.06 , -421.28
+497.96 , -8439.84 , -391.47
+497.96 , -7790.63 , -361.52
+497.96 , -7141.41 , -331.43
+497.96 , -6492.19 , -301.20
+497.96 , -5842.97 , -270.83
+497.96 , -5193.75 , -240.33
+497.96 , -4544.53 , -209.68
+497.96 , -3895.31 , -178.90
+497.96 , -3246.09 , -147.97
+497.96 , -2596.88 , -116.90
+497.96 , -1947.66 , -85.66
+497.96 , -1298.44 , -54.21
+497.96 , -649.22 , -22.23
+497.96 , -129.84 , 0.00
+497.96 , 119.66 , 13.60
+497.96 , 598.32 , 42.20
+497.96 , 1196.64 , 76.58
+497.96 , 1794.96 , 110.92
+497.96 , 2393.28 , 145.34
+497.96 , 2991.60 , 179.88
+497.96 , 3589.92 , 214.55
+497.96 , 4188.24 , 249.35
+497.96 , 4786.56 , 284.29
+497.96 , 5384.88 , 319.36
+497.96 , 5983.20 , 354.57
+497.96 , 6581.52 , 389.92
+497.96 , 7179.84 , 425.41
+497.96 , 7778.16 , 461.03
+497.96 , 8376.48 , 496.79
+497.96 , 8974.80 , 532.69
+497.96 , 9573.12 , 568.73
+497.96 , 10171.44 , 604.90
+497.96 , 10769.76 , 641.21
+497.96 , 11368.08 , 677.66
+497.96 , 11966.40 , 714.24
+547.75 , -12984.38 , -653.54
+547.75 , -12335.16 , -621.88
+547.75 , -11685.94 , -590.05
+547.75 , -11036.72 , -558.06
+547.75 , -10387.50 , -525.90
+547.75 , -9738.28 , -493.58
+547.75 , -9089.06 , -461.09
+547.75 , -8439.84 , -428.44
+547.75 , -7790.63 , -395.63
+547.75 , -7141.41 , -362.65
+547.75 , -6492.19 , -329.51
+547.75 , -5842.97 , -296.21
+547.75 , -5193.75 , -262.74
+547.75 , -4544.53 , -229.11
+547.75 , -3895.31 , -195.31
+547.75 , -3246.09 , -161.34
+547.75 , -2596.88 , -127.18
+547.75 , -1947.66 , -92.83
+547.75 , -1298.44 , -58.20
+547.75 , -649.22 , -22.82
+547.75 , -129.84 , 0.00
+547.75 , 119.66 , 15.79
+547.75 , 598.32 , 47.58
+547.75 , 1196.64 , 85.48
+547.75 , 1794.96 , 123.30
+547.75 , 2393.28 , 161.22
+547.75 , 2991.60 , 199.26
+547.75 , 3589.92 , 237.46
+547.75 , 4188.24 , 275.81
+547.75 , 4786.56 , 314.32
+547.75 , 5384.88 , 352.99
+547.75 , 5983.20 , 391.83
+547.75 , 6581.52 , 430.82
+547.75 , 7179.84 , 469.98
+547.75 , 7778.16 , 509.30
+547.75 , 8376.48 , 548.78
+547.75 , 8974.80 , 588.42
+547.75 , 9573.12 , 628.23
+547.75 , 10171.44 , 668.20
+547.75 , 10769.76 , 708.32
+547.75 , 11368.08 , 748.61
+547.75 , 11966.40 , 789.06
+597.55 , -12984.38 , -708.97
+597.55 , -12335.16 , -674.68
+597.55 , -11685.94 , -640.19
+597.55 , -11036.72 , -605.51
+597.55 , -10387.50 , -570.63
+597.55 , -9738.28 , -535.56
+597.55 , -9089.06 , -500.30
+597.55 , -8439.84 , -464.85
+597.55 , -7790.63 , -429.21
+597.55 , -7141.41 , -393.37
+597.55 , -6492.19 , -357.35
+597.55 , -5842.97 , -321.13
+597.55 , -5193.75 , -284.71
+597.55 , -4544.53 , -248.11
+597.55 , -3895.31 , -211.31
+597.55 , -3246.09 , -174.30
+597.55 , -2596.88 , -137.08
+597.55 , -1947.66 , -99.61
+597.55 , -1298.44 , -61.78
+597.55 , -649.22 , -22.86
+597.55 , -129.84 , 0.00
+597.55 , 119.66 , 18.17
+597.55 , 598.32 , 53.24
+597.55 , 1196.64 , 94.71
+597.55 , 1794.96 , 136.03
+597.55 , 2393.28 , 177.45
+597.55 , 2991.60 , 219.01
+597.55 , 3589.92 , 260.75
+597.55 , 4188.24 , 302.67
+597.55 , 4786.56 , 344.78
+597.55 , 5384.88 , 387.07
+597.55 , 5983.20 , 429.54
+597.55 , 6581.52 , 472.21
+597.55 , 7179.84 , 515.06
+597.55 , 7778.16 , 558.11
+597.55 , 8376.48 , 601.34
+597.55 , 8974.80 , 644.76
+597.55 , 9573.12 , 688.37
+597.55 , 10171.44 , 732.17
+597.55 , 10769.76 , 776.15
+597.55 , 11368.08 , 820.33
+597.55 , 11966.40 , 864.69
+647.35 , -12984.38 , -763.53
+647.35 , -12335.16 , -726.65
+647.35 , -11685.94 , -689.55
+647.35 , -11036.72 , -652.22
+647.35 , -10387.50 , -614.67
+647.35 , -9738.28 , -576.89
+647.35 , -9089.06 , -538.89
+647.35 , -8439.84 , -500.67
+647.35 , -7790.63 , -462.22
+647.35 , -7141.41 , -423.56
+647.35 , -6492.19 , -384.67
+647.35 , -5842.97 , -345.56
+647.35 , -5193.75 , -306.22
+647.35 , -4544.53 , -266.66
+647.35 , -3895.31 , -226.86
+647.35 , -3246.09 , -186.83
+647.35 , -2596.88 , -146.54
+647.35 , -1947.66 , -105.95
+647.35 , -1298.44 , -64.90
+647.35 , -649.22 , -22.24
+647.35 , -129.84 , 0.00
+647.35 , 119.66 , 20.74
+647.35 , 598.32 , 59.20
+647.35 , 1196.64 , 104.27
+647.35 , 1794.96 , 149.12
+647.35 , 2393.28 , 194.05
+647.35 , 2991.60 , 239.16
+647.35 , 3589.92 , 284.45
+647.35 , 4188.24 , 329.96
+647.35 , 4786.56 , 375.67
+647.35 , 5384.88 , 421.60
+647.35 , 5983.20 , 467.75
+647.35 , 6581.52 , 514.11
+647.35 , 7179.84 , 560.69
+647.35 , 7778.16 , 607.48
+647.35 , 8376.48 , 654.50
+647.35 , 8974.80 , 701.73
+647.35 , 9573.12 , 749.18
+647.35 , 10171.44 , 796.84
+647.35 , 10769.76 , 844.73
+647.35 , 11368.08 , 892.83
+647.35 , 11966.40 , 941.14
+697.14 , -12984.38 , -817.17
+697.14 , -12335.16 , -777.76
+697.14 , -11685.94 , -738.08
+697.14 , -11036.72 , -698.15
+697.14 , -10387.50 , -657.96
+697.14 , -9738.28 , -617.52
+697.14 , -9089.06 , -576.82
+697.14 , -8439.84 , -535.86
+697.14 , -7790.63 , -494.65
+697.14 , -7141.41 , -453.18
+697.14 , -6492.19 , -411.45
+697.14 , -5842.97 , -369.47
+697.14 , -5193.75 , -327.22
+697.14 , -4544.53 , -284.72
+697.14 , -3895.31 , -241.95
+697.14 , -3246.09 , -198.90
+697.14 , -2596.88 , -155.54
+697.14 , -1947.66 , -111.82
+697.14 , -1298.44 , -67.51
+697.14 , -649.22 , -20.80
+697.14 , -129.84 , 0.00
+697.14 , 119.66 , 23.52
+697.14 , 598.32 , 65.48
+697.14 , 1196.64 , 114.20
+697.14 , 1794.96 , 162.59
+697.14 , 2393.28 , 211.06
+697.14 , 2991.60 , 259.72
+697.14 , 3589.92 , 308.59
+697.14 , 4188.24 , 357.69
+697.14 , 4786.56 , 407.04
+697.14 , 5384.88 , 456.62
+697.14 , 5983.20 , 506.46
+697.14 , 6581.52 , 556.54
+697.14 , 7179.84 , 606.87
+697.14 , 7778.16 , 657.45
+697.14 , 8376.48 , 708.28
+697.14 , 8974.80 , 759.35
+697.14 , 9573.12 , 810.68
+697.14 , 10171.44 , 862.25
+697.14 , 10769.76 , 914.07
+697.14 , 11368.08 , 966.13
+697.14 , 11966.40 , 1018.44
+746.94 , -12984.38 , -869.86
+746.94 , -12335.16 , -827.96
+746.94 , -11685.94 , -785.77
+746.94 , -11036.72 , -743.28
+746.94 , -10387.50 , -700.50
+746.94 , -9738.28 , -657.42
+746.94 , -9089.06 , -614.05
+746.94 , -8439.84 , -570.39
+746.94 , -7790.63 , -526.44
+746.94 , -7141.41 , -482.19
+746.94 , -6492.19 , -437.65
+746.94 , -5842.97 , -392.82
+746.94 , -5193.75 , -347.69
+746.94 , -4544.53 , -302.26
+746.94 , -3895.31 , -256.52
+746.94 , -3246.09 , -210.46
+746.94 , -2596.88 , -164.04
+746.94 , -1947.66 , -117.17
+746.94 , -1298.44 , -69.54
+746.94 , -649.22 , -18.27
+746.94 , -129.84 , 0.00
+746.94 , 119.66 , 26.49
+746.94 , 598.32 , 72.10
+746.94 , 1196.64 , 124.50
+746.94 , 1794.96 , 176.46
+746.94 , 2393.28 , 228.49
+746.94 , 2991.60 , 280.71
+746.94 , 3589.92 , 333.18
+746.94 , 4188.24 , 385.90
+746.94 , 4786.56 , 438.89
+746.94 , 5384.88 , 492.16
+746.94 , 5983.20 , 545.71
+746.94 , 6581.52 , 599.54
+746.94 , 7179.84 , 653.64
+746.94 , 7778.16 , 708.03
+746.94 , 8376.48 , 762.71
+746.94 , 8974.80 , 817.66
+746.94 , 9573.12 , 872.89
+746.94 , 10171.44 , 928.41
+746.94 , 10769.76 , 984.20
+746.94 , 11368.08 , 1040.27
+746.94 , 11966.40 , 1096.63
+796.73 , -12984.38 , -921.56
+796.73 , -12335.16 , -877.23
+796.73 , -11685.94 , -832.56
+796.73 , -11036.72 , -787.56
+796.73 , -10387.50 , -742.22
+796.73 , -9738.28 , -696.56
+796.73 , -9089.06 , -650.56
+796.73 , -8439.84 , -604.23
+796.73 , -7790.63 , -557.56
+796.73 , -7141.41 , -510.57
+796.73 , -6492.19 , -463.24
+796.73 , -5842.97 , -415.58
+796.73 , -5193.75 , -367.58
+796.73 , -4544.53 , -319.24
+796.73 , -3895.31 , -270.55
+796.73 , -3246.09 , -221.48
+796.73 , -2596.88 , -171.99
+796.73 , -1947.66 , -121.95
+796.73 , -1298.44 , -70.93
+796.73 , -649.22 , -14.10
+796.73 , -129.84 , 0.00
+796.73 , 119.66 , 29.68
+796.73 , 598.32 , 79.05
+796.73 , 1196.64 , 135.20
+796.73 , 1794.96 , 190.76
+796.73 , 2393.28 , 246.36
+796.73 , 2991.60 , 302.17
+796.73 , 3589.92 , 358.24
+796.73 , 4188.24 , 414.60
+796.73 , 4786.56 , 471.27
+796.73 , 5384.88 , 528.24
+796.73 , 5983.20 , 585.52
+796.73 , 6581.52 , 643.12
+796.73 , 7179.84 , 701.03
+796.73 , 7778.16 , 759.26
+796.73 , 8376.48 , 817.80
+796.73 , 8974.80 , 876.66
+796.73 , 9573.12 , 935.84
+796.73 , 10171.44 , 995.34
+796.73 , 10769.76 , 1055.15
+796.73 , 11368.08 , 1115.27
+796.73 , 11966.40 , 1175.71
+846.53 , -12984.38 , -972.24
+846.53 , -12335.16 , -925.52
+846.53 , -11685.94 , -878.43
+846.53 , -11036.72 , -830.96
+846.53 , -10387.50 , -783.11
+846.53 , -9738.28 , -734.89
+846.53 , -9089.06 , -686.30
+846.53 , -8439.84 , -637.33
+846.53 , -7790.63 , -587.99
+846.53 , -7141.41 , -538.28
+846.53 , -6492.19 , -488.19
+846.53 , -5842.97 , -437.72
+846.53 , -5193.75 , -386.87
+846.53 , -4544.53 , -335.63
+846.53 , -3895.31 , -283.99
+846.53 , -3246.09 , -231.92
+846.53 , -2596.88 , -179.35
+846.53 , -1947.66 , -126.12
+846.53 , -1298.44 , -71.60
+846.53 , -649.22 , -6.45
+846.53 , -129.84 , 0.00
+846.53 , 119.66 , 33.08
+846.53 , 598.32 , 86.37
+846.53 , 1196.64 , 146.31
+846.53 , 1794.96 , 205.50
+846.53 , 2393.28 , 264.70
+846.53 , 2991.60 , 324.11
+846.53 , 3589.92 , 383.81
+846.53 , 4188.24 , 443.83
+846.53 , 4786.56 , 504.18
+846.53 , 5384.88 , 564.87
+846.53 , 5983.20 , 625.91
+846.53 , 6581.52 , 687.30
+846.53 , 7179.84 , 749.05
+846.53 , 7778.16 , 811.14
+846.53 , 8376.48 , 873.59
+846.53 , 8974.80 , 936.40
+846.53 , 9573.12 , 999.56
+846.53 , 10171.44 , 1063.07
+846.53 , 10769.76 , 1126.93
+846.53 , 11368.08 , 1191.14
+846.53 , 11966.40 , 1255.71
+896.32 , -12984.38 , -1021.86
+896.32 , -12335.16 , -972.81
+896.32 , -11685.94 , -923.33
+896.32 , -11036.72 , -873.44
+896.32 , -10387.50 , -823.13
+896.32 , -9738.28 , -772.39
+896.32 , -9089.06 , -721.24
+896.32 , -8439.84 , -669.67
+896.32 , -7790.63 , -617.68
+896.32 , -7141.41 , -565.27
+896.32 , -6492.19 , -512.45
+896.32 , -5842.97 , -459.19
+896.32 , -5193.75 , -405.51
+896.32 , -4544.53 , -351.39
+896.32 , -3895.31 , -296.81
+896.32 , -3246.09 , -241.73
+896.32 , -2596.88 , -186.07
+896.32 , -1947.66 , -129.61
+896.32 , -1298.44 , -71.46
+896.32 , -649.22 , 0.00
+896.32 , -129.84 , 0.00
+896.32 , 119.66 , 36.70
+896.32 , 598.32 , 94.04
+896.32 , 1196.64 , 157.85
+896.32 , 1794.96 , 220.70
+896.32 , 2393.28 , 283.52
+896.32 , 2991.60 , 346.56
+896.32 , 3589.92 , 409.90
+896.32 , 4188.24 , 473.59
+896.32 , 4786.56 , 537.65
+896.32 , 5384.88 , 602.09
+896.32 , 5983.20 , 666.91
+896.32 , 6581.52 , 732.12
+896.32 , 7179.84 , 797.72
+896.32 , 7778.16 , 863.72
+896.32 , 8376.48 , 930.10
+896.32 , 8974.80 , 996.88
+896.32 , 9573.12 , 1064.05
+896.32 , 10171.44 , 1131.62
+896.32 , 10769.76 , 1199.57
+896.32 , 11368.08 , 1267.92
+896.32 , 11966.40 , 1336.65
+946.12 , -12984.38 , -1070.37
+946.12 , -12335.16 , -1019.04
+946.12 , -11685.94 , -967.24
+946.12 , -11036.72 , -914.96
+946.12 , -10387.50 , -862.23
+946.12 , -9738.28 , -809.02
+946.12 , -9089.06 , -755.35
+946.12 , -8439.84 , -701.21
+946.12 , -7790.63 , -646.60
+946.12 , -7141.41 , -591.53
+946.12 , -6492.19 , -535.99
+946.12 , -5842.97 , -479.97
+946.12 , -5193.75 , -423.47
+946.12 , -4544.53 , -366.48
+946.12 , -3895.31 , -308.96
+946.12 , -3246.09 , -250.88
+946.12 , -2596.88 , -192.11
+946.12 , -1947.66 , -132.36
+946.12 , -1298.44 , -70.38
+946.12 , -649.22 , 0.00
+946.12 , -129.84 , 0.00
+946.12 , 119.66 , 40.53
+946.12 , 598.32 , 102.10
+946.12 , 1196.64 , 169.83
+946.12 , 1794.96 , 236.37
+946.12 , 2393.28 , 302.84
+946.12 , 2991.60 , 369.53
+946.12 , 3589.92 , 436.54
+946.12 , 4188.24 , 503.92
+946.12 , 4786.56 , 571.71
+946.12 , 5384.88 , 639.91
+946.12 , 5983.20 , 708.54
+946.12 , 6581.52 , 777.59
+946.12 , 7179.84 , 847.08
+946.12 , 7778.16 , 917.00
+946.12 , 8376.48 , 987.35
+946.12 , 8974.80 , 1058.14
+946.12 , 9573.12 , 1129.36
+946.12 , 10171.44 , 1201.01
+946.12 , 10769.76 , 1273.09
+946.12 , 11368.08 , 1345.61
+946.12 , 11966.40 , 1418.56
+995.92 , -12984.38 , -1117.74
+995.92 , -12335.16 , -1064.18
+995.92 , -11685.94 , -1010.10
+995.92 , -11036.72 , -955.49
+995.92 , -10387.50 , -900.37
+995.92 , -9738.28 , -844.73
+995.92 , -9089.06 , -788.58
+995.92 , -8439.84 , -731.90
+995.92 , -7790.63 , -674.71
+995.92 , -7141.41 , -617.00
+995.92 , -6492.19 , -558.77
+995.92 , -5842.97 , -500.01
+995.92 , -5193.75 , -440.71
+995.92 , -4544.53 , -380.85
+995.92 , -3895.31 , -320.40
+995.92 , -3246.09 , -259.31
+995.92 , -2596.88 , -197.41
+995.92 , -1947.66 , -134.30
+995.92 , -1298.44 , -68.24
+995.92 , -649.22 , 0.00
+995.92 , -129.84 , 0.00
+995.92 , 119.66 , 44.59
+995.92 , 598.32 , 110.53
+995.92 , 1196.64 , 182.27
+995.92 , 1794.96 , 252.55
+995.92 , 2393.28 , 322.69
+995.92 , 2991.60 , 393.04
+995.92 , 3589.92 , 463.74
+995.92 , 4188.24 , 534.84
+995.92 , 4786.56 , 606.37
+995.92 , 5384.88 , 678.37
+995.92 , 5983.20 , 750.82
+995.92 , 6581.52 , 823.74
+995.92 , 7179.84 , 897.14
+995.92 , 7778.16 , 971.01
+995.92 , 8376.48 , 1045.36
+995.92 , 8974.80 , 1120.19
+995.92 , 9573.12 , 1195.49
+995.92 , 10171.44 , 1271.27
+995.92 , 10769.76 , 1347.52
+995.92 , 11368.08 , 1424.25
+995.92 , 11966.40 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_2.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..e4be1e22ede233c40afa5a00eeb1292d2cad8f78
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -7190.72 , 0.00
+0.00 , -6831.19 , 0.00
+0.00 , -6471.65 , 0.00
+0.00 , -6112.11 , 0.00
+0.00 , -5752.58 , 0.00
+0.00 , -5393.04 , 0.00
+0.00 , -5033.51 , -0.13
+0.00 , -4673.97 , -0.66
+0.00 , -4314.43 , -0.98
+0.00 , -3954.90 , -1.19
+0.00 , -3595.36 , -1.32
+0.00 , -3235.82 , -1.38
+0.00 , -2876.29 , -1.39
+0.00 , -2516.75 , -1.35
+0.00 , -2157.22 , -1.26
+0.00 , -1797.68 , -1.13
+0.00 , -1438.14 , -0.97
+0.00 , -1078.61 , -0.77
+0.00 , -719.07 , -0.53
+0.00 , -359.54 , -0.27
+0.00 , -71.91 , -0.02
+0.00 , 67.66 , 0.13
+0.00 , 338.29 , 0.56
+0.00 , 676.58 , 1.12
+0.00 , 1014.86 , 1.70
+0.00 , 1353.15 , 2.31
+0.00 , 1691.44 , 2.93
+0.00 , 2029.73 , 3.58
+0.00 , 2368.01 , 4.25
+0.00 , 2706.30 , 4.93
+0.00 , 3044.59 , 5.64
+0.00 , 3382.88 , 6.37
+0.00 , 3721.16 , 7.12
+0.00 , 4059.45 , 7.88
+0.00 , 4397.74 , 8.67
+0.00 , 4736.03 , 9.47
+0.00 , 5074.31 , 10.29
+0.00 , 5412.60 , 11.13
+0.00 , 5750.89 , 11.99
+0.00 , 6089.18 , 12.87
+0.00 , 6427.46 , 13.76
+0.00 , 6765.75 , 14.67
+8.90 , -7190.72 , 0.00
+8.90 , -6831.19 , 0.00
+8.90 , -6471.65 , 0.00
+8.90 , -6112.11 , 0.00
+8.90 , -5752.58 , 0.00
+8.90 , -5393.04 , 0.00
+8.90 , -5033.51 , -0.50
+8.90 , -4673.97 , -0.84
+8.90 , -4314.43 , -1.04
+8.90 , -3954.90 , -1.16
+8.90 , -3595.36 , -1.22
+8.90 , -3235.82 , -1.24
+8.90 , -2876.29 , -1.21
+8.90 , -2516.75 , -1.15
+8.90 , -2157.22 , -1.06
+8.90 , -1797.68 , -0.94
+8.90 , -1438.14 , -0.80
+8.90 , -1078.61 , -0.62
+8.90 , -719.07 , -0.43
+8.90 , -359.54 , -0.21
+8.90 , -71.91 , -0.02
+8.90 , 67.66 , 0.10
+8.90 , 338.29 , 0.43
+8.90 , 676.58 , 0.85
+8.90 , 1014.86 , 1.30
+8.90 , 1353.15 , 1.75
+8.90 , 1691.44 , 2.23
+8.90 , 2029.73 , 2.71
+8.90 , 2368.01 , 3.21
+8.90 , 2706.30 , 3.73
+8.90 , 3044.59 , 4.26
+8.90 , 3382.88 , 4.80
+8.90 , 3721.16 , 5.36
+8.90 , 4059.45 , 5.93
+8.90 , 4397.74 , 6.52
+8.90 , 4736.03 , 7.12
+8.90 , 5074.31 , 7.73
+8.90 , 5412.60 , 8.35
+8.90 , 5750.89 , 8.99
+8.90 , 6089.18 , 9.64
+8.90 , 6427.46 , 10.30
+8.90 , 6765.75 , 10.98
+88.99 , -7190.72 , -58.10
+88.99 , -6831.19 , -55.37
+88.99 , -6471.65 , -52.62
+88.99 , -6112.11 , -49.85
+88.99 , -5752.58 , -47.06
+88.99 , -5393.04 , -44.25
+88.99 , -5033.51 , -41.42
+88.99 , -4673.97 , -38.57
+88.99 , -4314.43 , -35.70
+88.99 , -3954.90 , -32.81
+88.99 , -3595.36 , -29.90
+88.99 , -3235.82 , -26.98
+88.99 , -2876.29 , -24.03
+88.99 , -2516.75 , -21.07
+88.99 , -2157.22 , -18.08
+88.99 , -1797.68 , -15.08
+88.99 , -1438.14 , -12.06
+88.99 , -1078.61 , -9.02
+88.99 , -719.07 , -5.96
+88.99 , -359.54 , -2.88
+88.99 , -71.91 , -0.37
+88.99 , 67.66 , 0.90
+88.99 , 338.29 , 3.68
+88.99 , 676.58 , 7.16
+88.99 , 1014.86 , 10.66
+88.99 , 1353.15 , 14.17
+88.99 , 1691.44 , 17.71
+88.99 , 2029.73 , 21.26
+88.99 , 2368.01 , 24.84
+88.99 , 2706.30 , 28.43
+88.99 , 3044.59 , 32.04
+88.99 , 3382.88 , 35.67
+88.99 , 3721.16 , 39.32
+88.99 , 4059.45 , 42.99
+88.99 , 4397.74 , 46.68
+88.99 , 4736.03 , 50.38
+88.99 , 5074.31 , 54.11
+88.99 , 5412.60 , 57.85
+88.99 , 5750.89 , 61.61
+88.99 , 6089.18 , 65.39
+88.99 , 6427.46 , 69.19
+88.99 , 6765.75 , 73.01
+177.98 , -7190.72 , -120.57
+177.98 , -6831.19 , -114.73
+177.98 , -6471.65 , -108.87
+177.98 , -6112.11 , -102.99
+177.98 , -5752.58 , -97.08
+177.98 , -5393.04 , -91.15
+177.98 , -5033.51 , -85.20
+177.98 , -4673.97 , -79.23
+177.98 , -4314.43 , -73.23
+177.98 , -3954.90 , -67.21
+177.98 , -3595.36 , -61.17
+177.98 , -3235.82 , -55.10
+177.98 , -2876.29 , -49.01
+177.98 , -2516.75 , -42.90
+177.98 , -2157.22 , -36.77
+177.98 , -1797.68 , -30.61
+177.98 , -1438.14 , -24.43
+177.98 , -1078.61 , -18.23
+177.98 , -719.07 , -12.01
+177.98 , -359.54 , -5.76
+177.98 , -71.91 , -0.66
+177.98 , 67.66 , 1.84
+177.98 , 338.29 , 7.35
+177.98 , 676.58 , 14.22
+177.98 , 1014.86 , 21.11
+177.98 , 1353.15 , 28.02
+177.98 , 1691.44 , 34.96
+177.98 , 2029.73 , 41.92
+177.98 , 2368.01 , 48.90
+177.98 , 2706.30 , 55.90
+177.98 , 3044.59 , 62.93
+177.98 , 3382.88 , 69.98
+177.98 , 3721.16 , 77.05
+177.98 , 4059.45 , 84.15
+177.98 , 4397.74 , 91.27
+177.98 , 4736.03 , 98.41
+177.98 , 5074.31 , 105.58
+177.98 , 5412.60 , 112.76
+177.98 , 5750.89 , 119.97
+177.98 , 6089.18 , 127.21
+177.98 , 6427.46 , 134.46
+177.98 , 6765.75 , 141.74
+266.97 , -7190.72 , -182.44
+266.97 , -6831.19 , -173.55
+266.97 , -6471.65 , -164.62
+266.97 , -6112.11 , -155.67
+266.97 , -5752.58 , -146.69
+266.97 , -5393.04 , -137.68
+266.97 , -5033.51 , -128.65
+266.97 , -4673.97 , -119.58
+266.97 , -4314.43 , -110.49
+266.97 , -3954.90 , -101.36
+266.97 , -3595.36 , -92.21
+266.97 , -3235.82 , -83.03
+266.97 , -2876.29 , -73.82
+266.97 , -2516.75 , -64.58
+266.97 , -2157.22 , -55.31
+266.97 , -1797.68 , -46.02
+266.97 , -1438.14 , -36.70
+266.97 , -1078.61 , -27.34
+266.97 , -719.07 , -17.96
+266.97 , -359.54 , -8.54
+266.97 , -71.91 , -0.79
+266.97 , 67.66 , 2.86
+266.97 , 338.29 , 11.12
+266.97 , 676.58 , 21.39
+266.97 , 1014.86 , 31.68
+266.97 , 1353.15 , 41.99
+266.97 , 1691.44 , 52.34
+266.97 , 2029.73 , 62.71
+266.97 , 2368.01 , 73.12
+266.97 , 2706.30 , 83.55
+266.97 , 3044.59 , 94.01
+266.97 , 3382.88 , 104.50
+266.97 , 3721.16 , 115.02
+266.97 , 4059.45 , 125.57
+266.97 , 4397.74 , 136.15
+266.97 , 4736.03 , 146.76
+266.97 , 5074.31 , 157.40
+266.97 , 5412.60 , 168.06
+266.97 , 5750.89 , 178.76
+266.97 , 6089.18 , 189.48
+266.97 , 6427.46 , 200.23
+266.97 , 6765.75 , 211.02
+355.96 , -7190.72 , -243.71
+355.96 , -6831.19 , -231.81
+355.96 , -6471.65 , -219.87
+355.96 , -6112.11 , -207.89
+355.96 , -5752.58 , -195.88
+355.96 , -5393.04 , -183.83
+355.96 , -5033.51 , -171.74
+355.96 , -4673.97 , -159.61
+355.96 , -4314.43 , -147.45
+355.96 , -3954.90 , -135.25
+355.96 , -3595.36 , -123.01
+355.96 , -3235.82 , -110.74
+355.96 , -2876.29 , -98.43
+355.96 , -2516.75 , -86.08
+355.96 , -2157.22 , -73.70
+355.96 , -1797.68 , -61.27
+355.96 , -1438.14 , -48.82
+355.96 , -1078.61 , -36.32
+355.96 , -719.07 , -23.78
+355.96 , -359.54 , -11.19
+355.96 , -71.91 , -0.63
+355.96 , 67.66 , 3.98
+355.96 , 338.29 , 15.01
+355.96 , 676.58 , 28.68
+355.96 , 1014.86 , 42.37
+355.96 , 1353.15 , 56.10
+355.96 , 1691.44 , 69.87
+355.96 , 2029.73 , 83.67
+355.96 , 2368.01 , 97.52
+355.96 , 2706.30 , 111.40
+355.96 , 3044.59 , 125.31
+355.96 , 3382.88 , 139.27
+355.96 , 3721.16 , 153.26
+355.96 , 4059.45 , 167.29
+355.96 , 4397.74 , 181.36
+355.96 , 4736.03 , 195.46
+355.96 , 5074.31 , 209.61
+355.96 , 5412.60 , 223.79
+355.96 , 5750.89 , 238.01
+355.96 , 6089.18 , 252.26
+355.96 , 6427.46 , 266.56
+355.96 , 6765.75 , 280.89
+444.95 , -7190.72 , -304.37
+444.95 , -6831.19 , -289.50
+444.95 , -6471.65 , -274.59
+444.95 , -6112.11 , -259.63
+444.95 , -5752.58 , -244.61
+444.95 , -5393.04 , -229.56
+444.95 , -5033.51 , -214.45
+444.95 , -4673.97 , -199.30
+444.95 , -4314.43 , -184.10
+444.95 , -3954.90 , -168.85
+444.95 , -3595.36 , -153.55
+444.95 , -3235.82 , -138.20
+444.95 , -2876.29 , -122.81
+444.95 , -2516.75 , -107.37
+444.95 , -2157.22 , -91.88
+444.95 , -1797.68 , -76.35
+444.95 , -1438.14 , -60.76
+444.95 , -1078.61 , -45.13
+444.95 , -719.07 , -29.44
+444.95 , -359.54 , -13.67
+444.95 , -71.91 , 0.00
+444.95 , 67.66 , 5.21
+444.95 , 338.29 , 19.04
+444.95 , 676.58 , 36.13
+444.95 , 1014.86 , 53.24
+444.95 , 1353.15 , 70.39
+444.95 , 1691.44 , 87.59
+444.95 , 2029.73 , 104.83
+444.95 , 2368.01 , 122.13
+444.95 , 2706.30 , 139.47
+444.95 , 3044.59 , 156.87
+444.95 , 3382.88 , 174.31
+444.95 , 3721.16 , 191.80
+444.95 , 4059.45 , 209.33
+444.95 , 4397.74 , 226.92
+444.95 , 4736.03 , 244.56
+444.95 , 5074.31 , 262.24
+444.95 , 5412.60 , 279.97
+444.95 , 5750.89 , 297.76
+444.95 , 6089.18 , 315.58
+444.95 , 6427.46 , 333.46
+444.95 , 6765.75 , 351.39
+533.94 , -7190.72 , -364.37
+533.94 , -6831.19 , -346.59
+533.94 , -6471.65 , -328.74
+533.94 , -6112.11 , -310.84
+533.94 , -5752.58 , -292.87
+533.94 , -5393.04 , -274.84
+533.94 , -5033.51 , -256.75
+533.94 , -4673.97 , -238.60
+533.94 , -4314.43 , -220.39
+533.94 , -3954.90 , -202.12
+533.94 , -3595.36 , -183.79
+533.94 , -3235.82 , -165.40
+533.94 , -2876.29 , -146.94
+533.94 , -2516.75 , -128.43
+533.94 , -2157.22 , -109.85
+533.94 , -1797.68 , -91.21
+533.94 , -1438.14 , -72.51
+533.94 , -1078.61 , -53.75
+533.94 , -719.07 , -34.91
+533.94 , -359.54 , -15.95
+533.94 , -71.91 , 0.00
+533.94 , 67.66 , 6.58
+533.94 , 338.29 , 23.25
+533.94 , 676.58 , 43.76
+533.94 , 1014.86 , 64.29
+533.94 , 1353.15 , 84.87
+533.94 , 1691.44 , 105.52
+533.94 , 2029.73 , 126.22
+533.94 , 2368.01 , 146.98
+533.94 , 2706.30 , 167.81
+533.94 , 3044.59 , 188.70
+533.94 , 3382.88 , 209.65
+533.94 , 3721.16 , 230.66
+533.94 , 4059.45 , 251.73
+533.94 , 4397.74 , 272.87
+533.94 , 4736.03 , 294.07
+533.94 , 5074.31 , 315.33
+533.94 , 5412.60 , 336.65
+533.94 , 5750.89 , 358.03
+533.94 , 6089.18 , 379.47
+533.94 , 6427.46 , 400.98
+533.94 , 6765.75 , 422.54
+622.93 , -7190.72 , -423.69
+622.93 , -6831.19 , -403.04
+622.93 , -6471.65 , -382.31
+622.93 , -6112.11 , -361.50
+622.93 , -5752.58 , -340.62
+622.93 , -5393.04 , -319.66
+622.93 , -5033.51 , -298.62
+622.93 , -4673.97 , -277.51
+622.93 , -4314.43 , -256.31
+622.93 , -3954.90 , -235.05
+622.93 , -3595.36 , -213.70
+622.93 , -3235.82 , -192.28
+622.93 , -2876.29 , -170.79
+622.93 , -2516.75 , -149.21
+622.93 , -2157.22 , -127.57
+622.93 , -1797.68 , -105.84
+622.93 , -1438.14 , -84.03
+622.93 , -1078.61 , -62.14
+622.93 , -719.07 , -40.16
+622.93 , -359.54 , -18.00
+622.93 , -71.91 , 0.00
+622.93 , 67.66 , 8.09
+622.93 , 338.29 , 27.64
+622.93 , 676.58 , 51.59
+622.93 , 1014.86 , 75.56
+622.93 , 1353.15 , 99.58
+622.93 , 1691.44 , 123.68
+622.93 , 2029.73 , 147.86
+622.93 , 2368.01 , 172.10
+622.93 , 2706.30 , 196.43
+622.93 , 3044.59 , 220.84
+622.93 , 3382.88 , 245.32
+622.93 , 3721.16 , 269.88
+622.93 , 4059.45 , 294.51
+622.93 , 4397.74 , 319.23
+622.93 , 4736.03 , 344.02
+622.93 , 5074.31 , 368.89
+622.93 , 5412.60 , 393.83
+622.93 , 5750.89 , 418.85
+622.93 , 6089.18 , 443.95
+622.93 , 6427.46 , 469.13
+622.93 , 6765.75 , 494.38
+711.92 , -7190.72 , -482.31
+711.92 , -6831.19 , -458.83
+711.92 , -6471.65 , -435.26
+711.92 , -6112.11 , -411.59
+711.92 , -5752.58 , -387.83
+711.92 , -5393.04 , -363.97
+711.92 , -5033.51 , -340.02
+711.92 , -4673.97 , -315.97
+711.92 , -4314.43 , -291.83
+711.92 , -3954.90 , -267.59
+711.92 , -3595.36 , -243.26
+711.92 , -3235.82 , -218.84
+711.92 , -2876.29 , -194.32
+711.92 , -2516.75 , -169.71
+711.92 , -2157.22 , -145.00
+711.92 , -1797.68 , -120.19
+711.92 , -1438.14 , -95.29
+711.92 , -1078.61 , -70.28
+711.92 , -719.07 , -45.14
+711.92 , -359.54 , -19.76
+711.92 , -71.91 , 0.00
+711.92 , 67.66 , 9.76
+711.92 , 338.29 , 32.25
+711.92 , 676.58 , 59.66
+711.92 , 1014.86 , 87.07
+711.92 , 1353.15 , 114.55
+711.92 , 1691.44 , 142.11
+711.92 , 2029.73 , 169.77
+711.92 , 2368.01 , 197.52
+711.92 , 2706.30 , 225.37
+711.92 , 3044.59 , 253.31
+711.92 , 3382.88 , 281.34
+711.92 , 3721.16 , 309.47
+711.92 , 4059.45 , 337.70
+711.92 , 4397.74 , 366.02
+711.92 , 4736.03 , 394.44
+711.92 , 5074.31 , 422.95
+711.92 , 5412.60 , 451.56
+711.92 , 5750.89 , 480.26
+711.92 , 6089.18 , 509.05
+711.92 , 6427.46 , 537.94
+711.92 , 6765.75 , 566.93
+800.91 , -7190.72 , -540.17
+800.91 , -6831.19 , -513.92
+800.91 , -6471.65 , -487.55
+800.91 , -6112.11 , -461.06
+800.91 , -5752.58 , -434.46
+800.91 , -5393.04 , -407.75
+800.91 , -5033.51 , -380.92
+800.91 , -4673.97 , -353.97
+800.91 , -4314.43 , -326.91
+800.91 , -3954.90 , -299.73
+800.91 , -3595.36 , -272.44
+800.91 , -3235.82 , -245.03
+800.91 , -2876.29 , -217.51
+800.91 , -2516.75 , -189.87
+800.91 , -2157.22 , -162.12
+800.91 , -1797.68 , -134.25
+800.91 , -1438.14 , -106.26
+800.91 , -1078.61 , -78.13
+800.91 , -719.07 , -49.84
+800.91 , -359.54 , -21.19
+800.91 , -71.91 , 0.00
+800.91 , 67.66 , 11.59
+800.91 , 338.29 , 37.10
+800.91 , 676.58 , 67.98
+800.91 , 1014.86 , 98.85
+800.91 , 1353.15 , 129.79
+800.91 , 1691.44 , 160.84
+800.91 , 2029.73 , 191.99
+800.91 , 2368.01 , 223.26
+800.91 , 2706.30 , 254.64
+800.91 , 3044.59 , 286.14
+800.91 , 3382.88 , 317.75
+800.91 , 3721.16 , 349.48
+800.91 , 4059.45 , 381.32
+800.91 , 4397.74 , 413.28
+800.91 , 4736.03 , 445.36
+800.91 , 5074.31 , 477.54
+800.91 , 5412.60 , 509.85
+800.91 , 5750.89 , 542.27
+800.91 , 6089.18 , 574.80
+800.91 , 6427.46 , 607.45
+800.91 , 6765.75 , 640.21
+889.90 , -7190.72 , -597.26
+889.90 , -6831.19 , -568.28
+889.90 , -6471.65 , -539.16
+889.90 , -6112.11 , -509.90
+889.90 , -5752.58 , -480.50
+889.90 , -5393.04 , -450.96
+889.90 , -5033.51 , -421.28
+889.90 , -4673.97 , -391.47
+889.90 , -4314.43 , -361.52
+889.90 , -3954.90 , -331.43
+889.90 , -3595.36 , -301.20
+889.90 , -3235.82 , -270.83
+889.90 , -2876.29 , -240.33
+889.90 , -2516.75 , -209.68
+889.90 , -2157.22 , -178.90
+889.90 , -1797.68 , -147.97
+889.90 , -1438.14 , -116.90
+889.90 , -1078.61 , -85.66
+889.90 , -719.07 , -54.21
+889.90 , -359.54 , -22.23
+889.90 , -71.91 , 0.00
+889.90 , 67.66 , 13.60
+889.90 , 338.29 , 42.20
+889.90 , 676.58 , 76.58
+889.90 , 1014.86 , 110.92
+889.90 , 1353.15 , 145.34
+889.90 , 1691.44 , 179.88
+889.90 , 2029.73 , 214.55
+889.90 , 2368.01 , 249.35
+889.90 , 2706.30 , 284.29
+889.90 , 3044.59 , 319.36
+889.90 , 3382.88 , 354.57
+889.90 , 3721.16 , 389.92
+889.90 , 4059.45 , 425.41
+889.90 , 4397.74 , 461.03
+889.90 , 4736.03 , 496.79
+889.90 , 5074.31 , 532.69
+889.90 , 5412.60 , 568.73
+889.90 , 5750.89 , 604.90
+889.90 , 6089.18 , 641.21
+889.90 , 6427.46 , 677.66
+889.90 , 6765.75 , 714.24
+978.89 , -7190.72 , -653.54
+978.89 , -6831.19 , -621.88
+978.89 , -6471.65 , -590.05
+978.89 , -6112.11 , -558.06
+978.89 , -5752.58 , -525.90
+978.89 , -5393.04 , -493.58
+978.89 , -5033.51 , -461.09
+978.89 , -4673.97 , -428.44
+978.89 , -4314.43 , -395.63
+978.89 , -3954.90 , -362.65
+978.89 , -3595.36 , -329.51
+978.89 , -3235.82 , -296.21
+978.89 , -2876.29 , -262.74
+978.89 , -2516.75 , -229.11
+978.89 , -2157.22 , -195.31
+978.89 , -1797.68 , -161.34
+978.89 , -1438.14 , -127.18
+978.89 , -1078.61 , -92.83
+978.89 , -719.07 , -58.20
+978.89 , -359.54 , -22.82
+978.89 , -71.91 , 0.00
+978.89 , 67.66 , 15.79
+978.89 , 338.29 , 47.58
+978.89 , 676.58 , 85.48
+978.89 , 1014.86 , 123.30
+978.89 , 1353.15 , 161.22
+978.89 , 1691.44 , 199.26
+978.89 , 2029.73 , 237.46
+978.89 , 2368.01 , 275.81
+978.89 , 2706.30 , 314.32
+978.89 , 3044.59 , 352.99
+978.89 , 3382.88 , 391.83
+978.89 , 3721.16 , 430.82
+978.89 , 4059.45 , 469.98
+978.89 , 4397.74 , 509.30
+978.89 , 4736.03 , 548.78
+978.89 , 5074.31 , 588.42
+978.89 , 5412.60 , 628.23
+978.89 , 5750.89 , 668.20
+978.89 , 6089.18 , 708.32
+978.89 , 6427.46 , 748.61
+978.89 , 6765.75 , 789.06
+1067.88 , -7190.72 , -708.97
+1067.88 , -6831.19 , -674.68
+1067.88 , -6471.65 , -640.19
+1067.88 , -6112.11 , -605.51
+1067.88 , -5752.58 , -570.63
+1067.88 , -5393.04 , -535.56
+1067.88 , -5033.51 , -500.30
+1067.88 , -4673.97 , -464.85
+1067.88 , -4314.43 , -429.21
+1067.88 , -3954.90 , -393.37
+1067.88 , -3595.36 , -357.35
+1067.88 , -3235.82 , -321.13
+1067.88 , -2876.29 , -284.71
+1067.88 , -2516.75 , -248.11
+1067.88 , -2157.22 , -211.31
+1067.88 , -1797.68 , -174.30
+1067.88 , -1438.14 , -137.08
+1067.88 , -1078.61 , -99.61
+1067.88 , -719.07 , -61.78
+1067.88 , -359.54 , -22.86
+1067.88 , -71.91 , 0.00
+1067.88 , 67.66 , 18.17
+1067.88 , 338.29 , 53.24
+1067.88 , 676.58 , 94.71
+1067.88 , 1014.86 , 136.03
+1067.88 , 1353.15 , 177.45
+1067.88 , 1691.44 , 219.01
+1067.88 , 2029.73 , 260.75
+1067.88 , 2368.01 , 302.67
+1067.88 , 2706.30 , 344.78
+1067.88 , 3044.59 , 387.07
+1067.88 , 3382.88 , 429.54
+1067.88 , 3721.16 , 472.21
+1067.88 , 4059.45 , 515.06
+1067.88 , 4397.74 , 558.11
+1067.88 , 4736.03 , 601.34
+1067.88 , 5074.31 , 644.76
+1067.88 , 5412.60 , 688.37
+1067.88 , 5750.89 , 732.17
+1067.88 , 6089.18 , 776.15
+1067.88 , 6427.46 , 820.33
+1067.88 , 6765.75 , 864.69
+1156.87 , -7190.72 , -763.53
+1156.87 , -6831.19 , -726.65
+1156.87 , -6471.65 , -689.55
+1156.87 , -6112.11 , -652.22
+1156.87 , -5752.58 , -614.67
+1156.87 , -5393.04 , -576.89
+1156.87 , -5033.51 , -538.89
+1156.87 , -4673.97 , -500.67
+1156.87 , -4314.43 , -462.22
+1156.87 , -3954.90 , -423.56
+1156.87 , -3595.36 , -384.67
+1156.87 , -3235.82 , -345.56
+1156.87 , -2876.29 , -306.22
+1156.87 , -2516.75 , -266.66
+1156.87 , -2157.22 , -226.86
+1156.87 , -1797.68 , -186.83
+1156.87 , -1438.14 , -146.54
+1156.87 , -1078.61 , -105.95
+1156.87 , -719.07 , -64.90
+1156.87 , -359.54 , -22.24
+1156.87 , -71.91 , 0.00
+1156.87 , 67.66 , 20.74
+1156.87 , 338.29 , 59.20
+1156.87 , 676.58 , 104.27
+1156.87 , 1014.86 , 149.12
+1156.87 , 1353.15 , 194.05
+1156.87 , 1691.44 , 239.16
+1156.87 , 2029.73 , 284.45
+1156.87 , 2368.01 , 329.96
+1156.87 , 2706.30 , 375.67
+1156.87 , 3044.59 , 421.60
+1156.87 , 3382.88 , 467.75
+1156.87 , 3721.16 , 514.11
+1156.87 , 4059.45 , 560.69
+1156.87 , 4397.74 , 607.48
+1156.87 , 4736.03 , 654.50
+1156.87 , 5074.31 , 701.73
+1156.87 , 5412.60 , 749.18
+1156.87 , 5750.89 , 796.84
+1156.87 , 6089.18 , 844.73
+1156.87 , 6427.46 , 892.83
+1156.87 , 6765.75 , 941.14
+1245.86 , -7190.72 , -817.17
+1245.86 , -6831.19 , -777.76
+1245.86 , -6471.65 , -738.08
+1245.86 , -6112.11 , -698.15
+1245.86 , -5752.58 , -657.96
+1245.86 , -5393.04 , -617.52
+1245.86 , -5033.51 , -576.82
+1245.86 , -4673.97 , -535.86
+1245.86 , -4314.43 , -494.65
+1245.86 , -3954.90 , -453.18
+1245.86 , -3595.36 , -411.45
+1245.86 , -3235.82 , -369.47
+1245.86 , -2876.29 , -327.22
+1245.86 , -2516.75 , -284.72
+1245.86 , -2157.22 , -241.95
+1245.86 , -1797.68 , -198.90
+1245.86 , -1438.14 , -155.54
+1245.86 , -1078.61 , -111.82
+1245.86 , -719.07 , -67.51
+1245.86 , -359.54 , -20.80
+1245.86 , -71.91 , 0.00
+1245.86 , 67.66 , 23.52
+1245.86 , 338.29 , 65.48
+1245.86 , 676.58 , 114.20
+1245.86 , 1014.86 , 162.59
+1245.86 , 1353.15 , 211.06
+1245.86 , 1691.44 , 259.72
+1245.86 , 2029.73 , 308.59
+1245.86 , 2368.01 , 357.69
+1245.86 , 2706.30 , 407.04
+1245.86 , 3044.59 , 456.62
+1245.86 , 3382.88 , 506.46
+1245.86 , 3721.16 , 556.54
+1245.86 , 4059.45 , 606.87
+1245.86 , 4397.74 , 657.45
+1245.86 , 4736.03 , 708.28
+1245.86 , 5074.31 , 759.35
+1245.86 , 5412.60 , 810.68
+1245.86 , 5750.89 , 862.25
+1245.86 , 6089.18 , 914.07
+1245.86 , 6427.46 , 966.13
+1245.86 , 6765.75 , 1018.44
+1334.85 , -7190.72 , -869.86
+1334.85 , -6831.19 , -827.96
+1334.85 , -6471.65 , -785.77
+1334.85 , -6112.11 , -743.28
+1334.85 , -5752.58 , -700.50
+1334.85 , -5393.04 , -657.42
+1334.85 , -5033.51 , -614.05
+1334.85 , -4673.97 , -570.39
+1334.85 , -4314.43 , -526.44
+1334.85 , -3954.90 , -482.19
+1334.85 , -3595.36 , -437.65
+1334.85 , -3235.82 , -392.82
+1334.85 , -2876.29 , -347.69
+1334.85 , -2516.75 , -302.26
+1334.85 , -2157.22 , -256.52
+1334.85 , -1797.68 , -210.46
+1334.85 , -1438.14 , -164.04
+1334.85 , -1078.61 , -117.17
+1334.85 , -719.07 , -69.54
+1334.85 , -359.54 , -18.27
+1334.85 , -71.91 , 0.00
+1334.85 , 67.66 , 26.49
+1334.85 , 338.29 , 72.10
+1334.85 , 676.58 , 124.50
+1334.85 , 1014.86 , 176.46
+1334.85 , 1353.15 , 228.49
+1334.85 , 1691.44 , 280.71
+1334.85 , 2029.73 , 333.18
+1334.85 , 2368.01 , 385.90
+1334.85 , 2706.30 , 438.89
+1334.85 , 3044.59 , 492.16
+1334.85 , 3382.88 , 545.71
+1334.85 , 3721.16 , 599.54
+1334.85 , 4059.45 , 653.64
+1334.85 , 4397.74 , 708.03
+1334.85 , 4736.03 , 762.71
+1334.85 , 5074.31 , 817.66
+1334.85 , 5412.60 , 872.89
+1334.85 , 5750.89 , 928.41
+1334.85 , 6089.18 , 984.20
+1334.85 , 6427.46 , 1040.27
+1334.85 , 6765.75 , 1096.63
+1423.84 , -7190.72 , -921.56
+1423.84 , -6831.19 , -877.23
+1423.84 , -6471.65 , -832.56
+1423.84 , -6112.11 , -787.56
+1423.84 , -5752.58 , -742.22
+1423.84 , -5393.04 , -696.56
+1423.84 , -5033.51 , -650.56
+1423.84 , -4673.97 , -604.23
+1423.84 , -4314.43 , -557.56
+1423.84 , -3954.90 , -510.57
+1423.84 , -3595.36 , -463.24
+1423.84 , -3235.82 , -415.58
+1423.84 , -2876.29 , -367.58
+1423.84 , -2516.75 , -319.24
+1423.84 , -2157.22 , -270.55
+1423.84 , -1797.68 , -221.48
+1423.84 , -1438.14 , -171.99
+1423.84 , -1078.61 , -121.95
+1423.84 , -719.07 , -70.93
+1423.84 , -359.54 , -14.10
+1423.84 , -71.91 , 0.00
+1423.84 , 67.66 , 29.68
+1423.84 , 338.29 , 79.05
+1423.84 , 676.58 , 135.20
+1423.84 , 1014.86 , 190.76
+1423.84 , 1353.15 , 246.36
+1423.84 , 1691.44 , 302.17
+1423.84 , 2029.73 , 358.24
+1423.84 , 2368.01 , 414.60
+1423.84 , 2706.30 , 471.27
+1423.84 , 3044.59 , 528.24
+1423.84 , 3382.88 , 585.52
+1423.84 , 3721.16 , 643.12
+1423.84 , 4059.45 , 701.03
+1423.84 , 4397.74 , 759.26
+1423.84 , 4736.03 , 817.80
+1423.84 , 5074.31 , 876.66
+1423.84 , 5412.60 , 935.84
+1423.84 , 5750.89 , 995.34
+1423.84 , 6089.18 , 1055.15
+1423.84 , 6427.46 , 1115.27
+1423.84 , 6765.75 , 1175.71
+1512.83 , -7190.72 , -972.24
+1512.83 , -6831.19 , -925.52
+1512.83 , -6471.65 , -878.43
+1512.83 , -6112.11 , -830.96
+1512.83 , -5752.58 , -783.11
+1512.83 , -5393.04 , -734.89
+1512.83 , -5033.51 , -686.30
+1512.83 , -4673.97 , -637.33
+1512.83 , -4314.43 , -587.99
+1512.83 , -3954.90 , -538.28
+1512.83 , -3595.36 , -488.19
+1512.83 , -3235.82 , -437.72
+1512.83 , -2876.29 , -386.87
+1512.83 , -2516.75 , -335.63
+1512.83 , -2157.22 , -283.99
+1512.83 , -1797.68 , -231.92
+1512.83 , -1438.14 , -179.35
+1512.83 , -1078.61 , -126.12
+1512.83 , -719.07 , -71.60
+1512.83 , -359.54 , -6.45
+1512.83 , -71.91 , 0.00
+1512.83 , 67.66 , 33.08
+1512.83 , 338.29 , 86.37
+1512.83 , 676.58 , 146.31
+1512.83 , 1014.86 , 205.50
+1512.83 , 1353.15 , 264.70
+1512.83 , 1691.44 , 324.11
+1512.83 , 2029.73 , 383.81
+1512.83 , 2368.01 , 443.83
+1512.83 , 2706.30 , 504.18
+1512.83 , 3044.59 , 564.87
+1512.83 , 3382.88 , 625.91
+1512.83 , 3721.16 , 687.30
+1512.83 , 4059.45 , 749.05
+1512.83 , 4397.74 , 811.14
+1512.83 , 4736.03 , 873.59
+1512.83 , 5074.31 , 936.40
+1512.83 , 5412.60 , 999.56
+1512.83 , 5750.89 , 1063.07
+1512.83 , 6089.18 , 1126.93
+1512.83 , 6427.46 , 1191.14
+1512.83 , 6765.75 , 1255.71
+1601.82 , -7190.72 , -1021.86
+1601.82 , -6831.19 , -972.81
+1601.82 , -6471.65 , -923.33
+1601.82 , -6112.11 , -873.44
+1601.82 , -5752.58 , -823.13
+1601.82 , -5393.04 , -772.39
+1601.82 , -5033.51 , -721.24
+1601.82 , -4673.97 , -669.67
+1601.82 , -4314.43 , -617.68
+1601.82 , -3954.90 , -565.27
+1601.82 , -3595.36 , -512.45
+1601.82 , -3235.82 , -459.19
+1601.82 , -2876.29 , -405.51
+1601.82 , -2516.75 , -351.39
+1601.82 , -2157.22 , -296.81
+1601.82 , -1797.68 , -241.73
+1601.82 , -1438.14 , -186.07
+1601.82 , -1078.61 , -129.61
+1601.82 , -719.07 , -71.46
+1601.82 , -359.54 , 0.00
+1601.82 , -71.91 , 0.00
+1601.82 , 67.66 , 36.70
+1601.82 , 338.29 , 94.04
+1601.82 , 676.58 , 157.85
+1601.82 , 1014.86 , 220.70
+1601.82 , 1353.15 , 283.52
+1601.82 , 1691.44 , 346.56
+1601.82 , 2029.73 , 409.90
+1601.82 , 2368.01 , 473.59
+1601.82 , 2706.30 , 537.65
+1601.82 , 3044.59 , 602.09
+1601.82 , 3382.88 , 666.91
+1601.82 , 3721.16 , 732.12
+1601.82 , 4059.45 , 797.72
+1601.82 , 4397.74 , 863.72
+1601.82 , 4736.03 , 930.10
+1601.82 , 5074.31 , 996.88
+1601.82 , 5412.60 , 1064.05
+1601.82 , 5750.89 , 1131.62
+1601.82 , 6089.18 , 1199.57
+1601.82 , 6427.46 , 1267.92
+1601.82 , 6765.75 , 1336.65
+1690.81 , -7190.72 , -1070.37
+1690.81 , -6831.19 , -1019.04
+1690.81 , -6471.65 , -967.24
+1690.81 , -6112.11 , -914.96
+1690.81 , -5752.58 , -862.23
+1690.81 , -5393.04 , -809.02
+1690.81 , -5033.51 , -755.35
+1690.81 , -4673.97 , -701.21
+1690.81 , -4314.43 , -646.60
+1690.81 , -3954.90 , -591.53
+1690.81 , -3595.36 , -535.99
+1690.81 , -3235.82 , -479.97
+1690.81 , -2876.29 , -423.47
+1690.81 , -2516.75 , -366.48
+1690.81 , -2157.22 , -308.96
+1690.81 , -1797.68 , -250.88
+1690.81 , -1438.14 , -192.11
+1690.81 , -1078.61 , -132.36
+1690.81 , -719.07 , -70.38
+1690.81 , -359.54 , 0.00
+1690.81 , -71.91 , 0.00
+1690.81 , 67.66 , 40.53
+1690.81 , 338.29 , 102.10
+1690.81 , 676.58 , 169.83
+1690.81 , 1014.86 , 236.37
+1690.81 , 1353.15 , 302.84
+1690.81 , 1691.44 , 369.53
+1690.81 , 2029.73 , 436.54
+1690.81 , 2368.01 , 503.92
+1690.81 , 2706.30 , 571.71
+1690.81 , 3044.59 , 639.91
+1690.81 , 3382.88 , 708.54
+1690.81 , 3721.16 , 777.59
+1690.81 , 4059.45 , 847.08
+1690.81 , 4397.74 , 917.00
+1690.81 , 4736.03 , 987.35
+1690.81 , 5074.31 , 1058.14
+1690.81 , 5412.60 , 1129.36
+1690.81 , 5750.89 , 1201.01
+1690.81 , 6089.18 , 1273.09
+1690.81 , 6427.46 , 1345.61
+1690.81 , 6765.75 , 1418.56
+1779.80 , -7190.72 , -1117.74
+1779.80 , -6831.19 , -1064.18
+1779.80 , -6471.65 , -1010.10
+1779.80 , -6112.11 , -955.49
+1779.80 , -5752.58 , -900.37
+1779.80 , -5393.04 , -844.73
+1779.80 , -5033.51 , -788.58
+1779.80 , -4673.97 , -731.90
+1779.80 , -4314.43 , -674.71
+1779.80 , -3954.90 , -617.00
+1779.80 , -3595.36 , -558.77
+1779.80 , -3235.82 , -500.01
+1779.80 , -2876.29 , -440.71
+1779.80 , -2516.75 , -380.85
+1779.80 , -2157.22 , -320.40
+1779.80 , -1797.68 , -259.31
+1779.80 , -1438.14 , -197.41
+1779.80 , -1078.61 , -134.30
+1779.80 , -719.07 , -68.24
+1779.80 , -359.54 , 0.00
+1779.80 , -71.91 , 0.00
+1779.80 , 67.66 , 44.59
+1779.80 , 338.29 , 110.53
+1779.80 , 676.58 , 182.27
+1779.80 , 1014.86 , 252.55
+1779.80 , 1353.15 , 322.69
+1779.80 , 1691.44 , 393.04
+1779.80 , 2029.73 , 463.74
+1779.80 , 2368.01 , 534.84
+1779.80 , 2706.30 , 606.37
+1779.80 , 3044.59 , 678.37
+1779.80 , 3382.88 , 750.82
+1779.80 , 3721.16 , 823.74
+1779.80 , 4059.45 , 897.14
+1779.80 , 4397.74 , 971.01
+1779.80 , 4736.03 , 1045.36
+1779.80 , 5074.31 , 1120.19
+1779.80 , 5412.60 , 1195.49
+1779.80 , 5750.89 , 1271.27
+1779.80 , 6089.18 , 1347.52
+1779.80 , 6427.46 , 1424.25
+1779.80 , 6765.75 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_3.viepco b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..0bcfef3ae913c68f305349289ee722f6d8f67f8f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -4193.88 , 0.00
+0.00 , -3984.18 , 0.00
+0.00 , -3774.49 , 0.00
+0.00 , -3564.80 , 0.00
+0.00 , -3355.10 , 0.00
+0.00 , -3145.41 , 0.00
+0.00 , -2935.71 , -0.13
+0.00 , -2726.02 , -0.66
+0.00 , -2516.33 , -0.98
+0.00 , -2306.63 , -1.19
+0.00 , -2096.94 , -1.32
+0.00 , -1887.24 , -1.38
+0.00 , -1677.55 , -1.39
+0.00 , -1467.86 , -1.35
+0.00 , -1258.16 , -1.26
+0.00 , -1048.47 , -1.13
+0.00 , -838.78 , -0.97
+0.00 , -629.08 , -0.77
+0.00 , -419.39 , -0.53
+0.00 , -209.69 , -0.27
+0.00 , -41.94 , -0.02
+0.00 , 40.28 , 0.13
+0.00 , 201.39 , 0.56
+0.00 , 402.78 , 1.12
+0.00 , 604.17 , 1.70
+0.00 , 805.56 , 2.31
+0.00 , 1006.95 , 2.93
+0.00 , 1208.34 , 3.58
+0.00 , 1409.73 , 4.25
+0.00 , 1611.12 , 4.93
+0.00 , 1812.51 , 5.64
+0.00 , 2013.90 , 6.37
+0.00 , 2215.29 , 7.12
+0.00 , 2416.68 , 7.88
+0.00 , 2618.07 , 8.67
+0.00 , 2819.46 , 9.47
+0.00 , 3020.85 , 10.29
+0.00 , 3222.24 , 11.13
+0.00 , 3423.63 , 11.99
+0.00 , 3625.02 , 12.87
+0.00 , 3826.41 , 13.76
+0.00 , 4027.80 , 14.67
+15.10 , -4193.88 , 0.00
+15.10 , -3984.18 , 0.00
+15.10 , -3774.49 , 0.00
+15.10 , -3564.80 , 0.00
+15.10 , -3355.10 , 0.00
+15.10 , -3145.41 , 0.00
+15.10 , -2935.71 , -0.50
+15.10 , -2726.02 , -0.84
+15.10 , -2516.33 , -1.04
+15.10 , -2306.63 , -1.16
+15.10 , -2096.94 , -1.22
+15.10 , -1887.24 , -1.24
+15.10 , -1677.55 , -1.21
+15.10 , -1467.86 , -1.15
+15.10 , -1258.16 , -1.06
+15.10 , -1048.47 , -0.94
+15.10 , -838.78 , -0.80
+15.10 , -629.08 , -0.62
+15.10 , -419.39 , -0.43
+15.10 , -209.69 , -0.21
+15.10 , -41.94 , -0.02
+15.10 , 40.28 , 0.10
+15.10 , 201.39 , 0.43
+15.10 , 402.78 , 0.85
+15.10 , 604.17 , 1.30
+15.10 , 805.56 , 1.75
+15.10 , 1006.95 , 2.23
+15.10 , 1208.34 , 2.71
+15.10 , 1409.73 , 3.21
+15.10 , 1611.12 , 3.73
+15.10 , 1812.51 , 4.26
+15.10 , 2013.90 , 4.80
+15.10 , 2215.29 , 5.36
+15.10 , 2416.68 , 5.93
+15.10 , 2618.07 , 6.52
+15.10 , 2819.46 , 7.12
+15.10 , 3020.85 , 7.73
+15.10 , 3222.24 , 8.35
+15.10 , 3423.63 , 8.99
+15.10 , 3625.02 , 9.64
+15.10 , 3826.41 , 10.30
+15.10 , 4027.80 , 10.98
+151.02 , -4193.88 , -58.10
+151.02 , -3984.18 , -55.37
+151.02 , -3774.49 , -52.62
+151.02 , -3564.80 , -49.85
+151.02 , -3355.10 , -47.06
+151.02 , -3145.41 , -44.25
+151.02 , -2935.71 , -41.42
+151.02 , -2726.02 , -38.57
+151.02 , -2516.33 , -35.70
+151.02 , -2306.63 , -32.81
+151.02 , -2096.94 , -29.90
+151.02 , -1887.24 , -26.98
+151.02 , -1677.55 , -24.03
+151.02 , -1467.86 , -21.07
+151.02 , -1258.16 , -18.08
+151.02 , -1048.47 , -15.08
+151.02 , -838.78 , -12.06
+151.02 , -629.08 , -9.02
+151.02 , -419.39 , -5.96
+151.02 , -209.69 , -2.88
+151.02 , -41.94 , -0.37
+151.02 , 40.28 , 0.90
+151.02 , 201.39 , 3.68
+151.02 , 402.78 , 7.16
+151.02 , 604.17 , 10.66
+151.02 , 805.56 , 14.17
+151.02 , 1006.95 , 17.71
+151.02 , 1208.34 , 21.26
+151.02 , 1409.73 , 24.84
+151.02 , 1611.12 , 28.43
+151.02 , 1812.51 , 32.04
+151.02 , 2013.90 , 35.67
+151.02 , 2215.29 , 39.32
+151.02 , 2416.68 , 42.99
+151.02 , 2618.07 , 46.68
+151.02 , 2819.46 , 50.38
+151.02 , 3020.85 , 54.11
+151.02 , 3222.24 , 57.85
+151.02 , 3423.63 , 61.61
+151.02 , 3625.02 , 65.39
+151.02 , 3826.41 , 69.19
+151.02 , 4027.80 , 73.01
+302.05 , -4193.88 , -120.57
+302.05 , -3984.18 , -114.73
+302.05 , -3774.49 , -108.87
+302.05 , -3564.80 , -102.99
+302.05 , -3355.10 , -97.08
+302.05 , -3145.41 , -91.15
+302.05 , -2935.71 , -85.20
+302.05 , -2726.02 , -79.23
+302.05 , -2516.33 , -73.23
+302.05 , -2306.63 , -67.21
+302.05 , -2096.94 , -61.17
+302.05 , -1887.24 , -55.10
+302.05 , -1677.55 , -49.01
+302.05 , -1467.86 , -42.90
+302.05 , -1258.16 , -36.77
+302.05 , -1048.47 , -30.61
+302.05 , -838.78 , -24.43
+302.05 , -629.08 , -18.23
+302.05 , -419.39 , -12.01
+302.05 , -209.69 , -5.76
+302.05 , -41.94 , -0.66
+302.05 , 40.28 , 1.84
+302.05 , 201.39 , 7.35
+302.05 , 402.78 , 14.22
+302.05 , 604.17 , 21.11
+302.05 , 805.56 , 28.02
+302.05 , 1006.95 , 34.96
+302.05 , 1208.34 , 41.92
+302.05 , 1409.73 , 48.90
+302.05 , 1611.12 , 55.90
+302.05 , 1812.51 , 62.93
+302.05 , 2013.90 , 69.98
+302.05 , 2215.29 , 77.05
+302.05 , 2416.68 , 84.15
+302.05 , 2618.07 , 91.27
+302.05 , 2819.46 , 98.41
+302.05 , 3020.85 , 105.58
+302.05 , 3222.24 , 112.76
+302.05 , 3423.63 , 119.97
+302.05 , 3625.02 , 127.21
+302.05 , 3826.41 , 134.46
+302.05 , 4027.80 , 141.74
+453.07 , -4193.88 , -182.44
+453.07 , -3984.18 , -173.55
+453.07 , -3774.49 , -164.62
+453.07 , -3564.80 , -155.67
+453.07 , -3355.10 , -146.69
+453.07 , -3145.41 , -137.68
+453.07 , -2935.71 , -128.65
+453.07 , -2726.02 , -119.58
+453.07 , -2516.33 , -110.49
+453.07 , -2306.63 , -101.36
+453.07 , -2096.94 , -92.21
+453.07 , -1887.24 , -83.03
+453.07 , -1677.55 , -73.82
+453.07 , -1467.86 , -64.58
+453.07 , -1258.16 , -55.31
+453.07 , -1048.47 , -46.02
+453.07 , -838.78 , -36.70
+453.07 , -629.08 , -27.34
+453.07 , -419.39 , -17.96
+453.07 , -209.69 , -8.54
+453.07 , -41.94 , -0.79
+453.07 , 40.28 , 2.86
+453.07 , 201.39 , 11.12
+453.07 , 402.78 , 21.39
+453.07 , 604.17 , 31.68
+453.07 , 805.56 , 41.99
+453.07 , 1006.95 , 52.34
+453.07 , 1208.34 , 62.71
+453.07 , 1409.73 , 73.12
+453.07 , 1611.12 , 83.55
+453.07 , 1812.51 , 94.01
+453.07 , 2013.90 , 104.50
+453.07 , 2215.29 , 115.02
+453.07 , 2416.68 , 125.57
+453.07 , 2618.07 , 136.15
+453.07 , 2819.46 , 146.76
+453.07 , 3020.85 , 157.40
+453.07 , 3222.24 , 168.06
+453.07 , 3423.63 , 178.76
+453.07 , 3625.02 , 189.48
+453.07 , 3826.41 , 200.23
+453.07 , 4027.80 , 211.02
+604.09 , -4193.88 , -243.71
+604.09 , -3984.18 , -231.81
+604.09 , -3774.49 , -219.87
+604.09 , -3564.80 , -207.89
+604.09 , -3355.10 , -195.88
+604.09 , -3145.41 , -183.83
+604.09 , -2935.71 , -171.74
+604.09 , -2726.02 , -159.61
+604.09 , -2516.33 , -147.45
+604.09 , -2306.63 , -135.25
+604.09 , -2096.94 , -123.01
+604.09 , -1887.24 , -110.74
+604.09 , -1677.55 , -98.43
+604.09 , -1467.86 , -86.08
+604.09 , -1258.16 , -73.70
+604.09 , -1048.47 , -61.27
+604.09 , -838.78 , -48.82
+604.09 , -629.08 , -36.32
+604.09 , -419.39 , -23.78
+604.09 , -209.69 , -11.19
+604.09 , -41.94 , -0.63
+604.09 , 40.28 , 3.98
+604.09 , 201.39 , 15.01
+604.09 , 402.78 , 28.68
+604.09 , 604.17 , 42.37
+604.09 , 805.56 , 56.10
+604.09 , 1006.95 , 69.87
+604.09 , 1208.34 , 83.67
+604.09 , 1409.73 , 97.52
+604.09 , 1611.12 , 111.40
+604.09 , 1812.51 , 125.31
+604.09 , 2013.90 , 139.27
+604.09 , 2215.29 , 153.26
+604.09 , 2416.68 , 167.29
+604.09 , 2618.07 , 181.36
+604.09 , 2819.46 , 195.46
+604.09 , 3020.85 , 209.61
+604.09 , 3222.24 , 223.79
+604.09 , 3423.63 , 238.01
+604.09 , 3625.02 , 252.26
+604.09 , 3826.41 , 266.56
+604.09 , 4027.80 , 280.89
+755.11 , -4193.88 , -304.37
+755.11 , -3984.18 , -289.50
+755.11 , -3774.49 , -274.59
+755.11 , -3564.80 , -259.63
+755.11 , -3355.10 , -244.61
+755.11 , -3145.41 , -229.56
+755.11 , -2935.71 , -214.45
+755.11 , -2726.02 , -199.30
+755.11 , -2516.33 , -184.10
+755.11 , -2306.63 , -168.85
+755.11 , -2096.94 , -153.55
+755.11 , -1887.24 , -138.20
+755.11 , -1677.55 , -122.81
+755.11 , -1467.86 , -107.37
+755.11 , -1258.16 , -91.88
+755.11 , -1048.47 , -76.35
+755.11 , -838.78 , -60.76
+755.11 , -629.08 , -45.13
+755.11 , -419.39 , -29.44
+755.11 , -209.69 , -13.67
+755.11 , -41.94 , 0.00
+755.11 , 40.28 , 5.21
+755.11 , 201.39 , 19.04
+755.11 , 402.78 , 36.13
+755.11 , 604.17 , 53.24
+755.11 , 805.56 , 70.39
+755.11 , 1006.95 , 87.59
+755.11 , 1208.34 , 104.83
+755.11 , 1409.73 , 122.13
+755.11 , 1611.12 , 139.47
+755.11 , 1812.51 , 156.87
+755.11 , 2013.90 , 174.31
+755.11 , 2215.29 , 191.80
+755.11 , 2416.68 , 209.33
+755.11 , 2618.07 , 226.92
+755.11 , 2819.46 , 244.56
+755.11 , 3020.85 , 262.24
+755.11 , 3222.24 , 279.97
+755.11 , 3423.63 , 297.76
+755.11 , 3625.02 , 315.58
+755.11 , 3826.41 , 333.46
+755.11 , 4027.80 , 351.39
+906.14 , -4193.88 , -364.37
+906.14 , -3984.18 , -346.59
+906.14 , -3774.49 , -328.74
+906.14 , -3564.80 , -310.84
+906.14 , -3355.10 , -292.87
+906.14 , -3145.41 , -274.84
+906.14 , -2935.71 , -256.75
+906.14 , -2726.02 , -238.60
+906.14 , -2516.33 , -220.39
+906.14 , -2306.63 , -202.12
+906.14 , -2096.94 , -183.79
+906.14 , -1887.24 , -165.40
+906.14 , -1677.55 , -146.94
+906.14 , -1467.86 , -128.43
+906.14 , -1258.16 , -109.85
+906.14 , -1048.47 , -91.21
+906.14 , -838.78 , -72.51
+906.14 , -629.08 , -53.75
+906.14 , -419.39 , -34.91
+906.14 , -209.69 , -15.95
+906.14 , -41.94 , 0.00
+906.14 , 40.28 , 6.58
+906.14 , 201.39 , 23.25
+906.14 , 402.78 , 43.76
+906.14 , 604.17 , 64.29
+906.14 , 805.56 , 84.87
+906.14 , 1006.95 , 105.52
+906.14 , 1208.34 , 126.22
+906.14 , 1409.73 , 146.98
+906.14 , 1611.12 , 167.81
+906.14 , 1812.51 , 188.70
+906.14 , 2013.90 , 209.65
+906.14 , 2215.29 , 230.66
+906.14 , 2416.68 , 251.73
+906.14 , 2618.07 , 272.87
+906.14 , 2819.46 , 294.07
+906.14 , 3020.85 , 315.33
+906.14 , 3222.24 , 336.65
+906.14 , 3423.63 , 358.03
+906.14 , 3625.02 , 379.47
+906.14 , 3826.41 , 400.98
+906.14 , 4027.80 , 422.54
+1057.16 , -4193.88 , -423.69
+1057.16 , -3984.18 , -403.04
+1057.16 , -3774.49 , -382.31
+1057.16 , -3564.80 , -361.50
+1057.16 , -3355.10 , -340.62
+1057.16 , -3145.41 , -319.66
+1057.16 , -2935.71 , -298.62
+1057.16 , -2726.02 , -277.51
+1057.16 , -2516.33 , -256.31
+1057.16 , -2306.63 , -235.05
+1057.16 , -2096.94 , -213.70
+1057.16 , -1887.24 , -192.28
+1057.16 , -1677.55 , -170.79
+1057.16 , -1467.86 , -149.21
+1057.16 , -1258.16 , -127.57
+1057.16 , -1048.47 , -105.84
+1057.16 , -838.78 , -84.03
+1057.16 , -629.08 , -62.14
+1057.16 , -419.39 , -40.16
+1057.16 , -209.69 , -18.00
+1057.16 , -41.94 , 0.00
+1057.16 , 40.28 , 8.09
+1057.16 , 201.39 , 27.64
+1057.16 , 402.78 , 51.59
+1057.16 , 604.17 , 75.56
+1057.16 , 805.56 , 99.58
+1057.16 , 1006.95 , 123.68
+1057.16 , 1208.34 , 147.86
+1057.16 , 1409.73 , 172.10
+1057.16 , 1611.12 , 196.43
+1057.16 , 1812.51 , 220.84
+1057.16 , 2013.90 , 245.32
+1057.16 , 2215.29 , 269.88
+1057.16 , 2416.68 , 294.51
+1057.16 , 2618.07 , 319.23
+1057.16 , 2819.46 , 344.02
+1057.16 , 3020.85 , 368.89
+1057.16 , 3222.24 , 393.83
+1057.16 , 3423.63 , 418.85
+1057.16 , 3625.02 , 443.95
+1057.16 , 3826.41 , 469.13
+1057.16 , 4027.80 , 494.38
+1208.18 , -4193.88 , -482.31
+1208.18 , -3984.18 , -458.83
+1208.18 , -3774.49 , -435.26
+1208.18 , -3564.80 , -411.59
+1208.18 , -3355.10 , -387.83
+1208.18 , -3145.41 , -363.97
+1208.18 , -2935.71 , -340.02
+1208.18 , -2726.02 , -315.97
+1208.18 , -2516.33 , -291.83
+1208.18 , -2306.63 , -267.59
+1208.18 , -2096.94 , -243.26
+1208.18 , -1887.24 , -218.84
+1208.18 , -1677.55 , -194.32
+1208.18 , -1467.86 , -169.71
+1208.18 , -1258.16 , -145.00
+1208.18 , -1048.47 , -120.19
+1208.18 , -838.78 , -95.29
+1208.18 , -629.08 , -70.28
+1208.18 , -419.39 , -45.14
+1208.18 , -209.69 , -19.76
+1208.18 , -41.94 , 0.00
+1208.18 , 40.28 , 9.76
+1208.18 , 201.39 , 32.25
+1208.18 , 402.78 , 59.66
+1208.18 , 604.17 , 87.07
+1208.18 , 805.56 , 114.55
+1208.18 , 1006.95 , 142.11
+1208.18 , 1208.34 , 169.77
+1208.18 , 1409.73 , 197.52
+1208.18 , 1611.12 , 225.37
+1208.18 , 1812.51 , 253.31
+1208.18 , 2013.90 , 281.34
+1208.18 , 2215.29 , 309.47
+1208.18 , 2416.68 , 337.70
+1208.18 , 2618.07 , 366.02
+1208.18 , 2819.46 , 394.44
+1208.18 , 3020.85 , 422.95
+1208.18 , 3222.24 , 451.56
+1208.18 , 3423.63 , 480.26
+1208.18 , 3625.02 , 509.05
+1208.18 , 3826.41 , 537.94
+1208.18 , 4027.80 , 566.93
+1359.21 , -4193.88 , -540.17
+1359.21 , -3984.18 , -513.92
+1359.21 , -3774.49 , -487.55
+1359.21 , -3564.80 , -461.06
+1359.21 , -3355.10 , -434.46
+1359.21 , -3145.41 , -407.75
+1359.21 , -2935.71 , -380.92
+1359.21 , -2726.02 , -353.97
+1359.21 , -2516.33 , -326.91
+1359.21 , -2306.63 , -299.73
+1359.21 , -2096.94 , -272.44
+1359.21 , -1887.24 , -245.03
+1359.21 , -1677.55 , -217.51
+1359.21 , -1467.86 , -189.87
+1359.21 , -1258.16 , -162.12
+1359.21 , -1048.47 , -134.25
+1359.21 , -838.78 , -106.26
+1359.21 , -629.08 , -78.13
+1359.21 , -419.39 , -49.84
+1359.21 , -209.69 , -21.19
+1359.21 , -41.94 , 0.00
+1359.21 , 40.28 , 11.59
+1359.21 , 201.39 , 37.10
+1359.21 , 402.78 , 67.98
+1359.21 , 604.17 , 98.85
+1359.21 , 805.56 , 129.79
+1359.21 , 1006.95 , 160.84
+1359.21 , 1208.34 , 191.99
+1359.21 , 1409.73 , 223.26
+1359.21 , 1611.12 , 254.64
+1359.21 , 1812.51 , 286.14
+1359.21 , 2013.90 , 317.75
+1359.21 , 2215.29 , 349.48
+1359.21 , 2416.68 , 381.32
+1359.21 , 2618.07 , 413.28
+1359.21 , 2819.46 , 445.36
+1359.21 , 3020.85 , 477.54
+1359.21 , 3222.24 , 509.85
+1359.21 , 3423.63 , 542.27
+1359.21 , 3625.02 , 574.80
+1359.21 , 3826.41 , 607.45
+1359.21 , 4027.80 , 640.21
+1510.23 , -4193.88 , -597.26
+1510.23 , -3984.18 , -568.28
+1510.23 , -3774.49 , -539.16
+1510.23 , -3564.80 , -509.90
+1510.23 , -3355.10 , -480.50
+1510.23 , -3145.41 , -450.96
+1510.23 , -2935.71 , -421.28
+1510.23 , -2726.02 , -391.47
+1510.23 , -2516.33 , -361.52
+1510.23 , -2306.63 , -331.43
+1510.23 , -2096.94 , -301.20
+1510.23 , -1887.24 , -270.83
+1510.23 , -1677.55 , -240.33
+1510.23 , -1467.86 , -209.68
+1510.23 , -1258.16 , -178.90
+1510.23 , -1048.47 , -147.97
+1510.23 , -838.78 , -116.90
+1510.23 , -629.08 , -85.66
+1510.23 , -419.39 , -54.21
+1510.23 , -209.69 , -22.23
+1510.23 , -41.94 , 0.00
+1510.23 , 40.28 , 13.60
+1510.23 , 201.39 , 42.20
+1510.23 , 402.78 , 76.58
+1510.23 , 604.17 , 110.92
+1510.23 , 805.56 , 145.34
+1510.23 , 1006.95 , 179.88
+1510.23 , 1208.34 , 214.55
+1510.23 , 1409.73 , 249.35
+1510.23 , 1611.12 , 284.29
+1510.23 , 1812.51 , 319.36
+1510.23 , 2013.90 , 354.57
+1510.23 , 2215.29 , 389.92
+1510.23 , 2416.68 , 425.41
+1510.23 , 2618.07 , 461.03
+1510.23 , 2819.46 , 496.79
+1510.23 , 3020.85 , 532.69
+1510.23 , 3222.24 , 568.73
+1510.23 , 3423.63 , 604.90
+1510.23 , 3625.02 , 641.21
+1510.23 , 3826.41 , 677.66
+1510.23 , 4027.80 , 714.24
+1661.25 , -4193.88 , -653.54
+1661.25 , -3984.18 , -621.88
+1661.25 , -3774.49 , -590.05
+1661.25 , -3564.80 , -558.06
+1661.25 , -3355.10 , -525.90
+1661.25 , -3145.41 , -493.58
+1661.25 , -2935.71 , -461.09
+1661.25 , -2726.02 , -428.44
+1661.25 , -2516.33 , -395.63
+1661.25 , -2306.63 , -362.65
+1661.25 , -2096.94 , -329.51
+1661.25 , -1887.24 , -296.21
+1661.25 , -1677.55 , -262.74
+1661.25 , -1467.86 , -229.11
+1661.25 , -1258.16 , -195.31
+1661.25 , -1048.47 , -161.34
+1661.25 , -838.78 , -127.18
+1661.25 , -629.08 , -92.83
+1661.25 , -419.39 , -58.20
+1661.25 , -209.69 , -22.82
+1661.25 , -41.94 , 0.00
+1661.25 , 40.28 , 15.79
+1661.25 , 201.39 , 47.58
+1661.25 , 402.78 , 85.48
+1661.25 , 604.17 , 123.30
+1661.25 , 805.56 , 161.22
+1661.25 , 1006.95 , 199.26
+1661.25 , 1208.34 , 237.46
+1661.25 , 1409.73 , 275.81
+1661.25 , 1611.12 , 314.32
+1661.25 , 1812.51 , 352.99
+1661.25 , 2013.90 , 391.83
+1661.25 , 2215.29 , 430.82
+1661.25 , 2416.68 , 469.98
+1661.25 , 2618.07 , 509.30
+1661.25 , 2819.46 , 548.78
+1661.25 , 3020.85 , 588.42
+1661.25 , 3222.24 , 628.23
+1661.25 , 3423.63 , 668.20
+1661.25 , 3625.02 , 708.32
+1661.25 , 3826.41 , 748.61
+1661.25 , 4027.80 , 789.06
+1812.27 , -4193.88 , -708.97
+1812.27 , -3984.18 , -674.68
+1812.27 , -3774.49 , -640.19
+1812.27 , -3564.80 , -605.51
+1812.27 , -3355.10 , -570.63
+1812.27 , -3145.41 , -535.56
+1812.27 , -2935.71 , -500.30
+1812.27 , -2726.02 , -464.85
+1812.27 , -2516.33 , -429.21
+1812.27 , -2306.63 , -393.37
+1812.27 , -2096.94 , -357.35
+1812.27 , -1887.24 , -321.13
+1812.27 , -1677.55 , -284.71
+1812.27 , -1467.86 , -248.11
+1812.27 , -1258.16 , -211.31
+1812.27 , -1048.47 , -174.30
+1812.27 , -838.78 , -137.08
+1812.27 , -629.08 , -99.61
+1812.27 , -419.39 , -61.78
+1812.27 , -209.69 , -22.86
+1812.27 , -41.94 , 0.00
+1812.27 , 40.28 , 18.17
+1812.27 , 201.39 , 53.24
+1812.27 , 402.78 , 94.71
+1812.27 , 604.17 , 136.03
+1812.27 , 805.56 , 177.45
+1812.27 , 1006.95 , 219.01
+1812.27 , 1208.34 , 260.75
+1812.27 , 1409.73 , 302.67
+1812.27 , 1611.12 , 344.78
+1812.27 , 1812.51 , 387.07
+1812.27 , 2013.90 , 429.54
+1812.27 , 2215.29 , 472.21
+1812.27 , 2416.68 , 515.06
+1812.27 , 2618.07 , 558.11
+1812.27 , 2819.46 , 601.34
+1812.27 , 3020.85 , 644.76
+1812.27 , 3222.24 , 688.37
+1812.27 , 3423.63 , 732.17
+1812.27 , 3625.02 , 776.15
+1812.27 , 3826.41 , 820.33
+1812.27 , 4027.80 , 864.69
+1963.30 , -4193.88 , -763.53
+1963.30 , -3984.18 , -726.65
+1963.30 , -3774.49 , -689.55
+1963.30 , -3564.80 , -652.22
+1963.30 , -3355.10 , -614.67
+1963.30 , -3145.41 , -576.89
+1963.30 , -2935.71 , -538.89
+1963.30 , -2726.02 , -500.67
+1963.30 , -2516.33 , -462.22
+1963.30 , -2306.63 , -423.56
+1963.30 , -2096.94 , -384.67
+1963.30 , -1887.24 , -345.56
+1963.30 , -1677.55 , -306.22
+1963.30 , -1467.86 , -266.66
+1963.30 , -1258.16 , -226.86
+1963.30 , -1048.47 , -186.83
+1963.30 , -838.78 , -146.54
+1963.30 , -629.08 , -105.95
+1963.30 , -419.39 , -64.90
+1963.30 , -209.69 , -22.24
+1963.30 , -41.94 , 0.00
+1963.30 , 40.28 , 20.74
+1963.30 , 201.39 , 59.20
+1963.30 , 402.78 , 104.27
+1963.30 , 604.17 , 149.12
+1963.30 , 805.56 , 194.05
+1963.30 , 1006.95 , 239.16
+1963.30 , 1208.34 , 284.45
+1963.30 , 1409.73 , 329.96
+1963.30 , 1611.12 , 375.67
+1963.30 , 1812.51 , 421.60
+1963.30 , 2013.90 , 467.75
+1963.30 , 2215.29 , 514.11
+1963.30 , 2416.68 , 560.69
+1963.30 , 2618.07 , 607.48
+1963.30 , 2819.46 , 654.50
+1963.30 , 3020.85 , 701.73
+1963.30 , 3222.24 , 749.18
+1963.30 , 3423.63 , 796.84
+1963.30 , 3625.02 , 844.73
+1963.30 , 3826.41 , 892.83
+1963.30 , 4027.80 , 941.14
+2114.32 , -4193.88 , -817.17
+2114.32 , -3984.18 , -777.76
+2114.32 , -3774.49 , -738.08
+2114.32 , -3564.80 , -698.15
+2114.32 , -3355.10 , -657.96
+2114.32 , -3145.41 , -617.52
+2114.32 , -2935.71 , -576.82
+2114.32 , -2726.02 , -535.86
+2114.32 , -2516.33 , -494.65
+2114.32 , -2306.63 , -453.18
+2114.32 , -2096.94 , -411.45
+2114.32 , -1887.24 , -369.47
+2114.32 , -1677.55 , -327.22
+2114.32 , -1467.86 , -284.72
+2114.32 , -1258.16 , -241.95
+2114.32 , -1048.47 , -198.90
+2114.32 , -838.78 , -155.54
+2114.32 , -629.08 , -111.82
+2114.32 , -419.39 , -67.51
+2114.32 , -209.69 , -20.80
+2114.32 , -41.94 , 0.00
+2114.32 , 40.28 , 23.52
+2114.32 , 201.39 , 65.48
+2114.32 , 402.78 , 114.20
+2114.32 , 604.17 , 162.59
+2114.32 , 805.56 , 211.06
+2114.32 , 1006.95 , 259.72
+2114.32 , 1208.34 , 308.59
+2114.32 , 1409.73 , 357.69
+2114.32 , 1611.12 , 407.04
+2114.32 , 1812.51 , 456.62
+2114.32 , 2013.90 , 506.46
+2114.32 , 2215.29 , 556.54
+2114.32 , 2416.68 , 606.87
+2114.32 , 2618.07 , 657.45
+2114.32 , 2819.46 , 708.28
+2114.32 , 3020.85 , 759.35
+2114.32 , 3222.24 , 810.68
+2114.32 , 3423.63 , 862.25
+2114.32 , 3625.02 , 914.07
+2114.32 , 3826.41 , 966.13
+2114.32 , 4027.80 , 1018.44
+2265.34 , -4193.88 , -869.86
+2265.34 , -3984.18 , -827.96
+2265.34 , -3774.49 , -785.77
+2265.34 , -3564.80 , -743.28
+2265.34 , -3355.10 , -700.50
+2265.34 , -3145.41 , -657.42
+2265.34 , -2935.71 , -614.05
+2265.34 , -2726.02 , -570.39
+2265.34 , -2516.33 , -526.44
+2265.34 , -2306.63 , -482.19
+2265.34 , -2096.94 , -437.65
+2265.34 , -1887.24 , -392.82
+2265.34 , -1677.55 , -347.69
+2265.34 , -1467.86 , -302.26
+2265.34 , -1258.16 , -256.52
+2265.34 , -1048.47 , -210.46
+2265.34 , -838.78 , -164.04
+2265.34 , -629.08 , -117.17
+2265.34 , -419.39 , -69.54
+2265.34 , -209.69 , -18.27
+2265.34 , -41.94 , 0.00
+2265.34 , 40.28 , 26.49
+2265.34 , 201.39 , 72.10
+2265.34 , 402.78 , 124.50
+2265.34 , 604.17 , 176.46
+2265.34 , 805.56 , 228.49
+2265.34 , 1006.95 , 280.71
+2265.34 , 1208.34 , 333.18
+2265.34 , 1409.73 , 385.90
+2265.34 , 1611.12 , 438.89
+2265.34 , 1812.51 , 492.16
+2265.34 , 2013.90 , 545.71
+2265.34 , 2215.29 , 599.54
+2265.34 , 2416.68 , 653.64
+2265.34 , 2618.07 , 708.03
+2265.34 , 2819.46 , 762.71
+2265.34 , 3020.85 , 817.66
+2265.34 , 3222.24 , 872.89
+2265.34 , 3423.63 , 928.41
+2265.34 , 3625.02 , 984.20
+2265.34 , 3826.41 , 1040.27
+2265.34 , 4027.80 , 1096.63
+2416.37 , -4193.88 , -921.56
+2416.37 , -3984.18 , -877.23
+2416.37 , -3774.49 , -832.56
+2416.37 , -3564.80 , -787.56
+2416.37 , -3355.10 , -742.22
+2416.37 , -3145.41 , -696.56
+2416.37 , -2935.71 , -650.56
+2416.37 , -2726.02 , -604.23
+2416.37 , -2516.33 , -557.56
+2416.37 , -2306.63 , -510.57
+2416.37 , -2096.94 , -463.24
+2416.37 , -1887.24 , -415.58
+2416.37 , -1677.55 , -367.58
+2416.37 , -1467.86 , -319.24
+2416.37 , -1258.16 , -270.55
+2416.37 , -1048.47 , -221.48
+2416.37 , -838.78 , -171.99
+2416.37 , -629.08 , -121.95
+2416.37 , -419.39 , -70.93
+2416.37 , -209.69 , -14.10
+2416.37 , -41.94 , 0.00
+2416.37 , 40.28 , 29.68
+2416.37 , 201.39 , 79.05
+2416.37 , 402.78 , 135.20
+2416.37 , 604.17 , 190.76
+2416.37 , 805.56 , 246.36
+2416.37 , 1006.95 , 302.17
+2416.37 , 1208.34 , 358.24
+2416.37 , 1409.73 , 414.60
+2416.37 , 1611.12 , 471.27
+2416.37 , 1812.51 , 528.24
+2416.37 , 2013.90 , 585.52
+2416.37 , 2215.29 , 643.12
+2416.37 , 2416.68 , 701.03
+2416.37 , 2618.07 , 759.26
+2416.37 , 2819.46 , 817.80
+2416.37 , 3020.85 , 876.66
+2416.37 , 3222.24 , 935.84
+2416.37 , 3423.63 , 995.34
+2416.37 , 3625.02 , 1055.15
+2416.37 , 3826.41 , 1115.27
+2416.37 , 4027.80 , 1175.71
+2567.39 , -4193.88 , -972.24
+2567.39 , -3984.18 , -925.52
+2567.39 , -3774.49 , -878.43
+2567.39 , -3564.80 , -830.96
+2567.39 , -3355.10 , -783.11
+2567.39 , -3145.41 , -734.89
+2567.39 , -2935.71 , -686.30
+2567.39 , -2726.02 , -637.33
+2567.39 , -2516.33 , -587.99
+2567.39 , -2306.63 , -538.28
+2567.39 , -2096.94 , -488.19
+2567.39 , -1887.24 , -437.72
+2567.39 , -1677.55 , -386.87
+2567.39 , -1467.86 , -335.63
+2567.39 , -1258.16 , -283.99
+2567.39 , -1048.47 , -231.92
+2567.39 , -838.78 , -179.35
+2567.39 , -629.08 , -126.12
+2567.39 , -419.39 , -71.60
+2567.39 , -209.69 , -6.45
+2567.39 , -41.94 , 0.00
+2567.39 , 40.28 , 33.08
+2567.39 , 201.39 , 86.37
+2567.39 , 402.78 , 146.31
+2567.39 , 604.17 , 205.50
+2567.39 , 805.56 , 264.70
+2567.39 , 1006.95 , 324.11
+2567.39 , 1208.34 , 383.81
+2567.39 , 1409.73 , 443.83
+2567.39 , 1611.12 , 504.18
+2567.39 , 1812.51 , 564.87
+2567.39 , 2013.90 , 625.91
+2567.39 , 2215.29 , 687.30
+2567.39 , 2416.68 , 749.05
+2567.39 , 2618.07 , 811.14
+2567.39 , 2819.46 , 873.59
+2567.39 , 3020.85 , 936.40
+2567.39 , 3222.24 , 999.56
+2567.39 , 3423.63 , 1063.07
+2567.39 , 3625.02 , 1126.93
+2567.39 , 3826.41 , 1191.14
+2567.39 , 4027.80 , 1255.71
+2718.41 , -4193.88 , -1021.86
+2718.41 , -3984.18 , -972.81
+2718.41 , -3774.49 , -923.33
+2718.41 , -3564.80 , -873.44
+2718.41 , -3355.10 , -823.13
+2718.41 , -3145.41 , -772.39
+2718.41 , -2935.71 , -721.24
+2718.41 , -2726.02 , -669.67
+2718.41 , -2516.33 , -617.68
+2718.41 , -2306.63 , -565.27
+2718.41 , -2096.94 , -512.45
+2718.41 , -1887.24 , -459.19
+2718.41 , -1677.55 , -405.51
+2718.41 , -1467.86 , -351.39
+2718.41 , -1258.16 , -296.81
+2718.41 , -1048.47 , -241.73
+2718.41 , -838.78 , -186.07
+2718.41 , -629.08 , -129.61
+2718.41 , -419.39 , -71.46
+2718.41 , -209.69 , 0.00
+2718.41 , -41.94 , 0.00
+2718.41 , 40.28 , 36.70
+2718.41 , 201.39 , 94.04
+2718.41 , 402.78 , 157.85
+2718.41 , 604.17 , 220.70
+2718.41 , 805.56 , 283.52
+2718.41 , 1006.95 , 346.56
+2718.41 , 1208.34 , 409.90
+2718.41 , 1409.73 , 473.59
+2718.41 , 1611.12 , 537.65
+2718.41 , 1812.51 , 602.09
+2718.41 , 2013.90 , 666.91
+2718.41 , 2215.29 , 732.12
+2718.41 , 2416.68 , 797.72
+2718.41 , 2618.07 , 863.72
+2718.41 , 2819.46 , 930.10
+2718.41 , 3020.85 , 996.88
+2718.41 , 3222.24 , 1064.05
+2718.41 , 3423.63 , 1131.62
+2718.41 , 3625.02 , 1199.57
+2718.41 , 3826.41 , 1267.92
+2718.41 , 4027.80 , 1336.65
+2869.43 , -4193.88 , -1070.37
+2869.43 , -3984.18 , -1019.04
+2869.43 , -3774.49 , -967.24
+2869.43 , -3564.80 , -914.96
+2869.43 , -3355.10 , -862.23
+2869.43 , -3145.41 , -809.02
+2869.43 , -2935.71 , -755.35
+2869.43 , -2726.02 , -701.21
+2869.43 , -2516.33 , -646.60
+2869.43 , -2306.63 , -591.53
+2869.43 , -2096.94 , -535.99
+2869.43 , -1887.24 , -479.97
+2869.43 , -1677.55 , -423.47
+2869.43 , -1467.86 , -366.48
+2869.43 , -1258.16 , -308.96
+2869.43 , -1048.47 , -250.88
+2869.43 , -838.78 , -192.11
+2869.43 , -629.08 , -132.36
+2869.43 , -419.39 , -70.38
+2869.43 , -209.69 , 0.00
+2869.43 , -41.94 , 0.00
+2869.43 , 40.28 , 40.53
+2869.43 , 201.39 , 102.10
+2869.43 , 402.78 , 169.83
+2869.43 , 604.17 , 236.37
+2869.43 , 805.56 , 302.84
+2869.43 , 1006.95 , 369.53
+2869.43 , 1208.34 , 436.54
+2869.43 , 1409.73 , 503.92
+2869.43 , 1611.12 , 571.71
+2869.43 , 1812.51 , 639.91
+2869.43 , 2013.90 , 708.54
+2869.43 , 2215.29 , 777.59
+2869.43 , 2416.68 , 847.08
+2869.43 , 2618.07 , 917.00
+2869.43 , 2819.46 , 987.35
+2869.43 , 3020.85 , 1058.14
+2869.43 , 3222.24 , 1129.36
+2869.43 , 3423.63 , 1201.01
+2869.43 , 3625.02 , 1273.09
+2869.43 , 3826.41 , 1345.61
+2869.43 , 4027.80 , 1418.56
+3020.46 , -4193.88 , -1117.74
+3020.46 , -3984.18 , -1064.18
+3020.46 , -3774.49 , -1010.10
+3020.46 , -3564.80 , -955.49
+3020.46 , -3355.10 , -900.37
+3020.46 , -3145.41 , -844.73
+3020.46 , -2935.71 , -788.58
+3020.46 , -2726.02 , -731.90
+3020.46 , -2516.33 , -674.71
+3020.46 , -2306.63 , -617.00
+3020.46 , -2096.94 , -558.77
+3020.46 , -1887.24 , -500.01
+3020.46 , -1677.55 , -440.71
+3020.46 , -1467.86 , -380.85
+3020.46 , -1258.16 , -320.40
+3020.46 , -1048.47 , -259.31
+3020.46 , -838.78 , -197.41
+3020.46 , -629.08 , -134.30
+3020.46 , -419.39 , -68.24
+3020.46 , -209.69 , 0.00
+3020.46 , -41.94 , 0.00
+3020.46 , 40.28 , 44.59
+3020.46 , 201.39 , 110.53
+3020.46 , 402.78 , 182.27
+3020.46 , 604.17 , 252.55
+3020.46 , 805.56 , 322.69
+3020.46 , 1006.95 , 393.04
+3020.46 , 1208.34 , 463.74
+3020.46 , 1409.73 , 534.84
+3020.46 , 1611.12 , 606.37
+3020.46 , 1812.51 , 678.37
+3020.46 , 2013.90 , 750.82
+3020.46 , 2215.29 , 823.74
+3020.46 , 2416.68 , 897.14
+3020.46 , 2618.07 , 971.01
+3020.46 , 2819.46 , 1045.36
+3020.46 , 3020.85 , 1120.19
+3020.46 , 3222.24 , 1195.49
+3020.46 , 3423.63 , 1271.27
+3020.46 , 3625.02 , 1347.52
+3020.46 , 3826.41 , 1424.25
+3020.46 , 4027.80 , 1501.45
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_FLD_max.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..2c22528593c65014558a41670cf09448bd99eebb
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_FLD_max.viepcp
@@ -0,0 +1,24 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 4027.80 , -4193.88
+14.96 , 4027.80 , -4193.88
+151.09 , 4027.80 , -4193.88
+302.19 , 4027.80 , -4193.88
+452.92 , 4027.80 , -4193.88
+604.01 , 4027.80 , -4193.88
+755.11 , 4027.80 , -4193.88
+906.20 , 3356.50 , -3494.90
+1057.30 , 2876.98 , -2995.60
+1208.03 , 2517.38 , -2621.17
+1359.12 , 2237.68 , -2329.95
+1510.22 , 2013.90 , -2096.94
+1661.31 , 1830.82 , -1906.31
+1812.41 , 1678.25 , -1747.45
+1963.14 , 1549.15 , -1613.02
+2114.23 , 1438.52 , -1497.83
+2265.33 , 1342.60 , -1397.96
+2416.42 , 1258.71 , -1310.61
+2567.52 , 1184.66 , -1233.50
+2718.25 , 1118.82 , -1164.95
+2869.34 , 1059.96 , -1103.66
+3020.44 , 1006.95 , -1048.47
+
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_FLD_min.viepcp b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..1c40e34f4c8b390982508509b839a7cc766f8bd1
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 4027.80 , -4193.88
+14.96 , 4027.80 , -4193.88
+151.09 , 4027.80 , -4193.88
+302.19 , 4027.80 , -4193.88
+452.92 , 4027.80 , -4193.88
+604.01 , 4027.80 , -4193.88
+755.11 , 4027.80 , -4193.88
+906.20 , 3356.50 , -3494.90
+1057.30 , 2876.98 , -2995.60
+1208.03 , 2517.38 , -2621.17
+1359.12 , 2237.68 , -2329.95
+1510.22 , 2013.90 , -2096.94
+1661.31 , 1830.82 , -1906.31
+1812.41 , 1678.25 , -1747.45
+1963.14 , 1549.15 , -1613.02
+2114.23 , 1438.52 , -1497.83
+2265.33 , 1342.60 , -1397.96
+2416.42 , 1258.71 , -1310.61
+2567.52 , 1184.66 , -1233.50
+2718.25 , 1118.82 , -1164.95
+2869.34 , 1059.96 , -1103.66
+3020.44 , 1006.95 , -1048.47
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..841a118a18b289b3d124302d4931e8de455c6793
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -8.02
+15.10 , -8.28
+151.02 , -10.62
+302.05 , -13.22
+453.07 , -15.82
+604.09 , -18.45
+755.11 , -21.05
+906.14 , -23.65
+1057.16 , -26.25
+1208.18 , -28.85
+1359.21 , -31.48
+1510.23 , -34.08
+1661.25 , -36.68
+1812.28 , -39.28
+1963.30 , -41.88
+2114.32 , -44.51
+2265.34 , -47.11
+2416.37 , -49.71
+2567.39 , -52.31
+2718.41 , -54.91
+2869.44 , -57.54
+3020.46 , -60.14
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag1.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag1.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..69fa4188eac5b7a1325b80e75dcd3b202e9afd60
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag1.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -24.84
+4.98 , -25.62
+49.80 , -32.89
+99.59 , -40.94
+149.39 , -48.99
+199.18 , -57.13
+248.98 , -65.18
+298.77 , -73.23
+348.57 , -81.28
+398.37 , -89.33
+448.16 , -97.47
+497.96 , -105.52
+547.75 , -113.57
+597.55 , -121.62
+647.35 , -129.67
+697.14 , -137.81
+746.94 , -145.86
+796.73 , -153.91
+846.53 , -161.96
+896.32 , -170.01
+946.12 , -178.15
+995.92 , -186.20
diff --git a/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag2.viepcd b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag2.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..ffb4883b312afeed23be5a96783b2b92e3c03bed
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag2.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -13.76
+8.90 , -14.19
+88.99 , -18.22
+177.98 , -22.67
+266.97 , -27.13
+355.96 , -31.64
+444.95 , -36.10
+533.94 , -40.56
+622.93 , -45.01
+711.92 , -49.47
+800.91 , -53.98
+889.90 , -58.44
+978.89 , -62.89
+1067.88 , -67.35
+1156.87 , -71.81
+1245.86 , -76.32
+1334.85 , -80.78
+1423.84 , -85.23
+1512.83 , -89.69
+1601.82 , -94.15
+1690.81 , -98.66
+1779.80 , -103.11
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/325kW.vfld b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/325kW.vfld
new file mode 100644
index 0000000000000000000000000000000000000000..750d4048ef2da521d3c51bd0a8af39b6373c8575
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/325kW.vfld
@@ -0,0 +1,202 @@
+engine speed [1/min], full load torque [Nm], motoring torque [Nm]
+600,1188,-138
+608,1206.92,-138.2
+616,1225.84,-138.4
+624,1244.76,-138.6
+632,1263.68,-138.8
+640,1282.6,-139
+648,1301.52,-139.2
+656,1320.44,-139.4
+664,1339.36,-139.6
+672,1358.28,-139.8
+680,1377.2,-140
+688,1396.12,-140.2
+696,1415.04,-140.4
+704,1433.96,-140.6
+712,1452.88,-140.8
+720,1471.8,-141
+728,1490.72,-141.2
+736,1509.64,-141.4
+744,1528.56,-141.6
+752,1547.48,-141.8
+760,1566.4,-142
+768,1585.32,-142.2
+776,1604.24,-142.4
+784,1623.16,-142.6
+792,1642.08,-142.8
+800,1661,-143
+808,1679.92,-143.36
+816,1698.84,-143.72
+824,1717.76,-144.08
+832,1736.68,-144.44
+840,1755.6,-144.8
+848,1774.52,-145.16
+856,1793.44,-145.52
+864,1812.36,-145.88
+872,1831.28,-146.24
+880,1850.2,-146.6
+888,1869.12,-146.96
+896,1888.04,-147.32
+904,1906.96,-147.68
+912,1925.88,-148.04
+920,1944.8,-148.4
+928,1963.72,-148.76
+936,1982.64,-149.12
+944,2001.56,-149.48
+952,2020.48,-149.84
+960,2039.4,-150.2
+968,2058.32,-150.56
+976,2077.24,-150.92
+984,2096.16,-151.28
+992,2115.08,-151.64
+1000,2134,-152
+1008,2134,-152.52
+1016,2134,-153.04
+1024,2134,-153.56
+1032,2134,-154.08
+1040,2134,-154.6
+1048,2134,-155.12
+1056,2134,-155.64
+1064,2134,-156.16
+1072,2134,-156.68
+1080,2134,-157.2
+1088,2134,-157.72
+1096,2134,-158.24
+1104,2134,-158.76
+1112,2134,-159.28
+1120,2134,-159.8
+1128,2134,-160.32
+1136,2134,-160.84
+1144,2134,-161.36
+1152,2134,-161.88
+1160,2134,-162.4
+1168,2134,-162.92
+1176,2134,-163.44
+1184,2134,-163.96
+1192,2134,-164.48
+1200,2134,-165
+1208,2134,-165.88
+1216,2134,-166.76
+1224,2134,-167.64
+1232,2134,-168.52
+1240,2134,-169.4
+1248,2134,-170.28
+1256,2134,-171.16
+1264,2134,-172.04
+1272,2134,-172.92
+1280,2134,-173.8
+1288,2134,-174.68
+1296,2134,-175.56
+1304,2134,-176.44
+1312,2134,-177.32
+1320,2134,-178.2
+1328,2134,-179.08
+1336,2134,-179.96
+1344,2134,-180.84
+1352,2134,-181.72
+1360,2134,-182.6
+1368,2134,-183.48
+1376,2134,-184.36
+1384,2134,-185.24
+1392,2134,-186.12
+1400,2134,-187
+1408,2125.76,-188.2
+1416,2117.52,-189.4
+1424,2109.28,-190.6
+1432,2101.04,-191.8
+1440,2092.8,-193
+1448,2084.56,-194.2
+1456,2076.32,-195.4
+1464,2068.08,-196.6
+1472,2059.84,-197.8
+1480,2051.6,-199
+1488,2043.36,-200.2
+1496,2035.12,-201.3911
+1504,2026.88,-202.5793
+1512,2018.64,-203.7675
+1520,2010.4,-204.9557
+1528,2002.16,-206.1439
+1536,1993.92,-207.3321
+1544,1985.68,-208.5203
+1552,1977.44,-209.7085
+1560,1969.2,-210.8967
+1568,1960.96,-212.0849
+1576,1952.72,-213.2731
+1584,1944.48,-214.4613
+1592,1936.24,-215.6495
+1600,1928,-216.8377
+1608,1919.76,-218.0259
+1616,1911.52,-219.16
+1624,1903.28,-220.24
+1632,1895.04,-221.32
+1640,1886.8,-222.4
+1648,1878.56,-223.48
+1656,1870.32,-224.56
+1664,1862.08,-225.64
+1672,1853.84,-226.72
+1680,1845.6,-227.8
+1688,1837.36,-228.88
+1696,1829.12,-229.96
+1704,1820.88,-231.04
+1712,1812.64,-232.12
+1720,1804.4,-233.2
+1728,1796.16,-234.28
+1736,1787.92,-235.36
+1744,1779.68,-236.44
+1752,1771.44,-237.52
+1760,1763.2,-238.6
+1768,1754.96,-239.68
+1776,1746.72,-240.76
+1784,1738.48,-241.84
+1792,1730.24,-242.92
+1800,1722,-244
+1808,1703.24,-245.36
+1816,1684.48,-246.72
+1824,1665.72,-248.08
+1832,1646.96,-249.44
+1840,1628.2,-250.8
+1848,1609.44,-252.16
+1856,1590.68,-253.52
+1864,1571.92,-254.88
+1872,1553.16,-256.24
+1880,1534.4,-257.6
+1888,1515.64,-258.96
+1896,1496.88,-260.32
+1904,1478.12,-261.68
+1912,1459.36,-263.04
+1920,1440.6,-264.4
+1928,1421.84,-265.76
+1936,1403.08,-267.12
+1944,1384.32,-268.48
+1952,1365.56,-269.84
+1960,1346.8,-271.2
+1968,1328.04,-272.56
+1976,1309.28,-273.92
+1984,1290.52,-275.28
+1992,1271.76,-276.64
+2000,1253,-278
+2008,1234.28,-279.36
+2016,1215.56,-280.72
+2024,1196.84,-282.08
+2032,1178.12,-283.44
+2040,1159.4,-284.8
+2048,1140.68,-286.16
+2056,1121.96,-287.52
+2064,1103.24,-288.88
+2072,1084.52,-290.24
+2080,1065.8,-291.6
+2088,1047.08,-292.96
+2096,1028.36,-294.32
+2104,978.24,-295.68
+2112,896.72,-297.04
+2120,815.2,-298.4
+2128,733.68,-299.76
+2136,652.16,-301.12
+2144,570.64,-302.48
+2152,489.12,-303.84
+2160,407.6,-305.2
+2168,326.08,-306.56
+2176,244.56,-307.92
+2184,163.04,-309.28
+2192,81.52,-310.64
+2200,0,-312
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/325kW.vmap b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/325kW.vmap
new file mode 100644
index 0000000000000000000000000000000000000000..eea08f963f4b23b49f15d030db630b52edc1d4e3
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/325kW.vmap
@@ -0,0 +1,140 @@
+engine speed [rpm], torque [Nm], fuel consumption [g/h]
+500,-135.5,0
+500,0,1355
+500,213.4,3412.291
+500,426.8,5830.1
+500,640.2,8316.426
+500,853.6,10439.87
+500,1067,12823.69
+500,1188,14228.79
+500,1401.4,16628.66
+600,-138,0
+600,0,1355
+600,213.4,3412.291
+600,426.8,5830.1
+600,640.2,8316.426
+600,853.6,10439.87
+600,1067,12823.69
+600,1188,14228.79
+600,1401.4,16628.66
+751,-141.775,0
+750.9,0,1649.255
+750.9,213.4,4157.795
+750.9,426.8,7149.494
+750.9,640.2,10037.08
+750.9,853.6,12957.07
+750.9,1067,16055.22
+750.9,1280.4,19231.36
+750.9,1493.8,22400.17
+750.9,1544.879,23213.92
+751,1758.279,26392.93
+902,-147.59,0
+901.8,0,2210.735
+901.8,213.4,5204.867
+901.8,426.8,8515.462
+901.8,640.2,11804.75
+901.8,853.6,15410.55
+901.8,1067,19081.7
+901.8,1280.4,22742.96
+901.8,1493.8,26543.87
+901.8,1707.2,30534.68
+901.8,1901.757,34352.75
+902,2115.157,38403.27
+1053,-155.445,0
+1052.7,0,2768.035
+1052.7,213.4,6228.407
+1052.7,426.8,9836.041
+1052.7,640.2,13624.5
+1052.7,853.6,17854.95
+1052.7,1067,22072.71
+1052.7,1280.4,26161.13
+1052.7,1493.8,30525.55
+1052.7,1707.2,35019.18
+1052.7,1920.6,39913.3
+1052.7,2134,45438.16
+1053,2347.4,50542.53
+1204,-165.44,0
+1203.6,0,3086.704
+1203.6,213.4,6943.027
+1203.6,426.8,11040.37
+1203.6,640.2,15504.65
+1203.6,853.6,20335.89
+1203.6,1067,25176.6
+1203.6,1280.4,29782.22
+1203.6,1493.8,34642.24
+1203.6,1707.2,39786.14
+1203.6,1920.6,45254.8
+1203.6,2134,51129.03
+1204,2347.4,56732.88
+1367,-183.37,0
+1367.1,0,3845.344
+1367.1,213.4,7981.742
+1367.1,426.8,12796.69
+1367.1,640.2,17789.2
+1367.1,853.6,22854.21
+1367.1,1067,28302.84
+1367.1,1280.4,33739.91
+1367.1,1493.8,39393.87
+1367.1,1707.2,45836.33
+1367.1,1920.6,52078.71
+1367.1,2134,58296.41
+1367,2347.4,64530.56
+1490,-200.5,0
+1489.6,0,4373.424
+1489.6,213.4,8861.484
+1489.6,426.8,14090.86
+1489.6,640.2,19518.29
+1489.6,853.6,25092.8
+1489.6,1067,30873.69
+1489.6,1280.4,36865.42
+1489.6,1493.8,43095.57
+1489.6,1707.2,50249.81
+1489.6,1920.6,57035.25
+1489.6,2041.712,60609.5
+1490,2255.112,67311.83
+1612,-218.62,0
+1612.2,0,4904.015
+1612.2,213.4,9810.482
+1612.2,426.8,15403.9
+1612.2,640.2,21301.35
+1612.2,853.6,27492.32
+1612.2,1067,33580.96
+1612.2,1280.4,40114.61
+1612.2,1493.8,46914.77
+1612.2,1707.2,54666.14
+1612.2,1915.434,61862.91
+1612,2128.834,69491.99
+1735,-235.225,0
+1734.7,0,5586.953
+1734.7,213.4,11041.15
+1734.7,426.8,16949.24
+1734.7,640.2,23500.23
+1734.7,853.6,30159.59
+1734.7,1067,36741.18
+1734.7,1280.4,43923.85
+1734.7,1493.8,51295.21
+1734.7,1707.2,59469.31
+1734.7,1789.259,62731.31
+1735,2002.659,70935.23
+1857,-253.69,0
+1857.3,0,6673.839
+1857.3,213.4,12518.56
+1857.3,426.8,18687.88
+1857.3,640.2,25652.39
+1857.3,853.6,33003.08
+1857.3,1067,40438.09
+1857.3,1280.4,48117.52
+1857.3,1493.8,55848.59
+1857.3,1587.631,59434.17
+1857,1801.031,67215.39
+1957,-270.69,0
+1957.3,0,6673.839
+1957.3,213.4,12518.56
+1957.3,426.8,18687.88
+1957.3,640.2,25652.39
+1957.3,853.6,33003.08
+1957.3,1067,40438.09
+1957.3,1280.4,48117.52
+1957.3,1493.8,55848.59
+1957.3,1587.631,59434.17
+1957,1801.031,67215.39
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Axle_4x2_Tractor.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Axle_4x2_Tractor.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..e11cbf7cdde175e06ab8f6a0b79d46b84b3e0c1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Axle_4x2_Tractor.vtlm
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Default.vrlm b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Default.vrlm
new file mode 100644
index 0000000000000000000000000000000000000000..eb575b99973291e5414c4826da086c1f03a7f179
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Default.vrlm
@@ -0,0 +1,32 @@
+Retarder Speed [1/min],Torque Loss [Nm]
+0,10
+100,10
+200,10.1
+300,10.2
+400,10.3
+500,10.5
+600,10.7
+700,11
+800,11.3
+900,11.6
+1000,12
+1100,12.4
+1200,12.9
+1300,13.4
+1400,13.9
+1500,14.5
+1600,15.1
+1700,15.8
+1800,16.5
+1900,17.2
+2000,18
+2100,18.8
+2200,19.7
+2300,20.6
+2400,21.5
+2500,22.5
+2600,23.5
+2700,24.6
+2800,25.7
+2900,26.8
+3000,28
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Engine_325kW_12.7l.veng b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Engine_325kW_12.7l.veng
new file mode 100644
index 0000000000000000000000000000000000000000..084062afccf57ee58c485634cb158fdf05647b86
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Engine_325kW_12.7l.veng
@@ -0,0 +1,35 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-08-21T09:24:04.0725494Z",
+ "AppVersion": "3",
+ "FileVersion": 5
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "325kW 12.7l Engine",
+ "Displacement": "12740",
+ "IdlingSpeed": 600.0,
+ "Inertia": 5.1498,
+ "Fuels": [
+ {
+ "WHTC-Urban": 0.0,
+ "WHTC-Rural": 0.0,
+ "WHTC-Motorway": 0.0,
+ "WHTC-Engineering": 1.0,
+ "ColdHotBalancingFactor": 0.0,
+ "CFRegPer": 1.0,
+ "FuelMap": "325kW.vmap",
+ "FuelType": "DieselCI"
+ }
+ ],
+ "RatedPower": 0.0,
+ "RatedSpeed": 0.0,
+ "MaxTorque": 0.0,
+ "FullLoadCurve": "325kW.vfld",
+ "WHRType": [
+ "None"
+ ],
+ "WHRCorrectionFactors": {}
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_1.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_1.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_1.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_10.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_10.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_10.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_11.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_11.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_11.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_12.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_12.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..d30c0dbb042ca6d2235b4febe01b31292e5593c0
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_12.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,74.2
+0,-5000.0,69.2
+0,-4500.0,59.2
+0,-4000.0,59.2
+0,-3500.0,54.2
+0,-3000.0,49.2
+0,-2500.0,44.2
+0,-2000.0,39.2
+0,-1600.0,35.2
+0,-1200.0,31.2
+0,-900.0,28.2
+0,-600.0,25.2
+0,-400.0,23.2
+0,-200.0,21.2
+0,0.0,21.2
+0,200.0,21.2
+0,400.0,23.2
+0,600.0,25.2
+0,900.0,28.2
+0,1200.0,31.2
+0,1600.0,35.2
+0,2000.0,39.2
+0,2500.0,44.2
+0,3000.0,49.2
+0,3500.0,54.2
+0,4000.0,59.2
+0,4500.0,64.2
+0,5000.0,69.2
+0,5500.0,74.2
+600,-5500.0,74.2
+600,-5000.0,69.2
+600,-4500.0,59.2
+600,-4000.0,59.2
+600,-3500.0,54.2
+600,-3000.0,49.2
+600,-2500.0,44.2
+600,-2000.0,39.2
+600,-1600.0,35.2
+600,-1200.0,31.2
+600,-900.0,28.2
+600,-600.0,25.2
+600,-400.0,23.2
+600,-200.0,21.2
+600,0.0,21.2
+600,200.0,21.2
+600,400.0,23.2
+600,600.0,25.2
+600,900.0,28.2
+600,1200.0,31.2
+600,1600.0,35.2
+600,2000.0,39.2
+600,2500.0,44.2
+600,3000.0,49.2
+600,3500.0,54.2
+600,4000.0,59.2
+600,4500.0,64.2
+600,5000.0,69.2
+600,5500.0,74.2
+900,-5500.0,77.8
+900,-5000.0,72.8
+900,-4500.0,62.8
+900,-4000.0,62.8
+900,-3500.0,57.8
+900,-3000.0,52.8
+900,-2500.0,47.8
+900,-2000.0,42.8
+900,-1600.0,38.8
+900,-1200.0,34.8
+900,-900.0,31.8
+900,-600.0,28.8
+900,-400.0,26.8
+900,-200.0,24.8
+900,0.0,24.8
+900,200.0,24.8
+900,400.0,26.8
+900,600.0,28.8
+900,900.0,31.8
+900,1200.0,34.8
+900,1600.0,38.8
+900,2000.0,42.8
+900,2500.0,47.8
+900,3000.0,52.8
+900,3500.0,57.8
+900,4000.0,62.8
+900,4500.0,67.8
+900,5000.0,72.8
+900,5500.0,77.8
+1200,-5500.0,81.4
+1200,-5000.0,76.4
+1200,-4500.0,66.4
+1200,-4000.0,66.4
+1200,-3500.0,61.4
+1200,-3000.0,56.4
+1200,-2500.0,51.4
+1200,-2000.0,46.4
+1200,-1600.0,42.4
+1200,-1200.0,38.4
+1200,-900.0,35.4
+1200,-600.0,32.4
+1200,-400.0,30.4
+1200,-200.0,28.4
+1200,0.0,28.4
+1200,200.0,28.4
+1200,400.0,30.4
+1200,600.0,32.4
+1200,900.0,35.4
+1200,1200.0,38.4
+1200,1600.0,42.4
+1200,2000.0,46.4
+1200,2500.0,51.4
+1200,3000.0,56.4
+1200,3500.0,61.4
+1200,4000.0,66.4
+1200,4500.0,71.4
+1200,5000.0,76.4
+1200,5500.0,81.4
+1600,-5500.0,86.2
+1600,-5000.0,81.2
+1600,-4500.0,71.2
+1600,-4000.0,71.2
+1600,-3500.0,66.2
+1600,-3000.0,61.2
+1600,-2500.0,56.2
+1600,-2000.0,51.2
+1600,-1600.0,47.2
+1600,-1200.0,43.2
+1600,-900.0,40.2
+1600,-600.0,37.2
+1600,-400.0,35.2
+1600,-200.0,33.2
+1600,0.0,33.2
+1600,200.0,33.2
+1600,400.0,35.2
+1600,600.0,37.2
+1600,900.0,40.2
+1600,1200.0,43.2
+1600,1600.0,47.2
+1600,2000.0,51.2
+1600,2500.0,56.2
+1600,3000.0,61.2
+1600,3500.0,66.2
+1600,4000.0,71.2
+1600,4500.0,76.2
+1600,5000.0,81.2
+1600,5500.0,86.2
+2000,-5500.0,91.0
+2000,-5000.0,86.0
+2000,-4500.0,76.0
+2000,-4000.0,76.0
+2000,-3500.0,71.0
+2000,-3000.0,66.0
+2000,-2500.0,61.0
+2000,-2000.0,56.0
+2000,-1600.0,52.0
+2000,-1200.0,48.0
+2000,-900.0,45.0
+2000,-600.0,42.0
+2000,-400.0,40.0
+2000,-200.0,38.0
+2000,0.0,38.0
+2000,200.0,38.0
+2000,400.0,40.0
+2000,600.0,42.0
+2000,900.0,45.0
+2000,1200.0,48.0
+2000,1600.0,52.0
+2000,2000.0,56.0
+2000,2500.0,61.0
+2000,3000.0,66.0
+2000,3500.0,71.0
+2000,4000.0,76.0
+2000,4500.0,81.0
+2000,5000.0,86.0
+2000,5500.0,91.0
+2500,-5500.0,97.0
+2500,-5000.0,92.0
+2500,-4500.0,82.0
+2500,-4000.0,82.0
+2500,-3500.0,77.0
+2500,-3000.0,72.0
+2500,-2500.0,67.0
+2500,-2000.0,62.0
+2500,-1600.0,58.0
+2500,-1200.0,54.0
+2500,-900.0,51.0
+2500,-600.0,48.0
+2500,-400.0,46.0
+2500,-200.0,44.0
+2500,0.0,44.0
+2500,200.0,44.0
+2500,400.0,46.0
+2500,600.0,48.0
+2500,900.0,51.0
+2500,1200.0,54.0
+2500,1600.0,58.0
+2500,2000.0,62.0
+2500,2500.0,67.0
+2500,3000.0,72.0
+2500,3500.0,77.0
+2500,4000.0,82.0
+2500,4500.0,87.0
+2500,5000.0,92.0
+2500,5500.0,97.0
+3000,-5500.0,103.0
+3000,-5000.0,98.0
+3000,-4500.0,88.0
+3000,-4000.0,88.0
+3000,-3500.0,83.0
+3000,-3000.0,78.0
+3000,-2500.0,73.0
+3000,-2000.0,68.0
+3000,-1600.0,64.0
+3000,-1200.0,60.0
+3000,-900.0,57.0
+3000,-600.0,54.0
+3000,-400.0,52.0
+3000,-200.0,50.0
+3000,0.0,50.0
+3000,200.0,50.0
+3000,400.0,52.0
+3000,600.0,54.0
+3000,900.0,57.0
+3000,1200.0,60.0
+3000,1600.0,64.0
+3000,2000.0,68.0
+3000,2500.0,73.0
+3000,3000.0,78.0
+3000,3500.0,83.0
+3000,4000.0,88.0
+3000,4500.0,93.0
+3000,5000.0,98.0
+3000,5500.0,103.0
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_2.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_2.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_2.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_3.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_3.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_3.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_4.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_4.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_4.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_5.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_5.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_5.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_6.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_6.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_6.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_7.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_7.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_7.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_8.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_8.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_8.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_9.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_9.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Gear_9.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbat b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbat
new file mode 100644
index 0000000000000000000000000000000000000000..b63cc3aad2ae9a38a3f3d17146b5db01390e99ac
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbat
@@ -0,0 +1,18 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:28:30.2818342Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic Battery",
+ "Capacity": 14.0,
+ "SOC_min": 20.0,
+ "SOC_max": 80.0,
+ "MaxCurrentMap": "MaxCurrent.vimax",
+ "InternalResistanceCurve": "GenericBattery_10kWh_658V.vbatr",
+ "SoCCurve": "GenericBattery_10kWh_658V.vbatv"
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbatr b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbatr
new file mode 100644
index 0000000000000000000000000000000000000000..09c936221ae38d84265ae27ba5542834d407026a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbatr
@@ -0,0 +1,3 @@
+SoC, Ri
+0, 0.12
+100, 0.12
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbatv b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbatv
new file mode 100644
index 0000000000000000000000000000000000000000..8063e04c9379cce6870b2d71c99807f0ee73c3fa
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbatv
@@ -0,0 +1,12 @@
+SOC, V
+0, 590
+10, 614
+20, 626
+30, 632
+40, 638
+50, 640
+60, 640
+70, 642
+80, 646
+90, 650
+100, 658
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericEMotor_140kW_900Nm.vemp b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericEMotor_140kW_900Nm.vemp
new file mode 100644
index 0000000000000000000000000000000000000000..dc507a3de87525ae3ff0d10ae580fd845bc3763f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericEMotor_140kW_900Nm.vemp
@@ -0,0 +1,74 @@
+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0,900,-900
+1485.446136,900,-900
+1480,900,-900
+1488.888889,897.93,-897.93
+1497.777778,892.5975,-892.5975
+1506.666667,887.3325,-887.3325
+1511.111111,884.7225,-884.7225
+1555.555556,859.4325,-859.4325
+1600,835.56,-835.56
+1644.444444,812.97,-812.97
+1688.888889,791.595,-791.595
+1733.333333,771.3,-771.3
+1777.777778,752.0175,-752.0175
+1822.222222,733.6575,-733.6575
+1866.666667,716.1975,-716.1975
+1911.111111,699.5475,-699.5475
+1955.555556,683.64,-683.64
+2000,668.4525,-668.4525
+2044.444444,653.9175,-653.9175
+2088.888889,640.0125,-640.0125
+2133.333333,626.67,-626.67
+2177.777778,613.89,-613.89
+2222.222222,601.605,-601.605
+2266.666667,589.815,-589.815
+2311.111111,578.475,-578.475
+2355.555556,567.5625,-567.5625
+2400,557.0325,-557.0325
+2444.444444,546.9075,-546.9075
+2488.888889,537.1425,-537.1425
+2533.333333,527.715,-527.715
+2577.777778,518.625,-518.625
+2622.222222,509.8275,-509.8275
+2666.666667,501.345,-501.345
+2711.111111,493.11,-493.11
+2755.555556,485.1675,-485.1675
+2800,477.4725,-477.4725
+2844.444444,470.0025,-470.0025
+2888.888889,462.78,-462.78
+2933.333333,455.76,-455.76
+2977.777778,448.965,-448.965
+3022.222222,442.35,-442.35
+3066.666667,435.9375,-435.9375
+3111.111111,429.7275,-429.7275
+3155.555556,423.675,-423.675
+3200,417.78,-417.78
+3244.444444,412.065,-412.065
+3288.888889,406.485,-406.485
+3333.333333,401.0625,-401.0625
+3377.777778,395.7975,-395.7975
+3422.222222,390.645,-390.645
+3466.666667,385.65,-385.65
+3511.111111,380.7675,-380.7675
+3555.555556,375.9975,-375.9975
+3600,371.3625,-371.3625
+3644.444444,366.84,-366.84
+3688.888889,362.4075,-362.4075
+3733.333333,358.0875,-358.0875
+3777.777778,353.88,-353.88
+3822.222222,349.7625,-349.7625
+3866.666667,345.7575,-345.7575
+3911.111111,341.82,-341.82
+3955.555556,337.9725,-337.9725
+4000,334.215,-334.215
+4044.444444,330.5475,-330.5475
+4088.888889,326.97,-326.97
+4133.333333,323.4375,-323.4375
+4177.777778,319.995,-319.995
+4222.222222,316.6425,-316.6425
+4266.666667,313.335,-313.335
+4311.111111,310.095,-310.095
+4355.555556,306.945,-306.945
+4400,303.84,-303.84
+4444.444444,300.8025,-300.8025
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericIHPCDrag.vemd b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericIHPCDrag.vemd
new file mode 100644
index 0000000000000000000000000000000000000000..ea6b5cc3a57308f36d939ccc12b6b122899b3aa9
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericIHPCDrag.vemd
@@ -0,0 +1,3 @@
+n [rpm] , T_drag [Nm]
+0 , 0.0
+10000 , 0.0
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericIHPC_140kW_936Nm.vem b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericIHPC_140kW_936Nm.vem
new file mode 100644
index 0000000000000000000000000000000000000000..4ee8246760aa123e13fa136ff12f61f37defc3ca
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericIHPC_140kW_936Nm.vem
@@ -0,0 +1,63 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-10-09T08:18:42.8238326Z",
+ "AppVersion": "3",
+ "FileVersion": 5
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IHPC",
+ "DragCurve": "GenericIHPCDrag.vemd",
+ "Inertia": 0.5,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 13860.59,
+ "ContinuousTorqueSpeed": 166.99,
+ "OverloadTorque": 16517.20,
+ "OverloadTorqueSpeed": 166.01,
+ "OverloadTime": 312,
+ "FullLoadCurve": "GenericEMotor_140kW_900Nm.vemp",
+ "EfficiencyMap": {
+ "1": "GenericMap_140kW_936Nm.vemo",
+ "2": "GenericMap_140kW_936Nm.vemo",
+ "3": "GenericMap_140kW_936Nm.vemo",
+ "4": "GenericMap_140kW_936Nm.vemo",
+ "5": "GenericMap_140kW_936Nm.vemo",
+ "6": "GenericMap_140kW_936Nm.vemo",
+ "7": "GenericMap_140kW_936Nm.vemo",
+ "8": "GenericMap_140kW_936Nm.vemo",
+ "9": "GenericMap_140kW_936Nm.vemo",
+ "10": "GenericMap_140kW_936Nm.vemo",
+ "11": "GenericMap_140kW_936Nm.vemo",
+ "12": "GenericMap_140kW_936Nm.vemo"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 15015.63,
+ "ContinuousTorqueSpeed": 168.62,
+ "OverloadTorque": 17325.73,
+ "OverloadTorqueSpeed": 170.17,
+ "OverloadTime": 345,
+ "FullLoadCurve": "GenericEMotor_140kW_900Nm.vemp",
+ "EfficiencyMap": {
+ "1": "GenericMap_140kW_936Nm.vemo",
+ "2": "GenericMap_140kW_936Nm.vemo",
+ "3": "GenericMap_140kW_936Nm.vemo",
+ "4": "GenericMap_140kW_936Nm.vemo",
+ "5": "GenericMap_140kW_936Nm.vemo",
+ "6": "GenericMap_140kW_936Nm.vemo",
+ "7": "GenericMap_140kW_936Nm.vemo",
+ "8": "GenericMap_140kW_936Nm.vemo",
+ "9": "GenericMap_140kW_936Nm.vemo",
+ "10": "GenericMap_140kW_936Nm.vemo",
+ "11": "GenericMap_140kW_936Nm.vemo",
+ "12": "GenericMap_140kW_936Nm.vemo"
+ }
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericMap_140kW_936Nm.vemo b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericMap_140kW_936Nm.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..aaf978890c6fd20d74a852e50541bbc48c2933fb
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/GenericMap_140kW_936Nm.vemo
@@ -0,0 +1,2016 @@
+n [rpm] , T [Nm] , P_el [kW]
+0,-936,9.8449
+0,-906.75,9.2719
+0,-877.5,8.7161
+0,-848.25,8.1773
+0,-819,7.6558
+0,-789.75,7.1514
+0,-760.5,6.6641
+0,-731.25,6.194
+0,-702,5.741
+0,-672.75,5.3052
+0,-643.5,4.8866
+0,-614.25,4.4851
+0,-585,4.1007
+0,-555.75,3.7335
+0,-526.5,3.3834
+0,-497.25,3.0505
+0,-468,2.7348
+0,-438.75,2.4362
+0,-409.5,2.1547
+0,-380.25,1.8904
+0,-351,1.6433
+0,-321.75,1.4133
+0,-292.5,1.2004
+0,-263.25,1.0047
+0,-234,0.82617
+0,-204.75,0.66478
+0,-175.5,0.52053
+0,-146.25,0.39344
+0,-117,0.28349
+0,-87.75,0.1907
+0,-58.5,0.11506
+0,-29.25,0.056566
+0,0,0.0361
+0,29.25,0.086979
+0,58.5,0.15501
+0,87.75,0.24019
+0,117,0.34252
+0,146.25,0.462
+0,175.5,0.59864
+0,204.75,0.75242
+0,234,0.92335
+0,263.25,1.1114
+0,292.5,1.3167
+0,321.75,1.5391
+0,351,1.7786
+0,380.25,2.0353
+0,409.5,2.3091
+0,438.75,2.6001
+0,468,2.9083
+0,497.25,3.2336
+0,526.5,3.576
+0,555.75,3.9356
+0,585,4.3123
+0,614.25,4.7062
+0,643.5,5.1173
+0,672.75,5.5455
+0,702,5.9908
+0,731.25,6.4533
+0,760.5,6.933
+0,789.75,7.4298
+0,819,7.9437
+0,848.25,8.4748
+0,877.5,9.0231
+0,906.75,9.5885
+0,936,10.171
+40.80854701,-936,5.8367
+40.80854701,-906.75,5.3901
+40.80854701,-877.5,4.9606
+40.80854701,-848.25,4.5482
+40.80854701,-819,4.153
+40.80854701,-789.75,3.775
+40.80854701,-760.5,3.4141
+40.80854701,-731.25,3.0704
+40.80854701,-702,2.7438
+40.80854701,-672.75,2.4344
+40.80854701,-643.5,2.1421
+40.80854701,-614.25,1.8669
+40.80854701,-585,1.609
+40.80854701,-555.75,1.3681
+40.80854701,-526.5,1.1445
+40.80854701,-497.25,0.93793
+40.80854701,-468,0.74855
+40.80854701,-438.75,0.57729
+40.80854701,-409.5,0.4236
+40.80854701,-380.25,0.28766
+40.80854701,-351,0.16853
+40.80854701,-321.75,0.066217
+40.80854701,-292.5,-0.019286
+40.80854701,-263.25,-0.087979
+40.80854701,-234,-0.13986
+40.80854701,-204.75,-0.17493
+40.80854701,-175.5,-0.19319
+40.80854701,-146.25,-0.19464
+40.80854701,-117,-0.17927
+40.80854701,-87.75,-0.1471
+40.80854701,-58.5,-0.09811
+40.80854701,-29.25,-0.032313
+40.80854701,0,0.07245
+40.80854701,29.25,0.24971
+40.80854701,58.5,0.44411
+40.80854701,87.75,0.65567
+40.80854701,117,0.88437
+40.80854701,146.25,1.1302
+40.80854701,175.5,1.3932
+40.80854701,204.75,1.6734
+40.80854701,234,1.9707
+40.80854701,263.25,2.2852
+40.80854701,292.5,2.6168
+40.80854701,321.75,2.9655
+40.80854701,351,3.3315
+40.80854701,380.25,3.7145
+40.80854701,409.5,4.1147
+40.80854701,438.75,4.5321
+40.80854701,468,4.9666
+40.80854701,497.25,5.4183
+40.80854701,526.5,5.8871
+40.80854701,555.75,6.3731
+40.80854701,585,6.8762
+40.80854701,614.25,7.3965
+40.80854701,643.5,7.9339
+40.80854701,672.75,8.4885
+40.80854701,702,9.0602
+40.80854701,731.25,9.6491
+40.80854701,760.5,10.255
+40.80854701,789.75,10.878
+40.80854701,819,11.519
+40.80854701,848.25,12.176
+40.80854701,877.5,12.851
+40.80854701,906.75,13.542
+40.80854701,936,14.251
+81.61794872,-936,1.8303
+81.61794872,-906.75,1.5101
+81.61794872,-877.5,1.2075
+81.61794872,-848.25,0.92457
+81.61794872,-819,0.66034
+81.61794872,-789.75,0.41292
+81.61794872,-760.5,0.18231
+81.61794872,-731.25,-0.031493
+81.61794872,-702,-0.22848
+81.61794872,-672.75,-0.40866
+81.61794872,-643.5,-0.57202
+81.61794872,-614.25,-0.71858
+81.61794872,-585,-0.84832
+81.61794872,-555.75,-0.96125
+81.61794872,-526.5,-1.0574
+81.61794872,-497.25,-1.1367
+81.61794872,-468,-1.1992
+81.61794872,-438.75,-1.2449
+81.61794872,-409.5,-1.2737
+81.61794872,-380.25,-1.2858
+81.61794872,-351,-1.2811
+81.61794872,-321.75,-1.2595
+81.61794872,-292.5,-1.2211
+81.61794872,-263.25,-1.1659
+81.61794872,-234,-1.0939
+81.61794872,-204.75,-1.0051
+81.61794872,-175.5,-0.89953
+81.61794872,-146.25,-0.7771
+81.61794872,-117,-0.63787
+81.61794872,-87.75,-0.48182
+81.61794872,-58.5,-0.30896
+81.61794872,-29.25,-0.11929
+81.61794872,0,0.11065
+81.61794872,29.25,0.41428
+81.61794872,58.5,0.73507
+81.61794872,87.75,1.073
+81.61794872,117,1.4281
+81.61794872,146.25,1.8003
+81.61794872,175.5,2.1897
+81.61794872,204.75,2.5962
+81.61794872,234,3.0199
+81.61794872,263.25,3.4608
+81.61794872,292.5,3.9188
+81.61794872,321.75,4.3939
+81.61794872,351,4.8862
+81.61794872,380.25,5.3956
+81.61794872,409.5,5.9222
+81.61794872,438.75,6.466
+81.61794872,468,7.0269
+81.61794872,497.25,7.6049
+81.61794872,526.5,8.2001
+81.61794872,555.75,8.8124
+81.61794872,585,9.4419
+81.61794872,614.25,10.089
+81.61794872,643.5,10.752
+81.61794872,672.75,11.433
+81.61794872,702,12.131
+81.61794872,731.25,12.847
+81.61794872,760.5,13.579
+81.61794872,789.75,14.329
+81.61794872,819,15.095
+81.61794872,848.25,15.879
+81.61794872,877.5,16.68
+81.61794872,906.75,17.498
+81.61794872,936,18.334
+122.4273504,-936,-2.1071
+122.4273504,-906.75,-2.2979
+122.4273504,-877.5,-2.4719
+122.4273504,-848.25,-2.629
+122.4273504,-819,-2.7694
+122.4273504,-789.75,-2.8929
+122.4273504,-760.5,-2.9997
+122.4273504,-731.25,-3.0896
+122.4273504,-702,-3.1627
+122.4273504,-672.75,-3.219
+122.4273504,-643.5,-3.2585
+122.4273504,-614.25,-3.2812
+122.4273504,-585,-3.2871
+122.4273504,-555.75,-3.2761
+122.4273504,-526.5,-3.2484
+122.4273504,-497.25,-3.2038
+122.4273504,-468,-3.1424
+122.4273504,-438.75,-3.0642
+122.4273504,-409.5,-2.9692
+122.4273504,-380.25,-2.8574
+122.4273504,-351,-2.7288
+122.4273504,-321.75,-2.5834
+122.4273504,-292.5,-2.4211
+122.4273504,-263.25,-2.2421
+122.4273504,-234,-2.0462
+122.4273504,-204.75,-1.8335
+122.4273504,-175.5,-1.604
+122.4273504,-146.25,-1.3577
+122.4273504,-117,-1.0946
+122.4273504,-87.75,-0.81471
+122.4273504,-58.5,-0.51798
+122.4273504,-29.25,-0.20444
+122.4273504,0,0.15072
+122.4273504,29.25,0.58072
+122.4273504,58.5,1.0279
+122.4273504,87.75,1.4922
+122.4273504,117,1.9737
+122.4273504,146.25,2.4723
+122.4273504,175.5,2.988
+122.4273504,204.75,3.5209
+122.4273504,234,4.071
+122.4273504,263.25,4.6382
+122.4273504,292.5,5.2226
+122.4273504,321.75,5.8241
+122.4273504,351,6.4428
+122.4273504,380.25,7.0786
+122.4273504,409.5,7.7315
+122.4273504,438.75,8.4017
+122.4273504,468,9.0889
+122.4273504,497.25,9.7934
+122.4273504,526.5,10.515
+122.4273504,555.75,11.254
+122.4273504,585,12.01
+122.4273504,614.25,12.783
+122.4273504,643.5,13.573
+122.4273504,672.75,14.38
+122.4273504,702,15.205
+122.4273504,731.25,16.046
+122.4273504,760.5,16.905
+122.4273504,789.75,17.781
+122.4273504,819,18.674
+122.4273504,848.25,19.584
+122.4273504,877.5,20.512
+122.4273504,906.75,21.456
+122.4273504,936,22.418
+163.2393162,-936,-6.0305
+163.2393162,-906.75,-6.0974
+163.2393162,-877.5,-6.1475
+163.2393162,-848.25,-6.1808
+163.2393162,-819,-6.1973
+163.2393162,-789.75,-6.197
+163.2393162,-760.5,-6.1799
+163.2393162,-731.25,-6.1459
+163.2393162,-702,-6.0951
+163.2393162,-672.75,-6.0276
+163.2393162,-643.5,-5.9432
+163.2393162,-614.25,-5.842
+163.2393162,-585,-5.724
+163.2393162,-555.75,-5.5892
+163.2393162,-526.5,-5.4376
+163.2393162,-497.25,-5.2691
+163.2393162,-468,-5.0839
+163.2393162,-438.75,-4.8818
+163.2393162,-409.5,-4.6629
+163.2393162,-380.25,-4.4272
+163.2393162,-351,-4.1748
+163.2393162,-321.75,-3.9054
+163.2393162,-292.5,-3.6193
+163.2393162,-263.25,-3.3164
+163.2393162,-234,-2.9967
+163.2393162,-204.75,-2.6601
+163.2393162,-175.5,-2.3067
+163.2393162,-146.25,-1.9366
+163.2393162,-117,-1.5496
+163.2393162,-87.75,-1.1458
+163.2393162,-58.5,-0.72519
+163.2393162,-29.25,-0.28777
+163.2393162,0,0.19264
+163.2393162,29.25,0.74902
+163.2393162,58.5,1.3226
+163.2393162,87.75,1.9132
+163.2393162,117,2.5211
+163.2393162,146.25,3.1461
+163.2393162,175.5,3.7882
+163.2393162,204.75,4.4475
+163.2393162,234,5.1239
+163.2393162,263.25,5.8175
+163.2393162,292.5,6.5283
+163.2393162,321.75,7.2561
+163.2393162,351,8.0012
+163.2393162,380.25,8.7634
+163.2393162,409.5,9.5427
+163.2393162,438.75,10.339
+163.2393162,468,11.153
+163.2393162,497.25,11.984
+163.2393162,526.5,12.832
+163.2393162,555.75,13.697
+163.2393162,585,14.579
+163.2393162,614.25,15.478
+163.2393162,643.5,16.395
+163.2393162,672.75,17.329
+163.2393162,702,18.279
+163.2393162,731.25,19.247
+163.2393162,760.5,20.233
+163.2393162,789.75,21.235
+163.2393162,819,22.254
+163.2393162,848.25,23.291
+163.2393162,877.5,24.345
+163.2393162,906.75,25.416
+163.2393162,936,26.504
+204.042735,-936,-9.9521
+204.042735,-906.75,-9.8951
+204.042735,-877.5,-9.8214
+204.042735,-848.25,-9.7308
+204.042735,-819,-9.6234
+204.042735,-789.75,-9.4992
+204.042735,-760.5,-9.3582
+204.042735,-731.25,-9.2004
+204.042735,-702,-9.0258
+204.042735,-672.75,-8.8343
+204.042735,-643.5,-8.626
+204.042735,-614.25,-8.401
+204.042735,-585,-8.1591
+204.042735,-555.75,-7.9004
+204.042735,-526.5,-7.6249
+204.042735,-497.25,-7.3326
+204.042735,-468,-7.0235
+204.042735,-438.75,-6.6975
+204.042735,-409.5,-6.3548
+204.042735,-380.25,-5.9952
+204.042735,-351,-5.6189
+204.042735,-321.75,-5.2257
+204.042735,-292.5,-4.8157
+204.042735,-263.25,-4.3889
+204.042735,-234,-3.9453
+204.042735,-204.75,-3.4849
+204.042735,-175.5,-3.0076
+204.042735,-146.25,-2.5136
+204.042735,-117,-2.0027
+204.042735,-87.75,-1.475
+204.042735,-58.5,-0.93057
+204.042735,-29.25,-0.36928
+204.042735,0,0.23641
+204.042735,29.25,0.91917
+204.042735,58.5,1.6191
+204.042735,87.75,2.3361
+204.042735,117,3.0704
+204.042735,146.25,3.8217
+204.042735,175.5,4.5902
+204.042735,204.75,5.3759
+204.042735,234,6.1787
+204.042735,263.25,6.9987
+204.042735,292.5,7.8358
+204.042735,321.75,8.6901
+204.042735,351,9.5615
+204.042735,380.25,10.45
+204.042735,409.5,11.356
+204.042735,438.75,12.279
+204.042735,468,13.219
+204.042735,497.25,14.176
+204.042735,526.5,15.15
+204.042735,555.75,16.142
+204.042735,585,17.15
+204.042735,614.25,18.176
+204.042735,643.5,19.219
+204.042735,672.75,20.279
+204.042735,702,21.356
+204.042735,731.25,22.451
+204.042735,760.5,23.562
+204.042735,789.75,24.691
+204.042735,819,25.837
+204.042735,848.25,27
+204.042735,877.5,28.18
+204.042735,906.75,29.377
+204.042735,936,30.592
+244.8547009,-936,-13.872
+244.8547009,-906.75,-13.691
+244.8547009,-877.5,-13.493
+244.8547009,-848.25,-13.279
+244.8547009,-819,-13.048
+244.8547009,-789.75,-12.8
+244.8547009,-760.5,-12.535
+244.8547009,-731.25,-12.253
+244.8547009,-702,-11.955
+244.8547009,-672.75,-11.639
+244.8547009,-643.5,-11.307
+244.8547009,-614.25,-10.958
+244.8547009,-585,-10.592
+244.8547009,-555.75,-10.21
+244.8547009,-526.5,-9.8105
+244.8547009,-497.25,-9.3943
+244.8547009,-468,-8.9613
+244.8547009,-438.75,-8.5115
+244.8547009,-409.5,-8.0448
+244.8547009,-380.25,-7.5614
+244.8547009,-351,-7.0612
+244.8547009,-321.75,-6.5441
+244.8547009,-292.5,-6.0103
+244.8547009,-263.25,-5.4596
+244.8547009,-234,-4.8921
+244.8547009,-204.75,-4.3078
+244.8547009,-175.5,-3.7067
+244.8547009,-146.25,-3.0888
+244.8547009,-117,-2.454
+244.8547009,-87.75,-1.8025
+244.8547009,-58.5,-1.1341
+244.8547009,-29.25,-0.44896
+244.8547009,0,0.28205
+244.8547009,29.25,1.0912
+244.8547009,58.5,1.9175
+244.8547009,87.75,2.7609
+244.8547009,117,3.6215
+244.8547009,146.25,4.4992
+244.8547009,175.5,5.3941
+244.8547009,204.75,6.3062
+244.8547009,234,7.2354
+244.8547009,263.25,8.1817
+244.8547009,292.5,9.1452
+244.8547009,321.75,10.126
+244.8547009,351,11.124
+244.8547009,380.25,12.139
+244.8547009,409.5,13.171
+244.8547009,438.75,14.22
+244.8547009,468,15.286
+244.8547009,497.25,16.37
+244.8547009,526.5,17.471
+244.8547009,555.75,18.588
+244.8547009,585,19.723
+244.8547009,614.25,20.876
+244.8547009,643.5,22.045
+244.8547009,672.75,23.231
+244.8547009,702,24.435
+244.8547009,731.25,25.656
+244.8547009,760.5,26.894
+244.8547009,789.75,28.149
+244.8547009,819,29.421
+244.8547009,848.25,30.71
+244.8547009,877.5,32.017
+244.8547009,906.75,33.34
+244.8547009,936,34.681
+285.6666667,-936,-17.79
+285.6666667,-906.75,-17.485
+285.6666667,-877.5,-17.164
+285.6666667,-848.25,-16.825
+285.6666667,-819,-16.47
+285.6666667,-789.75,-16.098
+285.6666667,-760.5,-15.709
+285.6666667,-731.25,-15.304
+285.6666667,-702,-14.881
+285.6666667,-672.75,-14.442
+285.6666667,-643.5,-13.986
+285.6666667,-614.25,-13.513
+285.6666667,-585,-13.024
+285.6666667,-555.75,-12.517
+285.6666667,-526.5,-11.994
+285.6666667,-497.25,-11.454
+285.6666667,-468,-10.897
+285.6666667,-438.75,-10.324
+285.6666667,-409.5,-9.7331
+285.6666667,-380.25,-9.1258
+285.6666667,-351,-8.5016
+285.6666667,-321.75,-7.8607
+285.6666667,-292.5,-7.203
+285.6666667,-263.25,-6.5284
+285.6666667,-234,-5.8371
+285.6666667,-204.75,-5.1289
+285.6666667,-175.5,-4.4039
+285.6666667,-146.25,-3.6621
+285.6666667,-117,-2.9035
+285.6666667,-87.75,-2.1281
+285.6666667,-58.5,-1.3359
+285.6666667,-29.25,-0.52683
+285.6666667,0,0.32954
+285.6666667,29.25,1.2651
+285.6666667,58.5,2.2177
+285.6666667,87.75,3.1875
+285.6666667,117,4.1745
+285.6666667,146.25,5.1786
+285.6666667,175.5,6.1999
+285.6666667,204.75,7.2383
+285.6666667,234,8.2939
+285.6666667,263.25,9.3666
+285.6666667,292.5,10.456
+285.6666667,321.75,11.563
+285.6666667,351,12.688
+285.6666667,380.25,13.829
+285.6666667,409.5,14.987
+285.6666667,438.75,16.163
+285.6666667,468,17.356
+285.6666667,497.25,18.566
+285.6666667,526.5,19.793
+285.6666667,555.75,21.037
+285.6666667,585,22.298
+285.6666667,614.25,23.577
+285.6666667,643.5,24.873
+285.6666667,672.75,26.185
+285.6666667,702,27.515
+285.6666667,731.25,28.863
+285.6666667,760.5,30.227
+285.6666667,789.75,31.608
+285.6666667,819,33.007
+285.6666667,848.25,34.423
+285.6666667,877.5,35.856
+285.6666667,906.75,37.306
+285.6666667,936,38.773
+326.4700855,-936,-21.706
+326.4700855,-906.75,-21.277
+326.4700855,-877.5,-20.832
+326.4700855,-848.25,-20.37
+326.4700855,-819,-19.891
+326.4700855,-789.75,-19.395
+326.4700855,-760.5,-18.882
+326.4700855,-731.25,-18.353
+326.4700855,-702,-17.807
+326.4700855,-672.75,-17.244
+326.4700855,-643.5,-16.664
+326.4700855,-614.25,-16.067
+326.4700855,-585,-15.454
+326.4700855,-555.75,-14.823
+326.4700855,-526.5,-14.176
+326.4700855,-497.25,-13.512
+326.4700855,-468,-12.831
+326.4700855,-438.75,-12.134
+326.4700855,-409.5,-11.419
+326.4700855,-380.25,-10.688
+326.4700855,-351,-9.9403
+326.4700855,-321.75,-9.1755
+326.4700855,-292.5,-8.3939
+326.4700855,-263.25,-7.5955
+326.4700855,-234,-6.7802
+326.4700855,-204.75,-5.9482
+326.4700855,-175.5,-5.0993
+326.4700855,-146.25,-4.2337
+326.4700855,-117,-3.3512
+326.4700855,-87.75,-2.4519
+326.4700855,-58.5,-1.5358
+326.4700855,-29.25,-0.60288
+326.4700855,0,0.37889
+326.4700855,29.25,1.4408
+326.4700855,58.5,2.5198
+326.4700855,87.75,3.616
+326.4700855,117,4.7293
+326.4700855,146.25,5.8598
+326.4700855,175.5,7.0075
+326.4700855,204.75,8.1723
+326.4700855,234,9.3542
+326.4700855,263.25,10.553
+326.4700855,292.5,11.77
+326.4700855,321.75,13.003
+326.4700855,351,14.254
+326.4700855,380.25,15.521
+326.4700855,409.5,16.806
+326.4700855,438.75,18.108
+326.4700855,468,19.427
+326.4700855,497.25,20.764
+326.4700855,526.5,22.117
+326.4700855,555.75,23.488
+326.4700855,585,24.875
+326.4700855,614.25,26.28
+326.4700855,643.5,27.702
+326.4700855,672.75,29.141
+326.4700855,702,30.598
+326.4700855,731.25,32.071
+326.4700855,760.5,33.562
+326.4700855,789.75,35.07
+326.4700855,819,36.595
+326.4700855,848.25,38.137
+326.4700855,877.5,39.696
+326.4700855,906.75,41.273
+326.4700855,936,42.866
+367.2820513,-936,-25.62
+367.2820513,-906.75,-25.068
+367.2820513,-877.5,-24.499
+367.2820513,-848.25,-23.912
+367.2820513,-819,-23.31
+367.2820513,-789.75,-22.69
+367.2820513,-760.5,-22.053
+367.2820513,-731.25,-21.4
+367.2820513,-702,-20.73
+367.2820513,-672.75,-20.043
+367.2820513,-643.5,-19.339
+367.2820513,-614.25,-18.619
+367.2820513,-585,-17.881
+367.2820513,-555.75,-17.127
+367.2820513,-526.5,-16.356
+367.2820513,-497.25,-15.568
+367.2820513,-468,-14.764
+367.2820513,-438.75,-13.942
+367.2820513,-409.5,-13.104
+367.2820513,-380.25,-12.249
+367.2820513,-351,-11.377
+367.2820513,-321.75,-10.488
+367.2820513,-292.5,-9.583
+367.2820513,-263.25,-8.6607
+367.2820513,-234,-7.7216
+367.2820513,-204.75,-6.7657
+367.2820513,-175.5,-5.7929
+367.2820513,-146.25,-4.8034
+367.2820513,-117,-3.797
+367.2820513,-87.75,-2.7739
+367.2820513,-58.5,-1.7339
+367.2820513,-29.25,-0.67711
+367.2820513,0,0.4301
+367.2820513,29.25,1.6184
+367.2820513,58.5,2.8238
+367.2820513,87.75,4.0463
+367.2820513,117,5.2861
+367.2820513,146.25,6.5429
+367.2820513,175.5,7.8169
+367.2820513,204.75,9.1081
+367.2820513,234,10.416
+367.2820513,263.25,11.742
+367.2820513,292.5,13.085
+367.2820513,321.75,14.444
+367.2820513,351,15.821
+367.2820513,380.25,17.215
+367.2820513,409.5,18.627
+367.2820513,438.75,20.055
+367.2820513,468,21.5
+367.2820513,497.25,22.963
+367.2820513,526.5,24.443
+367.2820513,555.75,25.94
+367.2820513,585,27.454
+367.2820513,614.25,28.985
+367.2820513,643.5,30.534
+367.2820513,672.75,32.099
+367.2820513,702,33.682
+367.2820513,731.25,35.282
+367.2820513,760.5,36.899
+367.2820513,789.75,38.533
+367.2820513,819,40.185
+367.2820513,848.25,41.853
+367.2820513,877.5,43.539
+367.2820513,906.75,45.241
+367.2820513,936,46.961
+408.0854701,-936,-29.533
+408.0854701,-906.75,-28.856
+408.0854701,-877.5,-28.163
+408.0854701,-848.25,-27.453
+408.0854701,-819,-26.727
+408.0854701,-789.75,-25.983
+408.0854701,-760.5,-25.223
+408.0854701,-731.25,-24.445
+408.0854701,-702,-23.651
+408.0854701,-672.75,-22.841
+408.0854701,-643.5,-22.013
+408.0854701,-614.25,-21.169
+408.0854701,-585,-20.307
+408.0854701,-555.75,-19.429
+408.0854701,-526.5,-18.534
+408.0854701,-497.25,-17.623
+408.0854701,-468,-16.694
+408.0854701,-438.75,-15.749
+408.0854701,-409.5,-14.787
+408.0854701,-380.25,-13.808
+408.0854701,-351,-12.812
+408.0854701,-321.75,-11.8
+408.0854701,-292.5,-10.77
+408.0854701,-263.25,-9.7241
+408.0854701,-234,-8.6611
+408.0854701,-204.75,-7.5813
+408.0854701,-175.5,-6.4847
+408.0854701,-146.25,-5.3713
+408.0854701,-117,-4.2411
+408.0854701,-87.75,-3.094
+408.0854701,-58.5,-1.9302
+408.0854701,-29.25,-0.74951
+408.0854701,0,0.48317
+408.0854701,29.25,1.7978
+408.0854701,58.5,3.1296
+408.0854701,87.75,4.4785
+408.0854701,117,5.8446
+408.0854701,146.25,7.2279
+408.0854701,175.5,8.6283
+408.0854701,204.75,10.046
+408.0854701,234,11.481
+408.0854701,263.25,12.932
+408.0854701,292.5,14.401
+408.0854701,321.75,15.888
+408.0854701,351,17.391
+408.0854701,380.25,18.911
+408.0854701,409.5,20.449
+408.0854701,438.75,22.004
+408.0854701,468,23.576
+408.0854701,497.25,25.165
+408.0854701,526.5,26.771
+408.0854701,555.75,28.394
+408.0854701,585,30.035
+408.0854701,614.25,31.692
+408.0854701,643.5,33.367
+408.0854701,672.75,35.059
+408.0854701,702,36.768
+408.0854701,731.25,38.494
+408.0854701,760.5,40.238
+408.0854701,789.75,41.998
+408.0854701,819,43.776
+408.0854701,848.25,45.571
+408.0854701,877.5,47.383
+408.0854701,906.75,49.212
+408.0854701,936,51.058
+448.8974359,-936,-33.443
+448.8974359,-906.75,-32.643
+448.8974359,-877.5,-31.826
+448.8974359,-848.25,-30.992
+448.8974359,-819,-30.142
+448.8974359,-789.75,-29.274
+448.8974359,-760.5,-28.39
+448.8974359,-731.25,-27.489
+448.8974359,-702,-26.571
+448.8974359,-672.75,-25.636
+448.8974359,-643.5,-24.685
+448.8974359,-614.25,-23.717
+448.8974359,-585,-22.732
+448.8974359,-555.75,-21.73
+448.8974359,-526.5,-20.711
+448.8974359,-497.25,-19.675
+448.8974359,-468,-18.623
+448.8974359,-438.75,-17.554
+448.8974359,-409.5,-16.468
+448.8974359,-380.25,-15.365
+448.8974359,-351,-14.245
+448.8974359,-321.75,-13.109
+448.8974359,-292.5,-11.956
+448.8974359,-263.25,-10.786
+448.8974359,-234,-9.5988
+448.8974359,-204.75,-8.3951
+448.8974359,-175.5,-7.1747
+448.8974359,-146.25,-5.9374
+448.8974359,-117,-4.6833
+448.8974359,-87.75,-3.4124
+448.8974359,-58.5,-2.1246
+448.8974359,-29.25,-0.82009
+448.8974359,0,0.53809
+448.8974359,29.25,1.9791
+448.8974359,58.5,3.4373
+448.8974359,87.75,4.9126
+448.8974359,117,6.4051
+448.8974359,146.25,7.9147
+448.8974359,175.5,9.4414
+448.8974359,204.75,10.985
+448.8974359,234,12.546
+448.8974359,263.25,14.125
+448.8974359,292.5,15.72
+448.8974359,321.75,17.333
+448.8974359,351,18.962
+448.8974359,380.25,20.609
+448.8974359,409.5,22.273
+448.8974359,438.75,23.954
+448.8974359,468,25.652
+448.8974359,497.25,27.368
+448.8974359,526.5,29.1
+448.8974359,555.75,30.85
+448.8974359,585,32.617
+448.8974359,614.25,34.401
+448.8974359,643.5,36.202
+448.8974359,672.75,38.021
+448.8974359,702,39.856
+448.8974359,731.25,41.709
+448.8974359,760.5,43.579
+448.8974359,789.75,45.465
+448.8974359,819,47.37
+448.8974359,848.25,49.291
+448.8974359,877.5,51.229
+448.8974359,906.75,53.185
+448.8974359,936,55.157
+489.7094017,-936,-37.352
+489.7094017,-906.75,-36.428
+489.7094017,-877.5,-35.487
+489.7094017,-848.25,-34.53
+489.7094017,-819,-33.555
+489.7094017,-789.75,-32.564
+489.7094017,-760.5,-31.556
+489.7094017,-731.25,-30.531
+489.7094017,-702,-29.489
+489.7094017,-672.75,-28.43
+489.7094017,-643.5,-27.355
+489.7094017,-614.25,-26.263
+489.7094017,-585,-25.154
+489.7094017,-555.75,-24.028
+489.7094017,-526.5,-22.885
+489.7094017,-497.25,-21.726
+489.7094017,-468,-20.55
+489.7094017,-438.75,-19.357
+489.7094017,-409.5,-18.147
+489.7094017,-380.25,-16.92
+489.7094017,-351,-15.677
+489.7094017,-321.75,-14.416
+489.7094017,-292.5,-13.139
+489.7094017,-263.25,-11.845
+489.7094017,-234,-10.535
+489.7094017,-204.75,-9.2071
+489.7094017,-175.5,-7.8628
+489.7094017,-146.25,-6.5016
+489.7094017,-117,-5.1236
+489.7094017,-87.75,-3.7289
+489.7094017,-58.5,-2.3173
+489.7094017,-29.25,-0.88886
+489.7094017,0,0.59487
+489.7094017,29.25,2.1623
+489.7094017,58.5,3.7468
+489.7094017,87.75,5.3485
+489.7094017,117,6.9673
+489.7094017,146.25,8.6033
+489.7094017,175.5,10.256
+489.7094017,204.75,11.927
+489.7094017,234,13.614
+489.7094017,263.25,15.319
+489.7094017,292.5,17.041
+489.7094017,321.75,18.779
+489.7094017,351,20.536
+489.7094017,380.25,22.309
+489.7094017,409.5,24.099
+489.7094017,438.75,25.907
+489.7094017,468,27.731
+489.7094017,497.25,29.573
+489.7094017,526.5,31.432
+489.7094017,555.75,33.308
+489.7094017,585,35.201
+489.7094017,614.25,37.112
+489.7094017,643.5,39.039
+489.7094017,672.75,40.984
+489.7094017,702,42.946
+489.7094017,731.25,44.925
+489.7094017,760.5,46.921
+489.7094017,789.75,48.934
+489.7094017,819,50.965
+489.7094017,848.25,53.012
+489.7094017,877.5,55.077
+489.7094017,906.75,57.159
+489.7094017,936,59.258
+816.1794872,-936,-68.557
+816.1794872,-906.75,-66.642
+816.1794872,-877.5,-64.711
+816.1794872,-848.25,-62.762
+816.1794872,-819,-60.796
+816.1794872,-789.75,-58.814
+816.1794872,-760.5,-56.815
+816.1794872,-731.25,-54.799
+816.1794872,-702,-52.766
+816.1794872,-672.75,-50.717
+816.1794872,-643.5,-48.65
+816.1794872,-614.25,-46.567
+816.1794872,-585,-44.467
+816.1794872,-555.75,-42.35
+816.1794872,-526.5,-40.217
+816.1794872,-497.25,-38.066
+816.1794872,-468,-35.899
+816.1794872,-438.75,-33.715
+816.1794872,-409.5,-31.514
+816.1794872,-380.25,-29.297
+816.1794872,-351,-27.062
+816.1794872,-321.75,-24.811
+816.1794872,-292.5,-22.543
+816.1794872,-263.25,-20.258
+816.1794872,-234,-17.956
+816.1794872,-204.75,-15.638
+816.1794872,-175.5,-13.302
+816.1794872,-146.25,-10.95
+816.1794872,-117,-8.5812
+816.1794872,-87.75,-6.1954
+816.1794872,-58.5,-3.7928
+816.1794872,-29.25,-1.3734
+816.1794872,0,1.116
+816.1794872,29.25,3.6944
+816.1794872,58.5,6.29
+816.1794872,87.75,8.9027
+816.1794872,117,11.533
+816.1794872,146.25,14.18
+816.1794872,175.5,16.844
+816.1794872,204.75,19.525
+816.1794872,234,22.223
+816.1794872,263.25,24.939
+816.1794872,292.5,27.672
+816.1794872,321.75,30.422
+816.1794872,351,33.189
+816.1794872,380.25,35.973
+816.1794872,409.5,38.774
+816.1794872,438.75,41.593
+816.1794872,468,44.429
+816.1794872,497.25,47.281
+816.1794872,526.5,50.151
+816.1794872,555.75,53.038
+816.1794872,585,55.943
+816.1794872,614.25,58.864
+816.1794872,643.5,61.803
+816.1794872,672.75,64.758
+816.1794872,702,67.731
+816.1794872,731.25,70.721
+816.1794872,760.5,73.728
+816.1794872,789.75,76.753
+816.1794872,819,79.794
+816.1794872,848.25,82.853
+816.1794872,877.5,85.929
+816.1794872,906.75,89.022
+816.1794872,936,92.132
+1020.25641,-936,-88.002
+1020.25641,-906.75,-85.467
+1020.25641,-877.5,-82.916
+1020.25641,-848.25,-80.348
+1020.25641,-819,-77.763
+1020.25641,-789.75,-75.161
+1020.25641,-760.5,-72.543
+1020.25641,-731.25,-69.908
+1020.25641,-702,-67.255
+1020.25641,-672.75,-64.586
+1020.25641,-643.5,-61.901
+1020.25641,-614.25,-59.198
+1020.25641,-585,-56.479
+1020.25641,-555.75,-53.743
+1020.25641,-526.5,-50.99
+1020.25641,-497.25,-48.22
+1020.25641,-468,-45.433
+1020.25641,-438.75,-42.63
+1020.25641,-409.5,-39.81
+1020.25641,-380.25,-36.973
+1020.25641,-351,-34.119
+1020.25641,-321.75,-31.248
+1020.25641,-292.5,-28.361
+1020.25641,-263.25,-25.456
+1020.25641,-234,-22.535
+1020.25641,-204.75,-19.597
+1020.25641,-175.5,-16.643
+1020.25641,-146.25,-13.671
+1020.25641,-117,-10.683
+1020.25641,-87.75,-7.6778
+1020.25641,-58.5,-4.6558
+1020.25641,-29.25,-1.6171
+1020.25641,0,1.5021
+1020.25641,29.25,4.7124
+1020.25641,58.5,7.9398
+1020.25641,87.75,11.184
+1020.25641,117,14.446
+1020.25641,146.25,17.725
+1020.25641,175.5,21.021
+1020.25641,204.75,24.334
+1020.25641,234,27.665
+1020.25641,263.25,31.012
+1020.25641,292.5,34.377
+1020.25641,321.75,37.758
+1020.25641,351,41.157
+1020.25641,380.25,44.574
+1020.25641,409.5,48.007
+1020.25641,438.75,51.457
+1020.25641,468,54.925
+1020.25641,497.25,58.409
+1020.25641,526.5,61.911
+1020.25641,555.75,65.43
+1020.25641,585,68.966
+1020.25641,614.25,72.52
+1020.25641,643.5,76.09
+1020.25641,672.75,79.678
+1020.25641,702,83.282
+1020.25641,731.25,86.904
+1020.25641,760.5,90.543
+1020.25641,789.75,94.2
+1020.25641,819,97.873
+1020.25641,848.25,101.56
+1020.25641,877.5,105.27
+1020.25641,906.75,109
+1020.25641,936,112.74
+1224.273504,-936,-107.4
+1224.273504,-906.75,-104.25
+1224.273504,-877.5,-101.08
+1224.273504,-848.25,-97.888
+1224.273504,-819,-94.684
+1224.273504,-789.75,-91.463
+1224.273504,-760.5,-88.225
+1224.273504,-731.25,-84.97
+1224.273504,-702,-81.699
+1224.273504,-672.75,-78.411
+1224.273504,-643.5,-75.106
+1224.273504,-614.25,-71.784
+1224.273504,-585,-68.445
+1224.273504,-555.75,-65.089
+1224.273504,-526.5,-61.717
+1224.273504,-497.25,-58.328
+1224.273504,-468,-54.922
+1224.273504,-438.75,-51.499
+1224.273504,-409.5,-48.06
+1224.273504,-380.25,-44.603
+1224.273504,-351,-41.13
+1224.273504,-321.75,-37.64
+1224.273504,-292.5,-34.133
+1224.273504,-263.25,-30.61
+1224.273504,-234,-27.069
+1224.273504,-204.75,-23.512
+1224.273504,-175.5,-19.938
+1224.273504,-146.25,-16.347
+1224.273504,-117,-12.739
+1224.273504,-87.75,-9.1147
+1224.273504,-58.5,-5.4734
+1224.273504,-29.25,-1.8152
+1224.273504,0,1.9346
+1224.273504,29.25,5.7768
+1224.273504,58.5,9.6361
+1224.273504,87.75,13.513
+1224.273504,117,17.406
+1224.273504,146.25,21.317
+1224.273504,175.5,25.245
+1224.273504,204.75,29.19
+1224.273504,234,33.152
+1224.273504,263.25,37.131
+1224.273504,292.5,41.128
+1224.273504,321.75,45.142
+1224.273504,351,49.173
+1224.273504,380.25,53.22
+1224.273504,409.5,57.286
+1224.273504,438.75,61.368
+1224.273504,468,65.467
+1224.273504,497.25,69.584
+1224.273504,526.5,73.718
+1224.273504,555.75,77.868
+1224.273504,585,82.037
+1224.273504,614.25,86.222
+1224.273504,643.5,90.424
+1224.273504,672.75,94.644
+1224.273504,702,98.88
+1224.273504,731.25,103.13
+1224.273504,760.5,107.4
+1224.273504,789.75,111.69
+1224.273504,819,116
+1224.273504,848.25,120.32
+1224.273504,877.5,124.66
+1224.273504,906.75,129.02
+1224.273504,936,133.39
+1428.290598,-936,-126.75
+1428.290598,-906.75,-122.98
+1428.290598,-877.5,-119.19
+1428.290598,-848.25,-115.38
+1428.290598,-819,-111.56
+1428.290598,-789.75,-107.72
+1428.290598,-760.5,-103.86
+1428.290598,-731.25,-99.988
+1428.290598,-702,-96.097
+1428.290598,-672.75,-92.189
+1428.290598,-643.5,-88.265
+1428.290598,-614.25,-84.324
+1428.290598,-585,-80.366
+1428.290598,-555.75,-76.391
+1428.290598,-526.5,-72.399
+1428.290598,-497.25,-68.391
+1428.290598,-468,-64.365
+1428.290598,-438.75,-60.323
+1428.290598,-409.5,-56.264
+1428.290598,-380.25,-52.188
+1428.290598,-351,-48.096
+1428.290598,-321.75,-43.986
+1428.290598,-292.5,-39.86
+1428.290598,-263.25,-35.717
+1428.290598,-234,-31.557
+1428.290598,-204.75,-27.381
+1428.290598,-175.5,-23.187
+1428.290598,-146.25,-18.977
+1428.290598,-117,-14.75
+1428.290598,-87.75,-10.506
+1428.290598,-58.5,-6.2453
+1428.290598,-29.25,-1.9678
+1428.290598,0,2.4136
+1428.290598,29.25,6.8876
+1428.290598,58.5,11.379
+1428.290598,87.75,15.887
+1428.290598,117,20.413
+1428.290598,146.25,24.955
+1428.290598,175.5,29.515
+1428.290598,204.75,34.092
+1428.290598,234,38.686
+1428.290598,263.25,43.297
+1428.290598,292.5,47.926
+1428.290598,321.75,52.571
+1428.290598,351,57.234
+1428.290598,380.25,61.914
+1428.290598,409.5,66.611
+1428.290598,438.75,71.325
+1428.290598,468,76.056
+1428.290598,497.25,80.805
+1428.290598,526.5,85.57
+1428.290598,555.75,90.353
+1428.290598,585,95.153
+1428.290598,614.25,99.97
+1428.290598,643.5,104.8
+1428.290598,672.75,109.66
+1428.290598,702,114.52
+1428.290598,731.25,119.41
+1428.290598,760.5,124.31
+1428.290598,789.75,129.23
+1428.290598,819,134.17
+1428.290598,848.25,139.12
+1428.290598,877.5,144.1
+1428.290598,906.75,149.08
+1428.290598,936,154.09
+1632.393162,-936,-146.06
+1632.393162,-906.75,-141.67
+1632.393162,-877.5,-137.26
+1632.393162,-848.25,-132.83
+1632.393162,-819,-128.39
+1632.393162,-789.75,-123.93
+1632.393162,-760.5,-119.45
+1632.393162,-731.25,-114.96
+1632.393162,-702,-110.45
+1632.393162,-672.75,-105.92
+1632.393162,-643.5,-101.38
+1632.393162,-614.25,-96.818
+1632.393162,-585,-92.241
+1632.393162,-555.75,-87.646
+1632.393162,-526.5,-83.035
+1632.393162,-497.25,-78.407
+1632.393162,-468,-73.763
+1632.393162,-438.75,-69.101
+1632.393162,-409.5,-64.423
+1632.393162,-380.25,-59.728
+1632.393162,-351,-55.016
+1632.393162,-321.75,-50.287
+1632.393162,-292.5,-45.542
+1632.393162,-263.25,-40.779
+1632.393162,-234,-36
+1632.393162,-204.75,-31.204
+1632.393162,-175.5,-26.391
+1632.393162,-146.25,-21.562
+1632.393162,-117,-16.715
+1632.393162,-87.75,-11.852
+1632.393162,-58.5,-6.9718
+1632.393162,-29.25,-2.0749
+1632.393162,0,2.939
+1632.393162,29.25,8.0449
+1632.393162,58.5,13.168
+1632.393162,87.75,18.308
+1632.393162,117,23.466
+1632.393162,146.25,28.64
+1632.393162,175.5,33.832
+1632.393162,204.75,39.041
+1632.393162,234,44.267
+1632.393162,263.25,49.51
+1632.393162,292.5,54.77
+1632.393162,321.75,60.047
+1632.393162,351,65.342
+1632.393162,380.25,70.654
+1632.393162,409.5,75.983
+1632.393162,438.75,81.329
+1632.393162,468,86.692
+1632.393162,497.25,92.072
+1632.393162,526.5,97.47
+1632.393162,555.75,102.88
+1632.393162,585,108.32
+1632.393162,614.25,113.77
+1632.393162,643.5,119.23
+1632.393162,672.75,124.71
+1632.393162,702,130.21
+1632.393162,731.25,135.73
+1632.393162,760.5,141.27
+1632.393162,789.75,146.82
+1632.393162,819,152.39
+1632.393162,848.25,157.97
+1632.393162,877.5,163.58
+1632.393162,906.75,169.2
+1632.393162,936,174.84
+1836.410256,-936,-165.32
+1836.410256,-906.75,-160.31
+1836.410256,-877.5,-155.28
+1836.410256,-848.25,-150.24
+1836.410256,-819,-145.17
+1836.410256,-789.75,-140.1
+1836.410256,-760.5,-135
+1836.410256,-731.25,-129.89
+1836.410256,-702,-124.76
+1836.410256,-672.75,-119.61
+1836.410256,-643.5,-114.45
+1836.410256,-614.25,-109.27
+1836.410256,-585,-104.07
+1836.410256,-555.75,-98.857
+1836.410256,-526.5,-93.626
+1836.410256,-497.25,-88.379
+1836.410256,-468,-83.115
+1836.410256,-438.75,-77.834
+1836.410256,-409.5,-72.536
+1836.410256,-380.25,-67.222
+1836.410256,-351,-61.891
+1836.410256,-321.75,-56.542
+1836.410256,-292.5,-51.177
+1836.410256,-263.25,-45.796
+1836.410256,-234,-40.397
+1836.410256,-204.75,-34.982
+1836.410256,-175.5,-29.55
+1836.410256,-146.25,-24.101
+1836.410256,-117,-18.635
+1836.410256,-87.75,-13.152
+1836.410256,-58.5,-7.6528
+1836.410256,-29.25,-2.1365
+1836.410256,0,3.5108
+1836.410256,29.25,9.2486
+1836.410256,58.5,15.004
+1836.410256,87.75,20.776
+1836.410256,117,26.565
+1836.410256,146.25,32.371
+1836.410256,175.5,38.195
+1836.410256,204.75,44.036
+1836.410256,234,49.893
+1836.410256,263.25,55.768
+1836.410256,292.5,61.661
+1836.410256,321.75,67.57
+1836.410256,351,73.496
+1836.410256,380.25,79.44
+1836.410256,409.5,85.401
+1836.410256,438.75,91.379
+1836.410256,468,97.374
+1836.410256,497.25,103.39
+1836.410256,526.5,109.42
+1836.410256,555.75,115.46
+1836.410256,585,121.53
+1836.410256,614.25,127.61
+1836.410256,643.5,133.7
+1836.410256,672.75,139.82
+1836.410256,702,145.95
+1836.410256,731.25,152.1
+1836.410256,760.5,158.27
+1836.410256,789.75,164.45
+1836.410256,819,170.65
+1836.410256,848.25,176.87
+1836.410256,877.5,183.11
+1836.410256,906.75,189.36
+1836.410256,936,195.63
+2040.42735,-936,-184.54
+2040.42735,-906.75,-178.91
+2040.42735,-877.5,-173.26
+2040.42735,-848.25,-167.59
+2040.42735,-819,-161.91
+2040.42735,-789.75,-156.21
+2040.42735,-760.5,-150.5
+2040.42735,-731.25,-144.77
+2040.42735,-702,-139.02
+2040.42735,-672.75,-133.25
+2040.42735,-643.5,-127.47
+2040.42735,-614.25,-121.67
+2040.42735,-585,-115.85
+2040.42735,-555.75,-110.02
+2040.42735,-526.5,-104.17
+2040.42735,-497.25,-98.305
+2040.42735,-468,-92.421
+2040.42735,-438.75,-86.521
+2040.42735,-409.5,-80.604
+2040.42735,-380.25,-74.67
+2040.42735,-351,-68.72
+2040.42735,-321.75,-62.752
+2040.42735,-292.5,-56.768
+2040.42735,-263.25,-50.767
+2040.42735,-234,-44.749
+2040.42735,-204.75,-38.714
+2040.42735,-175.5,-32.662
+2040.42735,-146.25,-26.594
+2040.42735,-117,-20.509
+2040.42735,-87.75,-14.407
+2040.42735,-58.5,-8.2882
+2040.42735,-29.25,-2.1526
+2040.42735,0,4.1291
+2040.42735,29.25,10.499
+2040.42735,58.5,16.886
+2040.42735,87.75,23.29
+2040.42735,117,29.711
+2040.42735,146.25,36.149
+2040.42735,175.5,42.604
+2040.42735,204.75,49.077
+2040.42735,234,55.567
+2040.42735,263.25,62.074
+2040.42735,292.5,68.598
+2040.42735,321.75,75.139
+2040.42735,351,81.697
+2040.42735,380.25,88.273
+2040.42735,409.5,94.865
+2040.42735,438.75,101.48
+2040.42735,468,108.1
+2040.42735,497.25,114.75
+2040.42735,526.5,121.41
+2040.42735,555.75,128.09
+2040.42735,585,134.78
+2040.42735,614.25,141.49
+2040.42735,643.5,148.22
+2040.42735,672.75,154.97
+2040.42735,702,161.74
+2040.42735,731.25,168.52
+2040.42735,760.5,175.31
+2040.42735,789.75,182.13
+2040.42735,819,188.96
+2040.42735,848.25,195.81
+2040.42735,877.5,202.68
+2040.42735,906.75,209.56
+2040.42735,936,216.47
+2244.529915,-936,-203.71
+2244.529915,-906.75,-197.46
+2244.529915,-877.5,-191.19
+2244.529915,-848.25,-184.91
+2244.529915,-819,-178.61
+2244.529915,-789.75,-172.29
+2244.529915,-760.5,-165.95
+2244.529915,-731.25,-159.6
+2244.529915,-702,-153.23
+2244.529915,-672.75,-146.85
+2244.529915,-643.5,-140.45
+2244.529915,-614.25,-134.03
+2244.529915,-585,-127.59
+2244.529915,-555.75,-121.14
+2244.529915,-526.5,-114.67
+2244.529915,-497.25,-108.19
+2244.529915,-468,-101.68
+2244.529915,-438.75,-95.163
+2244.529915,-409.5,-88.626
+2244.529915,-380.25,-82.073
+2244.529915,-351,-75.503
+2244.529915,-321.75,-68.916
+2244.529915,-292.5,-62.313
+2244.529915,-263.25,-55.692
+2244.529915,-234,-49.055
+2244.529915,-204.75,-42.401
+2244.529915,-175.5,-35.73
+2244.529915,-146.25,-29.042
+2244.529915,-117,-22.338
+2244.529915,-87.75,-15.616
+2244.529915,-58.5,-8.8781
+2244.529915,-29.25,-2.1231
+2244.529915,0,4.7938
+2244.529915,29.25,11.795
+2244.529915,58.5,18.814
+2244.529915,87.75,25.85
+2244.529915,117,32.903
+2244.529915,146.25,39.973
+2244.529915,175.5,47.06
+2244.529915,204.75,54.165
+2244.529915,234,61.287
+2244.529915,263.25,68.425
+2244.529915,292.5,75.581
+2244.529915,321.75,82.754
+2244.529915,351,89.945
+2244.529915,380.25,97.152
+2244.529915,409.5,104.38
+2244.529915,438.75,111.62
+2244.529915,468,118.88
+2244.529915,497.25,126.15
+2244.529915,526.5,133.45
+2244.529915,555.75,140.76
+2244.529915,585,148.08
+2244.529915,614.25,155.43
+2244.529915,643.5,162.79
+2244.529915,672.75,170.17
+2244.529915,702,177.57
+2244.529915,731.25,184.98
+2244.529915,760.5,192.41
+2244.529915,789.75,199.86
+2244.529915,819,207.32
+2244.529915,848.25,214.8
+2244.529915,877.5,222.3
+2244.529915,906.75,229.82
+2244.529915,936,237.35
+2448.547009,-936,-222.84
+2448.547009,-906.75,-215.97
+2448.547009,-877.5,-209.08
+2448.547009,-848.25,-202.18
+2448.547009,-819,-195.25
+2448.547009,-789.75,-188.32
+2448.547009,-760.5,-181.36
+2448.547009,-731.25,-174.39
+2448.547009,-702,-167.4
+2448.547009,-672.75,-160.4
+2448.547009,-643.5,-153.38
+2448.547009,-614.25,-146.34
+2448.547009,-585,-139.29
+2448.547009,-555.75,-132.21
+2448.547009,-526.5,-125.13
+2448.547009,-497.25,-118.02
+2448.547009,-468,-110.9
+2448.547009,-438.75,-103.76
+2448.547009,-409.5,-96.603
+2448.547009,-380.25,-89.431
+2448.547009,-351,-82.241
+2448.547009,-321.75,-75.035
+2448.547009,-292.5,-67.812
+2448.547009,-263.25,-60.572
+2448.547009,-234,-53.315
+2448.547009,-204.75,-46.042
+2448.547009,-175.5,-38.752
+2448.547009,-146.25,-31.445
+2448.547009,-117,-24.121
+2448.547009,-87.75,-16.78
+2448.547009,-58.5,-9.4225
+2448.547009,-29.25,-2.0481
+2448.547009,0,5.505
+2448.547009,29.25,13.138
+2448.547009,58.5,20.789
+2448.547009,87.75,28.457
+2448.547009,117,36.142
+2448.547009,146.25,43.844
+2448.547009,175.5,51.563
+2448.547009,204.75,59.299
+2448.547009,234,67.053
+2448.547009,263.25,74.823
+2448.547009,292.5,82.611
+2448.547009,321.75,90.416
+2448.547009,351,98.238
+2448.547009,380.25,106.08
+2448.547009,409.5,113.93
+2448.547009,438.75,121.81
+2448.547009,468,129.7
+2448.547009,497.25,137.61
+2448.547009,526.5,145.53
+2448.547009,555.75,153.47
+2448.547009,585,161.43
+2448.547009,614.25,169.41
+2448.547009,643.5,177.4
+2448.547009,672.75,185.41
+2448.547009,702,193.44
+2448.547009,731.25,201.49
+2448.547009,760.5,209.55
+2448.547009,789.75,217.63
+2448.547009,819,225.72
+2448.547009,848.25,233.84
+2448.547009,877.5,241.97
+2448.547009,906.75,250.12
+2448.547009,936,258.28
+2652.564103,-936,-241.92
+2652.564103,-906.75,-234.43
+2652.564103,-877.5,-226.92
+2652.564103,-848.25,-219.4
+2652.564103,-819,-211.86
+2652.564103,-789.75,-204.3
+2652.564103,-760.5,-196.73
+2652.564103,-731.25,-189.14
+2652.564103,-702,-181.53
+2652.564103,-672.75,-173.91
+2652.564103,-643.5,-166.27
+2652.564103,-614.25,-158.61
+2652.564103,-585,-150.93
+2652.564103,-555.75,-143.24
+2652.564103,-526.5,-135.53
+2652.564103,-497.25,-127.81
+2652.564103,-468,-120.07
+2652.564103,-438.75,-112.31
+2652.564103,-409.5,-104.53
+2652.564103,-380.25,-96.743
+2652.564103,-351,-88.934
+2652.564103,-321.75,-81.108
+2652.564103,-292.5,-73.266
+2652.564103,-263.25,-65.407
+2652.564103,-234,-57.531
+2652.564103,-204.75,-49.638
+2652.564103,-175.5,-41.728
+2652.564103,-146.25,-33.802
+2652.564103,-117,-25.858
+2652.564103,-87.75,-17.898
+2652.564103,-58.5,-9.9213
+2652.564103,-29.25,-1.9276
+2652.564103,0,6.2626
+2652.564103,29.25,14.528
+2652.564103,58.5,22.81
+2652.564103,87.75,31.11
+2652.564103,117,39.427
+2652.564103,146.25,47.761
+2652.564103,175.5,56.112
+2652.564103,204.75,64.48
+2652.564103,234,72.865
+2652.564103,263.25,81.268
+2652.564103,292.5,89.688
+2652.564103,321.75,98.125
+2652.564103,351,106.58
+2652.564103,380.25,115.05
+2652.564103,409.5,123.54
+2652.564103,438.75,132.04
+2652.564103,468,140.57
+2652.564103,497.25,149.11
+2652.564103,526.5,157.66
+2652.564103,555.75,166.24
+2652.564103,585,174.83
+2652.564103,614.25,183.44
+2652.564103,643.5,192.06
+2652.564103,672.75,200.7
+2652.564103,702,209.36
+2652.564103,731.25,218.04
+2652.564103,760.5,226.74
+2652.564103,789.75,235.45
+2652.564103,819,244.17
+2652.564103,848.25,252.92
+2652.564103,877.5,261.68
+2652.564103,906.75,270.46
+2652.564103,936,279.26
+2856.666667,-936,-260.95
+2856.666667,-906.75,-252.84
+2856.666667,-877.5,-244.72
+2856.666667,-848.25,-236.57
+2856.666667,-819,-228.41
+2856.666667,-789.75,-220.24
+2856.666667,-760.5,-212.05
+2856.666667,-731.25,-203.84
+2856.666667,-702,-195.61
+2856.666667,-672.75,-187.37
+2856.666667,-643.5,-179.11
+2856.666667,-614.25,-170.83
+2856.666667,-585,-162.54
+2856.666667,-555.75,-154.22
+2856.666667,-526.5,-145.9
+2856.666667,-497.25,-137.55
+2856.666667,-468,-129.19
+2856.666667,-438.75,-120.81
+2856.666667,-409.5,-112.42
+2856.666667,-380.25,-104.01
+2856.666667,-351,-95.581
+2856.666667,-321.75,-87.136
+2856.666667,-292.5,-78.674
+2856.666667,-263.25,-70.195
+2856.666667,-234,-61.7
+2856.666667,-204.75,-53.188
+2856.666667,-175.5,-44.659
+2856.666667,-146.25,-36.113
+2856.666667,-117,-27.55
+2856.666667,-87.75,-18.971
+2856.666667,-58.5,-10.375
+2856.666667,-29.25,-1.7616
+2856.666667,0,7.0667
+2856.666667,29.25,15.964
+2856.666667,58.5,24.878
+2856.666667,87.75,33.81
+2856.666667,117,42.758
+2856.666667,146.25,51.724
+2856.666667,175.5,60.707
+2856.666667,204.75,69.707
+2856.666667,234,78.725
+2856.666667,263.25,87.759
+2856.666667,292.5,96.811
+2856.666667,321.75,105.88
+2856.666667,351,114.97
+2856.666667,380.25,124.07
+2856.666667,409.5,133.19
+2856.666667,438.75,142.33
+2856.666667,468,151.48
+2856.666667,497.25,160.65
+2856.666667,526.5,169.84
+2856.666667,555.75,179.05
+2856.666667,585,188.27
+2856.666667,614.25,197.51
+2856.666667,643.5,206.77
+2856.666667,672.75,216.04
+2856.666667,702,225.33
+2856.666667,731.25,234.64
+2856.666667,760.5,243.97
+2856.666667,789.75,253.31
+2856.666667,819,262.67
+2856.666667,848.25,272.05
+2856.666667,877.5,281.44
+2856.666667,906.75,290.86
+2856.666667,936,300.28
+3060.683761,-936,-279.94
+3060.683761,-906.75,-271.21
+3060.683761,-877.5,-262.47
+3060.683761,-848.25,-253.7
+3060.683761,-819,-244.93
+3060.683761,-789.75,-236.13
+3060.683761,-760.5,-227.32
+3060.683761,-731.25,-218.49
+3060.683761,-702,-209.64
+3060.683761,-672.75,-200.78
+3060.683761,-643.5,-191.9
+3060.683761,-614.25,-183
+3060.683761,-585,-174.09
+3060.683761,-555.75,-165.16
+3060.683761,-526.5,-156.22
+3060.683761,-497.25,-147.25
+3060.683761,-468,-138.27
+3060.683761,-438.75,-129.27
+3060.683761,-409.5,-120.26
+3060.683761,-380.25,-111.23
+3060.683761,-351,-102.18
+3060.683761,-321.75,-93.118
+3060.683761,-292.5,-84.037
+3060.683761,-263.25,-74.939
+3060.683761,-234,-65.824
+3060.683761,-204.75,-56.693
+3060.683761,-175.5,-47.544
+3060.683761,-146.25,-38.379
+3060.683761,-117,-29.197
+3060.683761,-87.75,-19.998
+3060.683761,-58.5,-10.782
+3060.683761,-29.25,-1.55
+3060.683761,0,7.9172
+3060.683761,29.25,17.446
+3060.683761,58.5,26.993
+3060.683761,87.75,36.556
+3060.683761,117,46.136
+3060.683761,146.25,55.734
+3060.683761,175.5,65.349
+3060.683761,204.75,74.981
+3060.683761,234,84.63
+3060.683761,263.25,94.296
+3060.683761,292.5,103.98
+3060.683761,321.75,113.68
+3060.683761,351,123.4
+3060.683761,380.25,133.13
+3060.683761,409.5,142.89
+3060.683761,438.75,152.65
+3060.683761,468,162.44
+3060.683761,497.25,172.24
+3060.683761,526.5,182.06
+3060.683761,555.75,191.9
+3060.683761,585,201.76
+3060.683761,614.25,211.63
+3060.683761,643.5,221.52
+3060.683761,672.75,231.43
+3060.683761,702,241.35
+3060.683761,731.25,251.29
+3060.683761,760.5,261.25
+3060.683761,789.75,271.22
+3060.683761,819,281.21
+3060.683761,848.25,291.22
+3060.683761,877.5,301.25
+3060.683761,906.75,311.29
+3060.683761,936,321.35
+3264.700855,-936,-298.88
+3264.700855,-906.75,-289.53
+3264.700855,-877.5,-280.17
+3264.700855,-848.25,-270.79
+3264.700855,-819,-261.39
+3264.700855,-789.75,-251.98
+3264.700855,-760.5,-242.54
+3264.700855,-731.25,-233.1
+3264.700855,-702,-223.63
+3264.700855,-672.75,-214.15
+3264.700855,-643.5,-204.65
+3264.700855,-614.25,-195.14
+3264.700855,-585,-185.6
+3264.700855,-555.75,-176.05
+3264.700855,-526.5,-166.49
+3264.700855,-497.25,-156.9
+3264.700855,-468,-147.3
+3264.700855,-438.75,-137.69
+3264.700855,-409.5,-128.06
+3264.700855,-380.25,-118.41
+3264.700855,-351,-108.74
+3264.700855,-321.75,-99.055
+3264.700855,-292.5,-89.354
+3264.700855,-263.25,-79.637
+3264.700855,-234,-69.903
+3264.700855,-204.75,-60.152
+3264.700855,-175.5,-50.384
+3264.700855,-146.25,-40.599
+3264.700855,-117,-30.798
+3264.700855,-87.75,-20.98
+3264.700855,-58.5,-11.145
+3264.700855,-29.25,-1.2929
+3264.700855,0,8.8141
+3264.700855,29.25,18.975
+3264.700855,58.5,29.153
+3264.700855,87.75,39.348
+3264.700855,117,49.561
+3264.700855,146.25,59.79
+3264.700855,175.5,70.037
+3264.700855,204.75,80.301
+3264.700855,234,90.582
+3264.700855,263.25,100.88
+3264.700855,292.5,111.2
+3264.700855,321.75,121.53
+3264.700855,351,131.88
+3264.700855,380.25,142.24
+3264.700855,409.5,152.63
+3264.700855,438.75,163.03
+3264.700855,468,173.45
+3264.700855,497.25,183.88
+3264.700855,526.5,194.34
+3264.700855,555.75,204.81
+3264.700855,585,215.29
+3264.700855,614.25,225.8
+3264.700855,643.5,236.32
+3264.700855,672.75,246.86
+3264.700855,702,257.41
+3264.700855,731.25,267.98
+3264.700855,760.5,278.57
+3264.700855,789.75,289.18
+3264.700855,819,299.8
+3264.700855,848.25,310.45
+3264.700855,877.5,321.1
+3264.700855,906.75,331.78
+3264.700855,936,342.47
+3468.803419,-936,-317.78
+3468.803419,-906.75,-307.81
+3468.803419,-877.5,-297.83
+3468.803419,-848.25,-287.83
+3468.803419,-819,-277.81
+3468.803419,-789.75,-267.78
+3468.803419,-760.5,-257.73
+3468.803419,-731.25,-247.66
+3468.803419,-702,-237.57
+3468.803419,-672.75,-227.47
+3468.803419,-643.5,-217.35
+3468.803419,-614.25,-207.22
+3468.803419,-585,-197.07
+3468.803419,-555.75,-186.9
+3468.803419,-526.5,-176.71
+3468.803419,-497.25,-166.51
+3468.803419,-468,-156.29
+3468.803419,-438.75,-146.06
+3468.803419,-409.5,-135.8
+3468.803419,-380.25,-125.53
+3468.803419,-351,-115.25
+3468.803419,-321.75,-104.95
+3468.803419,-292.5,-94.626
+3468.803419,-263.25,-84.289
+3468.803419,-234,-73.936
+3468.803419,-204.75,-63.565
+3468.803419,-175.5,-53.178
+3468.803419,-146.25,-42.774
+3468.803419,-117,-32.353
+3468.803419,-87.75,-21.916
+3468.803419,-58.5,-11.462
+3468.803419,-29.25,-0.99032
+3468.803419,0,9.7575
+3468.803419,29.25,20.55
+3468.803419,58.5,31.36
+3468.803419,87.75,42.188
+3468.803419,117,53.032
+3468.803419,146.25,63.893
+3468.803419,175.5,74.772
+3468.803419,204.75,85.668
+3468.803419,234,96.581
+3468.803419,263.25,107.51
+3468.803419,292.5,118.46
+3468.803419,321.75,129.42
+3468.803419,351,140.4
+3468.803419,380.25,151.4
+3468.803419,409.5,162.42
+3468.803419,438.75,173.45
+3468.803419,468,184.5
+3468.803419,497.25,195.57
+3468.803419,526.5,206.65
+3468.803419,555.75,217.75
+3468.803419,585,228.87
+3468.803419,614.25,240.01
+3468.803419,643.5,251.16
+3468.803419,672.75,262.33
+3468.803419,702,273.52
+3468.803419,731.25,284.72
+3468.803419,760.5,295.95
+3468.803419,789.75,307.18
+3468.803419,819,318.44
+3468.803419,848.25,329.71
+3468.803419,877.5,341
+3468.803419,906.75,352.31
+3468.803419,936,363.64
+3672.820513,-936,-336.63
+3672.820513,-906.75,-326.05
+3672.820513,-877.5,-315.44
+3672.820513,-848.25,-304.82
+3672.820513,-819,-294.19
+3672.820513,-789.75,-283.53
+3672.820513,-760.5,-272.86
+3672.820513,-731.25,-262.18
+3672.820513,-702,-251.47
+3672.820513,-672.75,-240.75
+3672.820513,-643.5,-230.01
+3672.820513,-614.25,-219.26
+3672.820513,-585,-208.49
+3672.820513,-555.75,-197.7
+3672.820513,-526.5,-186.9
+3672.820513,-497.25,-176.07
+3672.820513,-468,-165.24
+3672.820513,-438.75,-154.38
+3672.820513,-409.5,-143.51
+3672.820513,-380.25,-132.62
+3672.820513,-351,-121.71
+3672.820513,-321.75,-110.79
+3672.820513,-292.5,-99.852
+3672.820513,-263.25,-88.896
+3672.820513,-234,-77.923
+3672.820513,-204.75,-66.933
+3672.820513,-175.5,-55.927
+3672.820513,-146.25,-44.904
+3672.820513,-117,-33.863
+3672.820513,-87.75,-22.806
+3672.820513,-58.5,-11.733
+3672.820513,-29.25,-0.64219
+3672.820513,0,10.747
+3672.820513,29.25,22.172
+3672.820513,58.5,33.614
+3672.820513,87.75,45.073
+3672.820513,117,56.549
+3672.820513,146.25,68.043
+3672.820513,175.5,79.553
+3672.820513,204.75,91.081
+3672.820513,234,102.63
+3672.820513,263.25,114.19
+3672.820513,292.5,125.77
+3672.820513,321.75,137.36
+3672.820513,351,148.98
+3672.820513,380.25,160.61
+3672.820513,409.5,172.25
+3672.820513,438.75,183.92
+3672.820513,468,195.6
+3672.820513,497.25,207.3
+3672.820513,526.5,219.02
+3672.820513,555.75,230.75
+3672.820513,585,242.5
+3672.820513,614.25,254.27
+3672.820513,643.5,266.05
+3672.820513,672.75,277.86
+3672.820513,702,289.67
+3672.820513,731.25,301.51
+3672.820513,760.5,313.36
+3672.820513,789.75,325.23
+3672.820513,819,337.12
+3672.820513,848.25,349.03
+3672.820513,877.5,360.95
+3672.820513,906.75,372.89
+3672.820513,936,384.85
+3876.837607,-936,-355.44
+3876.837607,-906.75,-344.23
+3876.837607,-877.5,-333.01
+3876.837607,-848.25,-321.77
+3876.837607,-819,-310.52
+3876.837607,-789.75,-299.24
+3876.837607,-760.5,-287.95
+3876.837607,-731.25,-276.65
+3876.837607,-702,-265.32
+3876.837607,-672.75,-253.98
+3876.837607,-643.5,-242.63
+3876.837607,-614.25,-231.25
+3876.837607,-585,-219.86
+3876.837607,-555.75,-208.45
+3876.837607,-526.5,-197.03
+3876.837607,-497.25,-185.59
+3876.837607,-468,-174.13
+3876.837607,-438.75,-162.66
+3876.837607,-409.5,-151.17
+3876.837607,-380.25,-139.66
+3876.837607,-351,-128.13
+3876.837607,-321.75,-116.59
+3876.837607,-292.5,-105.03
+3876.837607,-263.25,-93.457
+3876.837607,-234,-81.865
+3876.837607,-204.75,-70.256
+3876.837607,-175.5,-58.63
+3876.837607,-146.25,-46.987
+3876.837607,-117,-35.328
+3876.837607,-87.75,-23.652
+3876.837607,-58.5,-11.958
+3876.837607,-29.25,-0.24855
+3876.837607,0,11.784
+3876.837607,29.25,23.84
+3876.837607,58.5,35.914
+3876.837607,87.75,48.005
+3876.837607,117,60.113
+3876.837607,146.25,72.238
+3876.837607,175.5,84.381
+3876.837607,204.75,96.54
+3876.837607,234,108.72
+3876.837607,263.25,120.91
+3876.837607,292.5,133.12
+3876.837607,321.75,145.35
+3876.837607,351,157.59
+3876.837607,380.25,169.86
+3876.837607,409.5,182.14
+3876.837607,438.75,194.43
+3876.837607,468,206.75
+3876.837607,497.25,219.08
+3876.837607,526.5,231.43
+3876.837607,555.75,243.79
+3876.837607,585,256.17
+3876.837607,614.25,268.57
+3876.837607,643.5,280.99
+3876.837607,672.75,293.42
+3876.837607,702,305.88
+3876.837607,731.25,318.34
+3876.837607,760.5,330.83
+3876.837607,789.75,343.33
+3876.837607,819,355.85
+3876.837607,848.25,368.39
+3876.837607,877.5,380.94
+3876.837607,906.75,393.51
+3876.837607,936,406.1
+4080.854701,-936,-374.2
+4080.854701,-906.75,-362.38
+4080.854701,-877.5,-350.53
+4080.854701,-848.25,-338.67
+4080.854701,-819,-326.8
+4080.854701,-789.75,-314.91
+4080.854701,-760.5,-303
+4080.854701,-731.25,-291.07
+4080.854701,-702,-279.13
+4080.854701,-672.75,-267.17
+4080.854701,-643.5,-255.19
+4080.854701,-614.25,-243.2
+4080.854701,-585,-231.19
+4080.854701,-555.75,-219.16
+4080.854701,-526.5,-207.12
+4080.854701,-497.25,-195.06
+4080.854701,-468,-182.98
+4080.854701,-438.75,-170.89
+4080.854701,-409.5,-158.78
+4080.854701,-380.25,-146.65
+4080.854701,-351,-134.51
+4080.854701,-321.75,-122.35
+4080.854701,-292.5,-110.17
+4080.854701,-263.25,-97.973
+4080.854701,-234,-85.761
+4080.854701,-204.75,-73.533
+4080.854701,-175.5,-61.288
+4080.854701,-146.25,-49.026
+4080.854701,-117,-36.747
+4080.854701,-87.75,-24.451
+4080.854701,-58.5,-12.139
+4080.854701,-29.25,0.19499
+4080.854701,0,12.866
+4080.854701,29.25,25.555
+4080.854701,58.5,38.26
+4080.854701,87.75,50.983
+4080.854701,117,63.723
+4080.854701,146.25,76.48
+4080.854701,175.5,89.255
+4080.854701,204.75,102.05
+4080.854701,234,114.85
+4080.854701,263.25,127.68
+4080.854701,292.5,140.52
+4080.854701,321.75,153.38
+4080.854701,351,166.26
+4080.854701,380.25,179.15
+4080.854701,409.5,192.07
+4080.854701,438.75,204.99
+4080.854701,468,217.94
+4080.854701,497.25,230.9
+4080.854701,526.5,243.88
+4080.854701,555.75,256.88
+4080.854701,585,269.89
+4080.854701,614.25,282.93
+4080.854701,643.5,295.97
+4080.854701,672.75,309.04
+4080.854701,702,322.12
+4080.854701,731.25,335.22
+4080.854701,760.5,348.34
+4080.854701,789.75,361.48
+4080.854701,819,374.63
+4080.854701,848.25,387.8
+4080.854701,877.5,400.98
+4080.854701,906.75,414.18
+4080.854701,936,427.4
+4268.632479,-936,-391.42
+4268.632479,-906.75,-379.03
+4268.632479,-877.5,-366.61
+4268.632479,-848.25,-354.19
+4268.632479,-819,-341.74
+4268.632479,-789.75,-329.28
+4268.632479,-760.5,-316.8
+4268.632479,-731.25,-304.3
+4268.632479,-702,-291.79
+4268.632479,-672.75,-279.26
+4268.632479,-643.5,-266.72
+4268.632479,-614.25,-254.15
+4268.632479,-585,-241.57
+4268.632479,-555.75,-228.98
+4268.632479,-526.5,-216.36
+4268.632479,-497.25,-203.73
+4268.632479,-468,-191.09
+4268.632479,-438.75,-178.42
+4268.632479,-409.5,-165.74
+4268.632479,-380.25,-153.04
+4268.632479,-351,-140.33
+4268.632479,-321.75,-127.6
+4268.632479,-292.5,-114.85
+4268.632479,-263.25,-102.09
+4268.632479,-234,-89.306
+4268.632479,-204.75,-76.508
+4268.632479,-175.5,-63.693
+4268.632479,-146.25,-50.861
+4268.632479,-117,-38.012
+4268.632479,-87.75,-25.147
+4268.632479,-58.5,-12.264
+4268.632479,-29.25,0.65077
+4268.632479,0,13.903
+4268.632479,29.25,27.173
+4268.632479,58.5,40.46
+4268.632479,87.75,53.764
+4268.632479,117,67.086
+4268.632479,146.25,80.424
+4268.632479,175.5,93.78
+4268.632479,204.75,107.15
+4268.632479,234,120.54
+4268.632479,263.25,133.95
+4268.632479,292.5,147.37
+4268.632479,321.75,160.81
+4268.632479,351,174.27
+4268.632479,380.25,187.75
+4268.632479,409.5,201.24
+4268.632479,438.75,214.75
+4268.632479,468,228.28
+4268.632479,497.25,241.82
+4268.632479,526.5,255.38
+4268.632479,555.75,268.96
+4268.632479,585,282.56
+4268.632479,614.25,296.17
+4268.632479,643.5,309.8
+4268.632479,672.75,323.45
+4268.632479,702,337.11
+4268.632479,731.25,350.79
+4268.632479,760.5,364.49
+4268.632479,789.75,378.21
+4268.632479,819,391.94
+4268.632479,848.25,405.69
+4268.632479,877.5,419.46
+4268.632479,906.75,433.24
+4268.632479,936,447.04
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Group5_HEV.vveh b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Group5_HEV.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..f4d4c6d0cc21dd19d4c2053f73d1b608325f5a14
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Group5_HEV.vveh
@@ -0,0 +1,109 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:36:11.4469594Z",
+ "AppVersion": "3",
+ "FileVersion": 10
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "Tractor",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 8229.0,
+ "CurbWeightExtra": 7500.0,
+ "MassMax": 18.0,
+ "Loading": 19300.0,
+ "rdyn": 492.0,
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 33350.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": true,
+ "RRCISO": 0.0065,
+ "FzISO": 33350.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18333,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 41690.0,
+ "Type": "Trailer"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18333,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 41690.0,
+ "Type": "Trailer"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18334,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 41690.0,
+ "Type": "Trailer"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 5.3,
+ "VehicleHeight": 4.0,
+ "IdlingSpeed": 600.0,
+ "Retarder": {
+ "Type": "None",
+ "Ratio": 1.0,
+ "File": ""
+ },
+ "Angledrive": {
+ "Type": "None",
+ "Ratio": 0.0,
+ "LossMap": ""
+ },
+ "PTO": {
+ "Type": "None",
+ "LossMap": "",
+ "Cycle": ""
+ },
+ "TorqueLimits": {},
+ "MaxDrivetrainPower": 1000.0,
+ "InitialSoC": 50.0,
+ "PowertrainConfiguration": "IHPC",
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1.0,
+ "MechanicalEfficiency": 1.0,
+ "Position": "IHPC",
+ "MotorFile": "GenericIHPC_140kW_936Nm.vem"
+ }
+ ],
+ "Battery": {
+ "NumPacks": 1,
+ "BatteryFile": "GenericBattery_10kWh_658V.vbat"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Hybrid_Parameters.vhctl b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Hybrid_Parameters.vhctl
new file mode 100644
index 0000000000000000000000000000000000000000..a46aef1a05bf9df86bedf57572abe03a6de5fb23
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Hybrid_Parameters.vhctl
@@ -0,0 +1,17 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:28:08.3781385Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "EquivalenceFactor": 2.0,
+ "MinSoC": 20.0,
+ "MaxSoC": 80.0,
+ "TargetSoC": 50.0,
+ "AuxBufferTime": 5.0,
+ "AuxBufferChgTime": 5.0,
+ "MinICEOnTime": 10.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/IHPC Group 5.vecto b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/IHPC Group 5.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..0589d7a5bc82c48909847ab7cac7298c4de37a5a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/IHPC Group 5.vecto
@@ -0,0 +1,64 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-08-24T13:41:04.1591616Z",
+ "AppVersion": "3",
+ "FileVersion": 13
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "Group5_HEV.vveh",
+ "EngineFile": "Engine_325kW_12.7l.veng",
+ "GearboxFile": "IHPC_12.vgbx",
+ "TCU": "IHPC_12.vgbx",
+ "ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
+ "HybridStrategyParams": "Hybrid_Parameters.vhctl",
+ "AuxiliaryAssembly": "Classic",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
+ "Aux": [],
+ "Padd": 3000.0,
+ "Padd_electric": 0.0,
+ "VACC": "Truck.vacc",
+ "EngineStopStartAtVehicleStopThreshold": 0.0,
+ "EngineStopStartMaxOffTimespan": 1000.0,
+ "EngineStopStartUtilityFactor": 0.0,
+ "EcoRollMinSpeed": 0.0,
+ "EcoRollActivationDelay": 0.0,
+ "EcoRollUnderspeedThreshold": 0.0,
+ "EcoRollMaxAcceleration": 0.0,
+ "PCCEnableSpeed": 0.0,
+ "PCCMinSpeed": 0.0,
+ "PCCUnderspeed": 0.0,
+ "PCCOverSpeed": 5.0,
+ "PCCPreviewDistanceUC1": 0.0,
+ "PCCPreviewDistanceUC2": 0.0,
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": "",
+ "MinSpeed": 50.0
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Overspeed",
+ "MinSpeed": 50.0,
+ "OverSpeed": 2.5
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "MunicipalUtility",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/IHPC_12.vgbx b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/IHPC_12.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..1694cd4862afe907ee913ce8dd141c7a80d6f4b2
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/IHPC_12.vgbx
@@ -0,0 +1,117 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:26:44.5653903Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "tractor_12gear_example",
+ "Inertia": 0.0,
+ "TracInt": 1.0,
+ "Gears": [
+ {
+ "Ratio": 2.64,
+ "LossMap": "Axle_4x2_Tractor.vtlm"
+ },
+ {
+ "Ratio": 14.93,
+ "LossMap": "Gear_1.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 11.64,
+ "LossMap": "Gear_2.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 9.02,
+ "LossMap": "Gear_3.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 7.04,
+ "LossMap": "Gear_4.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 5.64,
+ "LossMap": "Gear_5.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 4.4,
+ "LossMap": "Gear_6.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 3.39,
+ "LossMap": "Gear_7.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 2.65,
+ "LossMap": "Gear_8.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 2.05,
+ "LossMap": "Gear_9.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.6,
+ "LossMap": "Gear_10.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.28,
+ "LossMap": "Gear_11.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.0,
+ "LossMap": "Gear_12.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ }
+ ],
+ "TqReserve": 20.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.0,
+ "StartAcc": 0.6,
+ "GearboxType": "IHPC",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAfterUpshiftDelay": 6.0,
+ "UpshiftAfterDownshiftDelay": 6.0,
+ "UpshiftMinAcceleration": 0.1,
+ "PowershiftShiftTime": 0.8
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/MaxCurrent.vimax b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/MaxCurrent.vimax
new file mode 100644
index 0000000000000000000000000000000000000000..5552bda2b03a9e6d5f0b2de49ea79b598013047f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/MaxCurrent.vimax
@@ -0,0 +1,3 @@
+SOC, I_charge, I_discharge
+0, 280, 280
+100, 280, 280
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Truck.vacc b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Truck.vacc
new file mode 100644
index 0000000000000000000000000000000000000000..54e77864874d21d67e8f8d69a97b35c5c6031749
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/12SpeedGbx/Truck.vacc
@@ -0,0 +1,6 @@
+v [km/h],acc [m/s²],dec [m/s²]
+0,1,-1
+25,1,-1
+50,0.642857143,-1
+60,0.5,-0.5
+120,0.5,-0.5
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/325kW.vfld b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/325kW.vfld
new file mode 100644
index 0000000000000000000000000000000000000000..750d4048ef2da521d3c51bd0a8af39b6373c8575
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/325kW.vfld
@@ -0,0 +1,202 @@
+engine speed [1/min], full load torque [Nm], motoring torque [Nm]
+600,1188,-138
+608,1206.92,-138.2
+616,1225.84,-138.4
+624,1244.76,-138.6
+632,1263.68,-138.8
+640,1282.6,-139
+648,1301.52,-139.2
+656,1320.44,-139.4
+664,1339.36,-139.6
+672,1358.28,-139.8
+680,1377.2,-140
+688,1396.12,-140.2
+696,1415.04,-140.4
+704,1433.96,-140.6
+712,1452.88,-140.8
+720,1471.8,-141
+728,1490.72,-141.2
+736,1509.64,-141.4
+744,1528.56,-141.6
+752,1547.48,-141.8
+760,1566.4,-142
+768,1585.32,-142.2
+776,1604.24,-142.4
+784,1623.16,-142.6
+792,1642.08,-142.8
+800,1661,-143
+808,1679.92,-143.36
+816,1698.84,-143.72
+824,1717.76,-144.08
+832,1736.68,-144.44
+840,1755.6,-144.8
+848,1774.52,-145.16
+856,1793.44,-145.52
+864,1812.36,-145.88
+872,1831.28,-146.24
+880,1850.2,-146.6
+888,1869.12,-146.96
+896,1888.04,-147.32
+904,1906.96,-147.68
+912,1925.88,-148.04
+920,1944.8,-148.4
+928,1963.72,-148.76
+936,1982.64,-149.12
+944,2001.56,-149.48
+952,2020.48,-149.84
+960,2039.4,-150.2
+968,2058.32,-150.56
+976,2077.24,-150.92
+984,2096.16,-151.28
+992,2115.08,-151.64
+1000,2134,-152
+1008,2134,-152.52
+1016,2134,-153.04
+1024,2134,-153.56
+1032,2134,-154.08
+1040,2134,-154.6
+1048,2134,-155.12
+1056,2134,-155.64
+1064,2134,-156.16
+1072,2134,-156.68
+1080,2134,-157.2
+1088,2134,-157.72
+1096,2134,-158.24
+1104,2134,-158.76
+1112,2134,-159.28
+1120,2134,-159.8
+1128,2134,-160.32
+1136,2134,-160.84
+1144,2134,-161.36
+1152,2134,-161.88
+1160,2134,-162.4
+1168,2134,-162.92
+1176,2134,-163.44
+1184,2134,-163.96
+1192,2134,-164.48
+1200,2134,-165
+1208,2134,-165.88
+1216,2134,-166.76
+1224,2134,-167.64
+1232,2134,-168.52
+1240,2134,-169.4
+1248,2134,-170.28
+1256,2134,-171.16
+1264,2134,-172.04
+1272,2134,-172.92
+1280,2134,-173.8
+1288,2134,-174.68
+1296,2134,-175.56
+1304,2134,-176.44
+1312,2134,-177.32
+1320,2134,-178.2
+1328,2134,-179.08
+1336,2134,-179.96
+1344,2134,-180.84
+1352,2134,-181.72
+1360,2134,-182.6
+1368,2134,-183.48
+1376,2134,-184.36
+1384,2134,-185.24
+1392,2134,-186.12
+1400,2134,-187
+1408,2125.76,-188.2
+1416,2117.52,-189.4
+1424,2109.28,-190.6
+1432,2101.04,-191.8
+1440,2092.8,-193
+1448,2084.56,-194.2
+1456,2076.32,-195.4
+1464,2068.08,-196.6
+1472,2059.84,-197.8
+1480,2051.6,-199
+1488,2043.36,-200.2
+1496,2035.12,-201.3911
+1504,2026.88,-202.5793
+1512,2018.64,-203.7675
+1520,2010.4,-204.9557
+1528,2002.16,-206.1439
+1536,1993.92,-207.3321
+1544,1985.68,-208.5203
+1552,1977.44,-209.7085
+1560,1969.2,-210.8967
+1568,1960.96,-212.0849
+1576,1952.72,-213.2731
+1584,1944.48,-214.4613
+1592,1936.24,-215.6495
+1600,1928,-216.8377
+1608,1919.76,-218.0259
+1616,1911.52,-219.16
+1624,1903.28,-220.24
+1632,1895.04,-221.32
+1640,1886.8,-222.4
+1648,1878.56,-223.48
+1656,1870.32,-224.56
+1664,1862.08,-225.64
+1672,1853.84,-226.72
+1680,1845.6,-227.8
+1688,1837.36,-228.88
+1696,1829.12,-229.96
+1704,1820.88,-231.04
+1712,1812.64,-232.12
+1720,1804.4,-233.2
+1728,1796.16,-234.28
+1736,1787.92,-235.36
+1744,1779.68,-236.44
+1752,1771.44,-237.52
+1760,1763.2,-238.6
+1768,1754.96,-239.68
+1776,1746.72,-240.76
+1784,1738.48,-241.84
+1792,1730.24,-242.92
+1800,1722,-244
+1808,1703.24,-245.36
+1816,1684.48,-246.72
+1824,1665.72,-248.08
+1832,1646.96,-249.44
+1840,1628.2,-250.8
+1848,1609.44,-252.16
+1856,1590.68,-253.52
+1864,1571.92,-254.88
+1872,1553.16,-256.24
+1880,1534.4,-257.6
+1888,1515.64,-258.96
+1896,1496.88,-260.32
+1904,1478.12,-261.68
+1912,1459.36,-263.04
+1920,1440.6,-264.4
+1928,1421.84,-265.76
+1936,1403.08,-267.12
+1944,1384.32,-268.48
+1952,1365.56,-269.84
+1960,1346.8,-271.2
+1968,1328.04,-272.56
+1976,1309.28,-273.92
+1984,1290.52,-275.28
+1992,1271.76,-276.64
+2000,1253,-278
+2008,1234.28,-279.36
+2016,1215.56,-280.72
+2024,1196.84,-282.08
+2032,1178.12,-283.44
+2040,1159.4,-284.8
+2048,1140.68,-286.16
+2056,1121.96,-287.52
+2064,1103.24,-288.88
+2072,1084.52,-290.24
+2080,1065.8,-291.6
+2088,1047.08,-292.96
+2096,1028.36,-294.32
+2104,978.24,-295.68
+2112,896.72,-297.04
+2120,815.2,-298.4
+2128,733.68,-299.76
+2136,652.16,-301.12
+2144,570.64,-302.48
+2152,489.12,-303.84
+2160,407.6,-305.2
+2168,326.08,-306.56
+2176,244.56,-307.92
+2184,163.04,-309.28
+2192,81.52,-310.64
+2200,0,-312
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/325kW.vmap b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/325kW.vmap
new file mode 100644
index 0000000000000000000000000000000000000000..eea08f963f4b23b49f15d030db630b52edc1d4e3
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/325kW.vmap
@@ -0,0 +1,140 @@
+engine speed [rpm], torque [Nm], fuel consumption [g/h]
+500,-135.5,0
+500,0,1355
+500,213.4,3412.291
+500,426.8,5830.1
+500,640.2,8316.426
+500,853.6,10439.87
+500,1067,12823.69
+500,1188,14228.79
+500,1401.4,16628.66
+600,-138,0
+600,0,1355
+600,213.4,3412.291
+600,426.8,5830.1
+600,640.2,8316.426
+600,853.6,10439.87
+600,1067,12823.69
+600,1188,14228.79
+600,1401.4,16628.66
+751,-141.775,0
+750.9,0,1649.255
+750.9,213.4,4157.795
+750.9,426.8,7149.494
+750.9,640.2,10037.08
+750.9,853.6,12957.07
+750.9,1067,16055.22
+750.9,1280.4,19231.36
+750.9,1493.8,22400.17
+750.9,1544.879,23213.92
+751,1758.279,26392.93
+902,-147.59,0
+901.8,0,2210.735
+901.8,213.4,5204.867
+901.8,426.8,8515.462
+901.8,640.2,11804.75
+901.8,853.6,15410.55
+901.8,1067,19081.7
+901.8,1280.4,22742.96
+901.8,1493.8,26543.87
+901.8,1707.2,30534.68
+901.8,1901.757,34352.75
+902,2115.157,38403.27
+1053,-155.445,0
+1052.7,0,2768.035
+1052.7,213.4,6228.407
+1052.7,426.8,9836.041
+1052.7,640.2,13624.5
+1052.7,853.6,17854.95
+1052.7,1067,22072.71
+1052.7,1280.4,26161.13
+1052.7,1493.8,30525.55
+1052.7,1707.2,35019.18
+1052.7,1920.6,39913.3
+1052.7,2134,45438.16
+1053,2347.4,50542.53
+1204,-165.44,0
+1203.6,0,3086.704
+1203.6,213.4,6943.027
+1203.6,426.8,11040.37
+1203.6,640.2,15504.65
+1203.6,853.6,20335.89
+1203.6,1067,25176.6
+1203.6,1280.4,29782.22
+1203.6,1493.8,34642.24
+1203.6,1707.2,39786.14
+1203.6,1920.6,45254.8
+1203.6,2134,51129.03
+1204,2347.4,56732.88
+1367,-183.37,0
+1367.1,0,3845.344
+1367.1,213.4,7981.742
+1367.1,426.8,12796.69
+1367.1,640.2,17789.2
+1367.1,853.6,22854.21
+1367.1,1067,28302.84
+1367.1,1280.4,33739.91
+1367.1,1493.8,39393.87
+1367.1,1707.2,45836.33
+1367.1,1920.6,52078.71
+1367.1,2134,58296.41
+1367,2347.4,64530.56
+1490,-200.5,0
+1489.6,0,4373.424
+1489.6,213.4,8861.484
+1489.6,426.8,14090.86
+1489.6,640.2,19518.29
+1489.6,853.6,25092.8
+1489.6,1067,30873.69
+1489.6,1280.4,36865.42
+1489.6,1493.8,43095.57
+1489.6,1707.2,50249.81
+1489.6,1920.6,57035.25
+1489.6,2041.712,60609.5
+1490,2255.112,67311.83
+1612,-218.62,0
+1612.2,0,4904.015
+1612.2,213.4,9810.482
+1612.2,426.8,15403.9
+1612.2,640.2,21301.35
+1612.2,853.6,27492.32
+1612.2,1067,33580.96
+1612.2,1280.4,40114.61
+1612.2,1493.8,46914.77
+1612.2,1707.2,54666.14
+1612.2,1915.434,61862.91
+1612,2128.834,69491.99
+1735,-235.225,0
+1734.7,0,5586.953
+1734.7,213.4,11041.15
+1734.7,426.8,16949.24
+1734.7,640.2,23500.23
+1734.7,853.6,30159.59
+1734.7,1067,36741.18
+1734.7,1280.4,43923.85
+1734.7,1493.8,51295.21
+1734.7,1707.2,59469.31
+1734.7,1789.259,62731.31
+1735,2002.659,70935.23
+1857,-253.69,0
+1857.3,0,6673.839
+1857.3,213.4,12518.56
+1857.3,426.8,18687.88
+1857.3,640.2,25652.39
+1857.3,853.6,33003.08
+1857.3,1067,40438.09
+1857.3,1280.4,48117.52
+1857.3,1493.8,55848.59
+1857.3,1587.631,59434.17
+1857,1801.031,67215.39
+1957,-270.69,0
+1957.3,0,6673.839
+1957.3,213.4,12518.56
+1957.3,426.8,18687.88
+1957.3,640.2,25652.39
+1957.3,853.6,33003.08
+1957.3,1067,40438.09
+1957.3,1280.4,48117.52
+1957.3,1493.8,55848.59
+1957.3,1587.631,59434.17
+1957,1801.031,67215.39
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Axle_4x2_Tractor.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Axle_4x2_Tractor.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..e11cbf7cdde175e06ab8f6a0b79d46b84b3e0c1a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Axle_4x2_Tractor.vtlm
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Default.vrlm b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Default.vrlm
new file mode 100644
index 0000000000000000000000000000000000000000..eb575b99973291e5414c4826da086c1f03a7f179
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Default.vrlm
@@ -0,0 +1,32 @@
+Retarder Speed [1/min],Torque Loss [Nm]
+0,10
+100,10
+200,10.1
+300,10.2
+400,10.3
+500,10.5
+600,10.7
+700,11
+800,11.3
+900,11.6
+1000,12
+1100,12.4
+1200,12.9
+1300,13.4
+1400,13.9
+1500,14.5
+1600,15.1
+1700,15.8
+1800,16.5
+1900,17.2
+2000,18
+2100,18.8
+2200,19.7
+2300,20.6
+2400,21.5
+2500,22.5
+2600,23.5
+2700,24.6
+2800,25.7
+2900,26.8
+3000,28
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Engine_325kW_12.7l.veng b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Engine_325kW_12.7l.veng
new file mode 100644
index 0000000000000000000000000000000000000000..084062afccf57ee58c485634cb158fdf05647b86
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Engine_325kW_12.7l.veng
@@ -0,0 +1,35 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-08-21T09:24:04.0725494Z",
+ "AppVersion": "3",
+ "FileVersion": 5
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "325kW 12.7l Engine",
+ "Displacement": "12740",
+ "IdlingSpeed": 600.0,
+ "Inertia": 5.1498,
+ "Fuels": [
+ {
+ "WHTC-Urban": 0.0,
+ "WHTC-Rural": 0.0,
+ "WHTC-Motorway": 0.0,
+ "WHTC-Engineering": 1.0,
+ "ColdHotBalancingFactor": 0.0,
+ "CFRegPer": 1.0,
+ "FuelMap": "325kW.vmap",
+ "FuelType": "DieselCI"
+ }
+ ],
+ "RatedPower": 0.0,
+ "RatedSpeed": 0.0,
+ "MaxTorque": 0.0,
+ "FullLoadCurve": "325kW.vfld",
+ "WHRType": [
+ "None"
+ ],
+ "WHRCorrectionFactors": {}
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_1.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_1.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..b6e4f373d0cbc32c04b18ca49811dc4167db2eb7
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_1.vtlm
@@ -0,0 +1,2081 @@
+Input Speed [rpm] , Input Torque [Nm] , Torque Loss [Nm]
+0 , -6177.6 , 135.9072
+0 , -5984.55 , 131.08095
+0 , -5791.5 , 126.2547
+0 , -5598.45 , 121.42845
+0 , -5405.4 , 116.6022
+0 , -5212.35 , 111.77595
+0 , -5019.3 , 106.9497
+0 , -4826.25 , 102.12345
+0 , -4633.2 , 97.2972
+0 , -4440.15 , 92.47095
+0 , -4247.1 , 87.6447
+0 , -4054.05 , 82.81845
+0 , -3861 , 77.9922
+0 , -3667.95 , 73.16595
+0 , -3474.9 , 68.3397
+0 , -3281.85 , 63.51345
+0 , -3088.8 , 58.6872
+0 , -2895.75 , 53.86095
+0 , -2702.7 , 49.0347
+0 , -2509.65 , 44.20845
+0 , -2316.6 , 39.3822
+0 , -2123.55 , 34.55595
+0 , -1930.5 , 29.7297
+0 , -1737.45 , 24.90345
+0 , -1544.4 , 20.0772
+0 , -1351.35 , 15.25095
+0 , -1158.3 , 10.4247
+0 , -965.25 , 5.59845
+0 , -772.2 , 0.7722
+0 , -579.15 , 4.05405
+0 , -386.1 , 8.8803
+0 , -193.05 , 13.70655
+0 , 0 , 18.5328
+0 , 193.05 , 23.35905
+0 , 386.1 , 28.1853
+0 , 579.15 , 33.01155
+0 , 772.2 , 37.8378
+0 , 965.25 , 42.66405
+0 , 1158.3 , 47.4903
+0 , 1351.35 , 52.31655
+0 , 1544.4 , 57.1428
+0 , 1737.45 , 61.96905
+0 , 1930.5 , 66.7953
+0 , 2123.55 , 71.62155
+0 , 2316.6 , 76.4478
+0 , 2509.65 , 81.27405
+0 , 2702.7 , 86.1003
+0 , 2895.75 , 90.92655
+0 , 3088.8 , 95.7528
+0 , 3281.85 , 100.57905
+0 , 3474.9 , 105.4053
+0 , 3667.95 , 110.23155
+0 , 3861 , 115.0578
+0 , 4054.05 , 119.88405
+0 , 4247.1 , 124.7103
+0 , 4440.15 , 129.53655
+0 , 4633.2 , 134.3628
+0 , 4826.25 , 139.18905
+0 , 5019.3 , 144.0153
+0 , 5212.35 , 148.84155
+0 , 5405.4 , 153.6678
+0 , 5598.45 , 158.49405
+0 , 5791.5 , 163.3203
+0 , 5984.55 , 168.14655
+0 , 6177.6 , 172.9728
+40.80854701 , -6177.6 , 135.1509034
+40.80854701 , -5984.55 , 130.3246534
+40.80854701 , -5791.5 , 125.4984034
+40.80854701 , -5598.45 , 120.6721534
+40.80854701 , -5405.4 , 115.8459034
+40.80854701 , -5212.35 , 111.0196534
+40.80854701 , -5019.3 , 106.1934034
+40.80854701 , -4826.25 , 101.3671534
+40.80854701 , -4633.2 , 96.54090336
+40.80854701 , -4440.15 , 91.71465336
+40.80854701 , -4247.1 , 86.88840336
+40.80854701 , -4054.05 , 82.06215336
+40.80854701 , -3861 , 77.23590336
+40.80854701 , -3667.95 , 72.40965336
+40.80854701 , -3474.9 , 67.58340336
+40.80854701 , -3281.85 , 62.75715336
+40.80854701 , -3088.8 , 57.93090336
+40.80854701 , -2895.75 , 53.10465336
+40.80854701 , -2702.7 , 48.27840336
+40.80854701 , -2509.65 , 43.45215336
+40.80854701 , -2316.6 , 38.62590336
+40.80854701 , -2123.55 , 33.79965336
+40.80854701 , -1930.5 , 28.97340336
+40.80854701 , -1737.45 , 24.14715336
+40.80854701 , -1544.4 , 19.32090336
+40.80854701 , -1351.35 , 14.49465336
+40.80854701 , -1158.3 , 9.66840336
+40.80854701 , -965.25 , 4.84215336
+40.80854701 , -772.2 , 0.01590336
+40.80854701 , -579.15 , 4.81034664
+40.80854701 , -386.1 , 9.63659664
+40.80854701 , -193.05 , 14.46284664
+40.80854701 , 0 , 19.28909664
+40.80854701 , 193.05 , 24.11534664
+40.80854701 , 386.1 , 28.94159664
+40.80854701 , 579.15 , 33.76784664
+40.80854701 , 772.2 , 38.59409664
+40.80854701 , 965.25 , 43.42034664
+40.80854701 , 1158.3 , 48.24659664
+40.80854701 , 1351.35 , 53.07284664
+40.80854701 , 1544.4 , 57.89909664
+40.80854701 , 1737.45 , 62.72534664
+40.80854701 , 1930.5 , 67.55159664
+40.80854701 , 2123.55 , 72.37784664
+40.80854701 , 2316.6 , 77.20409664
+40.80854701 , 2509.65 , 82.03034664
+40.80854701 , 2702.7 , 86.85659664
+40.80854701 , 2895.75 , 91.68284664
+40.80854701 , 3088.8 , 96.50909664
+40.80854701 , 3281.85 , 101.3353466
+40.80854701 , 3474.9 , 106.1615966
+40.80854701 , 3667.95 , 110.9878466
+40.80854701 , 3861 , 115.8140966
+40.80854701 , 4054.05 , 120.6403466
+40.80854701 , 4247.1 , 125.4665966
+40.80854701 , 4440.15 , 130.2928466
+40.80854701 , 4633.2 , 135.1190966
+40.80854701 , 4826.25 , 139.9453466
+40.80854701 , 5019.3 , 144.7715966
+40.80854701 , 5212.35 , 149.5978466
+40.80854701 , 5405.4 , 154.4240966
+40.80854701 , 5598.45 , 159.2503466
+40.80854701 , 5791.5 , 164.0765966
+40.80854701 , 5984.55 , 168.9028466
+40.80854701 , 6177.6 , 173.7290966
+81.61794872 , -6177.6 , 134.3945909
+81.61794872 , -5984.55 , 129.5683409
+81.61794872 , -5791.5 , 124.7420909
+81.61794872 , -5598.45 , 119.9158409
+81.61794872 , -5405.4 , 115.0895909
+81.61794872 , -5212.35 , 110.2633409
+81.61794872 , -5019.3 , 105.4370909
+81.61794872 , -4826.25 , 100.6108409
+81.61794872 , -4633.2 , 95.78459088
+81.61794872 , -4440.15 , 90.95834088
+81.61794872 , -4247.1 , 86.13209088
+81.61794872 , -4054.05 , 81.30584088
+81.61794872 , -3861 , 76.47959088
+81.61794872 , -3667.95 , 71.65334088
+81.61794872 , -3474.9 , 66.82709088
+81.61794872 , -3281.85 , 62.00084088
+81.61794872 , -3088.8 , 57.17459088
+81.61794872 , -2895.75 , 52.34834088
+81.61794872 , -2702.7 , 47.52209088
+81.61794872 , -2509.65 , 42.69584088
+81.61794872 , -2316.6 , 37.86959088
+81.61794872 , -2123.55 , 33.04334088
+81.61794872 , -1930.5 , 28.21709088
+81.61794872 , -1737.45 , 23.39084088
+81.61794872 , -1544.4 , 18.56459088
+81.61794872 , -1351.35 , 13.73834088
+81.61794872 , -1158.3 , 8.91209088
+81.61794872 , -965.25 , 4.08584088
+81.61794872 , -772.2 , 0.74040912
+81.61794872 , -579.15 , 5.56665912
+81.61794872 , -386.1 , 10.39290912
+81.61794872 , -193.05 , 15.21915912
+81.61794872 , 0 , 20.04540912
+81.61794872 , 193.05 , 24.87165912
+81.61794872 , 386.1 , 29.69790912
+81.61794872 , 579.15 , 34.52415912
+81.61794872 , 772.2 , 39.35040912
+81.61794872 , 965.25 , 44.17665912
+81.61794872 , 1158.3 , 49.00290912
+81.61794872 , 1351.35 , 53.82915912
+81.61794872 , 1544.4 , 58.65540912
+81.61794872 , 1737.45 , 63.48165912
+81.61794872 , 1930.5 , 68.30790912
+81.61794872 , 2123.55 , 73.13415912
+81.61794872 , 2316.6 , 77.96040912
+81.61794872 , 2509.65 , 82.78665912
+81.61794872 , 2702.7 , 87.61290912
+81.61794872 , 2895.75 , 92.43915912
+81.61794872 , 3088.8 , 97.26540912
+81.61794872 , 3281.85 , 102.0916591
+81.61794872 , 3474.9 , 106.9179091
+81.61794872 , 3667.95 , 111.7441591
+81.61794872 , 3861 , 116.5704091
+81.61794872 , 4054.05 , 121.3966591
+81.61794872 , 4247.1 , 126.2229091
+81.61794872 , 4440.15 , 131.0491591
+81.61794872 , 4633.2 , 135.8754091
+81.61794872 , 4826.25 , 140.7016591
+81.61794872 , 5019.3 , 145.5279091
+81.61794872 , 5212.35 , 150.3541591
+81.61794872 , 5405.4 , 155.1804091
+81.61794872 , 5598.45 , 160.0066591
+81.61794872 , 5791.5 , 164.8329091
+81.61794872 , 5984.55 , 169.6591591
+81.61794872 , 6177.6 , 174.4854091
+122.4273504 , -6177.6 , 133.6382784
+122.4273504 , -5984.55 , 128.8120284
+122.4273504 , -5791.5 , 123.9857784
+122.4273504 , -5598.45 , 119.1595284
+122.4273504 , -5405.4 , 114.3332784
+122.4273504 , -5212.35 , 109.5070284
+122.4273504 , -5019.3 , 104.6807784
+122.4273504 , -4826.25 , 99.8545284
+122.4273504 , -4633.2 , 95.0282784
+122.4273504 , -4440.15 , 90.2020284
+122.4273504 , -4247.1 , 85.3757784
+122.4273504 , -4054.05 , 80.5495284
+122.4273504 , -3861 , 75.7232784
+122.4273504 , -3667.95 , 70.8970284
+122.4273504 , -3474.9 , 66.0707784
+122.4273504 , -3281.85 , 61.2445284
+122.4273504 , -3088.8 , 56.4182784
+122.4273504 , -2895.75 , 51.5920284
+122.4273504 , -2702.7 , 46.7657784
+122.4273504 , -2509.65 , 41.9395284
+122.4273504 , -2316.6 , 37.1132784
+122.4273504 , -2123.55 , 32.2870284
+122.4273504 , -1930.5 , 27.4607784
+122.4273504 , -1737.45 , 22.6345284
+122.4273504 , -1544.4 , 17.8082784
+122.4273504 , -1351.35 , 12.9820284
+122.4273504 , -1158.3 , 8.155778401
+122.4273504 , -965.25 , 3.329528401
+122.4273504 , -772.2 , 1.496721599
+122.4273504 , -579.15 , 6.322971599
+122.4273504 , -386.1 , 11.1492216
+122.4273504 , -193.05 , 15.9754716
+122.4273504 , 0 , 20.8017216
+122.4273504 , 193.05 , 25.6279716
+122.4273504 , 386.1 , 30.4542216
+122.4273504 , 579.15 , 35.2804716
+122.4273504 , 772.2 , 40.1067216
+122.4273504 , 965.25 , 44.9329716
+122.4273504 , 1158.3 , 49.7592216
+122.4273504 , 1351.35 , 54.5854716
+122.4273504 , 1544.4 , 59.4117216
+122.4273504 , 1737.45 , 64.2379716
+122.4273504 , 1930.5 , 69.0642216
+122.4273504 , 2123.55 , 73.8904716
+122.4273504 , 2316.6 , 78.7167216
+122.4273504 , 2509.65 , 83.5429716
+122.4273504 , 2702.7 , 88.3692216
+122.4273504 , 2895.75 , 93.1954716
+122.4273504 , 3088.8 , 98.0217216
+122.4273504 , 3281.85 , 102.8479716
+122.4273504 , 3474.9 , 107.6742216
+122.4273504 , 3667.95 , 112.5004716
+122.4273504 , 3861 , 117.3267216
+122.4273504 , 4054.05 , 122.1529716
+122.4273504 , 4247.1 , 126.9792216
+122.4273504 , 4440.15 , 131.8054716
+122.4273504 , 4633.2 , 136.6317216
+122.4273504 , 4826.25 , 141.4579716
+122.4273504 , 5019.3 , 146.2842216
+122.4273504 , 5212.35 , 151.1104716
+122.4273504 , 5405.4 , 155.9367216
+122.4273504 , 5598.45 , 160.7629716
+122.4273504 , 5791.5 , 165.5892216
+122.4273504 , 5984.55 , 170.4154716
+122.4273504 , 6177.6 , 175.2417216
+163.2393162 , -6177.6 , 132.8819184
+163.2393162 , -5984.55 , 128.0556684
+163.2393162 , -5791.5 , 123.2294184
+163.2393162 , -5598.45 , 118.4031684
+163.2393162 , -5405.4 , 113.5769184
+163.2393162 , -5212.35 , 108.7506684
+163.2393162 , -5019.3 , 103.9244184
+163.2393162 , -4826.25 , 99.0981684
+163.2393162 , -4633.2 , 94.2719184
+163.2393162 , -4440.15 , 89.4456684
+163.2393162 , -4247.1 , 84.6194184
+163.2393162 , -4054.05 , 79.7931684
+163.2393162 , -3861 , 74.9669184
+163.2393162 , -3667.95 , 70.1406684
+163.2393162 , -3474.9 , 65.3144184
+163.2393162 , -3281.85 , 60.4881684
+163.2393162 , -3088.8 , 55.6619184
+163.2393162 , -2895.75 , 50.8356684
+163.2393162 , -2702.7 , 46.0094184
+163.2393162 , -2509.65 , 41.1831684
+163.2393162 , -2316.6 , 36.3569184
+163.2393162 , -2123.55 , 31.5306684
+163.2393162 , -1930.5 , 26.7044184
+163.2393162 , -1737.45 , 21.8781684
+163.2393162 , -1544.4 , 17.0519184
+163.2393162 , -1351.35 , 12.2256684
+163.2393162 , -1158.3 , 7.399418401
+163.2393162 , -965.25 , 2.573168401
+163.2393162 , -772.2 , 2.253081599
+163.2393162 , -579.15 , 7.079331599
+163.2393162 , -386.1 , 11.9055816
+163.2393162 , -193.05 , 16.7318316
+163.2393162 , 0 , 21.5580816
+163.2393162 , 193.05 , 26.3843316
+163.2393162 , 386.1 , 31.2105816
+163.2393162 , 579.15 , 36.0368316
+163.2393162 , 772.2 , 40.8630816
+163.2393162 , 965.25 , 45.6893316
+163.2393162 , 1158.3 , 50.5155816
+163.2393162 , 1351.35 , 55.3418316
+163.2393162 , 1544.4 , 60.1680816
+163.2393162 , 1737.45 , 64.9943316
+163.2393162 , 1930.5 , 69.8205816
+163.2393162 , 2123.55 , 74.6468316
+163.2393162 , 2316.6 , 79.4730816
+163.2393162 , 2509.65 , 84.2993316
+163.2393162 , 2702.7 , 89.1255816
+163.2393162 , 2895.75 , 93.9518316
+163.2393162 , 3088.8 , 98.7780816
+163.2393162 , 3281.85 , 103.6043316
+163.2393162 , 3474.9 , 108.4305816
+163.2393162 , 3667.95 , 113.2568316
+163.2393162 , 3861 , 118.0830816
+163.2393162 , 4054.05 , 122.9093316
+163.2393162 , 4247.1 , 127.7355816
+163.2393162 , 4440.15 , 132.5618316
+163.2393162 , 4633.2 , 137.3880816
+163.2393162 , 4826.25 , 142.2143316
+163.2393162 , 5019.3 , 147.0405816
+163.2393162 , 5212.35 , 151.8668316
+163.2393162 , 5405.4 , 156.6930816
+163.2393162 , 5598.45 , 161.5193316
+163.2393162 , 5791.5 , 166.3455816
+163.2393162 , 5984.55 , 171.1718316
+163.2393162 , 6177.6 , 175.9980816
+204.042735 , -6177.6 , 132.1257168
+204.042735 , -5984.55 , 127.2994668
+204.042735 , -5791.5 , 122.4732168
+204.042735 , -5598.45 , 117.6469668
+204.042735 , -5405.4 , 112.8207168
+204.042735 , -5212.35 , 107.9944668
+204.042735 , -5019.3 , 103.1682168
+204.042735 , -4826.25 , 98.3419668
+204.042735 , -4633.2 , 93.5157168
+204.042735 , -4440.15 , 88.6894668
+204.042735 , -4247.1 , 83.8632168
+204.042735 , -4054.05 , 79.0369668
+204.042735 , -3861 , 74.2107168
+204.042735 , -3667.95 , 69.3844668
+204.042735 , -3474.9 , 64.5582168
+204.042735 , -3281.85 , 59.7319668
+204.042735 , -3088.8 , 54.9057168
+204.042735 , -2895.75 , 50.0794668
+204.042735 , -2702.7 , 45.2532168
+204.042735 , -2509.65 , 40.4269668
+204.042735 , -2316.6 , 35.6007168
+204.042735 , -2123.55 , 30.7744668
+204.042735 , -1930.5 , 25.9482168
+204.042735 , -1737.45 , 21.1219668
+204.042735 , -1544.4 , 16.2957168
+204.042735 , -1351.35 , 11.4694668
+204.042735 , -1158.3 , 6.643216801
+204.042735 , -965.25 , 1.816966801
+204.042735 , -772.2 , 3.009283199
+204.042735 , -579.15 , 7.835533199
+204.042735 , -386.1 , 12.6617832
+204.042735 , -193.05 , 17.4880332
+204.042735 , 0 , 22.3142832
+204.042735 , 193.05 , 27.1405332
+204.042735 , 386.1 , 31.9667832
+204.042735 , 579.15 , 36.7930332
+204.042735 , 772.2 , 41.6192832
+204.042735 , 965.25 , 46.4455332
+204.042735 , 1158.3 , 51.2717832
+204.042735 , 1351.35 , 56.0980332
+204.042735 , 1544.4 , 60.9242832
+204.042735 , 1737.45 , 65.7505332
+204.042735 , 1930.5 , 70.5767832
+204.042735 , 2123.55 , 75.4030332
+204.042735 , 2316.6 , 80.2292832
+204.042735 , 2509.65 , 85.0555332
+204.042735 , 2702.7 , 89.8817832
+204.042735 , 2895.75 , 94.7080332
+204.042735 , 3088.8 , 99.5342832
+204.042735 , 3281.85 , 104.3605332
+204.042735 , 3474.9 , 109.1867832
+204.042735 , 3667.95 , 114.0130332
+204.042735 , 3861 , 118.8392832
+204.042735 , 4054.05 , 123.6655332
+204.042735 , 4247.1 , 128.4917832
+204.042735 , 4440.15 , 133.3180332
+204.042735 , 4633.2 , 138.1442832
+204.042735 , 4826.25 , 142.9705332
+204.042735 , 5019.3 , 147.7967832
+204.042735 , 5212.35 , 152.6230332
+204.042735 , 5405.4 , 157.4492832
+204.042735 , 5598.45 , 162.2755332
+204.042735 , 5791.5 , 167.1017832
+204.042735 , 5984.55 , 171.9280332
+204.042735 , 6177.6 , 176.7542832
+244.8547009 , -6177.6 , 131.3693568
+244.8547009 , -5984.55 , 126.5431068
+244.8547009 , -5791.5 , 121.7168568
+244.8547009 , -5598.45 , 116.8906068
+244.8547009 , -5405.4 , 112.0643568
+244.8547009 , -5212.35 , 107.2381068
+244.8547009 , -5019.3 , 102.4118568
+244.8547009 , -4826.25 , 97.5856068
+244.8547009 , -4633.2 , 92.7593568
+244.8547009 , -4440.15 , 87.9331068
+244.8547009 , -4247.1 , 83.1068568
+244.8547009 , -4054.05 , 78.2806068
+244.8547009 , -3861 , 73.4543568
+244.8547009 , -3667.95 , 68.6281068
+244.8547009 , -3474.9 , 63.8018568
+244.8547009 , -3281.85 , 58.9756068
+244.8547009 , -3088.8 , 54.1493568
+244.8547009 , -2895.75 , 49.3231068
+244.8547009 , -2702.7 , 44.4968568
+244.8547009 , -2509.65 , 39.6706068
+244.8547009 , -2316.6 , 34.8443568
+244.8547009 , -2123.55 , 30.0181068
+244.8547009 , -1930.5 , 25.1918568
+244.8547009 , -1737.45 , 20.3656068
+244.8547009 , -1544.4 , 15.5393568
+244.8547009 , -1351.35 , 10.7131068
+244.8547009 , -1158.3 , 5.886856799
+244.8547009 , -965.25 , 1.060606799
+244.8547009 , -772.2 , 3.765643201
+244.8547009 , -579.15 , 8.591893201
+244.8547009 , -386.1 , 13.4181432
+244.8547009 , -193.05 , 18.2443932
+244.8547009 , 0 , 23.0706432
+244.8547009 , 193.05 , 27.8968932
+244.8547009 , 386.1 , 32.7231432
+244.8547009 , 579.15 , 37.5493932
+244.8547009 , 772.2 , 42.3756432
+244.8547009 , 965.25 , 47.2018932
+244.8547009 , 1158.3 , 52.0281432
+244.8547009 , 1351.35 , 56.8543932
+244.8547009 , 1544.4 , 61.6806432
+244.8547009 , 1737.45 , 66.5068932
+244.8547009 , 1930.5 , 71.3331432
+244.8547009 , 2123.55 , 76.1593932
+244.8547009 , 2316.6 , 80.9856432
+244.8547009 , 2509.65 , 85.8118932
+244.8547009 , 2702.7 , 90.6381432
+244.8547009 , 2895.75 , 95.4643932
+244.8547009 , 3088.8 , 100.2906432
+244.8547009 , 3281.85 , 105.1168932
+244.8547009 , 3474.9 , 109.9431432
+244.8547009 , 3667.95 , 114.7693932
+244.8547009 , 3861 , 119.5956432
+244.8547009 , 4054.05 , 124.4218932
+244.8547009 , 4247.1 , 129.2481432
+244.8547009 , 4440.15 , 134.0743932
+244.8547009 , 4633.2 , 138.9006432
+244.8547009 , 4826.25 , 143.7268932
+244.8547009 , 5019.3 , 148.5531432
+244.8547009 , 5212.35 , 153.3793932
+244.8547009 , 5405.4 , 158.2056432
+244.8547009 , 5598.45 , 163.0318932
+244.8547009 , 5791.5 , 167.8581432
+244.8547009 , 5984.55 , 172.6843932
+244.8547009 , 6177.6 , 177.5106432
+285.6666667 , -6177.6 , 130.6129968
+285.6666667 , -5984.55 , 125.7867468
+285.6666667 , -5791.5 , 120.9604968
+285.6666667 , -5598.45 , 116.1342468
+285.6666667 , -5405.4 , 111.3079968
+285.6666667 , -5212.35 , 106.4817468
+285.6666667 , -5019.3 , 101.6554968
+285.6666667 , -4826.25 , 96.8292468
+285.6666667 , -4633.2 , 92.0029968
+285.6666667 , -4440.15 , 87.1767468
+285.6666667 , -4247.1 , 82.3504968
+285.6666667 , -4054.05 , 77.5242468
+285.6666667 , -3861 , 72.6979968
+285.6666667 , -3667.95 , 67.8717468
+285.6666667 , -3474.9 , 63.0454968
+285.6666667 , -3281.85 , 58.2192468
+285.6666667 , -3088.8 , 53.3929968
+285.6666667 , -2895.75 , 48.5667468
+285.6666667 , -2702.7 , 43.7404968
+285.6666667 , -2509.65 , 38.9142468
+285.6666667 , -2316.6 , 34.0879968
+285.6666667 , -2123.55 , 29.2617468
+285.6666667 , -1930.5 , 24.4354968
+285.6666667 , -1737.45 , 19.6092468
+285.6666667 , -1544.4 , 14.7829968
+285.6666667 , -1351.35 , 9.956746799
+285.6666667 , -1158.3 , 5.130496799
+285.6666667 , -965.25 , 0.304246799
+285.6666667 , -772.2 , 4.522003201
+285.6666667 , -579.15 , 9.348253201
+285.6666667 , -386.1 , 14.1745032
+285.6666667 , -193.05 , 19.0007532
+285.6666667 , 0 , 23.8270032
+285.6666667 , 193.05 , 28.6532532
+285.6666667 , 386.1 , 33.4795032
+285.6666667 , 579.15 , 38.3057532
+285.6666667 , 772.2 , 43.1320032
+285.6666667 , 965.25 , 47.9582532
+285.6666667 , 1158.3 , 52.7845032
+285.6666667 , 1351.35 , 57.6107532
+285.6666667 , 1544.4 , 62.4370032
+285.6666667 , 1737.45 , 67.2632532
+285.6666667 , 1930.5 , 72.0895032
+285.6666667 , 2123.55 , 76.9157532
+285.6666667 , 2316.6 , 81.7420032
+285.6666667 , 2509.65 , 86.5682532
+285.6666667 , 2702.7 , 91.3945032
+285.6666667 , 2895.75 , 96.2207532
+285.6666667 , 3088.8 , 101.0470032
+285.6666667 , 3281.85 , 105.8732532
+285.6666667 , 3474.9 , 110.6995032
+285.6666667 , 3667.95 , 115.5257532
+285.6666667 , 3861 , 120.3520032
+285.6666667 , 4054.05 , 125.1782532
+285.6666667 , 4247.1 , 130.0045032
+285.6666667 , 4440.15 , 134.8307532
+285.6666667 , 4633.2 , 139.6570032
+285.6666667 , 4826.25 , 144.4832532
+285.6666667 , 5019.3 , 149.3095032
+285.6666667 , 5212.35 , 154.1357532
+285.6666667 , 5405.4 , 158.9620032
+285.6666667 , 5598.45 , 163.7882532
+285.6666667 , 5791.5 , 168.6145032
+285.6666667 , 5984.55 , 173.4407532
+285.6666667 , 6177.6 , 178.2670032
+326.4700855 , -6177.6 , 129.8567952
+326.4700855 , -5984.55 , 125.0305452
+326.4700855 , -5791.5 , 120.2042952
+326.4700855 , -5598.45 , 115.3780452
+326.4700855 , -5405.4 , 110.5517952
+326.4700855 , -5212.35 , 105.7255452
+326.4700855 , -5019.3 , 100.8992952
+326.4700855 , -4826.25 , 96.0730452
+326.4700855 , -4633.2 , 91.2467952
+326.4700855 , -4440.15 , 86.4205452
+326.4700855 , -4247.1 , 81.5942952
+326.4700855 , -4054.05 , 76.7680452
+326.4700855 , -3861 , 71.9417952
+326.4700855 , -3667.95 , 67.1155452
+326.4700855 , -3474.9 , 62.2892952
+326.4700855 , -3281.85 , 57.4630452
+326.4700855 , -3088.8 , 52.6367952
+326.4700855 , -2895.75 , 47.8105452
+326.4700855 , -2702.7 , 42.9842952
+326.4700855 , -2509.65 , 38.1580452
+326.4700855 , -2316.6 , 33.3317952
+326.4700855 , -2123.55 , 28.5055452
+326.4700855 , -1930.5 , 23.6792952
+326.4700855 , -1737.45 , 18.8530452
+326.4700855 , -1544.4 , 14.0267952
+326.4700855 , -1351.35 , 9.200545199
+326.4700855 , -1158.3 , 4.374295199
+326.4700855 , -965.25 , 0.451954801
+326.4700855 , -772.2 , 5.278204801
+326.4700855 , -579.15 , 10.1044548
+326.4700855 , -386.1 , 14.9307048
+326.4700855 , -193.05 , 19.7569548
+326.4700855 , 0 , 24.5832048
+326.4700855 , 193.05 , 29.4094548
+326.4700855 , 386.1 , 34.2357048
+326.4700855 , 579.15 , 39.0619548
+326.4700855 , 772.2 , 43.8882048
+326.4700855 , 965.25 , 48.7144548
+326.4700855 , 1158.3 , 53.5407048
+326.4700855 , 1351.35 , 58.3669548
+326.4700855 , 1544.4 , 63.1932048
+326.4700855 , 1737.45 , 68.0194548
+326.4700855 , 1930.5 , 72.8457048
+326.4700855 , 2123.55 , 77.6719548
+326.4700855 , 2316.6 , 82.4982048
+326.4700855 , 2509.65 , 87.3244548
+326.4700855 , 2702.7 , 92.1507048
+326.4700855 , 2895.75 , 96.9769548
+326.4700855 , 3088.8 , 101.8032048
+326.4700855 , 3281.85 , 106.6294548
+326.4700855 , 3474.9 , 111.4557048
+326.4700855 , 3667.95 , 116.2819548
+326.4700855 , 3861 , 121.1082048
+326.4700855 , 4054.05 , 125.9344548
+326.4700855 , 4247.1 , 130.7607048
+326.4700855 , 4440.15 , 135.5869548
+326.4700855 , 4633.2 , 140.4132048
+326.4700855 , 4826.25 , 145.2394548
+326.4700855 , 5019.3 , 150.0657048
+326.4700855 , 5212.35 , 154.8919548
+326.4700855 , 5405.4 , 159.7182048
+326.4700855 , 5598.45 , 164.5444548
+326.4700855 , 5791.5 , 169.3707048
+326.4700855 , 5984.55 , 174.1969548
+326.4700855 , 6177.6 , 179.0232048
+367.2820513 , -6177.6 , 129.1004352
+367.2820513 , -5984.55 , 124.2741852
+367.2820513 , -5791.5 , 119.4479352
+367.2820513 , -5598.45 , 114.6216852
+367.2820513 , -5405.4 , 109.7954352
+367.2820513 , -5212.35 , 104.9691852
+367.2820513 , -5019.3 , 100.1429352
+367.2820513 , -4826.25 , 95.3166852
+367.2820513 , -4633.2 , 90.4904352
+367.2820513 , -4440.15 , 85.6641852
+367.2820513 , -4247.1 , 80.8379352
+367.2820513 , -4054.05 , 76.0116852
+367.2820513 , -3861 , 71.1854352
+367.2820513 , -3667.95 , 66.3591852
+367.2820513 , -3474.9 , 61.5329352
+367.2820513 , -3281.85 , 56.7066852
+367.2820513 , -3088.8 , 51.8804352
+367.2820513 , -2895.75 , 47.0541852
+367.2820513 , -2702.7 , 42.2279352
+367.2820513 , -2509.65 , 37.4016852
+367.2820513 , -2316.6 , 32.5754352
+367.2820513 , -2123.55 , 27.7491852
+367.2820513 , -1930.5 , 22.9229352
+367.2820513 , -1737.45 , 18.0966852
+367.2820513 , -1544.4 , 13.2704352
+367.2820513 , -1351.35 , 8.4441852
+367.2820513 , -1158.3 , 3.6179352
+367.2820513 , -965.25 , 1.2083148
+367.2820513 , -772.2 , 6.0345648
+367.2820513 , -579.15 , 10.8608148
+367.2820513 , -386.1 , 15.6870648
+367.2820513 , -193.05 , 20.5133148
+367.2820513 , 0 , 25.3395648
+367.2820513 , 193.05 , 30.1658148
+367.2820513 , 386.1 , 34.9920648
+367.2820513 , 579.15 , 39.8183148
+367.2820513 , 772.2 , 44.6445648
+367.2820513 , 965.25 , 49.4708148
+367.2820513 , 1158.3 , 54.2970648
+367.2820513 , 1351.35 , 59.1233148
+367.2820513 , 1544.4 , 63.9495648
+367.2820513 , 1737.45 , 68.7758148
+367.2820513 , 1930.5 , 73.6020648
+367.2820513 , 2123.55 , 78.4283148
+367.2820513 , 2316.6 , 83.2545648
+367.2820513 , 2509.65 , 88.0808148
+367.2820513 , 2702.7 , 92.9070648
+367.2820513 , 2895.75 , 97.7333148
+367.2820513 , 3088.8 , 102.5595648
+367.2820513 , 3281.85 , 107.3858148
+367.2820513 , 3474.9 , 112.2120648
+367.2820513 , 3667.95 , 117.0383148
+367.2820513 , 3861 , 121.8645648
+367.2820513 , 4054.05 , 126.6908148
+367.2820513 , 4247.1 , 131.5170648
+367.2820513 , 4440.15 , 136.3433148
+367.2820513 , 4633.2 , 141.1695648
+367.2820513 , 4826.25 , 145.9958148
+367.2820513 , 5019.3 , 150.8220648
+367.2820513 , 5212.35 , 155.6483148
+367.2820513 , 5405.4 , 160.4745648
+367.2820513 , 5598.45 , 165.3008148
+367.2820513 , 5791.5 , 170.1270648
+367.2820513 , 5984.55 , 174.9533148
+367.2820513 , 6177.6 , 179.7795648
+408.0854701 , -6177.6 , 128.3442336
+408.0854701 , -5984.55 , 123.5179836
+408.0854701 , -5791.5 , 118.6917336
+408.0854701 , -5598.45 , 113.8654836
+408.0854701 , -5405.4 , 109.0392336
+408.0854701 , -5212.35 , 104.2129836
+408.0854701 , -5019.3 , 99.3867336
+408.0854701 , -4826.25 , 94.5604836
+408.0854701 , -4633.2 , 89.7342336
+408.0854701 , -4440.15 , 84.9079836
+408.0854701 , -4247.1 , 80.0817336
+408.0854701 , -4054.05 , 75.2554836
+408.0854701 , -3861 , 70.4292336
+408.0854701 , -3667.95 , 65.6029836
+408.0854701 , -3474.9 , 60.7767336
+408.0854701 , -3281.85 , 55.9504836
+408.0854701 , -3088.8 , 51.1242336
+408.0854701 , -2895.75 , 46.2979836
+408.0854701 , -2702.7 , 41.4717336
+408.0854701 , -2509.65 , 36.6454836
+408.0854701 , -2316.6 , 31.8192336
+408.0854701 , -2123.55 , 26.9929836
+408.0854701 , -1930.5 , 22.1667336
+408.0854701 , -1737.45 , 17.3404836
+408.0854701 , -1544.4 , 12.5142336
+408.0854701 , -1351.35 , 7.6879836
+408.0854701 , -1158.3 , 2.8617336
+408.0854701 , -965.25 , 1.9645164
+408.0854701 , -772.2 , 6.7907664
+408.0854701 , -579.15 , 11.6170164
+408.0854701 , -386.1 , 16.4432664
+408.0854701 , -193.05 , 21.2695164
+408.0854701 , 0 , 26.0957664
+408.0854701 , 193.05 , 30.9220164
+408.0854701 , 386.1 , 35.7482664
+408.0854701 , 579.15 , 40.5745164
+408.0854701 , 772.2 , 45.4007664
+408.0854701 , 965.25 , 50.2270164
+408.0854701 , 1158.3 , 55.0532664
+408.0854701 , 1351.35 , 59.8795164
+408.0854701 , 1544.4 , 64.7057664
+408.0854701 , 1737.45 , 69.5320164
+408.0854701 , 1930.5 , 74.3582664
+408.0854701 , 2123.55 , 79.1845164
+408.0854701 , 2316.6 , 84.0107664
+408.0854701 , 2509.65 , 88.8370164
+408.0854701 , 2702.7 , 93.6632664
+408.0854701 , 2895.75 , 98.4895164
+408.0854701 , 3088.8 , 103.3157664
+408.0854701 , 3281.85 , 108.1420164
+408.0854701 , 3474.9 , 112.9682664
+408.0854701 , 3667.95 , 117.7945164
+408.0854701 , 3861 , 122.6207664
+408.0854701 , 4054.05 , 127.4470164
+408.0854701 , 4247.1 , 132.2732664
+408.0854701 , 4440.15 , 137.0995164
+408.0854701 , 4633.2 , 141.9257664
+408.0854701 , 4826.25 , 146.7520164
+408.0854701 , 5019.3 , 151.5782664
+408.0854701 , 5212.35 , 156.4045164
+408.0854701 , 5405.4 , 161.2307664
+408.0854701 , 5598.45 , 166.0570164
+408.0854701 , 5791.5 , 170.8832664
+408.0854701 , 5984.55 , 175.7095164
+408.0854701 , 6177.6 , 180.5357664
+448.8974359 , -6177.6 , 127.5878736
+448.8974359 , -5984.55 , 122.7616236
+448.8974359 , -5791.5 , 117.9353736
+448.8974359 , -5598.45 , 113.1091236
+448.8974359 , -5405.4 , 108.2828736
+448.8974359 , -5212.35 , 103.4566236
+448.8974359 , -5019.3 , 98.6303736
+448.8974359 , -4826.25 , 93.8041236
+448.8974359 , -4633.2 , 88.9778736
+448.8974359 , -4440.15 , 84.1516236
+448.8974359 , -4247.1 , 79.3253736
+448.8974359 , -4054.05 , 74.4991236
+448.8974359 , -3861 , 69.6728736
+448.8974359 , -3667.95 , 64.8466236
+448.8974359 , -3474.9 , 60.0203736
+448.8974359 , -3281.85 , 55.1941236
+448.8974359 , -3088.8 , 50.3678736
+448.8974359 , -2895.75 , 45.5416236
+448.8974359 , -2702.7 , 40.7153736
+448.8974359 , -2509.65 , 35.8891236
+448.8974359 , -2316.6 , 31.0628736
+448.8974359 , -2123.55 , 26.2366236
+448.8974359 , -1930.5 , 21.4103736
+448.8974359 , -1737.45 , 16.5841236
+448.8974359 , -1544.4 , 11.7578736
+448.8974359 , -1351.35 , 6.9316236
+448.8974359 , -1158.3 , 2.1053736
+448.8974359 , -965.25 , 2.7208764
+448.8974359 , -772.2 , 7.5471264
+448.8974359 , -579.15 , 12.3733764
+448.8974359 , -386.1 , 17.1996264
+448.8974359 , -193.05 , 22.0258764
+448.8974359 , 0 , 26.8521264
+448.8974359 , 193.05 , 31.6783764
+448.8974359 , 386.1 , 36.5046264
+448.8974359 , 579.15 , 41.3308764
+448.8974359 , 772.2 , 46.1571264
+448.8974359 , 965.25 , 50.9833764
+448.8974359 , 1158.3 , 55.8096264
+448.8974359 , 1351.35 , 60.6358764
+448.8974359 , 1544.4 , 65.4621264
+448.8974359 , 1737.45 , 70.2883764
+448.8974359 , 1930.5 , 75.1146264
+448.8974359 , 2123.55 , 79.9408764
+448.8974359 , 2316.6 , 84.7671264
+448.8974359 , 2509.65 , 89.5933764
+448.8974359 , 2702.7 , 94.4196264
+448.8974359 , 2895.75 , 99.2458764
+448.8974359 , 3088.8 , 104.0721264
+448.8974359 , 3281.85 , 108.8983764
+448.8974359 , 3474.9 , 113.7246264
+448.8974359 , 3667.95 , 118.5508764
+448.8974359 , 3861 , 123.3771264
+448.8974359 , 4054.05 , 128.2033764
+448.8974359 , 4247.1 , 133.0296264
+448.8974359 , 4440.15 , 137.8558764
+448.8974359 , 4633.2 , 142.6821264
+448.8974359 , 4826.25 , 147.5083764
+448.8974359 , 5019.3 , 152.3346264
+448.8974359 , 5212.35 , 157.1608764
+448.8974359 , 5405.4 , 161.9871264
+448.8974359 , 5598.45 , 166.8133764
+448.8974359 , 5791.5 , 171.6396264
+448.8974359 , 5984.55 , 176.4658764
+448.8974359 , 6177.6 , 181.2921264
+489.7094017 , -6177.6 , 126.8315136
+489.7094017 , -5984.55 , 122.0052636
+489.7094017 , -5791.5 , 117.1790136
+489.7094017 , -5598.45 , 112.3527636
+489.7094017 , -5405.4 , 107.5265136
+489.7094017 , -5212.35 , 102.7002636
+489.7094017 , -5019.3 , 97.8740136
+489.7094017 , -4826.25 , 93.0477636
+489.7094017 , -4633.2 , 88.2215136
+489.7094017 , -4440.15 , 83.3952636
+489.7094017 , -4247.1 , 78.5690136
+489.7094017 , -4054.05 , 73.7427636
+489.7094017 , -3861 , 68.9165136
+489.7094017 , -3667.95 , 64.0902636
+489.7094017 , -3474.9 , 59.2640136
+489.7094017 , -3281.85 , 54.4377636
+489.7094017 , -3088.8 , 49.6115136
+489.7094017 , -2895.75 , 44.7852636
+489.7094017 , -2702.7 , 39.9590136
+489.7094017 , -2509.65 , 35.1327636
+489.7094017 , -2316.6 , 30.3065136
+489.7094017 , -2123.55 , 25.4802636
+489.7094017 , -1930.5 , 20.6540136
+489.7094017 , -1737.45 , 15.8277636
+489.7094017 , -1544.4 , 11.0015136
+489.7094017 , -1351.35 , 6.1752636
+489.7094017 , -1158.3 , 1.3490136
+489.7094017 , -965.25 , 3.4772364
+489.7094017 , -772.2 , 8.3034864
+489.7094017 , -579.15 , 13.1297364
+489.7094017 , -386.1 , 17.9559864
+489.7094017 , -193.05 , 22.7822364
+489.7094017 , 0 , 27.6084864
+489.7094017 , 193.05 , 32.4347364
+489.7094017 , 386.1 , 37.2609864
+489.7094017 , 579.15 , 42.0872364
+489.7094017 , 772.2 , 46.9134864
+489.7094017 , 965.25 , 51.7397364
+489.7094017 , 1158.3 , 56.5659864
+489.7094017 , 1351.35 , 61.3922364
+489.7094017 , 1544.4 , 66.2184864
+489.7094017 , 1737.45 , 71.0447364
+489.7094017 , 1930.5 , 75.8709864
+489.7094017 , 2123.55 , 80.6972364
+489.7094017 , 2316.6 , 85.5234864
+489.7094017 , 2509.65 , 90.3497364
+489.7094017 , 2702.7 , 95.1759864
+489.7094017 , 2895.75 , 100.0022364
+489.7094017 , 3088.8 , 104.8284864
+489.7094017 , 3281.85 , 109.6547364
+489.7094017 , 3474.9 , 114.4809864
+489.7094017 , 3667.95 , 119.3072364
+489.7094017 , 3861 , 124.1334864
+489.7094017 , 4054.05 , 128.9597364
+489.7094017 , 4247.1 , 133.7859864
+489.7094017 , 4440.15 , 138.6122364
+489.7094017 , 4633.2 , 143.4384864
+489.7094017 , 4826.25 , 148.2647364
+489.7094017 , 5019.3 , 153.0909864
+489.7094017 , 5212.35 , 157.9172364
+489.7094017 , 5405.4 , 162.7434864
+489.7094017 , 5598.45 , 167.5697364
+489.7094017 , 5791.5 , 172.3959864
+489.7094017 , 5984.55 , 177.2222364
+489.7094017 , 6177.6 , 182.0484864
+816.1794872 , -6177.6 , 120.7811088
+816.1794872 , -5984.55 , 115.9548588
+816.1794872 , -5791.5 , 111.1286088
+816.1794872 , -5598.45 , 106.3023588
+816.1794872 , -5405.4 , 101.4761088
+816.1794872 , -5212.35 , 96.6498588
+816.1794872 , -5019.3 , 91.8236088
+816.1794872 , -4826.25 , 86.9973588
+816.1794872 , -4633.2 , 82.1711088
+816.1794872 , -4440.15 , 77.3448588
+816.1794872 , -4247.1 , 72.5186088
+816.1794872 , -4054.05 , 67.6923588
+816.1794872 , -3861 , 62.8661088
+816.1794872 , -3667.95 , 58.0398588
+816.1794872 , -3474.9 , 53.2136088
+816.1794872 , -3281.85 , 48.3873588
+816.1794872 , -3088.8 , 43.5611088
+816.1794872 , -2895.75 , 38.7348588
+816.1794872 , -2702.7 , 33.9086088
+816.1794872 , -2509.65 , 29.0823588
+816.1794872 , -2316.6 , 24.2561088
+816.1794872 , -2123.55 , 19.4298588
+816.1794872 , -1930.5 , 14.6036088
+816.1794872 , -1737.45 , 9.7773588
+816.1794872 , -1544.4 , 4.9511088
+816.1794872 , -1351.35 , 0.1248588
+816.1794872 , -1158.3 , 4.7013912
+816.1794872 , -965.25 , 9.5276412
+816.1794872 , -772.2 , 14.3538912
+816.1794872 , -579.15 , 19.1801412
+816.1794872 , -386.1 , 24.0063912
+816.1794872 , -193.05 , 28.8326412
+816.1794872 , 0 , 33.6588912
+816.1794872 , 193.05 , 38.4851412
+816.1794872 , 386.1 , 43.3113912
+816.1794872 , 579.15 , 48.1376412
+816.1794872 , 772.2 , 52.9638912
+816.1794872 , 965.25 , 57.7901412
+816.1794872 , 1158.3 , 62.6163912
+816.1794872 , 1351.35 , 67.4426412
+816.1794872 , 1544.4 , 72.2688912
+816.1794872 , 1737.45 , 77.0951412
+816.1794872 , 1930.5 , 81.9213912
+816.1794872 , 2123.55 , 86.7476412
+816.1794872 , 2316.6 , 91.5738912
+816.1794872 , 2509.65 , 96.4001412
+816.1794872 , 2702.7 , 101.2263912
+816.1794872 , 2895.75 , 106.0526412
+816.1794872 , 3088.8 , 110.8788912
+816.1794872 , 3281.85 , 115.7051412
+816.1794872 , 3474.9 , 120.5313912
+816.1794872 , 3667.95 , 125.3576412
+816.1794872 , 3861 , 130.1838912
+816.1794872 , 4054.05 , 135.0101412
+816.1794872 , 4247.1 , 139.8363912
+816.1794872 , 4440.15 , 144.6626412
+816.1794872 , 4633.2 , 149.4888912
+816.1794872 , 4826.25 , 154.3151412
+816.1794872 , 5019.3 , 159.1413912
+816.1794872 , 5212.35 , 163.9676412
+816.1794872 , 5405.4 , 168.7938912
+816.1794872 , 5598.45 , 173.6201412
+816.1794872 , 5791.5 , 178.4463912
+816.1794872 , 5984.55 , 183.2726412
+816.1794872 , 6177.6 , 188.0988912
+1020.25641 , -6177.6 , 116.998992
+1020.25641 , -5984.55 , 112.172742
+1020.25641 , -5791.5 , 107.346492
+1020.25641 , -5598.45 , 102.520242
+1020.25641 , -5405.4 , 97.693992
+1020.25641 , -5212.35 , 92.867742
+1020.25641 , -5019.3 , 88.041492
+1020.25641 , -4826.25 , 83.215242
+1020.25641 , -4633.2 , 78.388992
+1020.25641 , -4440.15 , 73.562742
+1020.25641 , -4247.1 , 68.736492
+1020.25641 , -4054.05 , 63.910242
+1020.25641 , -3861 , 59.083992
+1020.25641 , -3667.95 , 54.257742
+1020.25641 , -3474.9 , 49.431492
+1020.25641 , -3281.85 , 44.605242
+1020.25641 , -3088.8 , 39.778992
+1020.25641 , -2895.75 , 34.952742
+1020.25641 , -2702.7 , 30.126492
+1020.25641 , -2509.65 , 25.300242
+1020.25641 , -2316.6 , 20.473992
+1020.25641 , -2123.55 , 15.647742
+1020.25641 , -1930.5 , 10.821492
+1020.25641 , -1737.45 , 5.995242005
+1020.25641 , -1544.4 , 1.168992005
+1020.25641 , -1351.35 , 3.657257995
+1020.25641 , -1158.3 , 8.483507995
+1020.25641 , -965.25 , 13.309758
+1020.25641 , -772.2 , 18.136008
+1020.25641 , -579.15 , 22.962258
+1020.25641 , -386.1 , 27.788508
+1020.25641 , -193.05 , 32.614758
+1020.25641 , 0 , 37.441008
+1020.25641 , 193.05 , 42.267258
+1020.25641 , 386.1 , 47.093508
+1020.25641 , 579.15 , 51.919758
+1020.25641 , 772.2 , 56.746008
+1020.25641 , 965.25 , 61.572258
+1020.25641 , 1158.3 , 66.398508
+1020.25641 , 1351.35 , 71.224758
+1020.25641 , 1544.4 , 76.051008
+1020.25641 , 1737.45 , 80.877258
+1020.25641 , 1930.5 , 85.703508
+1020.25641 , 2123.55 , 90.529758
+1020.25641 , 2316.6 , 95.356008
+1020.25641 , 2509.65 , 100.182258
+1020.25641 , 2702.7 , 105.008508
+1020.25641 , 2895.75 , 109.834758
+1020.25641 , 3088.8 , 114.661008
+1020.25641 , 3281.85 , 119.487258
+1020.25641 , 3474.9 , 124.313508
+1020.25641 , 3667.95 , 129.139758
+1020.25641 , 3861 , 133.966008
+1020.25641 , 4054.05 , 138.792258
+1020.25641 , 4247.1 , 143.618508
+1020.25641 , 4440.15 , 148.444758
+1020.25641 , 4633.2 , 153.271008
+1020.25641 , 4826.25 , 158.097258
+1020.25641 , 5019.3 , 162.923508
+1020.25641 , 5212.35 , 167.749758
+1020.25641 , 5405.4 , 172.576008
+1020.25641 , 5598.45 , 177.402258
+1020.25641 , 5791.5 , 182.228508
+1020.25641 , 5984.55 , 187.054758
+1020.25641 , 6177.6 , 191.881008
+1224.273504 , -6177.6 , 113.217984
+1224.273504 , -5984.55 , 108.391734
+1224.273504 , -5791.5 , 103.565484
+1224.273504 , -5598.45 , 98.73923401
+1224.273504 , -5405.4 , 93.91298401
+1224.273504 , -5212.35 , 89.08673401
+1224.273504 , -5019.3 , 84.26048401
+1224.273504 , -4826.25 , 79.43423401
+1224.273504 , -4633.2 , 74.60798401
+1224.273504 , -4440.15 , 69.78173401
+1224.273504 , -4247.1 , 64.95548401
+1224.273504 , -4054.05 , 60.12923401
+1224.273504 , -3861 , 55.30298401
+1224.273504 , -3667.95 , 50.47673401
+1224.273504 , -3474.9 , 45.65048401
+1224.273504 , -3281.85 , 40.82423401
+1224.273504 , -3088.8 , 35.99798401
+1224.273504 , -2895.75 , 31.17173401
+1224.273504 , -2702.7 , 26.34548401
+1224.273504 , -2509.65 , 21.51923401
+1224.273504 , -2316.6 , 16.69298401
+1224.273504 , -2123.55 , 11.86673401
+1224.273504 , -1930.5 , 7.040484005
+1224.273504 , -1737.45 , 2.214234005
+1224.273504 , -1544.4 , 2.612015995
+1224.273504 , -1351.35 , 7.438265995
+1224.273504 , -1158.3 , 12.26451599
+1224.273504 , -965.25 , 17.09076599
+1224.273504 , -772.2 , 21.91701599
+1224.273504 , -579.15 , 26.74326599
+1224.273504 , -386.1 , 31.56951599
+1224.273504 , -193.05 , 36.39576599
+1224.273504 , 0 , 41.22201599
+1224.273504 , 193.05 , 46.04826599
+1224.273504 , 386.1 , 50.87451599
+1224.273504 , 579.15 , 55.70076599
+1224.273504 , 772.2 , 60.52701599
+1224.273504 , 965.25 , 65.35326599
+1224.273504 , 1158.3 , 70.17951599
+1224.273504 , 1351.35 , 75.00576599
+1224.273504 , 1544.4 , 79.83201599
+1224.273504 , 1737.45 , 84.65826599
+1224.273504 , 1930.5 , 89.48451599
+1224.273504 , 2123.55 , 94.31076599
+1224.273504 , 2316.6 , 99.13701599
+1224.273504 , 2509.65 , 103.963266
+1224.273504 , 2702.7 , 108.789516
+1224.273504 , 2895.75 , 113.615766
+1224.273504 , 3088.8 , 118.442016
+1224.273504 , 3281.85 , 123.268266
+1224.273504 , 3474.9 , 128.094516
+1224.273504 , 3667.95 , 132.920766
+1224.273504 , 3861 , 137.747016
+1224.273504 , 4054.05 , 142.573266
+1224.273504 , 4247.1 , 147.399516
+1224.273504 , 4440.15 , 152.225766
+1224.273504 , 4633.2 , 157.052016
+1224.273504 , 4826.25 , 161.878266
+1224.273504 , 5019.3 , 166.704516
+1224.273504 , 5212.35 , 171.530766
+1224.273504 , 5405.4 , 176.357016
+1224.273504 , 5598.45 , 181.183266
+1224.273504 , 5791.5 , 186.009516
+1224.273504 , 5984.55 , 190.835766
+1224.273504 , 6177.6 , 195.662016
+1428.290598 , -6177.6 , 109.436976
+1428.290598 , -5984.55 , 104.610726
+1428.290598 , -5791.5 , 99.78447601
+1428.290598 , -5598.45 , 94.95822601
+1428.290598 , -5405.4 , 90.13197601
+1428.290598 , -5212.35 , 85.30572601
+1428.290598 , -5019.3 , 80.47947601
+1428.290598 , -4826.25 , 75.65322601
+1428.290598 , -4633.2 , 70.82697601
+1428.290598 , -4440.15 , 66.00072601
+1428.290598 , -4247.1 , 61.17447601
+1428.290598 , -4054.05 , 56.34822601
+1428.290598 , -3861 , 51.52197601
+1428.290598 , -3667.95 , 46.69572601
+1428.290598 , -3474.9 , 41.86947601
+1428.290598 , -3281.85 , 37.04322601
+1428.290598 , -3088.8 , 32.21697601
+1428.290598 , -2895.75 , 27.39072601
+1428.290598 , -2702.7 , 22.56447601
+1428.290598 , -2509.65 , 17.73822601
+1428.290598 , -2316.6 , 12.91197601
+1428.290598 , -2123.55 , 8.085726005
+1428.290598 , -1930.5 , 3.259476005
+1428.290598 , -1737.45 , 1.566773995
+1428.290598 , -1544.4 , 6.393023995
+1428.290598 , -1351.35 , 11.21927399
+1428.290598 , -1158.3 , 16.04552399
+1428.290598 , -965.25 , 20.87177399
+1428.290598 , -772.2 , 25.69802399
+1428.290598 , -579.15 , 30.52427399
+1428.290598 , -386.1 , 35.35052399
+1428.290598 , -193.05 , 40.17677399
+1428.290598 , 0 , 45.00302399
+1428.290598 , 193.05 , 49.82927399
+1428.290598 , 386.1 , 54.65552399
+1428.290598 , 579.15 , 59.48177399
+1428.290598 , 772.2 , 64.30802399
+1428.290598 , 965.25 , 69.13427399
+1428.290598 , 1158.3 , 73.96052399
+1428.290598 , 1351.35 , 78.78677399
+1428.290598 , 1544.4 , 83.61302399
+1428.290598 , 1737.45 , 88.43927399
+1428.290598 , 1930.5 , 93.26552399
+1428.290598 , 2123.55 , 98.09177399
+1428.290598 , 2316.6 , 102.918024
+1428.290598 , 2509.65 , 107.744274
+1428.290598 , 2702.7 , 112.570524
+1428.290598 , 2895.75 , 117.396774
+1428.290598 , 3088.8 , 122.223024
+1428.290598 , 3281.85 , 127.049274
+1428.290598 , 3474.9 , 131.875524
+1428.290598 , 3667.95 , 136.701774
+1428.290598 , 3861 , 141.528024
+1428.290598 , 4054.05 , 146.354274
+1428.290598 , 4247.1 , 151.180524
+1428.290598 , 4440.15 , 156.006774
+1428.290598 , 4633.2 , 160.833024
+1428.290598 , 4826.25 , 165.659274
+1428.290598 , 5019.3 , 170.485524
+1428.290598 , 5212.35 , 175.311774
+1428.290598 , 5405.4 , 180.138024
+1428.290598 , 5598.45 , 184.964274
+1428.290598 , 5791.5 , 189.790524
+1428.290598 , 5984.55 , 194.616774
+1428.290598 , 6177.6 , 199.443024
+1632.393162 , -6177.6 , 105.654384
+1632.393162 , -5984.55 , 100.828134
+1632.393162 , -5791.5 , 96.00188401
+1632.393162 , -5598.45 , 91.17563401
+1632.393162 , -5405.4 , 86.34938401
+1632.393162 , -5212.35 , 81.52313401
+1632.393162 , -5019.3 , 76.69688401
+1632.393162 , -4826.25 , 71.87063401
+1632.393162 , -4633.2 , 67.04438401
+1632.393162 , -4440.15 , 62.21813401
+1632.393162 , -4247.1 , 57.39188401
+1632.393162 , -4054.05 , 52.56563401
+1632.393162 , -3861 , 47.73938401
+1632.393162 , -3667.95 , 42.91313401
+1632.393162 , -3474.9 , 38.08688401
+1632.393162 , -3281.85 , 33.26063401
+1632.393162 , -3088.8 , 28.43438401
+1632.393162 , -2895.75 , 23.60813401
+1632.393162 , -2702.7 , 18.78188401
+1632.393162 , -2509.65 , 13.95563401
+1632.393162 , -2316.6 , 9.129384007
+1632.393162 , -2123.55 , 4.303134007
+1632.393162 , -1930.5 , 0.523115993
+1632.393162 , -1737.45 , 5.349365993
+1632.393162 , -1544.4 , 10.17561599
+1632.393162 , -1351.35 , 15.00186599
+1632.393162 , -1158.3 , 19.82811599
+1632.393162 , -965.25 , 24.65436599
+1632.393162 , -772.2 , 29.48061599
+1632.393162 , -579.15 , 34.30686599
+1632.393162 , -386.1 , 39.13311599
+1632.393162 , -193.05 , 43.95936599
+1632.393162 , 0 , 48.78561599
+1632.393162 , 193.05 , 53.61186599
+1632.393162 , 386.1 , 58.43811599
+1632.393162 , 579.15 , 63.26436599
+1632.393162 , 772.2 , 68.09061599
+1632.393162 , 965.25 , 72.91686599
+1632.393162 , 1158.3 , 77.74311599
+1632.393162 , 1351.35 , 82.56936599
+1632.393162 , 1544.4 , 87.39561599
+1632.393162 , 1737.45 , 92.22186599
+1632.393162 , 1930.5 , 97.04811599
+1632.393162 , 2123.55 , 101.874366
+1632.393162 , 2316.6 , 106.700616
+1632.393162 , 2509.65 , 111.526866
+1632.393162 , 2702.7 , 116.353116
+1632.393162 , 2895.75 , 121.179366
+1632.393162 , 3088.8 , 126.005616
+1632.393162 , 3281.85 , 130.831866
+1632.393162 , 3474.9 , 135.658116
+1632.393162 , 3667.95 , 140.484366
+1632.393162 , 3861 , 145.310616
+1632.393162 , 4054.05 , 150.136866
+1632.393162 , 4247.1 , 154.963116
+1632.393162 , 4440.15 , 159.789366
+1632.393162 , 4633.2 , 164.615616
+1632.393162 , 4826.25 , 169.441866
+1632.393162 , 5019.3 , 174.268116
+1632.393162 , 5212.35 , 179.094366
+1632.393162 , 5405.4 , 183.920616
+1632.393162 , 5598.45 , 188.746866
+1632.393162 , 5791.5 , 193.573116
+1632.393162 , 5984.55 , 198.399366
+1632.393162 , 6177.6 , 203.225616
+1836.410256 , -6177.6 , 101.873376
+1836.410256 , -5984.55 , 97.04712601
+1836.410256 , -5791.5 , 92.22087601
+1836.410256 , -5598.45 , 87.39462601
+1836.410256 , -5405.4 , 82.56837601
+1836.410256 , -5212.35 , 77.74212601
+1836.410256 , -5019.3 , 72.91587601
+1836.410256 , -4826.25 , 68.08962601
+1836.410256 , -4633.2 , 63.26337601
+1836.410256 , -4440.15 , 58.43712601
+1836.410256 , -4247.1 , 53.61087601
+1836.410256 , -4054.05 , 48.78462601
+1836.410256 , -3861 , 43.95837601
+1836.410256 , -3667.95 , 39.13212601
+1836.410256 , -3474.9 , 34.30587601
+1836.410256 , -3281.85 , 29.47962601
+1836.410256 , -3088.8 , 24.65337601
+1836.410256 , -2895.75 , 19.82712601
+1836.410256 , -2702.7 , 15.00087601
+1836.410256 , -2509.65 , 10.17462601
+1836.410256 , -2316.6 , 5.348376008
+1836.410256 , -2123.55 , 0.522126008
+1836.410256 , -1930.5 , 4.304123992
+1836.410256 , -1737.45 , 9.130373992
+1836.410256 , -1544.4 , 13.95662399
+1836.410256 , -1351.35 , 18.78287399
+1836.410256 , -1158.3 , 23.60912399
+1836.410256 , -965.25 , 28.43537399
+1836.410256 , -772.2 , 33.26162399
+1836.410256 , -579.15 , 38.08787399
+1836.410256 , -386.1 , 42.91412399
+1836.410256 , -193.05 , 47.74037399
+1836.410256 , 0 , 52.56662399
+1836.410256 , 193.05 , 57.39287399
+1836.410256 , 386.1 , 62.21912399
+1836.410256 , 579.15 , 67.04537399
+1836.410256 , 772.2 , 71.87162399
+1836.410256 , 965.25 , 76.69787399
+1836.410256 , 1158.3 , 81.52412399
+1836.410256 , 1351.35 , 86.35037399
+1836.410256 , 1544.4 , 91.17662399
+1836.410256 , 1737.45 , 96.00287399
+1836.410256 , 1930.5 , 100.829124
+1836.410256 , 2123.55 , 105.655374
+1836.410256 , 2316.6 , 110.481624
+1836.410256 , 2509.65 , 115.307874
+1836.410256 , 2702.7 , 120.134124
+1836.410256 , 2895.75 , 124.960374
+1836.410256 , 3088.8 , 129.786624
+1836.410256 , 3281.85 , 134.612874
+1836.410256 , 3474.9 , 139.439124
+1836.410256 , 3667.95 , 144.265374
+1836.410256 , 3861 , 149.091624
+1836.410256 , 4054.05 , 153.917874
+1836.410256 , 4247.1 , 158.744124
+1836.410256 , 4440.15 , 163.570374
+1836.410256 , 4633.2 , 168.396624
+1836.410256 , 4826.25 , 173.222874
+1836.410256 , 5019.3 , 178.049124
+1836.410256 , 5212.35 , 182.875374
+1836.410256 , 5405.4 , 187.701624
+1836.410256 , 5598.45 , 192.527874
+1836.410256 , 5791.5 , 197.354124
+1836.410256 , 5984.55 , 202.180374
+1836.410256 , 6177.6 , 207.006624
+2040.42735 , -6177.6 , 98.09236801
+2040.42735 , -5984.55 , 93.26611801
+2040.42735 , -5791.5 , 88.43986801
+2040.42735 , -5598.45 , 83.61361801
+2040.42735 , -5405.4 , 78.78736801
+2040.42735 , -5212.35 , 73.96111801
+2040.42735 , -5019.3 , 69.13486801
+2040.42735 , -4826.25 , 64.30861801
+2040.42735 , -4633.2 , 59.48236801
+2040.42735 , -4440.15 , 54.65611801
+2040.42735 , -4247.1 , 49.82986801
+2040.42735 , -4054.05 , 45.00361801
+2040.42735 , -3861 , 40.17736801
+2040.42735 , -3667.95 , 35.35111801
+2040.42735 , -3474.9 , 30.52486801
+2040.42735 , -3281.85 , 25.69861801
+2040.42735 , -3088.8 , 20.87236801
+2040.42735 , -2895.75 , 16.04611801
+2040.42735 , -2702.7 , 11.21986801
+2040.42735 , -2509.65 , 6.393618008
+2040.42735 , -2316.6 , 1.567368008
+2040.42735 , -2123.55 , 3.258881992
+2040.42735 , -1930.5 , 8.085131992
+2040.42735 , -1737.45 , 12.91138199
+2040.42735 , -1544.4 , 17.73763199
+2040.42735 , -1351.35 , 22.56388199
+2040.42735 , -1158.3 , 27.39013199
+2040.42735 , -965.25 , 32.21638199
+2040.42735 , -772.2 , 37.04263199
+2040.42735 , -579.15 , 41.86888199
+2040.42735 , -386.1 , 46.69513199
+2040.42735 , -193.05 , 51.52138199
+2040.42735 , 0 , 56.34763199
+2040.42735 , 193.05 , 61.17388199
+2040.42735 , 386.1 , 66.00013199
+2040.42735 , 579.15 , 70.82638199
+2040.42735 , 772.2 , 75.65263199
+2040.42735 , 965.25 , 80.47888199
+2040.42735 , 1158.3 , 85.30513199
+2040.42735 , 1351.35 , 90.13138199
+2040.42735 , 1544.4 , 94.95763199
+2040.42735 , 1737.45 , 99.78388199
+2040.42735 , 1930.5 , 104.610132
+2040.42735 , 2123.55 , 109.436382
+2040.42735 , 2316.6 , 114.262632
+2040.42735 , 2509.65 , 119.088882
+2040.42735 , 2702.7 , 123.915132
+2040.42735 , 2895.75 , 128.741382
+2040.42735 , 3088.8 , 133.567632
+2040.42735 , 3281.85 , 138.393882
+2040.42735 , 3474.9 , 143.220132
+2040.42735 , 3667.95 , 148.046382
+2040.42735 , 3861 , 152.872632
+2040.42735 , 4054.05 , 157.698882
+2040.42735 , 4247.1 , 162.525132
+2040.42735 , 4440.15 , 167.351382
+2040.42735 , 4633.2 , 172.177632
+2040.42735 , 4826.25 , 177.003882
+2040.42735 , 5019.3 , 181.830132
+2040.42735 , 5212.35 , 186.656382
+2040.42735 , 5405.4 , 191.482632
+2040.42735 , 5598.45 , 196.308882
+2040.42735 , 5791.5 , 201.135132
+2040.42735 , 5984.55 , 205.961382
+2040.42735 , 6177.6 , 210.787632
+2244.529915 , -6177.6 , 94.30977599
+2244.529915 , -5984.55 , 89.48352599
+2244.529915 , -5791.5 , 84.65727599
+2244.529915 , -5598.45 , 79.83102599
+2244.529915 , -5405.4 , 75.00477599
+2244.529915 , -5212.35 , 70.17852599
+2244.529915 , -5019.3 , 65.35227599
+2244.529915 , -4826.25 , 60.52602599
+2244.529915 , -4633.2 , 55.69977599
+2244.529915 , -4440.15 , 50.87352599
+2244.529915 , -4247.1 , 46.04727599
+2244.529915 , -4054.05 , 41.22102599
+2244.529915 , -3861 , 36.39477599
+2244.529915 , -3667.95 , 31.56852599
+2244.529915 , -3474.9 , 26.74227599
+2244.529915 , -3281.85 , 21.91602599
+2244.529915 , -3088.8 , 17.08977599
+2244.529915 , -2895.75 , 12.26352599
+2244.529915 , -2702.7 , 7.437275991
+2244.529915 , -2509.65 , 2.611025991
+2244.529915 , -2316.6 , 2.215224009
+2244.529915 , -2123.55 , 7.041474009
+2244.529915 , -1930.5 , 11.86772401
+2244.529915 , -1737.45 , 16.69397401
+2244.529915 , -1544.4 , 21.52022401
+2244.529915 , -1351.35 , 26.34647401
+2244.529915 , -1158.3 , 31.17272401
+2244.529915 , -965.25 , 35.99897401
+2244.529915 , -772.2 , 40.82522401
+2244.529915 , -579.15 , 45.65147401
+2244.529915 , -386.1 , 50.47772401
+2244.529915 , -193.05 , 55.30397401
+2244.529915 , 0 , 60.13022401
+2244.529915 , 193.05 , 64.95647401
+2244.529915 , 386.1 , 69.78272401
+2244.529915 , 579.15 , 74.60897401
+2244.529915 , 772.2 , 79.43522401
+2244.529915 , 965.25 , 84.26147401
+2244.529915 , 1158.3 , 89.08772401
+2244.529915 , 1351.35 , 93.91397401
+2244.529915 , 1544.4 , 98.74022401
+2244.529915 , 1737.45 , 103.566474
+2244.529915 , 1930.5 , 108.392724
+2244.529915 , 2123.55 , 113.218974
+2244.529915 , 2316.6 , 118.045224
+2244.529915 , 2509.65 , 122.871474
+2244.529915 , 2702.7 , 127.697724
+2244.529915 , 2895.75 , 132.523974
+2244.529915 , 3088.8 , 137.350224
+2244.529915 , 3281.85 , 142.176474
+2244.529915 , 3474.9 , 147.002724
+2244.529915 , 3667.95 , 151.828974
+2244.529915 , 3861 , 156.655224
+2244.529915 , 4054.05 , 161.481474
+2244.529915 , 4247.1 , 166.307724
+2244.529915 , 4440.15 , 171.133974
+2244.529915 , 4633.2 , 175.960224
+2244.529915 , 4826.25 , 180.786474
+2244.529915 , 5019.3 , 185.612724
+2244.529915 , 5212.35 , 190.438974
+2244.529915 , 5405.4 , 195.265224
+2244.529915 , 5598.45 , 200.091474
+2244.529915 , 5791.5 , 204.917724
+2244.529915 , 5984.55 , 209.743974
+2244.529915 , 6177.6 , 214.570224
+2448.547009 , -6177.6 , 90.52876799
+2448.547009 , -5984.55 , 85.70251799
+2448.547009 , -5791.5 , 80.87626799
+2448.547009 , -5598.45 , 76.05001799
+2448.547009 , -5405.4 , 71.22376799
+2448.547009 , -5212.35 , 66.39751799
+2448.547009 , -5019.3 , 61.57126799
+2448.547009 , -4826.25 , 56.74501799
+2448.547009 , -4633.2 , 51.91876799
+2448.547009 , -4440.15 , 47.09251799
+2448.547009 , -4247.1 , 42.26626799
+2448.547009 , -4054.05 , 37.44001799
+2448.547009 , -3861 , 32.61376799
+2448.547009 , -3667.95 , 27.78751799
+2448.547009 , -3474.9 , 22.96126799
+2448.547009 , -3281.85 , 18.13501799
+2448.547009 , -3088.8 , 13.30876799
+2448.547009 , -2895.75 , 8.482517992
+2448.547009 , -2702.7 , 3.656267992
+2448.547009 , -2509.65 , 1.169982008
+2448.547009 , -2316.6 , 5.996232008
+2448.547009 , -2123.55 , 10.82248201
+2448.547009 , -1930.5 , 15.64873201
+2448.547009 , -1737.45 , 20.47498201
+2448.547009 , -1544.4 , 25.30123201
+2448.547009 , -1351.35 , 30.12748201
+2448.547009 , -1158.3 , 34.95373201
+2448.547009 , -965.25 , 39.77998201
+2448.547009 , -772.2 , 44.60623201
+2448.547009 , -579.15 , 49.43248201
+2448.547009 , -386.1 , 54.25873201
+2448.547009 , -193.05 , 59.08498201
+2448.547009 , 0 , 63.91123201
+2448.547009 , 193.05 , 68.73748201
+2448.547009 , 386.1 , 73.56373201
+2448.547009 , 579.15 , 78.38998201
+2448.547009 , 772.2 , 83.21623201
+2448.547009 , 965.25 , 88.04248201
+2448.547009 , 1158.3 , 92.86873201
+2448.547009 , 1351.35 , 97.69498201
+2448.547009 , 1544.4 , 102.521232
+2448.547009 , 1737.45 , 107.347482
+2448.547009 , 1930.5 , 112.173732
+2448.547009 , 2123.55 , 116.999982
+2448.547009 , 2316.6 , 121.826232
+2448.547009 , 2509.65 , 126.652482
+2448.547009 , 2702.7 , 131.478732
+2448.547009 , 2895.75 , 136.304982
+2448.547009 , 3088.8 , 141.131232
+2448.547009 , 3281.85 , 145.957482
+2448.547009 , 3474.9 , 150.783732
+2448.547009 , 3667.95 , 155.609982
+2448.547009 , 3861 , 160.436232
+2448.547009 , 4054.05 , 165.262482
+2448.547009 , 4247.1 , 170.088732
+2448.547009 , 4440.15 , 174.914982
+2448.547009 , 4633.2 , 179.741232
+2448.547009 , 4826.25 , 184.567482
+2448.547009 , 5019.3 , 189.393732
+2448.547009 , 5212.35 , 194.219982
+2448.547009 , 5405.4 , 199.046232
+2448.547009 , 5598.45 , 203.872482
+2448.547009 , 5791.5 , 208.698732
+2448.547009 , 5984.55 , 213.524982
+2448.547009 , 6177.6 , 218.351232
+2652.564103 , -6177.6 , 86.74775999
+2652.564103 , -5984.55 , 81.92150999
+2652.564103 , -5791.5 , 77.09525999
+2652.564103 , -5598.45 , 72.26900999
+2652.564103 , -5405.4 , 67.44275999
+2652.564103 , -5212.35 , 62.61650999
+2652.564103 , -5019.3 , 57.79025999
+2652.564103 , -4826.25 , 52.96400999
+2652.564103 , -4633.2 , 48.13775999
+2652.564103 , -4440.15 , 43.31150999
+2652.564103 , -4247.1 , 38.48525999
+2652.564103 , -4054.05 , 33.65900999
+2652.564103 , -3861 , 28.83275999
+2652.564103 , -3667.95 , 24.00650999
+2652.564103 , -3474.9 , 19.18025999
+2652.564103 , -3281.85 , 14.35400999
+2652.564103 , -3088.8 , 9.527759992
+2652.564103 , -2895.75 , 4.701509992
+2652.564103 , -2702.7 , 0.124740008
+2652.564103 , -2509.65 , 4.950990008
+2652.564103 , -2316.6 , 9.777240008
+2652.564103 , -2123.55 , 14.60349001
+2652.564103 , -1930.5 , 19.42974001
+2652.564103 , -1737.45 , 24.25599001
+2652.564103 , -1544.4 , 29.08224001
+2652.564103 , -1351.35 , 33.90849001
+2652.564103 , -1158.3 , 38.73474001
+2652.564103 , -965.25 , 43.56099001
+2652.564103 , -772.2 , 48.38724001
+2652.564103 , -579.15 , 53.21349001
+2652.564103 , -386.1 , 58.03974001
+2652.564103 , -193.05 , 62.86599001
+2652.564103 , 0 , 67.69224001
+2652.564103 , 193.05 , 72.51849001
+2652.564103 , 386.1 , 77.34474001
+2652.564103 , 579.15 , 82.17099001
+2652.564103 , 772.2 , 86.99724001
+2652.564103 , 965.25 , 91.82349001
+2652.564103 , 1158.3 , 96.64974001
+2652.564103 , 1351.35 , 101.47599
+2652.564103 , 1544.4 , 106.30224
+2652.564103 , 1737.45 , 111.12849
+2652.564103 , 1930.5 , 115.95474
+2652.564103 , 2123.55 , 120.78099
+2652.564103 , 2316.6 , 125.60724
+2652.564103 , 2509.65 , 130.43349
+2652.564103 , 2702.7 , 135.25974
+2652.564103 , 2895.75 , 140.08599
+2652.564103 , 3088.8 , 144.91224
+2652.564103 , 3281.85 , 149.73849
+2652.564103 , 3474.9 , 154.56474
+2652.564103 , 3667.95 , 159.39099
+2652.564103 , 3861 , 164.21724
+2652.564103 , 4054.05 , 169.04349
+2652.564103 , 4247.1 , 173.86974
+2652.564103 , 4440.15 , 178.69599
+2652.564103 , 4633.2 , 183.52224
+2652.564103 , 4826.25 , 188.34849
+2652.564103 , 5019.3 , 193.17474
+2652.564103 , 5212.35 , 198.00099
+2652.564103 , 5405.4 , 202.82724
+2652.564103 , 5598.45 , 207.65349
+2652.564103 , 5791.5 , 212.47974
+2652.564103 , 5984.55 , 217.30599
+2652.564103 , 6177.6 , 222.13224
+2856.666667 , -6177.6 , 82.96516799
+2856.666667 , -5984.55 , 78.13891799
+2856.666667 , -5791.5 , 73.31266799
+2856.666667 , -5598.45 , 68.48641799
+2856.666667 , -5405.4 , 63.66016799
+2856.666667 , -5212.35 , 58.83391799
+2856.666667 , -5019.3 , 54.00766799
+2856.666667 , -4826.25 , 49.18141799
+2856.666667 , -4633.2 , 44.35516799
+2856.666667 , -4440.15 , 39.52891799
+2856.666667 , -4247.1 , 34.70266799
+2856.666667 , -4054.05 , 29.87641799
+2856.666667 , -3861 , 25.05016799
+2856.666667 , -3667.95 , 20.22391799
+2856.666667 , -3474.9 , 15.39766799
+2856.666667 , -3281.85 , 10.57141799
+2856.666667 , -3088.8 , 5.745167994
+2856.666667 , -2895.75 , 0.918917994
+2856.666667 , -2702.7 , 3.907332006
+2856.666667 , -2509.65 , 8.733582006
+2856.666667 , -2316.6 , 13.55983201
+2856.666667 , -2123.55 , 18.38608201
+2856.666667 , -1930.5 , 23.21233201
+2856.666667 , -1737.45 , 28.03858201
+2856.666667 , -1544.4 , 32.86483201
+2856.666667 , -1351.35 , 37.69108201
+2856.666667 , -1158.3 , 42.51733201
+2856.666667 , -965.25 , 47.34358201
+2856.666667 , -772.2 , 52.16983201
+2856.666667 , -579.15 , 56.99608201
+2856.666667 , -386.1 , 61.82233201
+2856.666667 , -193.05 , 66.64858201
+2856.666667 , 0 , 71.47483201
+2856.666667 , 193.05 , 76.30108201
+2856.666667 , 386.1 , 81.12733201
+2856.666667 , 579.15 , 85.95358201
+2856.666667 , 772.2 , 90.77983201
+2856.666667 , 965.25 , 95.60608201
+2856.666667 , 1158.3 , 100.432332
+2856.666667 , 1351.35 , 105.258582
+2856.666667 , 1544.4 , 110.084832
+2856.666667 , 1737.45 , 114.911082
+2856.666667 , 1930.5 , 119.737332
+2856.666667 , 2123.55 , 124.563582
+2856.666667 , 2316.6 , 129.389832
+2856.666667 , 2509.65 , 134.216082
+2856.666667 , 2702.7 , 139.042332
+2856.666667 , 2895.75 , 143.868582
+2856.666667 , 3088.8 , 148.694832
+2856.666667 , 3281.85 , 153.521082
+2856.666667 , 3474.9 , 158.347332
+2856.666667 , 3667.95 , 163.173582
+2856.666667 , 3861 , 167.999832
+2856.666667 , 4054.05 , 172.826082
+2856.666667 , 4247.1 , 177.652332
+2856.666667 , 4440.15 , 182.478582
+2856.666667 , 4633.2 , 187.304832
+2856.666667 , 4826.25 , 192.131082
+2856.666667 , 5019.3 , 196.957332
+2856.666667 , 5212.35 , 201.783582
+2856.666667 , 5405.4 , 206.609832
+2856.666667 , 5598.45 , 211.436082
+2856.666667 , 5791.5 , 216.262332
+2856.666667 , 5984.55 , 221.088582
+2856.666667 , 6177.6 , 225.914832
+3060.683761 , -6177.6 , 79.18415999
+3060.683761 , -5984.55 , 74.35790999
+3060.683761 , -5791.5 , 69.53165999
+3060.683761 , -5598.45 , 64.70540999
+3060.683761 , -5405.4 , 59.87915999
+3060.683761 , -5212.35 , 55.05290999
+3060.683761 , -5019.3 , 50.22665999
+3060.683761 , -4826.25 , 45.40040999
+3060.683761 , -4633.2 , 40.57415999
+3060.683761 , -4440.15 , 35.74790999
+3060.683761 , -4247.1 , 30.92165999
+3060.683761 , -4054.05 , 26.09540999
+3060.683761 , -3861 , 21.26915999
+3060.683761 , -3667.95 , 16.44290999
+3060.683761 , -3474.9 , 11.61665999
+3060.683761 , -3281.85 , 6.790409994
+3060.683761 , -3088.8 , 1.964159994
+3060.683761 , -2895.75 , 2.862090006
+3060.683761 , -2702.7 , 7.688340006
+3060.683761 , -2509.65 , 12.51459001
+3060.683761 , -2316.6 , 17.34084001
+3060.683761 , -2123.55 , 22.16709001
+3060.683761 , -1930.5 , 26.99334001
+3060.683761 , -1737.45 , 31.81959001
+3060.683761 , -1544.4 , 36.64584001
+3060.683761 , -1351.35 , 41.47209001
+3060.683761 , -1158.3 , 46.29834001
+3060.683761 , -965.25 , 51.12459001
+3060.683761 , -772.2 , 55.95084001
+3060.683761 , -579.15 , 60.77709001
+3060.683761 , -386.1 , 65.60334001
+3060.683761 , -193.05 , 70.42959001
+3060.683761 , 0 , 75.25584001
+3060.683761 , 193.05 , 80.08209001
+3060.683761 , 386.1 , 84.90834001
+3060.683761 , 579.15 , 89.73459001
+3060.683761 , 772.2 , 94.56084001
+3060.683761 , 965.25 , 99.38709001
+3060.683761 , 1158.3 , 104.21334
+3060.683761 , 1351.35 , 109.03959
+3060.683761 , 1544.4 , 113.86584
+3060.683761 , 1737.45 , 118.69209
+3060.683761 , 1930.5 , 123.51834
+3060.683761 , 2123.55 , 128.34459
+3060.683761 , 2316.6 , 133.17084
+3060.683761 , 2509.65 , 137.99709
+3060.683761 , 2702.7 , 142.82334
+3060.683761 , 2895.75 , 147.64959
+3060.683761 , 3088.8 , 152.47584
+3060.683761 , 3281.85 , 157.30209
+3060.683761 , 3474.9 , 162.12834
+3060.683761 , 3667.95 , 166.95459
+3060.683761 , 3861 , 171.78084
+3060.683761 , 4054.05 , 176.60709
+3060.683761 , 4247.1 , 181.43334
+3060.683761 , 4440.15 , 186.25959
+3060.683761 , 4633.2 , 191.08584
+3060.683761 , 4826.25 , 195.91209
+3060.683761 , 5019.3 , 200.73834
+3060.683761 , 5212.35 , 205.56459
+3060.683761 , 5405.4 , 210.39084
+3060.683761 , 5598.45 , 215.21709
+3060.683761 , 5791.5 , 220.04334
+3060.683761 , 5984.55 , 224.86959
+3060.683761 , 6177.6 , 229.69584
+3264.700855 , -6177.6 , 75.40315199
+3264.700855 , -5984.55 , 70.57690199
+3264.700855 , -5791.5 , 65.75065199
+3264.700855 , -5598.45 , 60.92440199
+3264.700855 , -5405.4 , 56.09815199
+3264.700855 , -5212.35 , 51.27190199
+3264.700855 , -5019.3 , 46.44565199
+3264.700855 , -4826.25 , 41.61940199
+3264.700855 , -4633.2 , 36.79315199
+3264.700855 , -4440.15 , 31.96690199
+3264.700855 , -4247.1 , 27.14065199
+3264.700855 , -4054.05 , 22.31440199
+3264.700855 , -3861 , 17.48815199
+3264.700855 , -3667.95 , 12.66190199
+3264.700855 , -3474.9 , 7.835651994
+3264.700855 , -3281.85 , 3.009401994
+3264.700855 , -3088.8 , 1.816848006
+3264.700855 , -2895.75 , 6.643098006
+3264.700855 , -2702.7 , 11.46934801
+3264.700855 , -2509.65 , 16.29559801
+3264.700855 , -2316.6 , 21.12184801
+3264.700855 , -2123.55 , 25.94809801
+3264.700855 , -1930.5 , 30.77434801
+3264.700855 , -1737.45 , 35.60059801
+3264.700855 , -1544.4 , 40.42684801
+3264.700855 , -1351.35 , 45.25309801
+3264.700855 , -1158.3 , 50.07934801
+3264.700855 , -965.25 , 54.90559801
+3264.700855 , -772.2 , 59.73184801
+3264.700855 , -579.15 , 64.55809801
+3264.700855 , -386.1 , 69.38434801
+3264.700855 , -193.05 , 74.21059801
+3264.700855 , 0 , 79.03684801
+3264.700855 , 193.05 , 83.86309801
+3264.700855 , 386.1 , 88.68934801
+3264.700855 , 579.15 , 93.51559801
+3264.700855 , 772.2 , 98.34184801
+3264.700855 , 965.25 , 103.168098
+3264.700855 , 1158.3 , 107.994348
+3264.700855 , 1351.35 , 112.820598
+3264.700855 , 1544.4 , 117.646848
+3264.700855 , 1737.45 , 122.473098
+3264.700855 , 1930.5 , 127.299348
+3264.700855 , 2123.55 , 132.125598
+3264.700855 , 2316.6 , 136.951848
+3264.700855 , 2509.65 , 141.778098
+3264.700855 , 2702.7 , 146.604348
+3264.700855 , 2895.75 , 151.430598
+3264.700855 , 3088.8 , 156.256848
+3264.700855 , 3281.85 , 161.083098
+3264.700855 , 3474.9 , 165.909348
+3264.700855 , 3667.95 , 170.735598
+3264.700855 , 3861 , 175.561848
+3264.700855 , 4054.05 , 180.388098
+3264.700855 , 4247.1 , 185.214348
+3264.700855 , 4440.15 , 190.040598
+3264.700855 , 4633.2 , 194.866848
+3264.700855 , 4826.25 , 199.693098
+3264.700855 , 5019.3 , 204.519348
+3264.700855 , 5212.35 , 209.345598
+3264.700855 , 5405.4 , 214.171848
+3264.700855 , 5598.45 , 218.998098
+3264.700855 , 5791.5 , 223.824348
+3264.700855 , 5984.55 , 228.650598
+3264.700855 , 6177.6 , 233.476848
+3468.803419 , -6177.6 , 71.62056
+3468.803419 , -5984.55 , 66.79431
+3468.803419 , -5791.5 , 61.96806
+3468.803419 , -5598.45 , 57.14181
+3468.803419 , -5405.4 , 52.31556
+3468.803419 , -5212.35 , 47.48931
+3468.803419 , -5019.3 , 42.66306
+3468.803419 , -4826.25 , 37.83681
+3468.803419 , -4633.2 , 33.01056
+3468.803419 , -4440.15 , 28.18431
+3468.803419 , -4247.1 , 23.35806
+3468.803419 , -4054.05 , 18.53181
+3468.803419 , -3861 , 13.70556
+3468.803419 , -3667.95 , 8.879309996
+3468.803419 , -3474.9 , 4.053059996
+3468.803419 , -3281.85 , 0.773190004
+3468.803419 , -3088.8 , 5.599440004
+3468.803419 , -2895.75 , 10.42569
+3468.803419 , -2702.7 , 15.25194
+3468.803419 , -2509.65 , 20.07819
+3468.803419 , -2316.6 , 24.90444
+3468.803419 , -2123.55 , 29.73069
+3468.803419 , -1930.5 , 34.55694
+3468.803419 , -1737.45 , 39.38319
+3468.803419 , -1544.4 , 44.20944
+3468.803419 , -1351.35 , 49.03569
+3468.803419 , -1158.3 , 53.86194
+3468.803419 , -965.25 , 58.68819
+3468.803419 , -772.2 , 63.51444
+3468.803419 , -579.15 , 68.34069
+3468.803419 , -386.1 , 73.16694
+3468.803419 , -193.05 , 77.99319
+3468.803419 , 0 , 82.81944
+3468.803419 , 193.05 , 87.64569
+3468.803419 , 386.1 , 92.47194
+3468.803419 , 579.15 , 97.29819
+3468.803419 , 772.2 , 102.12444
+3468.803419 , 965.25 , 106.95069
+3468.803419 , 1158.3 , 111.77694
+3468.803419 , 1351.35 , 116.60319
+3468.803419 , 1544.4 , 121.42944
+3468.803419 , 1737.45 , 126.25569
+3468.803419 , 1930.5 , 131.08194
+3468.803419 , 2123.55 , 135.90819
+3468.803419 , 2316.6 , 140.73444
+3468.803419 , 2509.65 , 145.56069
+3468.803419 , 2702.7 , 150.38694
+3468.803419 , 2895.75 , 155.21319
+3468.803419 , 3088.8 , 160.03944
+3468.803419 , 3281.85 , 164.86569
+3468.803419 , 3474.9 , 169.69194
+3468.803419 , 3667.95 , 174.51819
+3468.803419 , 3861 , 179.34444
+3468.803419 , 4054.05 , 184.17069
+3468.803419 , 4247.1 , 188.99694
+3468.803419 , 4440.15 , 193.82319
+3468.803419 , 4633.2 , 198.64944
+3468.803419 , 4826.25 , 203.47569
+3468.803419 , 5019.3 , 208.30194
+3468.803419 , 5212.35 , 213.12819
+3468.803419 , 5405.4 , 217.95444
+3468.803419 , 5598.45 , 222.78069
+3468.803419 , 5791.5 , 227.60694
+3468.803419 , 5984.55 , 232.43319
+3468.803419 , 6177.6 , 237.25944
+3672.820513 , -6177.6 , 67.839552
+3672.820513 , -5984.55 , 63.013302
+3672.820513 , -5791.5 , 58.187052
+3672.820513 , -5598.45 , 53.360802
+3672.820513 , -5405.4 , 48.534552
+3672.820513 , -5212.35 , 43.708302
+3672.820513 , -5019.3 , 38.882052
+3672.820513 , -4826.25 , 34.055802
+3672.820513 , -4633.2 , 29.229552
+3672.820513 , -4440.15 , 24.403302
+3672.820513 , -4247.1 , 19.577052
+3672.820513 , -4054.05 , 14.750802
+3672.820513 , -3861 , 9.924551997
+3672.820513 , -3667.95 , 5.098301997
+3672.820513 , -3474.9 , 0.272051997
+3672.820513 , -3281.85 , 4.554198003
+3672.820513 , -3088.8 , 9.380448003
+3672.820513 , -2895.75 , 14.206698
+3672.820513 , -2702.7 , 19.032948
+3672.820513 , -2509.65 , 23.859198
+3672.820513 , -2316.6 , 28.685448
+3672.820513 , -2123.55 , 33.511698
+3672.820513 , -1930.5 , 38.337948
+3672.820513 , -1737.45 , 43.164198
+3672.820513 , -1544.4 , 47.990448
+3672.820513 , -1351.35 , 52.816698
+3672.820513 , -1158.3 , 57.642948
+3672.820513 , -965.25 , 62.469198
+3672.820513 , -772.2 , 67.295448
+3672.820513 , -579.15 , 72.121698
+3672.820513 , -386.1 , 76.947948
+3672.820513 , -193.05 , 81.774198
+3672.820513 , 0 , 86.600448
+3672.820513 , 193.05 , 91.426698
+3672.820513 , 386.1 , 96.252948
+3672.820513 , 579.15 , 101.079198
+3672.820513 , 772.2 , 105.905448
+3672.820513 , 965.25 , 110.731698
+3672.820513 , 1158.3 , 115.557948
+3672.820513 , 1351.35 , 120.384198
+3672.820513 , 1544.4 , 125.210448
+3672.820513 , 1737.45 , 130.036698
+3672.820513 , 1930.5 , 134.862948
+3672.820513 , 2123.55 , 139.689198
+3672.820513 , 2316.6 , 144.515448
+3672.820513 , 2509.65 , 149.341698
+3672.820513 , 2702.7 , 154.167948
+3672.820513 , 2895.75 , 158.994198
+3672.820513 , 3088.8 , 163.820448
+3672.820513 , 3281.85 , 168.646698
+3672.820513 , 3474.9 , 173.472948
+3672.820513 , 3667.95 , 178.299198
+3672.820513 , 3861 , 183.125448
+3672.820513 , 4054.05 , 187.951698
+3672.820513 , 4247.1 , 192.777948
+3672.820513 , 4440.15 , 197.604198
+3672.820513 , 4633.2 , 202.430448
+3672.820513 , 4826.25 , 207.256698
+3672.820513 , 5019.3 , 212.082948
+3672.820513 , 5212.35 , 216.909198
+3672.820513 , 5405.4 , 221.735448
+3672.820513 , 5598.45 , 226.561698
+3672.820513 , 5791.5 , 231.387948
+3672.820513 , 5984.55 , 236.214198
+3672.820513 , 6177.6 , 241.040448
+3876.837607 , -6177.6 , 64.058544
+3876.837607 , -5984.55 , 59.232294
+3876.837607 , -5791.5 , 54.406044
+3876.837607 , -5598.45 , 49.579794
+3876.837607 , -5405.4 , 44.753544
+3876.837607 , -5212.35 , 39.927294
+3876.837607 , -5019.3 , 35.101044
+3876.837607 , -4826.25 , 30.274794
+3876.837607 , -4633.2 , 25.448544
+3876.837607 , -4440.15 , 20.622294
+3876.837607 , -4247.1 , 15.796044
+3876.837607 , -4054.05 , 10.969794
+3876.837607 , -3861 , 6.143543997
+3876.837607 , -3667.95 , 1.317293997
+3876.837607 , -3474.9 , 3.508956003
+3876.837607 , -3281.85 , 8.335206003
+3876.837607 , -3088.8 , 13.161456
+3876.837607 , -2895.75 , 17.987706
+3876.837607 , -2702.7 , 22.813956
+3876.837607 , -2509.65 , 27.640206
+3876.837607 , -2316.6 , 32.466456
+3876.837607 , -2123.55 , 37.292706
+3876.837607 , -1930.5 , 42.118956
+3876.837607 , -1737.45 , 46.945206
+3876.837607 , -1544.4 , 51.771456
+3876.837607 , -1351.35 , 56.597706
+3876.837607 , -1158.3 , 61.423956
+3876.837607 , -965.25 , 66.250206
+3876.837607 , -772.2 , 71.076456
+3876.837607 , -579.15 , 75.902706
+3876.837607 , -386.1 , 80.728956
+3876.837607 , -193.05 , 85.555206
+3876.837607 , 0 , 90.381456
+3876.837607 , 193.05 , 95.207706
+3876.837607 , 386.1 , 100.033956
+3876.837607 , 579.15 , 104.860206
+3876.837607 , 772.2 , 109.686456
+3876.837607 , 965.25 , 114.512706
+3876.837607 , 1158.3 , 119.338956
+3876.837607 , 1351.35 , 124.165206
+3876.837607 , 1544.4 , 128.991456
+3876.837607 , 1737.45 , 133.817706
+3876.837607 , 1930.5 , 138.643956
+3876.837607 , 2123.55 , 143.470206
+3876.837607 , 2316.6 , 148.296456
+3876.837607 , 2509.65 , 153.122706
+3876.837607 , 2702.7 , 157.948956
+3876.837607 , 2895.75 , 162.775206
+3876.837607 , 3088.8 , 167.601456
+3876.837607 , 3281.85 , 172.427706
+3876.837607 , 3474.9 , 177.253956
+3876.837607 , 3667.95 , 182.080206
+3876.837607 , 3861 , 186.906456
+3876.837607 , 4054.05 , 191.732706
+3876.837607 , 4247.1 , 196.558956
+3876.837607 , 4440.15 , 201.385206
+3876.837607 , 4633.2 , 206.211456
+3876.837607 , 4826.25 , 211.037706
+3876.837607 , 5019.3 , 215.863956
+3876.837607 , 5212.35 , 220.690206
+3876.837607 , 5405.4 , 225.516456
+3876.837607 , 5598.45 , 230.342706
+3876.837607 , 5791.5 , 235.168956
+3876.837607 , 5984.55 , 239.995206
+3876.837607 , 6177.6 , 244.821456
+4080.854701 , -6177.6 , 60.277536
+4080.854701 , -5984.55 , 55.451286
+4080.854701 , -5791.5 , 50.625036
+4080.854701 , -5598.45 , 45.798786
+4080.854701 , -5405.4 , 40.972536
+4080.854701 , -5212.35 , 36.146286
+4080.854701 , -5019.3 , 31.320036
+4080.854701 , -4826.25 , 26.493786
+4080.854701 , -4633.2 , 21.667536
+4080.854701 , -4440.15 , 16.841286
+4080.854701 , -4247.1 , 12.015036
+4080.854701 , -4054.05 , 7.188785997
+4080.854701 , -3861 , 2.362535997
+4080.854701 , -3667.95 , 2.463714003
+4080.854701 , -3474.9 , 7.289964003
+4080.854701 , -3281.85 , 12.116214
+4080.854701 , -3088.8 , 16.942464
+4080.854701 , -2895.75 , 21.768714
+4080.854701 , -2702.7 , 26.594964
+4080.854701 , -2509.65 , 31.421214
+4080.854701 , -2316.6 , 36.247464
+4080.854701 , -2123.55 , 41.073714
+4080.854701 , -1930.5 , 45.899964
+4080.854701 , -1737.45 , 50.726214
+4080.854701 , -1544.4 , 55.552464
+4080.854701 , -1351.35 , 60.378714
+4080.854701 , -1158.3 , 65.204964
+4080.854701 , -965.25 , 70.031214
+4080.854701 , -772.2 , 74.857464
+4080.854701 , -579.15 , 79.683714
+4080.854701 , -386.1 , 84.509964
+4080.854701 , -193.05 , 89.336214
+4080.854701 , 0 , 94.162464
+4080.854701 , 193.05 , 98.988714
+4080.854701 , 386.1 , 103.814964
+4080.854701 , 579.15 , 108.641214
+4080.854701 , 772.2 , 113.467464
+4080.854701 , 965.25 , 118.293714
+4080.854701 , 1158.3 , 123.119964
+4080.854701 , 1351.35 , 127.946214
+4080.854701 , 1544.4 , 132.772464
+4080.854701 , 1737.45 , 137.598714
+4080.854701 , 1930.5 , 142.424964
+4080.854701 , 2123.55 , 147.251214
+4080.854701 , 2316.6 , 152.077464
+4080.854701 , 2509.65 , 156.903714
+4080.854701 , 2702.7 , 161.729964
+4080.854701 , 2895.75 , 166.556214
+4080.854701 , 3088.8 , 171.382464
+4080.854701 , 3281.85 , 176.208714
+4080.854701 , 3474.9 , 181.034964
+4080.854701 , 3667.95 , 185.861214
+4080.854701 , 3861 , 190.687464
+4080.854701 , 4054.05 , 195.513714
+4080.854701 , 4247.1 , 200.339964
+4080.854701 , 4440.15 , 205.166214
+4080.854701 , 4633.2 , 209.992464
+4080.854701 , 4826.25 , 214.818714
+4080.854701 , 5019.3 , 219.644964
+4080.854701 , 5212.35 , 224.471214
+4080.854701 , 5405.4 , 229.297464
+4080.854701 , 5598.45 , 234.123714
+4080.854701 , 5791.5 , 238.949964
+4080.854701 , 5984.55 , 243.776214
+4080.854701 , 6177.6 , 248.602464
+4268.632479 , -6177.6 , 56.79748799
+4268.632479 , -5984.55 , 51.97123799
+4268.632479 , -5791.5 , 47.14498799
+4268.632479 , -5598.45 , 42.31873799
+4268.632479 , -5405.4 , 37.49248799
+4268.632479 , -5212.35 , 32.66623799
+4268.632479 , -5019.3 , 27.83998799
+4268.632479 , -4826.25 , 23.01373799
+4268.632479 , -4633.2 , 18.18748799
+4268.632479 , -4440.15 , 13.36123799
+4268.632479 , -4247.1 , 8.534987993
+4268.632479 , -4054.05 , 3.708737993
+4268.632479 , -3861 , 1.117512007
+4268.632479 , -3667.95 , 5.943762007
+4268.632479 , -3474.9 , 10.77001201
+4268.632479 , -3281.85 , 15.59626201
+4268.632479 , -3088.8 , 20.42251201
+4268.632479 , -2895.75 , 25.24876201
+4268.632479 , -2702.7 , 30.07501201
+4268.632479 , -2509.65 , 34.90126201
+4268.632479 , -2316.6 , 39.72751201
+4268.632479 , -2123.55 , 44.55376201
+4268.632479 , -1930.5 , 49.38001201
+4268.632479 , -1737.45 , 54.20626201
+4268.632479 , -1544.4 , 59.03251201
+4268.632479 , -1351.35 , 63.85876201
+4268.632479 , -1158.3 , 68.68501201
+4268.632479 , -965.25 , 73.51126201
+4268.632479 , -772.2 , 78.33751201
+4268.632479 , -579.15 , 83.16376201
+4268.632479 , -386.1 , 87.99001201
+4268.632479 , -193.05 , 92.81626201
+4268.632479 , 0 , 97.64251201
+4268.632479 , 193.05 , 102.468762
+4268.632479 , 386.1 , 107.295012
+4268.632479 , 579.15 , 112.121262
+4268.632479 , 772.2 , 116.947512
+4268.632479 , 965.25 , 121.773762
+4268.632479 , 1158.3 , 126.600012
+4268.632479 , 1351.35 , 131.426262
+4268.632479 , 1544.4 , 136.252512
+4268.632479 , 1737.45 , 141.078762
+4268.632479 , 1930.5 , 145.905012
+4268.632479 , 2123.55 , 150.731262
+4268.632479 , 2316.6 , 155.557512
+4268.632479 , 2509.65 , 160.383762
+4268.632479 , 2702.7 , 165.210012
+4268.632479 , 2895.75 , 170.036262
+4268.632479 , 3088.8 , 174.862512
+4268.632479 , 3281.85 , 179.688762
+4268.632479 , 3474.9 , 184.515012
+4268.632479 , 3667.95 , 189.341262
+4268.632479 , 3861 , 194.167512
+4268.632479 , 4054.05 , 198.993762
+4268.632479 , 4247.1 , 203.820012
+4268.632479 , 4440.15 , 208.646262
+4268.632479 , 4633.2 , 213.472512
+4268.632479 , 4826.25 , 218.298762
+4268.632479 , 5019.3 , 223.125012
+4268.632479 , 5212.35 , 227.951262
+4268.632479 , 5405.4 , 232.777512
+4268.632479 , 5598.45 , 237.603762
+4268.632479 , 5791.5 , 242.430012
+4268.632479 , 5984.55 , 247.256262
+4268.632479 , 6177.6 , 252.082512
+5000 , -6177.6 , 43.2432
+5000 , -5984.55 , 38.41695
+5000 , -5791.5 , 33.5907
+5000 , -5598.45 , 28.76445
+5000 , -5405.4 , 23.9382
+5000 , -5212.35 , 19.11195
+5000 , -5019.3 , 14.2857
+5000 , -4826.25 , 9.45945
+5000 , -4633.2 , 4.6332
+5000 , -4440.15 , 0.19305
+5000 , -4247.1 , 5.0193
+5000 , -4054.05 , 9.84555
+5000 , -3861 , 14.6718
+5000 , -3667.95 , 19.49805
+5000 , -3474.9 , 24.3243
+5000 , -3281.85 , 29.15055
+5000 , -3088.8 , 33.9768
+5000 , -2895.75 , 38.80305
+5000 , -2702.7 , 43.6293
+5000 , -2509.65 , 48.45555
+5000 , -2316.6 , 53.2818
+5000 , -2123.55 , 58.10805
+5000 , -1930.5 , 62.9343
+5000 , -1737.45 , 67.76055
+5000 , -1544.4 , 72.5868
+5000 , -1351.35 , 77.41305
+5000 , -1158.3 , 82.2393
+5000 , -965.25 , 87.06555
+5000 , -772.2 , 91.8918
+5000 , -579.15 , 96.71805
+5000 , -386.1 , 101.5443
+5000 , -193.05 , 106.37055
+5000 , 0 , 111.1968
+5000 , 193.05 , 116.02305
+5000 , 386.1 , 120.8493
+5000 , 579.15 , 125.67555
+5000 , 772.2 , 130.5018
+5000 , 965.25 , 135.32805
+5000 , 1158.3 , 140.1543
+5000 , 1351.35 , 144.98055
+5000 , 1544.4 , 149.8068
+5000 , 1737.45 , 154.63305
+5000 , 1930.5 , 159.4593
+5000 , 2123.55 , 164.28555
+5000 , 2316.6 , 169.1118
+5000 , 2509.65 , 173.93805
+5000 , 2702.7 , 178.7643
+5000 , 2895.75 , 183.59055
+5000 , 3088.8 , 188.4168
+5000 , 3281.85 , 193.24305
+5000 , 3474.9 , 198.0693
+5000 , 3667.95 , 202.89555
+5000 , 3861 , 207.7218
+5000 , 4054.05 , 212.54805
+5000 , 4247.1 , 217.3743
+5000 , 4440.15 , 222.20055
+5000 , 4633.2 , 227.0268
+5000 , 4826.25 , 231.85305
+5000 , 5019.3 , 236.6793
+5000 , 5212.35 , 241.50555
+5000 , 5405.4 , 246.3318
+5000 , 5598.45 , 251.15805
+5000 , 5791.5 , 255.9843
+5000 , 5984.55 , 260.81055
+5000 , 6177.6 , 265.6368
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_2.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_2.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..c377504c83eb00e4d10a618b109d33ddc4a8e478
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_2.vtlm
@@ -0,0 +1,2081 @@
+Input Speed [rpm] , Input Torque [Nm] , Torque Loss [Nm]
+0 , -6177.6 , 119.22768
+0 , -5984.55 , 114.98058
+0 , -5791.5 , 110.73348
+0 , -5598.45 , 106.48638
+0 , -5405.4 , 102.23928
+0 , -5212.35 , 97.99218
+0 , -5019.3 , 93.74508
+0 , -4826.25 , 89.49798
+0 , -4633.2 , 85.25088
+0 , -4440.15 , 81.00378
+0 , -4247.1 , 76.75668
+0 , -4054.05 , 72.50958
+0 , -3861 , 68.26248
+0 , -3667.95 , 64.01538
+0 , -3474.9 , 59.76828
+0 , -3281.85 , 55.52118
+0 , -3088.8 , 51.27408
+0 , -2895.75 , 47.02698
+0 , -2702.7 , 42.77988
+0 , -2509.65 , 38.53278
+0 , -2316.6 , 34.28568
+0 , -2123.55 , 30.03858
+0 , -1930.5 , 25.79148
+0 , -1737.45 , 21.54438
+0 , -1544.4 , 17.29728
+0 , -1351.35 , 13.05018
+0 , -1158.3 , 8.80308
+0 , -965.25 , 4.55598
+0 , -772.2 , 0.30888
+0 , -579.15 , 3.93822
+0 , -386.1 , 8.18532
+0 , -193.05 , 12.43242
+0 , 0 , 16.67952
+0 , 193.05 , 20.92662
+0 , 386.1 , 25.17372
+0 , 579.15 , 29.42082
+0 , 772.2 , 33.66792
+0 , 965.25 , 37.91502
+0 , 1158.3 , 42.16212
+0 , 1351.35 , 46.40922
+0 , 1544.4 , 50.65632
+0 , 1737.45 , 54.90342
+0 , 1930.5 , 59.15052
+0 , 2123.55 , 63.39762
+0 , 2316.6 , 67.64472
+0 , 2509.65 , 71.89182
+0 , 2702.7 , 76.13892
+0 , 2895.75 , 80.38602
+0 , 3088.8 , 84.63312
+0 , 3281.85 , 88.88022
+0 , 3474.9 , 93.12732
+0 , 3667.95 , 97.37442
+0 , 3861 , 101.62152
+0 , 4054.05 , 105.86862
+0 , 4247.1 , 110.11572
+0 , 4440.15 , 114.36282
+0 , 4633.2 , 118.60992
+0 , 4826.25 , 122.85702
+0 , 5019.3 , 127.10412
+0 , 5212.35 , 131.35122
+0 , 5405.4 , 135.59832
+0 , 5598.45 , 139.84542
+0 , 5791.5 , 144.09252
+0 , 5984.55 , 148.33962
+0 , 6177.6 , 152.58672
+40.80854701 , -6177.6 , 118.547013
+40.80854701 , -5984.55 , 114.299913
+40.80854701 , -5791.5 , 110.052813
+40.80854701 , -5598.45 , 105.805713
+40.80854701 , -5405.4 , 101.558613
+40.80854701 , -5212.35 , 97.31151302
+40.80854701 , -5019.3 , 93.06441302
+40.80854701 , -4826.25 , 88.81731302
+40.80854701 , -4633.2 , 84.57021302
+40.80854701 , -4440.15 , 80.32311302
+40.80854701 , -4247.1 , 76.07601302
+40.80854701 , -4054.05 , 71.82891302
+40.80854701 , -3861 , 67.58181302
+40.80854701 , -3667.95 , 63.33471302
+40.80854701 , -3474.9 , 59.08761302
+40.80854701 , -3281.85 , 54.84051302
+40.80854701 , -3088.8 , 50.59341302
+40.80854701 , -2895.75 , 46.34631302
+40.80854701 , -2702.7 , 42.09921302
+40.80854701 , -2509.65 , 37.85211302
+40.80854701 , -2316.6 , 33.60501302
+40.80854701 , -2123.55 , 29.35791302
+40.80854701 , -1930.5 , 25.11081302
+40.80854701 , -1737.45 , 20.86371302
+40.80854701 , -1544.4 , 16.61661302
+40.80854701 , -1351.35 , 12.36951302
+40.80854701 , -1158.3 , 8.122413024
+40.80854701 , -965.25 , 3.875313024
+40.80854701 , -772.2 , 0.371786976
+40.80854701 , -579.15 , 4.618886976
+40.80854701 , -386.1 , 8.865986976
+40.80854701 , -193.05 , 13.11308698
+40.80854701 , 0 , 17.36018698
+40.80854701 , 193.05 , 21.60728698
+40.80854701 , 386.1 , 25.85438698
+40.80854701 , 579.15 , 30.10148698
+40.80854701 , 772.2 , 34.34858698
+40.80854701 , 965.25 , 38.59568698
+40.80854701 , 1158.3 , 42.84278698
+40.80854701 , 1351.35 , 47.08988698
+40.80854701 , 1544.4 , 51.33698698
+40.80854701 , 1737.45 , 55.58408698
+40.80854701 , 1930.5 , 59.83118698
+40.80854701 , 2123.55 , 64.07828698
+40.80854701 , 2316.6 , 68.32538698
+40.80854701 , 2509.65 , 72.57248698
+40.80854701 , 2702.7 , 76.81958698
+40.80854701 , 2895.75 , 81.06668698
+40.80854701 , 3088.8 , 85.31378698
+40.80854701 , 3281.85 , 89.56088698
+40.80854701 , 3474.9 , 93.80798698
+40.80854701 , 3667.95 , 98.05508698
+40.80854701 , 3861 , 102.302187
+40.80854701 , 4054.05 , 106.549287
+40.80854701 , 4247.1 , 110.796387
+40.80854701 , 4440.15 , 115.043487
+40.80854701 , 4633.2 , 119.290587
+40.80854701 , 4826.25 , 123.537687
+40.80854701 , 5019.3 , 127.784787
+40.80854701 , 5212.35 , 132.031887
+40.80854701 , 5405.4 , 136.278987
+40.80854701 , 5598.45 , 140.526087
+40.80854701 , 5791.5 , 144.773187
+40.80854701 , 5984.55 , 149.020287
+40.80854701 , 6177.6 , 153.267387
+81.61794872 , -6177.6 , 117.8663318
+81.61794872 , -5984.55 , 113.6192318
+81.61794872 , -5791.5 , 109.3721318
+81.61794872 , -5598.45 , 105.1250318
+81.61794872 , -5405.4 , 100.8779318
+81.61794872 , -5212.35 , 96.63083179
+81.61794872 , -5019.3 , 92.38373179
+81.61794872 , -4826.25 , 88.13663179
+81.61794872 , -4633.2 , 83.88953179
+81.61794872 , -4440.15 , 79.64243179
+81.61794872 , -4247.1 , 75.39533179
+81.61794872 , -4054.05 , 71.14823179
+81.61794872 , -3861 , 66.90113179
+81.61794872 , -3667.95 , 62.65403179
+81.61794872 , -3474.9 , 58.40693179
+81.61794872 , -3281.85 , 54.15983179
+81.61794872 , -3088.8 , 49.91273179
+81.61794872 , -2895.75 , 45.66563179
+81.61794872 , -2702.7 , 41.41853179
+81.61794872 , -2509.65 , 37.17143179
+81.61794872 , -2316.6 , 32.92433179
+81.61794872 , -2123.55 , 28.67723179
+81.61794872 , -1930.5 , 24.43013179
+81.61794872 , -1737.45 , 20.18303179
+81.61794872 , -1544.4 , 15.93593179
+81.61794872 , -1351.35 , 11.68883179
+81.61794872 , -1158.3 , 7.441731792
+81.61794872 , -965.25 , 3.194631792
+81.61794872 , -772.2 , 1.052468208
+81.61794872 , -579.15 , 5.299568208
+81.61794872 , -386.1 , 9.546668208
+81.61794872 , -193.05 , 13.79376821
+81.61794872 , 0 , 18.04086821
+81.61794872 , 193.05 , 22.28796821
+81.61794872 , 386.1 , 26.53506821
+81.61794872 , 579.15 , 30.78216821
+81.61794872 , 772.2 , 35.02926821
+81.61794872 , 965.25 , 39.27636821
+81.61794872 , 1158.3 , 43.52346821
+81.61794872 , 1351.35 , 47.77056821
+81.61794872 , 1544.4 , 52.01766821
+81.61794872 , 1737.45 , 56.26476821
+81.61794872 , 1930.5 , 60.51186821
+81.61794872 , 2123.55 , 64.75896821
+81.61794872 , 2316.6 , 69.00606821
+81.61794872 , 2509.65 , 73.25316821
+81.61794872 , 2702.7 , 77.50026821
+81.61794872 , 2895.75 , 81.74736821
+81.61794872 , 3088.8 , 85.99446821
+81.61794872 , 3281.85 , 90.24156821
+81.61794872 , 3474.9 , 94.48866821
+81.61794872 , 3667.95 , 98.73576821
+81.61794872 , 3861 , 102.9828682
+81.61794872 , 4054.05 , 107.2299682
+81.61794872 , 4247.1 , 111.4770682
+81.61794872 , 4440.15 , 115.7241682
+81.61794872 , 4633.2 , 119.9712682
+81.61794872 , 4826.25 , 124.2183682
+81.61794872 , 5019.3 , 128.4654682
+81.61794872 , 5212.35 , 132.7125682
+81.61794872 , 5405.4 , 136.9596682
+81.61794872 , 5598.45 , 141.2067682
+81.61794872 , 5791.5 , 145.4538682
+81.61794872 , 5984.55 , 149.7009682
+81.61794872 , 6177.6 , 153.9480682
+122.4273504 , -6177.6 , 117.1856506
+122.4273504 , -5984.55 , 112.9385506
+122.4273504 , -5791.5 , 108.6914506
+122.4273504 , -5598.45 , 104.4443506
+122.4273504 , -5405.4 , 100.1972506
+122.4273504 , -5212.35 , 95.95015056
+122.4273504 , -5019.3 , 91.70305056
+122.4273504 , -4826.25 , 87.45595056
+122.4273504 , -4633.2 , 83.20885056
+122.4273504 , -4440.15 , 78.96175056
+122.4273504 , -4247.1 , 74.71465056
+122.4273504 , -4054.05 , 70.46755056
+122.4273504 , -3861 , 66.22045056
+122.4273504 , -3667.95 , 61.97335056
+122.4273504 , -3474.9 , 57.72625056
+122.4273504 , -3281.85 , 53.47915056
+122.4273504 , -3088.8 , 49.23205056
+122.4273504 , -2895.75 , 44.98495056
+122.4273504 , -2702.7 , 40.73785056
+122.4273504 , -2509.65 , 36.49075056
+122.4273504 , -2316.6 , 32.24365056
+122.4273504 , -2123.55 , 27.99655056
+122.4273504 , -1930.5 , 23.74945056
+122.4273504 , -1737.45 , 19.50235056
+122.4273504 , -1544.4 , 15.25525056
+122.4273504 , -1351.35 , 11.00815056
+122.4273504 , -1158.3 , 6.76105056
+122.4273504 , -965.25 , 2.51395056
+122.4273504 , -772.2 , 1.73314944
+122.4273504 , -579.15 , 5.98024944
+122.4273504 , -386.1 , 10.22734944
+122.4273504 , -193.05 , 14.47444944
+122.4273504 , 0 , 18.72154944
+122.4273504 , 193.05 , 22.96864944
+122.4273504 , 386.1 , 27.21574944
+122.4273504 , 579.15 , 31.46284944
+122.4273504 , 772.2 , 35.70994944
+122.4273504 , 965.25 , 39.95704944
+122.4273504 , 1158.3 , 44.20414944
+122.4273504 , 1351.35 , 48.45124944
+122.4273504 , 1544.4 , 52.69834944
+122.4273504 , 1737.45 , 56.94544944
+122.4273504 , 1930.5 , 61.19254944
+122.4273504 , 2123.55 , 65.43964944
+122.4273504 , 2316.6 , 69.68674944
+122.4273504 , 2509.65 , 73.93384944
+122.4273504 , 2702.7 , 78.18094944
+122.4273504 , 2895.75 , 82.42804944
+122.4273504 , 3088.8 , 86.67514944
+122.4273504 , 3281.85 , 90.92224944
+122.4273504 , 3474.9 , 95.16934944
+122.4273504 , 3667.95 , 99.41644944
+122.4273504 , 3861 , 103.6635494
+122.4273504 , 4054.05 , 107.9106494
+122.4273504 , 4247.1 , 112.1577494
+122.4273504 , 4440.15 , 116.4048494
+122.4273504 , 4633.2 , 120.6519494
+122.4273504 , 4826.25 , 124.8990494
+122.4273504 , 5019.3 , 129.1461494
+122.4273504 , 5212.35 , 133.3932494
+122.4273504 , 5405.4 , 137.6403494
+122.4273504 , 5598.45 , 141.8874494
+122.4273504 , 5791.5 , 146.1345494
+122.4273504 , 5984.55 , 150.3816494
+122.4273504 , 6177.6 , 154.6287494
+163.2393162 , -6177.6 , 116.5049266
+163.2393162 , -5984.55 , 112.2578266
+163.2393162 , -5791.5 , 108.0107266
+163.2393162 , -5598.45 , 103.7636266
+163.2393162 , -5405.4 , 99.51652656
+163.2393162 , -5212.35 , 95.26942656
+163.2393162 , -5019.3 , 91.02232656
+163.2393162 , -4826.25 , 86.77522656
+163.2393162 , -4633.2 , 82.52812656
+163.2393162 , -4440.15 , 78.28102656
+163.2393162 , -4247.1 , 74.03392656
+163.2393162 , -4054.05 , 69.78682656
+163.2393162 , -3861 , 65.53972656
+163.2393162 , -3667.95 , 61.29262656
+163.2393162 , -3474.9 , 57.04552656
+163.2393162 , -3281.85 , 52.79842656
+163.2393162 , -3088.8 , 48.55132656
+163.2393162 , -2895.75 , 44.30422656
+163.2393162 , -2702.7 , 40.05712656
+163.2393162 , -2509.65 , 35.81002656
+163.2393162 , -2316.6 , 31.56292656
+163.2393162 , -2123.55 , 27.31582656
+163.2393162 , -1930.5 , 23.06872656
+163.2393162 , -1737.45 , 18.82162656
+163.2393162 , -1544.4 , 14.57452656
+163.2393162 , -1351.35 , 10.32742656
+163.2393162 , -1158.3 , 6.080326561
+163.2393162 , -965.25 , 1.833226561
+163.2393162 , -772.2 , 2.413873439
+163.2393162 , -579.15 , 6.660973439
+163.2393162 , -386.1 , 10.90807344
+163.2393162 , -193.05 , 15.15517344
+163.2393162 , 0 , 19.40227344
+163.2393162 , 193.05 , 23.64937344
+163.2393162 , 386.1 , 27.89647344
+163.2393162 , 579.15 , 32.14357344
+163.2393162 , 772.2 , 36.39067344
+163.2393162 , 965.25 , 40.63777344
+163.2393162 , 1158.3 , 44.88487344
+163.2393162 , 1351.35 , 49.13197344
+163.2393162 , 1544.4 , 53.37907344
+163.2393162 , 1737.45 , 57.62617344
+163.2393162 , 1930.5 , 61.87327344
+163.2393162 , 2123.55 , 66.12037344
+163.2393162 , 2316.6 , 70.36747344
+163.2393162 , 2509.65 , 74.61457344
+163.2393162 , 2702.7 , 78.86167344
+163.2393162 , 2895.75 , 83.10877344
+163.2393162 , 3088.8 , 87.35587344
+163.2393162 , 3281.85 , 91.60297344
+163.2393162 , 3474.9 , 95.85007344
+163.2393162 , 3667.95 , 100.0971734
+163.2393162 , 3861 , 104.3442734
+163.2393162 , 4054.05 , 108.5913734
+163.2393162 , 4247.1 , 112.8384734
+163.2393162 , 4440.15 , 117.0855734
+163.2393162 , 4633.2 , 121.3326734
+163.2393162 , 4826.25 , 125.5797734
+163.2393162 , 5019.3 , 129.8268734
+163.2393162 , 5212.35 , 134.0739734
+163.2393162 , 5405.4 , 138.3210734
+163.2393162 , 5598.45 , 142.5681734
+163.2393162 , 5791.5 , 146.8152734
+163.2393162 , 5984.55 , 151.0623734
+163.2393162 , 6177.6 , 155.3094734
+204.042735 , -6177.6 , 115.8243451
+204.042735 , -5984.55 , 111.5772451
+204.042735 , -5791.5 , 107.3301451
+204.042735 , -5598.45 , 103.0830451
+204.042735 , -5405.4 , 98.83594512
+204.042735 , -5212.35 , 94.58884512
+204.042735 , -5019.3 , 90.34174512
+204.042735 , -4826.25 , 86.09464512
+204.042735 , -4633.2 , 81.84754512
+204.042735 , -4440.15 , 77.60044512
+204.042735 , -4247.1 , 73.35334512
+204.042735 , -4054.05 , 69.10624512
+204.042735 , -3861 , 64.85914512
+204.042735 , -3667.95 , 60.61204512
+204.042735 , -3474.9 , 56.36494512
+204.042735 , -3281.85 , 52.11784512
+204.042735 , -3088.8 , 47.87074512
+204.042735 , -2895.75 , 43.62364512
+204.042735 , -2702.7 , 39.37654512
+204.042735 , -2509.65 , 35.12944512
+204.042735 , -2316.6 , 30.88234512
+204.042735 , -2123.55 , 26.63524512
+204.042735 , -1930.5 , 22.38814512
+204.042735 , -1737.45 , 18.14104512
+204.042735 , -1544.4 , 13.89394512
+204.042735 , -1351.35 , 9.646845121
+204.042735 , -1158.3 , 5.399745121
+204.042735 , -965.25 , 1.152645121
+204.042735 , -772.2 , 3.094454879
+204.042735 , -579.15 , 7.341554879
+204.042735 , -386.1 , 11.58865488
+204.042735 , -193.05 , 15.83575488
+204.042735 , 0 , 20.08285488
+204.042735 , 193.05 , 24.32995488
+204.042735 , 386.1 , 28.57705488
+204.042735 , 579.15 , 32.82415488
+204.042735 , 772.2 , 37.07125488
+204.042735 , 965.25 , 41.31835488
+204.042735 , 1158.3 , 45.56545488
+204.042735 , 1351.35 , 49.81255488
+204.042735 , 1544.4 , 54.05965488
+204.042735 , 1737.45 , 58.30675488
+204.042735 , 1930.5 , 62.55385488
+204.042735 , 2123.55 , 66.80095488
+204.042735 , 2316.6 , 71.04805488
+204.042735 , 2509.65 , 75.29515488
+204.042735 , 2702.7 , 79.54225488
+204.042735 , 2895.75 , 83.78935488
+204.042735 , 3088.8 , 88.03645488
+204.042735 , 3281.85 , 92.28355488
+204.042735 , 3474.9 , 96.53065488
+204.042735 , 3667.95 , 100.7777549
+204.042735 , 3861 , 105.0248549
+204.042735 , 4054.05 , 109.2719549
+204.042735 , 4247.1 , 113.5190549
+204.042735 , 4440.15 , 117.7661549
+204.042735 , 4633.2 , 122.0132549
+204.042735 , 4826.25 , 126.2603549
+204.042735 , 5019.3 , 130.5074549
+204.042735 , 5212.35 , 134.7545549
+204.042735 , 5405.4 , 139.0016549
+204.042735 , 5598.45 , 143.2487549
+204.042735 , 5791.5 , 147.4958549
+204.042735 , 5984.55 , 151.7429549
+204.042735 , 6177.6 , 155.9900549
+244.8547009 , -6177.6 , 115.1436211
+244.8547009 , -5984.55 , 110.8965211
+244.8547009 , -5791.5 , 106.6494211
+244.8547009 , -5598.45 , 102.4023211
+244.8547009 , -5405.4 , 98.15522112
+244.8547009 , -5212.35 , 93.90812112
+244.8547009 , -5019.3 , 89.66102112
+244.8547009 , -4826.25 , 85.41392112
+244.8547009 , -4633.2 , 81.16682112
+244.8547009 , -4440.15 , 76.91972112
+244.8547009 , -4247.1 , 72.67262112
+244.8547009 , -4054.05 , 68.42552112
+244.8547009 , -3861 , 64.17842112
+244.8547009 , -3667.95 , 59.93132112
+244.8547009 , -3474.9 , 55.68422112
+244.8547009 , -3281.85 , 51.43712112
+244.8547009 , -3088.8 , 47.19002112
+244.8547009 , -2895.75 , 42.94292112
+244.8547009 , -2702.7 , 38.69582112
+244.8547009 , -2509.65 , 34.44872112
+244.8547009 , -2316.6 , 30.20162112
+244.8547009 , -2123.55 , 25.95452112
+244.8547009 , -1930.5 , 21.70742112
+244.8547009 , -1737.45 , 17.46032112
+244.8547009 , -1544.4 , 13.21322112
+244.8547009 , -1351.35 , 8.966121119
+244.8547009 , -1158.3 , 4.719021119
+244.8547009 , -965.25 , 0.471921119
+244.8547009 , -772.2 , 3.775178881
+244.8547009 , -579.15 , 8.022278881
+244.8547009 , -386.1 , 12.26937888
+244.8547009 , -193.05 , 16.51647888
+244.8547009 , 0 , 20.76357888
+244.8547009 , 193.05 , 25.01067888
+244.8547009 , 386.1 , 29.25777888
+244.8547009 , 579.15 , 33.50487888
+244.8547009 , 772.2 , 37.75197888
+244.8547009 , 965.25 , 41.99907888
+244.8547009 , 1158.3 , 46.24617888
+244.8547009 , 1351.35 , 50.49327888
+244.8547009 , 1544.4 , 54.74037888
+244.8547009 , 1737.45 , 58.98747888
+244.8547009 , 1930.5 , 63.23457888
+244.8547009 , 2123.55 , 67.48167888
+244.8547009 , 2316.6 , 71.72877888
+244.8547009 , 2509.65 , 75.97587888
+244.8547009 , 2702.7 , 80.22297888
+244.8547009 , 2895.75 , 84.47007888
+244.8547009 , 3088.8 , 88.71717888
+244.8547009 , 3281.85 , 92.96427888
+244.8547009 , 3474.9 , 97.21137888
+244.8547009 , 3667.95 , 101.4584789
+244.8547009 , 3861 , 105.7055789
+244.8547009 , 4054.05 , 109.9526789
+244.8547009 , 4247.1 , 114.1997789
+244.8547009 , 4440.15 , 118.4468789
+244.8547009 , 4633.2 , 122.6939789
+244.8547009 , 4826.25 , 126.9410789
+244.8547009 , 5019.3 , 131.1881789
+244.8547009 , 5212.35 , 135.4352789
+244.8547009 , 5405.4 , 139.6823789
+244.8547009 , 5598.45 , 143.9294789
+244.8547009 , 5791.5 , 148.1765789
+244.8547009 , 5984.55 , 152.4236789
+244.8547009 , 6177.6 , 156.6707789
+285.6666667 , -6177.6 , 114.4628971
+285.6666667 , -5984.55 , 110.2157971
+285.6666667 , -5791.5 , 105.9686971
+285.6666667 , -5598.45 , 101.7215971
+285.6666667 , -5405.4 , 97.47449712
+285.6666667 , -5212.35 , 93.22739712
+285.6666667 , -5019.3 , 88.98029712
+285.6666667 , -4826.25 , 84.73319712
+285.6666667 , -4633.2 , 80.48609712
+285.6666667 , -4440.15 , 76.23899712
+285.6666667 , -4247.1 , 71.99189712
+285.6666667 , -4054.05 , 67.74479712
+285.6666667 , -3861 , 63.49769712
+285.6666667 , -3667.95 , 59.25059712
+285.6666667 , -3474.9 , 55.00349712
+285.6666667 , -3281.85 , 50.75639712
+285.6666667 , -3088.8 , 46.50929712
+285.6666667 , -2895.75 , 42.26219712
+285.6666667 , -2702.7 , 38.01509712
+285.6666667 , -2509.65 , 33.76799712
+285.6666667 , -2316.6 , 29.52089712
+285.6666667 , -2123.55 , 25.27379712
+285.6666667 , -1930.5 , 21.02669712
+285.6666667 , -1737.45 , 16.77959712
+285.6666667 , -1544.4 , 12.53249712
+285.6666667 , -1351.35 , 8.285397119
+285.6666667 , -1158.3 , 4.038297119
+285.6666667 , -965.25 , 0.208802881
+285.6666667 , -772.2 , 4.455902881
+285.6666667 , -579.15 , 8.703002881
+285.6666667 , -386.1 , 12.95010288
+285.6666667 , -193.05 , 17.19720288
+285.6666667 , 0 , 21.44430288
+285.6666667 , 193.05 , 25.69140288
+285.6666667 , 386.1 , 29.93850288
+285.6666667 , 579.15 , 34.18560288
+285.6666667 , 772.2 , 38.43270288
+285.6666667 , 965.25 , 42.67980288
+285.6666667 , 1158.3 , 46.92690288
+285.6666667 , 1351.35 , 51.17400288
+285.6666667 , 1544.4 , 55.42110288
+285.6666667 , 1737.45 , 59.66820288
+285.6666667 , 1930.5 , 63.91530288
+285.6666667 , 2123.55 , 68.16240288
+285.6666667 , 2316.6 , 72.40950288
+285.6666667 , 2509.65 , 76.65660288
+285.6666667 , 2702.7 , 80.90370288
+285.6666667 , 2895.75 , 85.15080288
+285.6666667 , 3088.8 , 89.39790288
+285.6666667 , 3281.85 , 93.64500288
+285.6666667 , 3474.9 , 97.89210288
+285.6666667 , 3667.95 , 102.1392029
+285.6666667 , 3861 , 106.3863029
+285.6666667 , 4054.05 , 110.6334029
+285.6666667 , 4247.1 , 114.8805029
+285.6666667 , 4440.15 , 119.1276029
+285.6666667 , 4633.2 , 123.3747029
+285.6666667 , 4826.25 , 127.6218029
+285.6666667 , 5019.3 , 131.8689029
+285.6666667 , 5212.35 , 136.1160029
+285.6666667 , 5405.4 , 140.3631029
+285.6666667 , 5598.45 , 144.6102029
+285.6666667 , 5791.5 , 148.8573029
+285.6666667 , 5984.55 , 153.1044029
+285.6666667 , 6177.6 , 157.3515029
+326.4700855 , -6177.6 , 113.7823157
+326.4700855 , -5984.55 , 109.5352157
+326.4700855 , -5791.5 , 105.2881157
+326.4700855 , -5598.45 , 101.0410157
+326.4700855 , -5405.4 , 96.79391568
+326.4700855 , -5212.35 , 92.54681568
+326.4700855 , -5019.3 , 88.29971568
+326.4700855 , -4826.25 , 84.05261568
+326.4700855 , -4633.2 , 79.80551568
+326.4700855 , -4440.15 , 75.55841568
+326.4700855 , -4247.1 , 71.31131568
+326.4700855 , -4054.05 , 67.06421568
+326.4700855 , -3861 , 62.81711568
+326.4700855 , -3667.95 , 58.57001568
+326.4700855 , -3474.9 , 54.32291568
+326.4700855 , -3281.85 , 50.07581568
+326.4700855 , -3088.8 , 45.82871568
+326.4700855 , -2895.75 , 41.58161568
+326.4700855 , -2702.7 , 37.33451568
+326.4700855 , -2509.65 , 33.08741568
+326.4700855 , -2316.6 , 28.84031568
+326.4700855 , -2123.55 , 24.59321568
+326.4700855 , -1930.5 , 20.34611568
+326.4700855 , -1737.45 , 16.09901568
+326.4700855 , -1544.4 , 11.85191568
+326.4700855 , -1351.35 , 7.60481568
+326.4700855 , -1158.3 , 3.35771568
+326.4700855 , -965.25 , 0.88938432
+326.4700855 , -772.2 , 5.13648432
+326.4700855 , -579.15 , 9.38358432
+326.4700855 , -386.1 , 13.63068432
+326.4700855 , -193.05 , 17.87778432
+326.4700855 , 0 , 22.12488432
+326.4700855 , 193.05 , 26.37198432
+326.4700855 , 386.1 , 30.61908432
+326.4700855 , 579.15 , 34.86618432
+326.4700855 , 772.2 , 39.11328432
+326.4700855 , 965.25 , 43.36038432
+326.4700855 , 1158.3 , 47.60748432
+326.4700855 , 1351.35 , 51.85458432
+326.4700855 , 1544.4 , 56.10168432
+326.4700855 , 1737.45 , 60.34878432
+326.4700855 , 1930.5 , 64.59588432
+326.4700855 , 2123.55 , 68.84298432
+326.4700855 , 2316.6 , 73.09008432
+326.4700855 , 2509.65 , 77.33718432
+326.4700855 , 2702.7 , 81.58428432
+326.4700855 , 2895.75 , 85.83138432
+326.4700855 , 3088.8 , 90.07848432
+326.4700855 , 3281.85 , 94.32558432
+326.4700855 , 3474.9 , 98.57268432
+326.4700855 , 3667.95 , 102.8197843
+326.4700855 , 3861 , 107.0668843
+326.4700855 , 4054.05 , 111.3139843
+326.4700855 , 4247.1 , 115.5610843
+326.4700855 , 4440.15 , 119.8081843
+326.4700855 , 4633.2 , 124.0552843
+326.4700855 , 4826.25 , 128.3023843
+326.4700855 , 5019.3 , 132.5494843
+326.4700855 , 5212.35 , 136.7965843
+326.4700855 , 5405.4 , 141.0436843
+326.4700855 , 5598.45 , 145.2907843
+326.4700855 , 5791.5 , 149.5378843
+326.4700855 , 5984.55 , 153.7849843
+326.4700855 , 6177.6 , 158.0320843
+367.2820513 , -6177.6 , 113.1015917
+367.2820513 , -5984.55 , 108.8544917
+367.2820513 , -5791.5 , 104.6073917
+367.2820513 , -5598.45 , 100.3602917
+367.2820513 , -5405.4 , 96.11319168
+367.2820513 , -5212.35 , 91.86609168
+367.2820513 , -5019.3 , 87.61899168
+367.2820513 , -4826.25 , 83.37189168
+367.2820513 , -4633.2 , 79.12479168
+367.2820513 , -4440.15 , 74.87769168
+367.2820513 , -4247.1 , 70.63059168
+367.2820513 , -4054.05 , 66.38349168
+367.2820513 , -3861 , 62.13639168
+367.2820513 , -3667.95 , 57.88929168
+367.2820513 , -3474.9 , 53.64219168
+367.2820513 , -3281.85 , 49.39509168
+367.2820513 , -3088.8 , 45.14799168
+367.2820513 , -2895.75 , 40.90089168
+367.2820513 , -2702.7 , 36.65379168
+367.2820513 , -2509.65 , 32.40669168
+367.2820513 , -2316.6 , 28.15959168
+367.2820513 , -2123.55 , 23.91249168
+367.2820513 , -1930.5 , 19.66539168
+367.2820513 , -1737.45 , 15.41829168
+367.2820513 , -1544.4 , 11.17119168
+367.2820513 , -1351.35 , 6.92409168
+367.2820513 , -1158.3 , 2.67699168
+367.2820513 , -965.25 , 1.57010832
+367.2820513 , -772.2 , 5.81720832
+367.2820513 , -579.15 , 10.06430832
+367.2820513 , -386.1 , 14.31140832
+367.2820513 , -193.05 , 18.55850832
+367.2820513 , 0 , 22.80560832
+367.2820513 , 193.05 , 27.05270832
+367.2820513 , 386.1 , 31.29980832
+367.2820513 , 579.15 , 35.54690832
+367.2820513 , 772.2 , 39.79400832
+367.2820513 , 965.25 , 44.04110832
+367.2820513 , 1158.3 , 48.28820832
+367.2820513 , 1351.35 , 52.53530832
+367.2820513 , 1544.4 , 56.78240832
+367.2820513 , 1737.45 , 61.02950832
+367.2820513 , 1930.5 , 65.27660832
+367.2820513 , 2123.55 , 69.52370832
+367.2820513 , 2316.6 , 73.77080832
+367.2820513 , 2509.65 , 78.01790832
+367.2820513 , 2702.7 , 82.26500832
+367.2820513 , 2895.75 , 86.51210832
+367.2820513 , 3088.8 , 90.75920832
+367.2820513 , 3281.85 , 95.00630832
+367.2820513 , 3474.9 , 99.25340832
+367.2820513 , 3667.95 , 103.5005083
+367.2820513 , 3861 , 107.7476083
+367.2820513 , 4054.05 , 111.9947083
+367.2820513 , 4247.1 , 116.2418083
+367.2820513 , 4440.15 , 120.4889083
+367.2820513 , 4633.2 , 124.7360083
+367.2820513 , 4826.25 , 128.9831083
+367.2820513 , 5019.3 , 133.2302083
+367.2820513 , 5212.35 , 137.4773083
+367.2820513 , 5405.4 , 141.7244083
+367.2820513 , 5598.45 , 145.9715083
+367.2820513 , 5791.5 , 150.2186083
+367.2820513 , 5984.55 , 154.4657083
+367.2820513 , 6177.6 , 158.7128083
+408.0854701 , -6177.6 , 112.4210102
+408.0854701 , -5984.55 , 108.1739102
+408.0854701 , -5791.5 , 103.9268102
+408.0854701 , -5598.45 , 99.67971024
+408.0854701 , -5405.4 , 95.43261024
+408.0854701 , -5212.35 , 91.18551024
+408.0854701 , -5019.3 , 86.93841024
+408.0854701 , -4826.25 , 82.69131024
+408.0854701 , -4633.2 , 78.44421024
+408.0854701 , -4440.15 , 74.19711024
+408.0854701 , -4247.1 , 69.95001024
+408.0854701 , -4054.05 , 65.70291024
+408.0854701 , -3861 , 61.45581024
+408.0854701 , -3667.95 , 57.20871024
+408.0854701 , -3474.9 , 52.96161024
+408.0854701 , -3281.85 , 48.71451024
+408.0854701 , -3088.8 , 44.46741024
+408.0854701 , -2895.75 , 40.22031024
+408.0854701 , -2702.7 , 35.97321024
+408.0854701 , -2509.65 , 31.72611024
+408.0854701 , -2316.6 , 27.47901024
+408.0854701 , -2123.55 , 23.23191024
+408.0854701 , -1930.5 , 18.98481024
+408.0854701 , -1737.45 , 14.73771024
+408.0854701 , -1544.4 , 10.49061024
+408.0854701 , -1351.35 , 6.24351024
+408.0854701 , -1158.3 , 1.99641024
+408.0854701 , -965.25 , 2.25068976
+408.0854701 , -772.2 , 6.49778976
+408.0854701 , -579.15 , 10.74488976
+408.0854701 , -386.1 , 14.99198976
+408.0854701 , -193.05 , 19.23908976
+408.0854701 , 0 , 23.48618976
+408.0854701 , 193.05 , 27.73328976
+408.0854701 , 386.1 , 31.98038976
+408.0854701 , 579.15 , 36.22748976
+408.0854701 , 772.2 , 40.47458976
+408.0854701 , 965.25 , 44.72168976
+408.0854701 , 1158.3 , 48.96878976
+408.0854701 , 1351.35 , 53.21588976
+408.0854701 , 1544.4 , 57.46298976
+408.0854701 , 1737.45 , 61.71008976
+408.0854701 , 1930.5 , 65.95718976
+408.0854701 , 2123.55 , 70.20428976
+408.0854701 , 2316.6 , 74.45138976
+408.0854701 , 2509.65 , 78.69848976
+408.0854701 , 2702.7 , 82.94558976
+408.0854701 , 2895.75 , 87.19268976
+408.0854701 , 3088.8 , 91.43978976
+408.0854701 , 3281.85 , 95.68688976
+408.0854701 , 3474.9 , 99.93398976
+408.0854701 , 3667.95 , 104.1810898
+408.0854701 , 3861 , 108.4281898
+408.0854701 , 4054.05 , 112.6752898
+408.0854701 , 4247.1 , 116.9223898
+408.0854701 , 4440.15 , 121.1694898
+408.0854701 , 4633.2 , 125.4165898
+408.0854701 , 4826.25 , 129.6636898
+408.0854701 , 5019.3 , 133.9107898
+408.0854701 , 5212.35 , 138.1578898
+408.0854701 , 5405.4 , 142.4049898
+408.0854701 , 5598.45 , 146.6520898
+408.0854701 , 5791.5 , 150.8991898
+408.0854701 , 5984.55 , 155.1462898
+408.0854701 , 6177.6 , 159.3933898
+448.8974359 , -6177.6 , 111.7402862
+448.8974359 , -5984.55 , 107.4931862
+448.8974359 , -5791.5 , 103.2460862
+448.8974359 , -5598.45 , 98.99898624
+448.8974359 , -5405.4 , 94.75188624
+448.8974359 , -5212.35 , 90.50478624
+448.8974359 , -5019.3 , 86.25768624
+448.8974359 , -4826.25 , 82.01058624
+448.8974359 , -4633.2 , 77.76348624
+448.8974359 , -4440.15 , 73.51638624
+448.8974359 , -4247.1 , 69.26928624
+448.8974359 , -4054.05 , 65.02218624
+448.8974359 , -3861 , 60.77508624
+448.8974359 , -3667.95 , 56.52798624
+448.8974359 , -3474.9 , 52.28088624
+448.8974359 , -3281.85 , 48.03378624
+448.8974359 , -3088.8 , 43.78668624
+448.8974359 , -2895.75 , 39.53958624
+448.8974359 , -2702.7 , 35.29248624
+448.8974359 , -2509.65 , 31.04538624
+448.8974359 , -2316.6 , 26.79828624
+448.8974359 , -2123.55 , 22.55118624
+448.8974359 , -1930.5 , 18.30408624
+448.8974359 , -1737.45 , 14.05698624
+448.8974359 , -1544.4 , 9.80988624
+448.8974359 , -1351.35 , 5.56278624
+448.8974359 , -1158.3 , 1.31568624
+448.8974359 , -965.25 , 2.93141376
+448.8974359 , -772.2 , 7.17851376
+448.8974359 , -579.15 , 11.42561376
+448.8974359 , -386.1 , 15.67271376
+448.8974359 , -193.05 , 19.91981376
+448.8974359 , 0 , 24.16691376
+448.8974359 , 193.05 , 28.41401376
+448.8974359 , 386.1 , 32.66111376
+448.8974359 , 579.15 , 36.90821376
+448.8974359 , 772.2 , 41.15531376
+448.8974359 , 965.25 , 45.40241376
+448.8974359 , 1158.3 , 49.64951376
+448.8974359 , 1351.35 , 53.89661376
+448.8974359 , 1544.4 , 58.14371376
+448.8974359 , 1737.45 , 62.39081376
+448.8974359 , 1930.5 , 66.63791376
+448.8974359 , 2123.55 , 70.88501376
+448.8974359 , 2316.6 , 75.13211376
+448.8974359 , 2509.65 , 79.37921376
+448.8974359 , 2702.7 , 83.62631376
+448.8974359 , 2895.75 , 87.87341376
+448.8974359 , 3088.8 , 92.12051376
+448.8974359 , 3281.85 , 96.36761376
+448.8974359 , 3474.9 , 100.6147138
+448.8974359 , 3667.95 , 104.8618138
+448.8974359 , 3861 , 109.1089138
+448.8974359 , 4054.05 , 113.3560138
+448.8974359 , 4247.1 , 117.6031138
+448.8974359 , 4440.15 , 121.8502138
+448.8974359 , 4633.2 , 126.0973138
+448.8974359 , 4826.25 , 130.3444138
+448.8974359 , 5019.3 , 134.5915138
+448.8974359 , 5212.35 , 138.8386138
+448.8974359 , 5405.4 , 143.0857138
+448.8974359 , 5598.45 , 147.3328138
+448.8974359 , 5791.5 , 151.5799138
+448.8974359 , 5984.55 , 155.8270138
+448.8974359 , 6177.6 , 160.0741138
+489.7094017 , -6177.6 , 111.0595622
+489.7094017 , -5984.55 , 106.8124622
+489.7094017 , -5791.5 , 102.5653622
+489.7094017 , -5598.45 , 98.31826224
+489.7094017 , -5405.4 , 94.07116224
+489.7094017 , -5212.35 , 89.82406224
+489.7094017 , -5019.3 , 85.57696224
+489.7094017 , -4826.25 , 81.32986224
+489.7094017 , -4633.2 , 77.08276224
+489.7094017 , -4440.15 , 72.83566224
+489.7094017 , -4247.1 , 68.58856224
+489.7094017 , -4054.05 , 64.34146224
+489.7094017 , -3861 , 60.09436224
+489.7094017 , -3667.95 , 55.84726224
+489.7094017 , -3474.9 , 51.60016224
+489.7094017 , -3281.85 , 47.35306224
+489.7094017 , -3088.8 , 43.10596224
+489.7094017 , -2895.75 , 38.85886224
+489.7094017 , -2702.7 , 34.61176224
+489.7094017 , -2509.65 , 30.36466224
+489.7094017 , -2316.6 , 26.11756224
+489.7094017 , -2123.55 , 21.87046224
+489.7094017 , -1930.5 , 17.62336224
+489.7094017 , -1737.45 , 13.37626224
+489.7094017 , -1544.4 , 9.12916224
+489.7094017 , -1351.35 , 4.88206224
+489.7094017 , -1158.3 , 0.63496224
+489.7094017 , -965.25 , 3.61213776
+489.7094017 , -772.2 , 7.85923776
+489.7094017 , -579.15 , 12.10633776
+489.7094017 , -386.1 , 16.35343776
+489.7094017 , -193.05 , 20.60053776
+489.7094017 , 0 , 24.84763776
+489.7094017 , 193.05 , 29.09473776
+489.7094017 , 386.1 , 33.34183776
+489.7094017 , 579.15 , 37.58893776
+489.7094017 , 772.2 , 41.83603776
+489.7094017 , 965.25 , 46.08313776
+489.7094017 , 1158.3 , 50.33023776
+489.7094017 , 1351.35 , 54.57733776
+489.7094017 , 1544.4 , 58.82443776
+489.7094017 , 1737.45 , 63.07153776
+489.7094017 , 1930.5 , 67.31863776
+489.7094017 , 2123.55 , 71.56573776
+489.7094017 , 2316.6 , 75.81283776
+489.7094017 , 2509.65 , 80.05993776
+489.7094017 , 2702.7 , 84.30703776
+489.7094017 , 2895.75 , 88.55413776
+489.7094017 , 3088.8 , 92.80123776
+489.7094017 , 3281.85 , 97.04833776
+489.7094017 , 3474.9 , 101.2954378
+489.7094017 , 3667.95 , 105.5425378
+489.7094017 , 3861 , 109.7896378
+489.7094017 , 4054.05 , 114.0367378
+489.7094017 , 4247.1 , 118.2838378
+489.7094017 , 4440.15 , 122.5309378
+489.7094017 , 4633.2 , 126.7780378
+489.7094017 , 4826.25 , 131.0251378
+489.7094017 , 5019.3 , 135.2722378
+489.7094017 , 5212.35 , 139.5193378
+489.7094017 , 5405.4 , 143.7664378
+489.7094017 , 5598.45 , 148.0135378
+489.7094017 , 5791.5 , 152.2606378
+489.7094017 , 5984.55 , 156.5077378
+489.7094017 , 6177.6 , 160.7548378
+816.1794872 , -6177.6 , 105.6141979
+816.1794872 , -5984.55 , 101.3670979
+816.1794872 , -5791.5 , 97.11999792
+816.1794872 , -5598.45 , 92.87289792
+816.1794872 , -5405.4 , 88.62579792
+816.1794872 , -5212.35 , 84.37869792
+816.1794872 , -5019.3 , 80.13159792
+816.1794872 , -4826.25 , 75.88449792
+816.1794872 , -4633.2 , 71.63739792
+816.1794872 , -4440.15 , 67.39029792
+816.1794872 , -4247.1 , 63.14319792
+816.1794872 , -4054.05 , 58.89609792
+816.1794872 , -3861 , 54.64899792
+816.1794872 , -3667.95 , 50.40189792
+816.1794872 , -3474.9 , 46.15479792
+816.1794872 , -3281.85 , 41.90769792
+816.1794872 , -3088.8 , 37.66059792
+816.1794872 , -2895.75 , 33.41349792
+816.1794872 , -2702.7 , 29.16639792
+816.1794872 , -2509.65 , 24.91929792
+816.1794872 , -2316.6 , 20.67219792
+816.1794872 , -2123.55 , 16.42509792
+816.1794872 , -1930.5 , 12.17799792
+816.1794872 , -1737.45 , 7.93089792
+816.1794872 , -1544.4 , 3.68379792
+816.1794872 , -1351.35 , 0.56330208
+816.1794872 , -1158.3 , 4.81040208
+816.1794872 , -965.25 , 9.05750208
+816.1794872 , -772.2 , 13.30460208
+816.1794872 , -579.15 , 17.55170208
+816.1794872 , -386.1 , 21.79880208
+816.1794872 , -193.05 , 26.04590208
+816.1794872 , 0 , 30.29300208
+816.1794872 , 193.05 , 34.54010208
+816.1794872 , 386.1 , 38.78720208
+816.1794872 , 579.15 , 43.03430208
+816.1794872 , 772.2 , 47.28140208
+816.1794872 , 965.25 , 51.52850208
+816.1794872 , 1158.3 , 55.77560208
+816.1794872 , 1351.35 , 60.02270208
+816.1794872 , 1544.4 , 64.26980208
+816.1794872 , 1737.45 , 68.51690208
+816.1794872 , 1930.5 , 72.76400208
+816.1794872 , 2123.55 , 77.01110208
+816.1794872 , 2316.6 , 81.25820208
+816.1794872 , 2509.65 , 85.50530208
+816.1794872 , 2702.7 , 89.75240208
+816.1794872 , 2895.75 , 93.99950208
+816.1794872 , 3088.8 , 98.24660208
+816.1794872 , 3281.85 , 102.4937021
+816.1794872 , 3474.9 , 106.7408021
+816.1794872 , 3667.95 , 110.9879021
+816.1794872 , 3861 , 115.2350021
+816.1794872 , 4054.05 , 119.4821021
+816.1794872 , 4247.1 , 123.7292021
+816.1794872 , 4440.15 , 127.9763021
+816.1794872 , 4633.2 , 132.2234021
+816.1794872 , 4826.25 , 136.4705021
+816.1794872 , 5019.3 , 140.7176021
+816.1794872 , 5212.35 , 144.9647021
+816.1794872 , 5405.4 , 149.2118021
+816.1794872 , 5598.45 , 153.4589021
+816.1794872 , 5791.5 , 157.7060021
+816.1794872 , 5984.55 , 161.9531021
+816.1794872 , 6177.6 , 166.2002021
+1020.25641 , -6177.6 , 102.2102928
+1020.25641 , -5984.55 , 97.9631928
+1020.25641 , -5791.5 , 93.7160928
+1020.25641 , -5598.45 , 89.4689928
+1020.25641 , -5405.4 , 85.2218928
+1020.25641 , -5212.35 , 80.9747928
+1020.25641 , -5019.3 , 76.7276928
+1020.25641 , -4826.25 , 72.4805928
+1020.25641 , -4633.2 , 68.2334928
+1020.25641 , -4440.15 , 63.9863928
+1020.25641 , -4247.1 , 59.7392928
+1020.25641 , -4054.05 , 55.4921928
+1020.25641 , -3861 , 51.2450928
+1020.25641 , -3667.95 , 46.9979928
+1020.25641 , -3474.9 , 42.7508928
+1020.25641 , -3281.85 , 38.5037928
+1020.25641 , -3088.8 , 34.2566928
+1020.25641 , -2895.75 , 30.0095928
+1020.25641 , -2702.7 , 25.7624928
+1020.25641 , -2509.65 , 21.5153928
+1020.25641 , -2316.6 , 17.2682928
+1020.25641 , -2123.55 , 13.0211928
+1020.25641 , -1930.5 , 8.774092804
+1020.25641 , -1737.45 , 4.526992804
+1020.25641 , -1544.4 , 0.279892804
+1020.25641 , -1351.35 , 3.967207196
+1020.25641 , -1158.3 , 8.214307196
+1020.25641 , -965.25 , 12.4614072
+1020.25641 , -772.2 , 16.7085072
+1020.25641 , -579.15 , 20.9556072
+1020.25641 , -386.1 , 25.2027072
+1020.25641 , -193.05 , 29.4498072
+1020.25641 , 0 , 33.6969072
+1020.25641 , 193.05 , 37.9440072
+1020.25641 , 386.1 , 42.1911072
+1020.25641 , 579.15 , 46.4382072
+1020.25641 , 772.2 , 50.6853072
+1020.25641 , 965.25 , 54.9324072
+1020.25641 , 1158.3 , 59.1795072
+1020.25641 , 1351.35 , 63.4266072
+1020.25641 , 1544.4 , 67.6737072
+1020.25641 , 1737.45 , 71.9208072
+1020.25641 , 1930.5 , 76.1679072
+1020.25641 , 2123.55 , 80.4150072
+1020.25641 , 2316.6 , 84.6621072
+1020.25641 , 2509.65 , 88.9092072
+1020.25641 , 2702.7 , 93.1563072
+1020.25641 , 2895.75 , 97.4034072
+1020.25641 , 3088.8 , 101.6505072
+1020.25641 , 3281.85 , 105.8976072
+1020.25641 , 3474.9 , 110.1447072
+1020.25641 , 3667.95 , 114.3918072
+1020.25641 , 3861 , 118.6389072
+1020.25641 , 4054.05 , 122.8860072
+1020.25641 , 4247.1 , 127.1331072
+1020.25641 , 4440.15 , 131.3802072
+1020.25641 , 4633.2 , 135.6273072
+1020.25641 , 4826.25 , 139.8744072
+1020.25641 , 5019.3 , 144.1215072
+1020.25641 , 5212.35 , 148.3686072
+1020.25641 , 5405.4 , 152.6157072
+1020.25641 , 5598.45 , 156.8628072
+1020.25641 , 5791.5 , 161.1099072
+1020.25641 , 5984.55 , 165.3570072
+1020.25641 , 6177.6 , 169.6041072
+1224.273504 , -6177.6 , 98.8073856
+1224.273504 , -5984.55 , 94.5602856
+1224.273504 , -5791.5 , 90.3131856
+1224.273504 , -5598.45 , 86.0660856
+1224.273504 , -5405.4 , 81.8189856
+1224.273504 , -5212.35 , 77.5718856
+1224.273504 , -5019.3 , 73.3247856
+1224.273504 , -4826.25 , 69.0776856
+1224.273504 , -4633.2 , 64.8305856
+1224.273504 , -4440.15 , 60.5834856
+1224.273504 , -4247.1 , 56.3363856
+1224.273504 , -4054.05 , 52.0892856
+1224.273504 , -3861 , 47.8421856
+1224.273504 , -3667.95 , 43.5950856
+1224.273504 , -3474.9 , 39.3479856
+1224.273504 , -3281.85 , 35.1008856
+1224.273504 , -3088.8 , 30.8537856
+1224.273504 , -2895.75 , 26.6066856
+1224.273504 , -2702.7 , 22.3595856
+1224.273504 , -2509.65 , 18.1124856
+1224.273504 , -2316.6 , 13.8653856
+1224.273504 , -2123.55 , 9.618285605
+1224.273504 , -1930.5 , 5.371185605
+1224.273504 , -1737.45 , 1.124085605
+1224.273504 , -1544.4 , 3.123014395
+1224.273504 , -1351.35 , 7.370114395
+1224.273504 , -1158.3 , 11.6172144
+1224.273504 , -965.25 , 15.8643144
+1224.273504 , -772.2 , 20.1114144
+1224.273504 , -579.15 , 24.3585144
+1224.273504 , -386.1 , 28.6056144
+1224.273504 , -193.05 , 32.8527144
+1224.273504 , 0 , 37.0998144
+1224.273504 , 193.05 , 41.3469144
+1224.273504 , 386.1 , 45.5940144
+1224.273504 , 579.15 , 49.8411144
+1224.273504 , 772.2 , 54.0882144
+1224.273504 , 965.25 , 58.3353144
+1224.273504 , 1158.3 , 62.5824144
+1224.273504 , 1351.35 , 66.8295144
+1224.273504 , 1544.4 , 71.0766144
+1224.273504 , 1737.45 , 75.3237144
+1224.273504 , 1930.5 , 79.5708144
+1224.273504 , 2123.55 , 83.8179144
+1224.273504 , 2316.6 , 88.0650144
+1224.273504 , 2509.65 , 92.3121144
+1224.273504 , 2702.7 , 96.5592144
+1224.273504 , 2895.75 , 100.8063144
+1224.273504 , 3088.8 , 105.0534144
+1224.273504 , 3281.85 , 109.3005144
+1224.273504 , 3474.9 , 113.5476144
+1224.273504 , 3667.95 , 117.7947144
+1224.273504 , 3861 , 122.0418144
+1224.273504 , 4054.05 , 126.2889144
+1224.273504 , 4247.1 , 130.5360144
+1224.273504 , 4440.15 , 134.7831144
+1224.273504 , 4633.2 , 139.0302144
+1224.273504 , 4826.25 , 143.2773144
+1224.273504 , 5019.3 , 147.5244144
+1224.273504 , 5212.35 , 151.7715144
+1224.273504 , 5405.4 , 156.0186144
+1224.273504 , 5598.45 , 160.2657144
+1224.273504 , 5791.5 , 164.5128144
+1224.273504 , 5984.55 , 168.7599144
+1224.273504 , 6177.6 , 173.0070144
+1428.290598 , -6177.6 , 95.4044784
+1428.290598 , -5984.55 , 91.1573784
+1428.290598 , -5791.5 , 86.9102784
+1428.290598 , -5598.45 , 82.6631784
+1428.290598 , -5405.4 , 78.4160784
+1428.290598 , -5212.35 , 74.1689784
+1428.290598 , -5019.3 , 69.9218784
+1428.290598 , -4826.25 , 65.6747784
+1428.290598 , -4633.2 , 61.4276784
+1428.290598 , -4440.15 , 57.1805784
+1428.290598 , -4247.1 , 52.9334784
+1428.290598 , -4054.05 , 48.6863784
+1428.290598 , -3861 , 44.4392784
+1428.290598 , -3667.95 , 40.1921784
+1428.290598 , -3474.9 , 35.9450784
+1428.290598 , -3281.85 , 31.6979784
+1428.290598 , -3088.8 , 27.4508784
+1428.290598 , -2895.75 , 23.2037784
+1428.290598 , -2702.7 , 18.9566784
+1428.290598 , -2509.65 , 14.7095784
+1428.290598 , -2316.6 , 10.4624784
+1428.290598 , -2123.55 , 6.215378405
+1428.290598 , -1930.5 , 1.968278405
+1428.290598 , -1737.45 , 2.278821595
+1428.290598 , -1544.4 , 6.525921595
+1428.290598 , -1351.35 , 10.7730216
+1428.290598 , -1158.3 , 15.0201216
+1428.290598 , -965.25 , 19.2672216
+1428.290598 , -772.2 , 23.5143216
+1428.290598 , -579.15 , 27.7614216
+1428.290598 , -386.1 , 32.0085216
+1428.290598 , -193.05 , 36.2556216
+1428.290598 , 0 , 40.5027216
+1428.290598 , 193.05 , 44.7498216
+1428.290598 , 386.1 , 48.9969216
+1428.290598 , 579.15 , 53.2440216
+1428.290598 , 772.2 , 57.4911216
+1428.290598 , 965.25 , 61.7382216
+1428.290598 , 1158.3 , 65.9853216
+1428.290598 , 1351.35 , 70.2324216
+1428.290598 , 1544.4 , 74.4795216
+1428.290598 , 1737.45 , 78.7266216
+1428.290598 , 1930.5 , 82.9737216
+1428.290598 , 2123.55 , 87.2208216
+1428.290598 , 2316.6 , 91.4679216
+1428.290598 , 2509.65 , 95.7150216
+1428.290598 , 2702.7 , 99.9621216
+1428.290598 , 2895.75 , 104.2092216
+1428.290598 , 3088.8 , 108.4563216
+1428.290598 , 3281.85 , 112.7034216
+1428.290598 , 3474.9 , 116.9505216
+1428.290598 , 3667.95 , 121.1976216
+1428.290598 , 3861 , 125.4447216
+1428.290598 , 4054.05 , 129.6918216
+1428.290598 , 4247.1 , 133.9389216
+1428.290598 , 4440.15 , 138.1860216
+1428.290598 , 4633.2 , 142.4331216
+1428.290598 , 4826.25 , 146.6802216
+1428.290598 , 5019.3 , 150.9273216
+1428.290598 , 5212.35 , 155.1744216
+1428.290598 , 5405.4 , 159.4215216
+1428.290598 , 5598.45 , 163.6686216
+1428.290598 , 5791.5 , 167.9157216
+1428.290598 , 5984.55 , 172.1628216
+1428.290598 , 6177.6 , 176.4099216
+1632.393162 , -6177.6 , 92.00014561
+1632.393162 , -5984.55 , 87.75304561
+1632.393162 , -5791.5 , 83.50594561
+1632.393162 , -5598.45 , 79.25884561
+1632.393162 , -5405.4 , 75.01174561
+1632.393162 , -5212.35 , 70.76464561
+1632.393162 , -5019.3 , 66.51754561
+1632.393162 , -4826.25 , 62.27044561
+1632.393162 , -4633.2 , 58.02334561
+1632.393162 , -4440.15 , 53.77624561
+1632.393162 , -4247.1 , 49.52914561
+1632.393162 , -4054.05 , 45.28204561
+1632.393162 , -3861 , 41.03494561
+1632.393162 , -3667.95 , 36.78784561
+1632.393162 , -3474.9 , 32.54074561
+1632.393162 , -3281.85 , 28.29364561
+1632.393162 , -3088.8 , 24.04654561
+1632.393162 , -2895.75 , 19.79944561
+1632.393162 , -2702.7 , 15.55234561
+1632.393162 , -2509.65 , 11.30524561
+1632.393162 , -2316.6 , 7.058145607
+1632.393162 , -2123.55 , 2.811045607
+1632.393162 , -1930.5 , 1.436054393
+1632.393162 , -1737.45 , 5.683154393
+1632.393162 , -1544.4 , 9.930254393
+1632.393162 , -1351.35 , 14.17735439
+1632.393162 , -1158.3 , 18.42445439
+1632.393162 , -965.25 , 22.67155439
+1632.393162 , -772.2 , 26.91865439
+1632.393162 , -579.15 , 31.16575439
+1632.393162 , -386.1 , 35.41285439
+1632.393162 , -193.05 , 39.65995439
+1632.393162 , 0 , 43.90705439
+1632.393162 , 193.05 , 48.15415439
+1632.393162 , 386.1 , 52.40125439
+1632.393162 , 579.15 , 56.64835439
+1632.393162 , 772.2 , 60.89545439
+1632.393162 , 965.25 , 65.14255439
+1632.393162 , 1158.3 , 69.38965439
+1632.393162 , 1351.35 , 73.63675439
+1632.393162 , 1544.4 , 77.88385439
+1632.393162 , 1737.45 , 82.13095439
+1632.393162 , 1930.5 , 86.37805439
+1632.393162 , 2123.55 , 90.62515439
+1632.393162 , 2316.6 , 94.87225439
+1632.393162 , 2509.65 , 99.11935439
+1632.393162 , 2702.7 , 103.3664544
+1632.393162 , 2895.75 , 107.6135544
+1632.393162 , 3088.8 , 111.8606544
+1632.393162 , 3281.85 , 116.1077544
+1632.393162 , 3474.9 , 120.3548544
+1632.393162 , 3667.95 , 124.6019544
+1632.393162 , 3861 , 128.8490544
+1632.393162 , 4054.05 , 133.0961544
+1632.393162 , 4247.1 , 137.3432544
+1632.393162 , 4440.15 , 141.5903544
+1632.393162 , 4633.2 , 145.8374544
+1632.393162 , 4826.25 , 150.0845544
+1632.393162 , 5019.3 , 154.3316544
+1632.393162 , 5212.35 , 158.5787544
+1632.393162 , 5405.4 , 162.8258544
+1632.393162 , 5598.45 , 167.0729544
+1632.393162 , 5791.5 , 171.3200544
+1632.393162 , 5984.55 , 175.5671544
+1632.393162 , 6177.6 , 179.8142544
+1836.410256 , -6177.6 , 88.59723841
+1836.410256 , -5984.55 , 84.35013841
+1836.410256 , -5791.5 , 80.10303841
+1836.410256 , -5598.45 , 75.85593841
+1836.410256 , -5405.4 , 71.60883841
+1836.410256 , -5212.35 , 67.36173841
+1836.410256 , -5019.3 , 63.11463841
+1836.410256 , -4826.25 , 58.86753841
+1836.410256 , -4633.2 , 54.62043841
+1836.410256 , -4440.15 , 50.37333841
+1836.410256 , -4247.1 , 46.12623841
+1836.410256 , -4054.05 , 41.87913841
+1836.410256 , -3861 , 37.63203841
+1836.410256 , -3667.95 , 33.38493841
+1836.410256 , -3474.9 , 29.13783841
+1836.410256 , -3281.85 , 24.89073841
+1836.410256 , -3088.8 , 20.64363841
+1836.410256 , -2895.75 , 16.39653841
+1836.410256 , -2702.7 , 12.14943841
+1836.410256 , -2509.65 , 7.902338407
+1836.410256 , -2316.6 , 3.655238407
+1836.410256 , -2123.55 , 0.591861593
+1836.410256 , -1930.5 , 4.838961593
+1836.410256 , -1737.45 , 9.086061593
+1836.410256 , -1544.4 , 13.33316159
+1836.410256 , -1351.35 , 17.58026159
+1836.410256 , -1158.3 , 21.82736159
+1836.410256 , -965.25 , 26.07446159
+1836.410256 , -772.2 , 30.32156159
+1836.410256 , -579.15 , 34.56866159
+1836.410256 , -386.1 , 38.81576159
+1836.410256 , -193.05 , 43.06286159
+1836.410256 , 0 , 47.30996159
+1836.410256 , 193.05 , 51.55706159
+1836.410256 , 386.1 , 55.80416159
+1836.410256 , 579.15 , 60.05126159
+1836.410256 , 772.2 , 64.29836159
+1836.410256 , 965.25 , 68.54546159
+1836.410256 , 1158.3 , 72.79256159
+1836.410256 , 1351.35 , 77.03966159
+1836.410256 , 1544.4 , 81.28676159
+1836.410256 , 1737.45 , 85.53386159
+1836.410256 , 1930.5 , 89.78096159
+1836.410256 , 2123.55 , 94.02806159
+1836.410256 , 2316.6 , 98.27516159
+1836.410256 , 2509.65 , 102.5222616
+1836.410256 , 2702.7 , 106.7693616
+1836.410256 , 2895.75 , 111.0164616
+1836.410256 , 3088.8 , 115.2635616
+1836.410256 , 3281.85 , 119.5106616
+1836.410256 , 3474.9 , 123.7577616
+1836.410256 , 3667.95 , 128.0048616
+1836.410256 , 3861 , 132.2519616
+1836.410256 , 4054.05 , 136.4990616
+1836.410256 , 4247.1 , 140.7461616
+1836.410256 , 4440.15 , 144.9932616
+1836.410256 , 4633.2 , 149.2403616
+1836.410256 , 4826.25 , 153.4874616
+1836.410256 , 5019.3 , 157.7345616
+1836.410256 , 5212.35 , 161.9816616
+1836.410256 , 5405.4 , 166.2287616
+1836.410256 , 5598.45 , 170.4758616
+1836.410256 , 5791.5 , 174.7229616
+1836.410256 , 5984.55 , 178.9700616
+1836.410256 , 6177.6 , 183.2171616
+2040.42735 , -6177.6 , 85.19433121
+2040.42735 , -5984.55 , 80.94723121
+2040.42735 , -5791.5 , 76.70013121
+2040.42735 , -5598.45 , 72.45303121
+2040.42735 , -5405.4 , 68.20593121
+2040.42735 , -5212.35 , 63.95883121
+2040.42735 , -5019.3 , 59.71173121
+2040.42735 , -4826.25 , 55.46463121
+2040.42735 , -4633.2 , 51.21753121
+2040.42735 , -4440.15 , 46.97043121
+2040.42735 , -4247.1 , 42.72333121
+2040.42735 , -4054.05 , 38.47623121
+2040.42735 , -3861 , 34.22913121
+2040.42735 , -3667.95 , 29.98203121
+2040.42735 , -3474.9 , 25.73493121
+2040.42735 , -3281.85 , 21.48783121
+2040.42735 , -3088.8 , 17.24073121
+2040.42735 , -2895.75 , 12.99363121
+2040.42735 , -2702.7 , 8.746531207
+2040.42735 , -2509.65 , 4.499431207
+2040.42735 , -2316.6 , 0.252331207
+2040.42735 , -2123.55 , 3.994768793
+2040.42735 , -1930.5 , 8.241868793
+2040.42735 , -1737.45 , 12.48896879
+2040.42735 , -1544.4 , 16.73606879
+2040.42735 , -1351.35 , 20.98316879
+2040.42735 , -1158.3 , 25.23026879
+2040.42735 , -965.25 , 29.47736879
+2040.42735 , -772.2 , 33.72446879
+2040.42735 , -579.15 , 37.97156879
+2040.42735 , -386.1 , 42.21866879
+2040.42735 , -193.05 , 46.46576879
+2040.42735 , 0 , 50.71286879
+2040.42735 , 193.05 , 54.95996879
+2040.42735 , 386.1 , 59.20706879
+2040.42735 , 579.15 , 63.45416879
+2040.42735 , 772.2 , 67.70126879
+2040.42735 , 965.25 , 71.94836879
+2040.42735 , 1158.3 , 76.19546879
+2040.42735 , 1351.35 , 80.44256879
+2040.42735 , 1544.4 , 84.68966879
+2040.42735 , 1737.45 , 88.93676879
+2040.42735 , 1930.5 , 93.18386879
+2040.42735 , 2123.55 , 97.43096879
+2040.42735 , 2316.6 , 101.6780688
+2040.42735 , 2509.65 , 105.9251688
+2040.42735 , 2702.7 , 110.1722688
+2040.42735 , 2895.75 , 114.4193688
+2040.42735 , 3088.8 , 118.6664688
+2040.42735 , 3281.85 , 122.9135688
+2040.42735 , 3474.9 , 127.1606688
+2040.42735 , 3667.95 , 131.4077688
+2040.42735 , 3861 , 135.6548688
+2040.42735 , 4054.05 , 139.9019688
+2040.42735 , 4247.1 , 144.1490688
+2040.42735 , 4440.15 , 148.3961688
+2040.42735 , 4633.2 , 152.6432688
+2040.42735 , 4826.25 , 156.8903688
+2040.42735 , 5019.3 , 161.1374688
+2040.42735 , 5212.35 , 165.3845688
+2040.42735 , 5405.4 , 169.6316688
+2040.42735 , 5598.45 , 173.8787688
+2040.42735 , 5791.5 , 178.1258688
+2040.42735 , 5984.55 , 182.3729688
+2040.42735 , 6177.6 , 186.6200688
+2244.529915 , -6177.6 , 81.78999839
+2244.529915 , -5984.55 , 77.54289839
+2244.529915 , -5791.5 , 73.29579839
+2244.529915 , -5598.45 , 69.04869839
+2244.529915 , -5405.4 , 64.80159839
+2244.529915 , -5212.35 , 60.55449839
+2244.529915 , -5019.3 , 56.30739839
+2244.529915 , -4826.25 , 52.06029839
+2244.529915 , -4633.2 , 47.81319839
+2244.529915 , -4440.15 , 43.56609839
+2244.529915 , -4247.1 , 39.31899839
+2244.529915 , -4054.05 , 35.07189839
+2244.529915 , -3861 , 30.82479839
+2244.529915 , -3667.95 , 26.57769839
+2244.529915 , -3474.9 , 22.33059839
+2244.529915 , -3281.85 , 18.08349839
+2244.529915 , -3088.8 , 13.83639839
+2244.529915 , -2895.75 , 9.589298392
+2244.529915 , -2702.7 , 5.342198392
+2244.529915 , -2509.65 , 1.095098392
+2244.529915 , -2316.6 , 3.152001608
+2244.529915 , -2123.55 , 7.399101608
+2244.529915 , -1930.5 , 11.64620161
+2244.529915 , -1737.45 , 15.89330161
+2244.529915 , -1544.4 , 20.14040161
+2244.529915 , -1351.35 , 24.38750161
+2244.529915 , -1158.3 , 28.63460161
+2244.529915 , -965.25 , 32.88170161
+2244.529915 , -772.2 , 37.12880161
+2244.529915 , -579.15 , 41.37590161
+2244.529915 , -386.1 , 45.62300161
+2244.529915 , -193.05 , 49.87010161
+2244.529915 , 0 , 54.11720161
+2244.529915 , 193.05 , 58.36430161
+2244.529915 , 386.1 , 62.61140161
+2244.529915 , 579.15 , 66.85850161
+2244.529915 , 772.2 , 71.10560161
+2244.529915 , 965.25 , 75.35270161
+2244.529915 , 1158.3 , 79.59980161
+2244.529915 , 1351.35 , 83.84690161
+2244.529915 , 1544.4 , 88.09400161
+2244.529915 , 1737.45 , 92.34110161
+2244.529915 , 1930.5 , 96.58820161
+2244.529915 , 2123.55 , 100.8353016
+2244.529915 , 2316.6 , 105.0824016
+2244.529915 , 2509.65 , 109.3295016
+2244.529915 , 2702.7 , 113.5766016
+2244.529915 , 2895.75 , 117.8237016
+2244.529915 , 3088.8 , 122.0708016
+2244.529915 , 3281.85 , 126.3179016
+2244.529915 , 3474.9 , 130.5650016
+2244.529915 , 3667.95 , 134.8121016
+2244.529915 , 3861 , 139.0592016
+2244.529915 , 4054.05 , 143.3063016
+2244.529915 , 4247.1 , 147.5534016
+2244.529915 , 4440.15 , 151.8005016
+2244.529915 , 4633.2 , 156.0476016
+2244.529915 , 4826.25 , 160.2947016
+2244.529915 , 5019.3 , 164.5418016
+2244.529915 , 5212.35 , 168.7889016
+2244.529915 , 5405.4 , 173.0360016
+2244.529915 , 5598.45 , 177.2831016
+2244.529915 , 5791.5 , 181.5302016
+2244.529915 , 5984.55 , 185.7773016
+2244.529915 , 6177.6 , 190.0244016
+2448.547009 , -6177.6 , 78.38709119
+2448.547009 , -5984.55 , 74.13999119
+2448.547009 , -5791.5 , 69.89289119
+2448.547009 , -5598.45 , 65.64579119
+2448.547009 , -5405.4 , 61.39869119
+2448.547009 , -5212.35 , 57.15159119
+2448.547009 , -5019.3 , 52.90449119
+2448.547009 , -4826.25 , 48.65739119
+2448.547009 , -4633.2 , 44.41029119
+2448.547009 , -4440.15 , 40.16319119
+2448.547009 , -4247.1 , 35.91609119
+2448.547009 , -4054.05 , 31.66899119
+2448.547009 , -3861 , 27.42189119
+2448.547009 , -3667.95 , 23.17479119
+2448.547009 , -3474.9 , 18.92769119
+2448.547009 , -3281.85 , 14.68059119
+2448.547009 , -3088.8 , 10.43349119
+2448.547009 , -2895.75 , 6.186391192
+2448.547009 , -2702.7 , 1.939291192
+2448.547009 , -2509.65 , 2.307808808
+2448.547009 , -2316.6 , 6.554908808
+2448.547009 , -2123.55 , 10.80200881
+2448.547009 , -1930.5 , 15.04910881
+2448.547009 , -1737.45 , 19.29620881
+2448.547009 , -1544.4 , 23.54330881
+2448.547009 , -1351.35 , 27.79040881
+2448.547009 , -1158.3 , 32.03750881
+2448.547009 , -965.25 , 36.28460881
+2448.547009 , -772.2 , 40.53170881
+2448.547009 , -579.15 , 44.77880881
+2448.547009 , -386.1 , 49.02590881
+2448.547009 , -193.05 , 53.27300881
+2448.547009 , 0 , 57.52010881
+2448.547009 , 193.05 , 61.76720881
+2448.547009 , 386.1 , 66.01430881
+2448.547009 , 579.15 , 70.26140881
+2448.547009 , 772.2 , 74.50850881
+2448.547009 , 965.25 , 78.75560881
+2448.547009 , 1158.3 , 83.00270881
+2448.547009 , 1351.35 , 87.24980881
+2448.547009 , 1544.4 , 91.49690881
+2448.547009 , 1737.45 , 95.74400881
+2448.547009 , 1930.5 , 99.99110881
+2448.547009 , 2123.55 , 104.2382088
+2448.547009 , 2316.6 , 108.4853088
+2448.547009 , 2509.65 , 112.7324088
+2448.547009 , 2702.7 , 116.9795088
+2448.547009 , 2895.75 , 121.2266088
+2448.547009 , 3088.8 , 125.4737088
+2448.547009 , 3281.85 , 129.7208088
+2448.547009 , 3474.9 , 133.9679088
+2448.547009 , 3667.95 , 138.2150088
+2448.547009 , 3861 , 142.4621088
+2448.547009 , 4054.05 , 146.7092088
+2448.547009 , 4247.1 , 150.9563088
+2448.547009 , 4440.15 , 155.2034088
+2448.547009 , 4633.2 , 159.4505088
+2448.547009 , 4826.25 , 163.6976088
+2448.547009 , 5019.3 , 167.9447088
+2448.547009 , 5212.35 , 172.1918088
+2448.547009 , 5405.4 , 176.4389088
+2448.547009 , 5598.45 , 180.6860088
+2448.547009 , 5791.5 , 184.9331088
+2448.547009 , 5984.55 , 189.1802088
+2448.547009 , 6177.6 , 193.4273088
+2652.564103 , -6177.6 , 74.98418399
+2652.564103 , -5984.55 , 70.73708399
+2652.564103 , -5791.5 , 66.48998399
+2652.564103 , -5598.45 , 62.24288399
+2652.564103 , -5405.4 , 57.99578399
+2652.564103 , -5212.35 , 53.74868399
+2652.564103 , -5019.3 , 49.50158399
+2652.564103 , -4826.25 , 45.25448399
+2652.564103 , -4633.2 , 41.00738399
+2652.564103 , -4440.15 , 36.76028399
+2652.564103 , -4247.1 , 32.51318399
+2652.564103 , -4054.05 , 28.26608399
+2652.564103 , -3861 , 24.01898399
+2652.564103 , -3667.95 , 19.77188399
+2652.564103 , -3474.9 , 15.52478399
+2652.564103 , -3281.85 , 11.27768399
+2652.564103 , -3088.8 , 7.030583993
+2652.564103 , -2895.75 , 2.783483993
+2652.564103 , -2702.7 , 1.463616007
+2652.564103 , -2509.65 , 5.710716007
+2652.564103 , -2316.6 , 9.957816007
+2652.564103 , -2123.55 , 14.20491601
+2652.564103 , -1930.5 , 18.45201601
+2652.564103 , -1737.45 , 22.69911601
+2652.564103 , -1544.4 , 26.94621601
+2652.564103 , -1351.35 , 31.19331601
+2652.564103 , -1158.3 , 35.44041601
+2652.564103 , -965.25 , 39.68751601
+2652.564103 , -772.2 , 43.93461601
+2652.564103 , -579.15 , 48.18171601
+2652.564103 , -386.1 , 52.42881601
+2652.564103 , -193.05 , 56.67591601
+2652.564103 , 0 , 60.92301601
+2652.564103 , 193.05 , 65.17011601
+2652.564103 , 386.1 , 69.41721601
+2652.564103 , 579.15 , 73.66431601
+2652.564103 , 772.2 , 77.91141601
+2652.564103 , 965.25 , 82.15851601
+2652.564103 , 1158.3 , 86.40561601
+2652.564103 , 1351.35 , 90.65271601
+2652.564103 , 1544.4 , 94.89981601
+2652.564103 , 1737.45 , 99.14691601
+2652.564103 , 1930.5 , 103.394016
+2652.564103 , 2123.55 , 107.641116
+2652.564103 , 2316.6 , 111.888216
+2652.564103 , 2509.65 , 116.135316
+2652.564103 , 2702.7 , 120.382416
+2652.564103 , 2895.75 , 124.629516
+2652.564103 , 3088.8 , 128.876616
+2652.564103 , 3281.85 , 133.123716
+2652.564103 , 3474.9 , 137.370816
+2652.564103 , 3667.95 , 141.617916
+2652.564103 , 3861 , 145.865016
+2652.564103 , 4054.05 , 150.112116
+2652.564103 , 4247.1 , 154.359216
+2652.564103 , 4440.15 , 158.606316
+2652.564103 , 4633.2 , 162.853416
+2652.564103 , 4826.25 , 167.100516
+2652.564103 , 5019.3 , 171.347616
+2652.564103 , 5212.35 , 175.594716
+2652.564103 , 5405.4 , 179.841816
+2652.564103 , 5598.45 , 184.088916
+2652.564103 , 5791.5 , 188.336016
+2652.564103 , 5984.55 , 192.583116
+2652.564103 , 6177.6 , 196.830216
+2856.666667 , -6177.6 , 71.57985119
+2856.666667 , -5984.55 , 67.33275119
+2856.666667 , -5791.5 , 63.08565119
+2856.666667 , -5598.45 , 58.83855119
+2856.666667 , -5405.4 , 54.59145119
+2856.666667 , -5212.35 , 50.34435119
+2856.666667 , -5019.3 , 46.09725119
+2856.666667 , -4826.25 , 41.85015119
+2856.666667 , -4633.2 , 37.60305119
+2856.666667 , -4440.15 , 33.35595119
+2856.666667 , -4247.1 , 29.10885119
+2856.666667 , -4054.05 , 24.86175119
+2856.666667 , -3861 , 20.61465119
+2856.666667 , -3667.95 , 16.36755119
+2856.666667 , -3474.9 , 12.12045119
+2856.666667 , -3281.85 , 7.873351194
+2856.666667 , -3088.8 , 3.626251194
+2856.666667 , -2895.75 , 0.620848806
+2856.666667 , -2702.7 , 4.867948806
+2856.666667 , -2509.65 , 9.115048806
+2856.666667 , -2316.6 , 13.36214881
+2856.666667 , -2123.55 , 17.60924881
+2856.666667 , -1930.5 , 21.85634881
+2856.666667 , -1737.45 , 26.10344881
+2856.666667 , -1544.4 , 30.35054881
+2856.666667 , -1351.35 , 34.59764881
+2856.666667 , -1158.3 , 38.84474881
+2856.666667 , -965.25 , 43.09184881
+2856.666667 , -772.2 , 47.33894881
+2856.666667 , -579.15 , 51.58604881
+2856.666667 , -386.1 , 55.83314881
+2856.666667 , -193.05 , 60.08024881
+2856.666667 , 0 , 64.32734881
+2856.666667 , 193.05 , 68.57444881
+2856.666667 , 386.1 , 72.82154881
+2856.666667 , 579.15 , 77.06864881
+2856.666667 , 772.2 , 81.31574881
+2856.666667 , 965.25 , 85.56284881
+2856.666667 , 1158.3 , 89.80994881
+2856.666667 , 1351.35 , 94.05704881
+2856.666667 , 1544.4 , 98.30414881
+2856.666667 , 1737.45 , 102.5512488
+2856.666667 , 1930.5 , 106.7983488
+2856.666667 , 2123.55 , 111.0454488
+2856.666667 , 2316.6 , 115.2925488
+2856.666667 , 2509.65 , 119.5396488
+2856.666667 , 2702.7 , 123.7867488
+2856.666667 , 2895.75 , 128.0338488
+2856.666667 , 3088.8 , 132.2809488
+2856.666667 , 3281.85 , 136.5280488
+2856.666667 , 3474.9 , 140.7751488
+2856.666667 , 3667.95 , 145.0222488
+2856.666667 , 3861 , 149.2693488
+2856.666667 , 4054.05 , 153.5164488
+2856.666667 , 4247.1 , 157.7635488
+2856.666667 , 4440.15 , 162.0106488
+2856.666667 , 4633.2 , 166.2577488
+2856.666667 , 4826.25 , 170.5048488
+2856.666667 , 5019.3 , 174.7519488
+2856.666667 , 5212.35 , 178.9990488
+2856.666667 , 5405.4 , 183.2461488
+2856.666667 , 5598.45 , 187.4932488
+2856.666667 , 5791.5 , 191.7403488
+2856.666667 , 5984.55 , 195.9874488
+2856.666667 , 6177.6 , 200.2345488
+3060.683761 , -6177.6 , 68.17694399
+3060.683761 , -5984.55 , 63.92984399
+3060.683761 , -5791.5 , 59.68274399
+3060.683761 , -5598.45 , 55.43564399
+3060.683761 , -5405.4 , 51.18854399
+3060.683761 , -5212.35 , 46.94144399
+3060.683761 , -5019.3 , 42.69434399
+3060.683761 , -4826.25 , 38.44724399
+3060.683761 , -4633.2 , 34.20014399
+3060.683761 , -4440.15 , 29.95304399
+3060.683761 , -4247.1 , 25.70594399
+3060.683761 , -4054.05 , 21.45884399
+3060.683761 , -3861 , 17.21174399
+3060.683761 , -3667.95 , 12.96464399
+3060.683761 , -3474.9 , 8.717543995
+3060.683761 , -3281.85 , 4.470443995
+3060.683761 , -3088.8 , 0.223343995
+3060.683761 , -2895.75 , 4.023756005
+3060.683761 , -2702.7 , 8.270856005
+3060.683761 , -2509.65 , 12.51795601
+3060.683761 , -2316.6 , 16.76505601
+3060.683761 , -2123.55 , 21.01215601
+3060.683761 , -1930.5 , 25.25925601
+3060.683761 , -1737.45 , 29.50635601
+3060.683761 , -1544.4 , 33.75345601
+3060.683761 , -1351.35 , 38.00055601
+3060.683761 , -1158.3 , 42.24765601
+3060.683761 , -965.25 , 46.49475601
+3060.683761 , -772.2 , 50.74185601
+3060.683761 , -579.15 , 54.98895601
+3060.683761 , -386.1 , 59.23605601
+3060.683761 , -193.05 , 63.48315601
+3060.683761 , 0 , 67.73025601
+3060.683761 , 193.05 , 71.97735601
+3060.683761 , 386.1 , 76.22445601
+3060.683761 , 579.15 , 80.47155601
+3060.683761 , 772.2 , 84.71865601
+3060.683761 , 965.25 , 88.96575601
+3060.683761 , 1158.3 , 93.21285601
+3060.683761 , 1351.35 , 97.45995601
+3060.683761 , 1544.4 , 101.707056
+3060.683761 , 1737.45 , 105.954156
+3060.683761 , 1930.5 , 110.201256
+3060.683761 , 2123.55 , 114.448356
+3060.683761 , 2316.6 , 118.695456
+3060.683761 , 2509.65 , 122.942556
+3060.683761 , 2702.7 , 127.189656
+3060.683761 , 2895.75 , 131.436756
+3060.683761 , 3088.8 , 135.683856
+3060.683761 , 3281.85 , 139.930956
+3060.683761 , 3474.9 , 144.178056
+3060.683761 , 3667.95 , 148.425156
+3060.683761 , 3861 , 152.672256
+3060.683761 , 4054.05 , 156.919356
+3060.683761 , 4247.1 , 161.166456
+3060.683761 , 4440.15 , 165.413556
+3060.683761 , 4633.2 , 169.660656
+3060.683761 , 4826.25 , 173.907756
+3060.683761 , 5019.3 , 178.154856
+3060.683761 , 5212.35 , 182.401956
+3060.683761 , 5405.4 , 186.649056
+3060.683761 , 5598.45 , 190.896156
+3060.683761 , 5791.5 , 195.143256
+3060.683761 , 5984.55 , 199.390356
+3060.683761 , 6177.6 , 203.637456
+3264.700855 , -6177.6 , 64.7740368
+3264.700855 , -5984.55 , 60.5269368
+3264.700855 , -5791.5 , 56.2798368
+3264.700855 , -5598.45 , 52.0327368
+3264.700855 , -5405.4 , 47.7856368
+3264.700855 , -5212.35 , 43.5385368
+3264.700855 , -5019.3 , 39.2914368
+3264.700855 , -4826.25 , 35.0443368
+3264.700855 , -4633.2 , 30.7972368
+3264.700855 , -4440.15 , 26.5501368
+3264.700855 , -4247.1 , 22.3030368
+3264.700855 , -4054.05 , 18.0559368
+3264.700855 , -3861 , 13.8088368
+3264.700855 , -3667.95 , 9.561736795
+3264.700855 , -3474.9 , 5.314636795
+3264.700855 , -3281.85 , 1.067536795
+3264.700855 , -3088.8 , 3.179563205
+3264.700855 , -2895.75 , 7.426663205
+3264.700855 , -2702.7 , 11.6737632
+3264.700855 , -2509.65 , 15.9208632
+3264.700855 , -2316.6 , 20.1679632
+3264.700855 , -2123.55 , 24.4150632
+3264.700855 , -1930.5 , 28.6621632
+3264.700855 , -1737.45 , 32.9092632
+3264.700855 , -1544.4 , 37.1563632
+3264.700855 , -1351.35 , 41.4034632
+3264.700855 , -1158.3 , 45.6505632
+3264.700855 , -965.25 , 49.8976632
+3264.700855 , -772.2 , 54.1447632
+3264.700855 , -579.15 , 58.3918632
+3264.700855 , -386.1 , 62.6389632
+3264.700855 , -193.05 , 66.8860632
+3264.700855 , 0 , 71.1331632
+3264.700855 , 193.05 , 75.3802632
+3264.700855 , 386.1 , 79.6273632
+3264.700855 , 579.15 , 83.8744632
+3264.700855 , 772.2 , 88.1215632
+3264.700855 , 965.25 , 92.3686632
+3264.700855 , 1158.3 , 96.6157632
+3264.700855 , 1351.35 , 100.8628632
+3264.700855 , 1544.4 , 105.1099632
+3264.700855 , 1737.45 , 109.3570632
+3264.700855 , 1930.5 , 113.6041632
+3264.700855 , 2123.55 , 117.8512632
+3264.700855 , 2316.6 , 122.0983632
+3264.700855 , 2509.65 , 126.3454632
+3264.700855 , 2702.7 , 130.5925632
+3264.700855 , 2895.75 , 134.8396632
+3264.700855 , 3088.8 , 139.0867632
+3264.700855 , 3281.85 , 143.3338632
+3264.700855 , 3474.9 , 147.5809632
+3264.700855 , 3667.95 , 151.8280632
+3264.700855 , 3861 , 156.0751632
+3264.700855 , 4054.05 , 160.3222632
+3264.700855 , 4247.1 , 164.5693632
+3264.700855 , 4440.15 , 168.8164632
+3264.700855 , 4633.2 , 173.0635632
+3264.700855 , 4826.25 , 177.3106632
+3264.700855 , 5019.3 , 181.5577632
+3264.700855 , 5212.35 , 185.8048632
+3264.700855 , 5405.4 , 190.0519632
+3264.700855 , 5598.45 , 194.2990632
+3264.700855 , 5791.5 , 198.5461632
+3264.700855 , 5984.55 , 202.7932632
+3264.700855 , 6177.6 , 207.0403632
+3468.803419 , -6177.6 , 61.369704
+3468.803419 , -5984.55 , 57.122604
+3468.803419 , -5791.5 , 52.875504
+3468.803419 , -5598.45 , 48.628404
+3468.803419 , -5405.4 , 44.381304
+3468.803419 , -5212.35 , 40.134204
+3468.803419 , -5019.3 , 35.887104
+3468.803419 , -4826.25 , 31.640004
+3468.803419 , -4633.2 , 27.392904
+3468.803419 , -4440.15 , 23.145804
+3468.803419 , -4247.1 , 18.898704
+3468.803419 , -4054.05 , 14.651604
+3468.803419 , -3861 , 10.404504
+3468.803419 , -3667.95 , 6.157403997
+3468.803419 , -3474.9 , 1.910303997
+3468.803419 , -3281.85 , 2.336796003
+3468.803419 , -3088.8 , 6.583896003
+3468.803419 , -2895.75 , 10.830996
+3468.803419 , -2702.7 , 15.078096
+3468.803419 , -2509.65 , 19.325196
+3468.803419 , -2316.6 , 23.572296
+3468.803419 , -2123.55 , 27.819396
+3468.803419 , -1930.5 , 32.066496
+3468.803419 , -1737.45 , 36.313596
+3468.803419 , -1544.4 , 40.560696
+3468.803419 , -1351.35 , 44.807796
+3468.803419 , -1158.3 , 49.054896
+3468.803419 , -965.25 , 53.301996
+3468.803419 , -772.2 , 57.549096
+3468.803419 , -579.15 , 61.796196
+3468.803419 , -386.1 , 66.043296
+3468.803419 , -193.05 , 70.290396
+3468.803419 , 0 , 74.537496
+3468.803419 , 193.05 , 78.784596
+3468.803419 , 386.1 , 83.031696
+3468.803419 , 579.15 , 87.278796
+3468.803419 , 772.2 , 91.525896
+3468.803419 , 965.25 , 95.772996
+3468.803419 , 1158.3 , 100.020096
+3468.803419 , 1351.35 , 104.267196
+3468.803419 , 1544.4 , 108.514296
+3468.803419 , 1737.45 , 112.761396
+3468.803419 , 1930.5 , 117.008496
+3468.803419 , 2123.55 , 121.255596
+3468.803419 , 2316.6 , 125.502696
+3468.803419 , 2509.65 , 129.749796
+3468.803419 , 2702.7 , 133.996896
+3468.803419 , 2895.75 , 138.243996
+3468.803419 , 3088.8 , 142.491096
+3468.803419 , 3281.85 , 146.738196
+3468.803419 , 3474.9 , 150.985296
+3468.803419 , 3667.95 , 155.232396
+3468.803419 , 3861 , 159.479496
+3468.803419 , 4054.05 , 163.726596
+3468.803419 , 4247.1 , 167.973696
+3468.803419 , 4440.15 , 172.220796
+3468.803419 , 4633.2 , 176.467896
+3468.803419 , 4826.25 , 180.714996
+3468.803419 , 5019.3 , 184.962096
+3468.803419 , 5212.35 , 189.209196
+3468.803419 , 5405.4 , 193.456296
+3468.803419 , 5598.45 , 197.703396
+3468.803419 , 5791.5 , 201.950496
+3468.803419 , 5984.55 , 206.197596
+3468.803419 , 6177.6 , 210.444696
+3672.820513 , -6177.6 , 57.9667968
+3672.820513 , -5984.55 , 53.7196968
+3672.820513 , -5791.5 , 49.4725968
+3672.820513 , -5598.45 , 45.2254968
+3672.820513 , -5405.4 , 40.9783968
+3672.820513 , -5212.35 , 36.7312968
+3672.820513 , -5019.3 , 32.4841968
+3672.820513 , -4826.25 , 28.2370968
+3672.820513 , -4633.2 , 23.9899968
+3672.820513 , -4440.15 , 19.7428968
+3672.820513 , -4247.1 , 15.4957968
+3672.820513 , -4054.05 , 11.2486968
+3672.820513 , -3861 , 7.001596797
+3672.820513 , -3667.95 , 2.754496797
+3672.820513 , -3474.9 , 1.492603203
+3672.820513 , -3281.85 , 5.739703203
+3672.820513 , -3088.8 , 9.986803203
+3672.820513 , -2895.75 , 14.2339032
+3672.820513 , -2702.7 , 18.4810032
+3672.820513 , -2509.65 , 22.7281032
+3672.820513 , -2316.6 , 26.9752032
+3672.820513 , -2123.55 , 31.2223032
+3672.820513 , -1930.5 , 35.4694032
+3672.820513 , -1737.45 , 39.7165032
+3672.820513 , -1544.4 , 43.9636032
+3672.820513 , -1351.35 , 48.2107032
+3672.820513 , -1158.3 , 52.4578032
+3672.820513 , -965.25 , 56.7049032
+3672.820513 , -772.2 , 60.9520032
+3672.820513 , -579.15 , 65.1991032
+3672.820513 , -386.1 , 69.4462032
+3672.820513 , -193.05 , 73.6933032
+3672.820513 , 0 , 77.9404032
+3672.820513 , 193.05 , 82.1875032
+3672.820513 , 386.1 , 86.4346032
+3672.820513 , 579.15 , 90.6817032
+3672.820513 , 772.2 , 94.9288032
+3672.820513 , 965.25 , 99.1759032
+3672.820513 , 1158.3 , 103.4230032
+3672.820513 , 1351.35 , 107.6701032
+3672.820513 , 1544.4 , 111.9172032
+3672.820513 , 1737.45 , 116.1643032
+3672.820513 , 1930.5 , 120.4114032
+3672.820513 , 2123.55 , 124.6585032
+3672.820513 , 2316.6 , 128.9056032
+3672.820513 , 2509.65 , 133.1527032
+3672.820513 , 2702.7 , 137.3998032
+3672.820513 , 2895.75 , 141.6469032
+3672.820513 , 3088.8 , 145.8940032
+3672.820513 , 3281.85 , 150.1411032
+3672.820513 , 3474.9 , 154.3882032
+3672.820513 , 3667.95 , 158.6353032
+3672.820513 , 3861 , 162.8824032
+3672.820513 , 4054.05 , 167.1295032
+3672.820513 , 4247.1 , 171.3766032
+3672.820513 , 4440.15 , 175.6237032
+3672.820513 , 4633.2 , 179.8708032
+3672.820513 , 4826.25 , 184.1179032
+3672.820513 , 5019.3 , 188.3650032
+3672.820513 , 5212.35 , 192.6121032
+3672.820513 , 5405.4 , 196.8592032
+3672.820513 , 5598.45 , 201.1063032
+3672.820513 , 5791.5 , 205.3534032
+3672.820513 , 5984.55 , 209.6005032
+3672.820513 , 6177.6 , 213.8476032
+3876.837607 , -6177.6 , 54.5638896
+3876.837607 , -5984.55 , 50.3167896
+3876.837607 , -5791.5 , 46.0696896
+3876.837607 , -5598.45 , 41.8225896
+3876.837607 , -5405.4 , 37.5754896
+3876.837607 , -5212.35 , 33.3283896
+3876.837607 , -5019.3 , 29.0812896
+3876.837607 , -4826.25 , 24.8341896
+3876.837607 , -4633.2 , 20.5870896
+3876.837607 , -4440.15 , 16.3399896
+3876.837607 , -4247.1 , 12.0928896
+3876.837607 , -4054.05 , 7.845789597
+3876.837607 , -3861 , 3.598689597
+3876.837607 , -3667.95 , 0.648410403
+3876.837607 , -3474.9 , 4.895510403
+3876.837607 , -3281.85 , 9.142610403
+3876.837607 , -3088.8 , 13.3897104
+3876.837607 , -2895.75 , 17.6368104
+3876.837607 , -2702.7 , 21.8839104
+3876.837607 , -2509.65 , 26.1310104
+3876.837607 , -2316.6 , 30.3781104
+3876.837607 , -2123.55 , 34.6252104
+3876.837607 , -1930.5 , 38.8723104
+3876.837607 , -1737.45 , 43.1194104
+3876.837607 , -1544.4 , 47.3665104
+3876.837607 , -1351.35 , 51.6136104
+3876.837607 , -1158.3 , 55.8607104
+3876.837607 , -965.25 , 60.1078104
+3876.837607 , -772.2 , 64.3549104
+3876.837607 , -579.15 , 68.6020104
+3876.837607 , -386.1 , 72.8491104
+3876.837607 , -193.05 , 77.0962104
+3876.837607 , 0 , 81.3433104
+3876.837607 , 193.05 , 85.5904104
+3876.837607 , 386.1 , 89.8375104
+3876.837607 , 579.15 , 94.0846104
+3876.837607 , 772.2 , 98.3317104
+3876.837607 , 965.25 , 102.5788104
+3876.837607 , 1158.3 , 106.8259104
+3876.837607 , 1351.35 , 111.0730104
+3876.837607 , 1544.4 , 115.3201104
+3876.837607 , 1737.45 , 119.5672104
+3876.837607 , 1930.5 , 123.8143104
+3876.837607 , 2123.55 , 128.0614104
+3876.837607 , 2316.6 , 132.3085104
+3876.837607 , 2509.65 , 136.5556104
+3876.837607 , 2702.7 , 140.8027104
+3876.837607 , 2895.75 , 145.0498104
+3876.837607 , 3088.8 , 149.2969104
+3876.837607 , 3281.85 , 153.5440104
+3876.837607 , 3474.9 , 157.7911104
+3876.837607 , 3667.95 , 162.0382104
+3876.837607 , 3861 , 166.2853104
+3876.837607 , 4054.05 , 170.5324104
+3876.837607 , 4247.1 , 174.7795104
+3876.837607 , 4440.15 , 179.0266104
+3876.837607 , 4633.2 , 183.2737104
+3876.837607 , 4826.25 , 187.5208104
+3876.837607 , 5019.3 , 191.7679104
+3876.837607 , 5212.35 , 196.0150104
+3876.837607 , 5405.4 , 200.2621104
+3876.837607 , 5598.45 , 204.5092104
+3876.837607 , 5791.5 , 208.7563104
+3876.837607 , 5984.55 , 213.0034104
+3876.837607 , 6177.6 , 217.2505104
+4080.854701 , -6177.6 , 51.1609824
+4080.854701 , -5984.55 , 46.9138824
+4080.854701 , -5791.5 , 42.6667824
+4080.854701 , -5598.45 , 38.4196824
+4080.854701 , -5405.4 , 34.1725824
+4080.854701 , -5212.35 , 29.9254824
+4080.854701 , -5019.3 , 25.6783824
+4080.854701 , -4826.25 , 21.4312824
+4080.854701 , -4633.2 , 17.1841824
+4080.854701 , -4440.15 , 12.9370824
+4080.854701 , -4247.1 , 8.689982398
+4080.854701 , -4054.05 , 4.442882398
+4080.854701 , -3861 , 0.195782398
+4080.854701 , -3667.95 , 4.051317602
+4080.854701 , -3474.9 , 8.298417602
+4080.854701 , -3281.85 , 12.5455176
+4080.854701 , -3088.8 , 16.7926176
+4080.854701 , -2895.75 , 21.0397176
+4080.854701 , -2702.7 , 25.2868176
+4080.854701 , -2509.65 , 29.5339176
+4080.854701 , -2316.6 , 33.7810176
+4080.854701 , -2123.55 , 38.0281176
+4080.854701 , -1930.5 , 42.2752176
+4080.854701 , -1737.45 , 46.5223176
+4080.854701 , -1544.4 , 50.7694176
+4080.854701 , -1351.35 , 55.0165176
+4080.854701 , -1158.3 , 59.2636176
+4080.854701 , -965.25 , 63.5107176
+4080.854701 , -772.2 , 67.7578176
+4080.854701 , -579.15 , 72.0049176
+4080.854701 , -386.1 , 76.2520176
+4080.854701 , -193.05 , 80.4991176
+4080.854701 , 0 , 84.7462176
+4080.854701 , 193.05 , 88.9933176
+4080.854701 , 386.1 , 93.2404176
+4080.854701 , 579.15 , 97.4875176
+4080.854701 , 772.2 , 101.7346176
+4080.854701 , 965.25 , 105.9817176
+4080.854701 , 1158.3 , 110.2288176
+4080.854701 , 1351.35 , 114.4759176
+4080.854701 , 1544.4 , 118.7230176
+4080.854701 , 1737.45 , 122.9701176
+4080.854701 , 1930.5 , 127.2172176
+4080.854701 , 2123.55 , 131.4643176
+4080.854701 , 2316.6 , 135.7114176
+4080.854701 , 2509.65 , 139.9585176
+4080.854701 , 2702.7 , 144.2056176
+4080.854701 , 2895.75 , 148.4527176
+4080.854701 , 3088.8 , 152.6998176
+4080.854701 , 3281.85 , 156.9469176
+4080.854701 , 3474.9 , 161.1940176
+4080.854701 , 3667.95 , 165.4411176
+4080.854701 , 3861 , 169.6882176
+4080.854701 , 4054.05 , 173.9353176
+4080.854701 , 4247.1 , 178.1824176
+4080.854701 , 4440.15 , 182.4295176
+4080.854701 , 4633.2 , 186.6766176
+4080.854701 , 4826.25 , 190.9237176
+4080.854701 , 5019.3 , 195.1708176
+4080.854701 , 5212.35 , 199.4179176
+4080.854701 , 5405.4 , 203.6650176
+4080.854701 , 5598.45 , 207.9121176
+4080.854701 , 5791.5 , 212.1592176
+4080.854701 , 5984.55 , 216.4063176
+4080.854701 , 6177.6 , 220.6534176
+4268.632479 , -6177.6 , 48.02893919
+4268.632479 , -5984.55 , 43.78183919
+4268.632479 , -5791.5 , 39.53473919
+4268.632479 , -5598.45 , 35.28763919
+4268.632479 , -5405.4 , 31.04053919
+4268.632479 , -5212.35 , 26.79343919
+4268.632479 , -5019.3 , 22.54633919
+4268.632479 , -4826.25 , 18.29923919
+4268.632479 , -4633.2 , 14.05213919
+4268.632479 , -4440.15 , 9.805039194
+4268.632479 , -4247.1 , 5.557939194
+4268.632479 , -4054.05 , 1.310839194
+4268.632479 , -3861 , 2.936260806
+4268.632479 , -3667.95 , 7.183360806
+4268.632479 , -3474.9 , 11.43046081
+4268.632479 , -3281.85 , 15.67756081
+4268.632479 , -3088.8 , 19.92466081
+4268.632479 , -2895.75 , 24.17176081
+4268.632479 , -2702.7 , 28.41886081
+4268.632479 , -2509.65 , 32.66596081
+4268.632479 , -2316.6 , 36.91306081
+4268.632479 , -2123.55 , 41.16016081
+4268.632479 , -1930.5 , 45.40726081
+4268.632479 , -1737.45 , 49.65436081
+4268.632479 , -1544.4 , 53.90146081
+4268.632479 , -1351.35 , 58.14856081
+4268.632479 , -1158.3 , 62.39566081
+4268.632479 , -965.25 , 66.64276081
+4268.632479 , -772.2 , 70.88986081
+4268.632479 , -579.15 , 75.13696081
+4268.632479 , -386.1 , 79.38406081
+4268.632479 , -193.05 , 83.63116081
+4268.632479 , 0 , 87.87826081
+4268.632479 , 193.05 , 92.12536081
+4268.632479 , 386.1 , 96.37246081
+4268.632479 , 579.15 , 100.6195608
+4268.632479 , 772.2 , 104.8666608
+4268.632479 , 965.25 , 109.1137608
+4268.632479 , 1158.3 , 113.3608608
+4268.632479 , 1351.35 , 117.6079608
+4268.632479 , 1544.4 , 121.8550608
+4268.632479 , 1737.45 , 126.1021608
+4268.632479 , 1930.5 , 130.3492608
+4268.632479 , 2123.55 , 134.5963608
+4268.632479 , 2316.6 , 138.8434608
+4268.632479 , 2509.65 , 143.0905608
+4268.632479 , 2702.7 , 147.3376608
+4268.632479 , 2895.75 , 151.5847608
+4268.632479 , 3088.8 , 155.8318608
+4268.632479 , 3281.85 , 160.0789608
+4268.632479 , 3474.9 , 164.3260608
+4268.632479 , 3667.95 , 168.5731608
+4268.632479 , 3861 , 172.8202608
+4268.632479 , 4054.05 , 177.0673608
+4268.632479 , 4247.1 , 181.3144608
+4268.632479 , 4440.15 , 185.5615608
+4268.632479 , 4633.2 , 189.8086608
+4268.632479 , 4826.25 , 194.0557608
+4268.632479 , 5019.3 , 198.3028608
+4268.632479 , 5212.35 , 202.5499608
+4268.632479 , 5405.4 , 206.7970608
+4268.632479 , 5598.45 , 211.0441608
+4268.632479 , 5791.5 , 215.2912608
+4268.632479 , 5984.55 , 219.5383608
+4268.632479 , 6177.6 , 223.7854608
+5000 , -6177.6 , 35.83008
+5000 , -5984.55 , 31.58298
+5000 , -5791.5 , 27.33588
+5000 , -5598.45 , 23.08878
+5000 , -5405.4 , 18.84168
+5000 , -5212.35 , 14.59458
+5000 , -5019.3 , 10.34748
+5000 , -4826.25 , 6.10038
+5000 , -4633.2 , 1.85328
+5000 , -4440.15 , 2.39382
+5000 , -4247.1 , 6.64092
+5000 , -4054.05 , 10.88802
+5000 , -3861 , 15.13512
+5000 , -3667.95 , 19.38222
+5000 , -3474.9 , 23.62932
+5000 , -3281.85 , 27.87642
+5000 , -3088.8 , 32.12352
+5000 , -2895.75 , 36.37062
+5000 , -2702.7 , 40.61772
+5000 , -2509.65 , 44.86482
+5000 , -2316.6 , 49.11192
+5000 , -2123.55 , 53.35902
+5000 , -1930.5 , 57.60612
+5000 , -1737.45 , 61.85322
+5000 , -1544.4 , 66.10032
+5000 , -1351.35 , 70.34742
+5000 , -1158.3 , 74.59452
+5000 , -965.25 , 78.84162
+5000 , -772.2 , 83.08872
+5000 , -579.15 , 87.33582
+5000 , -386.1 , 91.58292
+5000 , -193.05 , 95.83002
+5000 , 0 , 100.07712
+5000 , 193.05 , 104.32422
+5000 , 386.1 , 108.57132
+5000 , 579.15 , 112.81842
+5000 , 772.2 , 117.06552
+5000 , 965.25 , 121.31262
+5000 , 1158.3 , 125.55972
+5000 , 1351.35 , 129.80682
+5000 , 1544.4 , 134.05392
+5000 , 1737.45 , 138.30102
+5000 , 1930.5 , 142.54812
+5000 , 2123.55 , 146.79522
+5000 , 2316.6 , 151.04232
+5000 , 2509.65 , 155.28942
+5000 , 2702.7 , 159.53652
+5000 , 2895.75 , 163.78362
+5000 , 3088.8 , 168.03072
+5000 , 3281.85 , 172.27782
+5000 , 3474.9 , 176.52492
+5000 , 3667.95 , 180.77202
+5000 , 3861 , 185.01912
+5000 , 4054.05 , 189.26622
+5000 , 4247.1 , 193.51332
+5000 , 4440.15 , 197.76042
+5000 , 4633.2 , 202.00752
+5000 , 4826.25 , 206.25462
+5000 , 5019.3 , 210.50172
+5000 , 5212.35 , 214.74882
+5000 , 5405.4 , 218.99592
+5000 , 5598.45 , 223.24302
+5000 , 5791.5 , 227.49012
+5000 , 5984.55 , 231.73722
+5000 , 6177.6 , 235.98432
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_3.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_3.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..4f5fc52723c711eeaaff6e4d70eff7e296291c5d
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_3.vtlm
@@ -0,0 +1,2081 @@
+Input Speed [rpm] , Input Torque [Nm] , Torque Loss [Nm]
+0 , -6177.6 , 113.66784
+0 , -5984.55 , 109.61379
+0 , -5791.5 , 105.55974
+0 , -5598.45 , 101.50569
+0 , -5405.4 , 97.45164
+0 , -5212.35 , 93.39759
+0 , -5019.3 , 89.34354
+0 , -4826.25 , 85.28949
+0 , -4633.2 , 81.23544
+0 , -4440.15 , 77.18139
+0 , -4247.1 , 73.12734
+0 , -4054.05 , 69.07329
+0 , -3861 , 65.01924
+0 , -3667.95 , 60.96519
+0 , -3474.9 , 56.91114
+0 , -3281.85 , 52.85709
+0 , -3088.8 , 48.80304
+0 , -2895.75 , 44.74899
+0 , -2702.7 , 40.69494
+0 , -2509.65 , 36.64089
+0 , -2316.6 , 32.58684
+0 , -2123.55 , 28.53279
+0 , -1930.5 , 24.47874
+0 , -1737.45 , 20.42469
+0 , -1544.4 , 16.37064
+0 , -1351.35 , 12.31659
+0 , -1158.3 , 8.26254
+0 , -965.25 , 4.20849
+0 , -772.2 , 0.15444
+0 , -579.15 , 3.89961
+0 , -386.1 , 7.95366
+0 , -193.05 , 12.00771
+0 , 0 , 16.06176
+0 , 193.05 , 20.11581
+0 , 386.1 , 24.16986
+0 , 579.15 , 28.22391
+0 , 772.2 , 32.27796
+0 , 965.25 , 36.33201
+0 , 1158.3 , 40.38606
+0 , 1351.35 , 44.44011
+0 , 1544.4 , 48.49416
+0 , 1737.45 , 52.54821
+0 , 1930.5 , 56.60226
+0 , 2123.55 , 60.65631
+0 , 2316.6 , 64.71036
+0 , 2509.65 , 68.76441
+0 , 2702.7 , 72.81846
+0 , 2895.75 , 76.87251
+0 , 3088.8 , 80.92656
+0 , 3281.85 , 84.98061
+0 , 3474.9 , 89.03466
+0 , 3667.95 , 93.08871
+0 , 3861 , 97.14276
+0 , 4054.05 , 101.19681
+0 , 4247.1 , 105.25086
+0 , 4440.15 , 109.30491
+0 , 4633.2 , 113.35896
+0 , 4826.25 , 117.41301
+0 , 5019.3 , 121.46706
+0 , 5212.35 , 125.52111
+0 , 5405.4 , 129.57516
+0 , 5598.45 , 133.62921
+0 , 5791.5 , 137.68326
+0 , 5984.55 , 141.73731
+0 , 6177.6 , 145.79136
+40.80854701 , -6177.6 , 113.0123829
+40.80854701 , -5984.55 , 108.9583329
+40.80854701 , -5791.5 , 104.9042829
+40.80854701 , -5598.45 , 100.8502329
+40.80854701 , -5405.4 , 96.79618291
+40.80854701 , -5212.35 , 92.74213291
+40.80854701 , -5019.3 , 88.68808291
+40.80854701 , -4826.25 , 84.63403291
+40.80854701 , -4633.2 , 80.57998291
+40.80854701 , -4440.15 , 76.52593291
+40.80854701 , -4247.1 , 72.47188291
+40.80854701 , -4054.05 , 68.41783291
+40.80854701 , -3861 , 64.36378291
+40.80854701 , -3667.95 , 60.30973291
+40.80854701 , -3474.9 , 56.25568291
+40.80854701 , -3281.85 , 52.20163291
+40.80854701 , -3088.8 , 48.14758291
+40.80854701 , -2895.75 , 44.09353291
+40.80854701 , -2702.7 , 40.03948291
+40.80854701 , -2509.65 , 35.98543291
+40.80854701 , -2316.6 , 31.93138291
+40.80854701 , -2123.55 , 27.87733291
+40.80854701 , -1930.5 , 23.82328291
+40.80854701 , -1737.45 , 19.76923291
+40.80854701 , -1544.4 , 15.71518291
+40.80854701 , -1351.35 , 11.66113291
+40.80854701 , -1158.3 , 7.607082912
+40.80854701 , -965.25 , 3.553032912
+40.80854701 , -772.2 , 0.501017088
+40.80854701 , -579.15 , 4.555067088
+40.80854701 , -386.1 , 8.609117088
+40.80854701 , -193.05 , 12.66316709
+40.80854701 , 0 , 16.71721709
+40.80854701 , 193.05 , 20.77126709
+40.80854701 , 386.1 , 24.82531709
+40.80854701 , 579.15 , 28.87936709
+40.80854701 , 772.2 , 32.93341709
+40.80854701 , 965.25 , 36.98746709
+40.80854701 , 1158.3 , 41.04151709
+40.80854701 , 1351.35 , 45.09556709
+40.80854701 , 1544.4 , 49.14961709
+40.80854701 , 1737.45 , 53.20366709
+40.80854701 , 1930.5 , 57.25771709
+40.80854701 , 2123.55 , 61.31176709
+40.80854701 , 2316.6 , 65.36581709
+40.80854701 , 2509.65 , 69.41986709
+40.80854701 , 2702.7 , 73.47391709
+40.80854701 , 2895.75 , 77.52796709
+40.80854701 , 3088.8 , 81.58201709
+40.80854701 , 3281.85 , 85.63606709
+40.80854701 , 3474.9 , 89.69011709
+40.80854701 , 3667.95 , 93.74416709
+40.80854701 , 3861 , 97.79821709
+40.80854701 , 4054.05 , 101.8522671
+40.80854701 , 4247.1 , 105.9063171
+40.80854701 , 4440.15 , 109.9603671
+40.80854701 , 4633.2 , 114.0144171
+40.80854701 , 4826.25 , 118.0684671
+40.80854701 , 5019.3 , 122.1225171
+40.80854701 , 5212.35 , 126.1765671
+40.80854701 , 5405.4 , 130.2306171
+40.80854701 , 5598.45 , 134.2846671
+40.80854701 , 5791.5 , 138.3387171
+40.80854701 , 5984.55 , 142.3927671
+40.80854701 , 6177.6 , 146.4468171
+81.61794872 , -6177.6 , 112.3569121
+81.61794872 , -5984.55 , 108.3028621
+81.61794872 , -5791.5 , 104.2488121
+81.61794872 , -5598.45 , 100.1947621
+81.61794872 , -5405.4 , 96.1407121
+81.61794872 , -5212.35 , 92.0866621
+81.61794872 , -5019.3 , 88.0326121
+81.61794872 , -4826.25 , 83.9785621
+81.61794872 , -4633.2 , 79.9245121
+81.61794872 , -4440.15 , 75.8704621
+81.61794872 , -4247.1 , 71.8164121
+81.61794872 , -4054.05 , 67.7623621
+81.61794872 , -3861 , 63.7083121
+81.61794872 , -3667.95 , 59.6542621
+81.61794872 , -3474.9 , 55.6002121
+81.61794872 , -3281.85 , 51.5461621
+81.61794872 , -3088.8 , 47.4921121
+81.61794872 , -2895.75 , 43.4380621
+81.61794872 , -2702.7 , 39.3840121
+81.61794872 , -2509.65 , 35.3299621
+81.61794872 , -2316.6 , 31.2759121
+81.61794872 , -2123.55 , 27.2218621
+81.61794872 , -1930.5 , 23.1678121
+81.61794872 , -1737.45 , 19.1137621
+81.61794872 , -1544.4 , 15.0597121
+81.61794872 , -1351.35 , 11.0056621
+81.61794872 , -1158.3 , 6.951612096
+81.61794872 , -965.25 , 2.897562096
+81.61794872 , -772.2 , 1.156487904
+81.61794872 , -579.15 , 5.210537904
+81.61794872 , -386.1 , 9.264587904
+81.61794872 , -193.05 , 13.3186379
+81.61794872 , 0 , 17.3726879
+81.61794872 , 193.05 , 21.4267379
+81.61794872 , 386.1 , 25.4807879
+81.61794872 , 579.15 , 29.5348379
+81.61794872 , 772.2 , 33.5888879
+81.61794872 , 965.25 , 37.6429379
+81.61794872 , 1158.3 , 41.6969879
+81.61794872 , 1351.35 , 45.7510379
+81.61794872 , 1544.4 , 49.8050879
+81.61794872 , 1737.45 , 53.8591379
+81.61794872 , 1930.5 , 57.9131879
+81.61794872 , 2123.55 , 61.9672379
+81.61794872 , 2316.6 , 66.0212879
+81.61794872 , 2509.65 , 70.0753379
+81.61794872 , 2702.7 , 74.1293879
+81.61794872 , 2895.75 , 78.1834379
+81.61794872 , 3088.8 , 82.2374879
+81.61794872 , 3281.85 , 86.2915379
+81.61794872 , 3474.9 , 90.3455879
+81.61794872 , 3667.95 , 94.3996379
+81.61794872 , 3861 , 98.4536879
+81.61794872 , 4054.05 , 102.5077379
+81.61794872 , 4247.1 , 106.5617879
+81.61794872 , 4440.15 , 110.6158379
+81.61794872 , 4633.2 , 114.6698879
+81.61794872 , 4826.25 , 118.7239379
+81.61794872 , 5019.3 , 122.7779879
+81.61794872 , 5212.35 , 126.8320379
+81.61794872 , 5405.4 , 130.8860879
+81.61794872 , 5598.45 , 134.9401379
+81.61794872 , 5791.5 , 138.9941879
+81.61794872 , 5984.55 , 143.0482379
+81.61794872 , 6177.6 , 147.1022879
+122.4273504 , -6177.6 , 111.7014413
+122.4273504 , -5984.55 , 107.6473913
+122.4273504 , -5791.5 , 103.5933413
+122.4273504 , -5598.45 , 99.53929128
+122.4273504 , -5405.4 , 95.48524128
+122.4273504 , -5212.35 , 91.43119128
+122.4273504 , -5019.3 , 87.37714128
+122.4273504 , -4826.25 , 83.32309128
+122.4273504 , -4633.2 , 79.26904128
+122.4273504 , -4440.15 , 75.21499128
+122.4273504 , -4247.1 , 71.16094128
+122.4273504 , -4054.05 , 67.10689128
+122.4273504 , -3861 , 63.05284128
+122.4273504 , -3667.95 , 58.99879128
+122.4273504 , -3474.9 , 54.94474128
+122.4273504 , -3281.85 , 50.89069128
+122.4273504 , -3088.8 , 46.83664128
+122.4273504 , -2895.75 , 42.78259128
+122.4273504 , -2702.7 , 38.72854128
+122.4273504 , -2509.65 , 34.67449128
+122.4273504 , -2316.6 , 30.62044128
+122.4273504 , -2123.55 , 26.56639128
+122.4273504 , -1930.5 , 22.51234128
+122.4273504 , -1737.45 , 18.45829128
+122.4273504 , -1544.4 , 14.40424128
+122.4273504 , -1351.35 , 10.35019128
+122.4273504 , -1158.3 , 6.29614128
+122.4273504 , -965.25 , 2.24209128
+122.4273504 , -772.2 , 1.81195872
+122.4273504 , -579.15 , 5.86600872
+122.4273504 , -386.1 , 9.92005872
+122.4273504 , -193.05 , 13.97410872
+122.4273504 , 0 , 18.02815872
+122.4273504 , 193.05 , 22.08220872
+122.4273504 , 386.1 , 26.13625872
+122.4273504 , 579.15 , 30.19030872
+122.4273504 , 772.2 , 34.24435872
+122.4273504 , 965.25 , 38.29840872
+122.4273504 , 1158.3 , 42.35245872
+122.4273504 , 1351.35 , 46.40650872
+122.4273504 , 1544.4 , 50.46055872
+122.4273504 , 1737.45 , 54.51460872
+122.4273504 , 1930.5 , 58.56865872
+122.4273504 , 2123.55 , 62.62270872
+122.4273504 , 2316.6 , 66.67675872
+122.4273504 , 2509.65 , 70.73080872
+122.4273504 , 2702.7 , 74.78485872
+122.4273504 , 2895.75 , 78.83890872
+122.4273504 , 3088.8 , 82.89295872
+122.4273504 , 3281.85 , 86.94700872
+122.4273504 , 3474.9 , 91.00105872
+122.4273504 , 3667.95 , 95.05510872
+122.4273504 , 3861 , 99.10915872
+122.4273504 , 4054.05 , 103.1632087
+122.4273504 , 4247.1 , 107.2172587
+122.4273504 , 4440.15 , 111.2713087
+122.4273504 , 4633.2 , 115.3253587
+122.4273504 , 4826.25 , 119.3794087
+122.4273504 , 5019.3 , 123.4334587
+122.4273504 , 5212.35 , 127.4875087
+122.4273504 , 5405.4 , 131.5415587
+122.4273504 , 5598.45 , 135.5956087
+122.4273504 , 5791.5 , 139.6496587
+122.4273504 , 5984.55 , 143.7037087
+122.4273504 , 6177.6 , 147.7577587
+163.2393162 , -6177.6 , 111.0459293
+163.2393162 , -5984.55 , 106.9918793
+163.2393162 , -5791.5 , 102.9378293
+163.2393162 , -5598.45 , 98.88377928
+163.2393162 , -5405.4 , 94.82972928
+163.2393162 , -5212.35 , 90.77567928
+163.2393162 , -5019.3 , 86.72162928
+163.2393162 , -4826.25 , 82.66757928
+163.2393162 , -4633.2 , 78.61352928
+163.2393162 , -4440.15 , 74.55947928
+163.2393162 , -4247.1 , 70.50542928
+163.2393162 , -4054.05 , 66.45137928
+163.2393162 , -3861 , 62.39732928
+163.2393162 , -3667.95 , 58.34327928
+163.2393162 , -3474.9 , 54.28922928
+163.2393162 , -3281.85 , 50.23517928
+163.2393162 , -3088.8 , 46.18112928
+163.2393162 , -2895.75 , 42.12707928
+163.2393162 , -2702.7 , 38.07302928
+163.2393162 , -2509.65 , 34.01897928
+163.2393162 , -2316.6 , 29.96492928
+163.2393162 , -2123.55 , 25.91087928
+163.2393162 , -1930.5 , 21.85682928
+163.2393162 , -1737.45 , 17.80277928
+163.2393162 , -1544.4 , 13.74872928
+163.2393162 , -1351.35 , 9.694679281
+163.2393162 , -1158.3 , 5.640629281
+163.2393162 , -965.25 , 1.586579281
+163.2393162 , -772.2 , 2.467470719
+163.2393162 , -579.15 , 6.521520719
+163.2393162 , -386.1 , 10.57557072
+163.2393162 , -193.05 , 14.62962072
+163.2393162 , 0 , 18.68367072
+163.2393162 , 193.05 , 22.73772072
+163.2393162 , 386.1 , 26.79177072
+163.2393162 , 579.15 , 30.84582072
+163.2393162 , 772.2 , 34.89987072
+163.2393162 , 965.25 , 38.95392072
+163.2393162 , 1158.3 , 43.00797072
+163.2393162 , 1351.35 , 47.06202072
+163.2393162 , 1544.4 , 51.11607072
+163.2393162 , 1737.45 , 55.17012072
+163.2393162 , 1930.5 , 59.22417072
+163.2393162 , 2123.55 , 63.27822072
+163.2393162 , 2316.6 , 67.33227072
+163.2393162 , 2509.65 , 71.38632072
+163.2393162 , 2702.7 , 75.44037072
+163.2393162 , 2895.75 , 79.49442072
+163.2393162 , 3088.8 , 83.54847072
+163.2393162 , 3281.85 , 87.60252072
+163.2393162 , 3474.9 , 91.65657072
+163.2393162 , 3667.95 , 95.71062072
+163.2393162 , 3861 , 99.76467072
+163.2393162 , 4054.05 , 103.8187207
+163.2393162 , 4247.1 , 107.8727707
+163.2393162 , 4440.15 , 111.9268207
+163.2393162 , 4633.2 , 115.9808707
+163.2393162 , 4826.25 , 120.0349207
+163.2393162 , 5019.3 , 124.0889707
+163.2393162 , 5212.35 , 128.1430207
+163.2393162 , 5405.4 , 132.1970707
+163.2393162 , 5598.45 , 136.2511207
+163.2393162 , 5791.5 , 140.3051707
+163.2393162 , 5984.55 , 144.3592207
+163.2393162 , 6177.6 , 148.4132707
+204.042735 , -6177.6 , 110.3905546
+204.042735 , -5984.55 , 106.3365046
+204.042735 , -5791.5 , 102.2824546
+204.042735 , -5598.45 , 98.22840456
+204.042735 , -5405.4 , 94.17435456
+204.042735 , -5212.35 , 90.12030456
+204.042735 , -5019.3 , 86.06625456
+204.042735 , -4826.25 , 82.01220456
+204.042735 , -4633.2 , 77.95815456
+204.042735 , -4440.15 , 73.90410456
+204.042735 , -4247.1 , 69.85005456
+204.042735 , -4054.05 , 65.79600456
+204.042735 , -3861 , 61.74195456
+204.042735 , -3667.95 , 57.68790456
+204.042735 , -3474.9 , 53.63385456
+204.042735 , -3281.85 , 49.57980456
+204.042735 , -3088.8 , 45.52575456
+204.042735 , -2895.75 , 41.47170456
+204.042735 , -2702.7 , 37.41765456
+204.042735 , -2509.65 , 33.36360456
+204.042735 , -2316.6 , 29.30955456
+204.042735 , -2123.55 , 25.25550456
+204.042735 , -1930.5 , 21.20145456
+204.042735 , -1737.45 , 17.14740456
+204.042735 , -1544.4 , 13.09335456
+204.042735 , -1351.35 , 9.039304561
+204.042735 , -1158.3 , 4.985254561
+204.042735 , -965.25 , 0.931204561
+204.042735 , -772.2 , 3.122845439
+204.042735 , -579.15 , 7.176895439
+204.042735 , -386.1 , 11.23094544
+204.042735 , -193.05 , 15.28499544
+204.042735 , 0 , 19.33904544
+204.042735 , 193.05 , 23.39309544
+204.042735 , 386.1 , 27.44714544
+204.042735 , 579.15 , 31.50119544
+204.042735 , 772.2 , 35.55524544
+204.042735 , 965.25 , 39.60929544
+204.042735 , 1158.3 , 43.66334544
+204.042735 , 1351.35 , 47.71739544
+204.042735 , 1544.4 , 51.77144544
+204.042735 , 1737.45 , 55.82549544
+204.042735 , 1930.5 , 59.87954544
+204.042735 , 2123.55 , 63.93359544
+204.042735 , 2316.6 , 67.98764544
+204.042735 , 2509.65 , 72.04169544
+204.042735 , 2702.7 , 76.09574544
+204.042735 , 2895.75 , 80.14979544
+204.042735 , 3088.8 , 84.20384544
+204.042735 , 3281.85 , 88.25789544
+204.042735 , 3474.9 , 92.31194544
+204.042735 , 3667.95 , 96.36599544
+204.042735 , 3861 , 100.4200454
+204.042735 , 4054.05 , 104.4740954
+204.042735 , 4247.1 , 108.5281454
+204.042735 , 4440.15 , 112.5821954
+204.042735 , 4633.2 , 116.6362454
+204.042735 , 4826.25 , 120.6902954
+204.042735 , 5019.3 , 124.7443454
+204.042735 , 5212.35 , 128.7983954
+204.042735 , 5405.4 , 132.8524454
+204.042735 , 5598.45 , 136.9064954
+204.042735 , 5791.5 , 140.9605454
+204.042735 , 5984.55 , 145.0145954
+204.042735 , 6177.6 , 149.0686454
+244.8547009 , -6177.6 , 109.7350426
+244.8547009 , -5984.55 , 105.6809926
+244.8547009 , -5791.5 , 101.6269426
+244.8547009 , -5598.45 , 97.57289256
+244.8547009 , -5405.4 , 93.51884256
+244.8547009 , -5212.35 , 89.46479256
+244.8547009 , -5019.3 , 85.41074256
+244.8547009 , -4826.25 , 81.35669256
+244.8547009 , -4633.2 , 77.30264256
+244.8547009 , -4440.15 , 73.24859256
+244.8547009 , -4247.1 , 69.19454256
+244.8547009 , -4054.05 , 65.14049256
+244.8547009 , -3861 , 61.08644256
+244.8547009 , -3667.95 , 57.03239256
+244.8547009 , -3474.9 , 52.97834256
+244.8547009 , -3281.85 , 48.92429256
+244.8547009 , -3088.8 , 44.87024256
+244.8547009 , -2895.75 , 40.81619256
+244.8547009 , -2702.7 , 36.76214256
+244.8547009 , -2509.65 , 32.70809256
+244.8547009 , -2316.6 , 28.65404256
+244.8547009 , -2123.55 , 24.59999256
+244.8547009 , -1930.5 , 20.54594256
+244.8547009 , -1737.45 , 16.49189256
+244.8547009 , -1544.4 , 12.43784256
+244.8547009 , -1351.35 , 8.383792559
+244.8547009 , -1158.3 , 4.329742559
+244.8547009 , -965.25 , 0.275692559
+244.8547009 , -772.2 , 3.778357441
+244.8547009 , -579.15 , 7.832407441
+244.8547009 , -386.1 , 11.88645744
+244.8547009 , -193.05 , 15.94050744
+244.8547009 , 0 , 19.99455744
+244.8547009 , 193.05 , 24.04860744
+244.8547009 , 386.1 , 28.10265744
+244.8547009 , 579.15 , 32.15670744
+244.8547009 , 772.2 , 36.21075744
+244.8547009 , 965.25 , 40.26480744
+244.8547009 , 1158.3 , 44.31885744
+244.8547009 , 1351.35 , 48.37290744
+244.8547009 , 1544.4 , 52.42695744
+244.8547009 , 1737.45 , 56.48100744
+244.8547009 , 1930.5 , 60.53505744
+244.8547009 , 2123.55 , 64.58910744
+244.8547009 , 2316.6 , 68.64315744
+244.8547009 , 2509.65 , 72.69720744
+244.8547009 , 2702.7 , 76.75125744
+244.8547009 , 2895.75 , 80.80530744
+244.8547009 , 3088.8 , 84.85935744
+244.8547009 , 3281.85 , 88.91340744
+244.8547009 , 3474.9 , 92.96745744
+244.8547009 , 3667.95 , 97.02150744
+244.8547009 , 3861 , 101.0755574
+244.8547009 , 4054.05 , 105.1296074
+244.8547009 , 4247.1 , 109.1836574
+244.8547009 , 4440.15 , 113.2377074
+244.8547009 , 4633.2 , 117.2917574
+244.8547009 , 4826.25 , 121.3458074
+244.8547009 , 5019.3 , 125.3998574
+244.8547009 , 5212.35 , 129.4539074
+244.8547009 , 5405.4 , 133.5079574
+244.8547009 , 5598.45 , 137.5620074
+244.8547009 , 5791.5 , 141.6160574
+244.8547009 , 5984.55 , 145.6701074
+244.8547009 , 6177.6 , 149.7241574
+285.6666667 , -6177.6 , 109.0795306
+285.6666667 , -5984.55 , 105.0254806
+285.6666667 , -5791.5 , 100.9714306
+285.6666667 , -5598.45 , 96.91738056
+285.6666667 , -5405.4 , 92.86333056
+285.6666667 , -5212.35 , 88.80928056
+285.6666667 , -5019.3 , 84.75523056
+285.6666667 , -4826.25 , 80.70118056
+285.6666667 , -4633.2 , 76.64713056
+285.6666667 , -4440.15 , 72.59308056
+285.6666667 , -4247.1 , 68.53903056
+285.6666667 , -4054.05 , 64.48498056
+285.6666667 , -3861 , 60.43093056
+285.6666667 , -3667.95 , 56.37688056
+285.6666667 , -3474.9 , 52.32283056
+285.6666667 , -3281.85 , 48.26878056
+285.6666667 , -3088.8 , 44.21473056
+285.6666667 , -2895.75 , 40.16068056
+285.6666667 , -2702.7 , 36.10663056
+285.6666667 , -2509.65 , 32.05258056
+285.6666667 , -2316.6 , 27.99853056
+285.6666667 , -2123.55 , 23.94448056
+285.6666667 , -1930.5 , 19.89043056
+285.6666667 , -1737.45 , 15.83638056
+285.6666667 , -1544.4 , 11.78233056
+285.6666667 , -1351.35 , 7.728280559
+285.6666667 , -1158.3 , 3.674230559
+285.6666667 , -965.25 , 0.379819441
+285.6666667 , -772.2 , 4.433869441
+285.6666667 , -579.15 , 8.487919441
+285.6666667 , -386.1 , 12.54196944
+285.6666667 , -193.05 , 16.59601944
+285.6666667 , 0 , 20.65006944
+285.6666667 , 193.05 , 24.70411944
+285.6666667 , 386.1 , 28.75816944
+285.6666667 , 579.15 , 32.81221944
+285.6666667 , 772.2 , 36.86626944
+285.6666667 , 965.25 , 40.92031944
+285.6666667 , 1158.3 , 44.97436944
+285.6666667 , 1351.35 , 49.02841944
+285.6666667 , 1544.4 , 53.08246944
+285.6666667 , 1737.45 , 57.13651944
+285.6666667 , 1930.5 , 61.19056944
+285.6666667 , 2123.55 , 65.24461944
+285.6666667 , 2316.6 , 69.29866944
+285.6666667 , 2509.65 , 73.35271944
+285.6666667 , 2702.7 , 77.40676944
+285.6666667 , 2895.75 , 81.46081944
+285.6666667 , 3088.8 , 85.51486944
+285.6666667 , 3281.85 , 89.56891944
+285.6666667 , 3474.9 , 93.62296944
+285.6666667 , 3667.95 , 97.67701944
+285.6666667 , 3861 , 101.7310694
+285.6666667 , 4054.05 , 105.7851194
+285.6666667 , 4247.1 , 109.8391694
+285.6666667 , 4440.15 , 113.8932194
+285.6666667 , 4633.2 , 117.9472694
+285.6666667 , 4826.25 , 122.0013194
+285.6666667 , 5019.3 , 126.0553694
+285.6666667 , 5212.35 , 130.1094194
+285.6666667 , 5405.4 , 134.1634694
+285.6666667 , 5598.45 , 138.2175194
+285.6666667 , 5791.5 , 142.2715694
+285.6666667 , 5984.55 , 146.3256194
+285.6666667 , 6177.6 , 150.3796694
+326.4700855 , -6177.6 , 108.4241558
+326.4700855 , -5984.55 , 104.3701058
+326.4700855 , -5791.5 , 100.3160558
+326.4700855 , -5598.45 , 96.26200584
+326.4700855 , -5405.4 , 92.20795584
+326.4700855 , -5212.35 , 88.15390584
+326.4700855 , -5019.3 , 84.09985584
+326.4700855 , -4826.25 , 80.04580584
+326.4700855 , -4633.2 , 75.99175584
+326.4700855 , -4440.15 , 71.93770584
+326.4700855 , -4247.1 , 67.88365584
+326.4700855 , -4054.05 , 63.82960584
+326.4700855 , -3861 , 59.77555584
+326.4700855 , -3667.95 , 55.72150584
+326.4700855 , -3474.9 , 51.66745584
+326.4700855 , -3281.85 , 47.61340584
+326.4700855 , -3088.8 , 43.55935584
+326.4700855 , -2895.75 , 39.50530584
+326.4700855 , -2702.7 , 35.45125584
+326.4700855 , -2509.65 , 31.39720584
+326.4700855 , -2316.6 , 27.34315584
+326.4700855 , -2123.55 , 23.28910584
+326.4700855 , -1930.5 , 19.23505584
+326.4700855 , -1737.45 , 15.18100584
+326.4700855 , -1544.4 , 11.12695584
+326.4700855 , -1351.35 , 7.07290584
+326.4700855 , -1158.3 , 3.01885584
+326.4700855 , -965.25 , 1.03519416
+326.4700855 , -772.2 , 5.08924416
+326.4700855 , -579.15 , 9.14329416
+326.4700855 , -386.1 , 13.19734416
+326.4700855 , -193.05 , 17.25139416
+326.4700855 , 0 , 21.30544416
+326.4700855 , 193.05 , 25.35949416
+326.4700855 , 386.1 , 29.41354416
+326.4700855 , 579.15 , 33.46759416
+326.4700855 , 772.2 , 37.52164416
+326.4700855 , 965.25 , 41.57569416
+326.4700855 , 1158.3 , 45.62974416
+326.4700855 , 1351.35 , 49.68379416
+326.4700855 , 1544.4 , 53.73784416
+326.4700855 , 1737.45 , 57.79189416
+326.4700855 , 1930.5 , 61.84594416
+326.4700855 , 2123.55 , 65.89999416
+326.4700855 , 2316.6 , 69.95404416
+326.4700855 , 2509.65 , 74.00809416
+326.4700855 , 2702.7 , 78.06214416
+326.4700855 , 2895.75 , 82.11619416
+326.4700855 , 3088.8 , 86.17024416
+326.4700855 , 3281.85 , 90.22429416
+326.4700855 , 3474.9 , 94.27834416
+326.4700855 , 3667.95 , 98.33239416
+326.4700855 , 3861 , 102.3864442
+326.4700855 , 4054.05 , 106.4404942
+326.4700855 , 4247.1 , 110.4945442
+326.4700855 , 4440.15 , 114.5485942
+326.4700855 , 4633.2 , 118.6026442
+326.4700855 , 4826.25 , 122.6566942
+326.4700855 , 5019.3 , 126.7107442
+326.4700855 , 5212.35 , 130.7647942
+326.4700855 , 5405.4 , 134.8188442
+326.4700855 , 5598.45 , 138.8728942
+326.4700855 , 5791.5 , 142.9269442
+326.4700855 , 5984.55 , 146.9809942
+326.4700855 , 6177.6 , 151.0350442
+367.2820513 , -6177.6 , 107.7686438
+367.2820513 , -5984.55 , 103.7145938
+367.2820513 , -5791.5 , 99.66054384
+367.2820513 , -5598.45 , 95.60649384
+367.2820513 , -5405.4 , 91.55244384
+367.2820513 , -5212.35 , 87.49839384
+367.2820513 , -5019.3 , 83.44434384
+367.2820513 , -4826.25 , 79.39029384
+367.2820513 , -4633.2 , 75.33624384
+367.2820513 , -4440.15 , 71.28219384
+367.2820513 , -4247.1 , 67.22814384
+367.2820513 , -4054.05 , 63.17409384
+367.2820513 , -3861 , 59.12004384
+367.2820513 , -3667.95 , 55.06599384
+367.2820513 , -3474.9 , 51.01194384
+367.2820513 , -3281.85 , 46.95789384
+367.2820513 , -3088.8 , 42.90384384
+367.2820513 , -2895.75 , 38.84979384
+367.2820513 , -2702.7 , 34.79574384
+367.2820513 , -2509.65 , 30.74169384
+367.2820513 , -2316.6 , 26.68764384
+367.2820513 , -2123.55 , 22.63359384
+367.2820513 , -1930.5 , 18.57954384
+367.2820513 , -1737.45 , 14.52549384
+367.2820513 , -1544.4 , 10.47144384
+367.2820513 , -1351.35 , 6.41739384
+367.2820513 , -1158.3 , 2.36334384
+367.2820513 , -965.25 , 1.69070616
+367.2820513 , -772.2 , 5.74475616
+367.2820513 , -579.15 , 9.79880616
+367.2820513 , -386.1 , 13.85285616
+367.2820513 , -193.05 , 17.90690616
+367.2820513 , 0 , 21.96095616
+367.2820513 , 193.05 , 26.01500616
+367.2820513 , 386.1 , 30.06905616
+367.2820513 , 579.15 , 34.12310616
+367.2820513 , 772.2 , 38.17715616
+367.2820513 , 965.25 , 42.23120616
+367.2820513 , 1158.3 , 46.28525616
+367.2820513 , 1351.35 , 50.33930616
+367.2820513 , 1544.4 , 54.39335616
+367.2820513 , 1737.45 , 58.44740616
+367.2820513 , 1930.5 , 62.50145616
+367.2820513 , 2123.55 , 66.55550616
+367.2820513 , 2316.6 , 70.60955616
+367.2820513 , 2509.65 , 74.66360616
+367.2820513 , 2702.7 , 78.71765616
+367.2820513 , 2895.75 , 82.77170616
+367.2820513 , 3088.8 , 86.82575616
+367.2820513 , 3281.85 , 90.87980616
+367.2820513 , 3474.9 , 94.93385616
+367.2820513 , 3667.95 , 98.98790616
+367.2820513 , 3861 , 103.0419562
+367.2820513 , 4054.05 , 107.0960062
+367.2820513 , 4247.1 , 111.1500562
+367.2820513 , 4440.15 , 115.2041062
+367.2820513 , 4633.2 , 119.2581562
+367.2820513 , 4826.25 , 123.3122062
+367.2820513 , 5019.3 , 127.3662562
+367.2820513 , 5212.35 , 131.4203062
+367.2820513 , 5405.4 , 135.4743562
+367.2820513 , 5598.45 , 139.5284062
+367.2820513 , 5791.5 , 143.5824562
+367.2820513 , 5984.55 , 147.6365062
+367.2820513 , 6177.6 , 151.6905562
+408.0854701 , -6177.6 , 107.1132691
+408.0854701 , -5984.55 , 103.0592191
+408.0854701 , -5791.5 , 99.00516912
+408.0854701 , -5598.45 , 94.95111912
+408.0854701 , -5405.4 , 90.89706912
+408.0854701 , -5212.35 , 86.84301912
+408.0854701 , -5019.3 , 82.78896912
+408.0854701 , -4826.25 , 78.73491912
+408.0854701 , -4633.2 , 74.68086912
+408.0854701 , -4440.15 , 70.62681912
+408.0854701 , -4247.1 , 66.57276912
+408.0854701 , -4054.05 , 62.51871912
+408.0854701 , -3861 , 58.46466912
+408.0854701 , -3667.95 , 54.41061912
+408.0854701 , -3474.9 , 50.35656912
+408.0854701 , -3281.85 , 46.30251912
+408.0854701 , -3088.8 , 42.24846912
+408.0854701 , -2895.75 , 38.19441912
+408.0854701 , -2702.7 , 34.14036912
+408.0854701 , -2509.65 , 30.08631912
+408.0854701 , -2316.6 , 26.03226912
+408.0854701 , -2123.55 , 21.97821912
+408.0854701 , -1930.5 , 17.92416912
+408.0854701 , -1737.45 , 13.87011912
+408.0854701 , -1544.4 , 9.81606912
+408.0854701 , -1351.35 , 5.76201912
+408.0854701 , -1158.3 , 1.70796912
+408.0854701 , -965.25 , 2.34608088
+408.0854701 , -772.2 , 6.40013088
+408.0854701 , -579.15 , 10.45418088
+408.0854701 , -386.1 , 14.50823088
+408.0854701 , -193.05 , 18.56228088
+408.0854701 , 0 , 22.61633088
+408.0854701 , 193.05 , 26.67038088
+408.0854701 , 386.1 , 30.72443088
+408.0854701 , 579.15 , 34.77848088
+408.0854701 , 772.2 , 38.83253088
+408.0854701 , 965.25 , 42.88658088
+408.0854701 , 1158.3 , 46.94063088
+408.0854701 , 1351.35 , 50.99468088
+408.0854701 , 1544.4 , 55.04873088
+408.0854701 , 1737.45 , 59.10278088
+408.0854701 , 1930.5 , 63.15683088
+408.0854701 , 2123.55 , 67.21088088
+408.0854701 , 2316.6 , 71.26493088
+408.0854701 , 2509.65 , 75.31898088
+408.0854701 , 2702.7 , 79.37303088
+408.0854701 , 2895.75 , 83.42708088
+408.0854701 , 3088.8 , 87.48113088
+408.0854701 , 3281.85 , 91.53518088
+408.0854701 , 3474.9 , 95.58923088
+408.0854701 , 3667.95 , 99.64328088
+408.0854701 , 3861 , 103.6973309
+408.0854701 , 4054.05 , 107.7513809
+408.0854701 , 4247.1 , 111.8054309
+408.0854701 , 4440.15 , 115.8594809
+408.0854701 , 4633.2 , 119.9135309
+408.0854701 , 4826.25 , 123.9675809
+408.0854701 , 5019.3 , 128.0216309
+408.0854701 , 5212.35 , 132.0756809
+408.0854701 , 5405.4 , 136.1297309
+408.0854701 , 5598.45 , 140.1837809
+408.0854701 , 5791.5 , 144.2378309
+408.0854701 , 5984.55 , 148.2918809
+408.0854701 , 6177.6 , 152.3459309
+448.8974359 , -6177.6 , 106.4577571
+448.8974359 , -5984.55 , 102.4037071
+448.8974359 , -5791.5 , 98.34965712
+448.8974359 , -5598.45 , 94.29560712
+448.8974359 , -5405.4 , 90.24155712
+448.8974359 , -5212.35 , 86.18750712
+448.8974359 , -5019.3 , 82.13345712
+448.8974359 , -4826.25 , 78.07940712
+448.8974359 , -4633.2 , 74.02535712
+448.8974359 , -4440.15 , 69.97130712
+448.8974359 , -4247.1 , 65.91725712
+448.8974359 , -4054.05 , 61.86320712
+448.8974359 , -3861 , 57.80915712
+448.8974359 , -3667.95 , 53.75510712
+448.8974359 , -3474.9 , 49.70105712
+448.8974359 , -3281.85 , 45.64700712
+448.8974359 , -3088.8 , 41.59295712
+448.8974359 , -2895.75 , 37.53890712
+448.8974359 , -2702.7 , 33.48485712
+448.8974359 , -2509.65 , 29.43080712
+448.8974359 , -2316.6 , 25.37675712
+448.8974359 , -2123.55 , 21.32270712
+448.8974359 , -1930.5 , 17.26865712
+448.8974359 , -1737.45 , 13.21460712
+448.8974359 , -1544.4 , 9.16055712
+448.8974359 , -1351.35 , 5.10650712
+448.8974359 , -1158.3 , 1.05245712
+448.8974359 , -965.25 , 3.00159288
+448.8974359 , -772.2 , 7.05564288
+448.8974359 , -579.15 , 11.10969288
+448.8974359 , -386.1 , 15.16374288
+448.8974359 , -193.05 , 19.21779288
+448.8974359 , 0 , 23.27184288
+448.8974359 , 193.05 , 27.32589288
+448.8974359 , 386.1 , 31.37994288
+448.8974359 , 579.15 , 35.43399288
+448.8974359 , 772.2 , 39.48804288
+448.8974359 , 965.25 , 43.54209288
+448.8974359 , 1158.3 , 47.59614288
+448.8974359 , 1351.35 , 51.65019288
+448.8974359 , 1544.4 , 55.70424288
+448.8974359 , 1737.45 , 59.75829288
+448.8974359 , 1930.5 , 63.81234288
+448.8974359 , 2123.55 , 67.86639288
+448.8974359 , 2316.6 , 71.92044288
+448.8974359 , 2509.65 , 75.97449288
+448.8974359 , 2702.7 , 80.02854288
+448.8974359 , 2895.75 , 84.08259288
+448.8974359 , 3088.8 , 88.13664288
+448.8974359 , 3281.85 , 92.19069288
+448.8974359 , 3474.9 , 96.24474288
+448.8974359 , 3667.95 , 100.2987929
+448.8974359 , 3861 , 104.3528429
+448.8974359 , 4054.05 , 108.4068929
+448.8974359 , 4247.1 , 112.4609429
+448.8974359 , 4440.15 , 116.5149929
+448.8974359 , 4633.2 , 120.5690429
+448.8974359 , 4826.25 , 124.6230929
+448.8974359 , 5019.3 , 128.6771429
+448.8974359 , 5212.35 , 132.7311929
+448.8974359 , 5405.4 , 136.7852429
+448.8974359 , 5598.45 , 140.8392929
+448.8974359 , 5791.5 , 144.8933429
+448.8974359 , 5984.55 , 148.9473929
+448.8974359 , 6177.6 , 153.0014429
+489.7094017 , -6177.6 , 105.8022451
+489.7094017 , -5984.55 , 101.7481951
+489.7094017 , -5791.5 , 97.69414512
+489.7094017 , -5598.45 , 93.64009512
+489.7094017 , -5405.4 , 89.58604512
+489.7094017 , -5212.35 , 85.53199512
+489.7094017 , -5019.3 , 81.47794512
+489.7094017 , -4826.25 , 77.42389512
+489.7094017 , -4633.2 , 73.36984512
+489.7094017 , -4440.15 , 69.31579512
+489.7094017 , -4247.1 , 65.26174512
+489.7094017 , -4054.05 , 61.20769512
+489.7094017 , -3861 , 57.15364512
+489.7094017 , -3667.95 , 53.09959512
+489.7094017 , -3474.9 , 49.04554512
+489.7094017 , -3281.85 , 44.99149512
+489.7094017 , -3088.8 , 40.93744512
+489.7094017 , -2895.75 , 36.88339512
+489.7094017 , -2702.7 , 32.82934512
+489.7094017 , -2509.65 , 28.77529512
+489.7094017 , -2316.6 , 24.72124512
+489.7094017 , -2123.55 , 20.66719512
+489.7094017 , -1930.5 , 16.61314512
+489.7094017 , -1737.45 , 12.55909512
+489.7094017 , -1544.4 , 8.50504512
+489.7094017 , -1351.35 , 4.45099512
+489.7094017 , -1158.3 , 0.39694512
+489.7094017 , -965.25 , 3.65710488
+489.7094017 , -772.2 , 7.71115488
+489.7094017 , -579.15 , 11.76520488
+489.7094017 , -386.1 , 15.81925488
+489.7094017 , -193.05 , 19.87330488
+489.7094017 , 0 , 23.92735488
+489.7094017 , 193.05 , 27.98140488
+489.7094017 , 386.1 , 32.03545488
+489.7094017 , 579.15 , 36.08950488
+489.7094017 , 772.2 , 40.14355488
+489.7094017 , 965.25 , 44.19760488
+489.7094017 , 1158.3 , 48.25165488
+489.7094017 , 1351.35 , 52.30570488
+489.7094017 , 1544.4 , 56.35975488
+489.7094017 , 1737.45 , 60.41380488
+489.7094017 , 1930.5 , 64.46785488
+489.7094017 , 2123.55 , 68.52190488
+489.7094017 , 2316.6 , 72.57595488
+489.7094017 , 2509.65 , 76.63000488
+489.7094017 , 2702.7 , 80.68405488
+489.7094017 , 2895.75 , 84.73810488
+489.7094017 , 3088.8 , 88.79215488
+489.7094017 , 3281.85 , 92.84620488
+489.7094017 , 3474.9 , 96.90025488
+489.7094017 , 3667.95 , 100.9543049
+489.7094017 , 3861 , 105.0083549
+489.7094017 , 4054.05 , 109.0624049
+489.7094017 , 4247.1 , 113.1164549
+489.7094017 , 4440.15 , 117.1705049
+489.7094017 , 4633.2 , 121.2245549
+489.7094017 , 4826.25 , 125.2786049
+489.7094017 , 5019.3 , 129.3326549
+489.7094017 , 5212.35 , 133.3867049
+489.7094017 , 5405.4 , 137.4407549
+489.7094017 , 5598.45 , 141.4948049
+489.7094017 , 5791.5 , 145.5488549
+489.7094017 , 5984.55 , 149.6029049
+489.7094017 , 6177.6 , 153.6569549
+816.1794872 , -6177.6 , 100.558561
+816.1794872 , -5984.55 , 96.50451096
+816.1794872 , -5791.5 , 92.45046096
+816.1794872 , -5598.45 , 88.39641096
+816.1794872 , -5405.4 , 84.34236096
+816.1794872 , -5212.35 , 80.28831096
+816.1794872 , -5019.3 , 76.23426096
+816.1794872 , -4826.25 , 72.18021096
+816.1794872 , -4633.2 , 68.12616096
+816.1794872 , -4440.15 , 64.07211096
+816.1794872 , -4247.1 , 60.01806096
+816.1794872 , -4054.05 , 55.96401096
+816.1794872 , -3861 , 51.90996096
+816.1794872 , -3667.95 , 47.85591096
+816.1794872 , -3474.9 , 43.80186096
+816.1794872 , -3281.85 , 39.74781096
+816.1794872 , -3088.8 , 35.69376096
+816.1794872 , -2895.75 , 31.63971096
+816.1794872 , -2702.7 , 27.58566096
+816.1794872 , -2509.65 , 23.53161096
+816.1794872 , -2316.6 , 19.47756096
+816.1794872 , -2123.55 , 15.42351096
+816.1794872 , -1930.5 , 11.36946096
+816.1794872 , -1737.45 , 7.31541096
+816.1794872 , -1544.4 , 3.26136096
+816.1794872 , -1351.35 , 0.79268904
+816.1794872 , -1158.3 , 4.84673904
+816.1794872 , -965.25 , 8.90078904
+816.1794872 , -772.2 , 12.95483904
+816.1794872 , -579.15 , 17.00888904
+816.1794872 , -386.1 , 21.06293904
+816.1794872 , -193.05 , 25.11698904
+816.1794872 , 0 , 29.17103904
+816.1794872 , 193.05 , 33.22508904
+816.1794872 , 386.1 , 37.27913904
+816.1794872 , 579.15 , 41.33318904
+816.1794872 , 772.2 , 45.38723904
+816.1794872 , 965.25 , 49.44128904
+816.1794872 , 1158.3 , 53.49533904
+816.1794872 , 1351.35 , 57.54938904
+816.1794872 , 1544.4 , 61.60343904
+816.1794872 , 1737.45 , 65.65748904
+816.1794872 , 1930.5 , 69.71153904
+816.1794872 , 2123.55 , 73.76558904
+816.1794872 , 2316.6 , 77.81963904
+816.1794872 , 2509.65 , 81.87368904
+816.1794872 , 2702.7 , 85.92773904
+816.1794872 , 2895.75 , 89.98178904
+816.1794872 , 3088.8 , 94.03583904
+816.1794872 , 3281.85 , 98.08988904
+816.1794872 , 3474.9 , 102.143939
+816.1794872 , 3667.95 , 106.197989
+816.1794872 , 3861 , 110.252039
+816.1794872 , 4054.05 , 114.306089
+816.1794872 , 4247.1 , 118.360139
+816.1794872 , 4440.15 , 122.414189
+816.1794872 , 4633.2 , 126.468239
+816.1794872 , 4826.25 , 130.522289
+816.1794872 , 5019.3 , 134.576339
+816.1794872 , 5212.35 , 138.630389
+816.1794872 , 5405.4 , 142.684439
+816.1794872 , 5598.45 , 146.738489
+816.1794872 , 5791.5 , 150.792539
+816.1794872 , 5984.55 , 154.846589
+816.1794872 , 6177.6 , 158.900639
+1020.25641 , -6177.6 , 97.2807264
+1020.25641 , -5984.55 , 93.2266764
+1020.25641 , -5791.5 , 89.1726264
+1020.25641 , -5598.45 , 85.1185764
+1020.25641 , -5405.4 , 81.0645264
+1020.25641 , -5212.35 , 77.0104764
+1020.25641 , -5019.3 , 72.9564264
+1020.25641 , -4826.25 , 68.9023764
+1020.25641 , -4633.2 , 64.8483264
+1020.25641 , -4440.15 , 60.7942764
+1020.25641 , -4247.1 , 56.7402264
+1020.25641 , -4054.05 , 52.6861764
+1020.25641 , -3861 , 48.6321264
+1020.25641 , -3667.95 , 44.5780764
+1020.25641 , -3474.9 , 40.5240264
+1020.25641 , -3281.85 , 36.4699764
+1020.25641 , -3088.8 , 32.4159264
+1020.25641 , -2895.75 , 28.3618764
+1020.25641 , -2702.7 , 24.3078264
+1020.25641 , -2509.65 , 20.2537764
+1020.25641 , -2316.6 , 16.1997264
+1020.25641 , -2123.55 , 12.1456764
+1020.25641 , -1930.5 , 8.091626404
+1020.25641 , -1737.45 , 4.037576404
+1020.25641 , -1544.4 , 0.016473596
+1020.25641 , -1351.35 , 4.070523596
+1020.25641 , -1158.3 , 8.124573596
+1020.25641 , -965.25 , 12.1786236
+1020.25641 , -772.2 , 16.2326736
+1020.25641 , -579.15 , 20.2867236
+1020.25641 , -386.1 , 24.3407736
+1020.25641 , -193.05 , 28.3948236
+1020.25641 , 0 , 32.4488736
+1020.25641 , 193.05 , 36.5029236
+1020.25641 , 386.1 , 40.5569736
+1020.25641 , 579.15 , 44.6110236
+1020.25641 , 772.2 , 48.6650736
+1020.25641 , 965.25 , 52.7191236
+1020.25641 , 1158.3 , 56.7731736
+1020.25641 , 1351.35 , 60.8272236
+1020.25641 , 1544.4 , 64.8812736
+1020.25641 , 1737.45 , 68.9353236
+1020.25641 , 1930.5 , 72.9893736
+1020.25641 , 2123.55 , 77.0434236
+1020.25641 , 2316.6 , 81.0974736
+1020.25641 , 2509.65 , 85.1515236
+1020.25641 , 2702.7 , 89.2055736
+1020.25641 , 2895.75 , 93.2596236
+1020.25641 , 3088.8 , 97.3136736
+1020.25641 , 3281.85 , 101.3677236
+1020.25641 , 3474.9 , 105.4217736
+1020.25641 , 3667.95 , 109.4758236
+1020.25641 , 3861 , 113.5298736
+1020.25641 , 4054.05 , 117.5839236
+1020.25641 , 4247.1 , 121.6379736
+1020.25641 , 4440.15 , 125.6920236
+1020.25641 , 4633.2 , 129.7460736
+1020.25641 , 4826.25 , 133.8001236
+1020.25641 , 5019.3 , 137.8541736
+1020.25641 , 5212.35 , 141.9082236
+1020.25641 , 5405.4 , 145.9622736
+1020.25641 , 5598.45 , 150.0163236
+1020.25641 , 5791.5 , 154.0703736
+1020.25641 , 5984.55 , 158.1244236
+1020.25641 , 6177.6 , 162.1784736
+1224.273504 , -6177.6 , 94.0038528
+1224.273504 , -5984.55 , 89.9498028
+1224.273504 , -5791.5 , 85.8957528
+1224.273504 , -5598.45 , 81.8417028
+1224.273504 , -5405.4 , 77.7876528
+1224.273504 , -5212.35 , 73.7336028
+1224.273504 , -5019.3 , 69.6795528
+1224.273504 , -4826.25 , 65.6255028
+1224.273504 , -4633.2 , 61.5714528
+1224.273504 , -4440.15 , 57.5174028
+1224.273504 , -4247.1 , 53.4633528
+1224.273504 , -4054.05 , 49.4093028
+1224.273504 , -3861 , 45.3552528
+1224.273504 , -3667.95 , 41.3012028
+1224.273504 , -3474.9 , 37.2471528
+1224.273504 , -3281.85 , 33.1931028
+1224.273504 , -3088.8 , 29.1390528
+1224.273504 , -2895.75 , 25.0850028
+1224.273504 , -2702.7 , 21.0309528
+1224.273504 , -2509.65 , 16.9769028
+1224.273504 , -2316.6 , 12.9228528
+1224.273504 , -2123.55 , 8.868802804
+1224.273504 , -1930.5 , 4.814752804
+1224.273504 , -1737.45 , 0.760702804
+1224.273504 , -1544.4 , 3.293347196
+1224.273504 , -1351.35 , 7.347397196
+1224.273504 , -1158.3 , 11.4014472
+1224.273504 , -965.25 , 15.4554972
+1224.273504 , -772.2 , 19.5095472
+1224.273504 , -579.15 , 23.5635972
+1224.273504 , -386.1 , 27.6176472
+1224.273504 , -193.05 , 31.6716972
+1224.273504 , 0 , 35.7257472
+1224.273504 , 193.05 , 39.7797972
+1224.273504 , 386.1 , 43.8338472
+1224.273504 , 579.15 , 47.8878972
+1224.273504 , 772.2 , 51.9419472
+1224.273504 , 965.25 , 55.9959972
+1224.273504 , 1158.3 , 60.0500472
+1224.273504 , 1351.35 , 64.1040972
+1224.273504 , 1544.4 , 68.1581472
+1224.273504 , 1737.45 , 72.2121972
+1224.273504 , 1930.5 , 76.2662472
+1224.273504 , 2123.55 , 80.3202972
+1224.273504 , 2316.6 , 84.3743472
+1224.273504 , 2509.65 , 88.4283972
+1224.273504 , 2702.7 , 92.4824472
+1224.273504 , 2895.75 , 96.5364972
+1224.273504 , 3088.8 , 100.5905472
+1224.273504 , 3281.85 , 104.6445972
+1224.273504 , 3474.9 , 108.6986472
+1224.273504 , 3667.95 , 112.7526972
+1224.273504 , 3861 , 116.8067472
+1224.273504 , 4054.05 , 120.8607972
+1224.273504 , 4247.1 , 124.9148472
+1224.273504 , 4440.15 , 128.9688972
+1224.273504 , 4633.2 , 133.0229472
+1224.273504 , 4826.25 , 137.0769972
+1224.273504 , 5019.3 , 141.1310472
+1224.273504 , 5212.35 , 145.1850972
+1224.273504 , 5405.4 , 149.2391472
+1224.273504 , 5598.45 , 153.2931972
+1224.273504 , 5791.5 , 157.3472472
+1224.273504 , 5984.55 , 161.4012972
+1224.273504 , 6177.6 , 165.4553472
+1428.290598 , -6177.6 , 90.7269792
+1428.290598 , -5984.55 , 86.6729292
+1428.290598 , -5791.5 , 82.6188792
+1428.290598 , -5598.45 , 78.5648292
+1428.290598 , -5405.4 , 74.5107792
+1428.290598 , -5212.35 , 70.4567292
+1428.290598 , -5019.3 , 66.4026792
+1428.290598 , -4826.25 , 62.3486292
+1428.290598 , -4633.2 , 58.2945792
+1428.290598 , -4440.15 , 54.2405292
+1428.290598 , -4247.1 , 50.1864792
+1428.290598 , -4054.05 , 46.1324292
+1428.290598 , -3861 , 42.0783792
+1428.290598 , -3667.95 , 38.0243292
+1428.290598 , -3474.9 , 33.9702792
+1428.290598 , -3281.85 , 29.9162292
+1428.290598 , -3088.8 , 25.8621792
+1428.290598 , -2895.75 , 21.8081292
+1428.290598 , -2702.7 , 17.7540792
+1428.290598 , -2509.65 , 13.7000292
+1428.290598 , -2316.6 , 9.645979205
+1428.290598 , -2123.55 , 5.591929205
+1428.290598 , -1930.5 , 1.537879205
+1428.290598 , -1737.45 , 2.516170795
+1428.290598 , -1544.4 , 6.570220795
+1428.290598 , -1351.35 , 10.6242708
+1428.290598 , -1158.3 , 14.6783208
+1428.290598 , -965.25 , 18.7323708
+1428.290598 , -772.2 , 22.7864208
+1428.290598 , -579.15 , 26.8404708
+1428.290598 , -386.1 , 30.8945208
+1428.290598 , -193.05 , 34.9485708
+1428.290598 , 0 , 39.0026208
+1428.290598 , 193.05 , 43.0566708
+1428.290598 , 386.1 , 47.1107208
+1428.290598 , 579.15 , 51.1647708
+1428.290598 , 772.2 , 55.2188208
+1428.290598 , 965.25 , 59.2728708
+1428.290598 , 1158.3 , 63.3269208
+1428.290598 , 1351.35 , 67.3809708
+1428.290598 , 1544.4 , 71.4350208
+1428.290598 , 1737.45 , 75.4890708
+1428.290598 , 1930.5 , 79.5431208
+1428.290598 , 2123.55 , 83.5971708
+1428.290598 , 2316.6 , 87.6512208
+1428.290598 , 2509.65 , 91.7052708
+1428.290598 , 2702.7 , 95.7593208
+1428.290598 , 2895.75 , 99.8133708
+1428.290598 , 3088.8 , 103.8674208
+1428.290598 , 3281.85 , 107.9214708
+1428.290598 , 3474.9 , 111.9755208
+1428.290598 , 3667.95 , 116.0295708
+1428.290598 , 3861 , 120.0836208
+1428.290598 , 4054.05 , 124.1376708
+1428.290598 , 4247.1 , 128.1917208
+1428.290598 , 4440.15 , 132.2457708
+1428.290598 , 4633.2 , 136.2998208
+1428.290598 , 4826.25 , 140.3538708
+1428.290598 , 5019.3 , 144.4079208
+1428.290598 , 5212.35 , 148.4619708
+1428.290598 , 5405.4 , 152.5160208
+1428.290598 , 5598.45 , 156.5700708
+1428.290598 , 5791.5 , 160.6241208
+1428.290598 , 5984.55 , 164.6781708
+1428.290598 , 6177.6 , 168.7322208
+1632.393162 , -6177.6 , 87.44873281
+1632.393162 , -5984.55 , 83.39468281
+1632.393162 , -5791.5 , 79.34063281
+1632.393162 , -5598.45 , 75.28658281
+1632.393162 , -5405.4 , 71.23253281
+1632.393162 , -5212.35 , 67.17848281
+1632.393162 , -5019.3 , 63.12443281
+1632.393162 , -4826.25 , 59.07038281
+1632.393162 , -4633.2 , 55.01633281
+1632.393162 , -4440.15 , 50.96228281
+1632.393162 , -4247.1 , 46.90823281
+1632.393162 , -4054.05 , 42.85418281
+1632.393162 , -3861 , 38.80013281
+1632.393162 , -3667.95 , 34.74608281
+1632.393162 , -3474.9 , 30.69203281
+1632.393162 , -3281.85 , 26.63798281
+1632.393162 , -3088.8 , 22.58393281
+1632.393162 , -2895.75 , 18.52988281
+1632.393162 , -2702.7 , 14.47583281
+1632.393162 , -2509.65 , 10.42178281
+1632.393162 , -2316.6 , 6.367732806
+1632.393162 , -2123.55 , 2.313682806
+1632.393162 , -1930.5 , 1.740367194
+1632.393162 , -1737.45 , 5.794417194
+1632.393162 , -1544.4 , 9.848467194
+1632.393162 , -1351.35 , 13.90251719
+1632.393162 , -1158.3 , 17.95656719
+1632.393162 , -965.25 , 22.01061719
+1632.393162 , -772.2 , 26.06466719
+1632.393162 , -579.15 , 30.11871719
+1632.393162 , -386.1 , 34.17276719
+1632.393162 , -193.05 , 38.22681719
+1632.393162 , 0 , 42.28086719
+1632.393162 , 193.05 , 46.33491719
+1632.393162 , 386.1 , 50.38896719
+1632.393162 , 579.15 , 54.44301719
+1632.393162 , 772.2 , 58.49706719
+1632.393162 , 965.25 , 62.55111719
+1632.393162 , 1158.3 , 66.60516719
+1632.393162 , 1351.35 , 70.65921719
+1632.393162 , 1544.4 , 74.71326719
+1632.393162 , 1737.45 , 78.76731719
+1632.393162 , 1930.5 , 82.82136719
+1632.393162 , 2123.55 , 86.87541719
+1632.393162 , 2316.6 , 90.92946719
+1632.393162 , 2509.65 , 94.98351719
+1632.393162 , 2702.7 , 99.03756719
+1632.393162 , 2895.75 , 103.0916172
+1632.393162 , 3088.8 , 107.1456672
+1632.393162 , 3281.85 , 111.1997172
+1632.393162 , 3474.9 , 115.2537672
+1632.393162 , 3667.95 , 119.3078172
+1632.393162 , 3861 , 123.3618672
+1632.393162 , 4054.05 , 127.4159172
+1632.393162 , 4247.1 , 131.4699672
+1632.393162 , 4440.15 , 135.5240172
+1632.393162 , 4633.2 , 139.5780672
+1632.393162 , 4826.25 , 143.6321172
+1632.393162 , 5019.3 , 147.6861672
+1632.393162 , 5212.35 , 151.7402172
+1632.393162 , 5405.4 , 155.7942672
+1632.393162 , 5598.45 , 159.8483172
+1632.393162 , 5791.5 , 163.9023672
+1632.393162 , 5984.55 , 167.9564172
+1632.393162 , 6177.6 , 172.0104672
+1836.410256 , -6177.6 , 84.17185921
+1836.410256 , -5984.55 , 80.11780921
+1836.410256 , -5791.5 , 76.06375921
+1836.410256 , -5598.45 , 72.00970921
+1836.410256 , -5405.4 , 67.95565921
+1836.410256 , -5212.35 , 63.90160921
+1836.410256 , -5019.3 , 59.84755921
+1836.410256 , -4826.25 , 55.79350921
+1836.410256 , -4633.2 , 51.73945921
+1836.410256 , -4440.15 , 47.68540921
+1836.410256 , -4247.1 , 43.63135921
+1836.410256 , -4054.05 , 39.57730921
+1836.410256 , -3861 , 35.52325921
+1836.410256 , -3667.95 , 31.46920921
+1836.410256 , -3474.9 , 27.41515921
+1836.410256 , -3281.85 , 23.36110921
+1836.410256 , -3088.8 , 19.30705921
+1836.410256 , -2895.75 , 15.25300921
+1836.410256 , -2702.7 , 11.19895921
+1836.410256 , -2509.65 , 7.144909207
+1836.410256 , -2316.6 , 3.090859207
+1836.410256 , -2123.55 , 0.963190793
+1836.410256 , -1930.5 , 5.017240793
+1836.410256 , -1737.45 , 9.071290793
+1836.410256 , -1544.4 , 13.12534079
+1836.410256 , -1351.35 , 17.17939079
+1836.410256 , -1158.3 , 21.23344079
+1836.410256 , -965.25 , 25.28749079
+1836.410256 , -772.2 , 29.34154079
+1836.410256 , -579.15 , 33.39559079
+1836.410256 , -386.1 , 37.44964079
+1836.410256 , -193.05 , 41.50369079
+1836.410256 , 0 , 45.55774079
+1836.410256 , 193.05 , 49.61179079
+1836.410256 , 386.1 , 53.66584079
+1836.410256 , 579.15 , 57.71989079
+1836.410256 , 772.2 , 61.77394079
+1836.410256 , 965.25 , 65.82799079
+1836.410256 , 1158.3 , 69.88204079
+1836.410256 , 1351.35 , 73.93609079
+1836.410256 , 1544.4 , 77.99014079
+1836.410256 , 1737.45 , 82.04419079
+1836.410256 , 1930.5 , 86.09824079
+1836.410256 , 2123.55 , 90.15229079
+1836.410256 , 2316.6 , 94.20634079
+1836.410256 , 2509.65 , 98.26039079
+1836.410256 , 2702.7 , 102.3144408
+1836.410256 , 2895.75 , 106.3684908
+1836.410256 , 3088.8 , 110.4225408
+1836.410256 , 3281.85 , 114.4765908
+1836.410256 , 3474.9 , 118.5306408
+1836.410256 , 3667.95 , 122.5846908
+1836.410256 , 3861 , 126.6387408
+1836.410256 , 4054.05 , 130.6927908
+1836.410256 , 4247.1 , 134.7468408
+1836.410256 , 4440.15 , 138.8008908
+1836.410256 , 4633.2 , 142.8549408
+1836.410256 , 4826.25 , 146.9089908
+1836.410256 , 5019.3 , 150.9630408
+1836.410256 , 5212.35 , 155.0170908
+1836.410256 , 5405.4 , 159.0711408
+1836.410256 , 5598.45 , 163.1251908
+1836.410256 , 5791.5 , 167.1792408
+1836.410256 , 5984.55 , 171.2332908
+1836.410256 , 6177.6 , 175.2873408
+2040.42735 , -6177.6 , 80.89498561
+2040.42735 , -5984.55 , 76.84093561
+2040.42735 , -5791.5 , 72.78688561
+2040.42735 , -5598.45 , 68.73283561
+2040.42735 , -5405.4 , 64.67878561
+2040.42735 , -5212.35 , 60.62473561
+2040.42735 , -5019.3 , 56.57068561
+2040.42735 , -4826.25 , 52.51663561
+2040.42735 , -4633.2 , 48.46258561
+2040.42735 , -4440.15 , 44.40853561
+2040.42735 , -4247.1 , 40.35448561
+2040.42735 , -4054.05 , 36.30043561
+2040.42735 , -3861 , 32.24638561
+2040.42735 , -3667.95 , 28.19233561
+2040.42735 , -3474.9 , 24.13828561
+2040.42735 , -3281.85 , 20.08423561
+2040.42735 , -3088.8 , 16.03018561
+2040.42735 , -2895.75 , 11.97613561
+2040.42735 , -2702.7 , 7.922085607
+2040.42735 , -2509.65 , 3.868035607
+2040.42735 , -2316.6 , 0.186014393
+2040.42735 , -2123.55 , 4.240064393
+2040.42735 , -1930.5 , 8.294114393
+2040.42735 , -1737.45 , 12.34816439
+2040.42735 , -1544.4 , 16.40221439
+2040.42735 , -1351.35 , 20.45626439
+2040.42735 , -1158.3 , 24.51031439
+2040.42735 , -965.25 , 28.56436439
+2040.42735 , -772.2 , 32.61841439
+2040.42735 , -579.15 , 36.67246439
+2040.42735 , -386.1 , 40.72651439
+2040.42735 , -193.05 , 44.78056439
+2040.42735 , 0 , 48.83461439
+2040.42735 , 193.05 , 52.88866439
+2040.42735 , 386.1 , 56.94271439
+2040.42735 , 579.15 , 60.99676439
+2040.42735 , 772.2 , 65.05081439
+2040.42735 , 965.25 , 69.10486439
+2040.42735 , 1158.3 , 73.15891439
+2040.42735 , 1351.35 , 77.21296439
+2040.42735 , 1544.4 , 81.26701439
+2040.42735 , 1737.45 , 85.32106439
+2040.42735 , 1930.5 , 89.37511439
+2040.42735 , 2123.55 , 93.42916439
+2040.42735 , 2316.6 , 97.48321439
+2040.42735 , 2509.65 , 101.5372644
+2040.42735 , 2702.7 , 105.5913144
+2040.42735 , 2895.75 , 109.6453644
+2040.42735 , 3088.8 , 113.6994144
+2040.42735 , 3281.85 , 117.7534644
+2040.42735 , 3474.9 , 121.8075144
+2040.42735 , 3667.95 , 125.8615644
+2040.42735 , 3861 , 129.9156144
+2040.42735 , 4054.05 , 133.9696644
+2040.42735 , 4247.1 , 138.0237144
+2040.42735 , 4440.15 , 142.0777644
+2040.42735 , 4633.2 , 146.1318144
+2040.42735 , 4826.25 , 150.1858644
+2040.42735 , 5019.3 , 154.2399144
+2040.42735 , 5212.35 , 158.2939644
+2040.42735 , 5405.4 , 162.3480144
+2040.42735 , 5598.45 , 166.4020644
+2040.42735 , 5791.5 , 170.4561144
+2040.42735 , 5984.55 , 174.5101644
+2040.42735 , 6177.6 , 178.5642144
+2244.529915 , -6177.6 , 77.61673919
+2244.529915 , -5984.55 , 73.56268919
+2244.529915 , -5791.5 , 69.50863919
+2244.529915 , -5598.45 , 65.45458919
+2244.529915 , -5405.4 , 61.40053919
+2244.529915 , -5212.35 , 57.34648919
+2244.529915 , -5019.3 , 53.29243919
+2244.529915 , -4826.25 , 49.23838919
+2244.529915 , -4633.2 , 45.18433919
+2244.529915 , -4440.15 , 41.13028919
+2244.529915 , -4247.1 , 37.07623919
+2244.529915 , -4054.05 , 33.02218919
+2244.529915 , -3861 , 28.96813919
+2244.529915 , -3667.95 , 24.91408919
+2244.529915 , -3474.9 , 20.86003919
+2244.529915 , -3281.85 , 16.80598919
+2244.529915 , -3088.8 , 12.75193919
+2244.529915 , -2895.75 , 8.697889192
+2244.529915 , -2702.7 , 4.643839192
+2244.529915 , -2509.65 , 0.589789192
+2244.529915 , -2316.6 , 3.464260808
+2244.529915 , -2123.55 , 7.518310808
+2244.529915 , -1930.5 , 11.57236081
+2244.529915 , -1737.45 , 15.62641081
+2244.529915 , -1544.4 , 19.68046081
+2244.529915 , -1351.35 , 23.73451081
+2244.529915 , -1158.3 , 27.78856081
+2244.529915 , -965.25 , 31.84261081
+2244.529915 , -772.2 , 35.89666081
+2244.529915 , -579.15 , 39.95071081
+2244.529915 , -386.1 , 44.00476081
+2244.529915 , -193.05 , 48.05881081
+2244.529915 , 0 , 52.11286081
+2244.529915 , 193.05 , 56.16691081
+2244.529915 , 386.1 , 60.22096081
+2244.529915 , 579.15 , 64.27501081
+2244.529915 , 772.2 , 68.32906081
+2244.529915 , 965.25 , 72.38311081
+2244.529915 , 1158.3 , 76.43716081
+2244.529915 , 1351.35 , 80.49121081
+2244.529915 , 1544.4 , 84.54526081
+2244.529915 , 1737.45 , 88.59931081
+2244.529915 , 1930.5 , 92.65336081
+2244.529915 , 2123.55 , 96.70741081
+2244.529915 , 2316.6 , 100.7614608
+2244.529915 , 2509.65 , 104.8155108
+2244.529915 , 2702.7 , 108.8695608
+2244.529915 , 2895.75 , 112.9236108
+2244.529915 , 3088.8 , 116.9776608
+2244.529915 , 3281.85 , 121.0317108
+2244.529915 , 3474.9 , 125.0857608
+2244.529915 , 3667.95 , 129.1398108
+2244.529915 , 3861 , 133.1938608
+2244.529915 , 4054.05 , 137.2479108
+2244.529915 , 4247.1 , 141.3019608
+2244.529915 , 4440.15 , 145.3560108
+2244.529915 , 4633.2 , 149.4100608
+2244.529915 , 4826.25 , 153.4641108
+2244.529915 , 5019.3 , 157.5181608
+2244.529915 , 5212.35 , 161.5722108
+2244.529915 , 5405.4 , 165.6262608
+2244.529915 , 5598.45 , 169.6803108
+2244.529915 , 5791.5 , 173.7343608
+2244.529915 , 5984.55 , 177.7884108
+2244.529915 , 6177.6 , 181.8424608
+2448.547009 , -6177.6 , 74.33986559
+2448.547009 , -5984.55 , 70.28581559
+2448.547009 , -5791.5 , 66.23176559
+2448.547009 , -5598.45 , 62.17771559
+2448.547009 , -5405.4 , 58.12366559
+2448.547009 , -5212.35 , 54.06961559
+2448.547009 , -5019.3 , 50.01556559
+2448.547009 , -4826.25 , 45.96151559
+2448.547009 , -4633.2 , 41.90746559
+2448.547009 , -4440.15 , 37.85341559
+2448.547009 , -4247.1 , 33.79936559
+2448.547009 , -4054.05 , 29.74531559
+2448.547009 , -3861 , 25.69126559
+2448.547009 , -3667.95 , 21.63721559
+2448.547009 , -3474.9 , 17.58316559
+2448.547009 , -3281.85 , 13.52911559
+2448.547009 , -3088.8 , 9.475065593
+2448.547009 , -2895.75 , 5.421015593
+2448.547009 , -2702.7 , 1.366965593
+2448.547009 , -2509.65 , 2.687084407
+2448.547009 , -2316.6 , 6.741134407
+2448.547009 , -2123.55 , 10.79518441
+2448.547009 , -1930.5 , 14.84923441
+2448.547009 , -1737.45 , 18.90328441
+2448.547009 , -1544.4 , 22.95733441
+2448.547009 , -1351.35 , 27.01138441
+2448.547009 , -1158.3 , 31.06543441
+2448.547009 , -965.25 , 35.11948441
+2448.547009 , -772.2 , 39.17353441
+2448.547009 , -579.15 , 43.22758441
+2448.547009 , -386.1 , 47.28163441
+2448.547009 , -193.05 , 51.33568441
+2448.547009 , 0 , 55.38973441
+2448.547009 , 193.05 , 59.44378441
+2448.547009 , 386.1 , 63.49783441
+2448.547009 , 579.15 , 67.55188441
+2448.547009 , 772.2 , 71.60593441
+2448.547009 , 965.25 , 75.65998441
+2448.547009 , 1158.3 , 79.71403441
+2448.547009 , 1351.35 , 83.76808441
+2448.547009 , 1544.4 , 87.82213441
+2448.547009 , 1737.45 , 91.87618441
+2448.547009 , 1930.5 , 95.93023441
+2448.547009 , 2123.55 , 99.98428441
+2448.547009 , 2316.6 , 104.0383344
+2448.547009 , 2509.65 , 108.0923844
+2448.547009 , 2702.7 , 112.1464344
+2448.547009 , 2895.75 , 116.2004844
+2448.547009 , 3088.8 , 120.2545344
+2448.547009 , 3281.85 , 124.3085844
+2448.547009 , 3474.9 , 128.3626344
+2448.547009 , 3667.95 , 132.4166844
+2448.547009 , 3861 , 136.4707344
+2448.547009 , 4054.05 , 140.5247844
+2448.547009 , 4247.1 , 144.5788344
+2448.547009 , 4440.15 , 148.6328844
+2448.547009 , 4633.2 , 152.6869344
+2448.547009 , 4826.25 , 156.7409844
+2448.547009 , 5019.3 , 160.7950344
+2448.547009 , 5212.35 , 164.8490844
+2448.547009 , 5405.4 , 168.9031344
+2448.547009 , 5598.45 , 172.9571844
+2448.547009 , 5791.5 , 177.0112344
+2448.547009 , 5984.55 , 181.0652844
+2448.547009 , 6177.6 , 185.1193344
+2652.564103 , -6177.6 , 71.06299199
+2652.564103 , -5984.55 , 67.00894199
+2652.564103 , -5791.5 , 62.95489199
+2652.564103 , -5598.45 , 58.90084199
+2652.564103 , -5405.4 , 54.84679199
+2652.564103 , -5212.35 , 50.79274199
+2652.564103 , -5019.3 , 46.73869199
+2652.564103 , -4826.25 , 42.68464199
+2652.564103 , -4633.2 , 38.63059199
+2652.564103 , -4440.15 , 34.57654199
+2652.564103 , -4247.1 , 30.52249199
+2652.564103 , -4054.05 , 26.46844199
+2652.564103 , -3861 , 22.41439199
+2652.564103 , -3667.95 , 18.36034199
+2652.564103 , -3474.9 , 14.30629199
+2652.564103 , -3281.85 , 10.25224199
+2652.564103 , -3088.8 , 6.198191993
+2652.564103 , -2895.75 , 2.144141993
+2652.564103 , -2702.7 , 1.909908007
+2652.564103 , -2509.65 , 5.963958007
+2652.564103 , -2316.6 , 10.01800801
+2652.564103 , -2123.55 , 14.07205801
+2652.564103 , -1930.5 , 18.12610801
+2652.564103 , -1737.45 , 22.18015801
+2652.564103 , -1544.4 , 26.23420801
+2652.564103 , -1351.35 , 30.28825801
+2652.564103 , -1158.3 , 34.34230801
+2652.564103 , -965.25 , 38.39635801
+2652.564103 , -772.2 , 42.45040801
+2652.564103 , -579.15 , 46.50445801
+2652.564103 , -386.1 , 50.55850801
+2652.564103 , -193.05 , 54.61255801
+2652.564103 , 0 , 58.66660801
+2652.564103 , 193.05 , 62.72065801
+2652.564103 , 386.1 , 66.77470801
+2652.564103 , 579.15 , 70.82875801
+2652.564103 , 772.2 , 74.88280801
+2652.564103 , 965.25 , 78.93685801
+2652.564103 , 1158.3 , 82.99090801
+2652.564103 , 1351.35 , 87.04495801
+2652.564103 , 1544.4 , 91.09900801
+2652.564103 , 1737.45 , 95.15305801
+2652.564103 , 1930.5 , 99.20710801
+2652.564103 , 2123.55 , 103.261158
+2652.564103 , 2316.6 , 107.315208
+2652.564103 , 2509.65 , 111.369258
+2652.564103 , 2702.7 , 115.423308
+2652.564103 , 2895.75 , 119.477358
+2652.564103 , 3088.8 , 123.531408
+2652.564103 , 3281.85 , 127.585458
+2652.564103 , 3474.9 , 131.639508
+2652.564103 , 3667.95 , 135.693558
+2652.564103 , 3861 , 139.747608
+2652.564103 , 4054.05 , 143.801658
+2652.564103 , 4247.1 , 147.855708
+2652.564103 , 4440.15 , 151.909758
+2652.564103 , 4633.2 , 155.963808
+2652.564103 , 4826.25 , 160.017858
+2652.564103 , 5019.3 , 164.071908
+2652.564103 , 5212.35 , 168.125958
+2652.564103 , 5405.4 , 172.180008
+2652.564103 , 5598.45 , 176.234058
+2652.564103 , 5791.5 , 180.288108
+2652.564103 , 5984.55 , 184.342158
+2652.564103 , 6177.6 , 188.396208
+2856.666667 , -6177.6 , 67.78474559
+2856.666667 , -5984.55 , 63.73069559
+2856.666667 , -5791.5 , 59.67664559
+2856.666667 , -5598.45 , 55.62259559
+2856.666667 , -5405.4 , 51.56854559
+2856.666667 , -5212.35 , 47.51449559
+2856.666667 , -5019.3 , 43.46044559
+2856.666667 , -4826.25 , 39.40639559
+2856.666667 , -4633.2 , 35.35234559
+2856.666667 , -4440.15 , 31.29829559
+2856.666667 , -4247.1 , 27.24424559
+2856.666667 , -4054.05 , 23.19019559
+2856.666667 , -3861 , 19.13614559
+2856.666667 , -3667.95 , 15.08209559
+2856.666667 , -3474.9 , 11.02804559
+2856.666667 , -3281.85 , 6.973995595
+2856.666667 , -3088.8 , 2.919945595
+2856.666667 , -2895.75 , 1.134104405
+2856.666667 , -2702.7 , 5.188154405
+2856.666667 , -2509.65 , 9.242204405
+2856.666667 , -2316.6 , 13.29625441
+2856.666667 , -2123.55 , 17.35030441
+2856.666667 , -1930.5 , 21.40435441
+2856.666667 , -1737.45 , 25.45840441
+2856.666667 , -1544.4 , 29.51245441
+2856.666667 , -1351.35 , 33.56650441
+2856.666667 , -1158.3 , 37.62055441
+2856.666667 , -965.25 , 41.67460441
+2856.666667 , -772.2 , 45.72865441
+2856.666667 , -579.15 , 49.78270441
+2856.666667 , -386.1 , 53.83675441
+2856.666667 , -193.05 , 57.89080441
+2856.666667 , 0 , 61.94485441
+2856.666667 , 193.05 , 65.99890441
+2856.666667 , 386.1 , 70.05295441
+2856.666667 , 579.15 , 74.10700441
+2856.666667 , 772.2 , 78.16105441
+2856.666667 , 965.25 , 82.21510441
+2856.666667 , 1158.3 , 86.26915441
+2856.666667 , 1351.35 , 90.32320441
+2856.666667 , 1544.4 , 94.37725441
+2856.666667 , 1737.45 , 98.43130441
+2856.666667 , 1930.5 , 102.4853544
+2856.666667 , 2123.55 , 106.5394044
+2856.666667 , 2316.6 , 110.5934544
+2856.666667 , 2509.65 , 114.6475044
+2856.666667 , 2702.7 , 118.7015544
+2856.666667 , 2895.75 , 122.7556044
+2856.666667 , 3088.8 , 126.8096544
+2856.666667 , 3281.85 , 130.8637044
+2856.666667 , 3474.9 , 134.9177544
+2856.666667 , 3667.95 , 138.9718044
+2856.666667 , 3861 , 143.0258544
+2856.666667 , 4054.05 , 147.0799044
+2856.666667 , 4247.1 , 151.1339544
+2856.666667 , 4440.15 , 155.1880044
+2856.666667 , 4633.2 , 159.2420544
+2856.666667 , 4826.25 , 163.2961044
+2856.666667 , 5019.3 , 167.3501544
+2856.666667 , 5212.35 , 171.4042044
+2856.666667 , 5405.4 , 175.4582544
+2856.666667 , 5598.45 , 179.5123044
+2856.666667 , 5791.5 , 183.5663544
+2856.666667 , 5984.55 , 187.6204044
+2856.666667 , 6177.6 , 191.6744544
+3060.683761 , -6177.6 , 64.50787199
+3060.683761 , -5984.55 , 60.45382199
+3060.683761 , -5791.5 , 56.39977199
+3060.683761 , -5598.45 , 52.34572199
+3060.683761 , -5405.4 , 48.29167199
+3060.683761 , -5212.35 , 44.23762199
+3060.683761 , -5019.3 , 40.18357199
+3060.683761 , -4826.25 , 36.12952199
+3060.683761 , -4633.2 , 32.07547199
+3060.683761 , -4440.15 , 28.02142199
+3060.683761 , -4247.1 , 23.96737199
+3060.683761 , -4054.05 , 19.91332199
+3060.683761 , -3861 , 15.85927199
+3060.683761 , -3667.95 , 11.80522199
+3060.683761 , -3474.9 , 7.751171995
+3060.683761 , -3281.85 , 3.697121995
+3060.683761 , -3088.8 , 0.356928005
+3060.683761 , -2895.75 , 4.410978005
+3060.683761 , -2702.7 , 8.465028005
+3060.683761 , -2509.65 , 12.51907801
+3060.683761 , -2316.6 , 16.57312801
+3060.683761 , -2123.55 , 20.62717801
+3060.683761 , -1930.5 , 24.68122801
+3060.683761 , -1737.45 , 28.73527801
+3060.683761 , -1544.4 , 32.78932801
+3060.683761 , -1351.35 , 36.84337801
+3060.683761 , -1158.3 , 40.89742801
+3060.683761 , -965.25 , 44.95147801
+3060.683761 , -772.2 , 49.00552801
+3060.683761 , -579.15 , 53.05957801
+3060.683761 , -386.1 , 57.11362801
+3060.683761 , -193.05 , 61.16767801
+3060.683761 , 0 , 65.22172801
+3060.683761 , 193.05 , 69.27577801
+3060.683761 , 386.1 , 73.32982801
+3060.683761 , 579.15 , 77.38387801
+3060.683761 , 772.2 , 81.43792801
+3060.683761 , 965.25 , 85.49197801
+3060.683761 , 1158.3 , 89.54602801
+3060.683761 , 1351.35 , 93.60007801
+3060.683761 , 1544.4 , 97.65412801
+3060.683761 , 1737.45 , 101.708178
+3060.683761 , 1930.5 , 105.762228
+3060.683761 , 2123.55 , 109.816278
+3060.683761 , 2316.6 , 113.870328
+3060.683761 , 2509.65 , 117.924378
+3060.683761 , 2702.7 , 121.978428
+3060.683761 , 2895.75 , 126.032478
+3060.683761 , 3088.8 , 130.086528
+3060.683761 , 3281.85 , 134.140578
+3060.683761 , 3474.9 , 138.194628
+3060.683761 , 3667.95 , 142.248678
+3060.683761 , 3861 , 146.302728
+3060.683761 , 4054.05 , 150.356778
+3060.683761 , 4247.1 , 154.410828
+3060.683761 , 4440.15 , 158.464878
+3060.683761 , 4633.2 , 162.518928
+3060.683761 , 4826.25 , 166.572978
+3060.683761 , 5019.3 , 170.627028
+3060.683761 , 5212.35 , 174.681078
+3060.683761 , 5405.4 , 178.735128
+3060.683761 , 5598.45 , 182.789178
+3060.683761 , 5791.5 , 186.843228
+3060.683761 , 5984.55 , 190.897278
+3060.683761 , 6177.6 , 194.951328
+3264.700855 , -6177.6 , 61.2309984
+3264.700855 , -5984.55 , 57.1769484
+3264.700855 , -5791.5 , 53.1228984
+3264.700855 , -5598.45 , 49.0688484
+3264.700855 , -5405.4 , 45.0147984
+3264.700855 , -5212.35 , 40.9607484
+3264.700855 , -5019.3 , 36.9066984
+3264.700855 , -4826.25 , 32.8526484
+3264.700855 , -4633.2 , 28.7985984
+3264.700855 , -4440.15 , 24.7445484
+3264.700855 , -4247.1 , 20.6904984
+3264.700855 , -4054.05 , 16.6364484
+3264.700855 , -3861 , 12.5823984
+3264.700855 , -3667.95 , 8.528348395
+3264.700855 , -3474.9 , 4.474298395
+3264.700855 , -3281.85 , 0.420248395
+3264.700855 , -3088.8 , 3.633801605
+3264.700855 , -2895.75 , 7.687851605
+3264.700855 , -2702.7 , 11.7419016
+3264.700855 , -2509.65 , 15.7959516
+3264.700855 , -2316.6 , 19.8500016
+3264.700855 , -2123.55 , 23.9040516
+3264.700855 , -1930.5 , 27.9581016
+3264.700855 , -1737.45 , 32.0121516
+3264.700855 , -1544.4 , 36.0662016
+3264.700855 , -1351.35 , 40.1202516
+3264.700855 , -1158.3 , 44.1743016
+3264.700855 , -965.25 , 48.2283516
+3264.700855 , -772.2 , 52.2824016
+3264.700855 , -579.15 , 56.3364516
+3264.700855 , -386.1 , 60.3905016
+3264.700855 , -193.05 , 64.4445516
+3264.700855 , 0 , 68.4986016
+3264.700855 , 193.05 , 72.5526516
+3264.700855 , 386.1 , 76.6067016
+3264.700855 , 579.15 , 80.6607516
+3264.700855 , 772.2 , 84.7148016
+3264.700855 , 965.25 , 88.7688516
+3264.700855 , 1158.3 , 92.8229016
+3264.700855 , 1351.35 , 96.8769516
+3264.700855 , 1544.4 , 100.9310016
+3264.700855 , 1737.45 , 104.9850516
+3264.700855 , 1930.5 , 109.0391016
+3264.700855 , 2123.55 , 113.0931516
+3264.700855 , 2316.6 , 117.1472016
+3264.700855 , 2509.65 , 121.2012516
+3264.700855 , 2702.7 , 125.2553016
+3264.700855 , 2895.75 , 129.3093516
+3264.700855 , 3088.8 , 133.3634016
+3264.700855 , 3281.85 , 137.4174516
+3264.700855 , 3474.9 , 141.4715016
+3264.700855 , 3667.95 , 145.5255516
+3264.700855 , 3861 , 149.5796016
+3264.700855 , 4054.05 , 153.6336516
+3264.700855 , 4247.1 , 157.6877016
+3264.700855 , 4440.15 , 161.7417516
+3264.700855 , 4633.2 , 165.7958016
+3264.700855 , 4826.25 , 169.8498516
+3264.700855 , 5019.3 , 173.9039016
+3264.700855 , 5212.35 , 177.9579516
+3264.700855 , 5405.4 , 182.0120016
+3264.700855 , 5598.45 , 186.0660516
+3264.700855 , 5791.5 , 190.1201016
+3264.700855 , 5984.55 , 194.1741516
+3264.700855 , 6177.6 , 198.2282016
+3468.803419 , -6177.6 , 57.952752
+3468.803419 , -5984.55 , 53.898702
+3468.803419 , -5791.5 , 49.844652
+3468.803419 , -5598.45 , 45.790602
+3468.803419 , -5405.4 , 41.736552
+3468.803419 , -5212.35 , 37.682502
+3468.803419 , -5019.3 , 33.628452
+3468.803419 , -4826.25 , 29.574402
+3468.803419 , -4633.2 , 25.520352
+3468.803419 , -4440.15 , 21.466302
+3468.803419 , -4247.1 , 17.412252
+3468.803419 , -4054.05 , 13.358202
+3468.803419 , -3861 , 9.304151997
+3468.803419 , -3667.95 , 5.250101997
+3468.803419 , -3474.9 , 1.196051997
+3468.803419 , -3281.85 , 2.857998003
+3468.803419 , -3088.8 , 6.912048003
+3468.803419 , -2895.75 , 10.966098
+3468.803419 , -2702.7 , 15.020148
+3468.803419 , -2509.65 , 19.074198
+3468.803419 , -2316.6 , 23.128248
+3468.803419 , -2123.55 , 27.182298
+3468.803419 , -1930.5 , 31.236348
+3468.803419 , -1737.45 , 35.290398
+3468.803419 , -1544.4 , 39.344448
+3468.803419 , -1351.35 , 43.398498
+3468.803419 , -1158.3 , 47.452548
+3468.803419 , -965.25 , 51.506598
+3468.803419 , -772.2 , 55.560648
+3468.803419 , -579.15 , 59.614698
+3468.803419 , -386.1 , 63.668748
+3468.803419 , -193.05 , 67.722798
+3468.803419 , 0 , 71.776848
+3468.803419 , 193.05 , 75.830898
+3468.803419 , 386.1 , 79.884948
+3468.803419 , 579.15 , 83.938998
+3468.803419 , 772.2 , 87.993048
+3468.803419 , 965.25 , 92.047098
+3468.803419 , 1158.3 , 96.101148
+3468.803419 , 1351.35 , 100.155198
+3468.803419 , 1544.4 , 104.209248
+3468.803419 , 1737.45 , 108.263298
+3468.803419 , 1930.5 , 112.317348
+3468.803419 , 2123.55 , 116.371398
+3468.803419 , 2316.6 , 120.425448
+3468.803419 , 2509.65 , 124.479498
+3468.803419 , 2702.7 , 128.533548
+3468.803419 , 2895.75 , 132.587598
+3468.803419 , 3088.8 , 136.641648
+3468.803419 , 3281.85 , 140.695698
+3468.803419 , 3474.9 , 144.749748
+3468.803419 , 3667.95 , 148.803798
+3468.803419 , 3861 , 152.857848
+3468.803419 , 4054.05 , 156.911898
+3468.803419 , 4247.1 , 160.965948
+3468.803419 , 4440.15 , 165.019998
+3468.803419 , 4633.2 , 169.074048
+3468.803419 , 4826.25 , 173.128098
+3468.803419 , 5019.3 , 177.182148
+3468.803419 , 5212.35 , 181.236198
+3468.803419 , 5405.4 , 185.290248
+3468.803419 , 5598.45 , 189.344298
+3468.803419 , 5791.5 , 193.398348
+3468.803419 , 5984.55 , 197.452398
+3468.803419 , 6177.6 , 201.506448
+3672.820513 , -6177.6 , 54.6758784
+3672.820513 , -5984.55 , 50.6218284
+3672.820513 , -5791.5 , 46.5677784
+3672.820513 , -5598.45 , 42.5137284
+3672.820513 , -5405.4 , 38.4596784
+3672.820513 , -5212.35 , 34.4056284
+3672.820513 , -5019.3 , 30.3515784
+3672.820513 , -4826.25 , 26.2975284
+3672.820513 , -4633.2 , 22.2434784
+3672.820513 , -4440.15 , 18.1894284
+3672.820513 , -4247.1 , 14.1353784
+3672.820513 , -4054.05 , 10.0813284
+3672.820513 , -3861 , 6.027278397
+3672.820513 , -3667.95 , 1.973228397
+3672.820513 , -3474.9 , 2.080821603
+3672.820513 , -3281.85 , 6.134871603
+3672.820513 , -3088.8 , 10.1889216
+3672.820513 , -2895.75 , 14.2429716
+3672.820513 , -2702.7 , 18.2970216
+3672.820513 , -2509.65 , 22.3510716
+3672.820513 , -2316.6 , 26.4051216
+3672.820513 , -2123.55 , 30.4591716
+3672.820513 , -1930.5 , 34.5132216
+3672.820513 , -1737.45 , 38.5672716
+3672.820513 , -1544.4 , 42.6213216
+3672.820513 , -1351.35 , 46.6753716
+3672.820513 , -1158.3 , 50.7294216
+3672.820513 , -965.25 , 54.7834716
+3672.820513 , -772.2 , 58.8375216
+3672.820513 , -579.15 , 62.8915716
+3672.820513 , -386.1 , 66.9456216
+3672.820513 , -193.05 , 70.9996716
+3672.820513 , 0 , 75.0537216
+3672.820513 , 193.05 , 79.1077716
+3672.820513 , 386.1 , 83.1618216
+3672.820513 , 579.15 , 87.2158716
+3672.820513 , 772.2 , 91.2699216
+3672.820513 , 965.25 , 95.3239716
+3672.820513 , 1158.3 , 99.3780216
+3672.820513 , 1351.35 , 103.4320716
+3672.820513 , 1544.4 , 107.4861216
+3672.820513 , 1737.45 , 111.5401716
+3672.820513 , 1930.5 , 115.5942216
+3672.820513 , 2123.55 , 119.6482716
+3672.820513 , 2316.6 , 123.7023216
+3672.820513 , 2509.65 , 127.7563716
+3672.820513 , 2702.7 , 131.8104216
+3672.820513 , 2895.75 , 135.8644716
+3672.820513 , 3088.8 , 139.9185216
+3672.820513 , 3281.85 , 143.9725716
+3672.820513 , 3474.9 , 148.0266216
+3672.820513 , 3667.95 , 152.0806716
+3672.820513 , 3861 , 156.1347216
+3672.820513 , 4054.05 , 160.1887716
+3672.820513 , 4247.1 , 164.2428216
+3672.820513 , 4440.15 , 168.2968716
+3672.820513 , 4633.2 , 172.3509216
+3672.820513 , 4826.25 , 176.4049716
+3672.820513 , 5019.3 , 180.4590216
+3672.820513 , 5212.35 , 184.5130716
+3672.820513 , 5405.4 , 188.5671216
+3672.820513 , 5598.45 , 192.6211716
+3672.820513 , 5791.5 , 196.6752216
+3672.820513 , 5984.55 , 200.7292716
+3672.820513 , 6177.6 , 204.7833216
+3876.837607 , -6177.6 , 51.3990048
+3876.837607 , -5984.55 , 47.3449548
+3876.837607 , -5791.5 , 43.2909048
+3876.837607 , -5598.45 , 39.2368548
+3876.837607 , -5405.4 , 35.1828048
+3876.837607 , -5212.35 , 31.1287548
+3876.837607 , -5019.3 , 27.0747048
+3876.837607 , -4826.25 , 23.0206548
+3876.837607 , -4633.2 , 18.9666048
+3876.837607 , -4440.15 , 14.9125548
+3876.837607 , -4247.1 , 10.8585048
+3876.837607 , -4054.05 , 6.804454797
+3876.837607 , -3861 , 2.750404797
+3876.837607 , -3667.95 , 1.303645203
+3876.837607 , -3474.9 , 5.357695203
+3876.837607 , -3281.85 , 9.411745203
+3876.837607 , -3088.8 , 13.4657952
+3876.837607 , -2895.75 , 17.5198452
+3876.837607 , -2702.7 , 21.5738952
+3876.837607 , -2509.65 , 25.6279452
+3876.837607 , -2316.6 , 29.6819952
+3876.837607 , -2123.55 , 33.7360452
+3876.837607 , -1930.5 , 37.7900952
+3876.837607 , -1737.45 , 41.8441452
+3876.837607 , -1544.4 , 45.8981952
+3876.837607 , -1351.35 , 49.9522452
+3876.837607 , -1158.3 , 54.0062952
+3876.837607 , -965.25 , 58.0603452
+3876.837607 , -772.2 , 62.1143952
+3876.837607 , -579.15 , 66.1684452
+3876.837607 , -386.1 , 70.2224952
+3876.837607 , -193.05 , 74.2765452
+3876.837607 , 0 , 78.3305952
+3876.837607 , 193.05 , 82.3846452
+3876.837607 , 386.1 , 86.4386952
+3876.837607 , 579.15 , 90.4927452
+3876.837607 , 772.2 , 94.5467952
+3876.837607 , 965.25 , 98.6008452
+3876.837607 , 1158.3 , 102.6548952
+3876.837607 , 1351.35 , 106.7089452
+3876.837607 , 1544.4 , 110.7629952
+3876.837607 , 1737.45 , 114.8170452
+3876.837607 , 1930.5 , 118.8710952
+3876.837607 , 2123.55 , 122.9251452
+3876.837607 , 2316.6 , 126.9791952
+3876.837607 , 2509.65 , 131.0332452
+3876.837607 , 2702.7 , 135.0872952
+3876.837607 , 2895.75 , 139.1413452
+3876.837607 , 3088.8 , 143.1953952
+3876.837607 , 3281.85 , 147.2494452
+3876.837607 , 3474.9 , 151.3034952
+3876.837607 , 3667.95 , 155.3575452
+3876.837607 , 3861 , 159.4115952
+3876.837607 , 4054.05 , 163.4656452
+3876.837607 , 4247.1 , 167.5196952
+3876.837607 , 4440.15 , 171.5737452
+3876.837607 , 4633.2 , 175.6277952
+3876.837607 , 4826.25 , 179.6818452
+3876.837607 , 5019.3 , 183.7358952
+3876.837607 , 5212.35 , 187.7899452
+3876.837607 , 5405.4 , 191.8439952
+3876.837607 , 5598.45 , 195.8980452
+3876.837607 , 5791.5 , 199.9520952
+3876.837607 , 5984.55 , 204.0061452
+3876.837607 , 6177.6 , 208.0601952
+4080.854701 , -6177.6 , 48.1221312
+4080.854701 , -5984.55 , 44.0680812
+4080.854701 , -5791.5 , 40.0140312
+4080.854701 , -5598.45 , 35.9599812
+4080.854701 , -5405.4 , 31.9059312
+4080.854701 , -5212.35 , 27.8518812
+4080.854701 , -5019.3 , 23.7978312
+4080.854701 , -4826.25 , 19.7437812
+4080.854701 , -4633.2 , 15.6897312
+4080.854701 , -4440.15 , 11.6356812
+4080.854701 , -4247.1 , 7.581631198
+4080.854701 , -4054.05 , 3.527581198
+4080.854701 , -3861 , 0.526468802
+4080.854701 , -3667.95 , 4.580518802
+4080.854701 , -3474.9 , 8.634568802
+4080.854701 , -3281.85 , 12.6886188
+4080.854701 , -3088.8 , 16.7426688
+4080.854701 , -2895.75 , 20.7967188
+4080.854701 , -2702.7 , 24.8507688
+4080.854701 , -2509.65 , 28.9048188
+4080.854701 , -2316.6 , 32.9588688
+4080.854701 , -2123.55 , 37.0129188
+4080.854701 , -1930.5 , 41.0669688
+4080.854701 , -1737.45 , 45.1210188
+4080.854701 , -1544.4 , 49.1750688
+4080.854701 , -1351.35 , 53.2291188
+4080.854701 , -1158.3 , 57.2831688
+4080.854701 , -965.25 , 61.3372188
+4080.854701 , -772.2 , 65.3912688
+4080.854701 , -579.15 , 69.4453188
+4080.854701 , -386.1 , 73.4993688
+4080.854701 , -193.05 , 77.5534188
+4080.854701 , 0 , 81.6074688
+4080.854701 , 193.05 , 85.6615188
+4080.854701 , 386.1 , 89.7155688
+4080.854701 , 579.15 , 93.7696188
+4080.854701 , 772.2 , 97.8236688
+4080.854701 , 965.25 , 101.8777188
+4080.854701 , 1158.3 , 105.9317688
+4080.854701 , 1351.35 , 109.9858188
+4080.854701 , 1544.4 , 114.0398688
+4080.854701 , 1737.45 , 118.0939188
+4080.854701 , 1930.5 , 122.1479688
+4080.854701 , 2123.55 , 126.2020188
+4080.854701 , 2316.6 , 130.2560688
+4080.854701 , 2509.65 , 134.3101188
+4080.854701 , 2702.7 , 138.3641688
+4080.854701 , 2895.75 , 142.4182188
+4080.854701 , 3088.8 , 146.4722688
+4080.854701 , 3281.85 , 150.5263188
+4080.854701 , 3474.9 , 154.5803688
+4080.854701 , 3667.95 , 158.6344188
+4080.854701 , 3861 , 162.6884688
+4080.854701 , 4054.05 , 166.7425188
+4080.854701 , 4247.1 , 170.7965688
+4080.854701 , 4440.15 , 174.8506188
+4080.854701 , 4633.2 , 178.9046688
+4080.854701 , 4826.25 , 182.9587188
+4080.854701 , 5019.3 , 187.0127688
+4080.854701 , 5212.35 , 191.0668188
+4080.854701 , 5405.4 , 195.1208688
+4080.854701 , 5598.45 , 199.1749188
+4080.854701 , 5791.5 , 203.2289688
+4080.854701 , 5984.55 , 207.2830188
+4080.854701 , 6177.6 , 211.3370688
+4268.632479 , -6177.6 , 45.10608959
+4268.632479 , -5984.55 , 41.05203959
+4268.632479 , -5791.5 , 36.99798959
+4268.632479 , -5598.45 , 32.94393959
+4268.632479 , -5405.4 , 28.88988959
+4268.632479 , -5212.35 , 24.83583959
+4268.632479 , -5019.3 , 20.78178959
+4268.632479 , -4826.25 , 16.72773959
+4268.632479 , -4633.2 , 12.67368959
+4268.632479 , -4440.15 , 8.619639594
+4268.632479 , -4247.1 , 4.565589594
+4268.632479 , -4054.05 , 0.511539594
+4268.632479 , -3861 , 3.542510406
+4268.632479 , -3667.95 , 7.596560406
+4268.632479 , -3474.9 , 11.65061041
+4268.632479 , -3281.85 , 15.70466041
+4268.632479 , -3088.8 , 19.75871041
+4268.632479 , -2895.75 , 23.81276041
+4268.632479 , -2702.7 , 27.86681041
+4268.632479 , -2509.65 , 31.92086041
+4268.632479 , -2316.6 , 35.97491041
+4268.632479 , -2123.55 , 40.02896041
+4268.632479 , -1930.5 , 44.08301041
+4268.632479 , -1737.45 , 48.13706041
+4268.632479 , -1544.4 , 52.19111041
+4268.632479 , -1351.35 , 56.24516041
+4268.632479 , -1158.3 , 60.29921041
+4268.632479 , -965.25 , 64.35326041
+4268.632479 , -772.2 , 68.40731041
+4268.632479 , -579.15 , 72.46136041
+4268.632479 , -386.1 , 76.51541041
+4268.632479 , -193.05 , 80.56946041
+4268.632479 , 0 , 84.62351041
+4268.632479 , 193.05 , 88.67756041
+4268.632479 , 386.1 , 92.73161041
+4268.632479 , 579.15 , 96.78566041
+4268.632479 , 772.2 , 100.8397104
+4268.632479 , 965.25 , 104.8937604
+4268.632479 , 1158.3 , 108.9478104
+4268.632479 , 1351.35 , 113.0018604
+4268.632479 , 1544.4 , 117.0559104
+4268.632479 , 1737.45 , 121.1099604
+4268.632479 , 1930.5 , 125.1640104
+4268.632479 , 2123.55 , 129.2180604
+4268.632479 , 2316.6 , 133.2721104
+4268.632479 , 2509.65 , 137.3261604
+4268.632479 , 2702.7 , 141.3802104
+4268.632479 , 2895.75 , 145.4342604
+4268.632479 , 3088.8 , 149.4883104
+4268.632479 , 3281.85 , 153.5423604
+4268.632479 , 3474.9 , 157.5964104
+4268.632479 , 3667.95 , 161.6504604
+4268.632479 , 3861 , 165.7045104
+4268.632479 , 4054.05 , 169.7585604
+4268.632479 , 4247.1 , 173.8126104
+4268.632479 , 4440.15 , 177.8666604
+4268.632479 , 4633.2 , 181.9207104
+4268.632479 , 4826.25 , 185.9747604
+4268.632479 , 5019.3 , 190.0288104
+4268.632479 , 5212.35 , 194.0828604
+4268.632479 , 5405.4 , 198.1369104
+4268.632479 , 5598.45 , 202.1909604
+4268.632479 , 5791.5 , 206.2450104
+4268.632479 , 5984.55 , 210.2990604
+4268.632479 , 6177.6 , 214.3531104
+5000 , -6177.6 , 33.35904
+5000 , -5984.55 , 29.30499
+5000 , -5791.5 , 25.25094
+5000 , -5598.45 , 21.19689
+5000 , -5405.4 , 17.14284
+5000 , -5212.35 , 13.08879
+5000 , -5019.3 , 9.03474
+5000 , -4826.25 , 4.98069
+5000 , -4633.2 , 0.92664
+5000 , -4440.15 , 3.12741
+5000 , -4247.1 , 7.18146
+5000 , -4054.05 , 11.23551
+5000 , -3861 , 15.28956
+5000 , -3667.95 , 19.34361
+5000 , -3474.9 , 23.39766
+5000 , -3281.85 , 27.45171
+5000 , -3088.8 , 31.50576
+5000 , -2895.75 , 35.55981
+5000 , -2702.7 , 39.61386
+5000 , -2509.65 , 43.66791
+5000 , -2316.6 , 47.72196
+5000 , -2123.55 , 51.77601
+5000 , -1930.5 , 55.83006
+5000 , -1737.45 , 59.88411
+5000 , -1544.4 , 63.93816
+5000 , -1351.35 , 67.99221
+5000 , -1158.3 , 72.04626
+5000 , -965.25 , 76.10031
+5000 , -772.2 , 80.15436
+5000 , -579.15 , 84.20841
+5000 , -386.1 , 88.26246
+5000 , -193.05 , 92.31651
+5000 , 0 , 96.37056
+5000 , 193.05 , 100.42461
+5000 , 386.1 , 104.47866
+5000 , 579.15 , 108.53271
+5000 , 772.2 , 112.58676
+5000 , 965.25 , 116.64081
+5000 , 1158.3 , 120.69486
+5000 , 1351.35 , 124.74891
+5000 , 1544.4 , 128.80296
+5000 , 1737.45 , 132.85701
+5000 , 1930.5 , 136.91106
+5000 , 2123.55 , 140.96511
+5000 , 2316.6 , 145.01916
+5000 , 2509.65 , 149.07321
+5000 , 2702.7 , 153.12726
+5000 , 2895.75 , 157.18131
+5000 , 3088.8 , 161.23536
+5000 , 3281.85 , 165.28941
+5000 , 3474.9 , 169.34346
+5000 , 3667.95 , 173.39751
+5000 , 3861 , 177.45156
+5000 , 4054.05 , 181.50561
+5000 , 4247.1 , 185.55966
+5000 , 4440.15 , 189.61371
+5000 , 4633.2 , 193.66776
+5000 , 4826.25 , 197.72181
+5000 , 5019.3 , 201.77586
+5000 , 5212.35 , 205.82991
+5000 , 5405.4 , 209.88396
+5000 , 5598.45 , 213.93801
+5000 , 5791.5 , 217.99206
+5000 , 5984.55 , 222.04611
+5000 , 6177.6 , 226.10016
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_4.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_4.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..75f259c18b538dd9de02bdc7b9a8b087fd93c558
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_4.vtlm
@@ -0,0 +1,2081 @@
+Input Speed [rpm] , Input Torque [Nm] , Torque Loss [Nm]
+0 , -6177.6 , 108.108
+0 , -5984.55 , 104.247
+0 , -5791.5 , 100.386
+0 , -5598.45 , 96.525
+0 , -5405.4 , 92.664
+0 , -5212.35 , 88.803
+0 , -5019.3 , 84.942
+0 , -4826.25 , 81.081
+0 , -4633.2 , 77.22
+0 , -4440.15 , 73.359
+0 , -4247.1 , 69.498
+0 , -4054.05 , 65.637
+0 , -3861 , 61.776
+0 , -3667.95 , 57.915
+0 , -3474.9 , 54.054
+0 , -3281.85 , 50.193
+0 , -3088.8 , 46.332
+0 , -2895.75 , 42.471
+0 , -2702.7 , 38.61
+0 , -2509.65 , 34.749
+0 , -2316.6 , 30.888
+0 , -2123.55 , 27.027
+0 , -1930.5 , 23.166
+0 , -1737.45 , 19.305
+0 , -1544.4 , 15.444
+0 , -1351.35 , 11.583
+0 , -1158.3 , 7.722
+0 , -965.25 , 3.861
+0 , -772.2 , 0
+0 , -579.15 , 3.861
+0 , -386.1 , 7.722
+0 , -193.05 , 11.583
+0 , 0 , 15.444
+0 , 193.05 , 19.305
+0 , 386.1 , 23.166
+0 , 579.15 , 27.027
+0 , 772.2 , 30.888
+0 , 965.25 , 34.749
+0 , 1158.3 , 38.61
+0 , 1351.35 , 42.471
+0 , 1544.4 , 46.332
+0 , 1737.45 , 50.193
+0 , 1930.5 , 54.054
+0 , 2123.55 , 57.915
+0 , 2316.6 , 61.776
+0 , 2509.65 , 65.637
+0 , 2702.7 , 69.498
+0 , 2895.75 , 73.359
+0 , 3088.8 , 77.22
+0 , 3281.85 , 81.081
+0 , 3474.9 , 84.942
+0 , 3667.95 , 88.803
+0 , 3861 , 92.664
+0 , 4054.05 , 96.525
+0 , 4247.1 , 100.386
+0 , 4440.15 , 104.247
+0 , 4633.2 , 108.108
+0 , 4826.25 , 111.969
+0 , 5019.3 , 115.83
+0 , 5212.35 , 119.691
+0 , 5405.4 , 123.552
+0 , 5598.45 , 127.413
+0 , 5791.5 , 131.274
+0 , 5984.55 , 135.135
+0 , 6177.6 , 138.996
+40.80854701 , -6177.6 , 107.4777528
+40.80854701 , -5984.55 , 103.6167528
+40.80854701 , -5791.5 , 99.7557528
+40.80854701 , -5598.45 , 95.8947528
+40.80854701 , -5405.4 , 92.0337528
+40.80854701 , -5212.35 , 88.1727528
+40.80854701 , -5019.3 , 84.3117528
+40.80854701 , -4826.25 , 80.4507528
+40.80854701 , -4633.2 , 76.5897528
+40.80854701 , -4440.15 , 72.7287528
+40.80854701 , -4247.1 , 68.8677528
+40.80854701 , -4054.05 , 65.0067528
+40.80854701 , -3861 , 61.1457528
+40.80854701 , -3667.95 , 57.2847528
+40.80854701 , -3474.9 , 53.4237528
+40.80854701 , -3281.85 , 49.5627528
+40.80854701 , -3088.8 , 45.7017528
+40.80854701 , -2895.75 , 41.8407528
+40.80854701 , -2702.7 , 37.9797528
+40.80854701 , -2509.65 , 34.1187528
+40.80854701 , -2316.6 , 30.2577528
+40.80854701 , -2123.55 , 26.3967528
+40.80854701 , -1930.5 , 22.5357528
+40.80854701 , -1737.45 , 18.6747528
+40.80854701 , -1544.4 , 14.8137528
+40.80854701 , -1351.35 , 10.9527528
+40.80854701 , -1158.3 , 7.0917528
+40.80854701 , -965.25 , 3.2307528
+40.80854701 , -772.2 , 0.6302472
+40.80854701 , -579.15 , 4.4912472
+40.80854701 , -386.1 , 8.3522472
+40.80854701 , -193.05 , 12.2132472
+40.80854701 , 0 , 16.0742472
+40.80854701 , 193.05 , 19.9352472
+40.80854701 , 386.1 , 23.7962472
+40.80854701 , 579.15 , 27.6572472
+40.80854701 , 772.2 , 31.5182472
+40.80854701 , 965.25 , 35.3792472
+40.80854701 , 1158.3 , 39.2402472
+40.80854701 , 1351.35 , 43.1012472
+40.80854701 , 1544.4 , 46.9622472
+40.80854701 , 1737.45 , 50.8232472
+40.80854701 , 1930.5 , 54.6842472
+40.80854701 , 2123.55 , 58.5452472
+40.80854701 , 2316.6 , 62.4062472
+40.80854701 , 2509.65 , 66.2672472
+40.80854701 , 2702.7 , 70.1282472
+40.80854701 , 2895.75 , 73.9892472
+40.80854701 , 3088.8 , 77.8502472
+40.80854701 , 3281.85 , 81.7112472
+40.80854701 , 3474.9 , 85.5722472
+40.80854701 , 3667.95 , 89.4332472
+40.80854701 , 3861 , 93.2942472
+40.80854701 , 4054.05 , 97.1552472
+40.80854701 , 4247.1 , 101.0162472
+40.80854701 , 4440.15 , 104.8772472
+40.80854701 , 4633.2 , 108.7382472
+40.80854701 , 4826.25 , 112.5992472
+40.80854701 , 5019.3 , 116.4602472
+40.80854701 , 5212.35 , 120.3212472
+40.80854701 , 5405.4 , 124.1822472
+40.80854701 , 5598.45 , 128.0432472
+40.80854701 , 5791.5 , 131.9042472
+40.80854701 , 5984.55 , 135.7652472
+40.80854701 , 6177.6 , 139.6262472
+81.61794872 , -6177.6 , 106.8474924
+81.61794872 , -5984.55 , 102.9864924
+81.61794872 , -5791.5 , 99.1254924
+81.61794872 , -5598.45 , 95.2644924
+81.61794872 , -5405.4 , 91.4034924
+81.61794872 , -5212.35 , 87.5424924
+81.61794872 , -5019.3 , 83.6814924
+81.61794872 , -4826.25 , 79.8204924
+81.61794872 , -4633.2 , 75.9594924
+81.61794872 , -4440.15 , 72.0984924
+81.61794872 , -4247.1 , 68.2374924
+81.61794872 , -4054.05 , 64.3764924
+81.61794872 , -3861 , 60.5154924
+81.61794872 , -3667.95 , 56.6544924
+81.61794872 , -3474.9 , 52.7934924
+81.61794872 , -3281.85 , 48.9324924
+81.61794872 , -3088.8 , 45.0714924
+81.61794872 , -2895.75 , 41.2104924
+81.61794872 , -2702.7 , 37.3494924
+81.61794872 , -2509.65 , 33.4884924
+81.61794872 , -2316.6 , 29.6274924
+81.61794872 , -2123.55 , 25.7664924
+81.61794872 , -1930.5 , 21.9054924
+81.61794872 , -1737.45 , 18.0444924
+81.61794872 , -1544.4 , 14.1834924
+81.61794872 , -1351.35 , 10.3224924
+81.61794872 , -1158.3 , 6.4614924
+81.61794872 , -965.25 , 2.6004924
+81.61794872 , -772.2 , 1.2605076
+81.61794872 , -579.15 , 5.1215076
+81.61794872 , -386.1 , 8.9825076
+81.61794872 , -193.05 , 12.8435076
+81.61794872 , 0 , 16.7045076
+81.61794872 , 193.05 , 20.5655076
+81.61794872 , 386.1 , 24.4265076
+81.61794872 , 579.15 , 28.2875076
+81.61794872 , 772.2 , 32.1485076
+81.61794872 , 965.25 , 36.0095076
+81.61794872 , 1158.3 , 39.8705076
+81.61794872 , 1351.35 , 43.7315076
+81.61794872 , 1544.4 , 47.5925076
+81.61794872 , 1737.45 , 51.4535076
+81.61794872 , 1930.5 , 55.3145076
+81.61794872 , 2123.55 , 59.1755076
+81.61794872 , 2316.6 , 63.0365076
+81.61794872 , 2509.65 , 66.8975076
+81.61794872 , 2702.7 , 70.7585076
+81.61794872 , 2895.75 , 74.6195076
+81.61794872 , 3088.8 , 78.4805076
+81.61794872 , 3281.85 , 82.3415076
+81.61794872 , 3474.9 , 86.2025076
+81.61794872 , 3667.95 , 90.0635076
+81.61794872 , 3861 , 93.9245076
+81.61794872 , 4054.05 , 97.7855076
+81.61794872 , 4247.1 , 101.6465076
+81.61794872 , 4440.15 , 105.5075076
+81.61794872 , 4633.2 , 109.3685076
+81.61794872 , 4826.25 , 113.2295076
+81.61794872 , 5019.3 , 117.0905076
+81.61794872 , 5212.35 , 120.9515076
+81.61794872 , 5405.4 , 124.8125076
+81.61794872 , 5598.45 , 128.6735076
+81.61794872 , 5791.5 , 132.5345076
+81.61794872 , 5984.55 , 136.3955076
+81.61794872 , 6177.6 , 140.2565076
+122.4273504 , -6177.6 , 106.217232
+122.4273504 , -5984.55 , 102.356232
+122.4273504 , -5791.5 , 98.495232
+122.4273504 , -5598.45 , 94.634232
+122.4273504 , -5405.4 , 90.773232
+122.4273504 , -5212.35 , 86.912232
+122.4273504 , -5019.3 , 83.051232
+122.4273504 , -4826.25 , 79.190232
+122.4273504 , -4633.2 , 75.329232
+122.4273504 , -4440.15 , 71.468232
+122.4273504 , -4247.1 , 67.607232
+122.4273504 , -4054.05 , 63.746232
+122.4273504 , -3861 , 59.885232
+122.4273504 , -3667.95 , 56.024232
+122.4273504 , -3474.9 , 52.163232
+122.4273504 , -3281.85 , 48.302232
+122.4273504 , -3088.8 , 44.441232
+122.4273504 , -2895.75 , 40.580232
+122.4273504 , -2702.7 , 36.719232
+122.4273504 , -2509.65 , 32.858232
+122.4273504 , -2316.6 , 28.997232
+122.4273504 , -2123.55 , 25.136232
+122.4273504 , -1930.5 , 21.275232
+122.4273504 , -1737.45 , 17.414232
+122.4273504 , -1544.4 , 13.553232
+122.4273504 , -1351.35 , 9.692232
+122.4273504 , -1158.3 , 5.831232
+122.4273504 , -965.25 , 1.970232
+122.4273504 , -772.2 , 1.890768
+122.4273504 , -579.15 , 5.751768
+122.4273504 , -386.1 , 9.612768
+122.4273504 , -193.05 , 13.473768
+122.4273504 , 0 , 17.334768
+122.4273504 , 193.05 , 21.195768
+122.4273504 , 386.1 , 25.056768
+122.4273504 , 579.15 , 28.917768
+122.4273504 , 772.2 , 32.778768
+122.4273504 , 965.25 , 36.639768
+122.4273504 , 1158.3 , 40.500768
+122.4273504 , 1351.35 , 44.361768
+122.4273504 , 1544.4 , 48.222768
+122.4273504 , 1737.45 , 52.083768
+122.4273504 , 1930.5 , 55.944768
+122.4273504 , 2123.55 , 59.805768
+122.4273504 , 2316.6 , 63.666768
+122.4273504 , 2509.65 , 67.527768
+122.4273504 , 2702.7 , 71.388768
+122.4273504 , 2895.75 , 75.249768
+122.4273504 , 3088.8 , 79.110768
+122.4273504 , 3281.85 , 82.971768
+122.4273504 , 3474.9 , 86.832768
+122.4273504 , 3667.95 , 90.693768
+122.4273504 , 3861 , 94.554768
+122.4273504 , 4054.05 , 98.415768
+122.4273504 , 4247.1 , 102.276768
+122.4273504 , 4440.15 , 106.137768
+122.4273504 , 4633.2 , 109.998768
+122.4273504 , 4826.25 , 113.859768
+122.4273504 , 5019.3 , 117.720768
+122.4273504 , 5212.35 , 121.581768
+122.4273504 , 5405.4 , 125.442768
+122.4273504 , 5598.45 , 129.303768
+122.4273504 , 5791.5 , 133.164768
+122.4273504 , 5984.55 , 137.025768
+122.4273504 , 6177.6 , 140.886768
+163.2393162 , -6177.6 , 105.586932
+163.2393162 , -5984.55 , 101.725932
+163.2393162 , -5791.5 , 97.864932
+163.2393162 , -5598.45 , 94.003932
+163.2393162 , -5405.4 , 90.142932
+163.2393162 , -5212.35 , 86.281932
+163.2393162 , -5019.3 , 82.420932
+163.2393162 , -4826.25 , 78.559932
+163.2393162 , -4633.2 , 74.698932
+163.2393162 , -4440.15 , 70.837932
+163.2393162 , -4247.1 , 66.976932
+163.2393162 , -4054.05 , 63.115932
+163.2393162 , -3861 , 59.254932
+163.2393162 , -3667.95 , 55.393932
+163.2393162 , -3474.9 , 51.532932
+163.2393162 , -3281.85 , 47.671932
+163.2393162 , -3088.8 , 43.810932
+163.2393162 , -2895.75 , 39.949932
+163.2393162 , -2702.7 , 36.088932
+163.2393162 , -2509.65 , 32.227932
+163.2393162 , -2316.6 , 28.366932
+163.2393162 , -2123.55 , 24.505932
+163.2393162 , -1930.5 , 20.644932
+163.2393162 , -1737.45 , 16.783932
+163.2393162 , -1544.4 , 12.922932
+163.2393162 , -1351.35 , 9.061932001
+163.2393162 , -1158.3 , 5.200932001
+163.2393162 , -965.25 , 1.339932001
+163.2393162 , -772.2 , 2.521067999
+163.2393162 , -579.15 , 6.382067999
+163.2393162 , -386.1 , 10.243068
+163.2393162 , -193.05 , 14.104068
+163.2393162 , 0 , 17.965068
+163.2393162 , 193.05 , 21.826068
+163.2393162 , 386.1 , 25.687068
+163.2393162 , 579.15 , 29.548068
+163.2393162 , 772.2 , 33.409068
+163.2393162 , 965.25 , 37.270068
+163.2393162 , 1158.3 , 41.131068
+163.2393162 , 1351.35 , 44.992068
+163.2393162 , 1544.4 , 48.853068
+163.2393162 , 1737.45 , 52.714068
+163.2393162 , 1930.5 , 56.575068
+163.2393162 , 2123.55 , 60.436068
+163.2393162 , 2316.6 , 64.297068
+163.2393162 , 2509.65 , 68.158068
+163.2393162 , 2702.7 , 72.019068
+163.2393162 , 2895.75 , 75.880068
+163.2393162 , 3088.8 , 79.741068
+163.2393162 , 3281.85 , 83.602068
+163.2393162 , 3474.9 , 87.463068
+163.2393162 , 3667.95 , 91.324068
+163.2393162 , 3861 , 95.185068
+163.2393162 , 4054.05 , 99.046068
+163.2393162 , 4247.1 , 102.907068
+163.2393162 , 4440.15 , 106.768068
+163.2393162 , 4633.2 , 110.629068
+163.2393162 , 4826.25 , 114.490068
+163.2393162 , 5019.3 , 118.351068
+163.2393162 , 5212.35 , 122.212068
+163.2393162 , 5405.4 , 126.073068
+163.2393162 , 5598.45 , 129.934068
+163.2393162 , 5791.5 , 133.795068
+163.2393162 , 5984.55 , 137.656068
+163.2393162 , 6177.6 , 141.517068
+204.042735 , -6177.6 , 104.956764
+204.042735 , -5984.55 , 101.095764
+204.042735 , -5791.5 , 97.234764
+204.042735 , -5598.45 , 93.373764
+204.042735 , -5405.4 , 89.512764
+204.042735 , -5212.35 , 85.651764
+204.042735 , -5019.3 , 81.790764
+204.042735 , -4826.25 , 77.929764
+204.042735 , -4633.2 , 74.068764
+204.042735 , -4440.15 , 70.207764
+204.042735 , -4247.1 , 66.346764
+204.042735 , -4054.05 , 62.485764
+204.042735 , -3861 , 58.624764
+204.042735 , -3667.95 , 54.763764
+204.042735 , -3474.9 , 50.902764
+204.042735 , -3281.85 , 47.041764
+204.042735 , -3088.8 , 43.180764
+204.042735 , -2895.75 , 39.319764
+204.042735 , -2702.7 , 35.458764
+204.042735 , -2509.65 , 31.597764
+204.042735 , -2316.6 , 27.736764
+204.042735 , -2123.55 , 23.875764
+204.042735 , -1930.5 , 20.014764
+204.042735 , -1737.45 , 16.153764
+204.042735 , -1544.4 , 12.292764
+204.042735 , -1351.35 , 8.431764001
+204.042735 , -1158.3 , 4.570764001
+204.042735 , -965.25 , 0.709764001
+204.042735 , -772.2 , 3.151235999
+204.042735 , -579.15 , 7.012235999
+204.042735 , -386.1 , 10.873236
+204.042735 , -193.05 , 14.734236
+204.042735 , 0 , 18.595236
+204.042735 , 193.05 , 22.456236
+204.042735 , 386.1 , 26.317236
+204.042735 , 579.15 , 30.178236
+204.042735 , 772.2 , 34.039236
+204.042735 , 965.25 , 37.900236
+204.042735 , 1158.3 , 41.761236
+204.042735 , 1351.35 , 45.622236
+204.042735 , 1544.4 , 49.483236
+204.042735 , 1737.45 , 53.344236
+204.042735 , 1930.5 , 57.205236
+204.042735 , 2123.55 , 61.066236
+204.042735 , 2316.6 , 64.927236
+204.042735 , 2509.65 , 68.788236
+204.042735 , 2702.7 , 72.649236
+204.042735 , 2895.75 , 76.510236
+204.042735 , 3088.8 , 80.371236
+204.042735 , 3281.85 , 84.232236
+204.042735 , 3474.9 , 88.093236
+204.042735 , 3667.95 , 91.954236
+204.042735 , 3861 , 95.815236
+204.042735 , 4054.05 , 99.676236
+204.042735 , 4247.1 , 103.537236
+204.042735 , 4440.15 , 107.398236
+204.042735 , 4633.2 , 111.259236
+204.042735 , 4826.25 , 115.120236
+204.042735 , 5019.3 , 118.981236
+204.042735 , 5212.35 , 122.842236
+204.042735 , 5405.4 , 126.703236
+204.042735 , 5598.45 , 130.564236
+204.042735 , 5791.5 , 134.425236
+204.042735 , 5984.55 , 138.286236
+204.042735 , 6177.6 , 142.147236
+244.8547009 , -6177.6 , 104.326464
+244.8547009 , -5984.55 , 100.465464
+244.8547009 , -5791.5 , 96.604464
+244.8547009 , -5598.45 , 92.743464
+244.8547009 , -5405.4 , 88.882464
+244.8547009 , -5212.35 , 85.021464
+244.8547009 , -5019.3 , 81.160464
+244.8547009 , -4826.25 , 77.299464
+244.8547009 , -4633.2 , 73.438464
+244.8547009 , -4440.15 , 69.577464
+244.8547009 , -4247.1 , 65.716464
+244.8547009 , -4054.05 , 61.855464
+244.8547009 , -3861 , 57.994464
+244.8547009 , -3667.95 , 54.133464
+244.8547009 , -3474.9 , 50.272464
+244.8547009 , -3281.85 , 46.411464
+244.8547009 , -3088.8 , 42.550464
+244.8547009 , -2895.75 , 38.689464
+244.8547009 , -2702.7 , 34.828464
+244.8547009 , -2509.65 , 30.967464
+244.8547009 , -2316.6 , 27.106464
+244.8547009 , -2123.55 , 23.245464
+244.8547009 , -1930.5 , 19.384464
+244.8547009 , -1737.45 , 15.523464
+244.8547009 , -1544.4 , 11.662464
+244.8547009 , -1351.35 , 7.801463999
+244.8547009 , -1158.3 , 3.940463999
+244.8547009 , -965.25 , 0.079463999
+244.8547009 , -772.2 , 3.781536001
+244.8547009 , -579.15 , 7.642536001
+244.8547009 , -386.1 , 11.503536
+244.8547009 , -193.05 , 15.364536
+244.8547009 , 0 , 19.225536
+244.8547009 , 193.05 , 23.086536
+244.8547009 , 386.1 , 26.947536
+244.8547009 , 579.15 , 30.808536
+244.8547009 , 772.2 , 34.669536
+244.8547009 , 965.25 , 38.530536
+244.8547009 , 1158.3 , 42.391536
+244.8547009 , 1351.35 , 46.252536
+244.8547009 , 1544.4 , 50.113536
+244.8547009 , 1737.45 , 53.974536
+244.8547009 , 1930.5 , 57.835536
+244.8547009 , 2123.55 , 61.696536
+244.8547009 , 2316.6 , 65.557536
+244.8547009 , 2509.65 , 69.418536
+244.8547009 , 2702.7 , 73.279536
+244.8547009 , 2895.75 , 77.140536
+244.8547009 , 3088.8 , 81.001536
+244.8547009 , 3281.85 , 84.862536
+244.8547009 , 3474.9 , 88.723536
+244.8547009 , 3667.95 , 92.584536
+244.8547009 , 3861 , 96.445536
+244.8547009 , 4054.05 , 100.306536
+244.8547009 , 4247.1 , 104.167536
+244.8547009 , 4440.15 , 108.028536
+244.8547009 , 4633.2 , 111.889536
+244.8547009 , 4826.25 , 115.750536
+244.8547009 , 5019.3 , 119.611536
+244.8547009 , 5212.35 , 123.472536
+244.8547009 , 5405.4 , 127.333536
+244.8547009 , 5598.45 , 131.194536
+244.8547009 , 5791.5 , 135.055536
+244.8547009 , 5984.55 , 138.916536
+244.8547009 , 6177.6 , 142.777536
+285.6666667 , -6177.6 , 103.696164
+285.6666667 , -5984.55 , 99.835164
+285.6666667 , -5791.5 , 95.974164
+285.6666667 , -5598.45 , 92.113164
+285.6666667 , -5405.4 , 88.252164
+285.6666667 , -5212.35 , 84.391164
+285.6666667 , -5019.3 , 80.530164
+285.6666667 , -4826.25 , 76.669164
+285.6666667 , -4633.2 , 72.808164
+285.6666667 , -4440.15 , 68.947164
+285.6666667 , -4247.1 , 65.086164
+285.6666667 , -4054.05 , 61.225164
+285.6666667 , -3861 , 57.364164
+285.6666667 , -3667.95 , 53.503164
+285.6666667 , -3474.9 , 49.642164
+285.6666667 , -3281.85 , 45.781164
+285.6666667 , -3088.8 , 41.920164
+285.6666667 , -2895.75 , 38.059164
+285.6666667 , -2702.7 , 34.198164
+285.6666667 , -2509.65 , 30.337164
+285.6666667 , -2316.6 , 26.476164
+285.6666667 , -2123.55 , 22.615164
+285.6666667 , -1930.5 , 18.754164
+285.6666667 , -1737.45 , 14.893164
+285.6666667 , -1544.4 , 11.032164
+285.6666667 , -1351.35 , 7.171163999
+285.6666667 , -1158.3 , 3.310163999
+285.6666667 , -965.25 , 0.550836001
+285.6666667 , -772.2 , 4.411836001
+285.6666667 , -579.15 , 8.272836001
+285.6666667 , -386.1 , 12.133836
+285.6666667 , -193.05 , 15.994836
+285.6666667 , 0 , 19.855836
+285.6666667 , 193.05 , 23.716836
+285.6666667 , 386.1 , 27.577836
+285.6666667 , 579.15 , 31.438836
+285.6666667 , 772.2 , 35.299836
+285.6666667 , 965.25 , 39.160836
+285.6666667 , 1158.3 , 43.021836
+285.6666667 , 1351.35 , 46.882836
+285.6666667 , 1544.4 , 50.743836
+285.6666667 , 1737.45 , 54.604836
+285.6666667 , 1930.5 , 58.465836
+285.6666667 , 2123.55 , 62.326836
+285.6666667 , 2316.6 , 66.187836
+285.6666667 , 2509.65 , 70.048836
+285.6666667 , 2702.7 , 73.909836
+285.6666667 , 2895.75 , 77.770836
+285.6666667 , 3088.8 , 81.631836
+285.6666667 , 3281.85 , 85.492836
+285.6666667 , 3474.9 , 89.353836
+285.6666667 , 3667.95 , 93.214836
+285.6666667 , 3861 , 97.075836
+285.6666667 , 4054.05 , 100.936836
+285.6666667 , 4247.1 , 104.797836
+285.6666667 , 4440.15 , 108.658836
+285.6666667 , 4633.2 , 112.519836
+285.6666667 , 4826.25 , 116.380836
+285.6666667 , 5019.3 , 120.241836
+285.6666667 , 5212.35 , 124.102836
+285.6666667 , 5405.4 , 127.963836
+285.6666667 , 5598.45 , 131.824836
+285.6666667 , 5791.5 , 135.685836
+285.6666667 , 5984.55 , 139.546836
+285.6666667 , 6177.6 , 143.407836
+326.4700855 , -6177.6 , 103.065996
+326.4700855 , -5984.55 , 99.204996
+326.4700855 , -5791.5 , 95.343996
+326.4700855 , -5598.45 , 91.482996
+326.4700855 , -5405.4 , 87.621996
+326.4700855 , -5212.35 , 83.760996
+326.4700855 , -5019.3 , 79.899996
+326.4700855 , -4826.25 , 76.038996
+326.4700855 , -4633.2 , 72.177996
+326.4700855 , -4440.15 , 68.316996
+326.4700855 , -4247.1 , 64.455996
+326.4700855 , -4054.05 , 60.594996
+326.4700855 , -3861 , 56.733996
+326.4700855 , -3667.95 , 52.872996
+326.4700855 , -3474.9 , 49.011996
+326.4700855 , -3281.85 , 45.150996
+326.4700855 , -3088.8 , 41.289996
+326.4700855 , -2895.75 , 37.428996
+326.4700855 , -2702.7 , 33.567996
+326.4700855 , -2509.65 , 29.706996
+326.4700855 , -2316.6 , 25.845996
+326.4700855 , -2123.55 , 21.984996
+326.4700855 , -1930.5 , 18.123996
+326.4700855 , -1737.45 , 14.262996
+326.4700855 , -1544.4 , 10.401996
+326.4700855 , -1351.35 , 6.540996
+326.4700855 , -1158.3 , 2.679996
+326.4700855 , -965.25 , 1.181004
+326.4700855 , -772.2 , 5.042004
+326.4700855 , -579.15 , 8.903004
+326.4700855 , -386.1 , 12.764004
+326.4700855 , -193.05 , 16.625004
+326.4700855 , 0 , 20.486004
+326.4700855 , 193.05 , 24.347004
+326.4700855 , 386.1 , 28.208004
+326.4700855 , 579.15 , 32.069004
+326.4700855 , 772.2 , 35.930004
+326.4700855 , 965.25 , 39.791004
+326.4700855 , 1158.3 , 43.652004
+326.4700855 , 1351.35 , 47.513004
+326.4700855 , 1544.4 , 51.374004
+326.4700855 , 1737.45 , 55.235004
+326.4700855 , 1930.5 , 59.096004
+326.4700855 , 2123.55 , 62.957004
+326.4700855 , 2316.6 , 66.818004
+326.4700855 , 2509.65 , 70.679004
+326.4700855 , 2702.7 , 74.540004
+326.4700855 , 2895.75 , 78.401004
+326.4700855 , 3088.8 , 82.262004
+326.4700855 , 3281.85 , 86.123004
+326.4700855 , 3474.9 , 89.984004
+326.4700855 , 3667.95 , 93.845004
+326.4700855 , 3861 , 97.706004
+326.4700855 , 4054.05 , 101.567004
+326.4700855 , 4247.1 , 105.428004
+326.4700855 , 4440.15 , 109.289004
+326.4700855 , 4633.2 , 113.150004
+326.4700855 , 4826.25 , 117.011004
+326.4700855 , 5019.3 , 120.872004
+326.4700855 , 5212.35 , 124.733004
+326.4700855 , 5405.4 , 128.594004
+326.4700855 , 5598.45 , 132.455004
+326.4700855 , 5791.5 , 136.316004
+326.4700855 , 5984.55 , 140.177004
+326.4700855 , 6177.6 , 144.038004
+367.2820513 , -6177.6 , 102.435696
+367.2820513 , -5984.55 , 98.574696
+367.2820513 , -5791.5 , 94.713696
+367.2820513 , -5598.45 , 90.852696
+367.2820513 , -5405.4 , 86.991696
+367.2820513 , -5212.35 , 83.130696
+367.2820513 , -5019.3 , 79.269696
+367.2820513 , -4826.25 , 75.408696
+367.2820513 , -4633.2 , 71.547696
+367.2820513 , -4440.15 , 67.686696
+367.2820513 , -4247.1 , 63.825696
+367.2820513 , -4054.05 , 59.964696
+367.2820513 , -3861 , 56.103696
+367.2820513 , -3667.95 , 52.242696
+367.2820513 , -3474.9 , 48.381696
+367.2820513 , -3281.85 , 44.520696
+367.2820513 , -3088.8 , 40.659696
+367.2820513 , -2895.75 , 36.798696
+367.2820513 , -2702.7 , 32.937696
+367.2820513 , -2509.65 , 29.076696
+367.2820513 , -2316.6 , 25.215696
+367.2820513 , -2123.55 , 21.354696
+367.2820513 , -1930.5 , 17.493696
+367.2820513 , -1737.45 , 13.632696
+367.2820513 , -1544.4 , 9.771696
+367.2820513 , -1351.35 , 5.910696
+367.2820513 , -1158.3 , 2.049696
+367.2820513 , -965.25 , 1.811304
+367.2820513 , -772.2 , 5.672304
+367.2820513 , -579.15 , 9.533304
+367.2820513 , -386.1 , 13.394304
+367.2820513 , -193.05 , 17.255304
+367.2820513 , 0 , 21.116304
+367.2820513 , 193.05 , 24.977304
+367.2820513 , 386.1 , 28.838304
+367.2820513 , 579.15 , 32.699304
+367.2820513 , 772.2 , 36.560304
+367.2820513 , 965.25 , 40.421304
+367.2820513 , 1158.3 , 44.282304
+367.2820513 , 1351.35 , 48.143304
+367.2820513 , 1544.4 , 52.004304
+367.2820513 , 1737.45 , 55.865304
+367.2820513 , 1930.5 , 59.726304
+367.2820513 , 2123.55 , 63.587304
+367.2820513 , 2316.6 , 67.448304
+367.2820513 , 2509.65 , 71.309304
+367.2820513 , 2702.7 , 75.170304
+367.2820513 , 2895.75 , 79.031304
+367.2820513 , 3088.8 , 82.892304
+367.2820513 , 3281.85 , 86.753304
+367.2820513 , 3474.9 , 90.614304
+367.2820513 , 3667.95 , 94.475304
+367.2820513 , 3861 , 98.336304
+367.2820513 , 4054.05 , 102.197304
+367.2820513 , 4247.1 , 106.058304
+367.2820513 , 4440.15 , 109.919304
+367.2820513 , 4633.2 , 113.780304
+367.2820513 , 4826.25 , 117.641304
+367.2820513 , 5019.3 , 121.502304
+367.2820513 , 5212.35 , 125.363304
+367.2820513 , 5405.4 , 129.224304
+367.2820513 , 5598.45 , 133.085304
+367.2820513 , 5791.5 , 136.946304
+367.2820513 , 5984.55 , 140.807304
+367.2820513 , 6177.6 , 144.668304
+408.0854701 , -6177.6 , 101.805528
+408.0854701 , -5984.55 , 97.944528
+408.0854701 , -5791.5 , 94.083528
+408.0854701 , -5598.45 , 90.222528
+408.0854701 , -5405.4 , 86.361528
+408.0854701 , -5212.35 , 82.500528
+408.0854701 , -5019.3 , 78.639528
+408.0854701 , -4826.25 , 74.778528
+408.0854701 , -4633.2 , 70.917528
+408.0854701 , -4440.15 , 67.056528
+408.0854701 , -4247.1 , 63.195528
+408.0854701 , -4054.05 , 59.334528
+408.0854701 , -3861 , 55.473528
+408.0854701 , -3667.95 , 51.612528
+408.0854701 , -3474.9 , 47.751528
+408.0854701 , -3281.85 , 43.890528
+408.0854701 , -3088.8 , 40.029528
+408.0854701 , -2895.75 , 36.168528
+408.0854701 , -2702.7 , 32.307528
+408.0854701 , -2509.65 , 28.446528
+408.0854701 , -2316.6 , 24.585528
+408.0854701 , -2123.55 , 20.724528
+408.0854701 , -1930.5 , 16.863528
+408.0854701 , -1737.45 , 13.002528
+408.0854701 , -1544.4 , 9.141528
+408.0854701 , -1351.35 , 5.280528
+408.0854701 , -1158.3 , 1.419528
+408.0854701 , -965.25 , 2.441472
+408.0854701 , -772.2 , 6.302472
+408.0854701 , -579.15 , 10.163472
+408.0854701 , -386.1 , 14.024472
+408.0854701 , -193.05 , 17.885472
+408.0854701 , 0 , 21.746472
+408.0854701 , 193.05 , 25.607472
+408.0854701 , 386.1 , 29.468472
+408.0854701 , 579.15 , 33.329472
+408.0854701 , 772.2 , 37.190472
+408.0854701 , 965.25 , 41.051472
+408.0854701 , 1158.3 , 44.912472
+408.0854701 , 1351.35 , 48.773472
+408.0854701 , 1544.4 , 52.634472
+408.0854701 , 1737.45 , 56.495472
+408.0854701 , 1930.5 , 60.356472
+408.0854701 , 2123.55 , 64.217472
+408.0854701 , 2316.6 , 68.078472
+408.0854701 , 2509.65 , 71.939472
+408.0854701 , 2702.7 , 75.800472
+408.0854701 , 2895.75 , 79.661472
+408.0854701 , 3088.8 , 83.522472
+408.0854701 , 3281.85 , 87.383472
+408.0854701 , 3474.9 , 91.244472
+408.0854701 , 3667.95 , 95.105472
+408.0854701 , 3861 , 98.966472
+408.0854701 , 4054.05 , 102.827472
+408.0854701 , 4247.1 , 106.688472
+408.0854701 , 4440.15 , 110.549472
+408.0854701 , 4633.2 , 114.410472
+408.0854701 , 4826.25 , 118.271472
+408.0854701 , 5019.3 , 122.132472
+408.0854701 , 5212.35 , 125.993472
+408.0854701 , 5405.4 , 129.854472
+408.0854701 , 5598.45 , 133.715472
+408.0854701 , 5791.5 , 137.576472
+408.0854701 , 5984.55 , 141.437472
+408.0854701 , 6177.6 , 145.298472
+448.8974359 , -6177.6 , 101.175228
+448.8974359 , -5984.55 , 97.314228
+448.8974359 , -5791.5 , 93.453228
+448.8974359 , -5598.45 , 89.592228
+448.8974359 , -5405.4 , 85.731228
+448.8974359 , -5212.35 , 81.870228
+448.8974359 , -5019.3 , 78.009228
+448.8974359 , -4826.25 , 74.148228
+448.8974359 , -4633.2 , 70.287228
+448.8974359 , -4440.15 , 66.426228
+448.8974359 , -4247.1 , 62.565228
+448.8974359 , -4054.05 , 58.704228
+448.8974359 , -3861 , 54.843228
+448.8974359 , -3667.95 , 50.982228
+448.8974359 , -3474.9 , 47.121228
+448.8974359 , -3281.85 , 43.260228
+448.8974359 , -3088.8 , 39.399228
+448.8974359 , -2895.75 , 35.538228
+448.8974359 , -2702.7 , 31.677228
+448.8974359 , -2509.65 , 27.816228
+448.8974359 , -2316.6 , 23.955228
+448.8974359 , -2123.55 , 20.094228
+448.8974359 , -1930.5 , 16.233228
+448.8974359 , -1737.45 , 12.372228
+448.8974359 , -1544.4 , 8.511228
+448.8974359 , -1351.35 , 4.650228
+448.8974359 , -1158.3 , 0.789228
+448.8974359 , -965.25 , 3.071772
+448.8974359 , -772.2 , 6.932772
+448.8974359 , -579.15 , 10.793772
+448.8974359 , -386.1 , 14.654772
+448.8974359 , -193.05 , 18.515772
+448.8974359 , 0 , 22.376772
+448.8974359 , 193.05 , 26.237772
+448.8974359 , 386.1 , 30.098772
+448.8974359 , 579.15 , 33.959772
+448.8974359 , 772.2 , 37.820772
+448.8974359 , 965.25 , 41.681772
+448.8974359 , 1158.3 , 45.542772
+448.8974359 , 1351.35 , 49.403772
+448.8974359 , 1544.4 , 53.264772
+448.8974359 , 1737.45 , 57.125772
+448.8974359 , 1930.5 , 60.986772
+448.8974359 , 2123.55 , 64.847772
+448.8974359 , 2316.6 , 68.708772
+448.8974359 , 2509.65 , 72.569772
+448.8974359 , 2702.7 , 76.430772
+448.8974359 , 2895.75 , 80.291772
+448.8974359 , 3088.8 , 84.152772
+448.8974359 , 3281.85 , 88.013772
+448.8974359 , 3474.9 , 91.874772
+448.8974359 , 3667.95 , 95.735772
+448.8974359 , 3861 , 99.596772
+448.8974359 , 4054.05 , 103.457772
+448.8974359 , 4247.1 , 107.318772
+448.8974359 , 4440.15 , 111.179772
+448.8974359 , 4633.2 , 115.040772
+448.8974359 , 4826.25 , 118.901772
+448.8974359 , 5019.3 , 122.762772
+448.8974359 , 5212.35 , 126.623772
+448.8974359 , 5405.4 , 130.484772
+448.8974359 , 5598.45 , 134.345772
+448.8974359 , 5791.5 , 138.206772
+448.8974359 , 5984.55 , 142.067772
+448.8974359 , 6177.6 , 145.928772
+489.7094017 , -6177.6 , 100.544928
+489.7094017 , -5984.55 , 96.683928
+489.7094017 , -5791.5 , 92.822928
+489.7094017 , -5598.45 , 88.961928
+489.7094017 , -5405.4 , 85.100928
+489.7094017 , -5212.35 , 81.239928
+489.7094017 , -5019.3 , 77.378928
+489.7094017 , -4826.25 , 73.517928
+489.7094017 , -4633.2 , 69.656928
+489.7094017 , -4440.15 , 65.795928
+489.7094017 , -4247.1 , 61.934928
+489.7094017 , -4054.05 , 58.073928
+489.7094017 , -3861 , 54.212928
+489.7094017 , -3667.95 , 50.351928
+489.7094017 , -3474.9 , 46.490928
+489.7094017 , -3281.85 , 42.629928
+489.7094017 , -3088.8 , 38.768928
+489.7094017 , -2895.75 , 34.907928
+489.7094017 , -2702.7 , 31.046928
+489.7094017 , -2509.65 , 27.185928
+489.7094017 , -2316.6 , 23.324928
+489.7094017 , -2123.55 , 19.463928
+489.7094017 , -1930.5 , 15.602928
+489.7094017 , -1737.45 , 11.741928
+489.7094017 , -1544.4 , 7.880928
+489.7094017 , -1351.35 , 4.019928
+489.7094017 , -1158.3 , 0.158928
+489.7094017 , -965.25 , 3.702072
+489.7094017 , -772.2 , 7.563072
+489.7094017 , -579.15 , 11.424072
+489.7094017 , -386.1 , 15.285072
+489.7094017 , -193.05 , 19.146072
+489.7094017 , 0 , 23.007072
+489.7094017 , 193.05 , 26.868072
+489.7094017 , 386.1 , 30.729072
+489.7094017 , 579.15 , 34.590072
+489.7094017 , 772.2 , 38.451072
+489.7094017 , 965.25 , 42.312072
+489.7094017 , 1158.3 , 46.173072
+489.7094017 , 1351.35 , 50.034072
+489.7094017 , 1544.4 , 53.895072
+489.7094017 , 1737.45 , 57.756072
+489.7094017 , 1930.5 , 61.617072
+489.7094017 , 2123.55 , 65.478072
+489.7094017 , 2316.6 , 69.339072
+489.7094017 , 2509.65 , 73.200072
+489.7094017 , 2702.7 , 77.061072
+489.7094017 , 2895.75 , 80.922072
+489.7094017 , 3088.8 , 84.783072
+489.7094017 , 3281.85 , 88.644072
+489.7094017 , 3474.9 , 92.505072
+489.7094017 , 3667.95 , 96.366072
+489.7094017 , 3861 , 100.227072
+489.7094017 , 4054.05 , 104.088072
+489.7094017 , 4247.1 , 107.949072
+489.7094017 , 4440.15 , 111.810072
+489.7094017 , 4633.2 , 115.671072
+489.7094017 , 4826.25 , 119.532072
+489.7094017 , 5019.3 , 123.393072
+489.7094017 , 5212.35 , 127.254072
+489.7094017 , 5405.4 , 131.115072
+489.7094017 , 5598.45 , 134.976072
+489.7094017 , 5791.5 , 138.837072
+489.7094017 , 5984.55 , 142.698072
+489.7094017 , 6177.6 , 146.559072
+816.1794872 , -6177.6 , 95.502924
+816.1794872 , -5984.55 , 91.641924
+816.1794872 , -5791.5 , 87.780924
+816.1794872 , -5598.45 , 83.919924
+816.1794872 , -5405.4 , 80.058924
+816.1794872 , -5212.35 , 76.197924
+816.1794872 , -5019.3 , 72.336924
+816.1794872 , -4826.25 , 68.475924
+816.1794872 , -4633.2 , 64.614924
+816.1794872 , -4440.15 , 60.753924
+816.1794872 , -4247.1 , 56.892924
+816.1794872 , -4054.05 , 53.031924
+816.1794872 , -3861 , 49.170924
+816.1794872 , -3667.95 , 45.309924
+816.1794872 , -3474.9 , 41.448924
+816.1794872 , -3281.85 , 37.587924
+816.1794872 , -3088.8 , 33.726924
+816.1794872 , -2895.75 , 29.865924
+816.1794872 , -2702.7 , 26.004924
+816.1794872 , -2509.65 , 22.143924
+816.1794872 , -2316.6 , 18.282924
+816.1794872 , -2123.55 , 14.421924
+816.1794872 , -1930.5 , 10.560924
+816.1794872 , -1737.45 , 6.699924
+816.1794872 , -1544.4 , 2.838924
+816.1794872 , -1351.35 , 1.022076
+816.1794872 , -1158.3 , 4.883076
+816.1794872 , -965.25 , 8.744076
+816.1794872 , -772.2 , 12.605076
+816.1794872 , -579.15 , 16.466076
+816.1794872 , -386.1 , 20.327076
+816.1794872 , -193.05 , 24.188076
+816.1794872 , 0 , 28.049076
+816.1794872 , 193.05 , 31.910076
+816.1794872 , 386.1 , 35.771076
+816.1794872 , 579.15 , 39.632076
+816.1794872 , 772.2 , 43.493076
+816.1794872 , 965.25 , 47.354076
+816.1794872 , 1158.3 , 51.215076
+816.1794872 , 1351.35 , 55.076076
+816.1794872 , 1544.4 , 58.937076
+816.1794872 , 1737.45 , 62.798076
+816.1794872 , 1930.5 , 66.659076
+816.1794872 , 2123.55 , 70.520076
+816.1794872 , 2316.6 , 74.381076
+816.1794872 , 2509.65 , 78.242076
+816.1794872 , 2702.7 , 82.103076
+816.1794872 , 2895.75 , 85.964076
+816.1794872 , 3088.8 , 89.825076
+816.1794872 , 3281.85 , 93.686076
+816.1794872 , 3474.9 , 97.547076
+816.1794872 , 3667.95 , 101.408076
+816.1794872 , 3861 , 105.269076
+816.1794872 , 4054.05 , 109.130076
+816.1794872 , 4247.1 , 112.991076
+816.1794872 , 4440.15 , 116.852076
+816.1794872 , 4633.2 , 120.713076
+816.1794872 , 4826.25 , 124.574076
+816.1794872 , 5019.3 , 128.435076
+816.1794872 , 5212.35 , 132.296076
+816.1794872 , 5405.4 , 136.157076
+816.1794872 , 5598.45 , 140.018076
+816.1794872 , 5791.5 , 143.879076
+816.1794872 , 5984.55 , 147.740076
+816.1794872 , 6177.6 , 151.601076
+1020.25641 , -6177.6 , 92.35116
+1020.25641 , -5984.55 , 88.49016
+1020.25641 , -5791.5 , 84.62916
+1020.25641 , -5598.45 , 80.76816
+1020.25641 , -5405.4 , 76.90716
+1020.25641 , -5212.35 , 73.04616
+1020.25641 , -5019.3 , 69.18516
+1020.25641 , -4826.25 , 65.32416
+1020.25641 , -4633.2 , 61.46316
+1020.25641 , -4440.15 , 57.60216
+1020.25641 , -4247.1 , 53.74116
+1020.25641 , -4054.05 , 49.88016
+1020.25641 , -3861 , 46.01916
+1020.25641 , -3667.95 , 42.15816
+1020.25641 , -3474.9 , 38.29716
+1020.25641 , -3281.85 , 34.43616
+1020.25641 , -3088.8 , 30.57516
+1020.25641 , -2895.75 , 26.71416
+1020.25641 , -2702.7 , 22.85316
+1020.25641 , -2509.65 , 18.99216
+1020.25641 , -2316.6 , 15.13116
+1020.25641 , -2123.55 , 11.27016
+1020.25641 , -1930.5 , 7.409160004
+1020.25641 , -1737.45 , 3.548160004
+1020.25641 , -1544.4 , 0.312839996
+1020.25641 , -1351.35 , 4.173839996
+1020.25641 , -1158.3 , 8.034839996
+1020.25641 , -965.25 , 11.89584
+1020.25641 , -772.2 , 15.75684
+1020.25641 , -579.15 , 19.61784
+1020.25641 , -386.1 , 23.47884
+1020.25641 , -193.05 , 27.33984
+1020.25641 , 0 , 31.20084
+1020.25641 , 193.05 , 35.06184
+1020.25641 , 386.1 , 38.92284
+1020.25641 , 579.15 , 42.78384
+1020.25641 , 772.2 , 46.64484
+1020.25641 , 965.25 , 50.50584
+1020.25641 , 1158.3 , 54.36684
+1020.25641 , 1351.35 , 58.22784
+1020.25641 , 1544.4 , 62.08884
+1020.25641 , 1737.45 , 65.94984
+1020.25641 , 1930.5 , 69.81084
+1020.25641 , 2123.55 , 73.67184
+1020.25641 , 2316.6 , 77.53284
+1020.25641 , 2509.65 , 81.39384
+1020.25641 , 2702.7 , 85.25484
+1020.25641 , 2895.75 , 89.11584
+1020.25641 , 3088.8 , 92.97684
+1020.25641 , 3281.85 , 96.83784
+1020.25641 , 3474.9 , 100.69884
+1020.25641 , 3667.95 , 104.55984
+1020.25641 , 3861 , 108.42084
+1020.25641 , 4054.05 , 112.28184
+1020.25641 , 4247.1 , 116.14284
+1020.25641 , 4440.15 , 120.00384
+1020.25641 , 4633.2 , 123.86484
+1020.25641 , 4826.25 , 127.72584
+1020.25641 , 5019.3 , 131.58684
+1020.25641 , 5212.35 , 135.44784
+1020.25641 , 5405.4 , 139.30884
+1020.25641 , 5598.45 , 143.16984
+1020.25641 , 5791.5 , 147.03084
+1020.25641 , 5984.55 , 150.89184
+1020.25641 , 6177.6 , 154.75284
+1224.273504 , -6177.6 , 89.20032
+1224.273504 , -5984.55 , 85.33932
+1224.273504 , -5791.5 , 81.47832
+1224.273504 , -5598.45 , 77.61732
+1224.273504 , -5405.4 , 73.75632
+1224.273504 , -5212.35 , 69.89532
+1224.273504 , -5019.3 , 66.03432
+1224.273504 , -4826.25 , 62.17332
+1224.273504 , -4633.2 , 58.31232
+1224.273504 , -4440.15 , 54.45132
+1224.273504 , -4247.1 , 50.59032
+1224.273504 , -4054.05 , 46.72932
+1224.273504 , -3861 , 42.86832
+1224.273504 , -3667.95 , 39.00732
+1224.273504 , -3474.9 , 35.14632
+1224.273504 , -3281.85 , 31.28532
+1224.273504 , -3088.8 , 27.42432
+1224.273504 , -2895.75 , 23.56332
+1224.273504 , -2702.7 , 19.70232
+1224.273504 , -2509.65 , 15.84132
+1224.273504 , -2316.6 , 11.98032
+1224.273504 , -2123.55 , 8.119320004
+1224.273504 , -1930.5 , 4.258320004
+1224.273504 , -1737.45 , 0.397320004
+1224.273504 , -1544.4 , 3.463679996
+1224.273504 , -1351.35 , 7.324679996
+1224.273504 , -1158.3 , 11.18568
+1224.273504 , -965.25 , 15.04668
+1224.273504 , -772.2 , 18.90768
+1224.273504 , -579.15 , 22.76868
+1224.273504 , -386.1 , 26.62968
+1224.273504 , -193.05 , 30.49068
+1224.273504 , 0 , 34.35168
+1224.273504 , 193.05 , 38.21268
+1224.273504 , 386.1 , 42.07368
+1224.273504 , 579.15 , 45.93468
+1224.273504 , 772.2 , 49.79568
+1224.273504 , 965.25 , 53.65668
+1224.273504 , 1158.3 , 57.51768
+1224.273504 , 1351.35 , 61.37868
+1224.273504 , 1544.4 , 65.23968
+1224.273504 , 1737.45 , 69.10068
+1224.273504 , 1930.5 , 72.96168
+1224.273504 , 2123.55 , 76.82268
+1224.273504 , 2316.6 , 80.68368
+1224.273504 , 2509.65 , 84.54468
+1224.273504 , 2702.7 , 88.40568
+1224.273504 , 2895.75 , 92.26668
+1224.273504 , 3088.8 , 96.12768
+1224.273504 , 3281.85 , 99.98868
+1224.273504 , 3474.9 , 103.84968
+1224.273504 , 3667.95 , 107.71068
+1224.273504 , 3861 , 111.57168
+1224.273504 , 4054.05 , 115.43268
+1224.273504 , 4247.1 , 119.29368
+1224.273504 , 4440.15 , 123.15468
+1224.273504 , 4633.2 , 127.01568
+1224.273504 , 4826.25 , 130.87668
+1224.273504 , 5019.3 , 134.73768
+1224.273504 , 5212.35 , 138.59868
+1224.273504 , 5405.4 , 142.45968
+1224.273504 , 5598.45 , 146.32068
+1224.273504 , 5791.5 , 150.18168
+1224.273504 , 5984.55 , 154.04268
+1224.273504 , 6177.6 , 157.90368
+1428.290598 , -6177.6 , 86.04948
+1428.290598 , -5984.55 , 82.18848
+1428.290598 , -5791.5 , 78.32748
+1428.290598 , -5598.45 , 74.46648
+1428.290598 , -5405.4 , 70.60548
+1428.290598 , -5212.35 , 66.74448
+1428.290598 , -5019.3 , 62.88348
+1428.290598 , -4826.25 , 59.02248
+1428.290598 , -4633.2 , 55.16148
+1428.290598 , -4440.15 , 51.30048
+1428.290598 , -4247.1 , 47.43948
+1428.290598 , -4054.05 , 43.57848
+1428.290598 , -3861 , 39.71748
+1428.290598 , -3667.95 , 35.85648
+1428.290598 , -3474.9 , 31.99548
+1428.290598 , -3281.85 , 28.13448
+1428.290598 , -3088.8 , 24.27348
+1428.290598 , -2895.75 , 20.41248
+1428.290598 , -2702.7 , 16.55148
+1428.290598 , -2509.65 , 12.69048
+1428.290598 , -2316.6 , 8.829480004
+1428.290598 , -2123.55 , 4.968480004
+1428.290598 , -1930.5 , 1.107480004
+1428.290598 , -1737.45 , 2.753519996
+1428.290598 , -1544.4 , 6.614519996
+1428.290598 , -1351.35 , 10.47552
+1428.290598 , -1158.3 , 14.33652
+1428.290598 , -965.25 , 18.19752
+1428.290598 , -772.2 , 22.05852
+1428.290598 , -579.15 , 25.91952
+1428.290598 , -386.1 , 29.78052
+1428.290598 , -193.05 , 33.64152
+1428.290598 , 0 , 37.50252
+1428.290598 , 193.05 , 41.36352
+1428.290598 , 386.1 , 45.22452
+1428.290598 , 579.15 , 49.08552
+1428.290598 , 772.2 , 52.94652
+1428.290598 , 965.25 , 56.80752
+1428.290598 , 1158.3 , 60.66852
+1428.290598 , 1351.35 , 64.52952
+1428.290598 , 1544.4 , 68.39052
+1428.290598 , 1737.45 , 72.25152
+1428.290598 , 1930.5 , 76.11252
+1428.290598 , 2123.55 , 79.97352
+1428.290598 , 2316.6 , 83.83452
+1428.290598 , 2509.65 , 87.69552
+1428.290598 , 2702.7 , 91.55652
+1428.290598 , 2895.75 , 95.41752
+1428.290598 , 3088.8 , 99.27852
+1428.290598 , 3281.85 , 103.13952
+1428.290598 , 3474.9 , 107.00052
+1428.290598 , 3667.95 , 110.86152
+1428.290598 , 3861 , 114.72252
+1428.290598 , 4054.05 , 118.58352
+1428.290598 , 4247.1 , 122.44452
+1428.290598 , 4440.15 , 126.30552
+1428.290598 , 4633.2 , 130.16652
+1428.290598 , 4826.25 , 134.02752
+1428.290598 , 5019.3 , 137.88852
+1428.290598 , 5212.35 , 141.74952
+1428.290598 , 5405.4 , 145.61052
+1428.290598 , 5598.45 , 149.47152
+1428.290598 , 5791.5 , 153.33252
+1428.290598 , 5984.55 , 157.19352
+1428.290598 , 6177.6 , 161.05452
+1632.393162 , -6177.6 , 82.89732001
+1632.393162 , -5984.55 , 79.03632001
+1632.393162 , -5791.5 , 75.17532001
+1632.393162 , -5598.45 , 71.31432001
+1632.393162 , -5405.4 , 67.45332001
+1632.393162 , -5212.35 , 63.59232001
+1632.393162 , -5019.3 , 59.73132001
+1632.393162 , -4826.25 , 55.87032001
+1632.393162 , -4633.2 , 52.00932001
+1632.393162 , -4440.15 , 48.14832001
+1632.393162 , -4247.1 , 44.28732001
+1632.393162 , -4054.05 , 40.42632001
+1632.393162 , -3861 , 36.56532001
+1632.393162 , -3667.95 , 32.70432001
+1632.393162 , -3474.9 , 28.84332001
+1632.393162 , -3281.85 , 24.98232001
+1632.393162 , -3088.8 , 21.12132001
+1632.393162 , -2895.75 , 17.26032001
+1632.393162 , -2702.7 , 13.39932001
+1632.393162 , -2509.65 , 9.538320006
+1632.393162 , -2316.6 , 5.677320006
+1632.393162 , -2123.55 , 1.816320006
+1632.393162 , -1930.5 , 2.044679994
+1632.393162 , -1737.45 , 5.905679994
+1632.393162 , -1544.4 , 9.766679994
+1632.393162 , -1351.35 , 13.62767999
+1632.393162 , -1158.3 , 17.48867999
+1632.393162 , -965.25 , 21.34967999
+1632.393162 , -772.2 , 25.21067999
+1632.393162 , -579.15 , 29.07167999
+1632.393162 , -386.1 , 32.93267999
+1632.393162 , -193.05 , 36.79367999
+1632.393162 , 0 , 40.65467999
+1632.393162 , 193.05 , 44.51567999
+1632.393162 , 386.1 , 48.37667999
+1632.393162 , 579.15 , 52.23767999
+1632.393162 , 772.2 , 56.09867999
+1632.393162 , 965.25 , 59.95967999
+1632.393162 , 1158.3 , 63.82067999
+1632.393162 , 1351.35 , 67.68167999
+1632.393162 , 1544.4 , 71.54267999
+1632.393162 , 1737.45 , 75.40367999
+1632.393162 , 1930.5 , 79.26467999
+1632.393162 , 2123.55 , 83.12567999
+1632.393162 , 2316.6 , 86.98667999
+1632.393162 , 2509.65 , 90.84767999
+1632.393162 , 2702.7 , 94.70867999
+1632.393162 , 2895.75 , 98.56967999
+1632.393162 , 3088.8 , 102.43068
+1632.393162 , 3281.85 , 106.29168
+1632.393162 , 3474.9 , 110.15268
+1632.393162 , 3667.95 , 114.01368
+1632.393162 , 3861 , 117.87468
+1632.393162 , 4054.05 , 121.73568
+1632.393162 , 4247.1 , 125.59668
+1632.393162 , 4440.15 , 129.45768
+1632.393162 , 4633.2 , 133.31868
+1632.393162 , 4826.25 , 137.17968
+1632.393162 , 5019.3 , 141.04068
+1632.393162 , 5212.35 , 144.90168
+1632.393162 , 5405.4 , 148.76268
+1632.393162 , 5598.45 , 152.62368
+1632.393162 , 5791.5 , 156.48468
+1632.393162 , 5984.55 , 160.34568
+1632.393162 , 6177.6 , 164.20668
+1836.410256 , -6177.6 , 79.74648001
+1836.410256 , -5984.55 , 75.88548001
+1836.410256 , -5791.5 , 72.02448001
+1836.410256 , -5598.45 , 68.16348001
+1836.410256 , -5405.4 , 64.30248001
+1836.410256 , -5212.35 , 60.44148001
+1836.410256 , -5019.3 , 56.58048001
+1836.410256 , -4826.25 , 52.71948001
+1836.410256 , -4633.2 , 48.85848001
+1836.410256 , -4440.15 , 44.99748001
+1836.410256 , -4247.1 , 41.13648001
+1836.410256 , -4054.05 , 37.27548001
+1836.410256 , -3861 , 33.41448001
+1836.410256 , -3667.95 , 29.55348001
+1836.410256 , -3474.9 , 25.69248001
+1836.410256 , -3281.85 , 21.83148001
+1836.410256 , -3088.8 , 17.97048001
+1836.410256 , -2895.75 , 14.10948001
+1836.410256 , -2702.7 , 10.24848001
+1836.410256 , -2509.65 , 6.387480006
+1836.410256 , -2316.6 , 2.526480006
+1836.410256 , -2123.55 , 1.334519994
+1836.410256 , -1930.5 , 5.195519994
+1836.410256 , -1737.45 , 9.056519994
+1836.410256 , -1544.4 , 12.91751999
+1836.410256 , -1351.35 , 16.77851999
+1836.410256 , -1158.3 , 20.63951999
+1836.410256 , -965.25 , 24.50051999
+1836.410256 , -772.2 , 28.36151999
+1836.410256 , -579.15 , 32.22251999
+1836.410256 , -386.1 , 36.08351999
+1836.410256 , -193.05 , 39.94451999
+1836.410256 , 0 , 43.80551999
+1836.410256 , 193.05 , 47.66651999
+1836.410256 , 386.1 , 51.52751999
+1836.410256 , 579.15 , 55.38851999
+1836.410256 , 772.2 , 59.24951999
+1836.410256 , 965.25 , 63.11051999
+1836.410256 , 1158.3 , 66.97151999
+1836.410256 , 1351.35 , 70.83251999
+1836.410256 , 1544.4 , 74.69351999
+1836.410256 , 1737.45 , 78.55451999
+1836.410256 , 1930.5 , 82.41551999
+1836.410256 , 2123.55 , 86.27651999
+1836.410256 , 2316.6 , 90.13751999
+1836.410256 , 2509.65 , 93.99851999
+1836.410256 , 2702.7 , 97.85951999
+1836.410256 , 2895.75 , 101.72052
+1836.410256 , 3088.8 , 105.58152
+1836.410256 , 3281.85 , 109.44252
+1836.410256 , 3474.9 , 113.30352
+1836.410256 , 3667.95 , 117.16452
+1836.410256 , 3861 , 121.02552
+1836.410256 , 4054.05 , 124.88652
+1836.410256 , 4247.1 , 128.74752
+1836.410256 , 4440.15 , 132.60852
+1836.410256 , 4633.2 , 136.46952
+1836.410256 , 4826.25 , 140.33052
+1836.410256 , 5019.3 , 144.19152
+1836.410256 , 5212.35 , 148.05252
+1836.410256 , 5405.4 , 151.91352
+1836.410256 , 5598.45 , 155.77452
+1836.410256 , 5791.5 , 159.63552
+1836.410256 , 5984.55 , 163.49652
+1836.410256 , 6177.6 , 167.35752
+2040.42735 , -6177.6 , 76.59564001
+2040.42735 , -5984.55 , 72.73464001
+2040.42735 , -5791.5 , 68.87364001
+2040.42735 , -5598.45 , 65.01264001
+2040.42735 , -5405.4 , 61.15164001
+2040.42735 , -5212.35 , 57.29064001
+2040.42735 , -5019.3 , 53.42964001
+2040.42735 , -4826.25 , 49.56864001
+2040.42735 , -4633.2 , 45.70764001
+2040.42735 , -4440.15 , 41.84664001
+2040.42735 , -4247.1 , 37.98564001
+2040.42735 , -4054.05 , 34.12464001
+2040.42735 , -3861 , 30.26364001
+2040.42735 , -3667.95 , 26.40264001
+2040.42735 , -3474.9 , 22.54164001
+2040.42735 , -3281.85 , 18.68064001
+2040.42735 , -3088.8 , 14.81964001
+2040.42735 , -2895.75 , 10.95864001
+2040.42735 , -2702.7 , 7.097640007
+2040.42735 , -2509.65 , 3.236640007
+2040.42735 , -2316.6 , 0.624359993
+2040.42735 , -2123.55 , 4.485359993
+2040.42735 , -1930.5 , 8.346359993
+2040.42735 , -1737.45 , 12.20735999
+2040.42735 , -1544.4 , 16.06835999
+2040.42735 , -1351.35 , 19.92935999
+2040.42735 , -1158.3 , 23.79035999
+2040.42735 , -965.25 , 27.65135999
+2040.42735 , -772.2 , 31.51235999
+2040.42735 , -579.15 , 35.37335999
+2040.42735 , -386.1 , 39.23435999
+2040.42735 , -193.05 , 43.09535999
+2040.42735 , 0 , 46.95635999
+2040.42735 , 193.05 , 50.81735999
+2040.42735 , 386.1 , 54.67835999
+2040.42735 , 579.15 , 58.53935999
+2040.42735 , 772.2 , 62.40035999
+2040.42735 , 965.25 , 66.26135999
+2040.42735 , 1158.3 , 70.12235999
+2040.42735 , 1351.35 , 73.98335999
+2040.42735 , 1544.4 , 77.84435999
+2040.42735 , 1737.45 , 81.70535999
+2040.42735 , 1930.5 , 85.56635999
+2040.42735 , 2123.55 , 89.42735999
+2040.42735 , 2316.6 , 93.28835999
+2040.42735 , 2509.65 , 97.14935999
+2040.42735 , 2702.7 , 101.01036
+2040.42735 , 2895.75 , 104.87136
+2040.42735 , 3088.8 , 108.73236
+2040.42735 , 3281.85 , 112.59336
+2040.42735 , 3474.9 , 116.45436
+2040.42735 , 3667.95 , 120.31536
+2040.42735 , 3861 , 124.17636
+2040.42735 , 4054.05 , 128.03736
+2040.42735 , 4247.1 , 131.89836
+2040.42735 , 4440.15 , 135.75936
+2040.42735 , 4633.2 , 139.62036
+2040.42735 , 4826.25 , 143.48136
+2040.42735 , 5019.3 , 147.34236
+2040.42735 , 5212.35 , 151.20336
+2040.42735 , 5405.4 , 155.06436
+2040.42735 , 5598.45 , 158.92536
+2040.42735 , 5791.5 , 162.78636
+2040.42735 , 5984.55 , 166.64736
+2040.42735 , 6177.6 , 170.50836
+2244.529915 , -6177.6 , 73.44347999
+2244.529915 , -5984.55 , 69.58247999
+2244.529915 , -5791.5 , 65.72147999
+2244.529915 , -5598.45 , 61.86047999
+2244.529915 , -5405.4 , 57.99947999
+2244.529915 , -5212.35 , 54.13847999
+2244.529915 , -5019.3 , 50.27747999
+2244.529915 , -4826.25 , 46.41647999
+2244.529915 , -4633.2 , 42.55547999
+2244.529915 , -4440.15 , 38.69447999
+2244.529915 , -4247.1 , 34.83347999
+2244.529915 , -4054.05 , 30.97247999
+2244.529915 , -3861 , 27.11147999
+2244.529915 , -3667.95 , 23.25047999
+2244.529915 , -3474.9 , 19.38947999
+2244.529915 , -3281.85 , 15.52847999
+2244.529915 , -3088.8 , 11.66747999
+2244.529915 , -2895.75 , 7.806479993
+2244.529915 , -2702.7 , 3.945479993
+2244.529915 , -2509.65 , 0.084479993
+2244.529915 , -2316.6 , 3.776520007
+2244.529915 , -2123.55 , 7.637520007
+2244.529915 , -1930.5 , 11.49852001
+2244.529915 , -1737.45 , 15.35952001
+2244.529915 , -1544.4 , 19.22052001
+2244.529915 , -1351.35 , 23.08152001
+2244.529915 , -1158.3 , 26.94252001
+2244.529915 , -965.25 , 30.80352001
+2244.529915 , -772.2 , 34.66452001
+2244.529915 , -579.15 , 38.52552001
+2244.529915 , -386.1 , 42.38652001
+2244.529915 , -193.05 , 46.24752001
+2244.529915 , 0 , 50.10852001
+2244.529915 , 193.05 , 53.96952001
+2244.529915 , 386.1 , 57.83052001
+2244.529915 , 579.15 , 61.69152001
+2244.529915 , 772.2 , 65.55252001
+2244.529915 , 965.25 , 69.41352001
+2244.529915 , 1158.3 , 73.27452001
+2244.529915 , 1351.35 , 77.13552001
+2244.529915 , 1544.4 , 80.99652001
+2244.529915 , 1737.45 , 84.85752001
+2244.529915 , 1930.5 , 88.71852001
+2244.529915 , 2123.55 , 92.57952001
+2244.529915 , 2316.6 , 96.44052001
+2244.529915 , 2509.65 , 100.30152
+2244.529915 , 2702.7 , 104.16252
+2244.529915 , 2895.75 , 108.02352
+2244.529915 , 3088.8 , 111.88452
+2244.529915 , 3281.85 , 115.74552
+2244.529915 , 3474.9 , 119.60652
+2244.529915 , 3667.95 , 123.46752
+2244.529915 , 3861 , 127.32852
+2244.529915 , 4054.05 , 131.18952
+2244.529915 , 4247.1 , 135.05052
+2244.529915 , 4440.15 , 138.91152
+2244.529915 , 4633.2 , 142.77252
+2244.529915 , 4826.25 , 146.63352
+2244.529915 , 5019.3 , 150.49452
+2244.529915 , 5212.35 , 154.35552
+2244.529915 , 5405.4 , 158.21652
+2244.529915 , 5598.45 , 162.07752
+2244.529915 , 5791.5 , 165.93852
+2244.529915 , 5984.55 , 169.79952
+2244.529915 , 6177.6 , 173.66052
+2448.547009 , -6177.6 , 70.29263999
+2448.547009 , -5984.55 , 66.43163999
+2448.547009 , -5791.5 , 62.57063999
+2448.547009 , -5598.45 , 58.70963999
+2448.547009 , -5405.4 , 54.84863999
+2448.547009 , -5212.35 , 50.98763999
+2448.547009 , -5019.3 , 47.12663999
+2448.547009 , -4826.25 , 43.26563999
+2448.547009 , -4633.2 , 39.40463999
+2448.547009 , -4440.15 , 35.54363999
+2448.547009 , -4247.1 , 31.68263999
+2448.547009 , -4054.05 , 27.82163999
+2448.547009 , -3861 , 23.96063999
+2448.547009 , -3667.95 , 20.09963999
+2448.547009 , -3474.9 , 16.23863999
+2448.547009 , -3281.85 , 12.37763999
+2448.547009 , -3088.8 , 8.516639993
+2448.547009 , -2895.75 , 4.655639993
+2448.547009 , -2702.7 , 0.794639993
+2448.547009 , -2509.65 , 3.066360007
+2448.547009 , -2316.6 , 6.927360007
+2448.547009 , -2123.55 , 10.78836001
+2448.547009 , -1930.5 , 14.64936001
+2448.547009 , -1737.45 , 18.51036001
+2448.547009 , -1544.4 , 22.37136001
+2448.547009 , -1351.35 , 26.23236001
+2448.547009 , -1158.3 , 30.09336001
+2448.547009 , -965.25 , 33.95436001
+2448.547009 , -772.2 , 37.81536001
+2448.547009 , -579.15 , 41.67636001
+2448.547009 , -386.1 , 45.53736001
+2448.547009 , -193.05 , 49.39836001
+2448.547009 , 0 , 53.25936001
+2448.547009 , 193.05 , 57.12036001
+2448.547009 , 386.1 , 60.98136001
+2448.547009 , 579.15 , 64.84236001
+2448.547009 , 772.2 , 68.70336001
+2448.547009 , 965.25 , 72.56436001
+2448.547009 , 1158.3 , 76.42536001
+2448.547009 , 1351.35 , 80.28636001
+2448.547009 , 1544.4 , 84.14736001
+2448.547009 , 1737.45 , 88.00836001
+2448.547009 , 1930.5 , 91.86936001
+2448.547009 , 2123.55 , 95.73036001
+2448.547009 , 2316.6 , 99.59136001
+2448.547009 , 2509.65 , 103.45236
+2448.547009 , 2702.7 , 107.31336
+2448.547009 , 2895.75 , 111.17436
+2448.547009 , 3088.8 , 115.03536
+2448.547009 , 3281.85 , 118.89636
+2448.547009 , 3474.9 , 122.75736
+2448.547009 , 3667.95 , 126.61836
+2448.547009 , 3861 , 130.47936
+2448.547009 , 4054.05 , 134.34036
+2448.547009 , 4247.1 , 138.20136
+2448.547009 , 4440.15 , 142.06236
+2448.547009 , 4633.2 , 145.92336
+2448.547009 , 4826.25 , 149.78436
+2448.547009 , 5019.3 , 153.64536
+2448.547009 , 5212.35 , 157.50636
+2448.547009 , 5405.4 , 161.36736
+2448.547009 , 5598.45 , 165.22836
+2448.547009 , 5791.5 , 169.08936
+2448.547009 , 5984.55 , 172.95036
+2448.547009 , 6177.6 , 176.81136
+2652.564103 , -6177.6 , 67.14179999
+2652.564103 , -5984.55 , 63.28079999
+2652.564103 , -5791.5 , 59.41979999
+2652.564103 , -5598.45 , 55.55879999
+2652.564103 , -5405.4 , 51.69779999
+2652.564103 , -5212.35 , 47.83679999
+2652.564103 , -5019.3 , 43.97579999
+2652.564103 , -4826.25 , 40.11479999
+2652.564103 , -4633.2 , 36.25379999
+2652.564103 , -4440.15 , 32.39279999
+2652.564103 , -4247.1 , 28.53179999
+2652.564103 , -4054.05 , 24.67079999
+2652.564103 , -3861 , 20.80979999
+2652.564103 , -3667.95 , 16.94879999
+2652.564103 , -3474.9 , 13.08779999
+2652.564103 , -3281.85 , 9.226799993
+2652.564103 , -3088.8 , 5.365799993
+2652.564103 , -2895.75 , 1.504799993
+2652.564103 , -2702.7 , 2.356200007
+2652.564103 , -2509.65 , 6.217200007
+2652.564103 , -2316.6 , 10.07820001
+2652.564103 , -2123.55 , 13.93920001
+2652.564103 , -1930.5 , 17.80020001
+2652.564103 , -1737.45 , 21.66120001
+2652.564103 , -1544.4 , 25.52220001
+2652.564103 , -1351.35 , 29.38320001
+2652.564103 , -1158.3 , 33.24420001
+2652.564103 , -965.25 , 37.10520001
+2652.564103 , -772.2 , 40.96620001
+2652.564103 , -579.15 , 44.82720001
+2652.564103 , -386.1 , 48.68820001
+2652.564103 , -193.05 , 52.54920001
+2652.564103 , 0 , 56.41020001
+2652.564103 , 193.05 , 60.27120001
+2652.564103 , 386.1 , 64.13220001
+2652.564103 , 579.15 , 67.99320001
+2652.564103 , 772.2 , 71.85420001
+2652.564103 , 965.25 , 75.71520001
+2652.564103 , 1158.3 , 79.57620001
+2652.564103 , 1351.35 , 83.43720001
+2652.564103 , 1544.4 , 87.29820001
+2652.564103 , 1737.45 , 91.15920001
+2652.564103 , 1930.5 , 95.02020001
+2652.564103 , 2123.55 , 98.88120001
+2652.564103 , 2316.6 , 102.7422
+2652.564103 , 2509.65 , 106.6032
+2652.564103 , 2702.7 , 110.4642
+2652.564103 , 2895.75 , 114.3252
+2652.564103 , 3088.8 , 118.1862
+2652.564103 , 3281.85 , 122.0472
+2652.564103 , 3474.9 , 125.9082
+2652.564103 , 3667.95 , 129.7692
+2652.564103 , 3861 , 133.6302
+2652.564103 , 4054.05 , 137.4912
+2652.564103 , 4247.1 , 141.3522
+2652.564103 , 4440.15 , 145.2132
+2652.564103 , 4633.2 , 149.0742
+2652.564103 , 4826.25 , 152.9352
+2652.564103 , 5019.3 , 156.7962
+2652.564103 , 5212.35 , 160.6572
+2652.564103 , 5405.4 , 164.5182
+2652.564103 , 5598.45 , 168.3792
+2652.564103 , 5791.5 , 172.2402
+2652.564103 , 5984.55 , 176.1012
+2652.564103 , 6177.6 , 179.9622
+2856.666667 , -6177.6 , 63.98963999
+2856.666667 , -5984.55 , 60.12863999
+2856.666667 , -5791.5 , 56.26763999
+2856.666667 , -5598.45 , 52.40663999
+2856.666667 , -5405.4 , 48.54563999
+2856.666667 , -5212.35 , 44.68463999
+2856.666667 , -5019.3 , 40.82363999
+2856.666667 , -4826.25 , 36.96263999
+2856.666667 , -4633.2 , 33.10163999
+2856.666667 , -4440.15 , 29.24063999
+2856.666667 , -4247.1 , 25.37963999
+2856.666667 , -4054.05 , 21.51863999
+2856.666667 , -3861 , 17.65763999
+2856.666667 , -3667.95 , 13.79663999
+2856.666667 , -3474.9 , 9.935639995
+2856.666667 , -3281.85 , 6.074639995
+2856.666667 , -3088.8 , 2.213639995
+2856.666667 , -2895.75 , 1.647360005
+2856.666667 , -2702.7 , 5.508360005
+2856.666667 , -2509.65 , 9.369360005
+2856.666667 , -2316.6 , 13.23036001
+2856.666667 , -2123.55 , 17.09136001
+2856.666667 , -1930.5 , 20.95236001
+2856.666667 , -1737.45 , 24.81336001
+2856.666667 , -1544.4 , 28.67436001
+2856.666667 , -1351.35 , 32.53536001
+2856.666667 , -1158.3 , 36.39636001
+2856.666667 , -965.25 , 40.25736001
+2856.666667 , -772.2 , 44.11836001
+2856.666667 , -579.15 , 47.97936001
+2856.666667 , -386.1 , 51.84036001
+2856.666667 , -193.05 , 55.70136001
+2856.666667 , 0 , 59.56236001
+2856.666667 , 193.05 , 63.42336001
+2856.666667 , 386.1 , 67.28436001
+2856.666667 , 579.15 , 71.14536001
+2856.666667 , 772.2 , 75.00636001
+2856.666667 , 965.25 , 78.86736001
+2856.666667 , 1158.3 , 82.72836001
+2856.666667 , 1351.35 , 86.58936001
+2856.666667 , 1544.4 , 90.45036001
+2856.666667 , 1737.45 , 94.31136001
+2856.666667 , 1930.5 , 98.17236001
+2856.666667 , 2123.55 , 102.03336
+2856.666667 , 2316.6 , 105.89436
+2856.666667 , 2509.65 , 109.75536
+2856.666667 , 2702.7 , 113.61636
+2856.666667 , 2895.75 , 117.47736
+2856.666667 , 3088.8 , 121.33836
+2856.666667 , 3281.85 , 125.19936
+2856.666667 , 3474.9 , 129.06036
+2856.666667 , 3667.95 , 132.92136
+2856.666667 , 3861 , 136.78236
+2856.666667 , 4054.05 , 140.64336
+2856.666667 , 4247.1 , 144.50436
+2856.666667 , 4440.15 , 148.36536
+2856.666667 , 4633.2 , 152.22636
+2856.666667 , 4826.25 , 156.08736
+2856.666667 , 5019.3 , 159.94836
+2856.666667 , 5212.35 , 163.80936
+2856.666667 , 5405.4 , 167.67036
+2856.666667 , 5598.45 , 171.53136
+2856.666667 , 5791.5 , 175.39236
+2856.666667 , 5984.55 , 179.25336
+2856.666667 , 6177.6 , 183.11436
+3060.683761 , -6177.6 , 60.8388
+3060.683761 , -5984.55 , 56.9778
+3060.683761 , -5791.5 , 53.1168
+3060.683761 , -5598.45 , 49.2558
+3060.683761 , -5405.4 , 45.3948
+3060.683761 , -5212.35 , 41.5338
+3060.683761 , -5019.3 , 37.6728
+3060.683761 , -4826.25 , 33.8118
+3060.683761 , -4633.2 , 29.9508
+3060.683761 , -4440.15 , 26.0898
+3060.683761 , -4247.1 , 22.2288
+3060.683761 , -4054.05 , 18.3678
+3060.683761 , -3861 , 14.5068
+3060.683761 , -3667.95 , 10.6458
+3060.683761 , -3474.9 , 6.784799995
+3060.683761 , -3281.85 , 2.923799995
+3060.683761 , -3088.8 , 0.937200005
+3060.683761 , -2895.75 , 4.798200005
+3060.683761 , -2702.7 , 8.659200005
+3060.683761 , -2509.65 , 12.5202
+3060.683761 , -2316.6 , 16.3812
+3060.683761 , -2123.55 , 20.2422
+3060.683761 , -1930.5 , 24.1032
+3060.683761 , -1737.45 , 27.9642
+3060.683761 , -1544.4 , 31.8252
+3060.683761 , -1351.35 , 35.6862
+3060.683761 , -1158.3 , 39.5472
+3060.683761 , -965.25 , 43.4082
+3060.683761 , -772.2 , 47.2692
+3060.683761 , -579.15 , 51.1302
+3060.683761 , -386.1 , 54.9912
+3060.683761 , -193.05 , 58.8522
+3060.683761 , 0 , 62.7132
+3060.683761 , 193.05 , 66.5742
+3060.683761 , 386.1 , 70.4352
+3060.683761 , 579.15 , 74.2962
+3060.683761 , 772.2 , 78.1572
+3060.683761 , 965.25 , 82.0182
+3060.683761 , 1158.3 , 85.8792
+3060.683761 , 1351.35 , 89.7402
+3060.683761 , 1544.4 , 93.6012
+3060.683761 , 1737.45 , 97.4622
+3060.683761 , 1930.5 , 101.3232
+3060.683761 , 2123.55 , 105.1842
+3060.683761 , 2316.6 , 109.0452
+3060.683761 , 2509.65 , 112.9062
+3060.683761 , 2702.7 , 116.7672
+3060.683761 , 2895.75 , 120.6282
+3060.683761 , 3088.8 , 124.4892
+3060.683761 , 3281.85 , 128.3502
+3060.683761 , 3474.9 , 132.2112
+3060.683761 , 3667.95 , 136.0722
+3060.683761 , 3861 , 139.9332
+3060.683761 , 4054.05 , 143.7942
+3060.683761 , 4247.1 , 147.6552
+3060.683761 , 4440.15 , 151.5162
+3060.683761 , 4633.2 , 155.3772
+3060.683761 , 4826.25 , 159.2382
+3060.683761 , 5019.3 , 163.0992
+3060.683761 , 5212.35 , 166.9602
+3060.683761 , 5405.4 , 170.8212
+3060.683761 , 5598.45 , 174.6822
+3060.683761 , 5791.5 , 178.5432
+3060.683761 , 5984.55 , 182.4042
+3060.683761 , 6177.6 , 186.2652
+3264.700855 , -6177.6 , 57.68796
+3264.700855 , -5984.55 , 53.82696
+3264.700855 , -5791.5 , 49.96596
+3264.700855 , -5598.45 , 46.10496
+3264.700855 , -5405.4 , 42.24396
+3264.700855 , -5212.35 , 38.38296
+3264.700855 , -5019.3 , 34.52196
+3264.700855 , -4826.25 , 30.66096
+3264.700855 , -4633.2 , 26.79996
+3264.700855 , -4440.15 , 22.93896
+3264.700855 , -4247.1 , 19.07796
+3264.700855 , -4054.05 , 15.21696
+3264.700855 , -3861 , 11.35596
+3264.700855 , -3667.95 , 7.494959995
+3264.700855 , -3474.9 , 3.633959995
+3264.700855 , -3281.85 , 0.227040005
+3264.700855 , -3088.8 , 4.088040005
+3264.700855 , -2895.75 , 7.949040005
+3264.700855 , -2702.7 , 11.81004
+3264.700855 , -2509.65 , 15.67104
+3264.700855 , -2316.6 , 19.53204
+3264.700855 , -2123.55 , 23.39304
+3264.700855 , -1930.5 , 27.25404
+3264.700855 , -1737.45 , 31.11504
+3264.700855 , -1544.4 , 34.97604
+3264.700855 , -1351.35 , 38.83704
+3264.700855 , -1158.3 , 42.69804
+3264.700855 , -965.25 , 46.55904
+3264.700855 , -772.2 , 50.42004
+3264.700855 , -579.15 , 54.28104
+3264.700855 , -386.1 , 58.14204
+3264.700855 , -193.05 , 62.00304
+3264.700855 , 0 , 65.86404
+3264.700855 , 193.05 , 69.72504
+3264.700855 , 386.1 , 73.58604
+3264.700855 , 579.15 , 77.44704
+3264.700855 , 772.2 , 81.30804
+3264.700855 , 965.25 , 85.16904
+3264.700855 , 1158.3 , 89.03004
+3264.700855 , 1351.35 , 92.89104
+3264.700855 , 1544.4 , 96.75204
+3264.700855 , 1737.45 , 100.61304
+3264.700855 , 1930.5 , 104.47404
+3264.700855 , 2123.55 , 108.33504
+3264.700855 , 2316.6 , 112.19604
+3264.700855 , 2509.65 , 116.05704
+3264.700855 , 2702.7 , 119.91804
+3264.700855 , 2895.75 , 123.77904
+3264.700855 , 3088.8 , 127.64004
+3264.700855 , 3281.85 , 131.50104
+3264.700855 , 3474.9 , 135.36204
+3264.700855 , 3667.95 , 139.22304
+3264.700855 , 3861 , 143.08404
+3264.700855 , 4054.05 , 146.94504
+3264.700855 , 4247.1 , 150.80604
+3264.700855 , 4440.15 , 154.66704
+3264.700855 , 4633.2 , 158.52804
+3264.700855 , 4826.25 , 162.38904
+3264.700855 , 5019.3 , 166.25004
+3264.700855 , 5212.35 , 170.11104
+3264.700855 , 5405.4 , 173.97204
+3264.700855 , 5598.45 , 177.83304
+3264.700855 , 5791.5 , 181.69404
+3264.700855 , 5984.55 , 185.55504
+3264.700855 , 6177.6 , 189.41604
+3468.803419 , -6177.6 , 54.5358
+3468.803419 , -5984.55 , 50.6748
+3468.803419 , -5791.5 , 46.8138
+3468.803419 , -5598.45 , 42.9528
+3468.803419 , -5405.4 , 39.0918
+3468.803419 , -5212.35 , 35.2308
+3468.803419 , -5019.3 , 31.3698
+3468.803419 , -4826.25 , 27.5088
+3468.803419 , -4633.2 , 23.6478
+3468.803419 , -4440.15 , 19.7868
+3468.803419 , -4247.1 , 15.9258
+3468.803419 , -4054.05 , 12.0648
+3468.803419 , -3861 , 8.203799997
+3468.803419 , -3667.95 , 4.342799997
+3468.803419 , -3474.9 , 0.481799997
+3468.803419 , -3281.85 , 3.379200003
+3468.803419 , -3088.8 , 7.240200003
+3468.803419 , -2895.75 , 11.1012
+3468.803419 , -2702.7 , 14.9622
+3468.803419 , -2509.65 , 18.8232
+3468.803419 , -2316.6 , 22.6842
+3468.803419 , -2123.55 , 26.5452
+3468.803419 , -1930.5 , 30.4062
+3468.803419 , -1737.45 , 34.2672
+3468.803419 , -1544.4 , 38.1282
+3468.803419 , -1351.35 , 41.9892
+3468.803419 , -1158.3 , 45.8502
+3468.803419 , -965.25 , 49.7112
+3468.803419 , -772.2 , 53.5722
+3468.803419 , -579.15 , 57.4332
+3468.803419 , -386.1 , 61.2942
+3468.803419 , -193.05 , 65.1552
+3468.803419 , 0 , 69.0162
+3468.803419 , 193.05 , 72.8772
+3468.803419 , 386.1 , 76.7382
+3468.803419 , 579.15 , 80.5992
+3468.803419 , 772.2 , 84.4602
+3468.803419 , 965.25 , 88.3212
+3468.803419 , 1158.3 , 92.1822
+3468.803419 , 1351.35 , 96.0432
+3468.803419 , 1544.4 , 99.9042
+3468.803419 , 1737.45 , 103.7652
+3468.803419 , 1930.5 , 107.6262
+3468.803419 , 2123.55 , 111.4872
+3468.803419 , 2316.6 , 115.3482
+3468.803419 , 2509.65 , 119.2092
+3468.803419 , 2702.7 , 123.0702
+3468.803419 , 2895.75 , 126.9312
+3468.803419 , 3088.8 , 130.7922
+3468.803419 , 3281.85 , 134.6532
+3468.803419 , 3474.9 , 138.5142
+3468.803419 , 3667.95 , 142.3752
+3468.803419 , 3861 , 146.2362
+3468.803419 , 4054.05 , 150.0972
+3468.803419 , 4247.1 , 153.9582
+3468.803419 , 4440.15 , 157.8192
+3468.803419 , 4633.2 , 161.6802
+3468.803419 , 4826.25 , 165.5412
+3468.803419 , 5019.3 , 169.4022
+3468.803419 , 5212.35 , 173.2632
+3468.803419 , 5405.4 , 177.1242
+3468.803419 , 5598.45 , 180.9852
+3468.803419 , 5791.5 , 184.8462
+3468.803419 , 5984.55 , 188.7072
+3468.803419 , 6177.6 , 192.5682
+3672.820513 , -6177.6 , 51.38496
+3672.820513 , -5984.55 , 47.52396
+3672.820513 , -5791.5 , 43.66296
+3672.820513 , -5598.45 , 39.80196
+3672.820513 , -5405.4 , 35.94096
+3672.820513 , -5212.35 , 32.07996
+3672.820513 , -5019.3 , 28.21896
+3672.820513 , -4826.25 , 24.35796
+3672.820513 , -4633.2 , 20.49696
+3672.820513 , -4440.15 , 16.63596
+3672.820513 , -4247.1 , 12.77496
+3672.820513 , -4054.05 , 8.913959997
+3672.820513 , -3861 , 5.052959997
+3672.820513 , -3667.95 , 1.191959997
+3672.820513 , -3474.9 , 2.669040003
+3672.820513 , -3281.85 , 6.530040003
+3672.820513 , -3088.8 , 10.39104
+3672.820513 , -2895.75 , 14.25204
+3672.820513 , -2702.7 , 18.11304
+3672.820513 , -2509.65 , 21.97404
+3672.820513 , -2316.6 , 25.83504
+3672.820513 , -2123.55 , 29.69604
+3672.820513 , -1930.5 , 33.55704
+3672.820513 , -1737.45 , 37.41804
+3672.820513 , -1544.4 , 41.27904
+3672.820513 , -1351.35 , 45.14004
+3672.820513 , -1158.3 , 49.00104
+3672.820513 , -965.25 , 52.86204
+3672.820513 , -772.2 , 56.72304
+3672.820513 , -579.15 , 60.58404
+3672.820513 , -386.1 , 64.44504
+3672.820513 , -193.05 , 68.30604
+3672.820513 , 0 , 72.16704
+3672.820513 , 193.05 , 76.02804
+3672.820513 , 386.1 , 79.88904
+3672.820513 , 579.15 , 83.75004
+3672.820513 , 772.2 , 87.61104
+3672.820513 , 965.25 , 91.47204
+3672.820513 , 1158.3 , 95.33304
+3672.820513 , 1351.35 , 99.19404
+3672.820513 , 1544.4 , 103.05504
+3672.820513 , 1737.45 , 106.91604
+3672.820513 , 1930.5 , 110.77704
+3672.820513 , 2123.55 , 114.63804
+3672.820513 , 2316.6 , 118.49904
+3672.820513 , 2509.65 , 122.36004
+3672.820513 , 2702.7 , 126.22104
+3672.820513 , 2895.75 , 130.08204
+3672.820513 , 3088.8 , 133.94304
+3672.820513 , 3281.85 , 137.80404
+3672.820513 , 3474.9 , 141.66504
+3672.820513 , 3667.95 , 145.52604
+3672.820513 , 3861 , 149.38704
+3672.820513 , 4054.05 , 153.24804
+3672.820513 , 4247.1 , 157.10904
+3672.820513 , 4440.15 , 160.97004
+3672.820513 , 4633.2 , 164.83104
+3672.820513 , 4826.25 , 168.69204
+3672.820513 , 5019.3 , 172.55304
+3672.820513 , 5212.35 , 176.41404
+3672.820513 , 5405.4 , 180.27504
+3672.820513 , 5598.45 , 184.13604
+3672.820513 , 5791.5 , 187.99704
+3672.820513 , 5984.55 , 191.85804
+3672.820513 , 6177.6 , 195.71904
+3876.837607 , -6177.6 , 48.23412
+3876.837607 , -5984.55 , 44.37312
+3876.837607 , -5791.5 , 40.51212
+3876.837607 , -5598.45 , 36.65112
+3876.837607 , -5405.4 , 32.79012
+3876.837607 , -5212.35 , 28.92912
+3876.837607 , -5019.3 , 25.06812
+3876.837607 , -4826.25 , 21.20712
+3876.837607 , -4633.2 , 17.34612
+3876.837607 , -4440.15 , 13.48512
+3876.837607 , -4247.1 , 9.624119997
+3876.837607 , -4054.05 , 5.763119997
+3876.837607 , -3861 , 1.902119997
+3876.837607 , -3667.95 , 1.958880003
+3876.837607 , -3474.9 , 5.819880003
+3876.837607 , -3281.85 , 9.680880003
+3876.837607 , -3088.8 , 13.54188
+3876.837607 , -2895.75 , 17.40288
+3876.837607 , -2702.7 , 21.26388
+3876.837607 , -2509.65 , 25.12488
+3876.837607 , -2316.6 , 28.98588
+3876.837607 , -2123.55 , 32.84688
+3876.837607 , -1930.5 , 36.70788
+3876.837607 , -1737.45 , 40.56888
+3876.837607 , -1544.4 , 44.42988
+3876.837607 , -1351.35 , 48.29088
+3876.837607 , -1158.3 , 52.15188
+3876.837607 , -965.25 , 56.01288
+3876.837607 , -772.2 , 59.87388
+3876.837607 , -579.15 , 63.73488
+3876.837607 , -386.1 , 67.59588
+3876.837607 , -193.05 , 71.45688
+3876.837607 , 0 , 75.31788
+3876.837607 , 193.05 , 79.17888
+3876.837607 , 386.1 , 83.03988
+3876.837607 , 579.15 , 86.90088
+3876.837607 , 772.2 , 90.76188
+3876.837607 , 965.25 , 94.62288
+3876.837607 , 1158.3 , 98.48388
+3876.837607 , 1351.35 , 102.34488
+3876.837607 , 1544.4 , 106.20588
+3876.837607 , 1737.45 , 110.06688
+3876.837607 , 1930.5 , 113.92788
+3876.837607 , 2123.55 , 117.78888
+3876.837607 , 2316.6 , 121.64988
+3876.837607 , 2509.65 , 125.51088
+3876.837607 , 2702.7 , 129.37188
+3876.837607 , 2895.75 , 133.23288
+3876.837607 , 3088.8 , 137.09388
+3876.837607 , 3281.85 , 140.95488
+3876.837607 , 3474.9 , 144.81588
+3876.837607 , 3667.95 , 148.67688
+3876.837607 , 3861 , 152.53788
+3876.837607 , 4054.05 , 156.39888
+3876.837607 , 4247.1 , 160.25988
+3876.837607 , 4440.15 , 164.12088
+3876.837607 , 4633.2 , 167.98188
+3876.837607 , 4826.25 , 171.84288
+3876.837607 , 5019.3 , 175.70388
+3876.837607 , 5212.35 , 179.56488
+3876.837607 , 5405.4 , 183.42588
+3876.837607 , 5598.45 , 187.28688
+3876.837607 , 5791.5 , 191.14788
+3876.837607 , 5984.55 , 195.00888
+3876.837607 , 6177.6 , 198.86988
+4080.854701 , -6177.6 , 45.08328
+4080.854701 , -5984.55 , 41.22228
+4080.854701 , -5791.5 , 37.36128
+4080.854701 , -5598.45 , 33.50028
+4080.854701 , -5405.4 , 29.63928
+4080.854701 , -5212.35 , 25.77828
+4080.854701 , -5019.3 , 21.91728
+4080.854701 , -4826.25 , 18.05628
+4080.854701 , -4633.2 , 14.19528
+4080.854701 , -4440.15 , 10.33428
+4080.854701 , -4247.1 , 6.473279998
+4080.854701 , -4054.05 , 2.612279998
+4080.854701 , -3861 , 1.248720002
+4080.854701 , -3667.95 , 5.109720002
+4080.854701 , -3474.9 , 8.970720002
+4080.854701 , -3281.85 , 12.83172
+4080.854701 , -3088.8 , 16.69272
+4080.854701 , -2895.75 , 20.55372
+4080.854701 , -2702.7 , 24.41472
+4080.854701 , -2509.65 , 28.27572
+4080.854701 , -2316.6 , 32.13672
+4080.854701 , -2123.55 , 35.99772
+4080.854701 , -1930.5 , 39.85872
+4080.854701 , -1737.45 , 43.71972
+4080.854701 , -1544.4 , 47.58072
+4080.854701 , -1351.35 , 51.44172
+4080.854701 , -1158.3 , 55.30272
+4080.854701 , -965.25 , 59.16372
+4080.854701 , -772.2 , 63.02472
+4080.854701 , -579.15 , 66.88572
+4080.854701 , -386.1 , 70.74672
+4080.854701 , -193.05 , 74.60772
+4080.854701 , 0 , 78.46872
+4080.854701 , 193.05 , 82.32972
+4080.854701 , 386.1 , 86.19072
+4080.854701 , 579.15 , 90.05172
+4080.854701 , 772.2 , 93.91272
+4080.854701 , 965.25 , 97.77372
+4080.854701 , 1158.3 , 101.63472
+4080.854701 , 1351.35 , 105.49572
+4080.854701 , 1544.4 , 109.35672
+4080.854701 , 1737.45 , 113.21772
+4080.854701 , 1930.5 , 117.07872
+4080.854701 , 2123.55 , 120.93972
+4080.854701 , 2316.6 , 124.80072
+4080.854701 , 2509.65 , 128.66172
+4080.854701 , 2702.7 , 132.52272
+4080.854701 , 2895.75 , 136.38372
+4080.854701 , 3088.8 , 140.24472
+4080.854701 , 3281.85 , 144.10572
+4080.854701 , 3474.9 , 147.96672
+4080.854701 , 3667.95 , 151.82772
+4080.854701 , 3861 , 155.68872
+4080.854701 , 4054.05 , 159.54972
+4080.854701 , 4247.1 , 163.41072
+4080.854701 , 4440.15 , 167.27172
+4080.854701 , 4633.2 , 171.13272
+4080.854701 , 4826.25 , 174.99372
+4080.854701 , 5019.3 , 178.85472
+4080.854701 , 5212.35 , 182.71572
+4080.854701 , 5405.4 , 186.57672
+4080.854701 , 5598.45 , 190.43772
+4080.854701 , 5791.5 , 194.29872
+4080.854701 , 5984.55 , 198.15972
+4080.854701 , 6177.6 , 202.02072
+4268.632479 , -6177.6 , 42.18323999
+4268.632479 , -5984.55 , 38.32223999
+4268.632479 , -5791.5 , 34.46123999
+4268.632479 , -5598.45 , 30.60023999
+4268.632479 , -5405.4 , 26.73923999
+4268.632479 , -5212.35 , 22.87823999
+4268.632479 , -5019.3 , 19.01723999
+4268.632479 , -4826.25 , 15.15623999
+4268.632479 , -4633.2 , 11.29523999
+4268.632479 , -4440.15 , 7.434239994
+4268.632479 , -4247.1 , 3.573239994
+4268.632479 , -4054.05 , 0.287760006
+4268.632479 , -3861 , 4.148760006
+4268.632479 , -3667.95 , 8.009760006
+4268.632479 , -3474.9 , 11.87076001
+4268.632479 , -3281.85 , 15.73176001
+4268.632479 , -3088.8 , 19.59276001
+4268.632479 , -2895.75 , 23.45376001
+4268.632479 , -2702.7 , 27.31476001
+4268.632479 , -2509.65 , 31.17576001
+4268.632479 , -2316.6 , 35.03676001
+4268.632479 , -2123.55 , 38.89776001
+4268.632479 , -1930.5 , 42.75876001
+4268.632479 , -1737.45 , 46.61976001
+4268.632479 , -1544.4 , 50.48076001
+4268.632479 , -1351.35 , 54.34176001
+4268.632479 , -1158.3 , 58.20276001
+4268.632479 , -965.25 , 62.06376001
+4268.632479 , -772.2 , 65.92476001
+4268.632479 , -579.15 , 69.78576001
+4268.632479 , -386.1 , 73.64676001
+4268.632479 , -193.05 , 77.50776001
+4268.632479 , 0 , 81.36876001
+4268.632479 , 193.05 , 85.22976001
+4268.632479 , 386.1 , 89.09076001
+4268.632479 , 579.15 , 92.95176001
+4268.632479 , 772.2 , 96.81276001
+4268.632479 , 965.25 , 100.67376
+4268.632479 , 1158.3 , 104.53476
+4268.632479 , 1351.35 , 108.39576
+4268.632479 , 1544.4 , 112.25676
+4268.632479 , 1737.45 , 116.11776
+4268.632479 , 1930.5 , 119.97876
+4268.632479 , 2123.55 , 123.83976
+4268.632479 , 2316.6 , 127.70076
+4268.632479 , 2509.65 , 131.56176
+4268.632479 , 2702.7 , 135.42276
+4268.632479 , 2895.75 , 139.28376
+4268.632479 , 3088.8 , 143.14476
+4268.632479 , 3281.85 , 147.00576
+4268.632479 , 3474.9 , 150.86676
+4268.632479 , 3667.95 , 154.72776
+4268.632479 , 3861 , 158.58876
+4268.632479 , 4054.05 , 162.44976
+4268.632479 , 4247.1 , 166.31076
+4268.632479 , 4440.15 , 170.17176
+4268.632479 , 4633.2 , 174.03276
+4268.632479 , 4826.25 , 177.89376
+4268.632479 , 5019.3 , 181.75476
+4268.632479 , 5212.35 , 185.61576
+4268.632479 , 5405.4 , 189.47676
+4268.632479 , 5598.45 , 193.33776
+4268.632479 , 5791.5 , 197.19876
+4268.632479 , 5984.55 , 201.05976
+4268.632479 , 6177.6 , 204.92076
+5000 , -6177.6 , 30.888
+5000 , -5984.55 , 27.027
+5000 , -5791.5 , 23.166
+5000 , -5598.45 , 19.305
+5000 , -5405.4 , 15.444
+5000 , -5212.35 , 11.583
+5000 , -5019.3 , 7.722
+5000 , -4826.25 , 3.861
+5000 , -4633.2 , 0
+5000 , -4440.15 , 3.861
+5000 , -4247.1 , 7.722
+5000 , -4054.05 , 11.583
+5000 , -3861 , 15.444
+5000 , -3667.95 , 19.305
+5000 , -3474.9 , 23.166
+5000 , -3281.85 , 27.027
+5000 , -3088.8 , 30.888
+5000 , -2895.75 , 34.749
+5000 , -2702.7 , 38.61
+5000 , -2509.65 , 42.471
+5000 , -2316.6 , 46.332
+5000 , -2123.55 , 50.193
+5000 , -1930.5 , 54.054
+5000 , -1737.45 , 57.915
+5000 , -1544.4 , 61.776
+5000 , -1351.35 , 65.637
+5000 , -1158.3 , 69.498
+5000 , -965.25 , 73.359
+5000 , -772.2 , 77.22
+5000 , -579.15 , 81.081
+5000 , -386.1 , 84.942
+5000 , -193.05 , 88.803
+5000 , 0 , 92.664
+5000 , 193.05 , 96.525
+5000 , 386.1 , 100.386
+5000 , 579.15 , 104.247
+5000 , 772.2 , 108.108
+5000 , 965.25 , 111.969
+5000 , 1158.3 , 115.83
+5000 , 1351.35 , 119.691
+5000 , 1544.4 , 123.552
+5000 , 1737.45 , 127.413
+5000 , 1930.5 , 131.274
+5000 , 2123.55 , 135.135
+5000 , 2316.6 , 138.996
+5000 , 2509.65 , 142.857
+5000 , 2702.7 , 146.718
+5000 , 2895.75 , 150.579
+5000 , 3088.8 , 154.44
+5000 , 3281.85 , 158.301
+5000 , 3474.9 , 162.162
+5000 , 3667.95 , 166.023
+5000 , 3861 , 169.884
+5000 , 4054.05 , 173.745
+5000 , 4247.1 , 177.606
+5000 , 4440.15 , 181.467
+5000 , 4633.2 , 185.328
+5000 , 4826.25 , 189.189
+5000 , 5019.3 , 193.05
+5000 , 5212.35 , 196.911
+5000 , 5405.4 , 200.772
+5000 , 5598.45 , 204.633
+5000 , 5791.5 , 208.494
+5000 , 5984.55 , 212.355
+5000 , 6177.6 , 216.216
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_5.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_5.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..0c62b96aa49736cc08eb39594ba2585d1ce4bb92
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_5.vtlm
@@ -0,0 +1,2081 @@
+Input Speed [rpm] , Input Torque [Nm] , Torque Loss [Nm]
+0 , -6177.6 , 103.16592
+0 , -5984.55 , 99.49797
+0 , -5791.5 , 95.83002
+0 , -5598.45 , 92.16207
+0 , -5405.4 , 88.49412
+0 , -5212.35 , 84.82617
+0 , -5019.3 , 81.15822
+0 , -4826.25 , 77.49027
+0 , -4633.2 , 73.82232
+0 , -4440.15 , 70.15437
+0 , -4247.1 , 66.48642
+0 , -4054.05 , 62.81847
+0 , -3861 , 59.15052
+0 , -3667.95 , 55.48257
+0 , -3474.9 , 51.81462
+0 , -3281.85 , 48.14667
+0 , -3088.8 , 44.47872
+0 , -2895.75 , 40.81077
+0 , -2702.7 , 37.14282
+0 , -2509.65 , 33.47487
+0 , -2316.6 , 29.80692
+0 , -2123.55 , 26.13897
+0 , -1930.5 , 22.47102
+0 , -1737.45 , 18.80307
+0 , -1544.4 , 15.13512
+0 , -1351.35 , 11.46717
+0 , -1158.3 , 7.79922
+0 , -965.25 , 4.13127
+0 , -772.2 , 0.46332
+0 , -579.15 , 3.20463
+0 , -386.1 , 6.87258
+0 , -193.05 , 10.54053
+0 , 0 , 14.20848
+0 , 193.05 , 17.87643
+0 , 386.1 , 21.54438
+0 , 579.15 , 25.21233
+0 , 772.2 , 28.88028
+0 , 965.25 , 32.54823
+0 , 1158.3 , 36.21618
+0 , 1351.35 , 39.88413
+0 , 1544.4 , 43.55208
+0 , 1737.45 , 47.22003
+0 , 1930.5 , 50.88798
+0 , 2123.55 , 54.55593
+0 , 2316.6 , 58.22388
+0 , 2509.65 , 61.89183
+0 , 2702.7 , 65.55978
+0 , 2895.75 , 69.22773
+0 , 3088.8 , 72.89568
+0 , 3281.85 , 76.56363
+0 , 3474.9 , 80.23158
+0 , 3667.95 , 83.89953
+0 , 3861 , 87.56748
+0 , 4054.05 , 91.23543
+0 , 4247.1 , 94.90338
+0 , 4440.15 , 98.57133
+0 , 4633.2 , 102.23928
+0 , 4826.25 , 105.90723
+0 , 5019.3 , 109.57518
+0 , 5212.35 , 113.24313
+0 , 5405.4 , 116.91108
+0 , 5598.45 , 120.57903
+0 , 5791.5 , 124.24698
+0 , 5984.55 , 127.91493
+0 , 6177.6 , 131.58288
+40.80854701 , -6177.6 , 102.5860926
+40.80854701 , -5984.55 , 98.91814258
+40.80854701 , -5791.5 , 95.25019258
+40.80854701 , -5598.45 , 91.58224258
+40.80854701 , -5405.4 , 87.91429258
+40.80854701 , -5212.35 , 84.24634258
+40.80854701 , -5019.3 , 80.57839258
+40.80854701 , -4826.25 , 76.91044258
+40.80854701 , -4633.2 , 73.24249258
+40.80854701 , -4440.15 , 69.57454258
+40.80854701 , -4247.1 , 65.90659258
+40.80854701 , -4054.05 , 62.23864258
+40.80854701 , -3861 , 58.57069258
+40.80854701 , -3667.95 , 54.90274258
+40.80854701 , -3474.9 , 51.23479258
+40.80854701 , -3281.85 , 47.56684258
+40.80854701 , -3088.8 , 43.89889258
+40.80854701 , -2895.75 , 40.23094258
+40.80854701 , -2702.7 , 36.56299258
+40.80854701 , -2509.65 , 32.89504258
+40.80854701 , -2316.6 , 29.22709258
+40.80854701 , -2123.55 , 25.55914258
+40.80854701 , -1930.5 , 21.89119258
+40.80854701 , -1737.45 , 18.22324258
+40.80854701 , -1544.4 , 14.55529258
+40.80854701 , -1351.35 , 10.88734258
+40.80854701 , -1158.3 , 7.219392576
+40.80854701 , -965.25 , 3.551442576
+40.80854701 , -772.2 , 0.116507424
+40.80854701 , -579.15 , 3.784457424
+40.80854701 , -386.1 , 7.452407424
+40.80854701 , -193.05 , 11.12035742
+40.80854701 , 0 , 14.78830742
+40.80854701 , 193.05 , 18.45625742
+40.80854701 , 386.1 , 22.12420742
+40.80854701 , 579.15 , 25.79215742
+40.80854701 , 772.2 , 29.46010742
+40.80854701 , 965.25 , 33.12805742
+40.80854701 , 1158.3 , 36.79600742
+40.80854701 , 1351.35 , 40.46395742
+40.80854701 , 1544.4 , 44.13190742
+40.80854701 , 1737.45 , 47.79985742
+40.80854701 , 1930.5 , 51.46780742
+40.80854701 , 2123.55 , 55.13575742
+40.80854701 , 2316.6 , 58.80370742
+40.80854701 , 2509.65 , 62.47165742
+40.80854701 , 2702.7 , 66.13960742
+40.80854701 , 2895.75 , 69.80755742
+40.80854701 , 3088.8 , 73.47550742
+40.80854701 , 3281.85 , 77.14345742
+40.80854701 , 3474.9 , 80.81140742
+40.80854701 , 3667.95 , 84.47935742
+40.80854701 , 3861 , 88.14730742
+40.80854701 , 4054.05 , 91.81525742
+40.80854701 , 4247.1 , 95.48320742
+40.80854701 , 4440.15 , 99.15115742
+40.80854701 , 4633.2 , 102.8191074
+40.80854701 , 4826.25 , 106.4870574
+40.80854701 , 5019.3 , 110.1550074
+40.80854701 , 5212.35 , 113.8229574
+40.80854701 , 5405.4 , 117.4909074
+40.80854701 , 5598.45 , 121.1588574
+40.80854701 , 5791.5 , 124.8268074
+40.80854701 , 5984.55 , 128.4947574
+40.80854701 , 6177.6 , 132.1627074
+81.61794872 , -6177.6 , 102.006253
+81.61794872 , -5984.55 , 98.33830301
+81.61794872 , -5791.5 , 94.67035301
+81.61794872 , -5598.45 , 91.00240301
+81.61794872 , -5405.4 , 87.33445301
+81.61794872 , -5212.35 , 83.66650301
+81.61794872 , -5019.3 , 79.99855301
+81.61794872 , -4826.25 , 76.33060301
+81.61794872 , -4633.2 , 72.66265301
+81.61794872 , -4440.15 , 68.99470301
+81.61794872 , -4247.1 , 65.32675301
+81.61794872 , -4054.05 , 61.65880301
+81.61794872 , -3861 , 57.99085301
+81.61794872 , -3667.95 , 54.32290301
+81.61794872 , -3474.9 , 50.65495301
+81.61794872 , -3281.85 , 46.98700301
+81.61794872 , -3088.8 , 43.31905301
+81.61794872 , -2895.75 , 39.65110301
+81.61794872 , -2702.7 , 35.98315301
+81.61794872 , -2509.65 , 32.31520301
+81.61794872 , -2316.6 , 28.64725301
+81.61794872 , -2123.55 , 24.97930301
+81.61794872 , -1930.5 , 21.31135301
+81.61794872 , -1737.45 , 17.64340301
+81.61794872 , -1544.4 , 13.97545301
+81.61794872 , -1351.35 , 10.30750301
+81.61794872 , -1158.3 , 6.639553008
+81.61794872 , -965.25 , 2.971603008
+81.61794872 , -772.2 , 0.696346992
+81.61794872 , -579.15 , 4.364296992
+81.61794872 , -386.1 , 8.032246992
+81.61794872 , -193.05 , 11.70019699
+81.61794872 , 0 , 15.36814699
+81.61794872 , 193.05 , 19.03609699
+81.61794872 , 386.1 , 22.70404699
+81.61794872 , 579.15 , 26.37199699
+81.61794872 , 772.2 , 30.03994699
+81.61794872 , 965.25 , 33.70789699
+81.61794872 , 1158.3 , 37.37584699
+81.61794872 , 1351.35 , 41.04379699
+81.61794872 , 1544.4 , 44.71174699
+81.61794872 , 1737.45 , 48.37969699
+81.61794872 , 1930.5 , 52.04764699
+81.61794872 , 2123.55 , 55.71559699
+81.61794872 , 2316.6 , 59.38354699
+81.61794872 , 2509.65 , 63.05149699
+81.61794872 , 2702.7 , 66.71944699
+81.61794872 , 2895.75 , 70.38739699
+81.61794872 , 3088.8 , 74.05534699
+81.61794872 , 3281.85 , 77.72329699
+81.61794872 , 3474.9 , 81.39124699
+81.61794872 , 3667.95 , 85.05919699
+81.61794872 , 3861 , 88.72714699
+81.61794872 , 4054.05 , 92.39509699
+81.61794872 , 4247.1 , 96.06304699
+81.61794872 , 4440.15 , 99.73099699
+81.61794872 , 4633.2 , 103.398947
+81.61794872 , 4826.25 , 107.066897
+81.61794872 , 5019.3 , 110.734847
+81.61794872 , 5212.35 , 114.402797
+81.61794872 , 5405.4 , 118.070747
+81.61794872 , 5598.45 , 121.738697
+81.61794872 , 5791.5 , 125.406647
+81.61794872 , 5984.55 , 129.074597
+81.61794872 , 6177.6 , 132.742547
+122.4273504 , -6177.6 , 101.4264134
+122.4273504 , -5984.55 , 97.75846344
+122.4273504 , -5791.5 , 94.09051344
+122.4273504 , -5598.45 , 90.42256344
+122.4273504 , -5405.4 , 86.75461344
+122.4273504 , -5212.35 , 83.08666344
+122.4273504 , -5019.3 , 79.41871344
+122.4273504 , -4826.25 , 75.75076344
+122.4273504 , -4633.2 , 72.08281344
+122.4273504 , -4440.15 , 68.41486344
+122.4273504 , -4247.1 , 64.74691344
+122.4273504 , -4054.05 , 61.07896344
+122.4273504 , -3861 , 57.41101344
+122.4273504 , -3667.95 , 53.74306344
+122.4273504 , -3474.9 , 50.07511344
+122.4273504 , -3281.85 , 46.40716344
+122.4273504 , -3088.8 , 42.73921344
+122.4273504 , -2895.75 , 39.07126344
+122.4273504 , -2702.7 , 35.40331344
+122.4273504 , -2509.65 , 31.73536344
+122.4273504 , -2316.6 , 28.06741344
+122.4273504 , -2123.55 , 24.39946344
+122.4273504 , -1930.5 , 20.73151344
+122.4273504 , -1737.45 , 17.06356344
+122.4273504 , -1544.4 , 13.39561344
+122.4273504 , -1351.35 , 9.72766344
+122.4273504 , -1158.3 , 6.05971344
+122.4273504 , -965.25 , 2.39176344
+122.4273504 , -772.2 , 1.27618656
+122.4273504 , -579.15 , 4.94413656
+122.4273504 , -386.1 , 8.61208656
+122.4273504 , -193.05 , 12.28003656
+122.4273504 , 0 , 15.94798656
+122.4273504 , 193.05 , 19.61593656
+122.4273504 , 386.1 , 23.28388656
+122.4273504 , 579.15 , 26.95183656
+122.4273504 , 772.2 , 30.61978656
+122.4273504 , 965.25 , 34.28773656
+122.4273504 , 1158.3 , 37.95568656
+122.4273504 , 1351.35 , 41.62363656
+122.4273504 , 1544.4 , 45.29158656
+122.4273504 , 1737.45 , 48.95953656
+122.4273504 , 1930.5 , 52.62748656
+122.4273504 , 2123.55 , 56.29543656
+122.4273504 , 2316.6 , 59.96338656
+122.4273504 , 2509.65 , 63.63133656
+122.4273504 , 2702.7 , 67.29928656
+122.4273504 , 2895.75 , 70.96723656
+122.4273504 , 3088.8 , 74.63518656
+122.4273504 , 3281.85 , 78.30313656
+122.4273504 , 3474.9 , 81.97108656
+122.4273504 , 3667.95 , 85.63903656
+122.4273504 , 3861 , 89.30698656
+122.4273504 , 4054.05 , 92.97493656
+122.4273504 , 4247.1 , 96.64288656
+122.4273504 , 4440.15 , 100.3108366
+122.4273504 , 4633.2 , 103.9787866
+122.4273504 , 4826.25 , 107.6467366
+122.4273504 , 5019.3 , 111.3146866
+122.4273504 , 5212.35 , 114.9826366
+122.4273504 , 5405.4 , 118.6505866
+122.4273504 , 5598.45 , 122.3185366
+122.4273504 , 5791.5 , 125.9864866
+122.4273504 , 5984.55 , 129.6544366
+122.4273504 , 6177.6 , 133.3223866
+163.2393162 , -6177.6 , 100.8465374
+163.2393162 , -5984.55 , 97.17858744
+163.2393162 , -5791.5 , 93.51063744
+163.2393162 , -5598.45 , 89.84268744
+163.2393162 , -5405.4 , 86.17473744
+163.2393162 , -5212.35 , 82.50678744
+163.2393162 , -5019.3 , 78.83883744
+163.2393162 , -4826.25 , 75.17088744
+163.2393162 , -4633.2 , 71.50293744
+163.2393162 , -4440.15 , 67.83498744
+163.2393162 , -4247.1 , 64.16703744
+163.2393162 , -4054.05 , 60.49908744
+163.2393162 , -3861 , 56.83113744
+163.2393162 , -3667.95 , 53.16318744
+163.2393162 , -3474.9 , 49.49523744
+163.2393162 , -3281.85 , 45.82728744
+163.2393162 , -3088.8 , 42.15933744
+163.2393162 , -2895.75 , 38.49138744
+163.2393162 , -2702.7 , 34.82343744
+163.2393162 , -2509.65 , 31.15548744
+163.2393162 , -2316.6 , 27.48753744
+163.2393162 , -2123.55 , 23.81958744
+163.2393162 , -1930.5 , 20.15163744
+163.2393162 , -1737.45 , 16.48368744
+163.2393162 , -1544.4 , 12.81573744
+163.2393162 , -1351.35 , 9.147787441
+163.2393162 , -1158.3 , 5.479837441
+163.2393162 , -965.25 , 1.811887441
+163.2393162 , -772.2 , 1.856062559
+163.2393162 , -579.15 , 5.524012559
+163.2393162 , -386.1 , 9.191962559
+163.2393162 , -193.05 , 12.85991256
+163.2393162 , 0 , 16.52786256
+163.2393162 , 193.05 , 20.19581256
+163.2393162 , 386.1 , 23.86376256
+163.2393162 , 579.15 , 27.53171256
+163.2393162 , 772.2 , 31.19966256
+163.2393162 , 965.25 , 34.86761256
+163.2393162 , 1158.3 , 38.53556256
+163.2393162 , 1351.35 , 42.20351256
+163.2393162 , 1544.4 , 45.87146256
+163.2393162 , 1737.45 , 49.53941256
+163.2393162 , 1930.5 , 53.20736256
+163.2393162 , 2123.55 , 56.87531256
+163.2393162 , 2316.6 , 60.54326256
+163.2393162 , 2509.65 , 64.21121256
+163.2393162 , 2702.7 , 67.87916256
+163.2393162 , 2895.75 , 71.54711256
+163.2393162 , 3088.8 , 75.21506256
+163.2393162 , 3281.85 , 78.88301256
+163.2393162 , 3474.9 , 82.55096256
+163.2393162 , 3667.95 , 86.21891256
+163.2393162 , 3861 , 89.88686256
+163.2393162 , 4054.05 , 93.55481256
+163.2393162 , 4247.1 , 97.22276256
+163.2393162 , 4440.15 , 100.8907126
+163.2393162 , 4633.2 , 104.5586626
+163.2393162 , 4826.25 , 108.2266126
+163.2393162 , 5019.3 , 111.8945626
+163.2393162 , 5212.35 , 115.5625126
+163.2393162 , 5405.4 , 119.2304626
+163.2393162 , 5598.45 , 122.8984126
+163.2393162 , 5791.5 , 126.5663626
+163.2393162 , 5984.55 , 130.2343126
+163.2393162 , 6177.6 , 133.9022626
+204.042735 , -6177.6 , 100.2667829
+204.042735 , -5984.55 , 96.59883288
+204.042735 , -5791.5 , 92.93088288
+204.042735 , -5598.45 , 89.26293288
+204.042735 , -5405.4 , 85.59498288
+204.042735 , -5212.35 , 81.92703288
+204.042735 , -5019.3 , 78.25908288
+204.042735 , -4826.25 , 74.59113288
+204.042735 , -4633.2 , 70.92318288
+204.042735 , -4440.15 , 67.25523288
+204.042735 , -4247.1 , 63.58728288
+204.042735 , -4054.05 , 59.91933288
+204.042735 , -3861 , 56.25138288
+204.042735 , -3667.95 , 52.58343288
+204.042735 , -3474.9 , 48.91548288
+204.042735 , -3281.85 , 45.24753288
+204.042735 , -3088.8 , 41.57958288
+204.042735 , -2895.75 , 37.91163288
+204.042735 , -2702.7 , 34.24368288
+204.042735 , -2509.65 , 30.57573288
+204.042735 , -2316.6 , 26.90778288
+204.042735 , -2123.55 , 23.23983288
+204.042735 , -1930.5 , 19.57188288
+204.042735 , -1737.45 , 15.90393288
+204.042735 , -1544.4 , 12.23598288
+204.042735 , -1351.35 , 8.568032881
+204.042735 , -1158.3 , 4.900082881
+204.042735 , -965.25 , 1.232132881
+204.042735 , -772.2 , 2.435817119
+204.042735 , -579.15 , 6.103767119
+204.042735 , -386.1 , 9.771717119
+204.042735 , -193.05 , 13.43966712
+204.042735 , 0 , 17.10761712
+204.042735 , 193.05 , 20.77556712
+204.042735 , 386.1 , 24.44351712
+204.042735 , 579.15 , 28.11146712
+204.042735 , 772.2 , 31.77941712
+204.042735 , 965.25 , 35.44736712
+204.042735 , 1158.3 , 39.11531712
+204.042735 , 1351.35 , 42.78326712
+204.042735 , 1544.4 , 46.45121712
+204.042735 , 1737.45 , 50.11916712
+204.042735 , 1930.5 , 53.78711712
+204.042735 , 2123.55 , 57.45506712
+204.042735 , 2316.6 , 61.12301712
+204.042735 , 2509.65 , 64.79096712
+204.042735 , 2702.7 , 68.45891712
+204.042735 , 2895.75 , 72.12686712
+204.042735 , 3088.8 , 75.79481712
+204.042735 , 3281.85 , 79.46276712
+204.042735 , 3474.9 , 83.13071712
+204.042735 , 3667.95 , 86.79866712
+204.042735 , 3861 , 90.46661712
+204.042735 , 4054.05 , 94.13456712
+204.042735 , 4247.1 , 97.80251712
+204.042735 , 4440.15 , 101.4704671
+204.042735 , 4633.2 , 105.1384171
+204.042735 , 4826.25 , 108.8063671
+204.042735 , 5019.3 , 112.4743171
+204.042735 , 5212.35 , 116.1422671
+204.042735 , 5405.4 , 119.8102171
+204.042735 , 5598.45 , 123.4781671
+204.042735 , 5791.5 , 127.1461171
+204.042735 , 5984.55 , 130.8140671
+204.042735 , 6177.6 , 134.4820171
+244.8547009 , -6177.6 , 99.68690688
+244.8547009 , -5984.55 , 96.01895688
+244.8547009 , -5791.5 , 92.35100688
+244.8547009 , -5598.45 , 88.68305688
+244.8547009 , -5405.4 , 85.01510688
+244.8547009 , -5212.35 , 81.34715688
+244.8547009 , -5019.3 , 77.67920688
+244.8547009 , -4826.25 , 74.01125688
+244.8547009 , -4633.2 , 70.34330688
+244.8547009 , -4440.15 , 66.67535688
+244.8547009 , -4247.1 , 63.00740688
+244.8547009 , -4054.05 , 59.33945688
+244.8547009 , -3861 , 55.67150688
+244.8547009 , -3667.95 , 52.00355688
+244.8547009 , -3474.9 , 48.33560688
+244.8547009 , -3281.85 , 44.66765688
+244.8547009 , -3088.8 , 40.99970688
+244.8547009 , -2895.75 , 37.33175688
+244.8547009 , -2702.7 , 33.66380688
+244.8547009 , -2509.65 , 29.99585688
+244.8547009 , -2316.6 , 26.32790688
+244.8547009 , -2123.55 , 22.65995688
+244.8547009 , -1930.5 , 18.99200688
+244.8547009 , -1737.45 , 15.32405688
+244.8547009 , -1544.4 , 11.65610688
+244.8547009 , -1351.35 , 7.988156879
+244.8547009 , -1158.3 , 4.320206879
+244.8547009 , -965.25 , 0.652256879
+244.8547009 , -772.2 , 3.015693121
+244.8547009 , -579.15 , 6.683643121
+244.8547009 , -386.1 , 10.35159312
+244.8547009 , -193.05 , 14.01954312
+244.8547009 , 0 , 17.68749312
+244.8547009 , 193.05 , 21.35544312
+244.8547009 , 386.1 , 25.02339312
+244.8547009 , 579.15 , 28.69134312
+244.8547009 , 772.2 , 32.35929312
+244.8547009 , 965.25 , 36.02724312
+244.8547009 , 1158.3 , 39.69519312
+244.8547009 , 1351.35 , 43.36314312
+244.8547009 , 1544.4 , 47.03109312
+244.8547009 , 1737.45 , 50.69904312
+244.8547009 , 1930.5 , 54.36699312
+244.8547009 , 2123.55 , 58.03494312
+244.8547009 , 2316.6 , 61.70289312
+244.8547009 , 2509.65 , 65.37084312
+244.8547009 , 2702.7 , 69.03879312
+244.8547009 , 2895.75 , 72.70674312
+244.8547009 , 3088.8 , 76.37469312
+244.8547009 , 3281.85 , 80.04264312
+244.8547009 , 3474.9 , 83.71059312
+244.8547009 , 3667.95 , 87.37854312
+244.8547009 , 3861 , 91.04649312
+244.8547009 , 4054.05 , 94.71444312
+244.8547009 , 4247.1 , 98.38239312
+244.8547009 , 4440.15 , 102.0503431
+244.8547009 , 4633.2 , 105.7182931
+244.8547009 , 4826.25 , 109.3862431
+244.8547009 , 5019.3 , 113.0541931
+244.8547009 , 5212.35 , 116.7221431
+244.8547009 , 5405.4 , 120.3900931
+244.8547009 , 5598.45 , 124.0580431
+244.8547009 , 5791.5 , 127.7259931
+244.8547009 , 5984.55 , 131.3939431
+244.8547009 , 6177.6 , 135.0618931
+285.6666667 , -6177.6 , 99.10703088
+285.6666667 , -5984.55 , 95.43908088
+285.6666667 , -5791.5 , 91.77113088
+285.6666667 , -5598.45 , 88.10318088
+285.6666667 , -5405.4 , 84.43523088
+285.6666667 , -5212.35 , 80.76728088
+285.6666667 , -5019.3 , 77.09933088
+285.6666667 , -4826.25 , 73.43138088
+285.6666667 , -4633.2 , 69.76343088
+285.6666667 , -4440.15 , 66.09548088
+285.6666667 , -4247.1 , 62.42753088
+285.6666667 , -4054.05 , 58.75958088
+285.6666667 , -3861 , 55.09163088
+285.6666667 , -3667.95 , 51.42368088
+285.6666667 , -3474.9 , 47.75573088
+285.6666667 , -3281.85 , 44.08778088
+285.6666667 , -3088.8 , 40.41983088
+285.6666667 , -2895.75 , 36.75188088
+285.6666667 , -2702.7 , 33.08393088
+285.6666667 , -2509.65 , 29.41598088
+285.6666667 , -2316.6 , 25.74803088
+285.6666667 , -2123.55 , 22.08008088
+285.6666667 , -1930.5 , 18.41213088
+285.6666667 , -1737.45 , 14.74418088
+285.6666667 , -1544.4 , 11.07623088
+285.6666667 , -1351.35 , 7.40828088
+285.6666667 , -1158.3 , 3.74033088
+285.6666667 , -965.25 , 0.07238088
+285.6666667 , -772.2 , 3.59556912
+285.6666667 , -579.15 , 7.26351912
+285.6666667 , -386.1 , 10.93146912
+285.6666667 , -193.05 , 14.59941912
+285.6666667 , 0 , 18.26736912
+285.6666667 , 193.05 , 21.93531912
+285.6666667 , 386.1 , 25.60326912
+285.6666667 , 579.15 , 29.27121912
+285.6666667 , 772.2 , 32.93916912
+285.6666667 , 965.25 , 36.60711912
+285.6666667 , 1158.3 , 40.27506912
+285.6666667 , 1351.35 , 43.94301912
+285.6666667 , 1544.4 , 47.61096912
+285.6666667 , 1737.45 , 51.27891912
+285.6666667 , 1930.5 , 54.94686912
+285.6666667 , 2123.55 , 58.61481912
+285.6666667 , 2316.6 , 62.28276912
+285.6666667 , 2509.65 , 65.95071912
+285.6666667 , 2702.7 , 69.61866912
+285.6666667 , 2895.75 , 73.28661912
+285.6666667 , 3088.8 , 76.95456912
+285.6666667 , 3281.85 , 80.62251912
+285.6666667 , 3474.9 , 84.29046912
+285.6666667 , 3667.95 , 87.95841912
+285.6666667 , 3861 , 91.62636912
+285.6666667 , 4054.05 , 95.29431912
+285.6666667 , 4247.1 , 98.96226912
+285.6666667 , 4440.15 , 102.6302191
+285.6666667 , 4633.2 , 106.2981691
+285.6666667 , 4826.25 , 109.9661191
+285.6666667 , 5019.3 , 113.6340691
+285.6666667 , 5212.35 , 117.3020191
+285.6666667 , 5405.4 , 120.9699691
+285.6666667 , 5598.45 , 124.6379191
+285.6666667 , 5791.5 , 128.3058691
+285.6666667 , 5984.55 , 131.9738191
+285.6666667 , 6177.6 , 135.6417691
+326.4700855 , -6177.6 , 98.52727632
+326.4700855 , -5984.55 , 94.85932632
+326.4700855 , -5791.5 , 91.19137632
+326.4700855 , -5598.45 , 87.52342632
+326.4700855 , -5405.4 , 83.85547632
+326.4700855 , -5212.35 , 80.18752632
+326.4700855 , -5019.3 , 76.51957632
+326.4700855 , -4826.25 , 72.85162632
+326.4700855 , -4633.2 , 69.18367632
+326.4700855 , -4440.15 , 65.51572632
+326.4700855 , -4247.1 , 61.84777632
+326.4700855 , -4054.05 , 58.17982632
+326.4700855 , -3861 , 54.51187632
+326.4700855 , -3667.95 , 50.84392632
+326.4700855 , -3474.9 , 47.17597632
+326.4700855 , -3281.85 , 43.50802632
+326.4700855 , -3088.8 , 39.84007632
+326.4700855 , -2895.75 , 36.17212632
+326.4700855 , -2702.7 , 32.50417632
+326.4700855 , -2509.65 , 28.83622632
+326.4700855 , -2316.6 , 25.16827632
+326.4700855 , -2123.55 , 21.50032632
+326.4700855 , -1930.5 , 17.83237632
+326.4700855 , -1737.45 , 14.16442632
+326.4700855 , -1544.4 , 10.49647632
+326.4700855 , -1351.35 , 6.82852632
+326.4700855 , -1158.3 , 3.16057632
+326.4700855 , -965.25 , 0.50737368
+326.4700855 , -772.2 , 4.17532368
+326.4700855 , -579.15 , 7.84327368
+326.4700855 , -386.1 , 11.51122368
+326.4700855 , -193.05 , 15.17917368
+326.4700855 , 0 , 18.84712368
+326.4700855 , 193.05 , 22.51507368
+326.4700855 , 386.1 , 26.18302368
+326.4700855 , 579.15 , 29.85097368
+326.4700855 , 772.2 , 33.51892368
+326.4700855 , 965.25 , 37.18687368
+326.4700855 , 1158.3 , 40.85482368
+326.4700855 , 1351.35 , 44.52277368
+326.4700855 , 1544.4 , 48.19072368
+326.4700855 , 1737.45 , 51.85867368
+326.4700855 , 1930.5 , 55.52662368
+326.4700855 , 2123.55 , 59.19457368
+326.4700855 , 2316.6 , 62.86252368
+326.4700855 , 2509.65 , 66.53047368
+326.4700855 , 2702.7 , 70.19842368
+326.4700855 , 2895.75 , 73.86637368
+326.4700855 , 3088.8 , 77.53432368
+326.4700855 , 3281.85 , 81.20227368
+326.4700855 , 3474.9 , 84.87022368
+326.4700855 , 3667.95 , 88.53817368
+326.4700855 , 3861 , 92.20612368
+326.4700855 , 4054.05 , 95.87407368
+326.4700855 , 4247.1 , 99.54202368
+326.4700855 , 4440.15 , 103.2099737
+326.4700855 , 4633.2 , 106.8779237
+326.4700855 , 4826.25 , 110.5458737
+326.4700855 , 5019.3 , 114.2138237
+326.4700855 , 5212.35 , 117.8817737
+326.4700855 , 5405.4 , 121.5497237
+326.4700855 , 5598.45 , 125.2176737
+326.4700855 , 5791.5 , 128.8856237
+326.4700855 , 5984.55 , 132.5535737
+326.4700855 , 6177.6 , 136.2215237
+367.2820513 , -6177.6 , 97.94740032
+367.2820513 , -5984.55 , 94.27945032
+367.2820513 , -5791.5 , 90.61150032
+367.2820513 , -5598.45 , 86.94355032
+367.2820513 , -5405.4 , 83.27560032
+367.2820513 , -5212.35 , 79.60765032
+367.2820513 , -5019.3 , 75.93970032
+367.2820513 , -4826.25 , 72.27175032
+367.2820513 , -4633.2 , 68.60380032
+367.2820513 , -4440.15 , 64.93585032
+367.2820513 , -4247.1 , 61.26790032
+367.2820513 , -4054.05 , 57.59995032
+367.2820513 , -3861 , 53.93200032
+367.2820513 , -3667.95 , 50.26405032
+367.2820513 , -3474.9 , 46.59610032
+367.2820513 , -3281.85 , 42.92815032
+367.2820513 , -3088.8 , 39.26020032
+367.2820513 , -2895.75 , 35.59225032
+367.2820513 , -2702.7 , 31.92430032
+367.2820513 , -2509.65 , 28.25635032
+367.2820513 , -2316.6 , 24.58840032
+367.2820513 , -2123.55 , 20.92045032
+367.2820513 , -1930.5 , 17.25250032
+367.2820513 , -1737.45 , 13.58455032
+367.2820513 , -1544.4 , 9.91660032
+367.2820513 , -1351.35 , 6.24865032
+367.2820513 , -1158.3 , 2.58070032
+367.2820513 , -965.25 , 1.08724968
+367.2820513 , -772.2 , 4.75519968
+367.2820513 , -579.15 , 8.42314968
+367.2820513 , -386.1 , 12.09109968
+367.2820513 , -193.05 , 15.75904968
+367.2820513 , 0 , 19.42699968
+367.2820513 , 193.05 , 23.09494968
+367.2820513 , 386.1 , 26.76289968
+367.2820513 , 579.15 , 30.43084968
+367.2820513 , 772.2 , 34.09879968
+367.2820513 , 965.25 , 37.76674968
+367.2820513 , 1158.3 , 41.43469968
+367.2820513 , 1351.35 , 45.10264968
+367.2820513 , 1544.4 , 48.77059968
+367.2820513 , 1737.45 , 52.43854968
+367.2820513 , 1930.5 , 56.10649968
+367.2820513 , 2123.55 , 59.77444968
+367.2820513 , 2316.6 , 63.44239968
+367.2820513 , 2509.65 , 67.11034968
+367.2820513 , 2702.7 , 70.77829968
+367.2820513 , 2895.75 , 74.44624968
+367.2820513 , 3088.8 , 78.11419968
+367.2820513 , 3281.85 , 81.78214968
+367.2820513 , 3474.9 , 85.45009968
+367.2820513 , 3667.95 , 89.11804968
+367.2820513 , 3861 , 92.78599968
+367.2820513 , 4054.05 , 96.45394968
+367.2820513 , 4247.1 , 100.1218997
+367.2820513 , 4440.15 , 103.7898497
+367.2820513 , 4633.2 , 107.4577997
+367.2820513 , 4826.25 , 111.1257497
+367.2820513 , 5019.3 , 114.7936997
+367.2820513 , 5212.35 , 118.4616497
+367.2820513 , 5405.4 , 122.1295997
+367.2820513 , 5598.45 , 125.7975497
+367.2820513 , 5791.5 , 129.4654997
+367.2820513 , 5984.55 , 133.1334497
+367.2820513 , 6177.6 , 136.8013997
+408.0854701 , -6177.6 , 97.36764576
+408.0854701 , -5984.55 , 93.69969576
+408.0854701 , -5791.5 , 90.03174576
+408.0854701 , -5598.45 , 86.36379576
+408.0854701 , -5405.4 , 82.69584576
+408.0854701 , -5212.35 , 79.02789576
+408.0854701 , -5019.3 , 75.35994576
+408.0854701 , -4826.25 , 71.69199576
+408.0854701 , -4633.2 , 68.02404576
+408.0854701 , -4440.15 , 64.35609576
+408.0854701 , -4247.1 , 60.68814576
+408.0854701 , -4054.05 , 57.02019576
+408.0854701 , -3861 , 53.35224576
+408.0854701 , -3667.95 , 49.68429576
+408.0854701 , -3474.9 , 46.01634576
+408.0854701 , -3281.85 , 42.34839576
+408.0854701 , -3088.8 , 38.68044576
+408.0854701 , -2895.75 , 35.01249576
+408.0854701 , -2702.7 , 31.34454576
+408.0854701 , -2509.65 , 27.67659576
+408.0854701 , -2316.6 , 24.00864576
+408.0854701 , -2123.55 , 20.34069576
+408.0854701 , -1930.5 , 16.67274576
+408.0854701 , -1737.45 , 13.00479576
+408.0854701 , -1544.4 , 9.33684576
+408.0854701 , -1351.35 , 5.66889576
+408.0854701 , -1158.3 , 2.00094576
+408.0854701 , -965.25 , 1.66700424
+408.0854701 , -772.2 , 5.33495424
+408.0854701 , -579.15 , 9.00290424
+408.0854701 , -386.1 , 12.67085424
+408.0854701 , -193.05 , 16.33880424
+408.0854701 , 0 , 20.00675424
+408.0854701 , 193.05 , 23.67470424
+408.0854701 , 386.1 , 27.34265424
+408.0854701 , 579.15 , 31.01060424
+408.0854701 , 772.2 , 34.67855424
+408.0854701 , 965.25 , 38.34650424
+408.0854701 , 1158.3 , 42.01445424
+408.0854701 , 1351.35 , 45.68240424
+408.0854701 , 1544.4 , 49.35035424
+408.0854701 , 1737.45 , 53.01830424
+408.0854701 , 1930.5 , 56.68625424
+408.0854701 , 2123.55 , 60.35420424
+408.0854701 , 2316.6 , 64.02215424
+408.0854701 , 2509.65 , 67.69010424
+408.0854701 , 2702.7 , 71.35805424
+408.0854701 , 2895.75 , 75.02600424
+408.0854701 , 3088.8 , 78.69395424
+408.0854701 , 3281.85 , 82.36190424
+408.0854701 , 3474.9 , 86.02985424
+408.0854701 , 3667.95 , 89.69780424
+408.0854701 , 3861 , 93.36575424
+408.0854701 , 4054.05 , 97.03370424
+408.0854701 , 4247.1 , 100.7016542
+408.0854701 , 4440.15 , 104.3696042
+408.0854701 , 4633.2 , 108.0375542
+408.0854701 , 4826.25 , 111.7055042
+408.0854701 , 5019.3 , 115.3734542
+408.0854701 , 5212.35 , 119.0414042
+408.0854701 , 5405.4 , 122.7093542
+408.0854701 , 5598.45 , 126.3773042
+408.0854701 , 5791.5 , 130.0452542
+408.0854701 , 5984.55 , 133.7132042
+408.0854701 , 6177.6 , 137.3811542
+448.8974359 , -6177.6 , 96.78776976
+448.8974359 , -5984.55 , 93.11981976
+448.8974359 , -5791.5 , 89.45186976
+448.8974359 , -5598.45 , 85.78391976
+448.8974359 , -5405.4 , 82.11596976
+448.8974359 , -5212.35 , 78.44801976
+448.8974359 , -5019.3 , 74.78006976
+448.8974359 , -4826.25 , 71.11211976
+448.8974359 , -4633.2 , 67.44416976
+448.8974359 , -4440.15 , 63.77621976
+448.8974359 , -4247.1 , 60.10826976
+448.8974359 , -4054.05 , 56.44031976
+448.8974359 , -3861 , 52.77236976
+448.8974359 , -3667.95 , 49.10441976
+448.8974359 , -3474.9 , 45.43646976
+448.8974359 , -3281.85 , 41.76851976
+448.8974359 , -3088.8 , 38.10056976
+448.8974359 , -2895.75 , 34.43261976
+448.8974359 , -2702.7 , 30.76466976
+448.8974359 , -2509.65 , 27.09671976
+448.8974359 , -2316.6 , 23.42876976
+448.8974359 , -2123.55 , 19.76081976
+448.8974359 , -1930.5 , 16.09286976
+448.8974359 , -1737.45 , 12.42491976
+448.8974359 , -1544.4 , 8.75696976
+448.8974359 , -1351.35 , 5.08901976
+448.8974359 , -1158.3 , 1.42106976
+448.8974359 , -965.25 , 2.24688024
+448.8974359 , -772.2 , 5.91483024
+448.8974359 , -579.15 , 9.58278024
+448.8974359 , -386.1 , 13.25073024
+448.8974359 , -193.05 , 16.91868024
+448.8974359 , 0 , 20.58663024
+448.8974359 , 193.05 , 24.25458024
+448.8974359 , 386.1 , 27.92253024
+448.8974359 , 579.15 , 31.59048024
+448.8974359 , 772.2 , 35.25843024
+448.8974359 , 965.25 , 38.92638024
+448.8974359 , 1158.3 , 42.59433024
+448.8974359 , 1351.35 , 46.26228024
+448.8974359 , 1544.4 , 49.93023024
+448.8974359 , 1737.45 , 53.59818024
+448.8974359 , 1930.5 , 57.26613024
+448.8974359 , 2123.55 , 60.93408024
+448.8974359 , 2316.6 , 64.60203024
+448.8974359 , 2509.65 , 68.26998024
+448.8974359 , 2702.7 , 71.93793024
+448.8974359 , 2895.75 , 75.60588024
+448.8974359 , 3088.8 , 79.27383024
+448.8974359 , 3281.85 , 82.94178024
+448.8974359 , 3474.9 , 86.60973024
+448.8974359 , 3667.95 , 90.27768024
+448.8974359 , 3861 , 93.94563024
+448.8974359 , 4054.05 , 97.61358024
+448.8974359 , 4247.1 , 101.2815302
+448.8974359 , 4440.15 , 104.9494802
+448.8974359 , 4633.2 , 108.6174302
+448.8974359 , 4826.25 , 112.2853802
+448.8974359 , 5019.3 , 115.9533302
+448.8974359 , 5212.35 , 119.6212802
+448.8974359 , 5405.4 , 123.2892302
+448.8974359 , 5598.45 , 126.9571802
+448.8974359 , 5791.5 , 130.6251302
+448.8974359 , 5984.55 , 134.2930802
+448.8974359 , 6177.6 , 137.9610302
+489.7094017 , -6177.6 , 96.20789376
+489.7094017 , -5984.55 , 92.53994376
+489.7094017 , -5791.5 , 88.87199376
+489.7094017 , -5598.45 , 85.20404376
+489.7094017 , -5405.4 , 81.53609376
+489.7094017 , -5212.35 , 77.86814376
+489.7094017 , -5019.3 , 74.20019376
+489.7094017 , -4826.25 , 70.53224376
+489.7094017 , -4633.2 , 66.86429376
+489.7094017 , -4440.15 , 63.19634376
+489.7094017 , -4247.1 , 59.52839376
+489.7094017 , -4054.05 , 55.86044376
+489.7094017 , -3861 , 52.19249376
+489.7094017 , -3667.95 , 48.52454376
+489.7094017 , -3474.9 , 44.85659376
+489.7094017 , -3281.85 , 41.18864376
+489.7094017 , -3088.8 , 37.52069376
+489.7094017 , -2895.75 , 33.85274376
+489.7094017 , -2702.7 , 30.18479376
+489.7094017 , -2509.65 , 26.51684376
+489.7094017 , -2316.6 , 22.84889376
+489.7094017 , -2123.55 , 19.18094376
+489.7094017 , -1930.5 , 15.51299376
+489.7094017 , -1737.45 , 11.84504376
+489.7094017 , -1544.4 , 8.17709376
+489.7094017 , -1351.35 , 4.50914376
+489.7094017 , -1158.3 , 0.84119376
+489.7094017 , -965.25 , 2.82675624
+489.7094017 , -772.2 , 6.49470624
+489.7094017 , -579.15 , 10.16265624
+489.7094017 , -386.1 , 13.83060624
+489.7094017 , -193.05 , 17.49855624
+489.7094017 , 0 , 21.16650624
+489.7094017 , 193.05 , 24.83445624
+489.7094017 , 386.1 , 28.50240624
+489.7094017 , 579.15 , 32.17035624
+489.7094017 , 772.2 , 35.83830624
+489.7094017 , 965.25 , 39.50625624
+489.7094017 , 1158.3 , 43.17420624
+489.7094017 , 1351.35 , 46.84215624
+489.7094017 , 1544.4 , 50.51010624
+489.7094017 , 1737.45 , 54.17805624
+489.7094017 , 1930.5 , 57.84600624
+489.7094017 , 2123.55 , 61.51395624
+489.7094017 , 2316.6 , 65.18190624
+489.7094017 , 2509.65 , 68.84985624
+489.7094017 , 2702.7 , 72.51780624
+489.7094017 , 2895.75 , 76.18575624
+489.7094017 , 3088.8 , 79.85370624
+489.7094017 , 3281.85 , 83.52165624
+489.7094017 , 3474.9 , 87.18960624
+489.7094017 , 3667.95 , 90.85755624
+489.7094017 , 3861 , 94.52550624
+489.7094017 , 4054.05 , 98.19345624
+489.7094017 , 4247.1 , 101.8614062
+489.7094017 , 4440.15 , 105.5293562
+489.7094017 , 4633.2 , 109.1973062
+489.7094017 , 4826.25 , 112.8652562
+489.7094017 , 5019.3 , 116.5332062
+489.7094017 , 5212.35 , 120.2011562
+489.7094017 , 5405.4 , 123.8691062
+489.7094017 , 5598.45 , 127.5370562
+489.7094017 , 5791.5 , 131.2050062
+489.7094017 , 5984.55 , 134.8729562
+489.7094017 , 6177.6 , 138.5409062
+816.1794872 , -6177.6 , 91.56925008
+816.1794872 , -5984.55 , 87.90130008
+816.1794872 , -5791.5 , 84.23335008
+816.1794872 , -5598.45 , 80.56540008
+816.1794872 , -5405.4 , 76.89745008
+816.1794872 , -5212.35 , 73.22950008
+816.1794872 , -5019.3 , 69.56155008
+816.1794872 , -4826.25 , 65.89360008
+816.1794872 , -4633.2 , 62.22565008
+816.1794872 , -4440.15 , 58.55770008
+816.1794872 , -4247.1 , 54.88975008
+816.1794872 , -4054.05 , 51.22180008
+816.1794872 , -3861 , 47.55385008
+816.1794872 , -3667.95 , 43.88590008
+816.1794872 , -3474.9 , 40.21795008
+816.1794872 , -3281.85 , 36.55000008
+816.1794872 , -3088.8 , 32.88205008
+816.1794872 , -2895.75 , 29.21410008
+816.1794872 , -2702.7 , 25.54615008
+816.1794872 , -2509.65 , 21.87820008
+816.1794872 , -2316.6 , 18.21025008
+816.1794872 , -2123.55 , 14.54230008
+816.1794872 , -1930.5 , 10.87435008
+816.1794872 , -1737.45 , 7.20640008
+816.1794872 , -1544.4 , 3.53845008
+816.1794872 , -1351.35 , 0.12949992
+816.1794872 , -1158.3 , 3.79744992
+816.1794872 , -965.25 , 7.46539992
+816.1794872 , -772.2 , 11.13334992
+816.1794872 , -579.15 , 14.80129992
+816.1794872 , -386.1 , 18.46924992
+816.1794872 , -193.05 , 22.13719992
+816.1794872 , 0 , 25.80514992
+816.1794872 , 193.05 , 29.47309992
+816.1794872 , 386.1 , 33.14104992
+816.1794872 , 579.15 , 36.80899992
+816.1794872 , 772.2 , 40.47694992
+816.1794872 , 965.25 , 44.14489992
+816.1794872 , 1158.3 , 47.81284992
+816.1794872 , 1351.35 , 51.48079992
+816.1794872 , 1544.4 , 55.14874992
+816.1794872 , 1737.45 , 58.81669992
+816.1794872 , 1930.5 , 62.48464992
+816.1794872 , 2123.55 , 66.15259992
+816.1794872 , 2316.6 , 69.82054992
+816.1794872 , 2509.65 , 73.48849992
+816.1794872 , 2702.7 , 77.15644992
+816.1794872 , 2895.75 , 80.82439992
+816.1794872 , 3088.8 , 84.49234992
+816.1794872 , 3281.85 , 88.16029992
+816.1794872 , 3474.9 , 91.82824992
+816.1794872 , 3667.95 , 95.49619992
+816.1794872 , 3861 , 99.16414992
+816.1794872 , 4054.05 , 102.8320999
+816.1794872 , 4247.1 , 106.5000499
+816.1794872 , 4440.15 , 110.1679999
+816.1794872 , 4633.2 , 113.8359499
+816.1794872 , 4826.25 , 117.5038999
+816.1794872 , 5019.3 , 121.1718499
+816.1794872 , 5212.35 , 124.8397999
+816.1794872 , 5405.4 , 128.5077499
+816.1794872 , 5598.45 , 132.1756999
+816.1794872 , 5791.5 , 135.8436499
+816.1794872 , 5984.55 , 139.5115999
+816.1794872 , 6177.6 , 143.1795499
+1020.25641 , -6177.6 , 88.6696272
+1020.25641 , -5984.55 , 85.0016772
+1020.25641 , -5791.5 , 81.3337272
+1020.25641 , -5598.45 , 77.6657772
+1020.25641 , -5405.4 , 73.9978272
+1020.25641 , -5212.35 , 70.3298772
+1020.25641 , -5019.3 , 66.6619272
+1020.25641 , -4826.25 , 62.9939772
+1020.25641 , -4633.2 , 59.3260272
+1020.25641 , -4440.15 , 55.6580772
+1020.25641 , -4247.1 , 51.9901272
+1020.25641 , -4054.05 , 48.3221772
+1020.25641 , -3861 , 44.6542272
+1020.25641 , -3667.95 , 40.9862772
+1020.25641 , -3474.9 , 37.3183272
+1020.25641 , -3281.85 , 33.6503772
+1020.25641 , -3088.8 , 29.9824272
+1020.25641 , -2895.75 , 26.3144772
+1020.25641 , -2702.7 , 22.6465272
+1020.25641 , -2509.65 , 18.9785772
+1020.25641 , -2316.6 , 15.3106272
+1020.25641 , -2123.55 , 11.6426772
+1020.25641 , -1930.5 , 7.974727204
+1020.25641 , -1737.45 , 4.306777204
+1020.25641 , -1544.4 , 0.638827204
+1020.25641 , -1351.35 , 3.029122796
+1020.25641 , -1158.3 , 6.697072796
+1020.25641 , -965.25 , 10.3650228
+1020.25641 , -772.2 , 14.0329728
+1020.25641 , -579.15 , 17.7009228
+1020.25641 , -386.1 , 21.3688728
+1020.25641 , -193.05 , 25.0368228
+1020.25641 , 0 , 28.7047728
+1020.25641 , 193.05 , 32.3727228
+1020.25641 , 386.1 , 36.0406728
+1020.25641 , 579.15 , 39.7086228
+1020.25641 , 772.2 , 43.3765728
+1020.25641 , 965.25 , 47.0445228
+1020.25641 , 1158.3 , 50.7124728
+1020.25641 , 1351.35 , 54.3804228
+1020.25641 , 1544.4 , 58.0483728
+1020.25641 , 1737.45 , 61.7163228
+1020.25641 , 1930.5 , 65.3842728
+1020.25641 , 2123.55 , 69.0522228
+1020.25641 , 2316.6 , 72.7201728
+1020.25641 , 2509.65 , 76.3881228
+1020.25641 , 2702.7 , 80.0560728
+1020.25641 , 2895.75 , 83.7240228
+1020.25641 , 3088.8 , 87.3919728
+1020.25641 , 3281.85 , 91.0599228
+1020.25641 , 3474.9 , 94.7278728
+1020.25641 , 3667.95 , 98.3958228
+1020.25641 , 3861 , 102.0637728
+1020.25641 , 4054.05 , 105.7317228
+1020.25641 , 4247.1 , 109.3996728
+1020.25641 , 4440.15 , 113.0676228
+1020.25641 , 4633.2 , 116.7355728
+1020.25641 , 4826.25 , 120.4035228
+1020.25641 , 5019.3 , 124.0714728
+1020.25641 , 5212.35 , 127.7394228
+1020.25641 , 5405.4 , 131.4073728
+1020.25641 , 5598.45 , 135.0753228
+1020.25641 , 5791.5 , 138.7432728
+1020.25641 , 5984.55 , 142.4112228
+1020.25641 , 6177.6 , 146.0791728
+1224.273504 , -6177.6 , 85.7708544
+1224.273504 , -5984.55 , 82.1029044
+1224.273504 , -5791.5 , 78.4349544
+1224.273504 , -5598.45 , 74.7670044
+1224.273504 , -5405.4 , 71.0990544
+1224.273504 , -5212.35 , 67.4311044
+1224.273504 , -5019.3 , 63.7631544
+1224.273504 , -4826.25 , 60.0952044
+1224.273504 , -4633.2 , 56.4272544
+1224.273504 , -4440.15 , 52.7593044
+1224.273504 , -4247.1 , 49.0913544
+1224.273504 , -4054.05 , 45.4234044
+1224.273504 , -3861 , 41.7554544
+1224.273504 , -3667.95 , 38.0875044
+1224.273504 , -3474.9 , 34.4195544
+1224.273504 , -3281.85 , 30.7516044
+1224.273504 , -3088.8 , 27.0836544
+1224.273504 , -2895.75 , 23.4157044
+1224.273504 , -2702.7 , 19.7477544
+1224.273504 , -2509.65 , 16.0798044
+1224.273504 , -2316.6 , 12.4118544
+1224.273504 , -2123.55 , 8.743904404
+1224.273504 , -1930.5 , 5.075954404
+1224.273504 , -1737.45 , 1.408004404
+1224.273504 , -1544.4 , 2.259945596
+1224.273504 , -1351.35 , 5.927895596
+1224.273504 , -1158.3 , 9.595845596
+1224.273504 , -965.25 , 13.2637956
+1224.273504 , -772.2 , 16.9317456
+1224.273504 , -579.15 , 20.5996956
+1224.273504 , -386.1 , 24.2676456
+1224.273504 , -193.05 , 27.9355956
+1224.273504 , 0 , 31.6035456
+1224.273504 , 193.05 , 35.2714956
+1224.273504 , 386.1 , 38.9394456
+1224.273504 , 579.15 , 42.6073956
+1224.273504 , 772.2 , 46.2753456
+1224.273504 , 965.25 , 49.9432956
+1224.273504 , 1158.3 , 53.6112456
+1224.273504 , 1351.35 , 57.2791956
+1224.273504 , 1544.4 , 60.9471456
+1224.273504 , 1737.45 , 64.6150956
+1224.273504 , 1930.5 , 68.2830456
+1224.273504 , 2123.55 , 71.9509956
+1224.273504 , 2316.6 , 75.6189456
+1224.273504 , 2509.65 , 79.2868956
+1224.273504 , 2702.7 , 82.9548456
+1224.273504 , 2895.75 , 86.6227956
+1224.273504 , 3088.8 , 90.2907456
+1224.273504 , 3281.85 , 93.9586956
+1224.273504 , 3474.9 , 97.6266456
+1224.273504 , 3667.95 , 101.2945956
+1224.273504 , 3861 , 104.9625456
+1224.273504 , 4054.05 , 108.6304956
+1224.273504 , 4247.1 , 112.2984456
+1224.273504 , 4440.15 , 115.9663956
+1224.273504 , 4633.2 , 119.6343456
+1224.273504 , 4826.25 , 123.3022956
+1224.273504 , 5019.3 , 126.9702456
+1224.273504 , 5212.35 , 130.6381956
+1224.273504 , 5405.4 , 134.3061456
+1224.273504 , 5598.45 , 137.9740956
+1224.273504 , 5791.5 , 141.6420456
+1224.273504 , 5984.55 , 145.3099956
+1224.273504 , 6177.6 , 148.9779456
+1428.290598 , -6177.6 , 82.8720816
+1428.290598 , -5984.55 , 79.2041316
+1428.290598 , -5791.5 , 75.5361816
+1428.290598 , -5598.45 , 71.8682316
+1428.290598 , -5405.4 , 68.2002816
+1428.290598 , -5212.35 , 64.5323316
+1428.290598 , -5019.3 , 60.8643816
+1428.290598 , -4826.25 , 57.1964316
+1428.290598 , -4633.2 , 53.5284816
+1428.290598 , -4440.15 , 49.8605316
+1428.290598 , -4247.1 , 46.1925816
+1428.290598 , -4054.05 , 42.5246316
+1428.290598 , -3861 , 38.8566816
+1428.290598 , -3667.95 , 35.1887316
+1428.290598 , -3474.9 , 31.5207816
+1428.290598 , -3281.85 , 27.8528316
+1428.290598 , -3088.8 , 24.1848816
+1428.290598 , -2895.75 , 20.5169316
+1428.290598 , -2702.7 , 16.8489816
+1428.290598 , -2509.65 , 13.1810316
+1428.290598 , -2316.6 , 9.513081604
+1428.290598 , -2123.55 , 5.845131604
+1428.290598 , -1930.5 , 2.177181604
+1428.290598 , -1737.45 , 1.490768396
+1428.290598 , -1544.4 , 5.158718396
+1428.290598 , -1351.35 , 8.826668396
+1428.290598 , -1158.3 , 12.4946184
+1428.290598 , -965.25 , 16.1625684
+1428.290598 , -772.2 , 19.8305184
+1428.290598 , -579.15 , 23.4984684
+1428.290598 , -386.1 , 27.1664184
+1428.290598 , -193.05 , 30.8343684
+1428.290598 , 0 , 34.5023184
+1428.290598 , 193.05 , 38.1702684
+1428.290598 , 386.1 , 41.8382184
+1428.290598 , 579.15 , 45.5061684
+1428.290598 , 772.2 , 49.1741184
+1428.290598 , 965.25 , 52.8420684
+1428.290598 , 1158.3 , 56.5100184
+1428.290598 , 1351.35 , 60.1779684
+1428.290598 , 1544.4 , 63.8459184
+1428.290598 , 1737.45 , 67.5138684
+1428.290598 , 1930.5 , 71.1818184
+1428.290598 , 2123.55 , 74.8497684
+1428.290598 , 2316.6 , 78.5177184
+1428.290598 , 2509.65 , 82.1856684
+1428.290598 , 2702.7 , 85.8536184
+1428.290598 , 2895.75 , 89.5215684
+1428.290598 , 3088.8 , 93.1895184
+1428.290598 , 3281.85 , 96.8574684
+1428.290598 , 3474.9 , 100.5254184
+1428.290598 , 3667.95 , 104.1933684
+1428.290598 , 3861 , 107.8613184
+1428.290598 , 4054.05 , 111.5292684
+1428.290598 , 4247.1 , 115.1972184
+1428.290598 , 4440.15 , 118.8651684
+1428.290598 , 4633.2 , 122.5331184
+1428.290598 , 4826.25 , 126.2010684
+1428.290598 , 5019.3 , 129.8690184
+1428.290598 , 5212.35 , 133.5369684
+1428.290598 , 5405.4 , 137.2049184
+1428.290598 , 5598.45 , 140.8728684
+1428.290598 , 5791.5 , 144.5408184
+1428.290598 , 5984.55 , 148.2087684
+1428.290598 , 6177.6 , 151.8767184
+1632.393162 , -6177.6 , 79.97209441
+1632.393162 , -5984.55 , 76.30414441
+1632.393162 , -5791.5 , 72.63619441
+1632.393162 , -5598.45 , 68.96824441
+1632.393162 , -5405.4 , 65.30029441
+1632.393162 , -5212.35 , 61.63234441
+1632.393162 , -5019.3 , 57.96439441
+1632.393162 , -4826.25 , 54.29644441
+1632.393162 , -4633.2 , 50.62849441
+1632.393162 , -4440.15 , 46.96054441
+1632.393162 , -4247.1 , 43.29259441
+1632.393162 , -4054.05 , 39.62464441
+1632.393162 , -3861 , 35.95669441
+1632.393162 , -3667.95 , 32.28874441
+1632.393162 , -3474.9 , 28.62079441
+1632.393162 , -3281.85 , 24.95284441
+1632.393162 , -3088.8 , 21.28489441
+1632.393162 , -2895.75 , 17.61694441
+1632.393162 , -2702.7 , 13.94899441
+1632.393162 , -2509.65 , 10.28104441
+1632.393162 , -2316.6 , 6.613094406
+1632.393162 , -2123.55 , 2.945144406
+1632.393162 , -1930.5 , 0.722805594
+1632.393162 , -1737.45 , 4.390755594
+1632.393162 , -1544.4 , 8.058705594
+1632.393162 , -1351.35 , 11.72665559
+1632.393162 , -1158.3 , 15.39460559
+1632.393162 , -965.25 , 19.06255559
+1632.393162 , -772.2 , 22.73050559
+1632.393162 , -579.15 , 26.39845559
+1632.393162 , -386.1 , 30.06640559
+1632.393162 , -193.05 , 33.73435559
+1632.393162 , 0 , 37.40230559
+1632.393162 , 193.05 , 41.07025559
+1632.393162 , 386.1 , 44.73820559
+1632.393162 , 579.15 , 48.40615559
+1632.393162 , 772.2 , 52.07410559
+1632.393162 , 965.25 , 55.74205559
+1632.393162 , 1158.3 , 59.41000559
+1632.393162 , 1351.35 , 63.07795559
+1632.393162 , 1544.4 , 66.74590559
+1632.393162 , 1737.45 , 70.41385559
+1632.393162 , 1930.5 , 74.08180559
+1632.393162 , 2123.55 , 77.74975559
+1632.393162 , 2316.6 , 81.41770559
+1632.393162 , 2509.65 , 85.08565559
+1632.393162 , 2702.7 , 88.75360559
+1632.393162 , 2895.75 , 92.42155559
+1632.393162 , 3088.8 , 96.08950559
+1632.393162 , 3281.85 , 99.75745559
+1632.393162 , 3474.9 , 103.4254056
+1632.393162 , 3667.95 , 107.0933556
+1632.393162 , 3861 , 110.7613056
+1632.393162 , 4054.05 , 114.4292556
+1632.393162 , 4247.1 , 118.0972056
+1632.393162 , 4440.15 , 121.7651556
+1632.393162 , 4633.2 , 125.4331056
+1632.393162 , 4826.25 , 129.1010556
+1632.393162 , 5019.3 , 132.7690056
+1632.393162 , 5212.35 , 136.4369556
+1632.393162 , 5405.4 , 140.1049056
+1632.393162 , 5598.45 , 143.7728556
+1632.393162 , 5791.5 , 147.4408056
+1632.393162 , 5984.55 , 151.1087556
+1632.393162 , 6177.6 , 154.7767056
+1836.410256 , -6177.6 , 77.07332161
+1836.410256 , -5984.55 , 73.40537161
+1836.410256 , -5791.5 , 69.73742161
+1836.410256 , -5598.45 , 66.06947161
+1836.410256 , -5405.4 , 62.40152161
+1836.410256 , -5212.35 , 58.73357161
+1836.410256 , -5019.3 , 55.06562161
+1836.410256 , -4826.25 , 51.39767161
+1836.410256 , -4633.2 , 47.72972161
+1836.410256 , -4440.15 , 44.06177161
+1836.410256 , -4247.1 , 40.39382161
+1836.410256 , -4054.05 , 36.72587161
+1836.410256 , -3861 , 33.05792161
+1836.410256 , -3667.95 , 29.38997161
+1836.410256 , -3474.9 , 25.72202161
+1836.410256 , -3281.85 , 22.05407161
+1836.410256 , -3088.8 , 18.38612161
+1836.410256 , -2895.75 , 14.71817161
+1836.410256 , -2702.7 , 11.05022161
+1836.410256 , -2509.65 , 7.382271606
+1836.410256 , -2316.6 , 3.714321606
+1836.410256 , -2123.55 , 0.046371606
+1836.410256 , -1930.5 , 3.621578394
+1836.410256 , -1737.45 , 7.289528394
+1836.410256 , -1544.4 , 10.95747839
+1836.410256 , -1351.35 , 14.62542839
+1836.410256 , -1158.3 , 18.29337839
+1836.410256 , -965.25 , 21.96132839
+1836.410256 , -772.2 , 25.62927839
+1836.410256 , -579.15 , 29.29722839
+1836.410256 , -386.1 , 32.96517839
+1836.410256 , -193.05 , 36.63312839
+1836.410256 , 0 , 40.30107839
+1836.410256 , 193.05 , 43.96902839
+1836.410256 , 386.1 , 47.63697839
+1836.410256 , 579.15 , 51.30492839
+1836.410256 , 772.2 , 54.97287839
+1836.410256 , 965.25 , 58.64082839
+1836.410256 , 1158.3 , 62.30877839
+1836.410256 , 1351.35 , 65.97672839
+1836.410256 , 1544.4 , 69.64467839
+1836.410256 , 1737.45 , 73.31262839
+1836.410256 , 1930.5 , 76.98057839
+1836.410256 , 2123.55 , 80.64852839
+1836.410256 , 2316.6 , 84.31647839
+1836.410256 , 2509.65 , 87.98442839
+1836.410256 , 2702.7 , 91.65237839
+1836.410256 , 2895.75 , 95.32032839
+1836.410256 , 3088.8 , 98.98827839
+1836.410256 , 3281.85 , 102.6562284
+1836.410256 , 3474.9 , 106.3241784
+1836.410256 , 3667.95 , 109.9921284
+1836.410256 , 3861 , 113.6600784
+1836.410256 , 4054.05 , 117.3280284
+1836.410256 , 4247.1 , 120.9959784
+1836.410256 , 4440.15 , 124.6639284
+1836.410256 , 4633.2 , 128.3318784
+1836.410256 , 4826.25 , 131.9998284
+1836.410256 , 5019.3 , 135.6677784
+1836.410256 , 5212.35 , 139.3357284
+1836.410256 , 5405.4 , 143.0036784
+1836.410256 , 5598.45 , 146.6716284
+1836.410256 , 5791.5 , 150.3395784
+1836.410256 , 5984.55 , 154.0075284
+1836.410256 , 6177.6 , 157.6754784
+2040.42735 , -6177.6 , 74.17454881
+2040.42735 , -5984.55 , 70.50659881
+2040.42735 , -5791.5 , 66.83864881
+2040.42735 , -5598.45 , 63.17069881
+2040.42735 , -5405.4 , 59.50274881
+2040.42735 , -5212.35 , 55.83479881
+2040.42735 , -5019.3 , 52.16684881
+2040.42735 , -4826.25 , 48.49889881
+2040.42735 , -4633.2 , 44.83094881
+2040.42735 , -4440.15 , 41.16299881
+2040.42735 , -4247.1 , 37.49504881
+2040.42735 , -4054.05 , 33.82709881
+2040.42735 , -3861 , 30.15914881
+2040.42735 , -3667.95 , 26.49119881
+2040.42735 , -3474.9 , 22.82324881
+2040.42735 , -3281.85 , 19.15529881
+2040.42735 , -3088.8 , 15.48734881
+2040.42735 , -2895.75 , 11.81939881
+2040.42735 , -2702.7 , 8.151448806
+2040.42735 , -2509.65 , 4.483498806
+2040.42735 , -2316.6 , 0.815548806
+2040.42735 , -2123.55 , 2.852401194
+2040.42735 , -1930.5 , 6.520351194
+2040.42735 , -1737.45 , 10.18830119
+2040.42735 , -1544.4 , 13.85625119
+2040.42735 , -1351.35 , 17.52420119
+2040.42735 , -1158.3 , 21.19215119
+2040.42735 , -965.25 , 24.86010119
+2040.42735 , -772.2 , 28.52805119
+2040.42735 , -579.15 , 32.19600119
+2040.42735 , -386.1 , 35.86395119
+2040.42735 , -193.05 , 39.53190119
+2040.42735 , 0 , 43.19985119
+2040.42735 , 193.05 , 46.86780119
+2040.42735 , 386.1 , 50.53575119
+2040.42735 , 579.15 , 54.20370119
+2040.42735 , 772.2 , 57.87165119
+2040.42735 , 965.25 , 61.53960119
+2040.42735 , 1158.3 , 65.20755119
+2040.42735 , 1351.35 , 68.87550119
+2040.42735 , 1544.4 , 72.54345119
+2040.42735 , 1737.45 , 76.21140119
+2040.42735 , 1930.5 , 79.87935119
+2040.42735 , 2123.55 , 83.54730119
+2040.42735 , 2316.6 , 87.21525119
+2040.42735 , 2509.65 , 90.88320119
+2040.42735 , 2702.7 , 94.55115119
+2040.42735 , 2895.75 , 98.21910119
+2040.42735 , 3088.8 , 101.8870512
+2040.42735 , 3281.85 , 105.5550012
+2040.42735 , 3474.9 , 109.2229512
+2040.42735 , 3667.95 , 112.8909012
+2040.42735 , 3861 , 116.5588512
+2040.42735 , 4054.05 , 120.2268012
+2040.42735 , 4247.1 , 123.8947512
+2040.42735 , 4440.15 , 127.5627012
+2040.42735 , 4633.2 , 131.2306512
+2040.42735 , 4826.25 , 134.8986012
+2040.42735 , 5019.3 , 138.5665512
+2040.42735 , 5212.35 , 142.2345012
+2040.42735 , 5405.4 , 145.9024512
+2040.42735 , 5598.45 , 149.5704012
+2040.42735 , 5791.5 , 153.2383512
+2040.42735 , 5984.55 , 156.9063012
+2040.42735 , 6177.6 , 160.5742512
+2244.529915 , -6177.6 , 71.27456159
+2244.529915 , -5984.55 , 67.60661159
+2244.529915 , -5791.5 , 63.93866159
+2244.529915 , -5598.45 , 60.27071159
+2244.529915 , -5405.4 , 56.60276159
+2244.529915 , -5212.35 , 52.93481159
+2244.529915 , -5019.3 , 49.26686159
+2244.529915 , -4826.25 , 45.59891159
+2244.529915 , -4633.2 , 41.93096159
+2244.529915 , -4440.15 , 38.26301159
+2244.529915 , -4247.1 , 34.59506159
+2244.529915 , -4054.05 , 30.92711159
+2244.529915 , -3861 , 27.25916159
+2244.529915 , -3667.95 , 23.59121159
+2244.529915 , -3474.9 , 19.92326159
+2244.529915 , -3281.85 , 16.25531159
+2244.529915 , -3088.8 , 12.58736159
+2244.529915 , -2895.75 , 8.919411593
+2244.529915 , -2702.7 , 5.251461593
+2244.529915 , -2509.65 , 1.583511593
+2244.529915 , -2316.6 , 2.084438407
+2244.529915 , -2123.55 , 5.752388407
+2244.529915 , -1930.5 , 9.420338407
+2244.529915 , -1737.45 , 13.08828841
+2244.529915 , -1544.4 , 16.75623841
+2244.529915 , -1351.35 , 20.42418841
+2244.529915 , -1158.3 , 24.09213841
+2244.529915 , -965.25 , 27.76008841
+2244.529915 , -772.2 , 31.42803841
+2244.529915 , -579.15 , 35.09598841
+2244.529915 , -386.1 , 38.76393841
+2244.529915 , -193.05 , 42.43188841
+2244.529915 , 0 , 46.09983841
+2244.529915 , 193.05 , 49.76778841
+2244.529915 , 386.1 , 53.43573841
+2244.529915 , 579.15 , 57.10368841
+2244.529915 , 772.2 , 60.77163841
+2244.529915 , 965.25 , 64.43958841
+2244.529915 , 1158.3 , 68.10753841
+2244.529915 , 1351.35 , 71.77548841
+2244.529915 , 1544.4 , 75.44343841
+2244.529915 , 1737.45 , 79.11138841
+2244.529915 , 1930.5 , 82.77933841
+2244.529915 , 2123.55 , 86.44728841
+2244.529915 , 2316.6 , 90.11523841
+2244.529915 , 2509.65 , 93.78318841
+2244.529915 , 2702.7 , 97.45113841
+2244.529915 , 2895.75 , 101.1190884
+2244.529915 , 3088.8 , 104.7870384
+2244.529915 , 3281.85 , 108.4549884
+2244.529915 , 3474.9 , 112.1229384
+2244.529915 , 3667.95 , 115.7908884
+2244.529915 , 3861 , 119.4588384
+2244.529915 , 4054.05 , 123.1267884
+2244.529915 , 4247.1 , 126.7947384
+2244.529915 , 4440.15 , 130.4626884
+2244.529915 , 4633.2 , 134.1306384
+2244.529915 , 4826.25 , 137.7985884
+2244.529915 , 5019.3 , 141.4665384
+2244.529915 , 5212.35 , 145.1344884
+2244.529915 , 5405.4 , 148.8024384
+2244.529915 , 5598.45 , 152.4703884
+2244.529915 , 5791.5 , 156.1383384
+2244.529915 , 5984.55 , 159.8062884
+2244.529915 , 6177.6 , 163.4742384
+2448.547009 , -6177.6 , 68.37578879
+2448.547009 , -5984.55 , 64.70783879
+2448.547009 , -5791.5 , 61.03988879
+2448.547009 , -5598.45 , 57.37193879
+2448.547009 , -5405.4 , 53.70398879
+2448.547009 , -5212.35 , 50.03603879
+2448.547009 , -5019.3 , 46.36808879
+2448.547009 , -4826.25 , 42.70013879
+2448.547009 , -4633.2 , 39.03218879
+2448.547009 , -4440.15 , 35.36423879
+2448.547009 , -4247.1 , 31.69628879
+2448.547009 , -4054.05 , 28.02833879
+2448.547009 , -3861 , 24.36038879
+2448.547009 , -3667.95 , 20.69243879
+2448.547009 , -3474.9 , 17.02448879
+2448.547009 , -3281.85 , 13.35653879
+2448.547009 , -3088.8 , 9.688588794
+2448.547009 , -2895.75 , 6.020638794
+2448.547009 , -2702.7 , 2.352688794
+2448.547009 , -2509.65 , 1.315261206
+2448.547009 , -2316.6 , 4.983211206
+2448.547009 , -2123.55 , 8.651161206
+2448.547009 , -1930.5 , 12.31911121
+2448.547009 , -1737.45 , 15.98706121
+2448.547009 , -1544.4 , 19.65501121
+2448.547009 , -1351.35 , 23.32296121
+2448.547009 , -1158.3 , 26.99091121
+2448.547009 , -965.25 , 30.65886121
+2448.547009 , -772.2 , 34.32681121
+2448.547009 , -579.15 , 37.99476121
+2448.547009 , -386.1 , 41.66271121
+2448.547009 , -193.05 , 45.33066121
+2448.547009 , 0 , 48.99861121
+2448.547009 , 193.05 , 52.66656121
+2448.547009 , 386.1 , 56.33451121
+2448.547009 , 579.15 , 60.00246121
+2448.547009 , 772.2 , 63.67041121
+2448.547009 , 965.25 , 67.33836121
+2448.547009 , 1158.3 , 71.00631121
+2448.547009 , 1351.35 , 74.67426121
+2448.547009 , 1544.4 , 78.34221121
+2448.547009 , 1737.45 , 82.01016121
+2448.547009 , 1930.5 , 85.67811121
+2448.547009 , 2123.55 , 89.34606121
+2448.547009 , 2316.6 , 93.01401121
+2448.547009 , 2509.65 , 96.68196121
+2448.547009 , 2702.7 , 100.3499112
+2448.547009 , 2895.75 , 104.0178612
+2448.547009 , 3088.8 , 107.6858112
+2448.547009 , 3281.85 , 111.3537612
+2448.547009 , 3474.9 , 115.0217112
+2448.547009 , 3667.95 , 118.6896612
+2448.547009 , 3861 , 122.3576112
+2448.547009 , 4054.05 , 126.0255612
+2448.547009 , 4247.1 , 129.6935112
+2448.547009 , 4440.15 , 133.3614612
+2448.547009 , 4633.2 , 137.0294112
+2448.547009 , 4826.25 , 140.6973612
+2448.547009 , 5019.3 , 144.3653112
+2448.547009 , 5212.35 , 148.0332612
+2448.547009 , 5405.4 , 151.7012112
+2448.547009 , 5598.45 , 155.3691612
+2448.547009 , 5791.5 , 159.0371112
+2448.547009 , 5984.55 , 162.7050612
+2448.547009 , 6177.6 , 166.3730112
+2652.564103 , -6177.6 , 65.47701599
+2652.564103 , -5984.55 , 61.80906599
+2652.564103 , -5791.5 , 58.14111599
+2652.564103 , -5598.45 , 54.47316599
+2652.564103 , -5405.4 , 50.80521599
+2652.564103 , -5212.35 , 47.13726599
+2652.564103 , -5019.3 , 43.46931599
+2652.564103 , -4826.25 , 39.80136599
+2652.564103 , -4633.2 , 36.13341599
+2652.564103 , -4440.15 , 32.46546599
+2652.564103 , -4247.1 , 28.79751599
+2652.564103 , -4054.05 , 25.12956599
+2652.564103 , -3861 , 21.46161599
+2652.564103 , -3667.95 , 17.79366599
+2652.564103 , -3474.9 , 14.12571599
+2652.564103 , -3281.85 , 10.45776599
+2652.564103 , -3088.8 , 6.789815994
+2652.564103 , -2895.75 , 3.121865994
+2652.564103 , -2702.7 , 0.546084006
+2652.564103 , -2509.65 , 4.214034006
+2652.564103 , -2316.6 , 7.881984006
+2652.564103 , -2123.55 , 11.54993401
+2652.564103 , -1930.5 , 15.21788401
+2652.564103 , -1737.45 , 18.88583401
+2652.564103 , -1544.4 , 22.55378401
+2652.564103 , -1351.35 , 26.22173401
+2652.564103 , -1158.3 , 29.88968401
+2652.564103 , -965.25 , 33.55763401
+2652.564103 , -772.2 , 37.22558401
+2652.564103 , -579.15 , 40.89353401
+2652.564103 , -386.1 , 44.56148401
+2652.564103 , -193.05 , 48.22943401
+2652.564103 , 0 , 51.89738401
+2652.564103 , 193.05 , 55.56533401
+2652.564103 , 386.1 , 59.23328401
+2652.564103 , 579.15 , 62.90123401
+2652.564103 , 772.2 , 66.56918401
+2652.564103 , 965.25 , 70.23713401
+2652.564103 , 1158.3 , 73.90508401
+2652.564103 , 1351.35 , 77.57303401
+2652.564103 , 1544.4 , 81.24098401
+2652.564103 , 1737.45 , 84.90893401
+2652.564103 , 1930.5 , 88.57688401
+2652.564103 , 2123.55 , 92.24483401
+2652.564103 , 2316.6 , 95.91278401
+2652.564103 , 2509.65 , 99.58073401
+2652.564103 , 2702.7 , 103.248684
+2652.564103 , 2895.75 , 106.916634
+2652.564103 , 3088.8 , 110.584584
+2652.564103 , 3281.85 , 114.252534
+2652.564103 , 3474.9 , 117.920484
+2652.564103 , 3667.95 , 121.588434
+2652.564103 , 3861 , 125.256384
+2652.564103 , 4054.05 , 128.924334
+2652.564103 , 4247.1 , 132.592284
+2652.564103 , 4440.15 , 136.260234
+2652.564103 , 4633.2 , 139.928184
+2652.564103 , 4826.25 , 143.596134
+2652.564103 , 5019.3 , 147.264084
+2652.564103 , 5212.35 , 150.932034
+2652.564103 , 5405.4 , 154.599984
+2652.564103 , 5598.45 , 158.267934
+2652.564103 , 5791.5 , 161.935884
+2652.564103 , 5984.55 , 165.603834
+2652.564103 , 6177.6 , 169.271784
+2856.666667 , -6177.6 , 62.5770288
+2856.666667 , -5984.55 , 58.9090788
+2856.666667 , -5791.5 , 55.2411288
+2856.666667 , -5598.45 , 51.5731788
+2856.666667 , -5405.4 , 47.9052288
+2856.666667 , -5212.35 , 44.2372788
+2856.666667 , -5019.3 , 40.5693288
+2856.666667 , -4826.25 , 36.9013788
+2856.666667 , -4633.2 , 33.2334288
+2856.666667 , -4440.15 , 29.5654788
+2856.666667 , -4247.1 , 25.8975288
+2856.666667 , -4054.05 , 22.2295788
+2856.666667 , -3861 , 18.5616288
+2856.666667 , -3667.95 , 14.8936788
+2856.666667 , -3474.9 , 11.2257288
+2856.666667 , -3281.85 , 7.557778795
+2856.666667 , -3088.8 , 3.889828795
+2856.666667 , -2895.75 , 0.221878795
+2856.666667 , -2702.7 , 3.446071205
+2856.666667 , -2509.65 , 7.114021205
+2856.666667 , -2316.6 , 10.7819712
+2856.666667 , -2123.55 , 14.4499212
+2856.666667 , -1930.5 , 18.1178712
+2856.666667 , -1737.45 , 21.7858212
+2856.666667 , -1544.4 , 25.4537712
+2856.666667 , -1351.35 , 29.1217212
+2856.666667 , -1158.3 , 32.7896712
+2856.666667 , -965.25 , 36.4576212
+2856.666667 , -772.2 , 40.1255712
+2856.666667 , -579.15 , 43.7935212
+2856.666667 , -386.1 , 47.4614712
+2856.666667 , -193.05 , 51.1294212
+2856.666667 , 0 , 54.7973712
+2856.666667 , 193.05 , 58.4653212
+2856.666667 , 386.1 , 62.1332712
+2856.666667 , 579.15 , 65.8012212
+2856.666667 , 772.2 , 69.4691712
+2856.666667 , 965.25 , 73.1371212
+2856.666667 , 1158.3 , 76.8050712
+2856.666667 , 1351.35 , 80.4730212
+2856.666667 , 1544.4 , 84.1409712
+2856.666667 , 1737.45 , 87.8089212
+2856.666667 , 1930.5 , 91.4768712
+2856.666667 , 2123.55 , 95.1448212
+2856.666667 , 2316.6 , 98.8127712
+2856.666667 , 2509.65 , 102.4807212
+2856.666667 , 2702.7 , 106.1486712
+2856.666667 , 2895.75 , 109.8166212
+2856.666667 , 3088.8 , 113.4845712
+2856.666667 , 3281.85 , 117.1525212
+2856.666667 , 3474.9 , 120.8204712
+2856.666667 , 3667.95 , 124.4884212
+2856.666667 , 3861 , 128.1563712
+2856.666667 , 4054.05 , 131.8243212
+2856.666667 , 4247.1 , 135.4922712
+2856.666667 , 4440.15 , 139.1602212
+2856.666667 , 4633.2 , 142.8281712
+2856.666667 , 4826.25 , 146.4961212
+2856.666667 , 5019.3 , 150.1640712
+2856.666667 , 5212.35 , 153.8320212
+2856.666667 , 5405.4 , 157.4999712
+2856.666667 , 5598.45 , 161.1679212
+2856.666667 , 5791.5 , 164.8358712
+2856.666667 , 5984.55 , 168.5038212
+2856.666667 , 6177.6 , 172.1717712
+3060.683761 , -6177.6 , 59.678256
+3060.683761 , -5984.55 , 56.010306
+3060.683761 , -5791.5 , 52.342356
+3060.683761 , -5598.45 , 48.674406
+3060.683761 , -5405.4 , 45.006456
+3060.683761 , -5212.35 , 41.338506
+3060.683761 , -5019.3 , 37.670556
+3060.683761 , -4826.25 , 34.002606
+3060.683761 , -4633.2 , 30.334656
+3060.683761 , -4440.15 , 26.666706
+3060.683761 , -4247.1 , 22.998756
+3060.683761 , -4054.05 , 19.330806
+3060.683761 , -3861 , 15.662856
+3060.683761 , -3667.95 , 11.994906
+3060.683761 , -3474.9 , 8.326955996
+3060.683761 , -3281.85 , 4.659005996
+3060.683761 , -3088.8 , 0.991055996
+3060.683761 , -2895.75 , 2.676894004
+3060.683761 , -2702.7 , 6.344844004
+3060.683761 , -2509.65 , 10.012794
+3060.683761 , -2316.6 , 13.680744
+3060.683761 , -2123.55 , 17.348694
+3060.683761 , -1930.5 , 21.016644
+3060.683761 , -1737.45 , 24.684594
+3060.683761 , -1544.4 , 28.352544
+3060.683761 , -1351.35 , 32.020494
+3060.683761 , -1158.3 , 35.688444
+3060.683761 , -965.25 , 39.356394
+3060.683761 , -772.2 , 43.024344
+3060.683761 , -579.15 , 46.692294
+3060.683761 , -386.1 , 50.360244
+3060.683761 , -193.05 , 54.028194
+3060.683761 , 0 , 57.696144
+3060.683761 , 193.05 , 61.364094
+3060.683761 , 386.1 , 65.032044
+3060.683761 , 579.15 , 68.699994
+3060.683761 , 772.2 , 72.367944
+3060.683761 , 965.25 , 76.035894
+3060.683761 , 1158.3 , 79.703844
+3060.683761 , 1351.35 , 83.371794
+3060.683761 , 1544.4 , 87.039744
+3060.683761 , 1737.45 , 90.707694
+3060.683761 , 1930.5 , 94.375644
+3060.683761 , 2123.55 , 98.043594
+3060.683761 , 2316.6 , 101.711544
+3060.683761 , 2509.65 , 105.379494
+3060.683761 , 2702.7 , 109.047444
+3060.683761 , 2895.75 , 112.715394
+3060.683761 , 3088.8 , 116.383344
+3060.683761 , 3281.85 , 120.051294
+3060.683761 , 3474.9 , 123.719244
+3060.683761 , 3667.95 , 127.387194
+3060.683761 , 3861 , 131.055144
+3060.683761 , 4054.05 , 134.723094
+3060.683761 , 4247.1 , 138.391044
+3060.683761 , 4440.15 , 142.058994
+3060.683761 , 4633.2 , 145.726944
+3060.683761 , 4826.25 , 149.394894
+3060.683761 , 5019.3 , 153.062844
+3060.683761 , 5212.35 , 156.730794
+3060.683761 , 5405.4 , 160.398744
+3060.683761 , 5598.45 , 164.066694
+3060.683761 , 5791.5 , 167.734644
+3060.683761 , 5984.55 , 171.402594
+3060.683761 , 6177.6 , 175.070544
+3264.700855 , -6177.6 , 56.7794832
+3264.700855 , -5984.55 , 53.1115332
+3264.700855 , -5791.5 , 49.4435832
+3264.700855 , -5598.45 , 45.7756332
+3264.700855 , -5405.4 , 42.1076832
+3264.700855 , -5212.35 , 38.4397332
+3264.700855 , -5019.3 , 34.7717832
+3264.700855 , -4826.25 , 31.1038332
+3264.700855 , -4633.2 , 27.4358832
+3264.700855 , -4440.15 , 23.7679332
+3264.700855 , -4247.1 , 20.0999832
+3264.700855 , -4054.05 , 16.4320332
+3264.700855 , -3861 , 12.7640832
+3264.700855 , -3667.95 , 9.096133196
+3264.700855 , -3474.9 , 5.428183196
+3264.700855 , -3281.85 , 1.760233196
+3264.700855 , -3088.8 , 1.907716804
+3264.700855 , -2895.75 , 5.575666804
+3264.700855 , -2702.7 , 9.243616804
+3264.700855 , -2509.65 , 12.9115668
+3264.700855 , -2316.6 , 16.5795168
+3264.700855 , -2123.55 , 20.2474668
+3264.700855 , -1930.5 , 23.9154168
+3264.700855 , -1737.45 , 27.5833668
+3264.700855 , -1544.4 , 31.2513168
+3264.700855 , -1351.35 , 34.9192668
+3264.700855 , -1158.3 , 38.5872168
+3264.700855 , -965.25 , 42.2551668
+3264.700855 , -772.2 , 45.9231168
+3264.700855 , -579.15 , 49.5910668
+3264.700855 , -386.1 , 53.2590168
+3264.700855 , -193.05 , 56.9269668
+3264.700855 , 0 , 60.5949168
+3264.700855 , 193.05 , 64.2628668
+3264.700855 , 386.1 , 67.9308168
+3264.700855 , 579.15 , 71.5987668
+3264.700855 , 772.2 , 75.2667168
+3264.700855 , 965.25 , 78.9346668
+3264.700855 , 1158.3 , 82.6026168
+3264.700855 , 1351.35 , 86.2705668
+3264.700855 , 1544.4 , 89.9385168
+3264.700855 , 1737.45 , 93.6064668
+3264.700855 , 1930.5 , 97.2744168
+3264.700855 , 2123.55 , 100.9423668
+3264.700855 , 2316.6 , 104.6103168
+3264.700855 , 2509.65 , 108.2782668
+3264.700855 , 2702.7 , 111.9462168
+3264.700855 , 2895.75 , 115.6141668
+3264.700855 , 3088.8 , 119.2821168
+3264.700855 , 3281.85 , 122.9500668
+3264.700855 , 3474.9 , 126.6180168
+3264.700855 , 3667.95 , 130.2859668
+3264.700855 , 3861 , 133.9539168
+3264.700855 , 4054.05 , 137.6218668
+3264.700855 , 4247.1 , 141.2898168
+3264.700855 , 4440.15 , 144.9577668
+3264.700855 , 4633.2 , 148.6257168
+3264.700855 , 4826.25 , 152.2936668
+3264.700855 , 5019.3 , 155.9616168
+3264.700855 , 5212.35 , 159.6295668
+3264.700855 , 5405.4 , 163.2975168
+3264.700855 , 5598.45 , 166.9654668
+3264.700855 , 5791.5 , 170.6334168
+3264.700855 , 5984.55 , 174.3013668
+3264.700855 , 6177.6 , 177.9693168
+3468.803419 , -6177.6 , 53.879496
+3468.803419 , -5984.55 , 50.211546
+3468.803419 , -5791.5 , 46.543596
+3468.803419 , -5598.45 , 42.875646
+3468.803419 , -5405.4 , 39.207696
+3468.803419 , -5212.35 , 35.539746
+3468.803419 , -5019.3 , 31.871796
+3468.803419 , -4826.25 , 28.203846
+3468.803419 , -4633.2 , 24.535896
+3468.803419 , -4440.15 , 20.867946
+3468.803419 , -4247.1 , 17.199996
+3468.803419 , -4054.05 , 13.532046
+3468.803419 , -3861 , 9.864095997
+3468.803419 , -3667.95 , 6.196145997
+3468.803419 , -3474.9 , 2.528195997
+3468.803419 , -3281.85 , 1.139754003
+3468.803419 , -3088.8 , 4.807704003
+3468.803419 , -2895.75 , 8.475654003
+3468.803419 , -2702.7 , 12.143604
+3468.803419 , -2509.65 , 15.811554
+3468.803419 , -2316.6 , 19.479504
+3468.803419 , -2123.55 , 23.147454
+3468.803419 , -1930.5 , 26.815404
+3468.803419 , -1737.45 , 30.483354
+3468.803419 , -1544.4 , 34.151304
+3468.803419 , -1351.35 , 37.819254
+3468.803419 , -1158.3 , 41.487204
+3468.803419 , -965.25 , 45.155154
+3468.803419 , -772.2 , 48.823104
+3468.803419 , -579.15 , 52.491054
+3468.803419 , -386.1 , 56.159004
+3468.803419 , -193.05 , 59.826954
+3468.803419 , 0 , 63.494904
+3468.803419 , 193.05 , 67.162854
+3468.803419 , 386.1 , 70.830804
+3468.803419 , 579.15 , 74.498754
+3468.803419 , 772.2 , 78.166704
+3468.803419 , 965.25 , 81.834654
+3468.803419 , 1158.3 , 85.502604
+3468.803419 , 1351.35 , 89.170554
+3468.803419 , 1544.4 , 92.838504
+3468.803419 , 1737.45 , 96.506454
+3468.803419 , 1930.5 , 100.174404
+3468.803419 , 2123.55 , 103.842354
+3468.803419 , 2316.6 , 107.510304
+3468.803419 , 2509.65 , 111.178254
+3468.803419 , 2702.7 , 114.846204
+3468.803419 , 2895.75 , 118.514154
+3468.803419 , 3088.8 , 122.182104
+3468.803419 , 3281.85 , 125.850054
+3468.803419 , 3474.9 , 129.518004
+3468.803419 , 3667.95 , 133.185954
+3468.803419 , 3861 , 136.853904
+3468.803419 , 4054.05 , 140.521854
+3468.803419 , 4247.1 , 144.189804
+3468.803419 , 4440.15 , 147.857754
+3468.803419 , 4633.2 , 151.525704
+3468.803419 , 4826.25 , 155.193654
+3468.803419 , 5019.3 , 158.861604
+3468.803419 , 5212.35 , 162.529554
+3468.803419 , 5405.4 , 166.197504
+3468.803419 , 5598.45 , 169.865454
+3468.803419 , 5791.5 , 173.533404
+3468.803419 , 5984.55 , 177.201354
+3468.803419 , 6177.6 , 180.869304
+3672.820513 , -6177.6 , 50.9807232
+3672.820513 , -5984.55 , 47.3127732
+3672.820513 , -5791.5 , 43.6448232
+3672.820513 , -5598.45 , 39.9768732
+3672.820513 , -5405.4 , 36.3089232
+3672.820513 , -5212.35 , 32.6409732
+3672.820513 , -5019.3 , 28.9730232
+3672.820513 , -4826.25 , 25.3050732
+3672.820513 , -4633.2 , 21.6371232
+3672.820513 , -4440.15 , 17.9691732
+3672.820513 , -4247.1 , 14.3012232
+3672.820513 , -4054.05 , 10.6332732
+3672.820513 , -3861 , 6.965323197
+3672.820513 , -3667.95 , 3.297373197
+3672.820513 , -3474.9 , 0.370576803
+3672.820513 , -3281.85 , 4.038526803
+3672.820513 , -3088.8 , 7.706476803
+3672.820513 , -2895.75 , 11.3744268
+3672.820513 , -2702.7 , 15.0423768
+3672.820513 , -2509.65 , 18.7103268
+3672.820513 , -2316.6 , 22.3782768
+3672.820513 , -2123.55 , 26.0462268
+3672.820513 , -1930.5 , 29.7141768
+3672.820513 , -1737.45 , 33.3821268
+3672.820513 , -1544.4 , 37.0500768
+3672.820513 , -1351.35 , 40.7180268
+3672.820513 , -1158.3 , 44.3859768
+3672.820513 , -965.25 , 48.0539268
+3672.820513 , -772.2 , 51.7218768
+3672.820513 , -579.15 , 55.3898268
+3672.820513 , -386.1 , 59.0577768
+3672.820513 , -193.05 , 62.7257268
+3672.820513 , 0 , 66.3936768
+3672.820513 , 193.05 , 70.0616268
+3672.820513 , 386.1 , 73.7295768
+3672.820513 , 579.15 , 77.3975268
+3672.820513 , 772.2 , 81.0654768
+3672.820513 , 965.25 , 84.7334268
+3672.820513 , 1158.3 , 88.4013768
+3672.820513 , 1351.35 , 92.0693268
+3672.820513 , 1544.4 , 95.7372768
+3672.820513 , 1737.45 , 99.4052268
+3672.820513 , 1930.5 , 103.0731768
+3672.820513 , 2123.55 , 106.7411268
+3672.820513 , 2316.6 , 110.4090768
+3672.820513 , 2509.65 , 114.0770268
+3672.820513 , 2702.7 , 117.7449768
+3672.820513 , 2895.75 , 121.4129268
+3672.820513 , 3088.8 , 125.0808768
+3672.820513 , 3281.85 , 128.7488268
+3672.820513 , 3474.9 , 132.4167768
+3672.820513 , 3667.95 , 136.0847268
+3672.820513 , 3861 , 139.7526768
+3672.820513 , 4054.05 , 143.4206268
+3672.820513 , 4247.1 , 147.0885768
+3672.820513 , 4440.15 , 150.7565268
+3672.820513 , 4633.2 , 154.4244768
+3672.820513 , 4826.25 , 158.0924268
+3672.820513 , 5019.3 , 161.7603768
+3672.820513 , 5212.35 , 165.4283268
+3672.820513 , 5405.4 , 169.0962768
+3672.820513 , 5598.45 , 172.7642268
+3672.820513 , 5791.5 , 176.4321768
+3672.820513 , 5984.55 , 180.1001268
+3672.820513 , 6177.6 , 183.7680768
+3876.837607 , -6177.6 , 48.0819504
+3876.837607 , -5984.55 , 44.4140004
+3876.837607 , -5791.5 , 40.7460504
+3876.837607 , -5598.45 , 37.0781004
+3876.837607 , -5405.4 , 33.4101504
+3876.837607 , -5212.35 , 29.7422004
+3876.837607 , -5019.3 , 26.0742504
+3876.837607 , -4826.25 , 22.4063004
+3876.837607 , -4633.2 , 18.7383504
+3876.837607 , -4440.15 , 15.0704004
+3876.837607 , -4247.1 , 11.4024504
+3876.837607 , -4054.05 , 7.734500398
+3876.837607 , -3861 , 4.066550398
+3876.837607 , -3667.95 , 0.398600398
+3876.837607 , -3474.9 , 3.269349602
+3876.837607 , -3281.85 , 6.937299602
+3876.837607 , -3088.8 , 10.6052496
+3876.837607 , -2895.75 , 14.2731996
+3876.837607 , -2702.7 , 17.9411496
+3876.837607 , -2509.65 , 21.6090996
+3876.837607 , -2316.6 , 25.2770496
+3876.837607 , -2123.55 , 28.9449996
+3876.837607 , -1930.5 , 32.6129496
+3876.837607 , -1737.45 , 36.2808996
+3876.837607 , -1544.4 , 39.9488496
+3876.837607 , -1351.35 , 43.6167996
+3876.837607 , -1158.3 , 47.2847496
+3876.837607 , -965.25 , 50.9526996
+3876.837607 , -772.2 , 54.6206496
+3876.837607 , -579.15 , 58.2885996
+3876.837607 , -386.1 , 61.9565496
+3876.837607 , -193.05 , 65.6244996
+3876.837607 , 0 , 69.2924496
+3876.837607 , 193.05 , 72.9603996
+3876.837607 , 386.1 , 76.6283496
+3876.837607 , 579.15 , 80.2962996
+3876.837607 , 772.2 , 83.9642496
+3876.837607 , 965.25 , 87.6321996
+3876.837607 , 1158.3 , 91.3001496
+3876.837607 , 1351.35 , 94.9680996
+3876.837607 , 1544.4 , 98.6360496
+3876.837607 , 1737.45 , 102.3039996
+3876.837607 , 1930.5 , 105.9719496
+3876.837607 , 2123.55 , 109.6398996
+3876.837607 , 2316.6 , 113.3078496
+3876.837607 , 2509.65 , 116.9757996
+3876.837607 , 2702.7 , 120.6437496
+3876.837607 , 2895.75 , 124.3116996
+3876.837607 , 3088.8 , 127.9796496
+3876.837607 , 3281.85 , 131.6475996
+3876.837607 , 3474.9 , 135.3155496
+3876.837607 , 3667.95 , 138.9834996
+3876.837607 , 3861 , 142.6514496
+3876.837607 , 4054.05 , 146.3193996
+3876.837607 , 4247.1 , 149.9873496
+3876.837607 , 4440.15 , 153.6552996
+3876.837607 , 4633.2 , 157.3232496
+3876.837607 , 4826.25 , 160.9911996
+3876.837607 , 5019.3 , 164.6591496
+3876.837607 , 5212.35 , 168.3270996
+3876.837607 , 5405.4 , 171.9950496
+3876.837607 , 5598.45 , 175.6629996
+3876.837607 , 5791.5 , 179.3309496
+3876.837607 , 5984.55 , 182.9988996
+3876.837607 , 6177.6 , 186.6668496
+4080.854701 , -6177.6 , 45.1831776
+4080.854701 , -5984.55 , 41.5152276
+4080.854701 , -5791.5 , 37.8472776
+4080.854701 , -5598.45 , 34.1793276
+4080.854701 , -5405.4 , 30.5113776
+4080.854701 , -5212.35 , 26.8434276
+4080.854701 , -5019.3 , 23.1754776
+4080.854701 , -4826.25 , 19.5075276
+4080.854701 , -4633.2 , 15.8395776
+4080.854701 , -4440.15 , 12.1716276
+4080.854701 , -4247.1 , 8.503677598
+4080.854701 , -4054.05 , 4.835727598
+4080.854701 , -3861 , 1.167777598
+4080.854701 , -3667.95 , 2.500172402
+4080.854701 , -3474.9 , 6.168122402
+4080.854701 , -3281.85 , 9.836072402
+4080.854701 , -3088.8 , 13.5040224
+4080.854701 , -2895.75 , 17.1719724
+4080.854701 , -2702.7 , 20.8399224
+4080.854701 , -2509.65 , 24.5078724
+4080.854701 , -2316.6 , 28.1758224
+4080.854701 , -2123.55 , 31.8437724
+4080.854701 , -1930.5 , 35.5117224
+4080.854701 , -1737.45 , 39.1796724
+4080.854701 , -1544.4 , 42.8476224
+4080.854701 , -1351.35 , 46.5155724
+4080.854701 , -1158.3 , 50.1835224
+4080.854701 , -965.25 , 53.8514724
+4080.854701 , -772.2 , 57.5194224
+4080.854701 , -579.15 , 61.1873724
+4080.854701 , -386.1 , 64.8553224
+4080.854701 , -193.05 , 68.5232724
+4080.854701 , 0 , 72.1912224
+4080.854701 , 193.05 , 75.8591724
+4080.854701 , 386.1 , 79.5271224
+4080.854701 , 579.15 , 83.1950724
+4080.854701 , 772.2 , 86.8630224
+4080.854701 , 965.25 , 90.5309724
+4080.854701 , 1158.3 , 94.1989224
+4080.854701 , 1351.35 , 97.8668724
+4080.854701 , 1544.4 , 101.5348224
+4080.854701 , 1737.45 , 105.2027724
+4080.854701 , 1930.5 , 108.8707224
+4080.854701 , 2123.55 , 112.5386724
+4080.854701 , 2316.6 , 116.2066224
+4080.854701 , 2509.65 , 119.8745724
+4080.854701 , 2702.7 , 123.5425224
+4080.854701 , 2895.75 , 127.2104724
+4080.854701 , 3088.8 , 130.8784224
+4080.854701 , 3281.85 , 134.5463724
+4080.854701 , 3474.9 , 138.2143224
+4080.854701 , 3667.95 , 141.8822724
+4080.854701 , 3861 , 145.5502224
+4080.854701 , 4054.05 , 149.2181724
+4080.854701 , 4247.1 , 152.8861224
+4080.854701 , 4440.15 , 156.5540724
+4080.854701 , 4633.2 , 160.2220224
+4080.854701 , 4826.25 , 163.8899724
+4080.854701 , 5019.3 , 167.5579224
+4080.854701 , 5212.35 , 171.2258724
+4080.854701 , 5405.4 , 174.8938224
+4080.854701 , 5598.45 , 178.5617724
+4080.854701 , 5791.5 , 182.2297224
+4080.854701 , 5984.55 , 185.8976724
+4080.854701 , 6177.6 , 189.5656224
+4268.632479 , -6177.6 , 42.51514079
+4268.632479 , -5984.55 , 38.84719079
+4268.632479 , -5791.5 , 35.17924079
+4268.632479 , -5598.45 , 31.51129079
+4268.632479 , -5405.4 , 27.84334079
+4268.632479 , -5212.35 , 24.17539079
+4268.632479 , -5019.3 , 20.50744079
+4268.632479 , -4826.25 , 16.83949079
+4268.632479 , -4633.2 , 13.17154079
+4268.632479 , -4440.15 , 9.503590795
+4268.632479 , -4247.1 , 5.835640795
+4268.632479 , -4054.05 , 2.167690795
+4268.632479 , -3861 , 1.500259205
+4268.632479 , -3667.95 , 5.168209205
+4268.632479 , -3474.9 , 8.836159205
+4268.632479 , -3281.85 , 12.50410921
+4268.632479 , -3088.8 , 16.17205921
+4268.632479 , -2895.75 , 19.84000921
+4268.632479 , -2702.7 , 23.50795921
+4268.632479 , -2509.65 , 27.17590921
+4268.632479 , -2316.6 , 30.84385921
+4268.632479 , -2123.55 , 34.51180921
+4268.632479 , -1930.5 , 38.17975921
+4268.632479 , -1737.45 , 41.84770921
+4268.632479 , -1544.4 , 45.51565921
+4268.632479 , -1351.35 , 49.18360921
+4268.632479 , -1158.3 , 52.85155921
+4268.632479 , -965.25 , 56.51950921
+4268.632479 , -772.2 , 60.18745921
+4268.632479 , -579.15 , 63.85540921
+4268.632479 , -386.1 , 67.52335921
+4268.632479 , -193.05 , 71.19130921
+4268.632479 , 0 , 74.85925921
+4268.632479 , 193.05 , 78.52720921
+4268.632479 , 386.1 , 82.19515921
+4268.632479 , 579.15 , 85.86310921
+4268.632479 , 772.2 , 89.53105921
+4268.632479 , 965.25 , 93.19900921
+4268.632479 , 1158.3 , 96.86695921
+4268.632479 , 1351.35 , 100.5349092
+4268.632479 , 1544.4 , 104.2028592
+4268.632479 , 1737.45 , 107.8708092
+4268.632479 , 1930.5 , 111.5387592
+4268.632479 , 2123.55 , 115.2067092
+4268.632479 , 2316.6 , 118.8746592
+4268.632479 , 2509.65 , 122.5426092
+4268.632479 , 2702.7 , 126.2105592
+4268.632479 , 2895.75 , 129.8785092
+4268.632479 , 3088.8 , 133.5464592
+4268.632479 , 3281.85 , 137.2144092
+4268.632479 , 3474.9 , 140.8823592
+4268.632479 , 3667.95 , 144.5503092
+4268.632479 , 3861 , 148.2182592
+4268.632479 , 4054.05 , 151.8862092
+4268.632479 , 4247.1 , 155.5541592
+4268.632479 , 4440.15 , 159.2221092
+4268.632479 , 4633.2 , 162.8900592
+4268.632479 , 4826.25 , 166.5580092
+4268.632479 , 5019.3 , 170.2259592
+4268.632479 , 5212.35 , 173.8939092
+4268.632479 , 5405.4 , 177.5618592
+4268.632479 , 5598.45 , 181.2298092
+4268.632479 , 5791.5 , 184.8977592
+4268.632479 , 5984.55 , 188.5657092
+4268.632479 , 6177.6 , 192.2336592
+5000 , -6177.6 , 32.12352
+5000 , -5984.55 , 28.45557
+5000 , -5791.5 , 24.78762
+5000 , -5598.45 , 21.11967
+5000 , -5405.4 , 17.45172
+5000 , -5212.35 , 13.78377
+5000 , -5019.3 , 10.11582
+5000 , -4826.25 , 6.44787
+5000 , -4633.2 , 2.77992
+5000 , -4440.15 , 0.88803
+5000 , -4247.1 , 4.55598
+5000 , -4054.05 , 8.22393
+5000 , -3861 , 11.89188
+5000 , -3667.95 , 15.55983
+5000 , -3474.9 , 19.22778
+5000 , -3281.85 , 22.89573
+5000 , -3088.8 , 26.56368
+5000 , -2895.75 , 30.23163
+5000 , -2702.7 , 33.89958
+5000 , -2509.65 , 37.56753
+5000 , -2316.6 , 41.23548
+5000 , -2123.55 , 44.90343
+5000 , -1930.5 , 48.57138
+5000 , -1737.45 , 52.23933
+5000 , -1544.4 , 55.90728
+5000 , -1351.35 , 59.57523
+5000 , -1158.3 , 63.24318
+5000 , -965.25 , 66.91113
+5000 , -772.2 , 70.57908
+5000 , -579.15 , 74.24703
+5000 , -386.1 , 77.91498
+5000 , -193.05 , 81.58293
+5000 , 0 , 85.25088
+5000 , 193.05 , 88.91883
+5000 , 386.1 , 92.58678
+5000 , 579.15 , 96.25473
+5000 , 772.2 , 99.92268
+5000 , 965.25 , 103.59063
+5000 , 1158.3 , 107.25858
+5000 , 1351.35 , 110.92653
+5000 , 1544.4 , 114.59448
+5000 , 1737.45 , 118.26243
+5000 , 1930.5 , 121.93038
+5000 , 2123.55 , 125.59833
+5000 , 2316.6 , 129.26628
+5000 , 2509.65 , 132.93423
+5000 , 2702.7 , 136.60218
+5000 , 2895.75 , 140.27013
+5000 , 3088.8 , 143.93808
+5000 , 3281.85 , 147.60603
+5000 , 3474.9 , 151.27398
+5000 , 3667.95 , 154.94193
+5000 , 3861 , 158.60988
+5000 , 4054.05 , 162.27783
+5000 , 4247.1 , 165.94578
+5000 , 4440.15 , 169.61373
+5000 , 4633.2 , 173.28168
+5000 , 4826.25 , 176.94963
+5000 , 5019.3 , 180.61758
+5000 , 5212.35 , 184.28553
+5000 , 5405.4 , 187.95348
+5000 , 5598.45 , 191.62143
+5000 , 5791.5 , 195.28938
+5000 , 5984.55 , 198.95733
+5000 , 6177.6 , 202.62528
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_6.vtlm b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_6.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..3166c1b361f4022cc02f04fd2f4ec6021d57c763
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Gear_6.vtlm
@@ -0,0 +1,2081 @@
+Input Speed [rpm] , Input Torque [Nm] , Torque Loss [Nm]
+0 , -6177.6 , 98.22384
+0 , -5984.55 , 94.74894
+0 , -5791.5 , 91.27404
+0 , -5598.45 , 87.79914
+0 , -5405.4 , 84.32424
+0 , -5212.35 , 80.84934
+0 , -5019.3 , 77.37444
+0 , -4826.25 , 73.89954
+0 , -4633.2 , 70.42464
+0 , -4440.15 , 66.94974
+0 , -4247.1 , 63.47484
+0 , -4054.05 , 59.99994
+0 , -3861 , 56.52504
+0 , -3667.95 , 53.05014
+0 , -3474.9 , 49.57524
+0 , -3281.85 , 46.10034
+0 , -3088.8 , 42.62544
+0 , -2895.75 , 39.15054
+0 , -2702.7 , 35.67564
+0 , -2509.65 , 32.20074
+0 , -2316.6 , 28.72584
+0 , -2123.55 , 25.25094
+0 , -1930.5 , 21.77604
+0 , -1737.45 , 18.30114
+0 , -1544.4 , 14.82624
+0 , -1351.35 , 11.35134
+0 , -1158.3 , 7.87644
+0 , -965.25 , 4.40154
+0 , -772.2 , 0.92664
+0 , -579.15 , 2.54826
+0 , -386.1 , 6.02316
+0 , -193.05 , 9.49806
+0 , 0 , 12.97296
+0 , 193.05 , 16.44786
+0 , 386.1 , 19.92276
+0 , 579.15 , 23.39766
+0 , 772.2 , 26.87256
+0 , 965.25 , 30.34746
+0 , 1158.3 , 33.82236
+0 , 1351.35 , 37.29726
+0 , 1544.4 , 40.77216
+0 , 1737.45 , 44.24706
+0 , 1930.5 , 47.72196
+0 , 2123.55 , 51.19686
+0 , 2316.6 , 54.67176
+0 , 2509.65 , 58.14666
+0 , 2702.7 , 61.62156
+0 , 2895.75 , 65.09646
+0 , 3088.8 , 68.57136
+0 , 3281.85 , 72.04626
+0 , 3474.9 , 75.52116
+0 , 3667.95 , 78.99606
+0 , 3861 , 82.47096
+0 , 4054.05 , 85.94586
+0 , 4247.1 , 89.42076
+0 , 4440.15 , 92.89566
+0 , 4633.2 , 96.37056
+0 , 4826.25 , 99.84546
+0 , 5019.3 , 103.32036
+0 , 5212.35 , 106.79526
+0 , 5405.4 , 110.27016
+0 , 5598.45 , 113.74506
+0 , 5791.5 , 117.21996
+0 , 5984.55 , 120.69486
+0 , 6177.6 , 124.16976
+40.80854701 , -6177.6 , 97.69443235
+40.80854701 , -5984.55 , 94.21953235
+40.80854701 , -5791.5 , 90.74463235
+40.80854701 , -5598.45 , 87.26973235
+40.80854701 , -5405.4 , 83.79483235
+40.80854701 , -5212.35 , 80.31993235
+40.80854701 , -5019.3 , 76.84503235
+40.80854701 , -4826.25 , 73.37013235
+40.80854701 , -4633.2 , 69.89523235
+40.80854701 , -4440.15 , 66.42033235
+40.80854701 , -4247.1 , 62.94543235
+40.80854701 , -4054.05 , 59.47053235
+40.80854701 , -3861 , 55.99563235
+40.80854701 , -3667.95 , 52.52073235
+40.80854701 , -3474.9 , 49.04583235
+40.80854701 , -3281.85 , 45.57093235
+40.80854701 , -3088.8 , 42.09603235
+40.80854701 , -2895.75 , 38.62113235
+40.80854701 , -2702.7 , 35.14623235
+40.80854701 , -2509.65 , 31.67133235
+40.80854701 , -2316.6 , 28.19643235
+40.80854701 , -2123.55 , 24.72153235
+40.80854701 , -1930.5 , 21.24663235
+40.80854701 , -1737.45 , 17.77173235
+40.80854701 , -1544.4 , 14.29683235
+40.80854701 , -1351.35 , 10.82193235
+40.80854701 , -1158.3 , 7.347032352
+40.80854701 , -965.25 , 3.872132352
+40.80854701 , -772.2 , 0.397232352
+40.80854701 , -579.15 , 3.077667648
+40.80854701 , -386.1 , 6.552567648
+40.80854701 , -193.05 , 10.02746765
+40.80854701 , 0 , 13.50236765
+40.80854701 , 193.05 , 16.97726765
+40.80854701 , 386.1 , 20.45216765
+40.80854701 , 579.15 , 23.92706765
+40.80854701 , 772.2 , 27.40196765
+40.80854701 , 965.25 , 30.87686765
+40.80854701 , 1158.3 , 34.35176765
+40.80854701 , 1351.35 , 37.82666765
+40.80854701 , 1544.4 , 41.30156765
+40.80854701 , 1737.45 , 44.77646765
+40.80854701 , 1930.5 , 48.25136765
+40.80854701 , 2123.55 , 51.72626765
+40.80854701 , 2316.6 , 55.20116765
+40.80854701 , 2509.65 , 58.67606765
+40.80854701 , 2702.7 , 62.15096765
+40.80854701 , 2895.75 , 65.62586765
+40.80854701 , 3088.8 , 69.10076765
+40.80854701 , 3281.85 , 72.57566765
+40.80854701 , 3474.9 , 76.05056765
+40.80854701 , 3667.95 , 79.52546765
+40.80854701 , 3861 , 83.00036765
+40.80854701 , 4054.05 , 86.47526765
+40.80854701 , 4247.1 , 89.95016765
+40.80854701 , 4440.15 , 93.42506765
+40.80854701 , 4633.2 , 96.89996765
+40.80854701 , 4826.25 , 100.3748676
+40.80854701 , 5019.3 , 103.8497676
+40.80854701 , 5212.35 , 107.3246676
+40.80854701 , 5405.4 , 110.7995676
+40.80854701 , 5598.45 , 114.2744676
+40.80854701 , 5791.5 , 117.7493676
+40.80854701 , 5984.55 , 121.2242676
+40.80854701 , 6177.6 , 124.6991676
+81.61794872 , -6177.6 , 97.16501362
+81.61794872 , -5984.55 , 93.69011362
+81.61794872 , -5791.5 , 90.21521362
+81.61794872 , -5598.45 , 86.74031362
+81.61794872 , -5405.4 , 83.26541362
+81.61794872 , -5212.35 , 79.79051362
+81.61794872 , -5019.3 , 76.31561362
+81.61794872 , -4826.25 , 72.84071362
+81.61794872 , -4633.2 , 69.36581362
+81.61794872 , -4440.15 , 65.89091362
+81.61794872 , -4247.1 , 62.41601362
+81.61794872 , -4054.05 , 58.94111362
+81.61794872 , -3861 , 55.46621362
+81.61794872 , -3667.95 , 51.99131362
+81.61794872 , -3474.9 , 48.51641362
+81.61794872 , -3281.85 , 45.04151362
+81.61794872 , -3088.8 , 41.56661362
+81.61794872 , -2895.75 , 38.09171362
+81.61794872 , -2702.7 , 34.61681362
+81.61794872 , -2509.65 , 31.14191362
+81.61794872 , -2316.6 , 27.66701362
+81.61794872 , -2123.55 , 24.19211362
+81.61794872 , -1930.5 , 20.71721362
+81.61794872 , -1737.45 , 17.24231362
+81.61794872 , -1544.4 , 13.76741362
+81.61794872 , -1351.35 , 10.29251362
+81.61794872 , -1158.3 , 6.817613616
+81.61794872 , -965.25 , 3.342713616
+81.61794872 , -772.2 , 0.132186384
+81.61794872 , -579.15 , 3.607086384
+81.61794872 , -386.1 , 7.081986384
+81.61794872 , -193.05 , 10.55688638
+81.61794872 , 0 , 14.03178638
+81.61794872 , 193.05 , 17.50668638
+81.61794872 , 386.1 , 20.98158638
+81.61794872 , 579.15 , 24.45648638
+81.61794872 , 772.2 , 27.93138638
+81.61794872 , 965.25 , 31.40628638
+81.61794872 , 1158.3 , 34.88118638
+81.61794872 , 1351.35 , 38.35608638
+81.61794872 , 1544.4 , 41.83098638
+81.61794872 , 1737.45 , 45.30588638
+81.61794872 , 1930.5 , 48.78078638
+81.61794872 , 2123.55 , 52.25568638
+81.61794872 , 2316.6 , 55.73058638
+81.61794872 , 2509.65 , 59.20548638
+81.61794872 , 2702.7 , 62.68038638
+81.61794872 , 2895.75 , 66.15528638
+81.61794872 , 3088.8 , 69.63018638
+81.61794872 , 3281.85 , 73.10508638
+81.61794872 , 3474.9 , 76.57998638
+81.61794872 , 3667.95 , 80.05488638
+81.61794872 , 3861 , 83.52978638
+81.61794872 , 4054.05 , 87.00468638
+81.61794872 , 4247.1 , 90.47958638
+81.61794872 , 4440.15 , 93.95448638
+81.61794872 , 4633.2 , 97.42938638
+81.61794872 , 4826.25 , 100.9042864
+81.61794872 , 5019.3 , 104.3791864
+81.61794872 , 5212.35 , 107.8540864
+81.61794872 , 5405.4 , 111.3289864
+81.61794872 , 5598.45 , 114.8038864
+81.61794872 , 5791.5 , 118.2787864
+81.61794872 , 5984.55 , 121.7536864
+81.61794872 , 6177.6 , 125.2285864
+122.4273504 , -6177.6 , 96.63559488
+122.4273504 , -5984.55 , 93.16069488
+122.4273504 , -5791.5 , 89.68579488
+122.4273504 , -5598.45 , 86.21089488
+122.4273504 , -5405.4 , 82.73599488
+122.4273504 , -5212.35 , 79.26109488
+122.4273504 , -5019.3 , 75.78619488
+122.4273504 , -4826.25 , 72.31129488
+122.4273504 , -4633.2 , 68.83639488
+122.4273504 , -4440.15 , 65.36149488
+122.4273504 , -4247.1 , 61.88659488
+122.4273504 , -4054.05 , 58.41169488
+122.4273504 , -3861 , 54.93679488
+122.4273504 , -3667.95 , 51.46189488
+122.4273504 , -3474.9 , 47.98699488
+122.4273504 , -3281.85 , 44.51209488
+122.4273504 , -3088.8 , 41.03719488
+122.4273504 , -2895.75 , 37.56229488
+122.4273504 , -2702.7 , 34.08739488
+122.4273504 , -2509.65 , 30.61249488
+122.4273504 , -2316.6 , 27.13759488
+122.4273504 , -2123.55 , 23.66269488
+122.4273504 , -1930.5 , 20.18779488
+122.4273504 , -1737.45 , 16.71289488
+122.4273504 , -1544.4 , 13.23799488
+122.4273504 , -1351.35 , 9.76309488
+122.4273504 , -1158.3 , 6.28819488
+122.4273504 , -965.25 , 2.81329488
+122.4273504 , -772.2 , 0.66160512
+122.4273504 , -579.15 , 4.13650512
+122.4273504 , -386.1 , 7.61140512
+122.4273504 , -193.05 , 11.08630512
+122.4273504 , 0 , 14.56120512
+122.4273504 , 193.05 , 18.03610512
+122.4273504 , 386.1 , 21.51100512
+122.4273504 , 579.15 , 24.98590512
+122.4273504 , 772.2 , 28.46080512
+122.4273504 , 965.25 , 31.93570512
+122.4273504 , 1158.3 , 35.41060512
+122.4273504 , 1351.35 , 38.88550512
+122.4273504 , 1544.4 , 42.36040512
+122.4273504 , 1737.45 , 45.83530512
+122.4273504 , 1930.5 , 49.31020512
+122.4273504 , 2123.55 , 52.78510512
+122.4273504 , 2316.6 , 56.26000512
+122.4273504 , 2509.65 , 59.73490512
+122.4273504 , 2702.7 , 63.20980512
+122.4273504 , 2895.75 , 66.68470512
+122.4273504 , 3088.8 , 70.15960512
+122.4273504 , 3281.85 , 73.63450512
+122.4273504 , 3474.9 , 77.10940512
+122.4273504 , 3667.95 , 80.58430512
+122.4273504 , 3861 , 84.05920512
+122.4273504 , 4054.05 , 87.53410512
+122.4273504 , 4247.1 , 91.00900512
+122.4273504 , 4440.15 , 94.48390512
+122.4273504 , 4633.2 , 97.95880512
+122.4273504 , 4826.25 , 101.4337051
+122.4273504 , 5019.3 , 104.9086051
+122.4273504 , 5212.35 , 108.3835051
+122.4273504 , 5405.4 , 111.8584051
+122.4273504 , 5598.45 , 115.3333051
+122.4273504 , 5791.5 , 118.8082051
+122.4273504 , 5984.55 , 122.2831051
+122.4273504 , 6177.6 , 125.7580051
+163.2393162 , -6177.6 , 96.10614288
+163.2393162 , -5984.55 , 92.63124288
+163.2393162 , -5791.5 , 89.15634288
+163.2393162 , -5598.45 , 85.68144288
+163.2393162 , -5405.4 , 82.20654288
+163.2393162 , -5212.35 , 78.73164288
+163.2393162 , -5019.3 , 75.25674288
+163.2393162 , -4826.25 , 71.78184288
+163.2393162 , -4633.2 , 68.30694288
+163.2393162 , -4440.15 , 64.83204288
+163.2393162 , -4247.1 , 61.35714288
+163.2393162 , -4054.05 , 57.88224288
+163.2393162 , -3861 , 54.40734288
+163.2393162 , -3667.95 , 50.93244288
+163.2393162 , -3474.9 , 47.45754288
+163.2393162 , -3281.85 , 43.98264288
+163.2393162 , -3088.8 , 40.50774288
+163.2393162 , -2895.75 , 37.03284288
+163.2393162 , -2702.7 , 33.55794288
+163.2393162 , -2509.65 , 30.08304288
+163.2393162 , -2316.6 , 26.60814288
+163.2393162 , -2123.55 , 23.13324288
+163.2393162 , -1930.5 , 19.65834288
+163.2393162 , -1737.45 , 16.18344288
+163.2393162 , -1544.4 , 12.70854288
+163.2393162 , -1351.35 , 9.233642881
+163.2393162 , -1158.3 , 5.758742881
+163.2393162 , -965.25 , 2.283842881
+163.2393162 , -772.2 , 1.191057119
+163.2393162 , -579.15 , 4.665957119
+163.2393162 , -386.1 , 8.140857119
+163.2393162 , -193.05 , 11.61575712
+163.2393162 , 0 , 15.09065712
+163.2393162 , 193.05 , 18.56555712
+163.2393162 , 386.1 , 22.04045712
+163.2393162 , 579.15 , 25.51535712
+163.2393162 , 772.2 , 28.99025712
+163.2393162 , 965.25 , 32.46515712
+163.2393162 , 1158.3 , 35.94005712
+163.2393162 , 1351.35 , 39.41495712
+163.2393162 , 1544.4 , 42.88985712
+163.2393162 , 1737.45 , 46.36475712
+163.2393162 , 1930.5 , 49.83965712
+163.2393162 , 2123.55 , 53.31455712
+163.2393162 , 2316.6 , 56.78945712
+163.2393162 , 2509.65 , 60.26435712
+163.2393162 , 2702.7 , 63.73925712
+163.2393162 , 2895.75 , 67.21415712
+163.2393162 , 3088.8 , 70.68905712
+163.2393162 , 3281.85 , 74.16395712
+163.2393162 , 3474.9 , 77.63885712
+163.2393162 , 3667.95 , 81.11375712
+163.2393162 , 3861 , 84.58865712
+163.2393162 , 4054.05 , 88.06355712
+163.2393162 , 4247.1 , 91.53845712
+163.2393162 , 4440.15 , 95.01335712
+163.2393162 , 4633.2 , 98.48825712
+163.2393162 , 4826.25 , 101.9631571
+163.2393162 , 5019.3 , 105.4380571
+163.2393162 , 5212.35 , 108.9129571
+163.2393162 , 5405.4 , 112.3878571
+163.2393162 , 5598.45 , 115.8627571
+163.2393162 , 5791.5 , 119.3376571
+163.2393162 , 5984.55 , 122.8125571
+163.2393162 , 6177.6 , 126.2874571
+204.042735 , -6177.6 , 95.57680176
+204.042735 , -5984.55 , 92.10190176
+204.042735 , -5791.5 , 88.62700176
+204.042735 , -5598.45 , 85.15210176
+204.042735 , -5405.4 , 81.67720176
+204.042735 , -5212.35 , 78.20230176
+204.042735 , -5019.3 , 74.72740176
+204.042735 , -4826.25 , 71.25250176
+204.042735 , -4633.2 , 67.77760176
+204.042735 , -4440.15 , 64.30270176
+204.042735 , -4247.1 , 60.82780176
+204.042735 , -4054.05 , 57.35290176
+204.042735 , -3861 , 53.87800176
+204.042735 , -3667.95 , 50.40310176
+204.042735 , -3474.9 , 46.92820176
+204.042735 , -3281.85 , 43.45330176
+204.042735 , -3088.8 , 39.97840176
+204.042735 , -2895.75 , 36.50350176
+204.042735 , -2702.7 , 33.02860176
+204.042735 , -2509.65 , 29.55370176
+204.042735 , -2316.6 , 26.07880176
+204.042735 , -2123.55 , 22.60390176
+204.042735 , -1930.5 , 19.12900176
+204.042735 , -1737.45 , 15.65410176
+204.042735 , -1544.4 , 12.17920176
+204.042735 , -1351.35 , 8.704301761
+204.042735 , -1158.3 , 5.229401761
+204.042735 , -965.25 , 1.754501761
+204.042735 , -772.2 , 1.720398239
+204.042735 , -579.15 , 5.195298239
+204.042735 , -386.1 , 8.670198239
+204.042735 , -193.05 , 12.14509824
+204.042735 , 0 , 15.61999824
+204.042735 , 193.05 , 19.09489824
+204.042735 , 386.1 , 22.56979824
+204.042735 , 579.15 , 26.04469824
+204.042735 , 772.2 , 29.51959824
+204.042735 , 965.25 , 32.99449824
+204.042735 , 1158.3 , 36.46939824
+204.042735 , 1351.35 , 39.94429824
+204.042735 , 1544.4 , 43.41919824
+204.042735 , 1737.45 , 46.89409824
+204.042735 , 1930.5 , 50.36899824
+204.042735 , 2123.55 , 53.84389824
+204.042735 , 2316.6 , 57.31879824
+204.042735 , 2509.65 , 60.79369824
+204.042735 , 2702.7 , 64.26859824
+204.042735 , 2895.75 , 67.74349824
+204.042735 , 3088.8 , 71.21839824
+204.042735 , 3281.85 , 74.69329824
+204.042735 , 3474.9 , 78.16819824
+204.042735 , 3667.95 , 81.64309824
+204.042735 , 3861 , 85.11799824
+204.042735 , 4054.05 , 88.59289824
+204.042735 , 4247.1 , 92.06779824
+204.042735 , 4440.15 , 95.54269824
+204.042735 , 4633.2 , 99.01759824
+204.042735 , 4826.25 , 102.4924982
+204.042735 , 5019.3 , 105.9673982
+204.042735 , 5212.35 , 109.4422982
+204.042735 , 5405.4 , 112.9171982
+204.042735 , 5598.45 , 116.3920982
+204.042735 , 5791.5 , 119.8669982
+204.042735 , 5984.55 , 123.3418982
+204.042735 , 6177.6 , 126.8167982
+244.8547009 , -6177.6 , 95.04734976
+244.8547009 , -5984.55 , 91.57244976
+244.8547009 , -5791.5 , 88.09754976
+244.8547009 , -5598.45 , 84.62264976
+244.8547009 , -5405.4 , 81.14774976
+244.8547009 , -5212.35 , 77.67284976
+244.8547009 , -5019.3 , 74.19794976
+244.8547009 , -4826.25 , 70.72304976
+244.8547009 , -4633.2 , 67.24814976
+244.8547009 , -4440.15 , 63.77324976
+244.8547009 , -4247.1 , 60.29834976
+244.8547009 , -4054.05 , 56.82344976
+244.8547009 , -3861 , 53.34854976
+244.8547009 , -3667.95 , 49.87364976
+244.8547009 , -3474.9 , 46.39874976
+244.8547009 , -3281.85 , 42.92384976
+244.8547009 , -3088.8 , 39.44894976
+244.8547009 , -2895.75 , 35.97404976
+244.8547009 , -2702.7 , 32.49914976
+244.8547009 , -2509.65 , 29.02424976
+244.8547009 , -2316.6 , 25.54934976
+244.8547009 , -2123.55 , 22.07444976
+244.8547009 , -1930.5 , 18.59954976
+244.8547009 , -1737.45 , 15.12464976
+244.8547009 , -1544.4 , 11.64974976
+244.8547009 , -1351.35 , 8.174849759
+244.8547009 , -1158.3 , 4.699949759
+244.8547009 , -965.25 , 1.225049759
+244.8547009 , -772.2 , 2.249850241
+244.8547009 , -579.15 , 5.724750241
+244.8547009 , -386.1 , 9.199650241
+244.8547009 , -193.05 , 12.67455024
+244.8547009 , 0 , 16.14945024
+244.8547009 , 193.05 , 19.62435024
+244.8547009 , 386.1 , 23.09925024
+244.8547009 , 579.15 , 26.57415024
+244.8547009 , 772.2 , 30.04905024
+244.8547009 , 965.25 , 33.52395024
+244.8547009 , 1158.3 , 36.99885024
+244.8547009 , 1351.35 , 40.47375024
+244.8547009 , 1544.4 , 43.94865024
+244.8547009 , 1737.45 , 47.42355024
+244.8547009 , 1930.5 , 50.89845024
+244.8547009 , 2123.55 , 54.37335024
+244.8547009 , 2316.6 , 57.84825024
+244.8547009 , 2509.65 , 61.32315024
+244.8547009 , 2702.7 , 64.79805024
+244.8547009 , 2895.75 , 68.27295024
+244.8547009 , 3088.8 , 71.74785024
+244.8547009 , 3281.85 , 75.22275024
+244.8547009 , 3474.9 , 78.69765024
+244.8547009 , 3667.95 , 82.17255024
+244.8547009 , 3861 , 85.64745024
+244.8547009 , 4054.05 , 89.12235024
+244.8547009 , 4247.1 , 92.59725024
+244.8547009 , 4440.15 , 96.07215024
+244.8547009 , 4633.2 , 99.54705024
+244.8547009 , 4826.25 , 103.0219502
+244.8547009 , 5019.3 , 106.4968502
+244.8547009 , 5212.35 , 109.9717502
+244.8547009 , 5405.4 , 113.4466502
+244.8547009 , 5598.45 , 116.9215502
+244.8547009 , 5791.5 , 120.3964502
+244.8547009 , 5984.55 , 123.8713502
+244.8547009 , 6177.6 , 127.3462502
+285.6666667 , -6177.6 , 94.51789776
+285.6666667 , -5984.55 , 91.04299776
+285.6666667 , -5791.5 , 87.56809776
+285.6666667 , -5598.45 , 84.09319776
+285.6666667 , -5405.4 , 80.61829776
+285.6666667 , -5212.35 , 77.14339776
+285.6666667 , -5019.3 , 73.66849776
+285.6666667 , -4826.25 , 70.19359776
+285.6666667 , -4633.2 , 66.71869776
+285.6666667 , -4440.15 , 63.24379776
+285.6666667 , -4247.1 , 59.76889776
+285.6666667 , -4054.05 , 56.29399776
+285.6666667 , -3861 , 52.81909776
+285.6666667 , -3667.95 , 49.34419776
+285.6666667 , -3474.9 , 45.86929776
+285.6666667 , -3281.85 , 42.39439776
+285.6666667 , -3088.8 , 38.91949776
+285.6666667 , -2895.75 , 35.44459776
+285.6666667 , -2702.7 , 31.96969776
+285.6666667 , -2509.65 , 28.49479776
+285.6666667 , -2316.6 , 25.01989776
+285.6666667 , -2123.55 , 21.54499776
+285.6666667 , -1930.5 , 18.07009776
+285.6666667 , -1737.45 , 14.59519776
+285.6666667 , -1544.4 , 11.12029776
+285.6666667 , -1351.35 , 7.64539776
+285.6666667 , -1158.3 , 4.17049776
+285.6666667 , -965.25 , 0.69559776
+285.6666667 , -772.2 , 2.77930224
+285.6666667 , -579.15 , 6.25420224
+285.6666667 , -386.1 , 9.72910224
+285.6666667 , -193.05 , 13.20400224
+285.6666667 , 0 , 16.67890224
+285.6666667 , 193.05 , 20.15380224
+285.6666667 , 386.1 , 23.62870224
+285.6666667 , 579.15 , 27.10360224
+285.6666667 , 772.2 , 30.57850224
+285.6666667 , 965.25 , 34.05340224
+285.6666667 , 1158.3 , 37.52830224
+285.6666667 , 1351.35 , 41.00320224
+285.6666667 , 1544.4 , 44.47810224
+285.6666667 , 1737.45 , 47.95300224
+285.6666667 , 1930.5 , 51.42790224
+285.6666667 , 2123.55 , 54.90280224
+285.6666667 , 2316.6 , 58.37770224
+285.6666667 , 2509.65 , 61.85260224
+285.6666667 , 2702.7 , 65.32750224
+285.6666667 , 2895.75 , 68.80240224
+285.6666667 , 3088.8 , 72.27730224
+285.6666667 , 3281.85 , 75.75220224
+285.6666667 , 3474.9 , 79.22710224
+285.6666667 , 3667.95 , 82.70200224
+285.6666667 , 3861 , 86.17690224
+285.6666667 , 4054.05 , 89.65180224
+285.6666667 , 4247.1 , 93.12670224
+285.6666667 , 4440.15 , 96.60160224
+285.6666667 , 4633.2 , 100.0765022
+285.6666667 , 4826.25 , 103.5514022
+285.6666667 , 5019.3 , 107.0263022
+285.6666667 , 5212.35 , 110.5012022
+285.6666667 , 5405.4 , 113.9761022
+285.6666667 , 5598.45 , 117.4510022
+285.6666667 , 5791.5 , 120.9259022
+285.6666667 , 5984.55 , 124.4008022
+285.6666667 , 6177.6 , 127.8757022
+326.4700855 , -6177.6 , 93.98855664
+326.4700855 , -5984.55 , 90.51365664
+326.4700855 , -5791.5 , 87.03875664
+326.4700855 , -5598.45 , 83.56385664
+326.4700855 , -5405.4 , 80.08895664
+326.4700855 , -5212.35 , 76.61405664
+326.4700855 , -5019.3 , 73.13915664
+326.4700855 , -4826.25 , 69.66425664
+326.4700855 , -4633.2 , 66.18935664
+326.4700855 , -4440.15 , 62.71445664
+326.4700855 , -4247.1 , 59.23955664
+326.4700855 , -4054.05 , 55.76465664
+326.4700855 , -3861 , 52.28975664
+326.4700855 , -3667.95 , 48.81485664
+326.4700855 , -3474.9 , 45.33995664
+326.4700855 , -3281.85 , 41.86505664
+326.4700855 , -3088.8 , 38.39015664
+326.4700855 , -2895.75 , 34.91525664
+326.4700855 , -2702.7 , 31.44035664
+326.4700855 , -2509.65 , 27.96545664
+326.4700855 , -2316.6 , 24.49055664
+326.4700855 , -2123.55 , 21.01565664
+326.4700855 , -1930.5 , 17.54075664
+326.4700855 , -1737.45 , 14.06585664
+326.4700855 , -1544.4 , 10.59095664
+326.4700855 , -1351.35 , 7.11605664
+326.4700855 , -1158.3 , 3.64115664
+326.4700855 , -965.25 , 0.16625664
+326.4700855 , -772.2 , 3.30864336
+326.4700855 , -579.15 , 6.78354336
+326.4700855 , -386.1 , 10.25844336
+326.4700855 , -193.05 , 13.73334336
+326.4700855 , 0 , 17.20824336
+326.4700855 , 193.05 , 20.68314336
+326.4700855 , 386.1 , 24.15804336
+326.4700855 , 579.15 , 27.63294336
+326.4700855 , 772.2 , 31.10784336
+326.4700855 , 965.25 , 34.58274336
+326.4700855 , 1158.3 , 38.05764336
+326.4700855 , 1351.35 , 41.53254336
+326.4700855 , 1544.4 , 45.00744336
+326.4700855 , 1737.45 , 48.48234336
+326.4700855 , 1930.5 , 51.95724336
+326.4700855 , 2123.55 , 55.43214336
+326.4700855 , 2316.6 , 58.90704336
+326.4700855 , 2509.65 , 62.38194336
+326.4700855 , 2702.7 , 65.85684336
+326.4700855 , 2895.75 , 69.33174336
+326.4700855 , 3088.8 , 72.80664336
+326.4700855 , 3281.85 , 76.28154336
+326.4700855 , 3474.9 , 79.75644336
+326.4700855 , 3667.95 , 83.23134336
+326.4700855 , 3861 , 86.70624336
+326.4700855 , 4054.05 , 90.18114336
+326.4700855 , 4247.1 , 93.65604336
+326.4700855 , 4440.15 , 97.13094336
+326.4700855 , 4633.2 , 100.6058434
+326.4700855 , 4826.25 , 104.0807434
+326.4700855 , 5019.3 , 107.5556434
+326.4700855 , 5212.35 , 111.0305434
+326.4700855 , 5405.4 , 114.5054434
+326.4700855 , 5598.45 , 117.9803434
+326.4700855 , 5791.5 , 121.4552434
+326.4700855 , 5984.55 , 124.9301434
+326.4700855 , 6177.6 , 128.4050434
+367.2820513 , -6177.6 , 93.45910464
+367.2820513 , -5984.55 , 89.98420464
+367.2820513 , -5791.5 , 86.50930464
+367.2820513 , -5598.45 , 83.03440464
+367.2820513 , -5405.4 , 79.55950464
+367.2820513 , -5212.35 , 76.08460464
+367.2820513 , -5019.3 , 72.60970464
+367.2820513 , -4826.25 , 69.13480464
+367.2820513 , -4633.2 , 65.65990464
+367.2820513 , -4440.15 , 62.18500464
+367.2820513 , -4247.1 , 58.71010464
+367.2820513 , -4054.05 , 55.23520464
+367.2820513 , -3861 , 51.76030464
+367.2820513 , -3667.95 , 48.28540464
+367.2820513 , -3474.9 , 44.81050464
+367.2820513 , -3281.85 , 41.33560464
+367.2820513 , -3088.8 , 37.86070464
+367.2820513 , -2895.75 , 34.38580464
+367.2820513 , -2702.7 , 30.91090464
+367.2820513 , -2509.65 , 27.43600464
+367.2820513 , -2316.6 , 23.96110464
+367.2820513 , -2123.55 , 20.48620464
+367.2820513 , -1930.5 , 17.01130464
+367.2820513 , -1737.45 , 13.53640464
+367.2820513 , -1544.4 , 10.06150464
+367.2820513 , -1351.35 , 6.58660464
+367.2820513 , -1158.3 , 3.11170464
+367.2820513 , -965.25 , 0.36319536
+367.2820513 , -772.2 , 3.83809536
+367.2820513 , -579.15 , 7.31299536
+367.2820513 , -386.1 , 10.78789536
+367.2820513 , -193.05 , 14.26279536
+367.2820513 , 0 , 17.73769536
+367.2820513 , 193.05 , 21.21259536
+367.2820513 , 386.1 , 24.68749536
+367.2820513 , 579.15 , 28.16239536
+367.2820513 , 772.2 , 31.63729536
+367.2820513 , 965.25 , 35.11219536
+367.2820513 , 1158.3 , 38.58709536
+367.2820513 , 1351.35 , 42.06199536
+367.2820513 , 1544.4 , 45.53689536
+367.2820513 , 1737.45 , 49.01179536
+367.2820513 , 1930.5 , 52.48669536
+367.2820513 , 2123.55 , 55.96159536
+367.2820513 , 2316.6 , 59.43649536
+367.2820513 , 2509.65 , 62.91139536
+367.2820513 , 2702.7 , 66.38629536
+367.2820513 , 2895.75 , 69.86119536
+367.2820513 , 3088.8 , 73.33609536
+367.2820513 , 3281.85 , 76.81099536
+367.2820513 , 3474.9 , 80.28589536
+367.2820513 , 3667.95 , 83.76079536
+367.2820513 , 3861 , 87.23569536
+367.2820513 , 4054.05 , 90.71059536
+367.2820513 , 4247.1 , 94.18549536
+367.2820513 , 4440.15 , 97.66039536
+367.2820513 , 4633.2 , 101.1352954
+367.2820513 , 4826.25 , 104.6101954
+367.2820513 , 5019.3 , 108.0850954
+367.2820513 , 5212.35 , 111.5599954
+367.2820513 , 5405.4 , 115.0348954
+367.2820513 , 5598.45 , 118.5097954
+367.2820513 , 5791.5 , 121.9846954
+367.2820513 , 5984.55 , 125.4595954
+367.2820513 , 6177.6 , 128.9344954
+408.0854701 , -6177.6 , 92.92976352
+408.0854701 , -5984.55 , 89.45486352
+408.0854701 , -5791.5 , 85.97996352
+408.0854701 , -5598.45 , 82.50506352
+408.0854701 , -5405.4 , 79.03016352
+408.0854701 , -5212.35 , 75.55526352
+408.0854701 , -5019.3 , 72.08036352
+408.0854701 , -4826.25 , 68.60546352
+408.0854701 , -4633.2 , 65.13056352
+408.0854701 , -4440.15 , 61.65566352
+408.0854701 , -4247.1 , 58.18076352
+408.0854701 , -4054.05 , 54.70586352
+408.0854701 , -3861 , 51.23096352
+408.0854701 , -3667.95 , 47.75606352
+408.0854701 , -3474.9 , 44.28116352
+408.0854701 , -3281.85 , 40.80626352
+408.0854701 , -3088.8 , 37.33136352
+408.0854701 , -2895.75 , 33.85646352
+408.0854701 , -2702.7 , 30.38156352
+408.0854701 , -2509.65 , 26.90666352
+408.0854701 , -2316.6 , 23.43176352
+408.0854701 , -2123.55 , 19.95686352
+408.0854701 , -1930.5 , 16.48196352
+408.0854701 , -1737.45 , 13.00706352
+408.0854701 , -1544.4 , 9.53216352
+408.0854701 , -1351.35 , 6.05726352
+408.0854701 , -1158.3 , 2.58236352
+408.0854701 , -965.25 , 0.89253648
+408.0854701 , -772.2 , 4.36743648
+408.0854701 , -579.15 , 7.84233648
+408.0854701 , -386.1 , 11.31723648
+408.0854701 , -193.05 , 14.79213648
+408.0854701 , 0 , 18.26703648
+408.0854701 , 193.05 , 21.74193648
+408.0854701 , 386.1 , 25.21683648
+408.0854701 , 579.15 , 28.69173648
+408.0854701 , 772.2 , 32.16663648
+408.0854701 , 965.25 , 35.64153648
+408.0854701 , 1158.3 , 39.11643648
+408.0854701 , 1351.35 , 42.59133648
+408.0854701 , 1544.4 , 46.06623648
+408.0854701 , 1737.45 , 49.54113648
+408.0854701 , 1930.5 , 53.01603648
+408.0854701 , 2123.55 , 56.49093648
+408.0854701 , 2316.6 , 59.96583648
+408.0854701 , 2509.65 , 63.44073648
+408.0854701 , 2702.7 , 66.91563648
+408.0854701 , 2895.75 , 70.39053648
+408.0854701 , 3088.8 , 73.86543648
+408.0854701 , 3281.85 , 77.34033648
+408.0854701 , 3474.9 , 80.81523648
+408.0854701 , 3667.95 , 84.29013648
+408.0854701 , 3861 , 87.76503648
+408.0854701 , 4054.05 , 91.23993648
+408.0854701 , 4247.1 , 94.71483648
+408.0854701 , 4440.15 , 98.18973648
+408.0854701 , 4633.2 , 101.6646365
+408.0854701 , 4826.25 , 105.1395365
+408.0854701 , 5019.3 , 108.6144365
+408.0854701 , 5212.35 , 112.0893365
+408.0854701 , 5405.4 , 115.5642365
+408.0854701 , 5598.45 , 119.0391365
+408.0854701 , 5791.5 , 122.5140365
+408.0854701 , 5984.55 , 125.9889365
+408.0854701 , 6177.6 , 129.4638365
+448.8974359 , -6177.6 , 92.40031152
+448.8974359 , -5984.55 , 88.92541152
+448.8974359 , -5791.5 , 85.45051152
+448.8974359 , -5598.45 , 81.97561152
+448.8974359 , -5405.4 , 78.50071152
+448.8974359 , -5212.35 , 75.02581152
+448.8974359 , -5019.3 , 71.55091152
+448.8974359 , -4826.25 , 68.07601152
+448.8974359 , -4633.2 , 64.60111152
+448.8974359 , -4440.15 , 61.12621152
+448.8974359 , -4247.1 , 57.65131152
+448.8974359 , -4054.05 , 54.17641152
+448.8974359 , -3861 , 50.70151152
+448.8974359 , -3667.95 , 47.22661152
+448.8974359 , -3474.9 , 43.75171152
+448.8974359 , -3281.85 , 40.27681152
+448.8974359 , -3088.8 , 36.80191152
+448.8974359 , -2895.75 , 33.32701152
+448.8974359 , -2702.7 , 29.85211152
+448.8974359 , -2509.65 , 26.37721152
+448.8974359 , -2316.6 , 22.90231152
+448.8974359 , -2123.55 , 19.42741152
+448.8974359 , -1930.5 , 15.95251152
+448.8974359 , -1737.45 , 12.47761152
+448.8974359 , -1544.4 , 9.00271152
+448.8974359 , -1351.35 , 5.52781152
+448.8974359 , -1158.3 , 2.05291152
+448.8974359 , -965.25 , 1.42198848
+448.8974359 , -772.2 , 4.89688848
+448.8974359 , -579.15 , 8.37178848
+448.8974359 , -386.1 , 11.84668848
+448.8974359 , -193.05 , 15.32158848
+448.8974359 , 0 , 18.79648848
+448.8974359 , 193.05 , 22.27138848
+448.8974359 , 386.1 , 25.74628848
+448.8974359 , 579.15 , 29.22118848
+448.8974359 , 772.2 , 32.69608848
+448.8974359 , 965.25 , 36.17098848
+448.8974359 , 1158.3 , 39.64588848
+448.8974359 , 1351.35 , 43.12078848
+448.8974359 , 1544.4 , 46.59568848
+448.8974359 , 1737.45 , 50.07058848
+448.8974359 , 1930.5 , 53.54548848
+448.8974359 , 2123.55 , 57.02038848
+448.8974359 , 2316.6 , 60.49528848
+448.8974359 , 2509.65 , 63.97018848
+448.8974359 , 2702.7 , 67.44508848
+448.8974359 , 2895.75 , 70.91998848
+448.8974359 , 3088.8 , 74.39488848
+448.8974359 , 3281.85 , 77.86978848
+448.8974359 , 3474.9 , 81.34468848
+448.8974359 , 3667.95 , 84.81958848
+448.8974359 , 3861 , 88.29448848
+448.8974359 , 4054.05 , 91.76938848
+448.8974359 , 4247.1 , 95.24428848
+448.8974359 , 4440.15 , 98.71918848
+448.8974359 , 4633.2 , 102.1940885
+448.8974359 , 4826.25 , 105.6689885
+448.8974359 , 5019.3 , 109.1438885
+448.8974359 , 5212.35 , 112.6187885
+448.8974359 , 5405.4 , 116.0936885
+448.8974359 , 5598.45 , 119.5685885
+448.8974359 , 5791.5 , 123.0434885
+448.8974359 , 5984.55 , 126.5183885
+448.8974359 , 6177.6 , 129.9932885
+489.7094017 , -6177.6 , 91.87085952
+489.7094017 , -5984.55 , 88.39595952
+489.7094017 , -5791.5 , 84.92105952
+489.7094017 , -5598.45 , 81.44615952
+489.7094017 , -5405.4 , 77.97125952
+489.7094017 , -5212.35 , 74.49635952
+489.7094017 , -5019.3 , 71.02145952
+489.7094017 , -4826.25 , 67.54655952
+489.7094017 , -4633.2 , 64.07165952
+489.7094017 , -4440.15 , 60.59675952
+489.7094017 , -4247.1 , 57.12185952
+489.7094017 , -4054.05 , 53.64695952
+489.7094017 , -3861 , 50.17205952
+489.7094017 , -3667.95 , 46.69715952
+489.7094017 , -3474.9 , 43.22225952
+489.7094017 , -3281.85 , 39.74735952
+489.7094017 , -3088.8 , 36.27245952
+489.7094017 , -2895.75 , 32.79755952
+489.7094017 , -2702.7 , 29.32265952
+489.7094017 , -2509.65 , 25.84775952
+489.7094017 , -2316.6 , 22.37285952
+489.7094017 , -2123.55 , 18.89795952
+489.7094017 , -1930.5 , 15.42305952
+489.7094017 , -1737.45 , 11.94815952
+489.7094017 , -1544.4 , 8.47325952
+489.7094017 , -1351.35 , 4.99835952
+489.7094017 , -1158.3 , 1.52345952
+489.7094017 , -965.25 , 1.95144048
+489.7094017 , -772.2 , 5.42634048
+489.7094017 , -579.15 , 8.90124048
+489.7094017 , -386.1 , 12.37614048
+489.7094017 , -193.05 , 15.85104048
+489.7094017 , 0 , 19.32594048
+489.7094017 , 193.05 , 22.80084048
+489.7094017 , 386.1 , 26.27574048
+489.7094017 , 579.15 , 29.75064048
+489.7094017 , 772.2 , 33.22554048
+489.7094017 , 965.25 , 36.70044048
+489.7094017 , 1158.3 , 40.17534048
+489.7094017 , 1351.35 , 43.65024048
+489.7094017 , 1544.4 , 47.12514048
+489.7094017 , 1737.45 , 50.60004048
+489.7094017 , 1930.5 , 54.07494048
+489.7094017 , 2123.55 , 57.54984048
+489.7094017 , 2316.6 , 61.02474048
+489.7094017 , 2509.65 , 64.49964048
+489.7094017 , 2702.7 , 67.97454048
+489.7094017 , 2895.75 , 71.44944048
+489.7094017 , 3088.8 , 74.92434048
+489.7094017 , 3281.85 , 78.39924048
+489.7094017 , 3474.9 , 81.87414048
+489.7094017 , 3667.95 , 85.34904048
+489.7094017 , 3861 , 88.82394048
+489.7094017 , 4054.05 , 92.29884048
+489.7094017 , 4247.1 , 95.77374048
+489.7094017 , 4440.15 , 99.24864048
+489.7094017 , 4633.2 , 102.7235405
+489.7094017 , 4826.25 , 106.1984405
+489.7094017 , 5019.3 , 109.6733405
+489.7094017 , 5212.35 , 113.1482405
+489.7094017 , 5405.4 , 116.6231405
+489.7094017 , 5598.45 , 120.0980405
+489.7094017 , 5791.5 , 123.5729405
+489.7094017 , 5984.55 , 127.0478405
+489.7094017 , 6177.6 , 130.5227405
+816.1794872 , -6177.6 , 87.63557616
+816.1794872 , -5984.55 , 84.16067616
+816.1794872 , -5791.5 , 80.68577616
+816.1794872 , -5598.45 , 77.21087616
+816.1794872 , -5405.4 , 73.73597616
+816.1794872 , -5212.35 , 70.26107616
+816.1794872 , -5019.3 , 66.78617616
+816.1794872 , -4826.25 , 63.31127616
+816.1794872 , -4633.2 , 59.83637616
+816.1794872 , -4440.15 , 56.36147616
+816.1794872 , -4247.1 , 52.88657616
+816.1794872 , -4054.05 , 49.41167616
+816.1794872 , -3861 , 45.93677616
+816.1794872 , -3667.95 , 42.46187616
+816.1794872 , -3474.9 , 38.98697616
+816.1794872 , -3281.85 , 35.51207616
+816.1794872 , -3088.8 , 32.03717616
+816.1794872 , -2895.75 , 28.56227616
+816.1794872 , -2702.7 , 25.08737616
+816.1794872 , -2509.65 , 21.61247616
+816.1794872 , -2316.6 , 18.13757616
+816.1794872 , -2123.55 , 14.66267616
+816.1794872 , -1930.5 , 11.18777616
+816.1794872 , -1737.45 , 7.71287616
+816.1794872 , -1544.4 , 4.23797616
+816.1794872 , -1351.35 , 0.76307616
+816.1794872 , -1158.3 , 2.71182384
+816.1794872 , -965.25 , 6.18672384
+816.1794872 , -772.2 , 9.66162384
+816.1794872 , -579.15 , 13.13652384
+816.1794872 , -386.1 , 16.61142384
+816.1794872 , -193.05 , 20.08632384
+816.1794872 , 0 , 23.56122384
+816.1794872 , 193.05 , 27.03612384
+816.1794872 , 386.1 , 30.51102384
+816.1794872 , 579.15 , 33.98592384
+816.1794872 , 772.2 , 37.46082384
+816.1794872 , 965.25 , 40.93572384
+816.1794872 , 1158.3 , 44.41062384
+816.1794872 , 1351.35 , 47.88552384
+816.1794872 , 1544.4 , 51.36042384
+816.1794872 , 1737.45 , 54.83532384
+816.1794872 , 1930.5 , 58.31022384
+816.1794872 , 2123.55 , 61.78512384
+816.1794872 , 2316.6 , 65.26002384
+816.1794872 , 2509.65 , 68.73492384
+816.1794872 , 2702.7 , 72.20982384
+816.1794872 , 2895.75 , 75.68472384
+816.1794872 , 3088.8 , 79.15962384
+816.1794872 , 3281.85 , 82.63452384
+816.1794872 , 3474.9 , 86.10942384
+816.1794872 , 3667.95 , 89.58432384
+816.1794872 , 3861 , 93.05922384
+816.1794872 , 4054.05 , 96.53412384
+816.1794872 , 4247.1 , 100.0090238
+816.1794872 , 4440.15 , 103.4839238
+816.1794872 , 4633.2 , 106.9588238
+816.1794872 , 4826.25 , 110.4337238
+816.1794872 , 5019.3 , 113.9086238
+816.1794872 , 5212.35 , 117.3835238
+816.1794872 , 5405.4 , 120.8584238
+816.1794872 , 5598.45 , 124.3333238
+816.1794872 , 5791.5 , 127.8082238
+816.1794872 , 5984.55 , 131.2831238
+816.1794872 , 6177.6 , 134.7580238
+1020.25641 , -6177.6 , 84.9880944
+1020.25641 , -5984.55 , 81.5131944
+1020.25641 , -5791.5 , 78.0382944
+1020.25641 , -5598.45 , 74.5633944
+1020.25641 , -5405.4 , 71.0884944
+1020.25641 , -5212.35 , 67.6135944
+1020.25641 , -5019.3 , 64.1386944
+1020.25641 , -4826.25 , 60.6637944
+1020.25641 , -4633.2 , 57.1888944
+1020.25641 , -4440.15 , 53.7139944
+1020.25641 , -4247.1 , 50.2390944
+1020.25641 , -4054.05 , 46.7641944
+1020.25641 , -3861 , 43.2892944
+1020.25641 , -3667.95 , 39.8143944
+1020.25641 , -3474.9 , 36.3394944
+1020.25641 , -3281.85 , 32.8645944
+1020.25641 , -3088.8 , 29.3896944
+1020.25641 , -2895.75 , 25.9147944
+1020.25641 , -2702.7 , 22.4398944
+1020.25641 , -2509.65 , 18.9649944
+1020.25641 , -2316.6 , 15.4900944
+1020.25641 , -2123.55 , 12.0151944
+1020.25641 , -1930.5 , 8.540294403
+1020.25641 , -1737.45 , 5.065394403
+1020.25641 , -1544.4 , 1.590494403
+1020.25641 , -1351.35 , 1.884405597
+1020.25641 , -1158.3 , 5.359305597
+1020.25641 , -965.25 , 8.834205597
+1020.25641 , -772.2 , 12.3091056
+1020.25641 , -579.15 , 15.7840056
+1020.25641 , -386.1 , 19.2589056
+1020.25641 , -193.05 , 22.7338056
+1020.25641 , 0 , 26.2087056
+1020.25641 , 193.05 , 29.6836056
+1020.25641 , 386.1 , 33.1585056
+1020.25641 , 579.15 , 36.6334056
+1020.25641 , 772.2 , 40.1083056
+1020.25641 , 965.25 , 43.5832056
+1020.25641 , 1158.3 , 47.0581056
+1020.25641 , 1351.35 , 50.5330056
+1020.25641 , 1544.4 , 54.0079056
+1020.25641 , 1737.45 , 57.4828056
+1020.25641 , 1930.5 , 60.9577056
+1020.25641 , 2123.55 , 64.4326056
+1020.25641 , 2316.6 , 67.9075056
+1020.25641 , 2509.65 , 71.3824056
+1020.25641 , 2702.7 , 74.8573056
+1020.25641 , 2895.75 , 78.3322056
+1020.25641 , 3088.8 , 81.8071056
+1020.25641 , 3281.85 , 85.2820056
+1020.25641 , 3474.9 , 88.7569056
+1020.25641 , 3667.95 , 92.2318056
+1020.25641 , 3861 , 95.7067056
+1020.25641 , 4054.05 , 99.1816056
+1020.25641 , 4247.1 , 102.6565056
+1020.25641 , 4440.15 , 106.1314056
+1020.25641 , 4633.2 , 109.6063056
+1020.25641 , 4826.25 , 113.0812056
+1020.25641 , 5019.3 , 116.5561056
+1020.25641 , 5212.35 , 120.0310056
+1020.25641 , 5405.4 , 123.5059056
+1020.25641 , 5598.45 , 126.9808056
+1020.25641 , 5791.5 , 130.4557056
+1020.25641 , 5984.55 , 133.9306056
+1020.25641 , 6177.6 , 137.4055056
+1224.273504 , -6177.6 , 82.3413888
+1224.273504 , -5984.55 , 78.8664888
+1224.273504 , -5791.5 , 75.3915888
+1224.273504 , -5598.45 , 71.9166888
+1224.273504 , -5405.4 , 68.4417888
+1224.273504 , -5212.35 , 64.9668888
+1224.273504 , -5019.3 , 61.4919888
+1224.273504 , -4826.25 , 58.0170888
+1224.273504 , -4633.2 , 54.5421888
+1224.273504 , -4440.15 , 51.0672888
+1224.273504 , -4247.1 , 47.5923888
+1224.273504 , -4054.05 , 44.1174888
+1224.273504 , -3861 , 40.6425888
+1224.273504 , -3667.95 , 37.1676888
+1224.273504 , -3474.9 , 33.6927888
+1224.273504 , -3281.85 , 30.2178888
+1224.273504 , -3088.8 , 26.7429888
+1224.273504 , -2895.75 , 23.2680888
+1224.273504 , -2702.7 , 19.7931888
+1224.273504 , -2509.65 , 16.3182888
+1224.273504 , -2316.6 , 12.8433888
+1224.273504 , -2123.55 , 9.368488804
+1224.273504 , -1930.5 , 5.893588804
+1224.273504 , -1737.45 , 2.418688804
+1224.273504 , -1544.4 , 1.056211196
+1224.273504 , -1351.35 , 4.531111196
+1224.273504 , -1158.3 , 8.006011196
+1224.273504 , -965.25 , 11.4809112
+1224.273504 , -772.2 , 14.9558112
+1224.273504 , -579.15 , 18.4307112
+1224.273504 , -386.1 , 21.9056112
+1224.273504 , -193.05 , 25.3805112
+1224.273504 , 0 , 28.8554112
+1224.273504 , 193.05 , 32.3303112
+1224.273504 , 386.1 , 35.8052112
+1224.273504 , 579.15 , 39.2801112
+1224.273504 , 772.2 , 42.7550112
+1224.273504 , 965.25 , 46.2299112
+1224.273504 , 1158.3 , 49.7048112
+1224.273504 , 1351.35 , 53.1797112
+1224.273504 , 1544.4 , 56.6546112
+1224.273504 , 1737.45 , 60.1295112
+1224.273504 , 1930.5 , 63.6044112
+1224.273504 , 2123.55 , 67.0793112
+1224.273504 , 2316.6 , 70.5542112
+1224.273504 , 2509.65 , 74.0291112
+1224.273504 , 2702.7 , 77.5040112
+1224.273504 , 2895.75 , 80.9789112
+1224.273504 , 3088.8 , 84.4538112
+1224.273504 , 3281.85 , 87.9287112
+1224.273504 , 3474.9 , 91.4036112
+1224.273504 , 3667.95 , 94.8785112
+1224.273504 , 3861 , 98.3534112
+1224.273504 , 4054.05 , 101.8283112
+1224.273504 , 4247.1 , 105.3032112
+1224.273504 , 4440.15 , 108.7781112
+1224.273504 , 4633.2 , 112.2530112
+1224.273504 , 4826.25 , 115.7279112
+1224.273504 , 5019.3 , 119.2028112
+1224.273504 , 5212.35 , 122.6777112
+1224.273504 , 5405.4 , 126.1526112
+1224.273504 , 5598.45 , 129.6275112
+1224.273504 , 5791.5 , 133.1024112
+1224.273504 , 5984.55 , 136.5773112
+1224.273504 , 6177.6 , 140.0522112
+1428.290598 , -6177.6 , 79.6946832
+1428.290598 , -5984.55 , 76.2197832
+1428.290598 , -5791.5 , 72.7448832
+1428.290598 , -5598.45 , 69.2699832
+1428.290598 , -5405.4 , 65.7950832
+1428.290598 , -5212.35 , 62.3201832
+1428.290598 , -5019.3 , 58.8452832
+1428.290598 , -4826.25 , 55.3703832
+1428.290598 , -4633.2 , 51.8954832
+1428.290598 , -4440.15 , 48.4205832
+1428.290598 , -4247.1 , 44.9456832
+1428.290598 , -4054.05 , 41.4707832
+1428.290598 , -3861 , 37.9958832
+1428.290598 , -3667.95 , 34.5209832
+1428.290598 , -3474.9 , 31.0460832
+1428.290598 , -3281.85 , 27.5711832
+1428.290598 , -3088.8 , 24.0962832
+1428.290598 , -2895.75 , 20.6213832
+1428.290598 , -2702.7 , 17.1464832
+1428.290598 , -2509.65 , 13.6715832
+1428.290598 , -2316.6 , 10.1966832
+1428.290598 , -2123.55 , 6.721783204
+1428.290598 , -1930.5 , 3.246883204
+1428.290598 , -1737.45 , 0.228016796
+1428.290598 , -1544.4 , 3.702916796
+1428.290598 , -1351.35 , 7.177816796
+1428.290598 , -1158.3 , 10.6527168
+1428.290598 , -965.25 , 14.1276168
+1428.290598 , -772.2 , 17.6025168
+1428.290598 , -579.15 , 21.0774168
+1428.290598 , -386.1 , 24.5523168
+1428.290598 , -193.05 , 28.0272168
+1428.290598 , 0 , 31.5021168
+1428.290598 , 193.05 , 34.9770168
+1428.290598 , 386.1 , 38.4519168
+1428.290598 , 579.15 , 41.9268168
+1428.290598 , 772.2 , 45.4017168
+1428.290598 , 965.25 , 48.8766168
+1428.290598 , 1158.3 , 52.3515168
+1428.290598 , 1351.35 , 55.8264168
+1428.290598 , 1544.4 , 59.3013168
+1428.290598 , 1737.45 , 62.7762168
+1428.290598 , 1930.5 , 66.2511168
+1428.290598 , 2123.55 , 69.7260168
+1428.290598 , 2316.6 , 73.2009168
+1428.290598 , 2509.65 , 76.6758168
+1428.290598 , 2702.7 , 80.1507168
+1428.290598 , 2895.75 , 83.6256168
+1428.290598 , 3088.8 , 87.1005168
+1428.290598 , 3281.85 , 90.5754168
+1428.290598 , 3474.9 , 94.0503168
+1428.290598 , 3667.95 , 97.5252168
+1428.290598 , 3861 , 101.0001168
+1428.290598 , 4054.05 , 104.4750168
+1428.290598 , 4247.1 , 107.9499168
+1428.290598 , 4440.15 , 111.4248168
+1428.290598 , 4633.2 , 114.8997168
+1428.290598 , 4826.25 , 118.3746168
+1428.290598 , 5019.3 , 121.8495168
+1428.290598 , 5212.35 , 125.3244168
+1428.290598 , 5405.4 , 128.7993168
+1428.290598 , 5598.45 , 132.2742168
+1428.290598 , 5791.5 , 135.7491168
+1428.290598 , 5984.55 , 139.2240168
+1428.290598 , 6177.6 , 142.6989168
+1632.393162 , -6177.6 , 77.04686881
+1632.393162 , -5984.55 , 73.57196881
+1632.393162 , -5791.5 , 70.09706881
+1632.393162 , -5598.45 , 66.62216881
+1632.393162 , -5405.4 , 63.14726881
+1632.393162 , -5212.35 , 59.67236881
+1632.393162 , -5019.3 , 56.19746881
+1632.393162 , -4826.25 , 52.72256881
+1632.393162 , -4633.2 , 49.24766881
+1632.393162 , -4440.15 , 45.77276881
+1632.393162 , -4247.1 , 42.29786881
+1632.393162 , -4054.05 , 38.82296881
+1632.393162 , -3861 , 35.34806881
+1632.393162 , -3667.95 , 31.87316881
+1632.393162 , -3474.9 , 28.39826881
+1632.393162 , -3281.85 , 24.92336881
+1632.393162 , -3088.8 , 21.44846881
+1632.393162 , -2895.75 , 17.97356881
+1632.393162 , -2702.7 , 14.49866881
+1632.393162 , -2509.65 , 11.02376881
+1632.393162 , -2316.6 , 7.548868805
+1632.393162 , -2123.55 , 4.073968805
+1632.393162 , -1930.5 , 0.599068805
+1632.393162 , -1737.45 , 2.875831195
+1632.393162 , -1544.4 , 6.350731195
+1632.393162 , -1351.35 , 9.825631195
+1632.393162 , -1158.3 , 13.30053119
+1632.393162 , -965.25 , 16.77543119
+1632.393162 , -772.2 , 20.25033119
+1632.393162 , -579.15 , 23.72523119
+1632.393162 , -386.1 , 27.20013119
+1632.393162 , -193.05 , 30.67503119
+1632.393162 , 0 , 34.14993119
+1632.393162 , 193.05 , 37.62483119
+1632.393162 , 386.1 , 41.09973119
+1632.393162 , 579.15 , 44.57463119
+1632.393162 , 772.2 , 48.04953119
+1632.393162 , 965.25 , 51.52443119
+1632.393162 , 1158.3 , 54.99933119
+1632.393162 , 1351.35 , 58.47423119
+1632.393162 , 1544.4 , 61.94913119
+1632.393162 , 1737.45 , 65.42403119
+1632.393162 , 1930.5 , 68.89893119
+1632.393162 , 2123.55 , 72.37383119
+1632.393162 , 2316.6 , 75.84873119
+1632.393162 , 2509.65 , 79.32363119
+1632.393162 , 2702.7 , 82.79853119
+1632.393162 , 2895.75 , 86.27343119
+1632.393162 , 3088.8 , 89.74833119
+1632.393162 , 3281.85 , 93.22323119
+1632.393162 , 3474.9 , 96.69813119
+1632.393162 , 3667.95 , 100.1730312
+1632.393162 , 3861 , 103.6479312
+1632.393162 , 4054.05 , 107.1228312
+1632.393162 , 4247.1 , 110.5977312
+1632.393162 , 4440.15 , 114.0726312
+1632.393162 , 4633.2 , 117.5475312
+1632.393162 , 4826.25 , 121.0224312
+1632.393162 , 5019.3 , 124.4973312
+1632.393162 , 5212.35 , 127.9722312
+1632.393162 , 5405.4 , 131.4471312
+1632.393162 , 5598.45 , 134.9220312
+1632.393162 , 5791.5 , 138.3969312
+1632.393162 , 5984.55 , 141.8718312
+1632.393162 , 6177.6 , 145.3467312
+1836.410256 , -6177.6 , 74.40016321
+1836.410256 , -5984.55 , 70.92526321
+1836.410256 , -5791.5 , 67.45036321
+1836.410256 , -5598.45 , 63.97546321
+1836.410256 , -5405.4 , 60.50056321
+1836.410256 , -5212.35 , 57.02566321
+1836.410256 , -5019.3 , 53.55076321
+1836.410256 , -4826.25 , 50.07586321
+1836.410256 , -4633.2 , 46.60096321
+1836.410256 , -4440.15 , 43.12606321
+1836.410256 , -4247.1 , 39.65116321
+1836.410256 , -4054.05 , 36.17626321
+1836.410256 , -3861 , 32.70136321
+1836.410256 , -3667.95 , 29.22646321
+1836.410256 , -3474.9 , 25.75156321
+1836.410256 , -3281.85 , 22.27666321
+1836.410256 , -3088.8 , 18.80176321
+1836.410256 , -2895.75 , 15.32686321
+1836.410256 , -2702.7 , 11.85196321
+1836.410256 , -2509.65 , 8.377063205
+1836.410256 , -2316.6 , 4.902163205
+1836.410256 , -2123.55 , 1.427263205
+1836.410256 , -1930.5 , 2.047636795
+1836.410256 , -1737.45 , 5.522536795
+1836.410256 , -1544.4 , 8.997436795
+1836.410256 , -1351.35 , 12.47233679
+1836.410256 , -1158.3 , 15.94723679
+1836.410256 , -965.25 , 19.42213679
+1836.410256 , -772.2 , 22.89703679
+1836.410256 , -579.15 , 26.37193679
+1836.410256 , -386.1 , 29.84683679
+1836.410256 , -193.05 , 33.32173679
+1836.410256 , 0 , 36.79663679
+1836.410256 , 193.05 , 40.27153679
+1836.410256 , 386.1 , 43.74643679
+1836.410256 , 579.15 , 47.22133679
+1836.410256 , 772.2 , 50.69623679
+1836.410256 , 965.25 , 54.17113679
+1836.410256 , 1158.3 , 57.64603679
+1836.410256 , 1351.35 , 61.12093679
+1836.410256 , 1544.4 , 64.59583679
+1836.410256 , 1737.45 , 68.07073679
+1836.410256 , 1930.5 , 71.54563679
+1836.410256 , 2123.55 , 75.02053679
+1836.410256 , 2316.6 , 78.49543679
+1836.410256 , 2509.65 , 81.97033679
+1836.410256 , 2702.7 , 85.44523679
+1836.410256 , 2895.75 , 88.92013679
+1836.410256 , 3088.8 , 92.39503679
+1836.410256 , 3281.85 , 95.86993679
+1836.410256 , 3474.9 , 99.34483679
+1836.410256 , 3667.95 , 102.8197368
+1836.410256 , 3861 , 106.2946368
+1836.410256 , 4054.05 , 109.7695368
+1836.410256 , 4247.1 , 113.2444368
+1836.410256 , 4440.15 , 116.7193368
+1836.410256 , 4633.2 , 120.1942368
+1836.410256 , 4826.25 , 123.6691368
+1836.410256 , 5019.3 , 127.1440368
+1836.410256 , 5212.35 , 130.6189368
+1836.410256 , 5405.4 , 134.0938368
+1836.410256 , 5598.45 , 137.5687368
+1836.410256 , 5791.5 , 141.0436368
+1836.410256 , 5984.55 , 144.5185368
+1836.410256 , 6177.6 , 147.9934368
+2040.42735 , -6177.6 , 71.75345761
+2040.42735 , -5984.55 , 68.27855761
+2040.42735 , -5791.5 , 64.80365761
+2040.42735 , -5598.45 , 61.32875761
+2040.42735 , -5405.4 , 57.85385761
+2040.42735 , -5212.35 , 54.37895761
+2040.42735 , -5019.3 , 50.90405761
+2040.42735 , -4826.25 , 47.42915761
+2040.42735 , -4633.2 , 43.95425761
+2040.42735 , -4440.15 , 40.47935761
+2040.42735 , -4247.1 , 37.00445761
+2040.42735 , -4054.05 , 33.52955761
+2040.42735 , -3861 , 30.05465761
+2040.42735 , -3667.95 , 26.57975761
+2040.42735 , -3474.9 , 23.10485761
+2040.42735 , -3281.85 , 19.62995761
+2040.42735 , -3088.8 , 16.15505761
+2040.42735 , -2895.75 , 12.68015761
+2040.42735 , -2702.7 , 9.205257606
+2040.42735 , -2509.65 , 5.730357606
+2040.42735 , -2316.6 , 2.255457606
+2040.42735 , -2123.55 , 1.219442394
+2040.42735 , -1930.5 , 4.694342394
+2040.42735 , -1737.45 , 8.169242394
+2040.42735 , -1544.4 , 11.64414239
+2040.42735 , -1351.35 , 15.11904239
+2040.42735 , -1158.3 , 18.59394239
+2040.42735 , -965.25 , 22.06884239
+2040.42735 , -772.2 , 25.54374239
+2040.42735 , -579.15 , 29.01864239
+2040.42735 , -386.1 , 32.49354239
+2040.42735 , -193.05 , 35.96844239
+2040.42735 , 0 , 39.44334239
+2040.42735 , 193.05 , 42.91824239
+2040.42735 , 386.1 , 46.39314239
+2040.42735 , 579.15 , 49.86804239
+2040.42735 , 772.2 , 53.34294239
+2040.42735 , 965.25 , 56.81784239
+2040.42735 , 1158.3 , 60.29274239
+2040.42735 , 1351.35 , 63.76764239
+2040.42735 , 1544.4 , 67.24254239
+2040.42735 , 1737.45 , 70.71744239
+2040.42735 , 1930.5 , 74.19234239
+2040.42735 , 2123.55 , 77.66724239
+2040.42735 , 2316.6 , 81.14214239
+2040.42735 , 2509.65 , 84.61704239
+2040.42735 , 2702.7 , 88.09194239
+2040.42735 , 2895.75 , 91.56684239
+2040.42735 , 3088.8 , 95.04174239
+2040.42735 , 3281.85 , 98.51664239
+2040.42735 , 3474.9 , 101.9915424
+2040.42735 , 3667.95 , 105.4664424
+2040.42735 , 3861 , 108.9413424
+2040.42735 , 4054.05 , 112.4162424
+2040.42735 , 4247.1 , 115.8911424
+2040.42735 , 4440.15 , 119.3660424
+2040.42735 , 4633.2 , 122.8409424
+2040.42735 , 4826.25 , 126.3158424
+2040.42735 , 5019.3 , 129.7907424
+2040.42735 , 5212.35 , 133.2656424
+2040.42735 , 5405.4 , 136.7405424
+2040.42735 , 5598.45 , 140.2154424
+2040.42735 , 5791.5 , 143.6903424
+2040.42735 , 5984.55 , 147.1652424
+2040.42735 , 6177.6 , 150.6401424
+2244.529915 , -6177.6 , 69.10564319
+2244.529915 , -5984.55 , 65.63074319
+2244.529915 , -5791.5 , 62.15584319
+2244.529915 , -5598.45 , 58.68094319
+2244.529915 , -5405.4 , 55.20604319
+2244.529915 , -5212.35 , 51.73114319
+2244.529915 , -5019.3 , 48.25624319
+2244.529915 , -4826.25 , 44.78134319
+2244.529915 , -4633.2 , 41.30644319
+2244.529915 , -4440.15 , 37.83154319
+2244.529915 , -4247.1 , 34.35664319
+2244.529915 , -4054.05 , 30.88174319
+2244.529915 , -3861 , 27.40684319
+2244.529915 , -3667.95 , 23.93194319
+2244.529915 , -3474.9 , 20.45704319
+2244.529915 , -3281.85 , 16.98214319
+2244.529915 , -3088.8 , 13.50724319
+2244.529915 , -2895.75 , 10.03234319
+2244.529915 , -2702.7 , 6.557443194
+2244.529915 , -2509.65 , 3.082543194
+2244.529915 , -2316.6 , 0.392356806
+2244.529915 , -2123.55 , 3.867256806
+2244.529915 , -1930.5 , 7.342156806
+2244.529915 , -1737.45 , 10.81705681
+2244.529915 , -1544.4 , 14.29195681
+2244.529915 , -1351.35 , 17.76685681
+2244.529915 , -1158.3 , 21.24175681
+2244.529915 , -965.25 , 24.71665681
+2244.529915 , -772.2 , 28.19155681
+2244.529915 , -579.15 , 31.66645681
+2244.529915 , -386.1 , 35.14135681
+2244.529915 , -193.05 , 38.61625681
+2244.529915 , 0 , 42.09115681
+2244.529915 , 193.05 , 45.56605681
+2244.529915 , 386.1 , 49.04095681
+2244.529915 , 579.15 , 52.51585681
+2244.529915 , 772.2 , 55.99075681
+2244.529915 , 965.25 , 59.46565681
+2244.529915 , 1158.3 , 62.94055681
+2244.529915 , 1351.35 , 66.41545681
+2244.529915 , 1544.4 , 69.89035681
+2244.529915 , 1737.45 , 73.36525681
+2244.529915 , 1930.5 , 76.84015681
+2244.529915 , 2123.55 , 80.31505681
+2244.529915 , 2316.6 , 83.78995681
+2244.529915 , 2509.65 , 87.26485681
+2244.529915 , 2702.7 , 90.73975681
+2244.529915 , 2895.75 , 94.21465681
+2244.529915 , 3088.8 , 97.68955681
+2244.529915 , 3281.85 , 101.1644568
+2244.529915 , 3474.9 , 104.6393568
+2244.529915 , 3667.95 , 108.1142568
+2244.529915 , 3861 , 111.5891568
+2244.529915 , 4054.05 , 115.0640568
+2244.529915 , 4247.1 , 118.5389568
+2244.529915 , 4440.15 , 122.0138568
+2244.529915 , 4633.2 , 125.4887568
+2244.529915 , 4826.25 , 128.9636568
+2244.529915 , 5019.3 , 132.4385568
+2244.529915 , 5212.35 , 135.9134568
+2244.529915 , 5405.4 , 139.3883568
+2244.529915 , 5598.45 , 142.8632568
+2244.529915 , 5791.5 , 146.3381568
+2244.529915 , 5984.55 , 149.8130568
+2244.529915 , 6177.6 , 153.2879568
+2448.547009 , -6177.6 , 66.45893759
+2448.547009 , -5984.55 , 62.98403759
+2448.547009 , -5791.5 , 59.50913759
+2448.547009 , -5598.45 , 56.03423759
+2448.547009 , -5405.4 , 52.55933759
+2448.547009 , -5212.35 , 49.08443759
+2448.547009 , -5019.3 , 45.60953759
+2448.547009 , -4826.25 , 42.13463759
+2448.547009 , -4633.2 , 38.65973759
+2448.547009 , -4440.15 , 35.18483759
+2448.547009 , -4247.1 , 31.70993759
+2448.547009 , -4054.05 , 28.23503759
+2448.547009 , -3861 , 24.76013759
+2448.547009 , -3667.95 , 21.28523759
+2448.547009 , -3474.9 , 17.81033759
+2448.547009 , -3281.85 , 14.33543759
+2448.547009 , -3088.8 , 10.86053759
+2448.547009 , -2895.75 , 7.385637594
+2448.547009 , -2702.7 , 3.910737594
+2448.547009 , -2509.65 , 0.435837594
+2448.547009 , -2316.6 , 3.039062406
+2448.547009 , -2123.55 , 6.513962406
+2448.547009 , -1930.5 , 9.988862406
+2448.547009 , -1737.45 , 13.46376241
+2448.547009 , -1544.4 , 16.93866241
+2448.547009 , -1351.35 , 20.41356241
+2448.547009 , -1158.3 , 23.88846241
+2448.547009 , -965.25 , 27.36336241
+2448.547009 , -772.2 , 30.83826241
+2448.547009 , -579.15 , 34.31316241
+2448.547009 , -386.1 , 37.78806241
+2448.547009 , -193.05 , 41.26296241
+2448.547009 , 0 , 44.73786241
+2448.547009 , 193.05 , 48.21276241
+2448.547009 , 386.1 , 51.68766241
+2448.547009 , 579.15 , 55.16256241
+2448.547009 , 772.2 , 58.63746241
+2448.547009 , 965.25 , 62.11236241
+2448.547009 , 1158.3 , 65.58726241
+2448.547009 , 1351.35 , 69.06216241
+2448.547009 , 1544.4 , 72.53706241
+2448.547009 , 1737.45 , 76.01196241
+2448.547009 , 1930.5 , 79.48686241
+2448.547009 , 2123.55 , 82.96176241
+2448.547009 , 2316.6 , 86.43666241
+2448.547009 , 2509.65 , 89.91156241
+2448.547009 , 2702.7 , 93.38646241
+2448.547009 , 2895.75 , 96.86136241
+2448.547009 , 3088.8 , 100.3362624
+2448.547009 , 3281.85 , 103.8111624
+2448.547009 , 3474.9 , 107.2860624
+2448.547009 , 3667.95 , 110.7609624
+2448.547009 , 3861 , 114.2358624
+2448.547009 , 4054.05 , 117.7107624
+2448.547009 , 4247.1 , 121.1856624
+2448.547009 , 4440.15 , 124.6605624
+2448.547009 , 4633.2 , 128.1354624
+2448.547009 , 4826.25 , 131.6103624
+2448.547009 , 5019.3 , 135.0852624
+2448.547009 , 5212.35 , 138.5601624
+2448.547009 , 5405.4 , 142.0350624
+2448.547009 , 5598.45 , 145.5099624
+2448.547009 , 5791.5 , 148.9848624
+2448.547009 , 5984.55 , 152.4597624
+2448.547009 , 6177.6 , 155.9346624
+2652.564103 , -6177.6 , 63.81223199
+2652.564103 , -5984.55 , 60.33733199
+2652.564103 , -5791.5 , 56.86243199
+2652.564103 , -5598.45 , 53.38753199
+2652.564103 , -5405.4 , 49.91263199
+2652.564103 , -5212.35 , 46.43773199
+2652.564103 , -5019.3 , 42.96283199
+2652.564103 , -4826.25 , 39.48793199
+2652.564103 , -4633.2 , 36.01303199
+2652.564103 , -4440.15 , 32.53813199
+2652.564103 , -4247.1 , 29.06323199
+2652.564103 , -4054.05 , 25.58833199
+2652.564103 , -3861 , 22.11343199
+2652.564103 , -3667.95 , 18.63853199
+2652.564103 , -3474.9 , 15.16363199
+2652.564103 , -3281.85 , 11.68873199
+2652.564103 , -3088.8 , 8.213831994
+2652.564103 , -2895.75 , 4.738931994
+2652.564103 , -2702.7 , 1.264031994
+2652.564103 , -2509.65 , 2.210868006
+2652.564103 , -2316.6 , 5.685768006
+2652.564103 , -2123.55 , 9.160668006
+2652.564103 , -1930.5 , 12.63556801
+2652.564103 , -1737.45 , 16.11046801
+2652.564103 , -1544.4 , 19.58536801
+2652.564103 , -1351.35 , 23.06026801
+2652.564103 , -1158.3 , 26.53516801
+2652.564103 , -965.25 , 30.01006801
+2652.564103 , -772.2 , 33.48496801
+2652.564103 , -579.15 , 36.95986801
+2652.564103 , -386.1 , 40.43476801
+2652.564103 , -193.05 , 43.90966801
+2652.564103 , 0 , 47.38456801
+2652.564103 , 193.05 , 50.85946801
+2652.564103 , 386.1 , 54.33436801
+2652.564103 , 579.15 , 57.80926801
+2652.564103 , 772.2 , 61.28416801
+2652.564103 , 965.25 , 64.75906801
+2652.564103 , 1158.3 , 68.23396801
+2652.564103 , 1351.35 , 71.70886801
+2652.564103 , 1544.4 , 75.18376801
+2652.564103 , 1737.45 , 78.65866801
+2652.564103 , 1930.5 , 82.13356801
+2652.564103 , 2123.55 , 85.60846801
+2652.564103 , 2316.6 , 89.08336801
+2652.564103 , 2509.65 , 92.55826801
+2652.564103 , 2702.7 , 96.03316801
+2652.564103 , 2895.75 , 99.50806801
+2652.564103 , 3088.8 , 102.982968
+2652.564103 , 3281.85 , 106.457868
+2652.564103 , 3474.9 , 109.932768
+2652.564103 , 3667.95 , 113.407668
+2652.564103 , 3861 , 116.882568
+2652.564103 , 4054.05 , 120.357468
+2652.564103 , 4247.1 , 123.832368
+2652.564103 , 4440.15 , 127.307268
+2652.564103 , 4633.2 , 130.782168
+2652.564103 , 4826.25 , 134.257068
+2652.564103 , 5019.3 , 137.731968
+2652.564103 , 5212.35 , 141.206868
+2652.564103 , 5405.4 , 144.681768
+2652.564103 , 5598.45 , 148.156668
+2652.564103 , 5791.5 , 151.631568
+2652.564103 , 5984.55 , 155.106468
+2652.564103 , 6177.6 , 158.581368
+2856.666667 , -6177.6 , 61.1644176
+2856.666667 , -5984.55 , 57.6895176
+2856.666667 , -5791.5 , 54.2146176
+2856.666667 , -5598.45 , 50.7397176
+2856.666667 , -5405.4 , 47.2648176
+2856.666667 , -5212.35 , 43.7899176
+2856.666667 , -5019.3 , 40.3150176
+2856.666667 , -4826.25 , 36.8401176
+2856.666667 , -4633.2 , 33.3652176
+2856.666667 , -4440.15 , 29.8903176
+2856.666667 , -4247.1 , 26.4154176
+2856.666667 , -4054.05 , 22.9405176
+2856.666667 , -3861 , 19.4656176
+2856.666667 , -3667.95 , 15.9907176
+2856.666667 , -3474.9 , 12.5158176
+2856.666667 , -3281.85 , 9.040917596
+2856.666667 , -3088.8 , 5.566017596
+2856.666667 , -2895.75 , 2.091117596
+2856.666667 , -2702.7 , 1.383782404
+2856.666667 , -2509.65 , 4.858682404
+2856.666667 , -2316.6 , 8.333582404
+2856.666667 , -2123.55 , 11.8084824
+2856.666667 , -1930.5 , 15.2833824
+2856.666667 , -1737.45 , 18.7582824
+2856.666667 , -1544.4 , 22.2331824
+2856.666667 , -1351.35 , 25.7080824
+2856.666667 , -1158.3 , 29.1829824
+2856.666667 , -965.25 , 32.6578824
+2856.666667 , -772.2 , 36.1327824
+2856.666667 , -579.15 , 39.6076824
+2856.666667 , -386.1 , 43.0825824
+2856.666667 , -193.05 , 46.5574824
+2856.666667 , 0 , 50.0323824
+2856.666667 , 193.05 , 53.5072824
+2856.666667 , 386.1 , 56.9821824
+2856.666667 , 579.15 , 60.4570824
+2856.666667 , 772.2 , 63.9319824
+2856.666667 , 965.25 , 67.4068824
+2856.666667 , 1158.3 , 70.8817824
+2856.666667 , 1351.35 , 74.3566824
+2856.666667 , 1544.4 , 77.8315824
+2856.666667 , 1737.45 , 81.3064824
+2856.666667 , 1930.5 , 84.7813824
+2856.666667 , 2123.55 , 88.2562824
+2856.666667 , 2316.6 , 91.7311824
+2856.666667 , 2509.65 , 95.2060824
+2856.666667 , 2702.7 , 98.6809824
+2856.666667 , 2895.75 , 102.1558824
+2856.666667 , 3088.8 , 105.6307824
+2856.666667 , 3281.85 , 109.1056824
+2856.666667 , 3474.9 , 112.5805824
+2856.666667 , 3667.95 , 116.0554824
+2856.666667 , 3861 , 119.5303824
+2856.666667 , 4054.05 , 123.0052824
+2856.666667 , 4247.1 , 126.4801824
+2856.666667 , 4440.15 , 129.9550824
+2856.666667 , 4633.2 , 133.4299824
+2856.666667 , 4826.25 , 136.9048824
+2856.666667 , 5019.3 , 140.3797824
+2856.666667 , 5212.35 , 143.8546824
+2856.666667 , 5405.4 , 147.3295824
+2856.666667 , 5598.45 , 150.8044824
+2856.666667 , 5791.5 , 154.2793824
+2856.666667 , 5984.55 , 157.7542824
+2856.666667 , 6177.6 , 161.2291824
+3060.683761 , -6177.6 , 58.517712
+3060.683761 , -5984.55 , 55.042812
+3060.683761 , -5791.5 , 51.567912
+3060.683761 , -5598.45 , 48.093012
+3060.683761 , -5405.4 , 44.618112
+3060.683761 , -5212.35 , 41.143212
+3060.683761 , -5019.3 , 37.668312
+3060.683761 , -4826.25 , 34.193412
+3060.683761 , -4633.2 , 30.718512
+3060.683761 , -4440.15 , 27.243612
+3060.683761 , -4247.1 , 23.768712
+3060.683761 , -4054.05 , 20.293812
+3060.683761 , -3861 , 16.818912
+3060.683761 , -3667.95 , 13.344012
+3060.683761 , -3474.9 , 9.869111996
+3060.683761 , -3281.85 , 6.394211996
+3060.683761 , -3088.8 , 2.919311996
+3060.683761 , -2895.75 , 0.555588004
+3060.683761 , -2702.7 , 4.030488004
+3060.683761 , -2509.65 , 7.505388004
+3060.683761 , -2316.6 , 10.980288
+3060.683761 , -2123.55 , 14.455188
+3060.683761 , -1930.5 , 17.930088
+3060.683761 , -1737.45 , 21.404988
+3060.683761 , -1544.4 , 24.879888
+3060.683761 , -1351.35 , 28.354788
+3060.683761 , -1158.3 , 31.829688
+3060.683761 , -965.25 , 35.304588
+3060.683761 , -772.2 , 38.779488
+3060.683761 , -579.15 , 42.254388
+3060.683761 , -386.1 , 45.729288
+3060.683761 , -193.05 , 49.204188
+3060.683761 , 0 , 52.679088
+3060.683761 , 193.05 , 56.153988
+3060.683761 , 386.1 , 59.628888
+3060.683761 , 579.15 , 63.103788
+3060.683761 , 772.2 , 66.578688
+3060.683761 , 965.25 , 70.053588
+3060.683761 , 1158.3 , 73.528488
+3060.683761 , 1351.35 , 77.003388
+3060.683761 , 1544.4 , 80.478288
+3060.683761 , 1737.45 , 83.953188
+3060.683761 , 1930.5 , 87.428088
+3060.683761 , 2123.55 , 90.902988
+3060.683761 , 2316.6 , 94.377888
+3060.683761 , 2509.65 , 97.852788
+3060.683761 , 2702.7 , 101.327688
+3060.683761 , 2895.75 , 104.802588
+3060.683761 , 3088.8 , 108.277488
+3060.683761 , 3281.85 , 111.752388
+3060.683761 , 3474.9 , 115.227288
+3060.683761 , 3667.95 , 118.702188
+3060.683761 , 3861 , 122.177088
+3060.683761 , 4054.05 , 125.651988
+3060.683761 , 4247.1 , 129.126888
+3060.683761 , 4440.15 , 132.601788
+3060.683761 , 4633.2 , 136.076688
+3060.683761 , 4826.25 , 139.551588
+3060.683761 , 5019.3 , 143.026488
+3060.683761 , 5212.35 , 146.501388
+3060.683761 , 5405.4 , 149.976288
+3060.683761 , 5598.45 , 153.451188
+3060.683761 , 5791.5 , 156.926088
+3060.683761 , 5984.55 , 160.400988
+3060.683761 , 6177.6 , 163.875888
+3264.700855 , -6177.6 , 55.8710064
+3264.700855 , -5984.55 , 52.3961064
+3264.700855 , -5791.5 , 48.9212064
+3264.700855 , -5598.45 , 45.4463064
+3264.700855 , -5405.4 , 41.9714064
+3264.700855 , -5212.35 , 38.4965064
+3264.700855 , -5019.3 , 35.0216064
+3264.700855 , -4826.25 , 31.5467064
+3264.700855 , -4633.2 , 28.0718064
+3264.700855 , -4440.15 , 24.5969064
+3264.700855 , -4247.1 , 21.1220064
+3264.700855 , -4054.05 , 17.6471064
+3264.700855 , -3861 , 14.1722064
+3264.700855 , -3667.95 , 10.6973064
+3264.700855 , -3474.9 , 7.222406396
+3264.700855 , -3281.85 , 3.747506396
+3264.700855 , -3088.8 , 0.272606396
+3264.700855 , -2895.75 , 3.202293604
+3264.700855 , -2702.7 , 6.677193604
+3264.700855 , -2509.65 , 10.1520936
+3264.700855 , -2316.6 , 13.6269936
+3264.700855 , -2123.55 , 17.1018936
+3264.700855 , -1930.5 , 20.5767936
+3264.700855 , -1737.45 , 24.0516936
+3264.700855 , -1544.4 , 27.5265936
+3264.700855 , -1351.35 , 31.0014936
+3264.700855 , -1158.3 , 34.4763936
+3264.700855 , -965.25 , 37.9512936
+3264.700855 , -772.2 , 41.4261936
+3264.700855 , -579.15 , 44.9010936
+3264.700855 , -386.1 , 48.3759936
+3264.700855 , -193.05 , 51.8508936
+3264.700855 , 0 , 55.3257936
+3264.700855 , 193.05 , 58.8006936
+3264.700855 , 386.1 , 62.2755936
+3264.700855 , 579.15 , 65.7504936
+3264.700855 , 772.2 , 69.2253936
+3264.700855 , 965.25 , 72.7002936
+3264.700855 , 1158.3 , 76.1751936
+3264.700855 , 1351.35 , 79.6500936
+3264.700855 , 1544.4 , 83.1249936
+3264.700855 , 1737.45 , 86.5998936
+3264.700855 , 1930.5 , 90.0747936
+3264.700855 , 2123.55 , 93.5496936
+3264.700855 , 2316.6 , 97.0245936
+3264.700855 , 2509.65 , 100.4994936
+3264.700855 , 2702.7 , 103.9743936
+3264.700855 , 2895.75 , 107.4492936
+3264.700855 , 3088.8 , 110.9241936
+3264.700855 , 3281.85 , 114.3990936
+3264.700855 , 3474.9 , 117.8739936
+3264.700855 , 3667.95 , 121.3488936
+3264.700855 , 3861 , 124.8237936
+3264.700855 , 4054.05 , 128.2986936
+3264.700855 , 4247.1 , 131.7735936
+3264.700855 , 4440.15 , 135.2484936
+3264.700855 , 4633.2 , 138.7233936
+3264.700855 , 4826.25 , 142.1982936
+3264.700855 , 5019.3 , 145.6731936
+3264.700855 , 5212.35 , 149.1480936
+3264.700855 , 5405.4 , 152.6229936
+3264.700855 , 5598.45 , 156.0978936
+3264.700855 , 5791.5 , 159.5727936
+3264.700855 , 5984.55 , 163.0476936
+3264.700855 , 6177.6 , 166.5225936
+3468.803419 , -6177.6 , 53.223192
+3468.803419 , -5984.55 , 49.748292
+3468.803419 , -5791.5 , 46.273392
+3468.803419 , -5598.45 , 42.798492
+3468.803419 , -5405.4 , 39.323592
+3468.803419 , -5212.35 , 35.848692
+3468.803419 , -5019.3 , 32.373792
+3468.803419 , -4826.25 , 28.898892
+3468.803419 , -4633.2 , 25.423992
+3468.803419 , -4440.15 , 21.949092
+3468.803419 , -4247.1 , 18.474192
+3468.803419 , -4054.05 , 14.999292
+3468.803419 , -3861 , 11.524392
+3468.803419 , -3667.95 , 8.049491997
+3468.803419 , -3474.9 , 4.574591997
+3468.803419 , -3281.85 , 1.099691997
+3468.803419 , -3088.8 , 2.375208003
+3468.803419 , -2895.75 , 5.850108003
+3468.803419 , -2702.7 , 9.325008003
+3468.803419 , -2509.65 , 12.799908
+3468.803419 , -2316.6 , 16.274808
+3468.803419 , -2123.55 , 19.749708
+3468.803419 , -1930.5 , 23.224608
+3468.803419 , -1737.45 , 26.699508
+3468.803419 , -1544.4 , 30.174408
+3468.803419 , -1351.35 , 33.649308
+3468.803419 , -1158.3 , 37.124208
+3468.803419 , -965.25 , 40.599108
+3468.803419 , -772.2 , 44.074008
+3468.803419 , -579.15 , 47.548908
+3468.803419 , -386.1 , 51.023808
+3468.803419 , -193.05 , 54.498708
+3468.803419 , 0 , 57.973608
+3468.803419 , 193.05 , 61.448508
+3468.803419 , 386.1 , 64.923408
+3468.803419 , 579.15 , 68.398308
+3468.803419 , 772.2 , 71.873208
+3468.803419 , 965.25 , 75.348108
+3468.803419 , 1158.3 , 78.823008
+3468.803419 , 1351.35 , 82.297908
+3468.803419 , 1544.4 , 85.772808
+3468.803419 , 1737.45 , 89.247708
+3468.803419 , 1930.5 , 92.722608
+3468.803419 , 2123.55 , 96.197508
+3468.803419 , 2316.6 , 99.672408
+3468.803419 , 2509.65 , 103.147308
+3468.803419 , 2702.7 , 106.622208
+3468.803419 , 2895.75 , 110.097108
+3468.803419 , 3088.8 , 113.572008
+3468.803419 , 3281.85 , 117.046908
+3468.803419 , 3474.9 , 120.521808
+3468.803419 , 3667.95 , 123.996708
+3468.803419 , 3861 , 127.471608
+3468.803419 , 4054.05 , 130.946508
+3468.803419 , 4247.1 , 134.421408
+3468.803419 , 4440.15 , 137.896308
+3468.803419 , 4633.2 , 141.371208
+3468.803419 , 4826.25 , 144.846108
+3468.803419 , 5019.3 , 148.321008
+3468.803419 , 5212.35 , 151.795908
+3468.803419 , 5405.4 , 155.270808
+3468.803419 , 5598.45 , 158.745708
+3468.803419 , 5791.5 , 162.220608
+3468.803419 , 5984.55 , 165.695508
+3468.803419 , 6177.6 , 169.170408
+3672.820513 , -6177.6 , 50.5764864
+3672.820513 , -5984.55 , 47.1015864
+3672.820513 , -5791.5 , 43.6266864
+3672.820513 , -5598.45 , 40.1517864
+3672.820513 , -5405.4 , 36.6768864
+3672.820513 , -5212.35 , 33.2019864
+3672.820513 , -5019.3 , 29.7270864
+3672.820513 , -4826.25 , 26.2521864
+3672.820513 , -4633.2 , 22.7772864
+3672.820513 , -4440.15 , 19.3023864
+3672.820513 , -4247.1 , 15.8274864
+3672.820513 , -4054.05 , 12.3525864
+3672.820513 , -3861 , 8.877686398
+3672.820513 , -3667.95 , 5.402786398
+3672.820513 , -3474.9 , 1.927886398
+3672.820513 , -3281.85 , 1.547013602
+3672.820513 , -3088.8 , 5.021913602
+3672.820513 , -2895.75 , 8.496813602
+3672.820513 , -2702.7 , 11.9717136
+3672.820513 , -2509.65 , 15.4466136
+3672.820513 , -2316.6 , 18.9215136
+3672.820513 , -2123.55 , 22.3964136
+3672.820513 , -1930.5 , 25.8713136
+3672.820513 , -1737.45 , 29.3462136
+3672.820513 , -1544.4 , 32.8211136
+3672.820513 , -1351.35 , 36.2960136
+3672.820513 , -1158.3 , 39.7709136
+3672.820513 , -965.25 , 43.2458136
+3672.820513 , -772.2 , 46.7207136
+3672.820513 , -579.15 , 50.1956136
+3672.820513 , -386.1 , 53.6705136
+3672.820513 , -193.05 , 57.1454136
+3672.820513 , 0 , 60.6203136
+3672.820513 , 193.05 , 64.0952136
+3672.820513 , 386.1 , 67.5701136
+3672.820513 , 579.15 , 71.0450136
+3672.820513 , 772.2 , 74.5199136
+3672.820513 , 965.25 , 77.9948136
+3672.820513 , 1158.3 , 81.4697136
+3672.820513 , 1351.35 , 84.9446136
+3672.820513 , 1544.4 , 88.4195136
+3672.820513 , 1737.45 , 91.8944136
+3672.820513 , 1930.5 , 95.3693136
+3672.820513 , 2123.55 , 98.8442136
+3672.820513 , 2316.6 , 102.3191136
+3672.820513 , 2509.65 , 105.7940136
+3672.820513 , 2702.7 , 109.2689136
+3672.820513 , 2895.75 , 112.7438136
+3672.820513 , 3088.8 , 116.2187136
+3672.820513 , 3281.85 , 119.6936136
+3672.820513 , 3474.9 , 123.1685136
+3672.820513 , 3667.95 , 126.6434136
+3672.820513 , 3861 , 130.1183136
+3672.820513 , 4054.05 , 133.5932136
+3672.820513 , 4247.1 , 137.0681136
+3672.820513 , 4440.15 , 140.5430136
+3672.820513 , 4633.2 , 144.0179136
+3672.820513 , 4826.25 , 147.4928136
+3672.820513 , 5019.3 , 150.9677136
+3672.820513 , 5212.35 , 154.4426136
+3672.820513 , 5405.4 , 157.9175136
+3672.820513 , 5598.45 , 161.3924136
+3672.820513 , 5791.5 , 164.8673136
+3672.820513 , 5984.55 , 168.3422136
+3672.820513 , 6177.6 , 171.8171136
+3876.837607 , -6177.6 , 47.9297808
+3876.837607 , -5984.55 , 44.4548808
+3876.837607 , -5791.5 , 40.9799808
+3876.837607 , -5598.45 , 37.5050808
+3876.837607 , -5405.4 , 34.0301808
+3876.837607 , -5212.35 , 30.5552808
+3876.837607 , -5019.3 , 27.0803808
+3876.837607 , -4826.25 , 23.6054808
+3876.837607 , -4633.2 , 20.1305808
+3876.837607 , -4440.15 , 16.6556808
+3876.837607 , -4247.1 , 13.1807808
+3876.837607 , -4054.05 , 9.705880798
+3876.837607 , -3861 , 6.230980798
+3876.837607 , -3667.95 , 2.756080798
+3876.837607 , -3474.9 , 0.718819202
+3876.837607 , -3281.85 , 4.193719202
+3876.837607 , -3088.8 , 7.668619202
+3876.837607 , -2895.75 , 11.1435192
+3876.837607 , -2702.7 , 14.6184192
+3876.837607 , -2509.65 , 18.0933192
+3876.837607 , -2316.6 , 21.5682192
+3876.837607 , -2123.55 , 25.0431192
+3876.837607 , -1930.5 , 28.5180192
+3876.837607 , -1737.45 , 31.9929192
+3876.837607 , -1544.4 , 35.4678192
+3876.837607 , -1351.35 , 38.9427192
+3876.837607 , -1158.3 , 42.4176192
+3876.837607 , -965.25 , 45.8925192
+3876.837607 , -772.2 , 49.3674192
+3876.837607 , -579.15 , 52.8423192
+3876.837607 , -386.1 , 56.3172192
+3876.837607 , -193.05 , 59.7921192
+3876.837607 , 0 , 63.2670192
+3876.837607 , 193.05 , 66.7419192
+3876.837607 , 386.1 , 70.2168192
+3876.837607 , 579.15 , 73.6917192
+3876.837607 , 772.2 , 77.1666192
+3876.837607 , 965.25 , 80.6415192
+3876.837607 , 1158.3 , 84.1164192
+3876.837607 , 1351.35 , 87.5913192
+3876.837607 , 1544.4 , 91.0662192
+3876.837607 , 1737.45 , 94.5411192
+3876.837607 , 1930.5 , 98.0160192
+3876.837607 , 2123.55 , 101.4909192
+3876.837607 , 2316.6 , 104.9658192
+3876.837607 , 2509.65 , 108.4407192
+3876.837607 , 2702.7 , 111.9156192
+3876.837607 , 2895.75 , 115.3905192
+3876.837607 , 3088.8 , 118.8654192
+3876.837607 , 3281.85 , 122.3403192
+3876.837607 , 3474.9 , 125.8152192
+3876.837607 , 3667.95 , 129.2901192
+3876.837607 , 3861 , 132.7650192
+3876.837607 , 4054.05 , 136.2399192
+3876.837607 , 4247.1 , 139.7148192
+3876.837607 , 4440.15 , 143.1897192
+3876.837607 , 4633.2 , 146.6646192
+3876.837607 , 4826.25 , 150.1395192
+3876.837607 , 5019.3 , 153.6144192
+3876.837607 , 5212.35 , 157.0893192
+3876.837607 , 5405.4 , 160.5642192
+3876.837607 , 5598.45 , 164.0391192
+3876.837607 , 5791.5 , 167.5140192
+3876.837607 , 5984.55 , 170.9889192
+3876.837607 , 6177.6 , 174.4638192
+4080.854701 , -6177.6 , 45.2830752
+4080.854701 , -5984.55 , 41.8081752
+4080.854701 , -5791.5 , 38.3332752
+4080.854701 , -5598.45 , 34.8583752
+4080.854701 , -5405.4 , 31.3834752
+4080.854701 , -5212.35 , 27.9085752
+4080.854701 , -5019.3 , 24.4336752
+4080.854701 , -4826.25 , 20.9587752
+4080.854701 , -4633.2 , 17.4838752
+4080.854701 , -4440.15 , 14.0089752
+4080.854701 , -4247.1 , 10.5340752
+4080.854701 , -4054.05 , 7.059175198
+4080.854701 , -3861 , 3.584275198
+4080.854701 , -3667.95 , 0.109375198
+4080.854701 , -3474.9 , 3.365524802
+4080.854701 , -3281.85 , 6.840424802
+4080.854701 , -3088.8 , 10.3153248
+4080.854701 , -2895.75 , 13.7902248
+4080.854701 , -2702.7 , 17.2651248
+4080.854701 , -2509.65 , 20.7400248
+4080.854701 , -2316.6 , 24.2149248
+4080.854701 , -2123.55 , 27.6898248
+4080.854701 , -1930.5 , 31.1647248
+4080.854701 , -1737.45 , 34.6396248
+4080.854701 , -1544.4 , 38.1145248
+4080.854701 , -1351.35 , 41.5894248
+4080.854701 , -1158.3 , 45.0643248
+4080.854701 , -965.25 , 48.5392248
+4080.854701 , -772.2 , 52.0141248
+4080.854701 , -579.15 , 55.4890248
+4080.854701 , -386.1 , 58.9639248
+4080.854701 , -193.05 , 62.4388248
+4080.854701 , 0 , 65.9137248
+4080.854701 , 193.05 , 69.3886248
+4080.854701 , 386.1 , 72.8635248
+4080.854701 , 579.15 , 76.3384248
+4080.854701 , 772.2 , 79.8133248
+4080.854701 , 965.25 , 83.2882248
+4080.854701 , 1158.3 , 86.7631248
+4080.854701 , 1351.35 , 90.2380248
+4080.854701 , 1544.4 , 93.7129248
+4080.854701 , 1737.45 , 97.1878248
+4080.854701 , 1930.5 , 100.6627248
+4080.854701 , 2123.55 , 104.1376248
+4080.854701 , 2316.6 , 107.6125248
+4080.854701 , 2509.65 , 111.0874248
+4080.854701 , 2702.7 , 114.5623248
+4080.854701 , 2895.75 , 118.0372248
+4080.854701 , 3088.8 , 121.5121248
+4080.854701 , 3281.85 , 124.9870248
+4080.854701 , 3474.9 , 128.4619248
+4080.854701 , 3667.95 , 131.9368248
+4080.854701 , 3861 , 135.4117248
+4080.854701 , 4054.05 , 138.8866248
+4080.854701 , 4247.1 , 142.3615248
+4080.854701 , 4440.15 , 145.8364248
+4080.854701 , 4633.2 , 149.3113248
+4080.854701 , 4826.25 , 152.7862248
+4080.854701 , 5019.3 , 156.2611248
+4080.854701 , 5212.35 , 159.7360248
+4080.854701 , 5405.4 , 163.2109248
+4080.854701 , 5598.45 , 166.6858248
+4080.854701 , 5791.5 , 170.1607248
+4080.854701 , 5984.55 , 173.6356248
+4080.854701 , 6177.6 , 177.1105248
+4268.632479 , -6177.6 , 42.8470416
+4268.632479 , -5984.55 , 39.3721416
+4268.632479 , -5791.5 , 35.8972416
+4268.632479 , -5598.45 , 32.4223416
+4268.632479 , -5405.4 , 28.9474416
+4268.632479 , -5212.35 , 25.4725416
+4268.632479 , -5019.3 , 21.9976416
+4268.632479 , -4826.25 , 18.5227416
+4268.632479 , -4633.2 , 15.0478416
+4268.632479 , -4440.15 , 11.5729416
+4268.632479 , -4247.1 , 8.098041595
+4268.632479 , -4054.05 , 4.623141595
+4268.632479 , -3861 , 1.148241595
+4268.632479 , -3667.95 , 2.326658405
+4268.632479 , -3474.9 , 5.801558405
+4268.632479 , -3281.85 , 9.276458405
+4268.632479 , -3088.8 , 12.7513584
+4268.632479 , -2895.75 , 16.2262584
+4268.632479 , -2702.7 , 19.7011584
+4268.632479 , -2509.65 , 23.1760584
+4268.632479 , -2316.6 , 26.6509584
+4268.632479 , -2123.55 , 30.1258584
+4268.632479 , -1930.5 , 33.6007584
+4268.632479 , -1737.45 , 37.0756584
+4268.632479 , -1544.4 , 40.5505584
+4268.632479 , -1351.35 , 44.0254584
+4268.632479 , -1158.3 , 47.5003584
+4268.632479 , -965.25 , 50.9752584
+4268.632479 , -772.2 , 54.4501584
+4268.632479 , -579.15 , 57.9250584
+4268.632479 , -386.1 , 61.3999584
+4268.632479 , -193.05 , 64.8748584
+4268.632479 , 0 , 68.3497584
+4268.632479 , 193.05 , 71.8246584
+4268.632479 , 386.1 , 75.2995584
+4268.632479 , 579.15 , 78.7744584
+4268.632479 , 772.2 , 82.2493584
+4268.632479 , 965.25 , 85.7242584
+4268.632479 , 1158.3 , 89.1991584
+4268.632479 , 1351.35 , 92.6740584
+4268.632479 , 1544.4 , 96.1489584
+4268.632479 , 1737.45 , 99.6238584
+4268.632479 , 1930.5 , 103.0987584
+4268.632479 , 2123.55 , 106.5736584
+4268.632479 , 2316.6 , 110.0485584
+4268.632479 , 2509.65 , 113.5234584
+4268.632479 , 2702.7 , 116.9983584
+4268.632479 , 2895.75 , 120.4732584
+4268.632479 , 3088.8 , 123.9481584
+4268.632479 , 3281.85 , 127.4230584
+4268.632479 , 3474.9 , 130.8979584
+4268.632479 , 3667.95 , 134.3728584
+4268.632479 , 3861 , 137.8477584
+4268.632479 , 4054.05 , 141.3226584
+4268.632479 , 4247.1 , 144.7975584
+4268.632479 , 4440.15 , 148.2724584
+4268.632479 , 4633.2 , 151.7473584
+4268.632479 , 4826.25 , 155.2222584
+4268.632479 , 5019.3 , 158.6971584
+4268.632479 , 5212.35 , 162.1720584
+4268.632479 , 5405.4 , 165.6469584
+4268.632479 , 5598.45 , 169.1218584
+4268.632479 , 5791.5 , 172.5967584
+4268.632479 , 5984.55 , 176.0716584
+4268.632479 , 6177.6 , 179.5465584
+5000 , -6177.6 , 33.35904
+5000 , -5984.55 , 29.88414
+5000 , -5791.5 , 26.40924
+5000 , -5598.45 , 22.93434
+5000 , -5405.4 , 19.45944
+5000 , -5212.35 , 15.98454
+5000 , -5019.3 , 12.50964
+5000 , -4826.25 , 9.03474
+5000 , -4633.2 , 5.55984
+5000 , -4440.15 , 2.08494
+5000 , -4247.1 , 1.38996
+5000 , -4054.05 , 4.86486
+5000 , -3861 , 8.33976
+5000 , -3667.95 , 11.81466
+5000 , -3474.9 , 15.28956
+5000 , -3281.85 , 18.76446
+5000 , -3088.8 , 22.23936
+5000 , -2895.75 , 25.71426
+5000 , -2702.7 , 29.18916
+5000 , -2509.65 , 32.66406
+5000 , -2316.6 , 36.13896
+5000 , -2123.55 , 39.61386
+5000 , -1930.5 , 43.08876
+5000 , -1737.45 , 46.56366
+5000 , -1544.4 , 50.03856
+5000 , -1351.35 , 53.51346
+5000 , -1158.3 , 56.98836
+5000 , -965.25 , 60.46326
+5000 , -772.2 , 63.93816
+5000 , -579.15 , 67.41306
+5000 , -386.1 , 70.88796
+5000 , -193.05 , 74.36286
+5000 , 0 , 77.83776
+5000 , 193.05 , 81.31266
+5000 , 386.1 , 84.78756
+5000 , 579.15 , 88.26246
+5000 , 772.2 , 91.73736
+5000 , 965.25 , 95.21226
+5000 , 1158.3 , 98.68716
+5000 , 1351.35 , 102.16206
+5000 , 1544.4 , 105.63696
+5000 , 1737.45 , 109.11186
+5000 , 1930.5 , 112.58676
+5000 , 2123.55 , 116.06166
+5000 , 2316.6 , 119.53656
+5000 , 2509.65 , 123.01146
+5000 , 2702.7 , 126.48636
+5000 , 2895.75 , 129.96126
+5000 , 3088.8 , 133.43616
+5000 , 3281.85 , 136.91106
+5000 , 3474.9 , 140.38596
+5000 , 3667.95 , 143.86086
+5000 , 3861 , 147.33576
+5000 , 4054.05 , 150.81066
+5000 , 4247.1 , 154.28556
+5000 , 4440.15 , 157.76046
+5000 , 4633.2 , 161.23536
+5000 , 4826.25 , 164.71026
+5000 , 5019.3 , 168.18516
+5000 , 5212.35 , 171.66006
+5000 , 5405.4 , 175.13496
+5000 , 5598.45 , 178.60986
+5000 , 5791.5 , 182.08476
+5000 , 5984.55 , 185.55966
+5000 , 6177.6 , 189.03456
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbat b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbat
new file mode 100644
index 0000000000000000000000000000000000000000..b63cc3aad2ae9a38a3f3d17146b5db01390e99ac
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbat
@@ -0,0 +1,18 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:28:30.2818342Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic Battery",
+ "Capacity": 14.0,
+ "SOC_min": 20.0,
+ "SOC_max": 80.0,
+ "MaxCurrentMap": "MaxCurrent.vimax",
+ "InternalResistanceCurve": "GenericBattery_10kWh_658V.vbatr",
+ "SoCCurve": "GenericBattery_10kWh_658V.vbatv"
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbatr b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbatr
new file mode 100644
index 0000000000000000000000000000000000000000..09c936221ae38d84265ae27ba5542834d407026a
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbatr
@@ -0,0 +1,3 @@
+SoC, Ri
+0, 0.12
+100, 0.12
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbatv b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbatv
new file mode 100644
index 0000000000000000000000000000000000000000..8063e04c9379cce6870b2d71c99807f0ee73c3fa
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbatv
@@ -0,0 +1,12 @@
+SOC, V
+0, 590
+10, 614
+20, 626
+30, 632
+40, 638
+50, 640
+60, 640
+70, 642
+80, 646
+90, 650
+100, 658
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Group5_HEV.vveh b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Group5_HEV.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..913be3ea1bdc50de2dfd2fb5f2468f69b851b2f8
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Group5_HEV.vveh
@@ -0,0 +1,109 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:36:11.4469594Z",
+ "AppVersion": "3",
+ "FileVersion": 10
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "Tractor",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 8229.0,
+ "CurbWeightExtra": 7500.0,
+ "MassMax": 18.0,
+ "Loading": 19300.0,
+ "rdyn": 492.0,
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 33350.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": true,
+ "RRCISO": 0.0065,
+ "FzISO": 33350.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18333,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 41690.0,
+ "Type": "Trailer"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18333,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 41690.0,
+ "Type": "Trailer"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18334,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 41690.0,
+ "Type": "Trailer"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 5.3,
+ "VehicleHeight": 4.0,
+ "IdlingSpeed": 600.0,
+ "Retarder": {
+ "Type": "None",
+ "Ratio": 1.0,
+ "File": ""
+ },
+ "Angledrive": {
+ "Type": "None",
+ "Ratio": 0.0,
+ "LossMap": ""
+ },
+ "PTO": {
+ "Type": "None",
+ "LossMap": "",
+ "Cycle": ""
+ },
+ "TorqueLimits": {},
+ "MaxDrivetrainPower": 1000.0,
+ "InitialSoC": 50.0,
+ "PowertrainConfiguration": "IHPC",
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1.0,
+ "MechanicalEfficiency": 1.0,
+ "Position": "IHPC",
+ "MotorFile": "IHPC-EM_6spd.vem"
+ }
+ ],
+ "Battery": {
+ "NumPacks": 1,
+ "BatteryFile": "GenericBattery_10kWh_658V.vbat"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Hybrid_Parameters.vhctl b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Hybrid_Parameters.vhctl
new file mode 100644
index 0000000000000000000000000000000000000000..a46aef1a05bf9df86bedf57572abe03a6de5fb23
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Hybrid_Parameters.vhctl
@@ -0,0 +1,17 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:28:08.3781385Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "EquivalenceFactor": 2.0,
+ "MinSoC": 20.0,
+ "MaxSoC": 80.0,
+ "TargetSoC": 50.0,
+ "AuxBufferTime": 5.0,
+ "AuxBufferChgTime": 5.0,
+ "MinICEOnTime": 10.0
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC Group 5.vecto b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC Group 5.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..252c083c7a8938574fe38a0fbeeec5076a68b979
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC Group 5.vecto
@@ -0,0 +1,64 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-08-24T13:41:04.1591616Z",
+ "AppVersion": "3",
+ "FileVersion": 13
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "Group5_HEV.vveh",
+ "EngineFile": "Engine_325kW_12.7l.veng",
+ "GearboxFile": "IHPC-Gbx_6.vgbx",
+ "TCU": "IHPC-Gbx_6.vgbx",
+ "ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
+ "HybridStrategyParams": "Hybrid_Parameters.vhctl",
+ "AuxiliaryAssembly": "Classic",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
+ "Aux": [],
+ "Padd": 3000.0,
+ "Padd_electric": 0.0,
+ "VACC": "Truck.vacc",
+ "EngineStopStartAtVehicleStopThreshold": 0.0,
+ "EngineStopStartMaxOffTimespan": 1000.0,
+ "EngineStopStartUtilityFactor": 0.0,
+ "EcoRollMinSpeed": 0.0,
+ "EcoRollActivationDelay": 0.0,
+ "EcoRollUnderspeedThreshold": 0.0,
+ "EcoRollMaxAcceleration": 0.0,
+ "PCCEnableSpeed": 0.0,
+ "PCCMinSpeed": 0.0,
+ "PCCUnderspeed": 0.0,
+ "PCCOverSpeed": 5.0,
+ "PCCPreviewDistanceUC1": 0.0,
+ "PCCPreviewDistanceUC2": 0.0,
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": "",
+ "MinSpeed": 50.0
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Overspeed",
+ "MinSpeed": 50.0,
+ "OverSpeed": 2.5
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "MunicipalUtility",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_6spd.vem b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_6spd.vem
new file mode 100644
index 0000000000000000000000000000000000000000..0d1f26fca05c096504d8ba47cbecf7cd8ce12a27
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_6spd.vem
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-10-09T08:18:42.8238326Z",
+ "AppVersion": "3",
+ "FileVersion": 5
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IHPC",
+ "DragCurve": "IHPC-EM_Drag.vemd",
+ "Inertia": 0.5,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 1722.91,
+ "ContinuousTorqueSpeed": 1477,
+ "OverloadTorque": 1956.56,
+ "OverloadTorqueSpeed": 1475,
+ "OverloadTime": 200,
+ "FullLoadCurve": "IHPC-EM_FLD_min.vemp",
+ "EfficiencyMap": {
+ "1": "IHPC-EM_Map_G1.vemo",
+ "2": "IHPC-EM_Map_G2.vemo",
+ "3": "IHPC-EM_Map_G3.vemo",
+ "4": "IHPC-EM_Map_G4.vemo",
+ "5": "IHPC-EM_Map_G5.vemo",
+ "6": "IHPC-EM_Map_G6.vemo"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 1736.79,
+ "ContinuousTorqueSpeed": 1470,
+ "OverloadTorque": 2010.59,
+ "OverloadTorqueSpeed": 1482,
+ "OverloadTime": 230,
+ "FullLoadCurve": "IHPC-EM_FLD_max.vemp",
+ "EfficiencyMap": {
+ "1": "IHPC-EM_Map_G1.vemo",
+ "2": "IHPC-EM_Map_G2.vemo",
+ "3": "IHPC-EM_Map_G3.vemo",
+ "4": "IHPC-EM_Map_G4.vemo",
+ "5": "IHPC-EM_Map_G5.vemo",
+ "6": "IHPC-EM_Map_G6.vemo"
+ }
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Drag.vemd b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Drag.vemd
new file mode 100644
index 0000000000000000000000000000000000000000..ea6b5cc3a57308f36d939ccc12b6b122899b3aa9
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Drag.vemd
@@ -0,0 +1,3 @@
+n [rpm] , T_drag [Nm]
+0 , 0.0
+10000 , 0.0
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_FLD_max.vemp b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_FLD_max.vemp
new file mode 100644
index 0000000000000000000000000000000000000000..ddf62440ac37eb95e77db6e8c2280ab25c0ba610
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_FLD_max.vemp
@@ -0,0 +1,70 @@
+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0.00 , 1991.48 , -1996.23
+1485.45 , 2012.58 , -2017.12
+1480.00 , 2012.50 , -2017.06
+1488.89 , 2008.08 , -2012.59
+1497.78 , 1996.49 , -2000.90
+1506.67 , 1985.05 , -1989.36
+1511.11 , 1979.38 , -1983.64
+1555.56 , 1924.45 , -1928.06
+1600.00 , 1872.64 , -1873.95
+1644.44 , 1823.64 , -1822.14
+1688.89 , 1777.31 , -1772.61
+1733.33 , 1733.35 , -1725.55
+1777.78 , 1691.62 , -1680.81
+1822.22 , 1651.92 , -1638.18
+1866.67 , 1614.19 , -1597.61
+1911.11 , 1578.24 , -1558.89
+1955.56 , 1543.93 , -1521.87
+2000.00 , 1511.19 , -1486.49
+2044.44 , 1479.89 , -1452.61
+2088.89 , 1449.97 , -1420.17
+2133.33 , 1421.29 , -1389.02
+2177.78 , 1393.85 , -1359.15
+2222.22 , 1367.49 , -1330.42
+2266.67 , 1342.22 , -1302.82
+2311.11 , 1317.93 , -1276.25
+2355.56 , 1294.59 , -1250.65
+2400.00 , 1272.09 , -1225.93
+2444.44 , 1250.48 , -1202.14
+2488.89 , 1229.65 , -1179.17
+2533.33 , 1209.57 , -1156.97
+2577.78 , 1190.24 , -1135.55
+2622.22 , 1171.54 , -1114.79
+2666.67 , 1153.53 , -1094.75
+2711.11 , 1136.07 , -1075.29
+2755.56 , 1119.26 , -1056.48
+2800.00 , 1102.98 , -1038.25
+2844.44 , 1087.20 , -1020.53
+2888.89 , 1071.97 , -1003.38
+2933.33 , 1057.18 , -986.69
+2977.78 , 1042.88 , -970.51
+3022.22 , 1028.98 , -954.75
+3066.67 , 1015.52 , -939.45
+3111.11 , 1002.51 , -924.61
+3155.56 , 989.84 , -910.13
+3200.00 , 977.52 , -896.02
+3244.44 , 965.60 , -882.31
+3288.89 , 953.97 , -868.92
+3333.33 , 942.69 , -855.88
+3377.78 , 931.75 , -843.21
+3422.22 , 921.07 , -830.79
+3466.67 , 910.72 , -818.73
+3511.11 , 900.63 , -806.93
+3555.56 , 890.78 , -795.39
+3600.00 , 881.23 , -784.15
+3644.44 , 871.92 , -773.17
+3688.89 , 862.82 , -762.40
+3733.33 , 853.96 , -751.89
+3777.78 , 845.35 , -741.63
+3822.22 , 836.93 , -731.58
+3866.67 , 828.76 , -721.79
+3911.11 , 820.75 , -712.15
+3955.56 , 812.92 , -702.72
+4000.00 , 805.30 , -693.49
+4044.44 , 797.87 , -684.47
+4088.89 , 790.65 , -675.66
+4133.33 , 783.52 , -666.94
+4177.78 , 776.59 , -658.44
+4222.22 , 769.85 , -650.14
+4266.67 , 763.22 , -641.94
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_FLD_min.vemp b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_FLD_min.vemp
new file mode 100644
index 0000000000000000000000000000000000000000..ddf62440ac37eb95e77db6e8c2280ab25c0ba610
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_FLD_min.vemp
@@ -0,0 +1,70 @@
+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0.00 , 1991.48 , -1996.23
+1485.45 , 2012.58 , -2017.12
+1480.00 , 2012.50 , -2017.06
+1488.89 , 2008.08 , -2012.59
+1497.78 , 1996.49 , -2000.90
+1506.67 , 1985.05 , -1989.36
+1511.11 , 1979.38 , -1983.64
+1555.56 , 1924.45 , -1928.06
+1600.00 , 1872.64 , -1873.95
+1644.44 , 1823.64 , -1822.14
+1688.89 , 1777.31 , -1772.61
+1733.33 , 1733.35 , -1725.55
+1777.78 , 1691.62 , -1680.81
+1822.22 , 1651.92 , -1638.18
+1866.67 , 1614.19 , -1597.61
+1911.11 , 1578.24 , -1558.89
+1955.56 , 1543.93 , -1521.87
+2000.00 , 1511.19 , -1486.49
+2044.44 , 1479.89 , -1452.61
+2088.89 , 1449.97 , -1420.17
+2133.33 , 1421.29 , -1389.02
+2177.78 , 1393.85 , -1359.15
+2222.22 , 1367.49 , -1330.42
+2266.67 , 1342.22 , -1302.82
+2311.11 , 1317.93 , -1276.25
+2355.56 , 1294.59 , -1250.65
+2400.00 , 1272.09 , -1225.93
+2444.44 , 1250.48 , -1202.14
+2488.89 , 1229.65 , -1179.17
+2533.33 , 1209.57 , -1156.97
+2577.78 , 1190.24 , -1135.55
+2622.22 , 1171.54 , -1114.79
+2666.67 , 1153.53 , -1094.75
+2711.11 , 1136.07 , -1075.29
+2755.56 , 1119.26 , -1056.48
+2800.00 , 1102.98 , -1038.25
+2844.44 , 1087.20 , -1020.53
+2888.89 , 1071.97 , -1003.38
+2933.33 , 1057.18 , -986.69
+2977.78 , 1042.88 , -970.51
+3022.22 , 1028.98 , -954.75
+3066.67 , 1015.52 , -939.45
+3111.11 , 1002.51 , -924.61
+3155.56 , 989.84 , -910.13
+3200.00 , 977.52 , -896.02
+3244.44 , 965.60 , -882.31
+3288.89 , 953.97 , -868.92
+3333.33 , 942.69 , -855.88
+3377.78 , 931.75 , -843.21
+3422.22 , 921.07 , -830.79
+3466.67 , 910.72 , -818.73
+3511.11 , 900.63 , -806.93
+3555.56 , 890.78 , -795.39
+3600.00 , 881.23 , -784.15
+3644.44 , 871.92 , -773.17
+3688.89 , 862.82 , -762.40
+3733.33 , 853.96 , -751.89
+3777.78 , 845.35 , -741.63
+3822.22 , 836.93 , -731.58
+3866.67 , 828.76 , -721.79
+3911.11 , 820.75 , -712.15
+3955.56 , 812.92 , -702.72
+4000.00 , 805.30 , -693.49
+4044.44 , 797.87 , -684.47
+4088.89 , 790.65 , -675.66
+4133.33 , 783.52 , -666.94
+4177.78 , 776.59 , -658.44
+4222.22 , 769.85 , -650.14
+4266.67 , 763.22 , -641.94
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G1.vemo b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G1.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..d952daeb523541814e5354e51a5b07cc85cd29b6
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G1.vemo
@@ -0,0 +1,2016 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00 , -2419.07 , 23.82
+0.00 , -2344.05 , 22.44
+0.00 , -2269.03 , 21.09
+0.00 , -2194.02 , 19.79
+0.00 , -2119.00 , 18.53
+0.00 , -2043.98 , 17.31
+0.00 , -1968.97 , 16.13
+0.00 , -1893.95 , 14.99
+0.00 , -1818.93 , 13.89
+0.00 , -1743.92 , 12.84
+0.00 , -1668.90 , 11.83
+0.00 , -1593.88 , 10.85
+0.00 , -1518.87 , 9.92
+0.00 , -1443.85 , 9.04
+0.00 , -1368.83 , 8.19
+0.00 , -1293.82 , 7.38
+0.00 , -1218.80 , 6.62
+0.00 , -1143.78 , 5.90
+0.00 , -1068.77 , 5.21
+0.00 , -993.75 , 4.57
+0.00 , -918.73 , 3.98
+0.00 , -843.72 , 3.42
+0.00 , -768.58 , 2.90
+0.00 , -690.33 , 2.43
+0.00 , -612.09 , 2.00
+0.00 , -533.51 , 1.61
+0.00 , -454.65 , 1.26
+0.00 , -375.79 , 0.95
+0.00 , -296.92 , 0.69
+0.00 , -218.06 , 0.46
+0.00 , -139.19 , 0.28
+0.00 , -60.33 , 0.14
+0.00 , 18.53 , 0.09
+0.00 , 85.28 , 0.21
+0.00 , 152.03 , 0.38
+0.00 , 218.78 , 0.58
+0.00 , 285.53 , 0.83
+0.00 , 352.28 , 1.12
+0.00 , 419.03 , 1.45
+0.00 , 485.78 , 1.82
+0.00 , 552.53 , 2.23
+0.00 , 619.29 , 2.69
+0.00 , 686.04 , 3.19
+0.00 , 752.79 , 3.72
+0.00 , 819.54 , 4.30
+0.00 , 886.29 , 4.93
+0.00 , 953.04 , 5.59
+0.00 , 1019.79 , 6.29
+0.00 , 1086.54 , 7.04
+0.00 , 1153.29 , 7.83
+0.00 , 1220.04 , 8.65
+0.00 , 1286.79 , 9.52
+0.00 , 1353.54 , 10.44
+0.00 , 1420.29 , 11.39
+0.00 , 1487.04 , 12.38
+0.00 , 1553.79 , 13.42
+0.00 , 1620.54 , 14.50
+0.00 , 1687.29 , 15.62
+0.00 , 1754.04 , 16.78
+0.00 , 1820.79 , 17.98
+0.00 , 1887.54 , 19.22
+0.00 , 1954.29 , 20.51
+0.00 , 2021.04 , 21.84
+0.00 , 2087.79 , 23.20
+0.00 , 2154.54 , 24.61
+40.81 , -2419.82 , 13.94
+40.81 , -2344.81 , 12.87
+40.81 , -2269.79 , 11.84
+40.81 , -2194.77 , 10.85
+40.81 , -2119.76 , 9.90
+40.81 , -2044.74 , 9.00
+40.81 , -1969.72 , 8.13
+40.81 , -1894.71 , 7.31
+40.81 , -1819.69 , 6.53
+40.81 , -1744.67 , 5.78
+40.81 , -1669.66 , 5.09
+40.81 , -1594.64 , 4.43
+40.81 , -1519.62 , 3.81
+40.81 , -1444.61 , 3.24
+40.81 , -1369.59 , 2.70
+40.81 , -1294.57 , 2.21
+40.81 , -1219.56 , 1.76
+40.81 , -1144.54 , 1.36
+40.81 , -1069.52 , 0.99
+40.81 , -994.51 , 0.67
+40.81 , -919.49 , 0.39
+40.81 , -844.47 , 0.15
+40.81 , -769.32 , -0.05
+40.81 , -690.47 , -0.22
+40.81 , -611.61 , -0.36
+40.81 , -532.76 , -0.45
+40.81 , -453.89 , -0.50
+40.81 , -375.03 , -0.51
+40.81 , -296.17 , -0.48
+40.81 , -217.30 , -0.41
+40.81 , -138.44 , -0.30
+40.81 , -59.57 , -0.15
+40.81 , 19.29 , 0.09
+40.81 , 86.04 , 0.51
+40.81 , 152.79 , 0.98
+40.81 , 219.54 , 1.48
+40.81 , 286.29 , 2.03
+40.81 , 353.04 , 2.62
+40.81 , 419.79 , 3.25
+40.81 , 486.54 , 3.92
+40.81 , 553.29 , 4.63
+40.81 , 620.04 , 5.39
+40.81 , 686.79 , 6.18
+40.81 , 753.54 , 7.02
+40.81 , 820.29 , 7.90
+40.81 , 887.04 , 8.82
+40.81 , 953.79 , 9.78
+40.81 , 1020.54 , 10.78
+40.81 , 1087.29 , 11.83
+40.81 , 1154.04 , 12.91
+40.81 , 1220.79 , 14.04
+40.81 , 1287.54 , 15.21
+40.81 , 1354.29 , 16.42
+40.81 , 1421.04 , 17.67
+40.81 , 1487.79 , 18.96
+40.81 , 1554.54 , 20.30
+40.81 , 1621.30 , 21.68
+40.81 , 1688.05 , 23.09
+40.81 , 1754.80 , 24.55
+40.81 , 1821.55 , 26.05
+40.81 , 1888.30 , 27.60
+40.81 , 1955.05 , 29.18
+40.81 , 2021.80 , 30.81
+40.81 , 2088.55 , 32.47
+40.81 , 2155.30 , 34.18
+81.62 , -2420.58 , 4.07
+81.62 , -2345.56 , 3.32
+81.62 , -2270.55 , 2.60
+81.62 , -2195.53 , 1.93
+81.62 , -2120.51 , 1.31
+81.62 , -2045.50 , 0.73
+81.62 , -1970.48 , 0.19
+81.62 , -1895.46 , -0.32
+81.62 , -1820.45 , -0.78
+81.62 , -1745.43 , -1.20
+81.62 , -1670.41 , -1.57
+81.62 , -1595.40 , -1.91
+81.62 , -1520.38 , -2.21
+81.62 , -1445.36 , -2.47
+81.62 , -1370.35 , -2.68
+81.62 , -1295.33 , -2.86
+81.62 , -1220.31 , -2.99
+81.62 , -1145.30 , -3.09
+81.62 , -1070.28 , -3.14
+81.62 , -995.26 , -3.15
+81.62 , -919.92 , -3.13
+81.62 , -844.32 , -3.07
+81.62 , -768.59 , -2.96
+81.62 , -689.73 , -2.84
+81.62 , -610.86 , -2.69
+81.62 , -532.00 , -2.49
+81.62 , -453.14 , -2.25
+81.62 , -374.27 , -1.97
+81.62 , -295.41 , -1.65
+81.62 , -216.55 , -1.29
+81.62 , -137.68 , -0.89
+81.62 , -58.82 , -0.44
+81.62 , 20.05 , 0.10
+81.62 , 86.80 , 0.82
+81.62 , 153.55 , 1.58
+81.62 , 220.30 , 2.38
+81.62 , 287.05 , 3.23
+81.62 , 353.80 , 4.12
+81.62 , 420.55 , 5.04
+81.62 , 487.30 , 6.01
+81.62 , 554.05 , 7.03
+81.62 , 620.80 , 8.08
+81.62 , 687.55 , 9.17
+81.62 , 754.30 , 10.31
+81.62 , 821.05 , 11.49
+81.62 , 887.80 , 12.71
+81.62 , 954.55 , 13.97
+81.62 , 1021.30 , 15.27
+81.62 , 1088.05 , 16.61
+81.62 , 1154.80 , 18.00
+81.62 , 1221.55 , 19.42
+81.62 , 1288.30 , 20.89
+81.62 , 1355.05 , 22.40
+81.62 , 1421.80 , 23.95
+81.62 , 1488.55 , 25.54
+81.62 , 1555.30 , 27.18
+81.62 , 1622.05 , 28.85
+81.62 , 1688.80 , 30.57
+81.62 , 1755.55 , 32.33
+81.62 , 1822.30 , 34.13
+81.62 , 1889.05 , 35.97
+81.62 , 1955.80 , 37.85
+81.62 , 2022.55 , 39.78
+81.62 , 2089.30 , 41.74
+81.62 , 2156.05 , 43.75
+122.43 , -2421.34 , -5.62
+122.43 , -2346.32 , -6.06
+122.43 , -2271.30 , -6.46
+122.43 , -2196.29 , -6.81
+122.43 , -2121.27 , -7.13
+122.43 , -2046.25 , -7.40
+122.43 , -1971.24 , -7.63
+122.43 , -1896.22 , -7.83
+122.43 , -1821.20 , -7.98
+122.43 , -1746.19 , -8.09
+122.43 , -1671.17 , -8.16
+122.43 , -1596.15 , -8.19
+122.43 , -1521.14 , -8.18
+122.43 , -1446.12 , -8.13
+122.43 , -1371.10 , -8.04
+122.43 , -1296.09 , -7.91
+122.43 , -1221.07 , -7.73
+122.43 , -1146.05 , -7.52
+122.43 , -1071.04 , -7.26
+122.43 , -996.02 , -6.97
+122.43 , -920.35 , -6.64
+122.43 , -844.14 , -6.28
+122.43 , -767.84 , -5.88
+122.43 , -688.97 , -5.47
+122.43 , -610.11 , -5.02
+122.43 , -531.24 , -4.53
+122.43 , -452.38 , -4.00
+122.43 , -373.52 , -3.43
+122.43 , -294.65 , -2.82
+122.43 , -215.79 , -2.16
+122.43 , -136.93 , -1.47
+122.43 , -58.06 , -0.74
+122.43 , 20.80 , 0.10
+122.43 , 87.55 , 1.12
+122.43 , 154.30 , 2.18
+122.43 , 221.05 , 3.28
+122.43 , 287.80 , 4.43
+122.43 , 354.55 , 5.61
+122.43 , 421.30 , 6.84
+122.43 , 488.05 , 8.11
+122.43 , 554.80 , 9.42
+122.43 , 621.55 , 10.77
+122.43 , 688.30 , 12.16
+122.43 , 755.05 , 13.60
+122.43 , 821.80 , 15.07
+122.43 , 888.56 , 16.59
+122.43 , 955.31 , 18.15
+122.43 , 1022.06 , 19.75
+122.43 , 1088.81 , 21.39
+122.43 , 1155.56 , 23.08
+122.43 , 1222.31 , 24.80
+122.43 , 1289.06 , 26.57
+122.43 , 1355.81 , 28.38
+122.43 , 1422.56 , 30.23
+122.43 , 1489.31 , 32.12
+122.43 , 1556.06 , 34.05
+122.43 , 1622.81 , 36.03
+122.43 , 1689.56 , 38.04
+122.43 , 1756.31 , 40.10
+122.43 , 1823.06 , 42.20
+122.43 , 1889.81 , 44.34
+122.43 , 1956.56 , 46.52
+122.43 , 2023.31 , 48.75
+122.43 , 2090.06 , 51.01
+122.43 , 2156.81 , 53.32
+163.24 , -2422.09 , -15.28
+163.24 , -2347.08 , -15.41
+163.24 , -2272.06 , -15.49
+163.24 , -2197.04 , -15.54
+163.24 , -2122.03 , -15.55
+163.24 , -2047.01 , -15.52
+163.24 , -1971.99 , -15.44
+163.24 , -1896.98 , -15.33
+163.24 , -1821.96 , -15.17
+163.24 , -1746.94 , -14.97
+163.24 , -1671.93 , -14.74
+163.24 , -1596.91 , -14.46
+163.24 , -1521.89 , -14.14
+163.24 , -1446.88 , -13.78
+163.24 , -1371.86 , -13.38
+163.24 , -1296.84 , -12.94
+163.24 , -1221.83 , -12.46
+163.24 , -1146.81 , -11.94
+163.24 , -1071.79 , -11.38
+163.24 , -996.78 , -10.77
+163.24 , -920.78 , -10.15
+163.24 , -843.97 , -9.49
+163.24 , -767.08 , -8.80
+163.24 , -688.22 , -8.10
+163.24 , -609.35 , -7.36
+163.24 , -530.49 , -6.58
+163.24 , -451.62 , -5.75
+163.24 , -372.76 , -4.89
+163.24 , -293.90 , -3.99
+163.24 , -215.03 , -3.04
+163.24 , -136.17 , -2.06
+163.24 , -57.31 , -1.03
+163.24 , 21.56 , 0.10
+163.24 , 88.31 , 1.42
+163.24 , 155.06 , 2.78
+163.24 , 221.81 , 4.18
+163.24 , 288.56 , 5.62
+163.24 , 355.31 , 7.11
+163.24 , 422.06 , 8.63
+163.24 , 488.81 , 10.20
+163.24 , 555.56 , 11.81
+163.24 , 622.31 , 13.46
+163.24 , 689.06 , 15.15
+163.24 , 755.81 , 16.89
+163.24 , 822.56 , 18.66
+163.24 , 889.31 , 20.48
+163.24 , 956.06 , 22.34
+163.24 , 1022.81 , 24.23
+163.24 , 1089.56 , 26.18
+163.24 , 1156.31 , 28.16
+163.24 , 1223.06 , 30.18
+163.24 , 1289.81 , 32.25
+163.24 , 1356.56 , 34.36
+163.24 , 1423.31 , 36.50
+163.24 , 1490.06 , 38.70
+163.24 , 1556.81 , 40.93
+163.24 , 1623.56 , 43.20
+163.24 , 1690.31 , 45.51
+163.24 , 1757.06 , 47.87
+163.24 , 1823.81 , 50.27
+163.24 , 1890.57 , 52.71
+163.24 , 1957.32 , 55.19
+163.24 , 2024.07 , 57.71
+163.24 , 2090.82 , 60.28
+163.24 , 2157.57 , 62.88
+204.04 , -2422.85 , -24.92
+204.04 , -2347.83 , -24.74
+204.04 , -2272.82 , -24.52
+204.04 , -2197.80 , -24.26
+204.04 , -2122.78 , -23.96
+204.04 , -2047.77 , -23.62
+204.04 , -1972.75 , -23.24
+204.04 , -1897.73 , -22.82
+204.04 , -1822.72 , -22.35
+204.04 , -1747.70 , -21.85
+204.04 , -1672.68 , -21.30
+204.04 , -1597.67 , -20.72
+204.04 , -1522.65 , -20.09
+204.04 , -1447.63 , -19.42
+204.04 , -1372.62 , -18.72
+204.04 , -1297.60 , -17.97
+204.04 , -1222.58 , -17.18
+204.04 , -1147.56 , -16.35
+204.04 , -1072.55 , -15.48
+204.04 , -997.53 , -14.57
+204.04 , -921.21 , -13.64
+204.04 , -843.79 , -12.70
+204.04 , -766.32 , -11.72
+204.04 , -687.46 , -10.73
+204.04 , -608.60 , -9.70
+204.04 , -529.73 , -8.62
+204.04 , -450.87 , -7.51
+204.04 , -372.00 , -6.35
+204.04 , -293.14 , -5.16
+204.04 , -214.28 , -3.92
+204.04 , -135.41 , -2.65
+204.04 , -56.55 , -1.33
+204.04 , 22.31 , 0.10
+204.04 , 89.06 , 1.71
+204.04 , 155.81 , 3.37
+204.04 , 222.57 , 5.07
+204.04 , 289.32 , 6.81
+204.04 , 356.07 , 8.60
+204.04 , 422.82 , 10.42
+204.04 , 489.57 , 12.29
+204.04 , 556.32 , 14.20
+204.04 , 623.07 , 16.15
+204.04 , 689.82 , 18.14
+204.04 , 756.57 , 20.17
+204.04 , 823.32 , 22.24
+204.04 , 890.07 , 24.36
+204.04 , 956.82 , 26.52
+204.04 , 1023.57 , 28.72
+204.04 , 1090.32 , 30.96
+204.04 , 1157.07 , 33.24
+204.04 , 1223.82 , 35.56
+204.04 , 1290.57 , 37.93
+204.04 , 1357.32 , 40.33
+204.04 , 1424.07 , 42.78
+204.04 , 1490.82 , 45.27
+204.04 , 1557.57 , 47.80
+204.04 , 1624.32 , 50.37
+204.04 , 1691.07 , 52.98
+204.04 , 1757.82 , 55.64
+204.04 , 1824.57 , 58.34
+204.04 , 1891.32 , 61.07
+204.04 , 1958.07 , 63.85
+204.04 , 2024.82 , 66.68
+204.04 , 2091.57 , 69.54
+204.04 , 2158.32 , 72.44
+244.85 , -2423.61 , -34.56
+244.85 , -2348.59 , -34.07
+244.85 , -2273.57 , -33.54
+244.85 , -2198.56 , -32.97
+244.85 , -2123.54 , -32.37
+244.85 , -2048.52 , -31.72
+244.85 , -1973.51 , -31.03
+244.85 , -1898.49 , -30.29
+244.85 , -1823.47 , -29.52
+244.85 , -1748.46 , -28.71
+244.85 , -1673.44 , -27.86
+244.85 , -1598.42 , -26.96
+244.85 , -1523.40 , -26.03
+244.85 , -1448.39 , -25.05
+244.85 , -1373.37 , -24.04
+244.85 , -1298.35 , -22.98
+244.85 , -1223.34 , -21.88
+244.85 , -1148.32 , -20.75
+244.85 , -1073.30 , -19.57
+244.85 , -998.29 , -18.35
+244.85 , -921.63 , -17.13
+244.85 , -843.62 , -15.91
+244.85 , -765.57 , -14.64
+244.85 , -686.70 , -13.36
+244.85 , -607.84 , -12.04
+244.85 , -528.98 , -10.67
+244.85 , -450.11 , -9.27
+244.85 , -371.25 , -7.82
+244.85 , -292.38 , -6.33
+244.85 , -213.52 , -4.81
+244.85 , -134.66 , -3.24
+244.85 , -55.79 , -1.63
+244.85 , 23.07 , 0.09
+244.85 , 89.82 , 2.01
+244.85 , 156.57 , 3.97
+244.85 , 223.32 , 5.96
+244.85 , 290.07 , 8.01
+244.85 , 356.82 , 10.09
+244.85 , 423.57 , 12.21
+244.85 , 490.32 , 14.38
+244.85 , 557.07 , 16.58
+244.85 , 623.82 , 18.83
+244.85 , 690.57 , 21.12
+244.85 , 757.32 , 23.45
+244.85 , 824.07 , 25.83
+244.85 , 890.82 , 28.24
+244.85 , 957.57 , 30.70
+244.85 , 1024.32 , 33.19
+244.85 , 1091.07 , 35.73
+244.85 , 1157.82 , 38.31
+244.85 , 1224.58 , 40.94
+244.85 , 1291.33 , 43.60
+244.85 , 1358.08 , 46.30
+244.85 , 1424.83 , 49.05
+244.85 , 1491.58 , 51.84
+244.85 , 1558.33 , 54.67
+244.85 , 1625.08 , 57.54
+244.85 , 1691.83 , 60.45
+244.85 , 1758.58 , 63.41
+244.85 , 1825.33 , 66.40
+244.85 , 1892.08 , 69.44
+244.85 , 1958.83 , 72.52
+244.85 , 2025.58 , 75.64
+244.85 , 2092.33 , 78.80
+244.85 , 2159.08 , 82.00
+285.67 , -2424.36 , -44.18
+285.67 , -2349.35 , -43.38
+285.67 , -2274.33 , -42.55
+285.67 , -2199.31 , -41.67
+285.67 , -2124.29 , -40.76
+285.67 , -2049.28 , -39.80
+285.67 , -1974.26 , -38.80
+285.67 , -1899.24 , -37.76
+285.67 , -1824.23 , -36.68
+285.67 , -1749.21 , -35.56
+285.67 , -1674.19 , -34.40
+285.67 , -1599.18 , -33.20
+285.67 , -1524.16 , -31.96
+285.67 , -1449.14 , -30.67
+285.67 , -1374.13 , -29.35
+285.67 , -1299.11 , -27.98
+285.67 , -1224.09 , -26.58
+285.67 , -1149.08 , -25.13
+285.67 , -1074.06 , -23.65
+285.67 , -999.04 , -22.12
+285.67 , -922.06 , -20.61
+285.67 , -843.44 , -19.11
+285.67 , -764.81 , -17.57
+285.67 , -685.95 , -15.99
+285.67 , -607.08 , -14.38
+285.67 , -528.22 , -12.72
+285.67 , -449.36 , -11.02
+285.67 , -370.49 , -9.29
+285.67 , -291.63 , -7.51
+285.67 , -212.76 , -5.69
+285.67 , -133.90 , -3.83
+285.67 , -55.04 , -1.93
+285.67 , 23.83 , 0.08
+285.67 , 90.58 , 2.30
+285.67 , 157.33 , 4.56
+285.67 , 224.08 , 6.85
+285.67 , 290.83 , 9.19
+285.67 , 357.58 , 11.58
+285.67 , 424.33 , 14.00
+285.67 , 491.08 , 16.46
+285.67 , 557.83 , 18.97
+285.67 , 624.58 , 21.52
+285.67 , 691.33 , 24.10
+285.67 , 758.08 , 26.73
+285.67 , 824.83 , 29.41
+285.67 , 891.58 , 32.12
+285.67 , 958.33 , 34.87
+285.67 , 1025.08 , 37.67
+285.67 , 1091.83 , 40.51
+285.67 , 1158.58 , 43.39
+285.67 , 1225.33 , 46.31
+285.67 , 1292.08 , 49.27
+285.67 , 1358.83 , 52.27
+285.67 , 1425.58 , 55.32
+285.67 , 1492.33 , 58.41
+285.67 , 1559.08 , 61.53
+285.67 , 1625.83 , 64.70
+285.67 , 1692.58 , 67.92
+285.67 , 1759.33 , 71.17
+285.67 , 1826.08 , 74.46
+285.67 , 1892.83 , 77.80
+285.67 , 1959.58 , 81.18
+285.67 , 2026.33 , 84.60
+285.67 , 2093.08 , 88.06
+285.67 , 2159.84 , 91.56
+326.47 , -2425.12 , -53.79
+326.47 , -2350.10 , -52.69
+326.47 , -2275.08 , -51.55
+326.47 , -2200.07 , -50.36
+326.47 , -2125.05 , -49.14
+326.47 , -2050.03 , -47.87
+326.47 , -1975.02 , -46.56
+326.47 , -1900.00 , -45.22
+326.47 , -1824.98 , -43.83
+326.47 , -1749.97 , -42.40
+326.47 , -1674.95 , -40.93
+326.47 , -1599.93 , -39.42
+326.47 , -1524.92 , -37.87
+326.47 , -1449.90 , -36.28
+326.47 , -1374.88 , -34.65
+326.47 , -1299.87 , -32.98
+326.47 , -1224.85 , -31.26
+326.47 , -1149.81 , -29.51
+326.47 , -1074.44 , -27.73
+326.47 , -999.06 , -25.90
+326.47 , -921.78 , -24.11
+326.47 , -842.92 , -22.32
+326.47 , -764.05 , -20.50
+326.47 , -685.19 , -18.63
+326.47 , -606.33 , -16.72
+326.47 , -527.46 , -14.77
+326.47 , -448.60 , -12.79
+326.47 , -369.74 , -10.76
+326.47 , -290.87 , -8.69
+326.47 , -212.01 , -6.58
+326.47 , -133.14 , -4.43
+326.47 , -54.28 , -2.23
+326.47 , 24.58 , 0.08
+326.47 , 91.33 , 2.59
+326.47 , 158.08 , 5.15
+326.47 , 224.83 , 7.74
+326.47 , 291.58 , 10.38
+326.47 , 358.33 , 13.06
+326.47 , 425.08 , 15.78
+326.47 , 491.83 , 18.55
+326.47 , 558.59 , 21.35
+326.47 , 625.34 , 24.20
+326.47 , 692.09 , 27.09
+326.47 , 758.84 , 30.01
+326.47 , 825.59 , 32.99
+326.47 , 892.34 , 36.00
+326.47 , 959.09 , 39.05
+326.47 , 1025.84 , 42.15
+326.47 , 1092.59 , 45.28
+326.47 , 1159.34 , 48.46
+326.47 , 1226.09 , 51.68
+326.47 , 1292.84 , 54.94
+326.47 , 1359.59 , 58.24
+326.47 , 1426.34 , 61.59
+326.47 , 1493.09 , 64.97
+326.47 , 1559.84 , 68.40
+326.47 , 1626.59 , 71.87
+326.47 , 1693.34 , 75.38
+326.47 , 1760.09 , 78.93
+326.47 , 1826.84 , 82.53
+326.47 , 1893.59 , 86.16
+326.47 , 1960.34 , 89.84
+326.47 , 2027.09 , 93.55
+326.47 , 2093.84 , 97.31
+326.47 , 2160.59 , 101.11
+367.28 , -2425.87 , -63.39
+367.28 , -2350.86 , -61.98
+367.28 , -2275.84 , -60.53
+367.28 , -2200.82 , -59.04
+367.28 , -2125.81 , -57.51
+367.28 , -2050.79 , -55.93
+367.28 , -1975.77 , -54.32
+367.28 , -1900.76 , -52.66
+367.28 , -1825.74 , -50.97
+367.28 , -1750.72 , -49.23
+367.28 , -1675.71 , -47.45
+367.28 , -1600.69 , -45.64
+367.28 , -1525.67 , -43.78
+367.28 , -1450.66 , -41.88
+367.28 , -1375.64 , -39.94
+367.28 , -1300.62 , -37.96
+367.28 , -1225.61 , -35.94
+367.28 , -1150.54 , -33.88
+367.28 , -1074.56 , -31.81
+367.28 , -998.58 , -29.71
+367.28 , -921.03 , -27.62
+367.28 , -842.16 , -25.54
+367.28 , -763.30 , -23.43
+367.28 , -684.43 , -21.27
+367.28 , -605.57 , -19.07
+367.28 , -526.71 , -16.83
+367.28 , -447.84 , -14.55
+367.28 , -368.98 , -12.23
+367.28 , -290.12 , -9.87
+367.28 , -211.25 , -7.47
+367.28 , -132.39 , -5.02
+367.28 , -53.52 , -2.54
+367.28 , 25.34 , 0.07
+367.28 , 92.09 , 2.88
+367.28 , 158.84 , 5.73
+367.28 , 225.59 , 8.63
+367.28 , 292.34 , 11.57
+367.28 , 359.09 , 14.55
+367.28 , 425.84 , 17.57
+367.28 , 492.59 , 20.63
+367.28 , 559.34 , 23.73
+367.28 , 626.09 , 26.88
+367.28 , 692.84 , 30.06
+367.28 , 759.59 , 33.29
+367.28 , 826.34 , 36.56
+367.28 , 893.09 , 39.87
+367.28 , 959.84 , 43.23
+367.28 , 1026.59 , 46.62
+367.28 , 1093.34 , 50.05
+367.28 , 1160.09 , 53.53
+367.28 , 1226.84 , 57.05
+367.28 , 1293.59 , 60.61
+367.28 , 1360.34 , 64.21
+367.28 , 1427.09 , 67.85
+367.28 , 1493.85 , 71.54
+367.28 , 1560.60 , 75.26
+367.28 , 1627.35 , 79.03
+367.28 , 1694.10 , 82.84
+367.28 , 1760.85 , 86.69
+367.28 , 1827.60 , 90.58
+367.28 , 1894.35 , 94.52
+367.28 , 1961.10 , 98.49
+367.28 , 2027.85 , 102.51
+367.28 , 2094.60 , 106.57
+367.28 , 2161.35 , 110.67
+408.09 , -2426.63 , -72.99
+408.09 , -2351.61 , -71.26
+408.09 , -2276.60 , -69.51
+408.09 , -2201.58 , -67.70
+408.09 , -2126.56 , -65.87
+408.09 , -2051.55 , -63.98
+408.09 , -1976.53 , -62.06
+408.09 , -1901.51 , -60.10
+408.09 , -1826.50 , -58.09
+408.09 , -1751.48 , -56.05
+408.09 , -1676.46 , -53.96
+408.09 , -1601.45 , -51.84
+408.09 , -1526.43 , -49.67
+408.09 , -1451.41 , -47.46
+408.09 , -1376.40 , -45.22
+408.09 , -1301.38 , -42.93
+408.09 , -1226.36 , -40.60
+408.09 , -1151.26 , -38.23
+408.09 , -1074.68 , -35.89
+408.09 , -998.10 , -33.51
+408.09 , -920.27 , -31.13
+408.09 , -841.41 , -28.77
+408.09 , -762.54 , -26.36
+408.09 , -683.68 , -23.91
+408.09 , -604.81 , -21.42
+408.09 , -525.95 , -18.89
+408.09 , -447.09 , -16.31
+408.09 , -368.22 , -13.70
+408.09 , -289.36 , -11.05
+408.09 , -210.50 , -8.36
+408.09 , -131.63 , -5.62
+408.09 , -52.77 , -2.85
+408.09 , 26.10 , 0.05
+408.09 , 92.85 , 3.17
+408.09 , 159.60 , 6.32
+408.09 , 226.35 , 9.51
+408.09 , 293.10 , 12.75
+408.09 , 359.85 , 16.03
+408.09 , 426.60 , 19.35
+408.09 , 493.35 , 22.71
+408.09 , 560.10 , 26.11
+408.09 , 626.85 , 29.55
+408.09 , 693.60 , 33.04
+408.09 , 760.35 , 36.57
+408.09 , 827.10 , 40.14
+408.09 , 893.85 , 43.74
+408.09 , 960.60 , 47.40
+408.09 , 1027.35 , 51.09
+408.09 , 1094.10 , 54.83
+408.09 , 1160.85 , 58.60
+408.09 , 1227.60 , 62.42
+408.09 , 1294.35 , 66.28
+408.09 , 1361.10 , 70.18
+408.09 , 1427.85 , 74.12
+408.09 , 1494.60 , 78.10
+408.09 , 1561.35 , 82.13
+408.09 , 1628.10 , 86.19
+408.09 , 1694.85 , 90.30
+408.09 , 1761.60 , 94.45
+408.09 , 1828.35 , 98.64
+408.09 , 1895.10 , 102.87
+408.09 , 1961.85 , 107.15
+408.09 , 2028.60 , 111.46
+408.09 , 2095.35 , 115.82
+408.09 , 2162.10 , 120.22
+448.90 , -2427.39 , -82.56
+448.90 , -2352.37 , -80.54
+448.90 , -2277.35 , -78.47
+448.90 , -2202.34 , -76.36
+448.90 , -2127.32 , -74.21
+448.90 , -2052.30 , -72.02
+448.90 , -1977.29 , -69.79
+448.90 , -1902.27 , -67.52
+448.90 , -1827.25 , -65.21
+448.90 , -1752.24 , -62.86
+448.90 , -1677.22 , -60.46
+448.90 , -1602.20 , -58.03
+448.90 , -1527.19 , -55.56
+448.90 , -1452.17 , -53.04
+448.90 , -1377.15 , -50.49
+448.90 , -1302.14 , -47.89
+448.90 , -1227.12 , -45.25
+448.90 , -1151.98 , -42.58
+448.90 , -1074.80 , -39.96
+448.90 , -997.61 , -37.31
+448.90 , -919.51 , -34.65
+448.90 , -840.65 , -31.99
+448.90 , -761.79 , -29.29
+448.90 , -682.92 , -26.55
+448.90 , -604.06 , -23.77
+448.90 , -525.19 , -20.95
+448.90 , -446.33 , -18.08
+448.90 , -367.47 , -15.18
+448.90 , -288.60 , -12.23
+448.90 , -209.74 , -9.25
+448.90 , -130.88 , -6.22
+448.90 , -52.01 , -3.16
+448.90 , 26.85 , 0.04
+448.90 , 93.60 , 3.45
+448.90 , 160.35 , 6.90
+448.90 , 227.10 , 10.40
+448.90 , 293.85 , 13.93
+448.90 , 360.60 , 17.51
+448.90 , 427.35 , 21.13
+448.90 , 494.10 , 24.79
+448.90 , 560.85 , 28.49
+448.90 , 627.60 , 32.23
+448.90 , 694.35 , 36.01
+448.90 , 761.10 , 39.84
+448.90 , 827.86 , 43.71
+448.90 , 894.61 , 47.62
+448.90 , 961.36 , 51.57
+448.90 , 1028.11 , 55.56
+448.90 , 1094.86 , 59.59
+448.90 , 1161.61 , 63.67
+448.90 , 1228.36 , 67.78
+448.90 , 1295.11 , 71.94
+448.90 , 1361.86 , 76.14
+448.90 , 1428.61 , 80.38
+448.90 , 1495.36 , 84.66
+448.90 , 1562.11 , 88.99
+448.90 , 1628.86 , 93.35
+448.90 , 1695.61 , 97.76
+448.90 , 1762.36 , 102.21
+448.90 , 1829.11 , 106.70
+448.90 , 1895.86 , 111.23
+448.90 , 1962.61 , 115.80
+448.90 , 2029.36 , 120.42
+448.90 , 2096.11 , 125.07
+448.90 , 2162.86 , 129.77
+489.71 , -2428.14 , -92.13
+489.71 , -2353.13 , -89.80
+489.71 , -2278.11 , -87.42
+489.71 , -2203.09 , -85.01
+489.71 , -2128.08 , -82.55
+489.71 , -2053.06 , -80.05
+489.71 , -1978.04 , -77.51
+489.71 , -1903.03 , -74.94
+489.71 , -1828.01 , -72.31
+489.71 , -1752.99 , -69.65
+489.71 , -1677.98 , -66.95
+489.71 , -1602.96 , -64.21
+489.71 , -1527.94 , -61.43
+489.71 , -1452.93 , -58.61
+489.71 , -1377.91 , -55.74
+489.71 , -1302.89 , -52.84
+489.71 , -1227.88 , -49.89
+489.71 , -1152.71 , -46.92
+489.71 , -1074.92 , -44.03
+489.71 , -997.13 , -41.10
+489.71 , -918.76 , -38.17
+489.71 , -839.89 , -35.22
+489.71 , -761.03 , -32.23
+489.71 , -682.17 , -29.19
+489.71 , -603.30 , -26.12
+489.71 , -524.44 , -23.01
+489.71 , -445.57 , -19.85
+489.71 , -366.71 , -16.66
+489.71 , -287.85 , -13.42
+489.71 , -208.98 , -10.14
+489.71 , -130.12 , -6.83
+489.71 , -51.26 , -3.47
+489.71 , 27.61 , 0.02
+489.71 , 94.36 , 3.73
+489.71 , 161.11 , 7.48
+489.71 , 227.86 , 11.28
+489.71 , 294.61 , 15.11
+489.71 , 361.36 , 18.99
+489.71 , 428.11 , 22.90
+489.71 , 494.86 , 26.86
+489.71 , 561.61 , 30.86
+489.71 , 628.36 , 34.90
+489.71 , 695.11 , 38.99
+489.71 , 761.86 , 43.11
+489.71 , 828.61 , 47.28
+489.71 , 895.36 , 51.49
+489.71 , 962.11 , 55.73
+489.71 , 1028.86 , 60.03
+489.71 , 1095.61 , 64.36
+489.71 , 1162.36 , 68.73
+489.71 , 1229.11 , 73.15
+489.71 , 1295.86 , 77.60
+489.71 , 1362.61 , 82.10
+489.71 , 1429.36 , 86.64
+489.71 , 1496.11 , 91.22
+489.71 , 1562.86 , 95.85
+489.71 , 1629.61 , 100.51
+489.71 , 1696.36 , 105.22
+489.71 , 1763.12 , 109.96
+489.71 , 1829.87 , 114.75
+489.71 , 1896.62 , 119.58
+489.71 , 1963.37 , 124.45
+489.71 , 2030.12 , 129.37
+489.71 , 2096.87 , 134.32
+489.71 , 2163.62 , 139.32
+816.18 , -2434.19 , -168.29
+816.18 , -2359.18 , -163.49
+816.18 , -2284.16 , -158.66
+816.18 , -2209.14 , -153.77
+816.18 , -2134.13 , -148.85
+816.18 , -2059.11 , -143.89
+816.18 , -1984.09 , -138.89
+816.18 , -1909.08 , -133.85
+816.18 , -1834.06 , -128.76
+816.18 , -1759.04 , -123.64
+816.18 , -1684.03 , -118.47
+816.18 , -1609.01 , -113.27
+816.18 , -1533.99 , -108.02
+816.18 , -1458.98 , -102.73
+816.18 , -1383.96 , -97.41
+816.18 , -1306.83 , -92.22
+816.18 , -1228.07 , -87.13
+816.18 , -1149.30 , -82.00
+816.18 , -1070.43 , -76.84
+816.18 , -991.57 , -71.64
+816.18 , -912.71 , -66.39
+816.18 , -833.84 , -61.11
+816.18 , -754.98 , -55.79
+816.18 , -676.11 , -50.42
+816.18 , -597.25 , -45.02
+816.18 , -518.39 , -39.57
+816.18 , -439.52 , -34.08
+816.18 , -360.66 , -28.55
+816.18 , -281.80 , -22.99
+816.18 , -202.93 , -17.38
+816.18 , -124.07 , -11.73
+816.18 , -45.20 , -6.04
+816.18 , 33.66 , -0.18
+816.18 , 100.41 , 5.92
+816.18 , 167.16 , 12.07
+816.18 , 233.91 , 18.25
+816.18 , 300.66 , 24.48
+816.18 , 367.41 , 30.74
+816.18 , 434.16 , 37.05
+816.18 , 500.91 , 43.40
+816.18 , 567.66 , 49.79
+816.18 , 634.41 , 56.22
+816.18 , 701.16 , 62.70
+816.18 , 767.91 , 69.21
+816.18 , 834.66 , 75.77
+816.18 , 901.41 , 82.37
+816.18 , 968.16 , 89.01
+816.18 , 1034.91 , 95.69
+816.18 , 1101.66 , 102.41
+816.18 , 1168.41 , 109.18
+816.18 , 1235.16 , 115.98
+816.18 , 1301.91 , 122.83
+816.18 , 1368.66 , 129.72
+816.18 , 1435.41 , 136.65
+816.18 , 1502.16 , 143.63
+816.18 , 1568.91 , 150.64
+816.18 , 1635.67 , 157.69
+816.18 , 1702.42 , 164.79
+816.18 , 1769.17 , 171.93
+816.18 , 1835.92 , 179.11
+816.18 , 1902.67 , 186.33
+816.18 , 1969.42 , 193.59
+816.18 , 2036.17 , 200.90
+816.18 , 2102.92 , 208.24
+816.18 , 2169.67 , 215.63
+1020.26 , -2437.98 , -215.54
+1020.26 , -2362.96 , -209.20
+1020.26 , -2287.94 , -202.82
+1020.26 , -2212.93 , -196.40
+1020.26 , -2137.91 , -189.94
+1020.26 , -2062.89 , -183.44
+1020.26 , -1987.88 , -176.90
+1020.26 , -1912.86 , -170.31
+1020.26 , -1837.84 , -163.69
+1020.26 , -1762.83 , -157.02
+1020.26 , -1687.81 , -150.32
+1020.26 , -1612.79 , -143.57
+1020.26 , -1537.56 , -136.81
+1020.26 , -1459.63 , -130.30
+1020.26 , -1381.70 , -123.74
+1020.26 , -1303.24 , -117.20
+1020.26 , -1224.38 , -110.66
+1020.26 , -1145.51 , -104.08
+1020.26 , -1066.65 , -97.46
+1020.26 , -987.79 , -90.80
+1020.26 , -908.92 , -84.10
+1020.26 , -830.06 , -77.36
+1020.26 , -751.20 , -70.58
+1020.26 , -672.33 , -63.75
+1020.26 , -593.47 , -56.89
+1020.26 , -514.61 , -49.99
+1020.26 , -435.74 , -43.04
+1020.26 , -356.88 , -36.06
+1020.26 , -278.01 , -29.03
+1020.26 , -199.15 , -21.96
+1020.26 , -120.29 , -14.86
+1020.26 , -41.42 , -7.71
+1020.26 , 37.44 , -0.37
+1020.26 , 104.19 , 7.23
+1020.26 , 170.94 , 14.87
+1020.26 , 237.69 , 22.54
+1020.26 , 304.44 , 30.26
+1020.26 , 371.19 , 38.02
+1020.26 , 437.94 , 45.83
+1020.26 , 504.69 , 53.67
+1020.26 , 571.44 , 61.56
+1020.26 , 638.19 , 69.48
+1020.26 , 704.94 , 77.45
+1020.26 , 771.69 , 85.46
+1020.26 , 838.44 , 93.51
+1020.26 , 905.19 , 101.61
+1020.26 , 971.94 , 109.74
+1020.26 , 1038.69 , 117.92
+1020.26 , 1105.45 , 126.14
+1020.26 , 1172.20 , 134.39
+1020.26 , 1238.95 , 142.69
+1020.26 , 1305.70 , 151.04
+1020.26 , 1372.45 , 159.42
+1020.26 , 1439.20 , 167.85
+1020.26 , 1505.95 , 176.31
+1020.26 , 1572.70 , 184.82
+1020.26 , 1639.45 , 193.37
+1020.26 , 1706.20 , 201.96
+1020.26 , 1772.95 , 210.59
+1020.26 , 1839.70 , 219.27
+1020.26 , 1906.45 , 227.98
+1020.26 , 1973.20 , 236.73
+1020.26 , 2039.95 , 245.53
+1020.26 , 2106.70 , 254.39
+1020.26 , 2173.45 , 263.26
+1224.27 , -2441.76 , -262.51
+1224.27 , -2366.74 , -254.64
+1224.27 , -2291.72 , -246.73
+1224.27 , -2216.71 , -238.76
+1224.27 , -2141.69 , -230.76
+1224.27 , -2066.67 , -222.71
+1224.27 , -1991.66 , -214.63
+1224.27 , -1916.64 , -206.51
+1224.27 , -1841.62 , -198.35
+1224.27 , -1766.61 , -190.14
+1224.27 , -1690.38 , -182.05
+1224.27 , -1613.28 , -174.03
+1224.27 , -1536.05 , -165.99
+1224.27 , -1457.19 , -158.11
+1224.27 , -1378.32 , -150.20
+1224.27 , -1299.46 , -142.25
+1224.27 , -1220.60 , -134.25
+1224.27 , -1141.73 , -126.21
+1224.27 , -1062.87 , -118.14
+1224.27 , -984.01 , -110.02
+1224.27 , -905.14 , -101.86
+1224.27 , -826.28 , -93.66
+1224.27 , -747.42 , -85.42
+1224.27 , -668.55 , -77.14
+1224.27 , -589.69 , -68.82
+1224.27 , -510.82 , -60.46
+1224.27 , -431.96 , -52.06
+1224.27 , -353.10 , -43.61
+1224.27 , -274.23 , -35.13
+1224.27 , -195.37 , -26.60
+1224.27 , -116.51 , -18.04
+1224.27 , -37.64 , -9.43
+1224.27 , 41.22 , -0.60
+1224.27 , 107.97 , 8.49
+1224.27 , 174.72 , 17.62
+1224.27 , 241.47 , 26.79
+1224.27 , 308.22 , 36.00
+1224.27 , 374.97 , 45.26
+1224.27 , 441.72 , 54.56
+1224.27 , 508.47 , 63.89
+1224.27 , 575.22 , 73.27
+1224.27 , 641.97 , 82.69
+1224.27 , 708.72 , 92.16
+1224.27 , 775.47 , 101.66
+1224.27 , 842.23 , 111.21
+1224.27 , 908.98 , 120.79
+1224.27 , 975.73 , 130.43
+1224.27 , 1042.48 , 140.09
+1224.27 , 1109.23 , 149.81
+1224.27 , 1175.98 , 159.56
+1224.27 , 1242.73 , 169.36
+1224.27 , 1309.48 , 179.19
+1224.27 , 1376.23 , 189.07
+1224.27 , 1442.98 , 198.99
+1224.27 , 1509.73 , 208.95
+1224.27 , 1576.48 , 218.95
+1224.27 , 1643.23 , 229.00
+1224.27 , 1709.98 , 239.07
+1224.27 , 1776.73 , 249.20
+1224.27 , 1843.48 , 259.37
+1224.27 , 1910.23 , 269.59
+1224.27 , 1976.98 , 279.84
+1224.27 , 2043.73 , 290.13
+1224.27 , 2110.48 , 300.47
+1224.27 , 2177.23 , 310.84
+1428.29 , -2445.54 , -309.21
+1428.29 , -2370.52 , -299.80
+1428.29 , -2295.50 , -290.34
+1428.29 , -2220.49 , -280.83
+1428.29 , -2145.47 , -271.30
+1428.29 , -2070.45 , -261.72
+1428.29 , -1995.44 , -252.09
+1428.29 , -1920.31 , -242.45
+1428.29 , -1844.04 , -232.93
+1428.29 , -1767.78 , -223.37
+1428.29 , -1690.00 , -214.00
+1428.29 , -1611.14 , -204.75
+1428.29 , -1532.27 , -195.46
+1428.29 , -1453.41 , -186.13
+1428.29 , -1374.54 , -176.76
+1428.29 , -1295.68 , -167.35
+1428.29 , -1216.82 , -157.89
+1428.29 , -1137.95 , -148.40
+1428.29 , -1059.09 , -138.86
+1428.29 , -980.23 , -129.29
+1428.29 , -901.36 , -119.67
+1428.29 , -822.50 , -110.01
+1428.29 , -743.63 , -100.32
+1428.29 , -664.77 , -90.58
+1428.29 , -585.91 , -80.80
+1428.29 , -507.04 , -70.98
+1428.29 , -428.18 , -61.12
+1428.29 , -349.32 , -51.22
+1428.29 , -270.45 , -41.28
+1428.29 , -191.59 , -31.29
+1428.29 , -112.72 , -21.27
+1428.29 , -33.86 , -11.21
+1428.29 , 45.00 , -0.89
+1428.29 , 111.75 , 9.69
+1428.29 , 178.50 , 20.32
+1428.29 , 245.25 , 30.98
+1428.29 , 312.00 , 41.69
+1428.29 , 378.75 , 52.44
+1428.29 , 445.50 , 63.23
+1428.29 , 512.25 , 74.07
+1428.29 , 579.01 , 84.94
+1428.29 , 645.76 , 95.86
+1428.29 , 712.51 , 106.81
+1428.29 , 779.26 , 117.81
+1428.29 , 846.01 , 128.85
+1428.29 , 912.76 , 139.94
+1428.29 , 979.51 , 151.06
+1428.29 , 1046.26 , 162.22
+1428.29 , 1113.01 , 173.43
+1428.29 , 1179.76 , 184.68
+1428.29 , 1246.51 , 195.97
+1428.29 , 1313.26 , 207.30
+1428.29 , 1380.01 , 218.67
+1428.29 , 1446.76 , 230.08
+1428.29 , 1513.51 , 241.53
+1428.29 , 1580.26 , 253.05
+1428.29 , 1647.01 , 264.56
+1428.29 , 1713.76 , 276.15
+1428.29 , 1780.51 , 287.77
+1428.29 , 1847.26 , 299.43
+1428.29 , 1914.01 , 311.14
+1428.29 , 1980.76 , 322.88
+1428.29 , 2047.51 , 334.69
+1428.29 , 2114.26 , 346.49
+1428.29 , 2181.01 , 358.37
+1632.39 , -2449.32 , -355.65
+1632.39 , -2374.30 , -344.69
+1632.39 , -2299.29 , -333.69
+1632.39 , -2224.27 , -322.64
+1632.39 , -2149.25 , -311.57
+1632.39 , -2073.99 , -300.49
+1632.39 , -1998.55 , -289.39
+1632.39 , -1922.81 , -278.32
+1632.39 , -1843.94 , -267.74
+1632.39 , -1765.08 , -257.10
+1632.39 , -1686.22 , -246.45
+1632.39 , -1607.35 , -235.73
+1632.39 , -1528.49 , -224.99
+1632.39 , -1449.63 , -214.20
+1632.39 , -1370.76 , -203.37
+1632.39 , -1291.90 , -192.49
+1632.39 , -1213.03 , -181.59
+1632.39 , -1134.17 , -170.63
+1632.39 , -1055.31 , -159.64
+1632.39 , -976.44 , -148.61
+1632.39 , -897.58 , -137.53
+1632.39 , -818.72 , -126.42
+1632.39 , -739.85 , -115.26
+1632.39 , -660.99 , -104.07
+1632.39 , -582.12 , -92.83
+1632.39 , -503.26 , -81.55
+1632.39 , -424.40 , -70.23
+1632.39 , -345.53 , -58.88
+1632.39 , -266.67 , -47.47
+1632.39 , -187.81 , -36.04
+1632.39 , -108.94 , -24.55
+1632.39 , -30.08 , -13.03
+1632.39 , 48.79 , -1.23
+1632.39 , 115.54 , 10.85
+1632.39 , 182.29 , 22.97
+1632.39 , 249.04 , 35.13
+1632.39 , 315.79 , 47.33
+1632.39 , 382.54 , 59.58
+1632.39 , 449.29 , 71.86
+1632.39 , 516.04 , 84.19
+1632.39 , 582.79 , 96.56
+1632.39 , 649.54 , 108.97
+1632.39 , 716.29 , 121.42
+1632.39 , 783.04 , 133.91
+1632.39 , 849.79 , 146.45
+1632.39 , 916.54 , 159.03
+1632.39 , 983.29 , 171.64
+1632.39 , 1050.04 , 184.30
+1632.39 , 1116.79 , 197.00
+1632.39 , 1183.54 , 209.74
+1632.39 , 1250.29 , 222.53
+1632.39 , 1317.04 , 235.34
+1632.39 , 1383.79 , 248.23
+1632.39 , 1450.54 , 261.14
+1632.39 , 1517.29 , 274.07
+1632.39 , 1584.04 , 287.06
+1632.39 , 1650.79 , 300.09
+1632.39 , 1717.54 , 313.17
+1632.39 , 1784.29 , 326.30
+1632.39 , 1851.04 , 339.45
+1632.39 , 1917.79 , 352.65
+1632.39 , 1984.54 , 365.88
+1632.39 , 2051.29 , 379.17
+1632.39 , 2118.04 , 392.50
+1632.39 , 2184.79 , 405.87
+1836.41 , -2453.10 , -401.80
+1836.41 , -2378.08 , -389.31
+1836.41 , -2303.07 , -376.77
+1836.41 , -2228.05 , -364.20
+1836.41 , -2153.03 , -351.56
+1836.41 , -2075.96 , -339.32
+1836.41 , -1997.51 , -327.26
+1836.41 , -1919.03 , -315.20
+1836.41 , -1840.16 , -303.15
+1836.41 , -1761.30 , -291.06
+1836.41 , -1682.44 , -278.94
+1836.41 , -1603.57 , -266.77
+1836.41 , -1524.71 , -254.56
+1836.41 , -1445.84 , -242.31
+1836.41 , -1366.98 , -230.03
+1836.41 , -1288.12 , -217.70
+1836.41 , -1209.25 , -205.33
+1836.41 , -1130.39 , -192.92
+1836.41 , -1051.53 , -180.47
+1836.41 , -972.66 , -167.98
+1836.41 , -893.80 , -155.45
+1836.41 , -814.93 , -142.87
+1836.41 , -736.07 , -130.26
+1836.41 , -657.21 , -117.61
+1836.41 , -578.34 , -104.91
+1836.41 , -499.48 , -92.18
+1836.41 , -420.62 , -79.40
+1836.41 , -341.75 , -66.58
+1836.41 , -262.89 , -53.73
+1836.41 , -184.02 , -40.83
+1836.41 , -105.16 , -27.89
+1836.41 , -26.30 , -14.91
+1836.41 , 52.57 , -1.61
+1836.41 , 119.32 , 11.96
+1836.41 , 186.07 , 25.57
+1836.41 , 252.82 , 39.23
+1836.41 , 319.57 , 52.93
+1836.41 , 386.32 , 66.66
+1836.41 , 453.07 , 80.44
+1836.41 , 519.82 , 94.27
+1836.41 , 586.57 , 108.13
+1836.41 , 653.32 , 122.03
+1836.41 , 720.07 , 135.98
+1836.41 , 786.82 , 149.97
+1836.41 , 853.57 , 163.99
+1836.41 , 920.32 , 178.07
+1836.41 , 987.07 , 192.18
+1836.41 , 1053.82 , 206.33
+1836.41 , 1120.57 , 220.53
+1836.41 , 1187.32 , 234.77
+1836.41 , 1254.07 , 249.05
+1836.41 , 1320.82 , 263.36
+1836.41 , 1387.57 , 277.73
+1836.41 , 1454.32 , 292.13
+1836.41 , 1521.07 , 306.56
+1836.41 , 1587.82 , 321.05
+1836.41 , 1654.57 , 335.58
+1836.41 , 1721.32 , 350.15
+1836.41 , 1788.07 , 364.76
+1836.41 , 1854.82 , 379.41
+1836.41 , 1921.57 , 394.10
+1836.41 , 1988.32 , 408.84
+1836.41 , 2055.07 , 423.62
+1836.41 , 2121.82 , 438.44
+1836.41 , 2188.57 , 453.30
+2040.43 , -2456.88 , -447.70
+2040.43 , -2381.87 , -433.66
+2040.43 , -2306.57 , -419.64
+2040.43 , -2228.95 , -406.06
+2040.43 , -2151.34 , -392.46
+2040.43 , -2072.97 , -378.97
+2040.43 , -1994.11 , -365.56
+2040.43 , -1915.25 , -352.11
+2040.43 , -1836.38 , -338.60
+2040.43 , -1757.52 , -325.05
+2040.43 , -1678.65 , -311.48
+2040.43 , -1599.79 , -297.85
+2040.43 , -1520.93 , -284.18
+2040.43 , -1442.06 , -270.48
+2040.43 , -1363.20 , -256.73
+2040.43 , -1284.34 , -242.95
+2040.43 , -1205.47 , -229.12
+2040.43 , -1126.61 , -215.26
+2040.43 , -1047.74 , -201.35
+2040.43 , -968.88 , -187.40
+2040.43 , -890.02 , -173.41
+2040.43 , -811.15 , -159.38
+2040.43 , -732.29 , -145.31
+2040.43 , -653.43 , -131.20
+2040.43 , -574.56 , -117.04
+2040.43 , -495.70 , -102.85
+2040.43 , -416.83 , -88.62
+2040.43 , -337.97 , -74.34
+2040.43 , -259.11 , -60.03
+2040.43 , -180.24 , -45.67
+2040.43 , -101.38 , -31.28
+2040.43 , -22.52 , -16.84
+2040.43 , 56.35 , -2.05
+2040.43 , 123.10 , 13.02
+2040.43 , 189.85 , 28.13
+2040.43 , 256.60 , 43.28
+2040.43 , 323.35 , 58.47
+2040.43 , 390.10 , 73.70
+2040.43 , 456.85 , 88.97
+2040.43 , 523.60 , 104.29
+2040.43 , 590.35 , 119.65
+2040.43 , 657.10 , 135.05
+2040.43 , 723.85 , 150.49
+2040.43 , 790.60 , 165.97
+2040.43 , 857.35 , 181.49
+2040.43 , 924.10 , 197.06
+2040.43 , 990.85 , 212.66
+2040.43 , 1057.60 , 228.32
+2040.43 , 1124.35 , 244.00
+2040.43 , 1191.10 , 259.74
+2040.43 , 1257.85 , 275.51
+2040.43 , 1324.60 , 291.33
+2040.43 , 1391.35 , 307.17
+2040.43 , 1458.10 , 323.06
+2040.43 , 1524.85 , 339.00
+2040.43 , 1591.60 , 354.99
+2040.43 , 1658.35 , 371.02
+2040.43 , 1725.10 , 387.08
+2040.43 , 1791.85 , 403.17
+2040.43 , 1858.60 , 419.32
+2040.43 , 1925.35 , 435.50
+2040.43 , 1992.11 , 451.73
+2040.43 , 2058.86 , 468.01
+2040.43 , 2125.61 , 484.31
+2040.43 , 2192.36 , 500.69
+2244.53 , -2459.57 , -493.57
+2244.53 , -2382.79 , -478.41
+2244.53 , -2305.78 , -463.25
+2244.53 , -2226.92 , -448.50
+2244.53 , -2148.05 , -433.71
+2244.53 , -2069.19 , -418.87
+2244.53 , -1990.33 , -403.98
+2244.53 , -1911.46 , -389.06
+2244.53 , -1832.60 , -374.10
+2244.53 , -1753.74 , -359.11
+2244.53 , -1674.87 , -344.08
+2244.53 , -1596.01 , -328.99
+2244.53 , -1517.14 , -313.86
+2244.53 , -1438.28 , -298.70
+2244.53 , -1359.42 , -283.50
+2244.53 , -1280.55 , -268.27
+2244.53 , -1201.69 , -252.97
+2244.53 , -1122.83 , -237.65
+2244.53 , -1043.96 , -222.28
+2244.53 , -965.10 , -206.87
+2244.53 , -886.23 , -191.43
+2244.53 , -807.37 , -175.94
+2244.53 , -728.51 , -160.41
+2244.53 , -649.64 , -144.84
+2244.53 , -570.78 , -129.23
+2244.53 , -491.92 , -113.58
+2244.53 , -413.05 , -97.89
+2244.53 , -334.19 , -82.15
+2244.53 , -255.32 , -66.38
+2244.53 , -176.46 , -50.57
+2244.53 , -97.60 , -34.71
+2244.53 , -18.73 , -18.82
+2244.53 , 60.13 , -2.53
+2244.53 , 126.88 , 14.03
+2244.53 , 193.63 , 30.63
+2244.53 , 260.38 , 47.28
+2244.53 , 327.13 , 63.96
+2244.53 , 393.88 , 80.69
+2244.53 , 460.63 , 97.46
+2244.53 , 527.38 , 114.27
+2244.53 , 594.13 , 131.12
+2244.53 , 660.88 , 148.01
+2244.53 , 727.63 , 164.95
+2244.53 , 794.38 , 181.92
+2244.53 , 861.13 , 198.94
+2244.53 , 927.88 , 216.00
+2244.53 , 994.63 , 233.11
+2244.53 , 1061.38 , 250.25
+2244.53 , 1128.13 , 267.43
+2244.53 , 1194.88 , 284.64
+2244.53 , 1261.63 , 301.93
+2244.53 , 1328.39 , 319.24
+2244.53 , 1395.14 , 336.57
+2244.53 , 1461.89 , 353.97
+2244.53 , 1528.64 , 371.40
+2244.53 , 1595.39 , 388.88
+2244.53 , 1662.14 , 406.40
+2244.53 , 1728.89 , 423.95
+2244.53 , 1795.64 , 441.55
+2244.53 , 1862.39 , 459.20
+2244.53 , 1929.14 , 476.87
+2244.53 , 1995.89 , 494.59
+2244.53 , 2062.64 , 512.35
+2244.53 , 2129.39 , 530.17
+2244.53 , 2196.14 , 548.01
+2448.55 , -2459.73 , -539.88
+2448.55 , -2380.86 , -523.75
+2448.55 , -2302.00 , -507.56
+2448.55 , -2223.14 , -491.36
+2448.55 , -2144.27 , -475.08
+2448.55 , -2065.41 , -458.81
+2448.55 , -1986.55 , -442.46
+2448.55 , -1907.68 , -426.08
+2448.55 , -1828.82 , -409.66
+2448.55 , -1749.95 , -393.21
+2448.55 , -1671.09 , -376.72
+2448.55 , -1592.23 , -360.17
+2448.55 , -1513.36 , -343.61
+2448.55 , -1434.50 , -326.96
+2448.55 , -1355.64 , -310.32
+2448.55 , -1276.77 , -293.61
+2448.55 , -1197.91 , -276.87
+2448.55 , -1119.04 , -260.09
+2448.55 , -1040.18 , -243.26
+2448.55 , -961.32 , -226.40
+2448.55 , -882.45 , -209.49
+2448.55 , -803.59 , -192.55
+2448.55 , -724.73 , -175.56
+2448.55 , -645.86 , -158.53
+2448.55 , -567.00 , -141.46
+2448.55 , -488.13 , -124.36
+2448.55 , -409.27 , -107.21
+2448.55 , -330.41 , -90.02
+2448.55 , -251.54 , -72.79
+2448.55 , -172.68 , -55.52
+2448.55 , -93.82 , -38.20
+2448.55 , -14.95 , -20.85
+2448.55 , 63.91 , -3.07
+2448.55 , 130.66 , 14.99
+2448.55 , 197.41 , 33.09
+2448.55 , 264.16 , 51.23
+2448.55 , 330.91 , 69.41
+2448.55 , 397.66 , 87.63
+2448.55 , 464.41 , 105.89
+2448.55 , 531.16 , 124.19
+2448.55 , 597.91 , 142.54
+2448.55 , 664.66 , 160.93
+2448.55 , 731.41 , 179.36
+2448.55 , 798.16 , 197.83
+2448.55 , 864.91 , 216.34
+2448.55 , 931.66 , 234.90
+2448.55 , 998.41 , 253.48
+2448.55 , 1065.17 , 272.13
+2448.55 , 1131.92 , 290.81
+2448.55 , 1198.67 , 309.53
+2448.55 , 1265.42 , 328.28
+2448.55 , 1332.17 , 347.08
+2448.55 , 1398.92 , 365.92
+2448.55 , 1465.67 , 384.82
+2448.55 , 1532.42 , 403.74
+2448.55 , 1599.17 , 422.70
+2448.55 , 1665.92 , 441.72
+2448.55 , 1732.67 , 460.78
+2448.55 , 1799.42 , 479.87
+2448.55 , 1866.17 , 499.01
+2448.55 , 1932.92 , 518.17
+2448.55 , 1999.67 , 537.40
+2448.55 , 2066.42 , 556.66
+2448.55 , 2133.17 , 575.96
+2448.55 , 2199.92 , 595.29
+2652.56 , -2455.95 , -587.15
+2652.56 , -2377.08 , -569.56
+2652.56 , -2298.22 , -551.92
+2652.56 , -2219.36 , -534.26
+2652.56 , -2140.49 , -516.54
+2652.56 , -2061.63 , -498.78
+2652.56 , -1982.76 , -481.00
+2652.56 , -1903.90 , -463.16
+2652.56 , -1825.04 , -445.28
+2652.56 , -1746.17 , -427.38
+2652.56 , -1667.31 , -409.42
+2652.56 , -1588.45 , -391.42
+2652.56 , -1509.58 , -373.37
+2652.56 , -1430.72 , -355.29
+2652.56 , -1351.85 , -337.17
+2652.56 , -1272.99 , -319.02
+2652.56 , -1194.13 , -300.82
+2652.56 , -1115.26 , -282.58
+2652.56 , -1036.40 , -264.29
+2652.56 , -957.54 , -245.98
+2652.56 , -878.67 , -227.61
+2652.56 , -799.81 , -209.21
+2652.56 , -720.94 , -190.76
+2652.56 , -642.08 , -172.28
+2652.56 , -563.22 , -153.75
+2652.56 , -484.35 , -135.19
+2652.56 , -405.49 , -116.58
+2652.56 , -326.63 , -97.93
+2652.56 , -247.76 , -79.24
+2652.56 , -168.90 , -60.51
+2652.56 , -90.04 , -41.74
+2652.56 , -11.17 , -22.93
+2652.56 , 67.69 , -3.65
+2652.56 , 134.44 , 15.90
+2652.56 , 201.19 , 35.49
+2652.56 , 267.94 , 55.13
+2652.56 , 334.69 , 74.80
+2652.56 , 401.44 , 94.52
+2652.56 , 468.19 , 114.27
+2652.56 , 534.94 , 134.07
+2652.56 , 601.69 , 153.91
+2652.56 , 668.44 , 173.80
+2652.56 , 735.19 , 193.72
+2652.56 , 801.95 , 213.68
+2652.56 , 868.70 , 233.69
+2652.56 , 935.45 , 253.74
+2652.56 , 1002.20 , 273.83
+2652.56 , 1068.95 , 293.95
+2652.56 , 1135.70 , 314.14
+2652.56 , 1202.45 , 334.35
+2652.56 , 1269.20 , 354.59
+2652.56 , 1335.95 , 374.91
+2652.56 , 1402.70 , 395.24
+2652.56 , 1469.45 , 415.62
+2652.56 , 1536.20 , 436.03
+2652.56 , 1602.95 , 456.49
+2652.56 , 1669.70 , 476.99
+2652.56 , 1736.45 , 497.55
+2652.56 , 1803.20 , 518.15
+2652.56 , 1869.95 , 538.78
+2652.56 , 1936.70 , 559.43
+2652.56 , 2003.45 , 580.15
+2652.56 , 2070.20 , 600.90
+2652.56 , 2136.95 , 621.69
+2652.56 , 2203.70 , 642.53
+2856.67 , -2452.16 , -634.47
+2856.67 , -2373.30 , -615.42
+2856.67 , -2294.44 , -596.34
+2856.67 , -2215.57 , -577.19
+2856.67 , -2136.71 , -558.02
+2856.67 , -2057.85 , -538.83
+2856.67 , -1978.98 , -519.58
+2856.67 , -1900.12 , -500.29
+2856.67 , -1821.25 , -480.95
+2856.67 , -1742.39 , -461.58
+2856.67 , -1663.53 , -442.17
+2856.67 , -1584.66 , -422.71
+2856.67 , -1505.80 , -403.22
+2856.67 , -1426.94 , -383.66
+2856.67 , -1348.07 , -364.10
+2856.67 , -1269.21 , -344.47
+2856.67 , -1190.34 , -324.81
+2856.67 , -1111.48 , -305.11
+2856.67 , -1032.62 , -285.38
+2856.67 , -953.75 , -265.61
+2856.67 , -874.89 , -245.78
+2856.67 , -796.03 , -225.92
+2856.67 , -717.16 , -206.02
+2856.67 , -638.30 , -186.07
+2856.67 , -559.43 , -166.09
+2856.67 , -480.57 , -146.07
+2856.67 , -401.71 , -126.00
+2856.67 , -322.84 , -105.90
+2856.67 , -243.98 , -85.75
+2856.67 , -165.12 , -65.57
+2856.67 , -86.25 , -45.34
+2856.67 , -7.39 , -25.07
+2856.67 , 71.47 , -4.28
+2856.67 , 138.23 , 16.76
+2856.67 , 204.98 , 37.85
+2856.67 , 271.73 , 58.98
+2856.67 , 338.48 , 80.14
+2856.67 , 405.23 , 101.36
+2856.67 , 471.98 , 122.61
+2856.67 , 538.73 , 143.90
+2856.67 , 605.48 , 165.24
+2856.67 , 672.23 , 186.61
+2856.67 , 738.98 , 208.03
+2856.67 , 805.73 , 229.49
+2856.67 , 872.48 , 251.00
+2856.67 , 939.23 , 272.54
+2856.67 , 1005.98 , 294.12
+2856.67 , 1072.73 , 315.75
+2856.67 , 1139.48 , 337.41
+2856.67 , 1206.23 , 359.11
+2856.67 , 1272.98 , 380.86
+2856.67 , 1339.73 , 402.67
+2856.67 , 1406.48 , 424.49
+2856.67 , 1473.23 , 446.36
+2856.67 , 1539.98 , 468.29
+2856.67 , 1606.73 , 490.23
+2856.67 , 1673.48 , 512.23
+2856.67 , 1740.23 , 534.27
+2856.67 , 1806.98 , 556.36
+2856.67 , 1873.73 , 578.48
+2856.67 , 1940.48 , 600.64
+2856.67 , 2007.23 , 622.86
+2856.67 , 2073.98 , 645.09
+2856.67 , 2140.73 , 667.40
+2856.67 , 2207.48 , 689.71
+3060.68 , -2448.38 , -681.85
+3060.68 , -2369.52 , -661.34
+3060.68 , -2290.66 , -640.80
+3060.68 , -2211.79 , -620.20
+3060.68 , -2132.93 , -599.59
+3060.68 , -2054.06 , -578.91
+3060.68 , -1975.20 , -558.21
+3060.68 , -1896.34 , -537.45
+3060.68 , -1817.47 , -516.65
+3060.68 , -1738.61 , -495.83
+3060.68 , -1659.75 , -474.96
+3060.68 , -1580.88 , -454.03
+3060.68 , -1502.02 , -433.09
+3060.68 , -1423.15 , -412.09
+3060.68 , -1344.29 , -391.08
+3060.68 , -1265.43 , -369.98
+3060.68 , -1186.56 , -348.87
+3060.68 , -1107.70 , -327.71
+3060.68 , -1028.84 , -306.52
+3060.68 , -949.97 , -285.28
+3060.68 , -871.11 , -264.00
+3060.68 , -792.25 , -242.68
+3060.68 , -713.38 , -221.32
+3060.68 , -634.52 , -199.92
+3060.68 , -555.65 , -178.48
+3060.68 , -476.79 , -157.00
+3060.68 , -397.93 , -135.48
+3060.68 , -319.06 , -113.92
+3060.68 , -240.20 , -92.31
+3060.68 , -161.34 , -70.67
+3060.68 , -82.47 , -48.98
+3060.68 , -3.61 , -27.26
+3060.68 , 75.26 , -4.96
+3060.68 , 142.01 , 17.58
+3060.68 , 208.76 , 40.16
+3060.68 , 275.51 , 62.78
+3060.68 , 342.26 , 85.44
+3060.68 , 409.01 , 108.15
+3060.68 , 475.76 , 130.89
+3060.68 , 542.51 , 153.68
+3060.68 , 609.26 , 176.51
+3060.68 , 676.01 , 199.38
+3060.68 , 742.76 , 222.29
+3060.68 , 809.51 , 245.25
+3060.68 , 876.26 , 268.25
+3060.68 , 943.01 , 291.27
+3060.68 , 1009.76 , 314.37
+3060.68 , 1076.51 , 337.47
+3060.68 , 1143.26 , 360.64
+3060.68 , 1210.01 , 383.83
+3060.68 , 1276.76 , 407.07
+3060.68 , 1343.51 , 430.36
+3060.68 , 1410.26 , 453.70
+3060.68 , 1477.01 , 477.07
+3060.68 , 1543.76 , 500.48
+3060.68 , 1610.51 , 523.94
+3060.68 , 1677.26 , 547.42
+3060.68 , 1744.01 , 570.96
+3060.68 , 1810.76 , 594.54
+3060.68 , 1877.51 , 618.14
+3060.68 , 1944.26 , 641.80
+3060.68 , 2011.01 , 665.50
+3060.68 , 2077.76 , 689.25
+3060.68 , 2144.51 , 713.02
+3060.68 , 2211.26 , 736.85
+3264.70 , -2444.60 , -729.27
+3264.70 , -2365.74 , -707.30
+3264.70 , -2286.87 , -685.30
+3264.70 , -2208.01 , -663.26
+3264.70 , -2129.15 , -641.17
+3264.70 , -2050.28 , -619.06
+3264.70 , -1971.42 , -596.87
+3264.70 , -1892.56 , -574.68
+3264.70 , -1813.69 , -552.42
+3264.70 , -1734.83 , -530.14
+3264.70 , -1655.97 , -507.81
+3264.70 , -1577.10 , -485.45
+3264.70 , -1498.24 , -463.02
+3264.70 , -1419.37 , -440.57
+3264.70 , -1340.51 , -418.09
+3264.70 , -1261.65 , -395.54
+3264.70 , -1182.78 , -372.97
+3264.70 , -1103.92 , -350.37
+3264.70 , -1025.06 , -327.72
+3264.70 , -946.19 , -305.02
+3264.70 , -867.33 , -282.28
+3264.70 , -788.46 , -259.50
+3264.70 , -709.60 , -236.68
+3264.70 , -630.74 , -213.82
+3264.70 , -551.87 , -190.93
+3264.70 , -473.01 , -167.99
+3264.70 , -394.15 , -145.00
+3264.70 , -315.28 , -121.98
+3264.70 , -236.42 , -98.92
+3264.70 , -157.55 , -75.82
+3264.70 , -78.69 , -52.68
+3264.70 , 0.17 , -29.49
+3264.70 , 79.04 , -5.69
+3264.70 , 145.79 , 18.34
+3264.70 , 212.54 , 42.42
+3264.70 , 279.29 , 66.53
+3264.70 , 346.04 , 90.69
+3264.70 , 412.79 , 114.89
+3264.70 , 479.54 , 139.13
+3264.70 , 546.29 , 163.41
+3264.70 , 613.04 , 187.73
+3264.70 , 679.79 , 212.10
+3264.70 , 746.54 , 236.52
+3264.70 , 813.29 , 260.96
+3264.70 , 880.04 , 285.45
+3264.70 , 946.79 , 309.96
+3264.70 , 1013.54 , 334.55
+3264.70 , 1080.29 , 359.16
+3264.70 , 1147.04 , 383.82
+3264.70 , 1213.79 , 408.51
+3264.70 , 1280.54 , 433.26
+3264.70 , 1347.29 , 458.04
+3264.70 , 1414.04 , 482.85
+3264.70 , 1480.79 , 507.73
+3264.70 , 1547.54 , 532.63
+3264.70 , 1614.29 , 557.58
+3264.70 , 1681.04 , 582.55
+3264.70 , 1747.79 , 607.58
+3264.70 , 1814.54 , 632.65
+3264.70 , 1881.29 , 657.77
+3264.70 , 1948.04 , 682.91
+3264.70 , 2014.79 , 708.13
+3264.70 , 2081.54 , 733.34
+3264.70 , 2148.29 , 758.63
+3264.70 , 2215.05 , 783.95
+3468.80 , -2440.82 , -776.75
+3468.80 , -2361.96 , -753.32
+3468.80 , -2283.09 , -729.87
+3468.80 , -2204.23 , -706.37
+3468.80 , -2125.36 , -682.82
+3468.80 , -2046.50 , -659.25
+3468.80 , -1967.64 , -635.62
+3468.80 , -1888.77 , -611.95
+3468.80 , -1809.91 , -588.23
+3468.80 , -1731.05 , -564.49
+3468.80 , -1652.18 , -540.70
+3468.80 , -1573.32 , -516.88
+3468.80 , -1494.46 , -493.02
+3468.80 , -1415.59 , -469.11
+3468.80 , -1336.73 , -445.15
+3468.80 , -1257.86 , -421.16
+3468.80 , -1179.00 , -397.13
+3468.80 , -1100.14 , -373.07
+3468.80 , -1021.27 , -348.94
+3468.80 , -942.41 , -324.78
+3468.80 , -863.55 , -300.60
+3468.80 , -784.68 , -276.38
+3468.80 , -705.82 , -252.09
+3468.80 , -626.95 , -227.78
+3468.80 , -548.09 , -203.42
+3468.80 , -469.23 , -179.02
+3468.80 , -390.36 , -154.58
+3468.80 , -311.50 , -130.10
+3468.80 , -232.64 , -105.58
+3468.80 , -153.77 , -81.02
+3468.80 , -74.91 , -56.42
+3468.80 , 3.96 , -31.78
+3468.80 , 82.82 , -6.47
+3468.80 , 149.57 , 19.06
+3468.80 , 216.32 , 44.62
+3468.80 , 283.07 , 70.24
+3468.80 , 349.82 , 95.89
+3468.80 , 416.57 , 121.58
+3468.80 , 483.32 , 147.32
+3468.80 , 550.07 , 173.09
+3468.80 , 616.82 , 198.91
+3468.80 , 683.57 , 224.77
+3468.80 , 750.32 , 250.67
+3468.80 , 817.07 , 276.61
+3468.80 , 883.82 , 302.59
+3468.80 , 950.57 , 328.62
+3468.80 , 1017.32 , 354.69
+3468.80 , 1084.07 , 380.79
+3468.80 , 1150.82 , 406.94
+3468.80 , 1217.57 , 433.14
+3468.80 , 1284.32 , 459.36
+3468.80 , 1351.07 , 485.63
+3468.80 , 1417.82 , 511.95
+3468.80 , 1484.57 , 538.32
+3468.80 , 1551.33 , 564.71
+3468.80 , 1618.08 , 591.15
+3468.80 , 1684.83 , 617.64
+3468.80 , 1751.58 , 644.15
+3468.80 , 1818.33 , 670.74
+3468.80 , 1885.08 , 697.32
+3468.80 , 1951.83 , 723.98
+3468.80 , 2018.58 , 750.66
+3468.80 , 2085.33 , 777.39
+3468.80 , 2152.08 , 804.17
+3468.80 , 2218.83 , 831.00
+3672.82 , -2437.04 , -824.28
+3672.82 , -2358.17 , -799.41
+3672.82 , -2279.31 , -774.48
+3672.82 , -2200.45 , -749.52
+3672.82 , -2121.58 , -724.53
+3672.82 , -2042.72 , -699.48
+3672.82 , -1963.86 , -674.39
+3672.82 , -1884.99 , -649.29
+3672.82 , -1806.13 , -624.11
+3672.82 , -1727.27 , -598.91
+3672.82 , -1648.40 , -573.66
+3672.82 , -1569.54 , -548.38
+3672.82 , -1490.67 , -523.06
+3672.82 , -1411.81 , -497.69
+3672.82 , -1332.95 , -472.29
+3672.82 , -1254.08 , -446.82
+3672.82 , -1175.22 , -421.35
+3672.82 , -1096.36 , -395.81
+3672.82 , -1017.49 , -370.24
+3672.82 , -938.63 , -344.63
+3672.82 , -859.76 , -318.97
+3672.82 , -780.90 , -293.28
+3672.82 , -702.04 , -267.55
+3672.82 , -623.17 , -241.78
+3672.82 , -544.31 , -215.96
+3672.82 , -465.45 , -190.11
+3672.82 , -386.58 , -164.21
+3672.82 , -307.72 , -138.28
+3672.82 , -228.85 , -112.30
+3672.82 , -149.99 , -86.28
+3672.82 , -71.13 , -60.22
+3672.82 , 7.74 , -34.12
+3672.82 , 86.60 , -7.30
+3672.82 , 153.35 , 19.72
+3672.82 , 220.10 , 46.79
+3672.82 , 286.85 , 73.89
+3672.82 , 353.60 , 101.04
+3672.82 , 420.35 , 128.23
+3672.82 , 487.10 , 155.45
+3672.82 , 553.85 , 182.72
+3672.82 , 620.60 , 210.05
+3672.82 , 687.35 , 237.40
+3672.82 , 754.10 , 264.79
+3672.82 , 820.85 , 292.22
+3672.82 , 887.60 , 319.71
+3672.82 , 954.35 , 347.23
+3672.82 , 1021.10 , 374.77
+3672.82 , 1087.85 , 402.39
+3672.82 , 1154.60 , 430.03
+3672.82 , 1221.35 , 457.71
+3672.82 , 1288.11 , 485.45
+3672.82 , 1354.86 , 513.21
+3672.82 , 1421.61 , 541.02
+3672.82 , 1488.36 , 568.88
+3672.82 , 1555.11 , 596.76
+3672.82 , 1621.86 , 624.71
+3672.82 , 1688.61 , 652.67
+3672.82 , 1755.36 , 680.69
+3672.82 , 1822.11 , 708.74
+3672.82 , 1888.86 , 736.84
+3672.82 , 1955.61 , 764.99
+3672.82 , 2022.36 , 793.19
+3672.82 , 2089.11 , 821.41
+3672.82 , 2155.86 , 849.67
+3672.82 , 2222.61 , 877.99
+3876.84 , -2433.26 , -871.87
+3876.84 , -2354.39 , -845.52
+3876.84 , -2275.53 , -819.15
+3876.84 , -2196.67 , -792.73
+3876.84 , -2117.80 , -766.29
+3876.84 , -2038.94 , -739.77
+3876.84 , -1960.08 , -713.23
+3876.84 , -1881.21 , -686.66
+3876.84 , -1802.35 , -660.03
+3876.84 , -1723.48 , -633.36
+3876.84 , -1644.62 , -606.68
+3876.84 , -1565.76 , -579.92
+3876.84 , -1486.89 , -553.14
+3876.84 , -1408.03 , -526.30
+3876.84 , -1329.17 , -499.45
+3876.84 , -1250.30 , -472.55
+3876.84 , -1171.44 , -445.59
+3876.84 , -1092.57 , -418.62
+3876.84 , -1013.71 , -391.59
+3876.84 , -934.85 , -364.52
+3876.84 , -855.98 , -337.40
+3876.84 , -777.12 , -310.25
+3876.84 , -698.26 , -283.06
+3876.84 , -619.39 , -255.83
+3876.84 , -540.53 , -228.56
+3876.84 , -461.66 , -201.25
+3876.84 , -382.80 , -173.89
+3876.84 , -303.94 , -146.50
+3876.84 , -225.07 , -119.06
+3876.84 , -146.21 , -91.59
+3876.84 , -67.35 , -64.07
+3876.84 , 11.52 , -36.51
+3876.84 , 90.38 , -8.18
+3876.84 , 157.13 , 20.34
+3876.84 , 223.88 , 48.90
+3876.84 , 290.63 , 77.50
+3876.84 , 357.38 , 106.14
+3876.84 , 424.13 , 134.82
+3876.84 , 490.88 , 163.54
+3876.84 , 557.63 , 192.31
+3876.84 , 624.38 , 221.12
+3876.84 , 691.13 , 249.96
+3876.84 , 757.88 , 278.85
+3876.84 , 824.63 , 307.78
+3876.84 , 891.38 , 336.74
+3876.84 , 958.13 , 365.78
+3876.84 , 1024.89 , 394.83
+3876.84 , 1091.64 , 423.91
+3876.84 , 1158.39 , 453.07
+3876.84 , 1225.14 , 482.24
+3876.84 , 1291.89 , 511.47
+3876.84 , 1358.64 , 540.72
+3876.84 , 1425.39 , 570.02
+3876.84 , 1492.14 , 599.37
+3876.84 , 1558.89 , 628.76
+3876.84 , 1625.64 , 658.18
+3876.84 , 1692.39 , 687.67
+3876.84 , 1759.14 , 717.17
+3876.84 , 1825.89 , 746.73
+3876.84 , 1892.64 , 776.32
+3876.84 , 1959.39 , 805.96
+3876.84 , 2026.14 , 835.64
+3876.84 , 2092.89 , 865.35
+3876.84 , 2159.64 , 895.11
+3876.84 , 2226.39 , 924.92
+4080.85 , -2429.48 , -919.50
+4080.85 , -2350.61 , -891.72
+4080.85 , -2271.75 , -863.86
+4080.85 , -2192.89 , -835.98
+4080.85 , -2114.02 , -808.08
+4080.85 , -2035.16 , -780.13
+4080.85 , -1956.29 , -752.13
+4080.85 , -1877.43 , -724.08
+4080.85 , -1798.57 , -696.01
+4080.85 , -1719.70 , -667.89
+4080.85 , -1640.84 , -639.72
+4080.85 , -1561.98 , -611.52
+4080.85 , -1483.11 , -583.28
+4080.85 , -1404.25 , -554.99
+4080.85 , -1325.38 , -526.67
+4080.85 , -1246.52 , -498.31
+4080.85 , -1167.66 , -469.90
+4080.85 , -1088.79 , -441.46
+4080.85 , -1009.93 , -412.98
+4080.85 , -931.07 , -384.45
+4080.85 , -852.20 , -355.89
+4080.85 , -773.34 , -327.28
+4080.85 , -694.47 , -298.63
+4080.85 , -615.61 , -269.94
+4080.85 , -536.75 , -241.21
+4080.85 , -457.88 , -212.44
+4080.85 , -379.02 , -183.62
+4080.85 , -300.16 , -154.77
+4080.85 , -221.29 , -125.88
+4080.85 , -142.43 , -96.95
+4080.85 , -63.56 , -67.97
+4080.85 , 15.30 , -38.95
+4080.85 , 94.16 , -9.10
+4080.85 , 160.91 , 20.91
+4080.85 , 227.66 , 50.96
+4080.85 , 294.41 , 81.05
+4080.85 , 361.16 , 111.19
+4080.85 , 427.91 , 141.36
+4080.85 , 494.66 , 171.58
+4080.85 , 561.41 , 201.85
+4080.85 , 628.16 , 232.13
+4080.85 , 694.91 , 262.48
+4080.85 , 761.67 , 292.86
+4080.85 , 828.42 , 323.29
+4080.85 , 895.17 , 353.76
+4080.85 , 961.92 , 384.26
+4080.85 , 1028.67 , 414.83
+4080.85 , 1095.42 , 445.40
+4080.85 , 1162.17 , 476.04
+4080.85 , 1228.92 , 506.71
+4080.85 , 1295.67 , 537.43
+4080.85 , 1362.42 , 568.19
+4080.85 , 1429.17 , 598.98
+4080.85 , 1495.92 , 629.84
+4080.85 , 1562.67 , 660.70
+4080.85 , 1629.42 , 691.63
+4080.85 , 1696.17 , 722.59
+4080.85 , 1762.92 , 753.60
+4080.85 , 1829.67 , 784.65
+4080.85 , 1896.42 , 815.76
+4080.85 , 1963.17 , 846.88
+4080.85 , 2029.92 , 878.06
+4080.85 , 2096.67 , 909.26
+4080.85 , 2163.42 , 940.51
+4080.85 , 2230.17 , 971.80
+4268.63 , -2426.00 , -963.37
+4268.63 , -2347.13 , -934.25
+4268.63 , -2268.27 , -905.05
+4268.63 , -2189.41 , -875.85
+4268.63 , -2110.54 , -846.58
+4268.63 , -2031.68 , -817.29
+4268.63 , -1952.81 , -787.95
+4268.63 , -1873.95 , -758.56
+4268.63 , -1795.09 , -729.14
+4268.63 , -1716.22 , -699.68
+4268.63 , -1637.36 , -670.19
+4268.63 , -1558.50 , -640.63
+4268.63 , -1479.63 , -611.05
+4268.63 , -1400.77 , -581.44
+4268.63 , -1321.90 , -551.76
+4268.63 , -1243.04 , -522.06
+4268.63 , -1164.18 , -492.33
+4268.63 , -1085.31 , -462.53
+4268.63 , -1006.45 , -432.70
+4268.63 , -927.59 , -402.83
+4268.63 , -848.72 , -372.93
+4268.63 , -769.86 , -342.98
+4268.63 , -690.99 , -312.99
+4268.63 , -612.13 , -282.97
+4268.63 , -533.27 , -252.89
+4268.63 , -454.40 , -222.78
+4268.63 , -375.54 , -192.63
+4268.63 , -296.68 , -162.43
+4268.63 , -217.81 , -132.20
+4268.63 , -138.95 , -101.92
+4268.63 , -60.08 , -71.61
+4268.63 , 18.78 , -41.21
+4268.63 , 97.64 , -10.00
+4268.63 , 164.39 , 21.38
+4268.63 , 231.14 , 52.81
+4268.63 , 297.89 , 84.28
+4268.63 , 364.64 , 115.79
+4268.63 , 431.39 , 147.34
+4268.63 , 498.14 , 178.93
+4268.63 , 564.89 , 210.56
+4268.63 , 631.64 , 242.24
+4268.63 , 698.39 , 273.96
+4268.63 , 765.15 , 305.71
+4268.63 , 831.90 , 337.51
+4268.63 , 898.65 , 369.35
+4268.63 , 965.40 , 401.25
+4268.63 , 1032.15 , 433.17
+4268.63 , 1098.90 , 465.13
+4268.63 , 1165.65 , 497.15
+4268.63 , 1232.40 , 529.19
+4268.63 , 1299.15 , 561.27
+4268.63 , 1365.90 , 593.41
+4268.63 , 1432.65 , 625.59
+4268.63 , 1499.40 , 657.80
+4268.63 , 1566.15 , 690.06
+4268.63 , 1632.90 , 722.36
+4268.63 , 1699.65 , 754.69
+4268.63 , 1766.40 , 787.07
+4268.63 , 1833.15 , 819.50
+4268.63 , 1899.90 , 851.97
+4268.63 , 1966.65 , 884.47
+4268.63 , 2033.40 , 917.02
+4268.63 , 2100.15 , 949.61
+4268.63 , 2166.90 , 982.23
+4268.63 , 2233.65 , 1014.90
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G2.vemo b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G2.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..0683b9b6d09fbab33fbc6ee9e248a5be1c47f01d
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G2.vemo
@@ -0,0 +1,2016 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00 , -2373.37 , 23.82
+0.00 , -2299.72 , 22.44
+0.00 , -2226.08 , 21.09
+0.00 , -2152.43 , 19.79
+0.00 , -2078.78 , 18.53
+0.00 , -2005.14 , 17.31
+0.00 , -1931.49 , 16.13
+0.00 , -1857.84 , 14.99
+0.00 , -1784.20 , 13.89
+0.00 , -1710.55 , 12.84
+0.00 , -1636.90 , 11.83
+0.00 , -1563.26 , 10.85
+0.00 , -1489.61 , 9.92
+0.00 , -1415.96 , 9.04
+0.00 , -1342.32 , 8.19
+0.00 , -1268.67 , 7.38
+0.00 , -1195.02 , 6.62
+0.00 , -1121.38 , 5.90
+0.00 , -1047.73 , 5.21
+0.00 , -974.08 , 4.57
+0.00 , -900.44 , 3.98
+0.00 , -826.79 , 3.42
+0.00 , -752.36 , 2.90
+0.00 , -675.64 , 2.43
+0.00 , -598.92 , 2.00
+0.00 , -522.04 , 1.61
+0.00 , -445.08 , 1.26
+0.00 , -368.12 , 0.95
+0.00 , -291.16 , 0.69
+0.00 , -214.20 , 0.46
+0.00 , -137.24 , 0.28
+0.00 , -60.28 , 0.14
+0.00 , 16.68 , 0.09
+0.00 , 84.68 , 0.21
+0.00 , 152.68 , 0.38
+0.00 , 220.68 , 0.58
+0.00 , 288.69 , 0.83
+0.00 , 356.69 , 1.12
+0.00 , 424.69 , 1.45
+0.00 , 492.69 , 1.82
+0.00 , 560.69 , 2.23
+0.00 , 628.70 , 2.69
+0.00 , 696.70 , 3.19
+0.00 , 764.70 , 3.72
+0.00 , 832.70 , 4.30
+0.00 , 900.70 , 4.93
+0.00 , 968.70 , 5.59
+0.00 , 1036.71 , 6.29
+0.00 , 1104.71 , 7.04
+0.00 , 1172.71 , 7.83
+0.00 , 1240.71 , 8.65
+0.00 , 1308.71 , 9.52
+0.00 , 1376.71 , 10.44
+0.00 , 1444.72 , 11.39
+0.00 , 1512.72 , 12.38
+0.00 , 1580.72 , 13.42
+0.00 , 1648.72 , 14.50
+0.00 , 1716.72 , 15.62
+0.00 , 1784.72 , 16.78
+0.00 , 1852.73 , 17.98
+0.00 , 1920.73 , 19.22
+0.00 , 1988.73 , 20.51
+0.00 , 2056.73 , 21.84
+0.00 , 2124.73 , 23.20
+0.00 , 2192.74 , 24.61
+40.81 , -2374.05 , 13.97
+40.81 , -2300.40 , 12.90
+40.81 , -2226.76 , 11.87
+40.81 , -2153.11 , 10.88
+40.81 , -2079.46 , 9.93
+40.81 , -2005.82 , 9.02
+40.81 , -1932.17 , 8.15
+40.81 , -1858.52 , 7.33
+40.81 , -1784.88 , 6.54
+40.81 , -1711.23 , 5.80
+40.81 , -1637.58 , 5.10
+40.81 , -1563.94 , 4.44
+40.81 , -1490.29 , 3.83
+40.81 , -1416.64 , 3.25
+40.81 , -1343.00 , 2.72
+40.81 , -1269.35 , 2.22
+40.81 , -1195.70 , 1.77
+40.81 , -1122.06 , 1.37
+40.81 , -1048.41 , 1.00
+40.81 , -974.76 , 0.68
+40.81 , -900.88 , 0.40
+40.81 , -826.94 , 0.15
+40.81 , -752.24 , -0.05
+40.81 , -675.28 , -0.22
+40.81 , -598.32 , -0.36
+40.81 , -521.36 , -0.45
+40.81 , -444.40 , -0.50
+40.81 , -367.44 , -0.51
+40.81 , -290.48 , -0.48
+40.81 , -213.52 , -0.41
+40.81 , -136.56 , -0.30
+40.81 , -59.60 , -0.15
+40.81 , 17.36 , 0.10
+40.81 , 85.36 , 0.52
+40.81 , 153.36 , 0.99
+40.81 , 221.37 , 1.49
+40.81 , 289.37 , 2.04
+40.81 , 357.37 , 2.63
+40.81 , 425.37 , 3.26
+40.81 , 493.37 , 3.93
+40.81 , 561.37 , 4.64
+40.81 , 629.38 , 5.40
+40.81 , 697.38 , 6.20
+40.81 , 765.38 , 7.03
+40.81 , 833.38 , 7.91
+40.81 , 901.38 , 8.83
+40.81 , 969.38 , 9.80
+40.81 , 1037.39 , 10.80
+40.81 , 1105.39 , 11.84
+40.81 , 1173.39 , 12.93
+40.81 , 1241.39 , 14.06
+40.81 , 1309.39 , 15.23
+40.81 , 1377.39 , 16.44
+40.81 , 1445.40 , 17.69
+40.81 , 1513.40 , 18.99
+40.81 , 1581.40 , 20.32
+40.81 , 1649.40 , 21.70
+40.81 , 1717.40 , 23.12
+40.81 , 1785.41 , 24.58
+40.81 , 1853.41 , 26.08
+40.81 , 1921.41 , 27.63
+40.81 , 1989.41 , 29.21
+40.81 , 2057.41 , 30.84
+40.81 , 2125.41 , 32.50
+40.81 , 2193.42 , 34.21
+81.62 , -2374.73 , 4.13
+81.62 , -2301.08 , 3.37
+81.62 , -2227.44 , 2.65
+81.62 , -2153.79 , 1.98
+81.62 , -2080.14 , 1.36
+81.62 , -2006.50 , 0.77
+81.62 , -1932.85 , 0.23
+81.62 , -1859.20 , -0.28
+81.62 , -1785.56 , -0.74
+81.62 , -1711.91 , -1.16
+81.62 , -1638.26 , -1.54
+81.62 , -1564.62 , -1.88
+81.62 , -1490.97 , -2.18
+81.62 , -1417.32 , -2.44
+81.62 , -1343.68 , -2.66
+81.62 , -1270.03 , -2.84
+81.62 , -1196.39 , -2.97
+81.62 , -1122.74 , -3.07
+81.62 , -1049.09 , -3.13
+81.62 , -975.45 , -3.14
+81.62 , -901.13 , -3.12
+81.62 , -826.66 , -3.06
+81.62 , -751.56 , -2.97
+81.62 , -674.60 , -2.85
+81.62 , -597.64 , -2.69
+81.62 , -520.68 , -2.49
+81.62 , -443.72 , -2.25
+81.62 , -366.76 , -1.96
+81.62 , -289.80 , -1.64
+81.62 , -212.84 , -1.28
+81.62 , -135.88 , -0.87
+81.62 , -58.92 , -0.43
+81.62 , 18.04 , 0.11
+81.62 , 86.04 , 0.84
+81.62 , 154.04 , 1.60
+81.62 , 222.05 , 2.40
+81.62 , 290.05 , 3.25
+81.62 , 358.05 , 4.14
+81.62 , 426.05 , 5.07
+81.62 , 494.05 , 6.04
+81.62 , 562.05 , 7.05
+81.62 , 630.06 , 8.11
+81.62 , 698.06 , 9.20
+81.62 , 766.06 , 10.34
+81.62 , 834.06 , 11.52
+81.62 , 902.06 , 12.74
+81.62 , 970.07 , 14.00
+81.62 , 1038.07 , 15.31
+81.62 , 1106.07 , 16.65
+81.62 , 1174.07 , 18.04
+81.62 , 1242.07 , 19.46
+81.62 , 1310.07 , 20.93
+81.62 , 1378.08 , 22.44
+81.62 , 1446.08 , 24.00
+81.62 , 1514.08 , 25.59
+81.62 , 1582.08 , 27.23
+81.62 , 1650.08 , 28.90
+81.62 , 1718.08 , 30.62
+81.62 , 1786.09 , 32.38
+81.62 , 1854.09 , 34.18
+81.62 , 1922.09 , 36.03
+81.62 , 1990.09 , 37.91
+81.62 , 2058.09 , 39.84
+81.62 , 2126.09 , 41.80
+81.62 , 2194.10 , 43.81
+122.43 , -2375.41 , -5.54
+122.43 , -2301.76 , -5.98
+122.43 , -2228.12 , -6.38
+122.43 , -2154.47 , -6.74
+122.43 , -2080.82 , -7.06
+122.43 , -2007.18 , -7.33
+122.43 , -1933.53 , -7.57
+122.43 , -1859.88 , -7.77
+122.43 , -1786.24 , -7.92
+122.43 , -1712.59 , -8.04
+122.43 , -1638.95 , -8.11
+122.43 , -1565.30 , -8.15
+122.43 , -1491.65 , -8.14
+122.43 , -1418.01 , -8.09
+122.43 , -1344.36 , -8.00
+122.43 , -1270.71 , -7.87
+122.43 , -1197.07 , -7.70
+122.43 , -1123.42 , -7.49
+122.43 , -1049.77 , -7.24
+122.43 , -976.13 , -6.95
+122.43 , -901.37 , -6.63
+122.43 , -826.37 , -6.28
+122.43 , -750.88 , -5.89
+122.43 , -673.92 , -5.47
+122.43 , -596.96 , -5.02
+122.43 , -520.00 , -4.53
+122.43 , -443.04 , -3.99
+122.43 , -366.08 , -3.42
+122.43 , -289.12 , -2.80
+122.43 , -212.16 , -2.15
+122.43 , -135.20 , -1.45
+122.43 , -58.24 , -0.71
+122.43 , 18.72 , 0.12
+122.43 , 86.72 , 1.15
+122.43 , 154.73 , 2.21
+122.43 , 222.73 , 3.31
+122.43 , 290.73 , 4.46
+122.43 , 358.73 , 5.65
+122.43 , 426.73 , 6.88
+122.43 , 494.73 , 8.15
+122.43 , 562.74 , 9.46
+122.43 , 630.74 , 10.82
+122.43 , 698.74 , 12.21
+122.43 , 766.74 , 13.65
+122.43 , 834.74 , 15.13
+122.43 , 902.74 , 16.65
+122.43 , 970.75 , 18.21
+122.43 , 1038.75 , 19.81
+122.43 , 1106.75 , 21.45
+122.43 , 1174.75 , 23.14
+122.43 , 1242.75 , 24.87
+122.43 , 1310.75 , 26.64
+122.43 , 1378.76 , 28.45
+122.43 , 1446.76 , 30.30
+122.43 , 1514.76 , 32.19
+122.43 , 1582.76 , 34.13
+122.43 , 1650.76 , 36.11
+122.43 , 1718.76 , 38.12
+122.43 , 1786.77 , 40.18
+122.43 , 1854.77 , 42.28
+122.43 , 1922.77 , 44.43
+122.43 , 1990.77 , 46.61
+122.43 , 2058.77 , 48.84
+122.43 , 2126.78 , 51.10
+122.43 , 2194.78 , 53.41
+163.24 , -2376.09 , -15.17
+163.24 , -2302.44 , -15.30
+163.24 , -2228.80 , -15.39
+163.24 , -2155.15 , -15.45
+163.24 , -2081.50 , -15.46
+163.24 , -2007.86 , -15.43
+163.24 , -1934.21 , -15.36
+163.24 , -1860.57 , -15.25
+163.24 , -1786.92 , -15.10
+163.24 , -1713.27 , -14.91
+163.24 , -1639.63 , -14.67
+163.24 , -1565.98 , -14.40
+163.24 , -1492.33 , -14.09
+163.24 , -1418.69 , -13.73
+163.24 , -1345.04 , -13.34
+163.24 , -1271.39 , -12.90
+163.24 , -1197.75 , -12.42
+163.24 , -1124.10 , -11.91
+163.24 , -1050.45 , -11.35
+163.24 , -976.81 , -10.75
+163.24 , -901.62 , -10.14
+163.24 , -826.09 , -9.49
+163.24 , -750.20 , -8.81
+163.24 , -673.24 , -8.10
+163.24 , -596.28 , -7.36
+163.24 , -519.32 , -6.57
+163.24 , -442.36 , -5.74
+163.24 , -365.40 , -4.88
+163.24 , -288.44 , -3.97
+163.24 , -211.48 , -3.02
+163.24 , -134.52 , -2.03
+163.24 , -57.56 , -1.00
+163.24 , 19.40 , 0.13
+163.24 , 87.40 , 1.46
+163.24 , 155.41 , 2.82
+163.24 , 223.41 , 4.22
+163.24 , 291.41 , 5.67
+163.24 , 359.41 , 7.16
+163.24 , 427.41 , 8.69
+163.24 , 495.41 , 10.26
+163.24 , 563.42 , 11.87
+163.24 , 631.42 , 13.52
+163.24 , 699.42 , 15.22
+163.24 , 767.42 , 16.95
+163.24 , 835.42 , 18.73
+163.24 , 903.42 , 20.55
+163.24 , 971.43 , 22.41
+163.24 , 1039.43 , 24.31
+163.24 , 1107.43 , 26.26
+163.24 , 1175.43 , 28.24
+163.24 , 1243.43 , 30.27
+163.24 , 1311.44 , 32.34
+163.24 , 1379.44 , 34.45
+163.24 , 1447.44 , 36.60
+163.24 , 1515.44 , 38.79
+163.24 , 1583.44 , 41.03
+163.24 , 1651.44 , 43.30
+163.24 , 1719.45 , 45.62
+163.24 , 1787.45 , 47.98
+163.24 , 1855.45 , 50.38
+163.24 , 1923.45 , 52.82
+163.24 , 1991.45 , 55.31
+163.24 , 2059.45 , 57.83
+163.24 , 2127.46 , 60.40
+163.24 , 2195.46 , 63.01
+204.04 , -2376.77 , -24.79
+204.04 , -2303.13 , -24.61
+204.04 , -2229.48 , -24.40
+204.04 , -2155.83 , -24.15
+204.04 , -2082.19 , -23.85
+204.04 , -2008.54 , -23.51
+204.04 , -1934.89 , -23.14
+204.04 , -1861.25 , -22.72
+204.04 , -1787.60 , -22.26
+204.04 , -1713.95 , -21.76
+204.04 , -1640.31 , -21.22
+204.04 , -1566.66 , -20.64
+204.04 , -1493.01 , -20.02
+204.04 , -1419.37 , -19.36
+204.04 , -1345.72 , -18.66
+204.04 , -1272.07 , -17.92
+204.04 , -1198.43 , -17.13
+204.04 , -1124.78 , -16.31
+204.04 , -1051.13 , -15.45
+204.04 , -977.49 , -14.54
+204.04 , -901.87 , -13.64
+204.04 , -825.81 , -12.70
+204.04 , -749.52 , -11.73
+204.04 , -672.56 , -10.73
+204.04 , -595.60 , -9.69
+204.04 , -518.64 , -8.61
+204.04 , -441.68 , -7.50
+204.04 , -364.72 , -6.34
+204.04 , -287.76 , -5.13
+204.04 , -210.80 , -3.89
+204.04 , -133.84 , -2.61
+204.04 , -56.88 , -1.29
+204.04 , 20.08 , 0.14
+204.04 , 88.08 , 1.76
+204.04 , 156.09 , 3.43
+204.04 , 224.09 , 5.13
+204.04 , 292.09 , 6.88
+204.04 , 360.09 , 8.66
+204.04 , 428.09 , 10.49
+204.04 , 496.09 , 12.36
+204.04 , 564.10 , 14.27
+204.04 , 632.10 , 16.23
+204.04 , 700.10 , 18.22
+204.04 , 768.10 , 20.26
+204.04 , 836.10 , 22.33
+204.04 , 904.11 , 24.45
+204.04 , 972.11 , 26.61
+204.04 , 1040.11 , 28.82
+204.04 , 1108.11 , 31.06
+204.04 , 1176.11 , 33.35
+204.04 , 1244.11 , 35.67
+204.04 , 1312.12 , 38.04
+204.04 , 1380.12 , 40.45
+204.04 , 1448.12 , 42.90
+204.04 , 1516.12 , 45.39
+204.04 , 1584.12 , 47.93
+204.04 , 1652.12 , 50.50
+204.04 , 1720.13 , 53.12
+204.04 , 1788.13 , 55.78
+204.04 , 1856.13 , 58.48
+204.04 , 1924.13 , 61.22
+204.04 , 1992.13 , 64.00
+204.04 , 2060.13 , 66.83
+204.04 , 2128.14 , 69.69
+204.04 , 2196.14 , 72.60
+244.85 , -2377.45 , -34.40
+244.85 , -2303.81 , -33.92
+244.85 , -2230.16 , -33.40
+244.85 , -2156.51 , -32.83
+244.85 , -2082.87 , -32.23
+244.85 , -2009.22 , -31.59
+244.85 , -1935.57 , -30.91
+244.85 , -1861.93 , -30.18
+244.85 , -1788.28 , -29.42
+244.85 , -1714.63 , -28.61
+244.85 , -1640.99 , -27.77
+244.85 , -1567.34 , -26.88
+244.85 , -1493.69 , -25.95
+244.85 , -1420.05 , -24.98
+244.85 , -1346.40 , -23.97
+244.85 , -1272.75 , -22.92
+244.85 , -1199.11 , -21.83
+244.85 , -1125.46 , -20.70
+244.85 , -1051.81 , -19.53
+244.85 , -978.17 , -18.32
+244.85 , -902.11 , -17.13
+244.85 , -825.52 , -15.91
+244.85 , -748.84 , -14.65
+244.85 , -671.88 , -13.36
+244.85 , -594.92 , -12.03
+244.85 , -517.96 , -10.66
+244.85 , -441.00 , -9.25
+244.85 , -364.04 , -7.79
+244.85 , -287.08 , -6.30
+244.85 , -210.12 , -4.77
+244.85 , -133.16 , -3.19
+244.85 , -56.20 , -1.58
+244.85 , 20.76 , 0.15
+244.85 , 88.77 , 2.07
+244.85 , 156.77 , 4.03
+244.85 , 224.77 , 6.04
+244.85 , 292.77 , 8.08
+244.85 , 360.77 , 10.17
+244.85 , 428.77 , 12.30
+244.85 , 496.78 , 14.47
+244.85 , 564.78 , 16.68
+244.85 , 632.78 , 18.93
+244.85 , 700.78 , 21.22
+244.85 , 768.78 , 23.56
+244.85 , 836.78 , 25.94
+244.85 , 904.79 , 28.36
+244.85 , 972.79 , 30.82
+244.85 , 1040.79 , 33.32
+244.85 , 1108.79 , 35.86
+244.85 , 1176.79 , 38.44
+244.85 , 1244.79 , 41.07
+244.85 , 1312.80 , 43.74
+244.85 , 1380.80 , 46.45
+244.85 , 1448.80 , 49.20
+244.85 , 1516.80 , 51.99
+244.85 , 1584.80 , 54.82
+244.85 , 1652.81 , 57.70
+244.85 , 1720.81 , 60.62
+244.85 , 1788.81 , 63.58
+244.85 , 1856.81 , 66.57
+244.85 , 1924.81 , 69.62
+244.85 , 1992.81 , 72.70
+244.85 , 2060.82 , 75.82
+244.85 , 2128.82 , 78.99
+244.85 , 2196.82 , 82.19
+285.67 , -2378.13 , -44.00
+285.67 , -2304.49 , -43.21
+285.67 , -2230.84 , -42.38
+285.67 , -2157.19 , -41.51
+285.67 , -2083.55 , -40.60
+285.67 , -2009.90 , -39.65
+285.67 , -1936.25 , -38.66
+285.67 , -1862.61 , -37.63
+285.67 , -1788.96 , -36.56
+285.67 , -1715.31 , -35.45
+285.67 , -1641.67 , -34.29
+285.67 , -1568.02 , -33.10
+285.67 , -1494.37 , -31.87
+285.67 , -1420.73 , -30.59
+285.67 , -1347.08 , -29.28
+285.67 , -1273.44 , -27.92
+285.67 , -1199.79 , -26.52
+285.67 , -1126.08 , -25.09
+285.67 , -1052.27 , -23.61
+285.67 , -978.46 , -22.10
+285.67 , -902.07 , -20.62
+285.67 , -825.11 , -19.12
+285.67 , -748.15 , -17.58
+285.67 , -671.19 , -15.99
+285.67 , -594.23 , -14.37
+285.67 , -517.27 , -12.71
+285.67 , -440.31 , -11.00
+285.67 , -363.36 , -9.26
+285.67 , -286.40 , -7.47
+285.67 , -209.44 , -5.64
+285.67 , -132.48 , -3.78
+285.67 , -55.52 , -1.87
+285.67 , 21.44 , 0.16
+285.67 , 89.45 , 2.38
+285.67 , 157.45 , 4.64
+285.67 , 225.45 , 6.94
+285.67 , 293.45 , 9.29
+285.67 , 361.45 , 11.67
+285.67 , 429.45 , 14.10
+285.67 , 497.46 , 16.57
+285.67 , 565.46 , 19.08
+285.67 , 633.46 , 21.63
+285.67 , 701.46 , 24.22
+285.67 , 769.46 , 26.86
+285.67 , 837.47 , 29.54
+285.67 , 905.47 , 32.26
+285.67 , 973.47 , 35.01
+285.67 , 1041.47 , 37.82
+285.67 , 1109.47 , 40.66
+285.67 , 1177.47 , 43.54
+285.67 , 1245.48 , 46.47
+285.67 , 1313.48 , 49.44
+285.67 , 1381.48 , 52.44
+285.67 , 1449.48 , 55.50
+285.67 , 1517.48 , 58.59
+285.67 , 1585.48 , 61.72
+285.67 , 1653.49 , 64.89
+285.67 , 1721.49 , 68.11
+285.67 , 1789.49 , 71.37
+285.67 , 1857.49 , 74.67
+285.67 , 1925.49 , 78.01
+285.67 , 1993.49 , 81.39
+285.67 , 2061.50 , 84.82
+285.67 , 2129.50 , 88.28
+285.67 , 2197.50 , 91.79
+326.47 , -2378.81 , -53.58
+326.47 , -2305.17 , -52.49
+326.47 , -2231.52 , -51.36
+326.47 , -2157.87 , -50.18
+326.47 , -2084.23 , -48.97
+326.47 , -2010.58 , -47.71
+326.47 , -1936.93 , -46.41
+326.47 , -1863.29 , -45.07
+326.47 , -1789.64 , -43.70
+326.47 , -1715.99 , -42.28
+326.47 , -1642.35 , -40.82
+326.47 , -1568.70 , -39.32
+326.47 , -1495.06 , -37.78
+326.47 , -1421.41 , -36.19
+326.47 , -1347.76 , -34.57
+326.47 , -1274.12 , -32.91
+326.47 , -1200.47 , -31.20
+326.47 , -1126.56 , -29.47
+326.47 , -1052.22 , -27.70
+326.47 , -977.88 , -25.90
+326.47 , -901.39 , -24.13
+326.47 , -824.43 , -22.34
+326.47 , -747.47 , -20.50
+326.47 , -670.51 , -18.63
+326.47 , -593.55 , -16.71
+326.47 , -516.59 , -14.75
+326.47 , -439.63 , -12.76
+326.47 , -362.67 , -10.72
+326.47 , -285.71 , -8.64
+326.47 , -208.75 , -6.52
+326.47 , -131.79 , -4.36
+326.47 , -54.83 , -2.16
+326.47 , 22.12 , 0.16
+326.47 , 90.13 , 2.68
+326.47 , 158.13 , 5.24
+326.47 , 226.13 , 7.84
+326.47 , 294.13 , 10.49
+326.47 , 362.13 , 13.17
+326.47 , 430.14 , 15.90
+326.47 , 498.14 , 18.67
+326.47 , 566.14 , 21.48
+326.47 , 634.14 , 24.33
+326.47 , 702.14 , 27.23
+326.47 , 770.14 , 30.16
+326.47 , 838.15 , 33.14
+326.47 , 906.15 , 36.15
+326.47 , 974.15 , 39.21
+326.47 , 1042.15 , 42.31
+326.47 , 1110.15 , 45.46
+326.47 , 1178.15 , 48.64
+326.47 , 1246.16 , 51.87
+326.47 , 1314.16 , 55.13
+326.47 , 1382.16 , 58.44
+326.47 , 1450.16 , 61.79
+326.47 , 1518.16 , 65.18
+326.47 , 1586.16 , 68.61
+326.47 , 1654.17 , 72.09
+326.47 , 1722.17 , 75.60
+326.47 , 1790.17 , 79.16
+326.47 , 1858.17 , 82.76
+326.47 , 1926.17 , 86.40
+326.47 , 1994.18 , 90.08
+326.47 , 2062.18 , 93.81
+326.47 , 2130.18 , 97.57
+326.47 , 2198.18 , 101.38
+367.28 , -2379.49 , -63.16
+367.28 , -2305.85 , -61.76
+367.28 , -2232.20 , -60.32
+367.28 , -2158.55 , -58.84
+367.28 , -2084.91 , -57.32
+367.28 , -2011.26 , -55.75
+367.28 , -1937.62 , -54.15
+367.28 , -1863.97 , -52.50
+367.28 , -1790.32 , -50.82
+367.28 , -1716.68 , -49.09
+367.28 , -1643.03 , -47.33
+367.28 , -1569.38 , -45.52
+367.28 , -1495.74 , -43.67
+367.28 , -1422.09 , -41.78
+367.28 , -1348.44 , -39.85
+367.28 , -1274.80 , -37.88
+367.28 , -1201.15 , -35.87
+367.28 , -1127.04 , -33.84
+367.28 , -1052.16 , -31.79
+367.28 , -977.29 , -29.71
+367.28 , -900.71 , -27.64
+367.28 , -823.75 , -25.56
+367.28 , -746.79 , -23.43
+367.28 , -669.83 , -21.26
+367.28 , -592.87 , -19.05
+367.28 , -515.91 , -16.80
+367.28 , -438.95 , -14.51
+367.28 , -361.99 , -12.18
+367.28 , -285.03 , -9.81
+367.28 , -208.07 , -7.40
+367.28 , -131.11 , -4.95
+367.28 , -54.15 , -2.45
+367.28 , 22.81 , 0.16
+367.28 , 90.81 , 2.98
+367.28 , 158.81 , 5.84
+367.28 , 226.81 , 8.75
+367.28 , 294.81 , 11.69
+367.28 , 362.81 , 14.68
+367.28 , 430.82 , 17.70
+367.28 , 498.82 , 20.77
+367.28 , 566.82 , 23.88
+367.28 , 634.82 , 27.03
+367.28 , 702.82 , 30.23
+367.28 , 770.82 , 33.46
+367.28 , 838.83 , 36.73
+367.28 , 906.83 , 40.05
+367.28 , 974.83 , 43.41
+367.28 , 1042.83 , 46.81
+367.28 , 1110.83 , 50.25
+367.28 , 1178.84 , 53.74
+367.28 , 1246.84 , 57.26
+367.28 , 1314.84 , 60.83
+367.28 , 1382.84 , 64.44
+367.28 , 1450.84 , 68.08
+367.28 , 1518.84 , 71.78
+367.28 , 1586.85 , 75.51
+367.28 , 1654.85 , 79.28
+367.28 , 1722.85 , 83.10
+367.28 , 1790.85 , 86.95
+367.28 , 1858.85 , 90.85
+367.28 , 1926.85 , 94.79
+367.28 , 1994.86 , 98.77
+367.28 , 2062.86 , 102.80
+367.28 , 2130.86 , 106.86
+367.28 , 2198.86 , 110.97
+408.09 , -2380.17 , -72.73
+408.09 , -2306.53 , -71.02
+408.09 , -2232.88 , -69.27
+408.09 , -2159.24 , -67.49
+408.09 , -2085.59 , -65.66
+408.09 , -2011.94 , -63.79
+408.09 , -1938.30 , -61.88
+408.09 , -1864.65 , -59.92
+408.09 , -1791.00 , -57.93
+408.09 , -1717.36 , -55.90
+408.09 , -1643.71 , -53.83
+408.09 , -1570.06 , -51.71
+408.09 , -1496.42 , -49.56
+408.09 , -1422.77 , -47.36
+408.09 , -1349.12 , -45.12
+408.09 , -1275.48 , -42.85
+408.09 , -1201.83 , -40.53
+408.09 , -1127.51 , -38.20
+408.09 , -1052.11 , -35.88
+408.09 , -976.71 , -33.51
+408.09 , -900.03 , -31.16
+408.09 , -823.07 , -28.78
+408.09 , -746.11 , -26.36
+408.09 , -669.15 , -23.90
+408.09 , -592.19 , -21.40
+408.09 , -515.23 , -18.85
+408.09 , -438.27 , -16.27
+408.09 , -361.31 , -13.65
+408.09 , -284.35 , -10.98
+408.09 , -207.39 , -8.28
+408.09 , -130.43 , -5.53
+408.09 , -53.47 , -2.75
+408.09 , 23.49 , 0.17
+408.09 , 91.49 , 3.28
+408.09 , 159.49 , 6.44
+408.09 , 227.49 , 9.65
+408.09 , 295.49 , 12.89
+408.09 , 363.49 , 16.18
+408.09 , 431.50 , 19.50
+408.09 , 499.50 , 22.87
+408.09 , 567.50 , 26.28
+408.09 , 635.50 , 29.73
+408.09 , 703.50 , 33.22
+408.09 , 771.51 , 36.76
+408.09 , 839.51 , 40.33
+408.09 , 907.51 , 43.95
+408.09 , 975.51 , 47.61
+408.09 , 1043.51 , 51.31
+408.09 , 1111.51 , 55.05
+408.09 , 1179.52 , 58.83
+408.09 , 1247.52 , 62.66
+408.09 , 1315.52 , 66.52
+408.09 , 1383.52 , 70.43
+408.09 , 1451.52 , 74.38
+408.09 , 1519.52 , 78.37
+408.09 , 1587.53 , 82.40
+408.09 , 1655.53 , 86.47
+408.09 , 1723.53 , 90.59
+408.09 , 1791.53 , 94.75
+408.09 , 1859.53 , 98.94
+408.09 , 1927.53 , 103.18
+408.09 , 1995.54 , 107.46
+408.09 , 2063.54 , 111.79
+408.09 , 2131.54 , 116.15
+408.09 , 2199.54 , 120.55
+448.90 , -2380.86 , -82.29
+448.90 , -2307.21 , -80.27
+448.90 , -2233.56 , -78.22
+448.90 , -2159.92 , -76.12
+448.90 , -2086.27 , -73.99
+448.90 , -2012.62 , -71.81
+448.90 , -1938.98 , -69.59
+448.90 , -1865.33 , -67.33
+448.90 , -1791.68 , -65.03
+448.90 , -1718.04 , -62.69
+448.90 , -1644.39 , -60.31
+448.90 , -1570.74 , -57.89
+448.90 , -1497.10 , -55.43
+448.90 , -1423.45 , -52.93
+448.90 , -1349.80 , -50.39
+448.90 , -1276.16 , -47.80
+448.90 , -1202.51 , -45.18
+448.90 , -1127.99 , -42.55
+448.90 , -1052.06 , -39.96
+448.90 , -976.12 , -37.32
+448.90 , -899.35 , -34.67
+448.90 , -822.39 , -32.00
+448.90 , -745.43 , -29.29
+448.90 , -668.47 , -26.54
+448.90 , -591.51 , -23.74
+448.90 , -514.55 , -20.91
+448.90 , -437.59 , -18.03
+448.90 , -360.63 , -15.12
+448.90 , -283.67 , -12.16
+448.90 , -206.71 , -9.16
+448.90 , -129.75 , -6.12
+448.90 , -52.79 , -3.04
+448.90 , 24.17 , 0.17
+448.90 , 92.17 , 3.58
+448.90 , 160.17 , 7.04
+448.90 , 228.17 , 10.55
+448.90 , 296.17 , 14.09
+448.90 , 364.18 , 17.67
+448.90 , 432.18 , 21.30
+448.90 , 500.18 , 24.97
+448.90 , 568.18 , 28.67
+448.90 , 636.18 , 32.43
+448.90 , 704.18 , 36.22
+448.90 , 772.19 , 40.05
+448.90 , 840.19 , 43.93
+448.90 , 908.19 , 47.84
+448.90 , 976.19 , 51.80
+448.90 , 1044.19 , 55.80
+448.90 , 1112.19 , 59.84
+448.90 , 1180.20 , 63.92
+448.90 , 1248.20 , 68.05
+448.90 , 1316.20 , 72.21
+448.90 , 1384.20 , 76.42
+448.90 , 1452.20 , 80.67
+448.90 , 1520.21 , 84.96
+448.90 , 1588.21 , 89.29
+448.90 , 1656.21 , 93.66
+448.90 , 1724.21 , 98.08
+448.90 , 1792.21 , 102.54
+448.90 , 1860.21 , 107.03
+448.90 , 1928.22 , 111.57
+448.90 , 1996.22 , 116.15
+448.90 , 2064.22 , 120.77
+448.90 , 2132.22 , 125.44
+448.90 , 2200.22 , 130.14
+489.71 , -2381.54 , -91.84
+489.71 , -2307.89 , -89.52
+489.71 , -2234.24 , -87.15
+489.71 , -2160.60 , -84.75
+489.71 , -2086.95 , -82.31
+489.71 , -2013.30 , -79.82
+489.71 , -1939.66 , -77.30
+489.71 , -1866.01 , -74.73
+489.71 , -1792.36 , -72.13
+489.71 , -1718.72 , -69.48
+489.71 , -1645.07 , -66.79
+489.71 , -1571.42 , -64.07
+489.71 , -1497.78 , -61.30
+489.71 , -1424.13 , -58.49
+489.71 , -1350.49 , -55.64
+489.71 , -1276.84 , -52.75
+489.71 , -1203.19 , -49.82
+489.71 , -1128.47 , -46.90
+489.71 , -1052.00 , -44.03
+489.71 , -975.54 , -41.12
+489.71 , -898.67 , -38.19
+489.71 , -821.71 , -35.23
+489.71 , -744.75 , -32.22
+489.71 , -667.79 , -29.17
+489.71 , -590.83 , -26.09
+489.71 , -513.87 , -22.96
+489.71 , -436.91 , -19.79
+489.71 , -359.95 , -16.58
+489.71 , -282.99 , -13.33
+489.71 , -206.03 , -10.04
+489.71 , -129.07 , -6.71
+489.71 , -52.11 , -3.34
+489.71 , 24.85 , 0.17
+489.71 , 92.85 , 3.88
+489.71 , 160.85 , 7.64
+489.71 , 228.85 , 11.44
+489.71 , 296.85 , 15.29
+489.71 , 364.86 , 19.17
+489.71 , 432.86 , 23.09
+489.71 , 500.86 , 27.06
+489.71 , 568.86 , 31.07
+489.71 , 636.86 , 35.12
+489.71 , 704.86 , 39.21
+489.71 , 772.87 , 43.35
+489.71 , 840.87 , 47.52
+489.71 , 908.87 , 51.74
+489.71 , 976.87 , 55.99
+489.71 , 1044.87 , 60.29
+489.71 , 1112.88 , 64.63
+489.71 , 1180.88 , 69.02
+489.71 , 1248.88 , 73.44
+489.71 , 1316.88 , 77.90
+489.71 , 1384.88 , 82.41
+489.71 , 1452.88 , 86.96
+489.71 , 1520.89 , 91.55
+489.71 , 1588.89 , 96.18
+489.71 , 1656.89 , 100.85
+489.71 , 1724.89 , 105.57
+489.71 , 1792.89 , 110.32
+489.71 , 1860.89 , 115.12
+489.71 , 1928.90 , 119.96
+489.71 , 1996.90 , 124.84
+489.71 , 2064.90 , 129.76
+489.71 , 2132.90 , 134.72
+489.71 , 2200.90 , 139.73
+816.18 , -2386.98 , -167.85
+816.18 , -2313.34 , -163.07
+816.18 , -2239.69 , -158.26
+816.18 , -2166.04 , -153.40
+816.18 , -2092.40 , -148.50
+816.18 , -2018.75 , -143.56
+816.18 , -1945.10 , -138.58
+816.18 , -1871.46 , -133.56
+816.18 , -1797.81 , -128.50
+816.18 , -1724.16 , -123.40
+816.18 , -1650.52 , -118.26
+816.18 , -1576.87 , -113.08
+816.18 , -1503.00 , -107.87
+816.18 , -1428.91 , -102.64
+816.18 , -1354.83 , -97.38
+816.18 , -1278.02 , -92.30
+816.18 , -1201.06 , -87.20
+816.18 , -1124.10 , -82.06
+816.18 , -1047.15 , -76.87
+816.18 , -970.19 , -71.65
+816.18 , -893.23 , -66.38
+816.18 , -816.27 , -61.07
+816.18 , -739.31 , -55.73
+816.18 , -662.35 , -50.34
+816.18 , -585.39 , -44.91
+816.18 , -508.43 , -39.44
+816.18 , -431.47 , -33.93
+816.18 , -354.51 , -28.38
+816.18 , -277.55 , -22.79
+816.18 , -200.59 , -17.16
+816.18 , -123.63 , -11.48
+816.18 , -46.67 , -5.77
+816.18 , 30.29 , 0.11
+816.18 , 98.29 , 6.23
+816.18 , 166.30 , 12.38
+816.18 , 234.30 , 18.58
+816.18 , 302.30 , 24.82
+816.18 , 370.30 , 31.10
+816.18 , 438.30 , 37.42
+816.18 , 506.31 , 43.79
+816.18 , 574.31 , 50.19
+816.18 , 642.31 , 56.64
+816.18 , 710.31 , 63.13
+816.18 , 778.31 , 69.66
+816.18 , 846.31 , 76.23
+816.18 , 914.32 , 82.84
+816.18 , 982.32 , 89.49
+816.18 , 1050.32 , 96.19
+816.18 , 1118.32 , 102.93
+816.18 , 1186.32 , 109.70
+816.18 , 1254.32 , 116.52
+816.18 , 1322.33 , 123.39
+816.18 , 1390.33 , 130.29
+816.18 , 1458.33 , 137.23
+816.18 , 1526.33 , 144.22
+816.18 , 1594.33 , 151.25
+816.18 , 1662.33 , 158.32
+816.18 , 1730.34 , 165.43
+816.18 , 1798.34 , 172.58
+816.18 , 1866.34 , 179.78
+816.18 , 1934.34 , 187.01
+816.18 , 2002.34 , 194.29
+816.18 , 2070.35 , 201.61
+816.18 , 2138.35 , 208.97
+816.18 , 2206.35 , 216.37
+1020.26 , -2390.39 , -215.03
+1020.26 , -2316.74 , -208.72
+1020.26 , -2243.09 , -202.37
+1020.26 , -2169.45 , -195.97
+1020.26 , -2095.80 , -189.54
+1020.26 , -2022.15 , -183.07
+1020.26 , -1948.51 , -176.56
+1020.26 , -1874.86 , -170.00
+1020.26 , -1801.21 , -163.40
+1020.26 , -1727.57 , -156.77
+1020.26 , -1653.92 , -150.09
+1020.26 , -1580.27 , -143.38
+1020.26 , -1505.05 , -136.79
+1020.26 , -1428.31 , -130.32
+1020.26 , -1351.57 , -123.81
+1020.26 , -1274.62 , -117.28
+1020.26 , -1197.66 , -110.72
+1020.26 , -1120.70 , -104.11
+1020.26 , -1043.74 , -97.46
+1020.26 , -966.78 , -90.77
+1020.26 , -889.82 , -84.04
+1020.26 , -812.86 , -77.27
+1020.26 , -735.90 , -70.46
+1020.26 , -658.94 , -63.61
+1020.26 , -581.98 , -56.72
+1020.26 , -505.02 , -49.79
+1020.26 , -428.06 , -42.81
+1020.26 , -351.10 , -35.80
+1020.26 , -274.14 , -28.75
+1020.26 , -197.18 , -21.65
+1020.26 , -120.22 , -14.51
+1020.26 , -43.26 , -7.34
+1020.26 , 33.70 , 0.03
+1020.26 , 101.70 , 7.65
+1020.26 , 169.70 , 15.30
+1020.26 , 237.70 , 23.00
+1020.26 , 305.70 , 30.73
+1020.26 , 373.71 , 38.51
+1020.26 , 441.71 , 46.33
+1020.26 , 509.71 , 54.19
+1020.26 , 577.71 , 62.10
+1020.26 , 645.71 , 70.04
+1020.26 , 713.71 , 78.03
+1020.26 , 781.72 , 86.05
+1020.26 , 849.72 , 94.12
+1020.26 , 917.72 , 102.24
+1020.26 , 985.72 , 110.39
+1020.26 , 1053.72 , 118.58
+1020.26 , 1121.72 , 126.82
+1020.26 , 1189.73 , 135.09
+1020.26 , 1257.73 , 143.41
+1020.26 , 1325.73 , 151.77
+1020.26 , 1393.73 , 160.17
+1020.26 , 1461.73 , 168.61
+1020.26 , 1529.74 , 177.10
+1020.26 , 1597.74 , 185.62
+1020.26 , 1665.74 , 194.19
+1020.26 , 1733.74 , 202.80
+1020.26 , 1801.74 , 211.45
+1020.26 , 1869.74 , 220.14
+1020.26 , 1937.75 , 228.87
+1020.26 , 2005.75 , 237.64
+1020.26 , 2073.75 , 246.46
+1020.26 , 2141.75 , 255.33
+1020.26 , 2209.75 , 264.23
+1224.27 , -2393.79 , -261.95
+1224.27 , -2320.14 , -254.11
+1224.27 , -2246.50 , -246.23
+1224.27 , -2172.85 , -238.29
+1224.27 , -2099.20 , -230.33
+1224.27 , -2025.56 , -222.32
+1224.27 , -1951.91 , -214.27
+1224.27 , -1878.26 , -206.18
+1224.27 , -1804.62 , -198.05
+1224.27 , -1730.79 , -189.91
+1224.27 , -1654.71 , -182.01
+1224.27 , -1578.63 , -174.07
+1224.27 , -1502.10 , -166.15
+1224.27 , -1425.14 , -158.24
+1224.27 , -1348.18 , -150.29
+1224.27 , -1271.22 , -142.30
+1224.27 , -1194.26 , -134.27
+1224.27 , -1117.30 , -126.20
+1224.27 , -1040.34 , -118.09
+1224.27 , -963.38 , -109.93
+1224.27 , -886.42 , -101.74
+1224.27 , -809.46 , -93.51
+1224.27 , -732.50 , -85.23
+1224.27 , -655.54 , -76.92
+1224.27 , -578.58 , -68.56
+1224.27 , -501.62 , -60.17
+1224.27 , -424.66 , -51.73
+1224.27 , -347.70 , -43.25
+1224.27 , -270.74 , -34.74
+1224.27 , -193.78 , -26.18
+1224.27 , -116.82 , -17.58
+1224.27 , -39.86 , -8.94
+1224.27 , 37.10 , -0.07
+1224.27 , 105.10 , 9.04
+1224.27 , 173.10 , 18.19
+1224.27 , 241.11 , 27.38
+1224.27 , 309.11 , 36.62
+1224.27 , 377.11 , 45.89
+1224.27 , 445.11 , 55.21
+1224.27 , 513.11 , 64.57
+1224.27 , 581.11 , 73.97
+1224.27 , 649.12 , 83.41
+1224.27 , 717.12 , 92.90
+1224.27 , 785.12 , 102.42
+1224.27 , 853.12 , 111.99
+1224.27 , 921.12 , 121.60
+1224.27 , 989.12 , 131.25
+1224.27 , 1057.13 , 140.94
+1224.27 , 1125.13 , 150.67
+1224.27 , 1193.13 , 160.45
+1224.27 , 1261.13 , 170.26
+1224.27 , 1329.13 , 180.12
+1224.27 , 1397.13 , 190.02
+1224.27 , 1465.14 , 199.96
+1224.27 , 1533.14 , 209.94
+1224.27 , 1601.14 , 219.97
+1224.27 , 1669.14 , 230.03
+1224.27 , 1737.14 , 240.13
+1224.27 , 1805.14 , 250.27
+1224.27 , 1873.15 , 260.47
+1224.27 , 1941.15 , 270.71
+1224.27 , 2009.15 , 280.98
+1224.27 , 2077.15 , 291.29
+1224.27 , 2145.15 , 301.65
+1224.27 , 2213.16 , 312.04
+1428.29 , -2397.19 , -308.61
+1428.29 , -2323.54 , -299.24
+1428.29 , -2249.90 , -289.82
+1428.29 , -2176.25 , -280.35
+1428.29 , -2102.61 , -270.86
+1428.29 , -2028.96 , -261.31
+1428.29 , -1955.31 , -251.73
+1428.29 , -1880.53 , -242.28
+1428.29 , -1805.11 , -232.88
+1428.29 , -1729.57 , -223.46
+1428.29 , -1652.61 , -214.21
+1428.29 , -1575.65 , -204.92
+1428.29 , -1498.69 , -195.59
+1428.29 , -1421.73 , -186.22
+1428.29 , -1344.77 , -176.80
+1428.29 , -1267.81 , -167.35
+1428.29 , -1190.86 , -157.86
+1428.29 , -1113.90 , -148.32
+1428.29 , -1036.94 , -138.75
+1428.29 , -959.98 , -129.13
+1428.29 , -883.02 , -119.48
+1428.29 , -806.06 , -109.78
+1428.29 , -729.10 , -100.04
+1428.29 , -652.14 , -90.26
+1428.29 , -575.18 , -80.44
+1428.29 , -498.22 , -70.59
+1428.29 , -421.26 , -60.68
+1428.29 , -344.30 , -50.74
+1428.29 , -267.34 , -40.76
+1428.29 , -190.38 , -30.74
+1428.29 , -113.42 , -20.68
+1428.29 , -36.46 , -10.57
+1428.29 , 40.50 , -0.22
+1428.29 , 108.50 , 10.39
+1428.29 , 176.51 , 21.04
+1428.29 , 244.51 , 31.73
+1428.29 , 312.51 , 42.47
+1428.29 , 380.51 , 53.24
+1428.29 , 448.51 , 64.05
+1428.29 , 516.51 , 74.91
+1428.29 , 584.52 , 85.81
+1428.29 , 652.52 , 96.75
+1428.29 , 720.52 , 107.73
+1428.29 , 788.52 , 118.76
+1428.29 , 856.52 , 129.82
+1428.29 , 924.53 , 140.93
+1428.29 , 992.53 , 152.08
+1428.29 , 1060.53 , 163.26
+1428.29 , 1128.53 , 174.49
+1428.29 , 1196.53 , 185.77
+1428.29 , 1264.53 , 197.08
+1428.29 , 1332.54 , 208.44
+1428.29 , 1400.54 , 219.83
+1428.29 , 1468.54 , 231.27
+1428.29 , 1536.54 , 242.74
+1428.29 , 1604.54 , 254.28
+1428.29 , 1672.54 , 265.83
+1428.29 , 1740.55 , 277.44
+1428.29 , 1808.55 , 289.08
+1428.29 , 1876.55 , 300.77
+1428.29 , 1944.55 , 312.50
+1428.29 , 2012.55 , 324.26
+1428.29 , 2080.55 , 336.10
+1428.29 , 2148.56 , 347.93
+1428.29 , 2216.56 , 359.83
+1632.39 , -2400.60 , -355.02
+1632.39 , -2326.95 , -344.11
+1632.39 , -2253.30 , -333.16
+1632.39 , -2179.66 , -322.16
+1632.39 , -2105.79 , -311.17
+1632.39 , -2031.02 , -300.28
+1632.39 , -1956.25 , -289.35
+1632.39 , -1880.09 , -278.63
+1632.39 , -1803.13 , -268.00
+1632.39 , -1726.17 , -257.32
+1632.39 , -1649.21 , -246.61
+1632.39 , -1572.25 , -235.86
+1632.39 , -1495.29 , -225.06
+1632.39 , -1418.33 , -214.23
+1632.39 , -1341.37 , -203.35
+1632.39 , -1264.41 , -192.44
+1632.39 , -1187.45 , -181.48
+1632.39 , -1110.49 , -170.48
+1632.39 , -1033.53 , -159.44
+1632.39 , -956.57 , -148.37
+1632.39 , -879.61 , -137.25
+1632.39 , -802.65 , -126.09
+1632.39 , -725.69 , -114.89
+1632.39 , -648.73 , -103.64
+1632.39 , -571.77 , -92.36
+1632.39 , -494.81 , -81.04
+1632.39 , -417.85 , -69.67
+1632.39 , -340.89 , -58.27
+1632.39 , -263.93 , -46.82
+1632.39 , -186.97 , -35.34
+1632.39 , -110.01 , -23.81
+1632.39 , -33.05 , -12.24
+1632.39 , 43.91 , -0.39
+1632.39 , 111.91 , 11.71
+1632.39 , 179.91 , 23.86
+1632.39 , 247.91 , 36.05
+1632.39 , 315.91 , 48.28
+1632.39 , 383.92 , 60.55
+1632.39 , 451.92 , 72.87
+1632.39 , 519.92 , 85.22
+1632.39 , 587.92 , 97.62
+1632.39 , 655.92 , 110.06
+1632.39 , 723.92 , 122.54
+1632.39 , 791.93 , 135.06
+1632.39 , 859.93 , 147.62
+1632.39 , 927.93 , 160.22
+1632.39 , 995.93 , 172.87
+1632.39 , 1063.93 , 185.56
+1632.39 , 1131.93 , 198.29
+1632.39 , 1199.94 , 211.05
+1632.39 , 1267.94 , 223.87
+1632.39 , 1335.94 , 236.71
+1632.39 , 1403.94 , 249.62
+1632.39 , 1471.94 , 262.56
+1632.39 , 1539.95 , 275.53
+1632.39 , 1607.95 , 288.54
+1632.39 , 1675.95 , 301.60
+1632.39 , 1743.95 , 314.71
+1632.39 , 1811.95 , 327.86
+1632.39 , 1879.95 , 341.04
+1632.39 , 1947.96 , 354.27
+1632.39 , 2015.96 , 367.52
+1632.39 , 2083.96 , 380.85
+1632.39 , 2151.96 , 394.20
+1632.39 , 2219.96 , 407.60
+1836.41 , -2404.00 , -401.17
+1836.41 , -2330.35 , -388.73
+1836.41 , -2256.35 , -376.31
+1836.41 , -2182.24 , -363.88
+1836.41 , -2107.57 , -351.49
+1836.41 , -2030.61 , -339.54
+1836.41 , -1953.65 , -327.51
+1836.41 , -1876.69 , -315.47
+1836.41 , -1799.73 , -303.37
+1836.41 , -1722.77 , -291.23
+1836.41 , -1645.81 , -279.06
+1836.41 , -1568.85 , -266.84
+1836.41 , -1491.89 , -254.58
+1836.41 , -1414.93 , -242.28
+1836.41 , -1337.97 , -229.94
+1836.41 , -1261.01 , -217.56
+1836.41 , -1184.05 , -205.14
+1836.41 , -1107.09 , -192.68
+1836.41 , -1030.13 , -180.17
+1836.41 , -953.17 , -167.63
+1836.41 , -876.21 , -155.05
+1836.41 , -799.25 , -142.43
+1836.41 , -722.29 , -129.76
+1836.41 , -645.33 , -117.06
+1836.41 , -568.37 , -104.31
+1836.41 , -491.41 , -91.52
+1836.41 , -414.45 , -78.70
+1836.41 , -337.49 , -65.83
+1836.41 , -260.53 , -52.92
+1836.41 , -183.57 , -39.97
+1836.41 , -106.61 , -26.98
+1836.41 , -29.65 , -13.95
+1836.41 , 47.31 , -0.60
+1836.41 , 115.31 , 13.00
+1836.41 , 183.31 , 26.65
+1836.41 , 251.32 , 40.34
+1836.41 , 319.32 , 54.06
+1836.41 , 387.32 , 67.83
+1836.41 , 455.32 , 81.64
+1836.41 , 523.32 , 95.50
+1836.41 , 591.32 , 109.39
+1836.41 , 659.33 , 123.33
+1836.41 , 727.33 , 137.31
+1836.41 , 795.33 , 151.32
+1836.41 , 863.33 , 165.38
+1836.41 , 931.33 , 179.49
+1836.41 , 999.33 , 193.63
+1836.41 , 1067.34 , 207.82
+1836.41 , 1135.34 , 222.04
+1836.41 , 1203.34 , 236.32
+1836.41 , 1271.34 , 250.63
+1836.41 , 1339.34 , 264.97
+1836.41 , 1407.34 , 279.37
+1836.41 , 1475.35 , 293.81
+1836.41 , 1543.35 , 308.26
+1836.41 , 1611.35 , 322.79
+1836.41 , 1679.35 , 337.34
+1836.41 , 1747.35 , 351.95
+1836.41 , 1815.36 , 366.60
+1836.41 , 1883.36 , 381.27
+1836.41 , 1951.36 , 395.99
+1836.41 , 2019.36 , 410.76
+1836.41 , 2087.36 , 425.58
+1836.41 , 2155.36 , 440.43
+1836.41 , 2223.37 , 455.32
+2040.43 , -2407.40 , -447.08
+2040.43 , -2333.76 , -433.10
+2040.43 , -2257.73 , -419.58
+2040.43 , -2180.97 , -406.17
+2040.43 , -2104.16 , -392.75
+2040.43 , -2027.20 , -379.31
+2040.43 , -1950.24 , -365.84
+2040.43 , -1873.28 , -352.33
+2040.43 , -1796.32 , -338.77
+2040.43 , -1719.36 , -325.16
+2040.43 , -1642.40 , -311.53
+2040.43 , -1565.44 , -297.84
+2040.43 , -1488.48 , -284.11
+2040.43 , -1411.52 , -270.36
+2040.43 , -1334.56 , -256.56
+2040.43 , -1257.60 , -242.72
+2040.43 , -1180.64 , -228.83
+2040.43 , -1103.69 , -214.91
+2040.43 , -1026.73 , -200.94
+2040.43 , -949.77 , -186.94
+2040.43 , -872.81 , -172.89
+2040.43 , -795.85 , -158.80
+2040.43 , -718.89 , -144.67
+2040.43 , -641.93 , -130.51
+2040.43 , -564.97 , -116.30
+2040.43 , -488.01 , -102.05
+2040.43 , -411.05 , -87.75
+2040.43 , -334.09 , -73.42
+2040.43 , -257.13 , -59.05
+2040.43 , -180.17 , -44.64
+2040.43 , -103.21 , -30.19
+2040.43 , -26.25 , -15.69
+2040.43 , 50.71 , -0.84
+2040.43 , 118.71 , 14.26
+2040.43 , 186.72 , 29.40
+2040.43 , 254.72 , 44.59
+2040.43 , 322.72 , 59.81
+2040.43 , 390.72 , 75.08
+2040.43 , 458.72 , 90.39
+2040.43 , 526.73 , 105.74
+2040.43 , 594.73 , 121.13
+2040.43 , 662.73 , 136.57
+2040.43 , 730.73 , 152.04
+2040.43 , 798.73 , 167.56
+2040.43 , 866.73 , 183.12
+2040.43 , 934.74 , 198.72
+2040.43 , 1002.74 , 214.36
+2040.43 , 1070.74 , 230.05
+2040.43 , 1138.74 , 245.76
+2040.43 , 1206.74 , 261.54
+2040.43 , 1274.74 , 277.35
+2040.43 , 1342.75 , 293.20
+2040.43 , 1410.75 , 309.08
+2040.43 , 1478.75 , 325.00
+2040.43 , 1546.75 , 340.98
+2040.43 , 1614.75 , 357.00
+2040.43 , 1682.75 , 373.07
+2040.43 , 1750.76 , 389.16
+2040.43 , 1818.76 , 405.28
+2040.43 , 1886.76 , 421.47
+2040.43 , 1954.76 , 437.69
+2040.43 , 2022.76 , 453.95
+2040.43 , 2090.76 , 470.27
+2040.43 , 2158.77 , 486.60
+2040.43 , 2226.77 , 503.01
+2244.53 , -2407.54 , -493.49
+2244.53 , -2331.44 , -478.55
+2244.53 , -2254.68 , -463.72
+2244.53 , -2177.72 , -448.91
+2244.53 , -2100.76 , -434.05
+2244.53 , -2023.80 , -419.15
+2244.53 , -1946.84 , -404.19
+2244.53 , -1869.88 , -389.22
+2244.53 , -1792.92 , -374.19
+2244.53 , -1715.96 , -359.14
+2244.53 , -1639.00 , -344.04
+2244.53 , -1562.04 , -328.90
+2244.53 , -1485.08 , -313.70
+2244.53 , -1408.12 , -298.48
+2244.53 , -1331.16 , -283.21
+2244.53 , -1254.20 , -267.92
+2244.53 , -1177.24 , -252.56
+2244.53 , -1100.28 , -237.17
+2244.53 , -1023.32 , -221.74
+2244.53 , -946.36 , -206.27
+2244.53 , -869.40 , -190.76
+2244.53 , -792.44 , -175.21
+2244.53 , -715.48 , -159.62
+2244.53 , -638.52 , -143.99
+2244.53 , -561.56 , -128.32
+2244.53 , -484.60 , -112.60
+2244.53 , -407.64 , -96.85
+2244.53 , -330.68 , -81.05
+2244.53 , -253.72 , -65.22
+2244.53 , -176.76 , -49.34
+2244.53 , -99.80 , -33.43
+2244.53 , -22.84 , -17.47
+2244.53 , 54.12 , -1.12
+2244.53 , 122.12 , 15.48
+2244.53 , 190.12 , 32.12
+2244.53 , 258.12 , 48.80
+2244.53 , 326.12 , 65.53
+2244.53 , 394.13 , 82.29
+2244.53 , 462.13 , 99.10
+2244.53 , 530.13 , 115.95
+2244.53 , 598.13 , 132.84
+2244.53 , 666.13 , 149.77
+2244.53 , 734.13 , 166.75
+2244.53 , 802.14 , 183.76
+2244.53 , 870.14 , 200.82
+2244.53 , 938.14 , 217.91
+2244.53 , 1006.14 , 235.06
+2244.53 , 1074.14 , 252.24
+2244.53 , 1142.14 , 269.46
+2244.53 , 1210.15 , 286.71
+2244.53 , 1278.15 , 304.04
+2244.53 , 1346.15 , 321.38
+2244.53 , 1414.15 , 338.75
+2244.53 , 1482.15 , 356.20
+2244.53 , 1550.16 , 373.66
+2244.53 , 1618.16 , 391.18
+2244.53 , 1686.16 , 408.74
+2244.53 , 1754.16 , 426.33
+2244.53 , 1822.16 , 443.97
+2244.53 , 1890.16 , 461.65
+2244.53 , 1958.17 , 479.36
+2244.53 , 2026.17 , 497.12
+2244.53 , 2094.17 , 514.92
+2244.53 , 2162.17 , 532.78
+2244.53 , 2230.17 , 550.66
+2448.55 , -2405.20 , -540.43
+2448.55 , -2328.24 , -524.23
+2448.55 , -2251.28 , -507.98
+2448.55 , -2174.32 , -491.71
+2448.55 , -2097.36 , -475.36
+2448.55 , -2020.40 , -459.01
+2448.55 , -1943.44 , -442.60
+2448.55 , -1866.48 , -426.15
+2448.55 , -1789.52 , -409.66
+2448.55 , -1712.56 , -393.15
+2448.55 , -1635.60 , -376.58
+2448.55 , -1558.64 , -359.97
+2448.55 , -1481.68 , -343.33
+2448.55 , -1404.72 , -326.63
+2448.55 , -1327.76 , -309.92
+2448.55 , -1250.80 , -293.14
+2448.55 , -1173.84 , -276.33
+2448.55 , -1096.88 , -259.48
+2448.55 , -1019.92 , -242.58
+2448.55 , -942.96 , -225.65
+2448.55 , -866.00 , -208.67
+2448.55 , -789.04 , -191.66
+2448.55 , -712.08 , -174.61
+2448.55 , -635.12 , -157.51
+2448.55 , -558.16 , -140.37
+2448.55 , -481.20 , -123.20
+2448.55 , -404.24 , -105.98
+2448.55 , -327.28 , -88.72
+2448.55 , -250.32 , -71.42
+2448.55 , -173.36 , -54.08
+2448.55 , -96.40 , -36.70
+2448.55 , -19.44 , -19.28
+2448.55 , 57.52 , -1.43
+2448.55 , 125.52 , 16.67
+2448.55 , 193.52 , 34.81
+2448.55 , 261.53 , 52.99
+2448.55 , 329.53 , 71.21
+2448.55 , 397.53 , 89.48
+2448.55 , 465.53 , 107.78
+2448.55 , 533.53 , 126.13
+2448.55 , 601.53 , 144.52
+2448.55 , 669.54 , 162.94
+2448.55 , 737.54 , 181.42
+2448.55 , 805.54 , 199.93
+2448.55 , 873.54 , 218.48
+2448.55 , 941.54 , 237.09
+2448.55 , 1009.54 , 255.71
+2448.55 , 1077.55 , 274.40
+2448.55 , 1145.55 , 293.12
+2448.55 , 1213.55 , 311.89
+2448.55 , 1281.55 , 330.68
+2448.55 , 1349.55 , 349.52
+2448.55 , 1417.55 , 368.40
+2448.55 , 1485.56 , 387.34
+2448.55 , 1553.56 , 406.30
+2448.55 , 1621.56 , 425.31
+2448.55 , 1689.56 , 444.37
+2448.55 , 1757.56 , 463.47
+2448.55 , 1825.57 , 482.60
+2448.55 , 1893.57 , 501.78
+2448.55 , 1961.57 , 520.98
+2448.55 , 2029.57 , 540.26
+2448.55 , 2097.57 , 559.56
+2448.55 , 2165.57 , 578.91
+2448.55 , 2233.58 , 598.28
+2652.56 , -2401.79 , -587.64
+2652.56 , -2324.83 , -569.98
+2652.56 , -2247.87 , -552.26
+2652.56 , -2170.91 , -534.53
+2652.56 , -2093.95 , -516.74
+2652.56 , -2016.99 , -498.90
+2652.56 , -1940.03 , -481.04
+2652.56 , -1863.07 , -463.14
+2652.56 , -1786.11 , -445.18
+2652.56 , -1709.15 , -427.20
+2652.56 , -1632.19 , -409.17
+2652.56 , -1555.23 , -391.10
+2652.56 , -1478.27 , -372.97
+2652.56 , -1401.31 , -354.82
+2652.56 , -1324.35 , -336.62
+2652.56 , -1247.39 , -318.40
+2652.56 , -1170.43 , -300.13
+2652.56 , -1093.47 , -281.81
+2652.56 , -1016.52 , -263.44
+2652.56 , -939.56 , -245.06
+2652.56 , -862.60 , -226.62
+2652.56 , -785.64 , -208.14
+2652.56 , -708.68 , -189.62
+2652.56 , -631.72 , -171.07
+2652.56 , -554.76 , -152.47
+2652.56 , -477.80 , -133.83
+2652.56 , -400.84 , -115.14
+2652.56 , -323.88 , -96.42
+2652.56 , -246.92 , -77.66
+2652.56 , -169.96 , -58.86
+2652.56 , -93.00 , -40.01
+2652.56 , -16.04 , -21.13
+2652.56 , 60.92 , -1.77
+2652.56 , 128.92 , 17.83
+2652.56 , 196.93 , 37.46
+2652.56 , 264.93 , 57.14
+2652.56 , 332.93 , 76.86
+2652.56 , 400.93 , 96.63
+2652.56 , 468.93 , 116.43
+2652.56 , 536.94 , 136.27
+2652.56 , 604.94 , 156.16
+2652.56 , 672.94 , 176.09
+2652.56 , 740.94 , 196.06
+2652.56 , 808.94 , 216.07
+2652.56 , 876.94 , 236.12
+2652.56 , 944.95 , 256.21
+2652.56 , 1012.95 , 276.35
+2652.56 , 1080.95 , 296.51
+2652.56 , 1148.95 , 316.75
+2652.56 , 1216.95 , 337.01
+2652.56 , 1284.95 , 357.30
+2652.56 , 1352.96 , 377.65
+2652.56 , 1420.96 , 398.03
+2652.56 , 1488.96 , 418.46
+2652.56 , 1556.96 , 438.92
+2652.56 , 1624.96 , 459.42
+2652.56 , 1692.96 , 479.97
+2652.56 , 1760.97 , 500.57
+2652.56 , 1828.97 , 521.22
+2652.56 , 1896.97 , 541.89
+2652.56 , 1964.97 , 562.58
+2652.56 , 2032.97 , 583.35
+2652.56 , 2100.98 , 604.14
+2652.56 , 2168.98 , 624.99
+2652.56 , 2236.98 , 645.87
+2856.67 , -2398.39 , -634.88
+2856.67 , -2321.43 , -615.75
+2856.67 , -2244.47 , -596.60
+2856.67 , -2167.51 , -577.37
+2856.67 , -2090.55 , -558.12
+2856.67 , -2013.59 , -538.84
+2856.67 , -1936.63 , -519.52
+2856.67 , -1859.67 , -500.15
+2856.67 , -1782.71 , -480.73
+2856.67 , -1705.75 , -461.28
+2856.67 , -1628.79 , -441.79
+2856.67 , -1551.83 , -422.24
+2856.67 , -1474.87 , -402.68
+2856.67 , -1397.91 , -383.04
+2856.67 , -1320.95 , -363.40
+2856.67 , -1243.99 , -343.69
+2856.67 , -1167.03 , -323.95
+2856.67 , -1090.07 , -304.17
+2856.67 , -1013.11 , -284.36
+2856.67 , -936.15 , -264.50
+2856.67 , -859.19 , -244.60
+2856.67 , -782.23 , -224.66
+2856.67 , -705.27 , -204.68
+2856.67 , -628.31 , -184.66
+2856.67 , -551.35 , -164.59
+2856.67 , -474.39 , -144.49
+2856.67 , -397.43 , -124.34
+2856.67 , -320.47 , -104.16
+2856.67 , -243.51 , -83.93
+2856.67 , -166.55 , -63.67
+2856.67 , -89.59 , -43.36
+2856.67 , -12.63 , -23.01
+2856.67 , 64.33 , -2.14
+2856.67 , 132.33 , 18.95
+2856.67 , 200.33 , 40.09
+2856.67 , 268.33 , 61.26
+2856.67 , 336.33 , 82.48
+2856.67 , 404.34 , 103.74
+2856.67 , 472.34 , 125.04
+2856.67 , 540.34 , 146.38
+2856.67 , 608.34 , 167.77
+2856.67 , 676.34 , 189.19
+2856.67 , 744.34 , 210.66
+2856.67 , 812.35 , 232.17
+2856.67 , 880.35 , 253.73
+2856.67 , 948.35 , 275.31
+2856.67 , 1016.35 , 296.95
+2856.67 , 1084.35 , 318.63
+2856.67 , 1152.36 , 340.33
+2856.67 , 1220.36 , 362.09
+2856.67 , 1288.36 , 383.89
+2856.67 , 1356.36 , 405.74
+2856.67 , 1424.36 , 427.61
+2856.67 , 1492.36 , 449.53
+2856.67 , 1560.37 , 471.51
+2856.67 , 1628.37 , 493.50
+2856.67 , 1696.37 , 515.55
+2856.67 , 1764.37 , 537.64
+2856.67 , 1832.37 , 559.78
+2856.67 , 1900.37 , 581.94
+2856.67 , 1968.38 , 604.16
+2856.67 , 2036.38 , 626.42
+2856.67 , 2104.38 , 648.70
+2856.67 , 2172.38 , 671.06
+2856.67 , 2240.38 , 693.42
+3060.68 , -2394.99 , -682.17
+3060.68 , -2318.03 , -661.58
+3060.68 , -2241.07 , -640.96
+3060.68 , -2164.11 , -620.26
+3060.68 , -2087.15 , -599.57
+3060.68 , -2010.19 , -578.81
+3060.68 , -1933.23 , -558.02
+3060.68 , -1856.27 , -537.18
+3060.68 , -1779.31 , -516.29
+3060.68 , -1702.35 , -495.38
+3060.68 , -1625.39 , -474.42
+3060.68 , -1548.43 , -453.42
+3060.68 , -1471.47 , -432.39
+3060.68 , -1394.51 , -411.31
+3060.68 , -1317.55 , -390.20
+3060.68 , -1240.59 , -369.03
+3060.68 , -1163.63 , -347.83
+3060.68 , -1086.67 , -326.58
+3060.68 , -1009.71 , -305.30
+3060.68 , -932.75 , -283.98
+3060.68 , -855.79 , -262.61
+3060.68 , -778.83 , -241.21
+3060.68 , -701.87 , -219.77
+3060.68 , -624.91 , -198.28
+3060.68 , -547.95 , -176.75
+3060.68 , -470.99 , -155.19
+3060.68 , -394.03 , -133.58
+3060.68 , -317.07 , -111.93
+3060.68 , -240.11 , -90.24
+3060.68 , -163.15 , -68.51
+3060.68 , -86.19 , -46.74
+3060.68 , -9.23 , -24.93
+3060.68 , 67.73 , -2.55
+3060.68 , 135.73 , 20.04
+3060.68 , 203.73 , 42.68
+3060.68 , 271.74 , 65.35
+3060.68 , 339.74 , 88.06
+3060.68 , 407.74 , 110.82
+3060.68 , 475.74 , 133.62
+3060.68 , 543.74 , 156.46
+3060.68 , 611.74 , 179.34
+3060.68 , 679.75 , 202.27
+3060.68 , 747.75 , 225.23
+3060.68 , 815.75 , 248.24
+3060.68 , 883.75 , 271.29
+3060.68 , 951.75 , 294.37
+3060.68 , 1019.75 , 317.52
+3060.68 , 1087.76 , 340.67
+3060.68 , 1155.76 , 363.89
+3060.68 , 1223.76 , 387.14
+3060.68 , 1291.76 , 410.43
+3060.68 , 1359.76 , 433.78
+3060.68 , 1427.76 , 457.17
+3060.68 , 1495.77 , 480.58
+3060.68 , 1563.77 , 504.05
+3060.68 , 1631.77 , 527.56
+3060.68 , 1699.77 , 551.10
+3060.68 , 1767.77 , 574.68
+3060.68 , 1835.78 , 598.32
+3060.68 , 1903.78 , 621.98
+3060.68 , 1971.78 , 645.68
+3060.68 , 2039.78 , 669.44
+3060.68 , 2107.78 , 693.24
+3060.68 , 2175.78 , 717.07
+3060.68 , 2243.79 , 740.94
+3264.70 , -2391.58 , -729.48
+3264.70 , -2314.62 , -707.42
+3264.70 , -2237.66 , -685.34
+3264.70 , -2160.70 , -663.21
+3264.70 , -2083.74 , -641.02
+3264.70 , -2006.78 , -618.82
+3264.70 , -1929.82 , -596.54
+3264.70 , -1852.86 , -574.26
+3264.70 , -1775.90 , -551.91
+3264.70 , -1698.94 , -529.54
+3264.70 , -1621.98 , -507.11
+3264.70 , -1545.02 , -484.66
+3264.70 , -1468.06 , -462.14
+3264.70 , -1391.10 , -439.60
+3264.70 , -1314.14 , -417.03
+3264.70 , -1237.18 , -394.39
+3264.70 , -1160.22 , -371.72
+3264.70 , -1083.26 , -349.03
+3264.70 , -1006.30 , -326.29
+3264.70 , -929.35 , -303.51
+3264.70 , -852.39 , -280.67
+3264.70 , -775.43 , -257.80
+3264.70 , -698.47 , -234.89
+3264.70 , -621.51 , -211.94
+3264.70 , -544.55 , -188.95
+3264.70 , -467.59 , -165.92
+3264.70 , -390.63 , -142.85
+3264.70 , -313.67 , -119.74
+3264.70 , -236.71 , -96.58
+3264.70 , -159.75 , -73.39
+3264.70 , -82.79 , -50.16
+3264.70 , -5.83 , -26.88
+3264.70 , 71.13 , -2.99
+3264.70 , 139.13 , 21.10
+3264.70 , 207.14 , 45.23
+3264.70 , 275.14 , 69.40
+3264.70 , 343.14 , 93.62
+3264.70 , 411.14 , 117.87
+3264.70 , 479.14 , 142.17
+3264.70 , 547.15 , 166.51
+3264.70 , 615.15 , 190.89
+3264.70 , 683.15 , 215.31
+3264.70 , 751.15 , 239.78
+3264.70 , 819.15 , 264.28
+3264.70 , 887.15 , 288.83
+3264.70 , 955.16 , 313.40
+3264.70 , 1023.16 , 338.04
+3264.70 , 1091.16 , 362.71
+3264.70 , 1159.16 , 387.42
+3264.70 , 1227.16 , 412.16
+3264.70 , 1295.16 , 436.98
+3264.70 , 1363.17 , 461.81
+3264.70 , 1431.17 , 486.67
+3264.70 , 1499.17 , 511.61
+3264.70 , 1567.17 , 536.57
+3264.70 , 1635.17 , 561.57
+3264.70 , 1703.17 , 586.60
+3264.70 , 1771.18 , 611.68
+3264.70 , 1839.18 , 636.81
+3264.70 , 1907.18 , 661.98
+3264.70 , 1975.18 , 687.18
+3264.70 , 2043.18 , 712.46
+3264.70 , 2111.19 , 737.73
+3264.70 , 2179.19 , 763.07
+3264.70 , 2247.19 , 788.44
+3468.80 , -2388.18 , -776.85
+3468.80 , -2311.22 , -753.32
+3468.80 , -2234.26 , -729.77
+3468.80 , -2157.30 , -706.17
+3468.80 , -2080.34 , -682.53
+3468.80 , -2003.38 , -658.86
+3468.80 , -1926.42 , -635.14
+3468.80 , -1849.46 , -611.37
+3468.80 , -1772.50 , -587.55
+3468.80 , -1695.54 , -563.71
+3468.80 , -1618.58 , -539.82
+3468.80 , -1541.62 , -515.91
+3468.80 , -1464.66 , -491.95
+3468.80 , -1387.70 , -467.94
+3468.80 , -1310.74 , -443.88
+3468.80 , -1233.78 , -419.80
+3468.80 , -1156.82 , -395.67
+3468.80 , -1079.86 , -371.51
+3468.80 , -1002.90 , -347.29
+3468.80 , -925.94 , -323.04
+3468.80 , -848.98 , -298.76
+3468.80 , -772.02 , -274.44
+3468.80 , -695.06 , -250.05
+3468.80 , -618.10 , -225.64
+3468.80 , -541.14 , -201.19
+3468.80 , -464.18 , -176.69
+3468.80 , -387.22 , -152.16
+3468.80 , -310.26 , -127.58
+3468.80 , -233.30 , -102.96
+3468.80 , -156.34 , -78.31
+3468.80 , -79.38 , -53.61
+3468.80 , -2.42 , -28.87
+3468.80 , 74.54 , -3.46
+3468.80 , 142.54 , 22.12
+3468.80 , 210.54 , 47.75
+3468.80 , 278.54 , 73.42
+3468.80 , 346.54 , 99.13
+3468.80 , 414.55 , 124.89
+3468.80 , 482.55 , 150.68
+3468.80 , 550.55 , 176.52
+3468.80 , 618.55 , 202.40
+3468.80 , 686.55 , 228.31
+3468.80 , 754.55 , 254.28
+3468.80 , 822.56 , 280.27
+3468.80 , 890.56 , 306.31
+3468.80 , 958.56 , 332.40
+3468.80 , 1026.56 , 358.54
+3468.80 , 1094.56 , 384.70
+3468.80 , 1162.57 , 410.91
+3468.80 , 1230.57 , 437.16
+3468.80 , 1298.57 , 463.45
+3468.80 , 1366.57 , 489.78
+3468.80 , 1434.57 , 516.15
+3468.80 , 1502.57 , 542.58
+3468.80 , 1570.58 , 569.03
+3468.80 , 1638.58 , 595.53
+3468.80 , 1706.58 , 622.08
+3468.80 , 1774.58 , 648.65
+3468.80 , 1842.58 , 675.30
+3468.80 , 1910.58 , 701.94
+3468.80 , 1978.59 , 728.66
+3468.80 , 2046.59 , 755.40
+3468.80 , 2114.59 , 782.19
+3468.80 , 2182.59 , 809.03
+3468.80 , 2250.59 , 835.92
+3672.82 , -2384.78 , -824.23
+3672.82 , -2307.82 , -799.27
+3672.82 , -2230.86 , -774.23
+3672.82 , -2153.90 , -749.16
+3672.82 , -2076.94 , -724.08
+3672.82 , -1999.98 , -698.92
+3672.82 , -1923.02 , -673.73
+3672.82 , -1846.06 , -648.52
+3672.82 , -1769.10 , -623.24
+3672.82 , -1692.14 , -597.94
+3672.82 , -1615.18 , -572.58
+3672.82 , -1538.22 , -547.21
+3672.82 , -1461.26 , -521.78
+3672.82 , -1384.30 , -496.30
+3672.82 , -1307.34 , -470.81
+3672.82 , -1230.38 , -445.23
+3672.82 , -1153.42 , -419.66
+3672.82 , -1076.46 , -394.02
+3672.82 , -999.50 , -368.35
+3672.82 , -922.54 , -342.63
+3672.82 , -845.58 , -316.87
+3672.82 , -768.62 , -291.08
+3672.82 , -691.66 , -265.25
+3672.82 , -614.70 , -239.37
+3672.82 , -537.74 , -213.45
+3672.82 , -460.78 , -187.49
+3672.82 , -383.82 , -161.50
+3672.82 , -306.86 , -135.46
+3672.82 , -229.90 , -109.38
+3672.82 , -152.94 , -83.26
+3672.82 , -75.98 , -57.10
+3672.82 , 0.98 , -30.89
+3672.82 , 77.94 , -3.97
+3672.82 , 145.94 , 23.12
+3672.82 , 213.94 , 50.24
+3672.82 , 281.95 , 77.41
+3672.82 , 349.95 , 104.62
+3672.82 , 417.95 , 131.87
+3672.82 , 485.95 , 159.16
+3672.82 , 553.95 , 186.50
+3672.82 , 621.95 , 213.88
+3672.82 , 689.96 , 241.30
+3672.82 , 757.96 , 268.76
+3672.82 , 825.96 , 296.24
+3672.82 , 893.96 , 323.80
+3672.82 , 961.96 , 351.38
+3672.82 , 1029.96 , 378.99
+3672.82 , 1097.97 , 406.66
+3672.82 , 1165.97 , 434.37
+3672.82 , 1233.97 , 462.12
+3672.82 , 1301.97 , 489.92
+3672.82 , 1369.97 , 517.74
+3672.82 , 1437.98 , 545.61
+3672.82 , 1505.98 , 573.53
+3672.82 , 1573.98 , 601.48
+3672.82 , 1641.98 , 629.49
+3672.82 , 1709.98 , 657.51
+3672.82 , 1777.98 , 685.60
+3672.82 , 1845.99 , 713.72
+3672.82 , 1913.99 , 741.88
+3672.82 , 1981.99 , 770.09
+3672.82 , 2049.99 , 798.35
+3672.82 , 2117.99 , 826.63
+3672.82 , 2185.99 , 854.96
+3672.82 , 2254.00 , 883.34
+3876.84 , -2381.37 , -871.67
+3876.84 , -2304.41 , -845.21
+3876.84 , -2227.45 , -818.73
+3876.84 , -2150.49 , -792.20
+3876.84 , -2073.53 , -765.65
+3876.84 , -1996.57 , -739.03
+3876.84 , -1919.61 , -712.38
+3876.84 , -1842.65 , -685.70
+3876.84 , -1765.69 , -658.96
+3876.84 , -1688.73 , -632.19
+3876.84 , -1611.77 , -605.39
+3876.84 , -1534.81 , -578.52
+3876.84 , -1457.85 , -551.63
+3876.84 , -1380.89 , -524.69
+3876.84 , -1303.93 , -497.73
+3876.84 , -1226.97 , -470.72
+3876.84 , -1150.01 , -443.66
+3876.84 , -1073.05 , -416.57
+3876.84 , -996.09 , -389.44
+3876.84 , -919.13 , -362.26
+3876.84 , -842.18 , -335.03
+3876.84 , -765.22 , -307.77
+3876.84 , -688.26 , -280.47
+3876.84 , -611.30 , -253.14
+3876.84 , -534.34 , -225.76
+3876.84 , -457.38 , -198.34
+3876.84 , -380.42 , -170.87
+3876.84 , -303.46 , -143.37
+3876.84 , -226.50 , -115.83
+3876.84 , -149.54 , -88.24
+3876.84 , -72.58 , -60.62
+3876.84 , 4.38 , -32.95
+3876.84 , 81.34 , -4.51
+3876.84 , 149.35 , 24.07
+3876.84 , 217.35 , 52.70
+3876.84 , 285.35 , 81.37
+3876.84 , 353.35 , 110.07
+3876.84 , 421.35 , 138.82
+3876.84 , 489.35 , 167.61
+3876.84 , 557.36 , 196.44
+3876.84 , 625.36 , 225.32
+3876.84 , 693.36 , 254.23
+3876.84 , 761.36 , 283.18
+3876.84 , 829.36 , 312.19
+3876.84 , 897.36 , 341.21
+3876.84 , 965.37 , 370.31
+3876.84 , 1033.37 , 399.43
+3876.84 , 1101.37 , 428.58
+3876.84 , 1169.37 , 457.80
+3876.84 , 1237.37 , 487.05
+3876.84 , 1305.37 , 516.34
+3876.84 , 1373.38 , 545.66
+3876.84 , 1441.38 , 575.02
+3876.84 , 1509.38 , 604.44
+3876.84 , 1577.38 , 633.90
+3876.84 , 1645.38 , 663.38
+3876.84 , 1713.38 , 692.94
+3876.84 , 1781.39 , 722.50
+3876.84 , 1849.39 , 752.13
+3876.84 , 1917.39 , 781.79
+3876.84 , 1985.39 , 811.49
+3876.84 , 2053.39 , 841.25
+3876.84 , 2121.40 , 871.02
+3876.84 , 2189.40 , 900.85
+3876.84 , 2257.40 , 930.72
+4080.85 , -2377.97 , -919.12
+4080.85 , -2301.01 , -891.23
+4080.85 , -2224.05 , -863.26
+4080.85 , -2147.09 , -835.27
+4080.85 , -2070.13 , -807.25
+4080.85 , -1993.17 , -779.18
+4080.85 , -1916.21 , -751.07
+4080.85 , -1839.25 , -722.91
+4080.85 , -1762.29 , -694.72
+4080.85 , -1685.33 , -666.48
+4080.85 , -1608.37 , -638.20
+4080.85 , -1531.41 , -609.89
+4080.85 , -1454.45 , -581.54
+4080.85 , -1377.49 , -553.13
+4080.85 , -1300.53 , -524.70
+4080.85 , -1223.57 , -496.23
+4080.85 , -1146.61 , -467.70
+4080.85 , -1069.65 , -439.15
+4080.85 , -992.69 , -410.55
+4080.85 , -915.73 , -381.91
+4080.85 , -838.77 , -353.23
+4080.85 , -761.81 , -324.52
+4080.85 , -684.85 , -295.75
+4080.85 , -607.89 , -266.94
+4080.85 , -530.93 , -238.09
+4080.85 , -453.97 , -209.21
+4080.85 , -377.01 , -180.29
+4080.85 , -300.05 , -151.32
+4080.85 , -223.09 , -122.31
+4080.85 , -146.13 , -93.26
+4080.85 , -69.17 , -64.18
+4080.85 , 7.79 , -35.04
+4080.85 , 84.75 , -5.08
+4080.85 , 152.75 , 25.00
+4080.85 , 220.75 , 55.12
+4080.85 , 288.75 , 85.29
+4080.85 , 356.75 , 115.49
+4080.85 , 424.75 , 145.74
+4080.85 , 492.76 , 176.03
+4080.85 , 560.76 , 206.37
+4080.85 , 628.76 , 236.72
+4080.85 , 696.76 , 267.14
+4080.85 , 764.76 , 297.59
+4080.85 , 832.77 , 328.08
+4080.85 , 900.77 , 358.63
+4080.85 , 968.77 , 389.19
+4080.85 , 1036.77 , 419.84
+4080.85 , 1104.77 , 450.48
+4080.85 , 1172.77 , 481.19
+4080.85 , 1240.78 , 511.93
+4080.85 , 1308.78 , 542.71
+4080.85 , 1376.78 , 573.55
+4080.85 , 1444.78 , 604.41
+4080.85 , 1512.78 , 635.34
+4080.85 , 1580.78 , 666.27
+4080.85 , 1648.79 , 697.27
+4080.85 , 1716.79 , 728.30
+4080.85 , 1784.79 , 759.38
+4080.85 , 1852.79 , 790.50
+4080.85 , 1920.79 , 821.68
+4080.85 , 1988.79 , 852.87
+4080.85 , 2056.80 , 884.12
+4080.85 , 2124.80 , 915.39
+4080.85 , 2192.80 , 946.71
+4080.85 , 2260.80 , 978.07
+4268.63 , -2374.84 , -962.82
+4268.63 , -2297.88 , -933.58
+4268.63 , -2220.92 , -904.26
+4268.63 , -2143.96 , -874.95
+4268.63 , -2067.00 , -845.56
+4268.63 , -1990.04 , -816.15
+4268.63 , -1913.08 , -786.68
+4268.63 , -1836.12 , -757.17
+4268.63 , -1759.16 , -727.64
+4268.63 , -1682.20 , -698.06
+4268.63 , -1605.24 , -668.45
+4268.63 , -1528.28 , -638.77
+4268.63 , -1451.32 , -609.07
+4268.63 , -1374.36 , -579.34
+4268.63 , -1297.40 , -549.54
+4268.63 , -1220.44 , -519.72
+4268.63 , -1143.48 , -489.87
+4268.63 , -1066.52 , -459.95
+4268.63 , -989.56 , -430.01
+4268.63 , -912.60 , -400.01
+4268.63 , -835.64 , -369.99
+4268.63 , -758.68 , -339.93
+4268.63 , -681.72 , -309.81
+4268.63 , -604.76 , -279.68
+4268.63 , -527.80 , -249.48
+4268.63 , -450.84 , -219.25
+4268.63 , -373.88 , -188.98
+4268.63 , -296.92 , -158.66
+4268.63 , -219.96 , -128.31
+4268.63 , -143.00 , -97.92
+4268.63 , -66.04 , -67.48
+4268.63 , 10.92 , -36.97
+4268.63 , 87.88 , -5.64
+4268.63 , 155.88 , 25.82
+4268.63 , 223.88 , 57.32
+4268.63 , 291.88 , 88.86
+4268.63 , 359.89 , 120.45
+4268.63 , 427.89 , 152.07
+4268.63 , 495.89 , 183.74
+4268.63 , 563.89 , 215.44
+4268.63 , 631.89 , 247.19
+4268.63 , 699.89 , 278.99
+4268.63 , 767.90 , 310.81
+4268.63 , 835.90 , 342.68
+4268.63 , 903.90 , 374.60
+4268.63 , 971.90 , 406.57
+4268.63 , 1039.90 , 438.56
+4268.63 , 1107.90 , 470.60
+4268.63 , 1175.91 , 502.69
+4268.63 , 1243.91 , 534.80
+4268.63 , 1311.91 , 566.96
+4268.63 , 1379.91 , 599.17
+4268.63 , 1447.91 , 631.43
+4268.63 , 1515.91 , 663.71
+4268.63 , 1583.92 , 696.04
+4268.63 , 1651.92 , 728.42
+4268.63 , 1719.92 , 760.82
+4268.63 , 1787.92 , 793.27
+4268.63 , 1855.92 , 825.77
+4268.63 , 1923.93 , 858.32
+4268.63 , 1991.93 , 890.89
+4268.63 , 2059.93 , 923.51
+4268.63 , 2127.93 , 956.18
+4268.63 , 2195.93 , 988.87
+4268.63 , 2263.93 , 1021.62
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G3.vemo b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G3.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..a95612fadc82e410c8dc55a4413e37c3d9c0c667
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G3.vemo
@@ -0,0 +1,2016 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00 , -2326.01 , 23.82
+0.00 , -2253.83 , 22.44
+0.00 , -2181.64 , 21.09
+0.00 , -2109.45 , 19.79
+0.00 , -2037.27 , 18.53
+0.00 , -1965.08 , 17.31
+0.00 , -1892.90 , 16.13
+0.00 , -1820.71 , 14.99
+0.00 , -1748.52 , 13.89
+0.00 , -1676.34 , 12.84
+0.00 , -1604.15 , 11.83
+0.00 , -1531.97 , 10.85
+0.00 , -1459.78 , 9.92
+0.00 , -1387.59 , 9.04
+0.00 , -1315.41 , 8.19
+0.00 , -1243.22 , 7.38
+0.00 , -1171.04 , 6.62
+0.00 , -1098.85 , 5.90
+0.00 , -1026.67 , 5.21
+0.00 , -954.48 , 4.57
+0.00 , -882.29 , 3.98
+0.00 , -810.11 , 3.42
+0.00 , -736.51 , 2.90
+0.00 , -661.35 , 2.43
+0.00 , -586.18 , 2.00
+0.00 , -510.92 , 1.61
+0.00 , -435.64 , 1.26
+0.00 , -360.35 , 0.95
+0.00 , -285.07 , 0.69
+0.00 , -209.79 , 0.46
+0.00 , -134.50 , 0.28
+0.00 , -59.22 , 0.14
+0.00 , 16.06 , 0.09
+0.00 , 85.44 , 0.21
+0.00 , 154.82 , 0.38
+0.00 , 224.20 , 0.58
+0.00 , 293.58 , 0.83
+0.00 , 362.96 , 1.12
+0.00 , 432.35 , 1.45
+0.00 , 501.73 , 1.82
+0.00 , 571.11 , 2.23
+0.00 , 640.49 , 2.69
+0.00 , 709.87 , 3.19
+0.00 , 779.25 , 3.72
+0.00 , 848.63 , 4.30
+0.00 , 918.01 , 4.93
+0.00 , 987.39 , 5.59
+0.00 , 1056.77 , 6.29
+0.00 , 1126.15 , 7.04
+0.00 , 1195.53 , 7.83
+0.00 , 1264.91 , 8.65
+0.00 , 1334.29 , 9.52
+0.00 , 1403.67 , 10.44
+0.00 , 1473.05 , 11.39
+0.00 , 1542.44 , 12.38
+0.00 , 1611.82 , 13.42
+0.00 , 1681.20 , 14.50
+0.00 , 1750.58 , 15.62
+0.00 , 1819.96 , 16.78
+0.00 , 1889.34 , 17.98
+0.00 , 1958.72 , 19.22
+0.00 , 2028.10 , 20.51
+0.00 , 2097.48 , 21.84
+0.00 , 2166.86 , 23.20
+0.00 , 2236.24 , 24.61
+40.81 , -2326.67 , 13.98
+40.81 , -2254.48 , 12.91
+40.81 , -2182.30 , 11.88
+40.81 , -2110.11 , 10.89
+40.81 , -2037.92 , 9.94
+40.81 , -1965.74 , 9.03
+40.81 , -1893.55 , 8.16
+40.81 , -1821.37 , 7.34
+40.81 , -1749.18 , 6.55
+40.81 , -1676.99 , 5.81
+40.81 , -1604.81 , 5.11
+40.81 , -1532.62 , 4.45
+40.81 , -1460.44 , 3.83
+40.81 , -1388.25 , 3.26
+40.81 , -1316.06 , 2.72
+40.81 , -1243.88 , 2.23
+40.81 , -1171.69 , 1.78
+40.81 , -1099.51 , 1.37
+40.81 , -1027.32 , 1.00
+40.81 , -955.10 , 0.68
+40.81 , -882.53 , 0.40
+40.81 , -809.96 , 0.16
+40.81 , -736.11 , -0.05
+40.81 , -660.83 , -0.22
+40.81 , -585.55 , -0.36
+40.81 , -510.26 , -0.45
+40.81 , -434.98 , -0.50
+40.81 , -359.70 , -0.51
+40.81 , -284.41 , -0.48
+40.81 , -209.13 , -0.41
+40.81 , -133.85 , -0.30
+40.81 , -58.57 , -0.14
+40.81 , 16.72 , 0.10
+40.81 , 86.10 , 0.53
+40.81 , 155.48 , 0.99
+40.81 , 224.86 , 1.50
+40.81 , 294.24 , 2.04
+40.81 , 363.62 , 2.63
+40.81 , 433.00 , 3.26
+40.81 , 502.38 , 3.94
+40.81 , 571.76 , 4.65
+40.81 , 641.14 , 5.40
+40.81 , 710.52 , 6.20
+40.81 , 779.90 , 7.04
+40.81 , 849.28 , 7.92
+40.81 , 918.67 , 8.84
+40.81 , 988.05 , 9.80
+40.81 , 1057.43 , 10.80
+40.81 , 1126.81 , 11.85
+40.81 , 1196.19 , 12.94
+40.81 , 1265.57 , 14.07
+40.81 , 1334.95 , 15.24
+40.81 , 1404.33 , 16.45
+40.81 , 1473.71 , 17.70
+40.81 , 1543.09 , 18.99
+40.81 , 1612.47 , 20.33
+40.81 , 1681.85 , 21.71
+40.81 , 1751.23 , 23.13
+40.81 , 1820.61 , 24.59
+40.81 , 1889.99 , 26.09
+40.81 , 1959.37 , 27.63
+40.81 , 2028.76 , 29.22
+40.81 , 2098.14 , 30.85
+40.81 , 2167.52 , 32.51
+40.81 , 2236.90 , 34.22
+81.62 , -2327.32 , 4.15
+81.62 , -2255.14 , 3.39
+81.62 , -2182.95 , 2.67
+81.62 , -2110.77 , 2.00
+81.62 , -2038.58 , 1.38
+81.62 , -1966.39 , 0.79
+81.62 , -1894.21 , 0.25
+81.62 , -1822.02 , -0.26
+81.62 , -1749.84 , -0.72
+81.62 , -1677.65 , -1.14
+81.62 , -1605.46 , -1.53
+81.62 , -1533.28 , -1.87
+81.62 , -1461.09 , -2.17
+81.62 , -1388.91 , -2.43
+81.62 , -1316.72 , -2.65
+81.62 , -1244.53 , -2.83
+81.62 , -1172.35 , -2.97
+81.62 , -1100.16 , -3.06
+81.62 , -1027.98 , -3.12
+81.62 , -955.71 , -3.14
+81.62 , -882.64 , -3.12
+81.62 , -809.57 , -3.06
+81.62 , -735.46 , -2.97
+81.62 , -660.17 , -2.85
+81.62 , -584.89 , -2.69
+81.62 , -509.61 , -2.49
+81.62 , -434.32 , -2.25
+81.62 , -359.04 , -1.96
+81.62 , -283.76 , -1.64
+81.62 , -208.48 , -1.27
+81.62 , -133.19 , -0.87
+81.62 , -57.91 , -0.42
+81.62 , 17.37 , 0.12
+81.62 , 86.75 , 0.84
+81.62 , 156.13 , 1.61
+81.62 , 225.51 , 2.41
+81.62 , 294.90 , 3.26
+81.62 , 364.28 , 4.15
+81.62 , 433.66 , 5.08
+81.62 , 503.04 , 6.05
+81.62 , 572.42 , 7.06
+81.62 , 641.80 , 8.12
+81.62 , 711.18 , 9.21
+81.62 , 780.56 , 10.35
+81.62 , 849.94 , 11.53
+81.62 , 919.32 , 12.75
+81.62 , 988.70 , 14.01
+81.62 , 1058.08 , 15.32
+81.62 , 1127.46 , 16.66
+81.62 , 1196.84 , 18.05
+81.62 , 1266.22 , 19.48
+81.62 , 1335.60 , 20.95
+81.62 , 1404.99 , 22.46
+81.62 , 1474.37 , 24.01
+81.62 , 1543.75 , 25.60
+81.62 , 1613.13 , 27.24
+81.62 , 1682.51 , 28.92
+81.62 , 1751.89 , 30.64
+81.62 , 1821.27 , 32.40
+81.62 , 1890.65 , 34.20
+81.62 , 1960.03 , 36.04
+81.62 , 2029.41 , 37.92
+81.62 , 2098.79 , 39.85
+81.62 , 2168.17 , 41.82
+81.62 , 2237.55 , 43.83
+122.43 , -2327.98 , -5.50
+122.43 , -2255.79 , -5.95
+122.43 , -2183.61 , -6.35
+122.43 , -2111.42 , -6.71
+122.43 , -2039.23 , -7.03
+122.43 , -1967.05 , -7.31
+122.43 , -1894.86 , -7.54
+122.43 , -1822.68 , -7.74
+122.43 , -1750.49 , -7.90
+122.43 , -1678.31 , -8.02
+122.43 , -1606.12 , -8.09
+122.43 , -1533.93 , -8.13
+122.43 , -1461.75 , -8.12
+122.43 , -1389.56 , -8.07
+122.43 , -1317.38 , -7.99
+122.43 , -1245.19 , -7.86
+122.43 , -1173.00 , -7.69
+122.43 , -1100.82 , -7.48
+122.43 , -1028.63 , -7.23
+122.43 , -956.32 , -6.94
+122.43 , -882.75 , -6.63
+122.43 , -809.18 , -6.28
+122.43 , -734.80 , -5.89
+122.43 , -659.52 , -5.48
+122.43 , -584.23 , -5.02
+122.43 , -508.95 , -4.53
+122.43 , -433.67 , -3.99
+122.43 , -358.39 , -3.42
+122.43 , -283.10 , -2.80
+122.43 , -207.82 , -2.14
+122.43 , -132.54 , -1.44
+122.43 , -57.25 , -0.71
+122.43 , 18.03 , 0.13
+122.43 , 87.41 , 1.16
+122.43 , 156.79 , 2.22
+122.43 , 226.17 , 3.33
+122.43 , 295.55 , 4.47
+122.43 , 364.93 , 5.66
+122.43 , 434.31 , 6.89
+122.43 , 503.69 , 8.16
+122.43 , 573.07 , 9.47
+122.43 , 642.45 , 10.83
+122.43 , 711.83 , 12.22
+122.43 , 781.22 , 13.66
+122.43 , 850.60 , 15.14
+122.43 , 919.98 , 16.66
+122.43 , 989.36 , 18.22
+122.43 , 1058.74 , 19.83
+122.43 , 1128.12 , 21.47
+122.43 , 1197.50 , 23.16
+122.43 , 1266.88 , 24.89
+122.43 , 1336.26 , 26.66
+122.43 , 1405.64 , 28.47
+122.43 , 1475.02 , 30.32
+122.43 , 1544.40 , 32.21
+122.43 , 1613.78 , 34.15
+122.43 , 1683.16 , 36.13
+122.43 , 1752.54 , 38.14
+122.43 , 1821.92 , 40.20
+122.43 , 1891.31 , 42.30
+122.43 , 1960.69 , 44.45
+122.43 , 2030.07 , 46.63
+122.43 , 2099.45 , 48.86
+122.43 , 2168.83 , 51.13
+122.43 , 2238.21 , 53.43
+163.24 , -2328.63 , -15.12
+163.24 , -2256.45 , -15.26
+163.24 , -2184.26 , -15.35
+163.24 , -2112.08 , -15.41
+163.24 , -2039.89 , -15.42
+163.24 , -1967.70 , -15.39
+163.24 , -1895.52 , -15.32
+163.24 , -1823.33 , -15.22
+163.24 , -1751.15 , -15.07
+163.24 , -1678.96 , -14.88
+163.24 , -1606.77 , -14.65
+163.24 , -1534.59 , -14.37
+163.24 , -1462.40 , -14.06
+163.24 , -1390.22 , -13.71
+163.24 , -1318.03 , -13.32
+163.24 , -1245.84 , -12.88
+163.24 , -1173.66 , -12.41
+163.24 , -1101.47 , -11.89
+163.24 , -1029.29 , -11.34
+163.24 , -956.93 , -10.74
+163.24 , -882.86 , -10.14
+163.24 , -808.79 , -9.49
+163.24 , -734.14 , -8.81
+163.24 , -658.86 , -8.11
+163.24 , -583.58 , -7.36
+163.24 , -508.30 , -6.57
+163.24 , -433.01 , -5.74
+163.24 , -357.73 , -4.87
+163.24 , -282.45 , -3.96
+163.24 , -207.16 , -3.01
+163.24 , -131.88 , -2.02
+163.24 , -56.60 , -0.99
+163.24 , 18.68 , 0.15
+163.24 , 88.06 , 1.47
+163.24 , 157.44 , 2.83
+163.24 , 226.83 , 4.24
+163.24 , 296.21 , 5.68
+163.24 , 365.59 , 7.17
+163.24 , 434.97 , 8.70
+163.24 , 504.35 , 10.27
+163.24 , 573.73 , 11.89
+163.24 , 643.11 , 13.54
+163.24 , 712.49 , 15.24
+163.24 , 781.87 , 16.97
+163.24 , 851.25 , 18.75
+163.24 , 920.63 , 20.57
+163.24 , 990.01 , 22.43
+163.24 , 1059.39 , 24.34
+163.24 , 1128.77 , 26.28
+163.24 , 1198.15 , 28.27
+163.24 , 1267.53 , 30.29
+163.24 , 1336.92 , 32.36
+163.24 , 1406.30 , 34.47
+163.24 , 1475.68 , 36.63
+163.24 , 1545.06 , 38.82
+163.24 , 1614.44 , 41.06
+163.24 , 1683.82 , 43.33
+163.24 , 1753.20 , 45.65
+163.24 , 1822.58 , 48.01
+163.24 , 1891.96 , 50.41
+163.24 , 1961.34 , 52.85
+163.24 , 2030.72 , 55.34
+163.24 , 2100.10 , 57.86
+163.24 , 2169.48 , 60.43
+163.24 , 2238.86 , 63.04
+204.04 , -2329.29 , -24.73
+204.04 , -2257.10 , -24.56
+204.04 , -2184.92 , -24.35
+204.04 , -2112.73 , -24.09
+204.04 , -2040.55 , -23.80
+204.04 , -1968.36 , -23.47
+204.04 , -1896.17 , -23.09
+204.04 , -1823.99 , -22.68
+204.04 , -1751.80 , -22.22
+204.04 , -1679.62 , -21.73
+204.04 , -1607.43 , -21.19
+204.04 , -1535.24 , -20.61
+204.04 , -1463.06 , -19.99
+204.04 , -1390.87 , -19.33
+204.04 , -1318.69 , -18.63
+204.04 , -1246.50 , -17.89
+204.04 , -1174.31 , -17.11
+204.04 , -1102.13 , -16.29
+204.04 , -1029.94 , -15.43
+204.04 , -957.54 , -14.53
+204.04 , -882.97 , -13.64
+204.04 , -808.40 , -12.70
+204.04 , -733.49 , -11.74
+204.04 , -658.21 , -10.74
+204.04 , -582.92 , -9.70
+204.04 , -507.64 , -8.62
+204.04 , -432.36 , -7.49
+204.04 , -357.07 , -6.33
+204.04 , -281.79 , -5.13
+204.04 , -206.51 , -3.88
+204.04 , -131.23 , -2.60
+204.04 , -55.94 , -1.27
+204.04 , 19.34 , 0.16
+204.04 , 88.72 , 1.78
+204.04 , 158.10 , 3.44
+204.04 , 227.48 , 5.15
+204.04 , 296.86 , 6.90
+204.04 , 366.24 , 8.68
+204.04 , 435.62 , 10.51
+204.04 , 505.00 , 12.38
+204.04 , 574.38 , 14.30
+204.04 , 643.76 , 16.25
+204.04 , 713.15 , 18.24
+204.04 , 782.53 , 20.28
+204.04 , 851.91 , 22.36
+204.04 , 921.29 , 24.48
+204.04 , 990.67 , 26.64
+204.04 , 1060.05 , 28.84
+204.04 , 1129.43 , 31.09
+204.04 , 1198.81 , 33.37
+204.04 , 1268.19 , 35.70
+204.04 , 1337.57 , 38.07
+204.04 , 1406.95 , 40.48
+204.04 , 1476.33 , 42.93
+204.04 , 1545.71 , 45.43
+204.04 , 1615.09 , 47.96
+204.04 , 1684.47 , 50.54
+204.04 , 1753.85 , 53.16
+204.04 , 1823.24 , 55.81
+204.04 , 1892.62 , 58.52
+204.04 , 1962.00 , 61.26
+204.04 , 2031.38 , 64.04
+204.04 , 2100.76 , 66.87
+204.04 , 2170.14 , 69.73
+204.04 , 2239.52 , 72.64
+244.85 , -2329.95 , -34.33
+244.85 , -2257.76 , -33.85
+244.85 , -2185.57 , -33.33
+244.85 , -2113.39 , -32.77
+244.85 , -2041.20 , -32.18
+244.85 , -1969.02 , -31.54
+244.85 , -1896.83 , -30.85
+244.85 , -1824.64 , -30.13
+244.85 , -1752.46 , -29.37
+244.85 , -1680.27 , -28.57
+244.85 , -1608.09 , -27.72
+244.85 , -1535.90 , -26.84
+244.85 , -1463.71 , -25.91
+244.85 , -1391.53 , -24.95
+244.85 , -1319.34 , -23.94
+244.85 , -1247.16 , -22.90
+244.85 , -1174.97 , -21.81
+244.85 , -1102.78 , -20.68
+244.85 , -1030.60 , -19.51
+244.85 , -958.15 , -18.31
+244.85 , -883.08 , -17.13
+244.85 , -808.01 , -15.92
+244.85 , -732.83 , -14.66
+244.85 , -657.55 , -13.37
+244.85 , -582.27 , -12.03
+244.85 , -506.99 , -10.66
+244.85 , -431.70 , -9.24
+244.85 , -356.42 , -7.79
+244.85 , -281.14 , -6.29
+244.85 , -205.85 , -4.76
+244.85 , -130.57 , -3.18
+244.85 , -55.29 , -1.56
+244.85 , 19.99 , 0.17
+244.85 , 89.38 , 2.09
+244.85 , 158.76 , 4.05
+244.85 , 228.14 , 6.06
+244.85 , 297.52 , 8.10
+244.85 , 366.90 , 10.19
+244.85 , 436.28 , 12.32
+244.85 , 505.66 , 14.49
+244.85 , 575.04 , 16.70
+244.85 , 644.42 , 18.96
+244.85 , 713.80 , 21.25
+244.85 , 783.18 , 23.59
+244.85 , 852.56 , 25.97
+244.85 , 921.94 , 28.39
+244.85 , 991.32 , 30.85
+244.85 , 1060.70 , 33.35
+244.85 , 1130.08 , 35.89
+244.85 , 1199.47 , 38.48
+244.85 , 1268.85 , 41.11
+244.85 , 1338.23 , 43.78
+244.85 , 1407.61 , 46.49
+244.85 , 1476.99 , 49.24
+244.85 , 1546.37 , 52.03
+244.85 , 1615.75 , 54.86
+244.85 , 1685.13 , 57.74
+244.85 , 1754.51 , 60.66
+244.85 , 1823.89 , 63.62
+244.85 , 1893.27 , 66.62
+244.85 , 1962.65 , 69.66
+244.85 , 2032.03 , 72.74
+244.85 , 2101.41 , 75.87
+244.85 , 2170.79 , 79.04
+244.85 , 2240.17 , 82.24
+285.67 , -2330.60 , -43.92
+285.67 , -2258.41 , -43.13
+285.67 , -2186.23 , -42.31
+285.67 , -2114.04 , -41.44
+285.67 , -2041.86 , -40.54
+285.67 , -1969.67 , -39.59
+285.67 , -1897.48 , -38.60
+285.67 , -1825.30 , -37.58
+285.67 , -1753.11 , -36.51
+285.67 , -1680.93 , -35.40
+285.67 , -1608.74 , -34.25
+285.67 , -1536.56 , -33.06
+285.67 , -1464.37 , -31.83
+285.67 , -1392.18 , -30.55
+285.67 , -1320.00 , -29.24
+285.67 , -1247.81 , -27.89
+285.67 , -1175.63 , -26.49
+285.67 , -1103.23 , -25.07
+285.67 , -1030.76 , -23.60
+285.67 , -958.03 , -22.10
+285.67 , -882.74 , -20.64
+285.67 , -807.46 , -19.13
+285.67 , -732.18 , -17.59
+285.67 , -656.90 , -16.00
+285.67 , -581.61 , -14.37
+285.67 , -506.33 , -12.71
+285.67 , -431.05 , -11.00
+285.67 , -355.76 , -9.25
+285.67 , -280.48 , -7.46
+285.67 , -205.20 , -5.63
+285.67 , -129.92 , -3.76
+285.67 , -54.63 , -1.85
+285.67 , 20.65 , 0.18
+285.67 , 90.03 , 2.40
+285.67 , 159.41 , 4.66
+285.67 , 228.79 , 6.97
+285.67 , 298.17 , 9.31
+285.67 , 367.55 , 11.70
+285.67 , 436.93 , 14.13
+285.67 , 506.31 , 16.60
+285.67 , 575.70 , 19.11
+285.67 , 645.08 , 21.67
+285.67 , 714.46 , 24.26
+285.67 , 783.84 , 26.90
+285.67 , 853.22 , 29.57
+285.67 , 922.60 , 32.29
+285.67 , 991.98 , 35.05
+285.67 , 1061.36 , 37.86
+285.67 , 1130.74 , 40.70
+285.67 , 1200.12 , 43.59
+285.67 , 1269.50 , 46.51
+285.67 , 1338.88 , 49.48
+285.67 , 1408.26 , 52.49
+285.67 , 1477.64 , 55.54
+285.67 , 1547.02 , 58.64
+285.67 , 1616.40 , 61.77
+285.67 , 1685.79 , 64.94
+285.67 , 1755.17 , 68.16
+285.67 , 1824.55 , 71.42
+285.67 , 1893.93 , 74.72
+285.67 , 1963.31 , 78.06
+285.67 , 2032.69 , 81.45
+285.67 , 2102.07 , 84.87
+285.67 , 2171.45 , 88.34
+285.67 , 2240.83 , 91.85
+326.47 , -2331.26 , -53.49
+326.47 , -2259.07 , -52.40
+326.47 , -2186.88 , -51.27
+326.47 , -2114.70 , -50.10
+326.47 , -2042.51 , -48.89
+326.47 , -1970.33 , -47.64
+326.47 , -1898.14 , -46.34
+326.47 , -1825.95 , -45.01
+326.47 , -1753.77 , -43.64
+326.47 , -1681.58 , -42.22
+326.47 , -1609.40 , -40.76
+326.47 , -1537.21 , -39.27
+326.47 , -1465.02 , -37.73
+326.47 , -1392.84 , -36.15
+326.47 , -1320.65 , -34.53
+326.47 , -1248.47 , -32.87
+326.47 , -1176.28 , -31.17
+326.47 , -1103.53 , -29.45
+326.47 , -1030.56 , -27.69
+326.47 , -957.37 , -25.91
+326.47 , -882.09 , -24.15
+326.47 , -806.81 , -22.35
+326.47 , -731.52 , -20.51
+326.47 , -656.24 , -18.63
+326.47 , -580.96 , -16.71
+326.47 , -505.67 , -14.75
+326.47 , -430.39 , -12.75
+326.47 , -355.11 , -10.71
+326.47 , -279.83 , -8.63
+326.47 , -204.54 , -6.50
+326.47 , -129.26 , -4.34
+326.47 , -53.98 , -2.13
+326.47 , 21.31 , 0.19
+326.47 , 90.69 , 2.71
+326.47 , 160.07 , 5.27
+326.47 , 229.45 , 7.88
+326.47 , 298.83 , 10.52
+326.47 , 368.21 , 13.21
+326.47 , 437.59 , 15.94
+326.47 , 506.97 , 18.71
+326.47 , 576.35 , 21.52
+326.47 , 645.73 , 24.37
+326.47 , 715.11 , 27.27
+326.47 , 784.49 , 30.20
+326.47 , 853.87 , 33.18
+326.47 , 923.25 , 36.20
+326.47 , 992.63 , 39.26
+326.47 , 1062.01 , 42.36
+326.47 , 1131.40 , 45.50
+326.47 , 1200.78 , 48.69
+326.47 , 1270.16 , 51.92
+326.47 , 1339.54 , 55.19
+326.47 , 1408.92 , 58.49
+326.47 , 1478.30 , 61.84
+326.47 , 1547.68 , 65.24
+326.47 , 1617.06 , 68.67
+326.47 , 1686.44 , 72.15
+326.47 , 1755.82 , 75.66
+326.47 , 1825.20 , 79.22
+326.47 , 1894.58 , 82.82
+326.47 , 1963.96 , 86.47
+326.47 , 2033.34 , 90.15
+326.47 , 2102.72 , 93.87
+326.47 , 2172.10 , 97.64
+326.47 , 2241.49 , 101.45
+367.28 , -2331.91 , -63.06
+367.28 , -2259.73 , -61.67
+367.28 , -2187.54 , -60.23
+367.28 , -2115.35 , -58.75
+367.28 , -2043.17 , -57.23
+367.28 , -1970.98 , -55.67
+367.28 , -1898.80 , -54.07
+367.28 , -1826.61 , -52.43
+367.28 , -1754.42 , -50.75
+367.28 , -1682.24 , -49.03
+367.28 , -1610.05 , -47.27
+367.28 , -1537.87 , -45.46
+367.28 , -1465.68 , -43.62
+367.28 , -1393.49 , -41.73
+367.28 , -1321.31 , -39.81
+367.28 , -1249.12 , -37.84
+367.28 , -1176.94 , -35.84
+367.28 , -1103.83 , -33.82
+367.28 , -1030.36 , -31.79
+367.28 , -956.72 , -29.71
+367.28 , -881.43 , -27.66
+367.28 , -806.15 , -25.57
+367.28 , -730.87 , -23.44
+367.28 , -655.58 , -21.27
+367.28 , -580.30 , -19.05
+367.28 , -505.02 , -16.80
+367.28 , -429.74 , -14.51
+367.28 , -354.45 , -12.17
+367.28 , -279.17 , -9.80
+367.28 , -203.89 , -7.38
+367.28 , -128.60 , -4.92
+367.28 , -53.32 , -2.42
+367.28 , 21.96 , 0.20
+367.28 , 91.34 , 3.02
+367.28 , 160.72 , 5.88
+367.28 , 230.10 , 8.78
+367.28 , 299.48 , 11.73
+367.28 , 368.86 , 14.71
+367.28 , 438.24 , 17.74
+367.28 , 507.63 , 20.81
+367.28 , 577.01 , 23.92
+367.28 , 646.39 , 27.08
+367.28 , 715.77 , 30.27
+367.28 , 785.15 , 33.51
+367.28 , 854.53 , 36.78
+367.28 , 923.91 , 40.10
+367.28 , 993.29 , 43.46
+367.28 , 1062.67 , 46.87
+367.28 , 1132.05 , 50.31
+367.28 , 1201.43 , 53.79
+367.28 , 1270.81 , 57.32
+367.28 , 1340.19 , 60.89
+367.28 , 1409.57 , 64.50
+367.28 , 1478.95 , 68.15
+367.28 , 1548.33 , 71.84
+367.28 , 1617.72 , 75.57
+367.28 , 1687.10 , 79.35
+367.28 , 1756.48 , 83.17
+367.28 , 1825.86 , 87.02
+367.28 , 1895.24 , 90.92
+367.28 , 1964.62 , 94.87
+367.28 , 2034.00 , 98.85
+367.28 , 2103.38 , 102.87
+367.28 , 2172.76 , 106.94
+367.28 , 2242.14 , 111.04
+408.09 , -2332.57 , -72.62
+408.09 , -2260.38 , -70.92
+408.09 , -2188.19 , -69.17
+408.09 , -2116.01 , -67.39
+408.09 , -2043.82 , -65.57
+408.09 , -1971.64 , -63.70
+408.09 , -1899.45 , -61.79
+408.09 , -1827.27 , -59.84
+408.09 , -1755.08 , -57.86
+408.09 , -1682.89 , -55.83
+408.09 , -1610.71 , -53.76
+408.09 , -1538.52 , -51.65
+408.09 , -1466.34 , -49.50
+408.09 , -1394.15 , -47.31
+408.09 , -1321.96 , -45.08
+408.09 , -1249.78 , -42.81
+408.09 , -1177.59 , -40.49
+408.09 , -1104.13 , -38.19
+408.09 , -1030.16 , -35.88
+408.09 , -956.06 , -33.52
+408.09 , -880.78 , -31.18
+408.09 , -805.49 , -28.79
+408.09 , -730.21 , -26.37
+408.09 , -654.93 , -23.90
+408.09 , -579.65 , -21.40
+408.09 , -504.36 , -18.85
+408.09 , -429.08 , -16.26
+408.09 , -353.80 , -13.63
+408.09 , -278.51 , -10.97
+408.09 , -203.23 , -8.26
+408.09 , -127.95 , -5.51
+408.09 , -52.67 , -2.71
+408.09 , 22.62 , 0.20
+408.09 , 92.00 , 3.32
+408.09 , 161.38 , 6.49
+408.09 , 230.76 , 9.69
+408.09 , 300.14 , 12.93
+408.09 , 369.52 , 16.22
+408.09 , 438.90 , 19.55
+408.09 , 508.28 , 22.92
+408.09 , 577.66 , 26.33
+408.09 , 647.04 , 29.78
+408.09 , 716.42 , 33.27
+408.09 , 785.80 , 36.81
+408.09 , 855.18 , 40.39
+408.09 , 924.56 , 44.01
+408.09 , 993.95 , 47.67
+408.09 , 1063.33 , 51.37
+408.09 , 1132.71 , 55.11
+408.09 , 1202.09 , 58.90
+408.09 , 1271.47 , 62.72
+408.09 , 1340.85 , 66.59
+408.09 , 1410.23 , 70.50
+408.09 , 1479.61 , 74.45
+408.09 , 1548.99 , 78.44
+408.09 , 1618.37 , 82.47
+408.09 , 1687.75 , 86.55
+408.09 , 1757.13 , 90.66
+408.09 , 1826.51 , 94.82
+408.09 , 1895.89 , 99.02
+408.09 , 1965.27 , 103.26
+408.09 , 2034.65 , 107.55
+408.09 , 2104.04 , 111.87
+408.09 , 2173.42 , 116.24
+408.09 , 2242.80 , 120.64
+448.90 , -2333.22 , -82.17
+448.90 , -2261.04 , -80.16
+448.90 , -2188.85 , -78.11
+448.90 , -2116.66 , -76.02
+448.90 , -2044.48 , -73.89
+448.90 , -1972.29 , -71.71
+448.90 , -1900.11 , -69.50
+448.90 , -1827.92 , -67.25
+448.90 , -1755.73 , -64.95
+448.90 , -1683.55 , -62.62
+448.90 , -1611.36 , -60.25
+448.90 , -1539.18 , -57.83
+448.90 , -1466.99 , -55.37
+448.90 , -1394.80 , -52.88
+448.90 , -1322.62 , -50.34
+448.90 , -1250.43 , -47.76
+448.90 , -1178.25 , -45.14
+448.90 , -1104.44 , -42.55
+448.90 , -1029.96 , -39.96
+448.90 , -955.40 , -37.33
+448.90 , -880.12 , -34.69
+448.90 , -804.84 , -32.02
+448.90 , -729.56 , -29.30
+448.90 , -654.27 , -26.54
+448.90 , -578.99 , -23.74
+448.90 , -503.71 , -20.90
+448.90 , -428.42 , -18.02
+448.90 , -353.14 , -15.10
+448.90 , -277.86 , -12.14
+448.90 , -202.58 , -9.13
+448.90 , -127.29 , -6.09
+448.90 , -52.01 , -3.01
+448.90 , 23.27 , 0.21
+448.90 , 92.65 , 3.63
+448.90 , 162.03 , 7.09
+448.90 , 231.41 , 10.59
+448.90 , 300.79 , 14.14
+448.90 , 370.17 , 17.72
+448.90 , 439.56 , 21.35
+448.90 , 508.94 , 25.02
+448.90 , 578.32 , 28.73
+448.90 , 647.70 , 32.48
+448.90 , 717.08 , 36.28
+448.90 , 786.46 , 40.11
+448.90 , 855.84 , 43.99
+448.90 , 925.22 , 47.91
+448.90 , 994.60 , 51.87
+448.90 , 1063.98 , 55.87
+448.90 , 1133.36 , 59.91
+448.90 , 1202.74 , 64.00
+448.90 , 1272.12 , 68.12
+448.90 , 1341.50 , 72.29
+448.90 , 1410.88 , 76.50
+448.90 , 1480.26 , 80.75
+448.90 , 1549.65 , 85.04
+448.90 , 1619.03 , 89.37
+448.90 , 1688.41 , 93.75
+448.90 , 1757.79 , 98.16
+448.90 , 1827.17 , 102.62
+448.90 , 1896.55 , 107.12
+448.90 , 1965.93 , 111.66
+448.90 , 2035.31 , 116.24
+448.90 , 2104.69 , 120.87
+448.90 , 2174.07 , 125.53
+448.90 , 2243.45 , 130.24
+489.71 , -2333.88 , -91.71
+489.71 , -2261.69 , -89.39
+489.71 , -2189.51 , -87.03
+489.71 , -2117.32 , -84.64
+489.71 , -2045.13 , -82.20
+489.71 , -1972.95 , -79.72
+489.71 , -1900.76 , -77.20
+489.71 , -1828.58 , -74.64
+489.71 , -1756.39 , -72.04
+489.71 , -1684.20 , -69.40
+489.71 , -1612.02 , -66.72
+489.71 , -1539.83 , -64.00
+489.71 , -1467.65 , -61.23
+489.71 , -1395.46 , -58.43
+489.71 , -1323.27 , -55.58
+489.71 , -1251.09 , -52.70
+489.71 , -1178.90 , -49.77
+489.71 , -1104.74 , -46.91
+489.71 , -1029.76 , -44.05
+489.71 , -954.75 , -41.14
+489.71 , -879.47 , -38.21
+489.71 , -804.18 , -35.24
+489.71 , -728.90 , -32.23
+489.71 , -653.62 , -29.18
+489.71 , -578.34 , -26.09
+489.71 , -503.05 , -22.95
+489.71 , -427.77 , -19.78
+489.71 , -352.49 , -16.56
+489.71 , -277.20 , -13.31
+489.71 , -201.92 , -10.01
+489.71 , -126.64 , -6.68
+489.71 , -51.36 , -3.30
+489.71 , 23.93 , 0.21
+489.71 , 93.31 , 3.93
+489.71 , 162.69 , 7.69
+489.71 , 232.07 , 11.50
+489.71 , 301.45 , 15.34
+489.71 , 370.83 , 19.23
+489.71 , 440.21 , 23.15
+489.71 , 509.59 , 27.12
+489.71 , 578.97 , 31.13
+489.71 , 648.35 , 35.19
+489.71 , 717.73 , 39.28
+489.71 , 787.11 , 43.41
+489.71 , 856.49 , 47.59
+489.71 , 925.88 , 51.81
+489.71 , 995.26 , 56.07
+489.71 , 1064.64 , 60.37
+489.71 , 1134.02 , 64.71
+489.71 , 1203.40 , 69.10
+489.71 , 1272.78 , 73.52
+489.71 , 1342.16 , 77.99
+489.71 , 1411.54 , 82.50
+489.71 , 1480.92 , 87.05
+489.71 , 1550.30 , 91.64
+489.71 , 1619.68 , 96.27
+489.71 , 1689.06 , 100.95
+489.71 , 1758.44 , 105.66
+489.71 , 1827.82 , 110.42
+489.71 , 1897.20 , 115.22
+489.71 , 1966.58 , 120.06
+489.71 , 2035.97 , 124.94
+489.71 , 2105.35 , 129.86
+489.71 , 2174.73 , 134.83
+489.71 , 2244.11 , 139.84
+816.18 , -2339.12 , -167.65
+816.18 , -2266.94 , -162.88
+816.18 , -2194.75 , -158.08
+816.18 , -2122.56 , -153.23
+816.18 , -2050.38 , -148.34
+816.18 , -1978.19 , -143.41
+816.18 , -1906.01 , -138.44
+816.18 , -1833.82 , -133.43
+816.18 , -1761.63 , -128.38
+816.18 , -1689.45 , -123.29
+816.18 , -1617.26 , -118.15
+816.18 , -1545.08 , -112.98
+816.18 , -1472.32 , -107.81
+816.18 , -1399.53 , -102.61
+816.18 , -1325.92 , -97.44
+816.18 , -1250.64 , -92.36
+816.18 , -1175.35 , -87.25
+816.18 , -1100.07 , -82.10
+816.18 , -1024.79 , -76.90
+816.18 , -949.51 , -71.67
+816.18 , -874.22 , -66.40
+816.18 , -798.94 , -61.08
+816.18 , -723.66 , -55.72
+816.18 , -648.37 , -50.33
+816.18 , -573.09 , -44.89
+816.18 , -497.81 , -39.41
+816.18 , -422.53 , -33.89
+816.18 , -347.24 , -28.33
+816.18 , -271.96 , -22.73
+816.18 , -196.68 , -17.09
+816.18 , -121.39 , -11.41
+816.18 , -46.11 , -5.68
+816.18 , 29.17 , 0.21
+816.18 , 98.55 , 6.33
+816.18 , 167.93 , 12.48
+816.18 , 237.31 , 18.69
+816.18 , 306.69 , 24.93
+816.18 , 376.07 , 31.21
+816.18 , 445.45 , 37.54
+816.18 , 514.84 , 43.90
+816.18 , 584.22 , 50.31
+816.18 , 653.60 , 56.76
+816.18 , 722.98 , 63.25
+816.18 , 792.36 , 69.79
+816.18 , 861.74 , 76.36
+816.18 , 931.12 , 82.98
+816.18 , 1000.50 , 89.63
+816.18 , 1069.88 , 96.33
+816.18 , 1139.26 , 103.07
+816.18 , 1208.64 , 109.85
+816.18 , 1278.02 , 116.68
+816.18 , 1347.40 , 123.54
+816.18 , 1416.78 , 130.45
+816.18 , 1486.16 , 137.40
+816.18 , 1555.54 , 144.39
+816.18 , 1624.93 , 151.42
+816.18 , 1694.31 , 158.49
+816.18 , 1763.69 , 165.60
+816.18 , 1833.07 , 172.76
+816.18 , 1902.45 , 179.96
+816.18 , 1971.83 , 187.19
+816.18 , 2041.21 , 194.47
+816.18 , 2110.59 , 201.80
+816.18 , 2179.97 , 209.16
+816.18 , 2249.35 , 216.56
+1020.26 , -2342.40 , -214.79
+1020.26 , -2270.21 , -208.49
+1020.26 , -2198.03 , -202.15
+1020.26 , -2125.84 , -195.77
+1020.26 , -2053.66 , -189.35
+1020.26 , -1981.47 , -182.89
+1020.26 , -1909.28 , -176.39
+1020.26 , -1837.10 , -169.85
+1020.26 , -1764.91 , -163.26
+1020.26 , -1692.72 , -156.64
+1020.26 , -1620.52 , -149.98
+1020.26 , -1548.32 , -143.27
+1020.26 , -1473.21 , -136.84
+1020.26 , -1397.92 , -130.38
+1020.26 , -1322.64 , -123.88
+1020.26 , -1247.36 , -117.35
+1020.26 , -1172.08 , -110.77
+1020.26 , -1096.79 , -104.15
+1020.26 , -1021.51 , -97.49
+1020.26 , -946.23 , -90.79
+1020.26 , -870.94 , -84.05
+1020.26 , -795.66 , -77.27
+1020.26 , -720.38 , -70.45
+1020.26 , -645.10 , -63.58
+1020.26 , -569.81 , -56.68
+1020.26 , -494.53 , -49.73
+1020.26 , -419.25 , -42.75
+1020.26 , -343.97 , -35.72
+1020.26 , -268.68 , -28.66
+1020.26 , -193.40 , -21.55
+1020.26 , -118.12 , -14.40
+1020.26 , -42.83 , -7.21
+1020.26 , 32.45 , 0.17
+1020.26 , 101.83 , 7.78
+1020.26 , 171.21 , 15.44
+1020.26 , 240.59 , 23.14
+1020.26 , 309.97 , 30.88
+1020.26 , 379.35 , 38.67
+1020.26 , 448.73 , 46.49
+1020.26 , 518.11 , 54.35
+1020.26 , 587.49 , 62.26
+1020.26 , 656.87 , 70.21
+1020.26 , 726.26 , 78.20
+1020.26 , 795.64 , 86.23
+1020.26 , 865.02 , 94.30
+1020.26 , 934.40 , 102.42
+1020.26 , 1003.78 , 110.58
+1020.26 , 1073.16 , 118.77
+1020.26 , 1142.54 , 127.01
+1020.26 , 1211.92 , 135.29
+1020.26 , 1281.30 , 143.61
+1020.26 , 1350.68 , 151.98
+1020.26 , 1420.06 , 160.38
+1020.26 , 1489.44 , 168.83
+1020.26 , 1558.82 , 177.32
+1020.26 , 1628.20 , 185.85
+1020.26 , 1697.58 , 194.42
+1020.26 , 1766.96 , 203.03
+1020.26 , 1836.35 , 211.68
+1020.26 , 1905.73 , 220.38
+1020.26 , 1975.11 , 229.12
+1020.26 , 2044.49 , 237.89
+1020.26 , 2113.87 , 246.71
+1020.26 , 2183.25 , 255.59
+1020.26 , 2252.63 , 264.49
+1224.27 , -2345.68 , -261.68
+1224.27 , -2273.49 , -253.86
+1224.27 , -2201.30 , -245.99
+1224.27 , -2129.12 , -238.07
+1224.27 , -2056.93 , -230.11
+1224.27 , -1984.75 , -222.12
+1224.27 , -1912.56 , -214.09
+1224.27 , -1840.37 , -206.01
+1224.27 , -1768.19 , -197.90
+1224.27 , -1694.58 , -189.92
+1224.27 , -1619.88 , -182.05
+1224.27 , -1545.18 , -174.13
+1224.27 , -1469.93 , -166.25
+1224.27 , -1394.65 , -158.32
+1224.27 , -1319.36 , -150.36
+1224.27 , -1244.08 , -142.36
+1224.27 , -1168.80 , -134.32
+1224.27 , -1093.52 , -126.23
+1224.27 , -1018.23 , -118.11
+1224.27 , -942.95 , -109.94
+1224.27 , -867.67 , -101.73
+1224.27 , -792.39 , -93.49
+1224.27 , -717.10 , -85.20
+1224.27 , -641.82 , -76.87
+1224.27 , -566.54 , -68.50
+1224.27 , -491.25 , -60.09
+1224.27 , -415.97 , -51.64
+1224.27 , -340.69 , -43.15
+1224.27 , -265.41 , -34.61
+1224.27 , -190.12 , -26.04
+1224.27 , -114.84 , -17.43
+1224.27 , -39.56 , -8.77
+1224.27 , 35.73 , 0.10
+1224.27 , 105.11 , 9.22
+1224.27 , 174.49 , 18.37
+1224.27 , 243.87 , 27.57
+1224.27 , 313.25 , 36.81
+1224.27 , 382.63 , 46.09
+1224.27 , 452.01 , 55.41
+1224.27 , 521.39 , 64.78
+1224.27 , 590.77 , 74.18
+1224.27 , 660.15 , 83.63
+1224.27 , 729.53 , 93.12
+1224.27 , 798.91 , 102.65
+1224.27 , 868.29 , 112.22
+1224.27 , 937.67 , 121.83
+1224.27 , 1007.05 , 131.49
+1224.27 , 1076.44 , 141.19
+1224.27 , 1145.82 , 150.92
+1224.27 , 1215.20 , 160.70
+1224.27 , 1284.58 , 170.52
+1224.27 , 1353.96 , 180.38
+1224.27 , 1423.34 , 190.29
+1224.27 , 1492.72 , 200.23
+1224.27 , 1562.10 , 210.22
+1224.27 , 1631.48 , 220.25
+1224.27 , 1700.86 , 230.32
+1224.27 , 1770.24 , 240.42
+1224.27 , 1839.62 , 250.57
+1224.27 , 1909.00 , 260.77
+1224.27 , 1978.38 , 271.02
+1224.27 , 2047.76 , 281.29
+1224.27 , 2117.14 , 291.61
+1224.27 , 2186.53 , 301.98
+1224.27 , 2255.91 , 312.37
+1428.29 , -2348.95 , -308.31
+1428.29 , -2276.77 , -298.96
+1428.29 , -2204.58 , -289.55
+1428.29 , -2132.40 , -280.10
+1428.29 , -2060.21 , -270.63
+1428.29 , -1988.02 , -261.10
+1428.29 , -1915.49 , -251.58
+1428.29 , -1841.38 , -242.27
+1428.29 , -1767.27 , -232.91
+1428.29 , -1692.50 , -223.60
+1428.29 , -1617.22 , -214.34
+1428.29 , -1541.94 , -205.03
+1428.29 , -1466.65 , -195.69
+1428.29 , -1391.37 , -186.30
+1428.29 , -1316.09 , -176.87
+1428.29 , -1240.80 , -167.40
+1428.29 , -1165.52 , -157.89
+1428.29 , -1090.24 , -148.34
+1428.29 , -1014.96 , -138.75
+1428.29 , -939.67 , -129.12
+1428.29 , -864.39 , -119.45
+1428.29 , -789.11 , -109.73
+1428.29 , -713.83 , -99.98
+1428.29 , -638.54 , -90.18
+1428.29 , -563.26 , -80.35
+1428.29 , -487.98 , -70.47
+1428.29 , -412.69 , -60.56
+1428.29 , -337.41 , -50.60
+1428.29 , -262.13 , -40.60
+1428.29 , -186.85 , -30.56
+1428.29 , -111.56 , -20.48
+1428.29 , -36.28 , -10.36
+1428.29 , 39.00 , 0.01
+1428.29 , 108.38 , 10.62
+1428.29 , 177.76 , 21.28
+1428.29 , 247.14 , 31.97
+1428.29 , 316.53 , 42.71
+1428.29 , 385.91 , 53.49
+1428.29 , 455.29 , 64.31
+1428.29 , 524.67 , 75.17
+1428.29 , 594.05 , 86.08
+1428.29 , 663.43 , 97.02
+1428.29 , 732.81 , 108.01
+1428.29 , 802.19 , 119.04
+1428.29 , 871.57 , 130.11
+1428.29 , 940.95 , 141.22
+1428.29 , 1010.33 , 152.38
+1428.29 , 1079.71 , 163.57
+1428.29 , 1149.09 , 174.81
+1428.29 , 1218.47 , 186.09
+1428.29 , 1287.85 , 197.40
+1428.29 , 1357.23 , 208.77
+1428.29 , 1426.62 , 220.17
+1428.29 , 1496.00 , 231.61
+1428.29 , 1565.38 , 243.09
+1428.29 , 1634.76 , 254.63
+1428.29 , 1704.14 , 266.18
+1428.29 , 1773.52 , 277.80
+1428.29 , 1842.90 , 289.45
+1428.29 , 1912.28 , 301.14
+1428.29 , 1981.66 , 312.88
+1428.29 , 2051.04 , 324.65
+1428.29 , 2120.42 , 336.49
+1428.29 , 2189.80 , 348.32
+1428.29 , 2259.18 , 360.23
+1632.39 , -2352.23 , -354.71
+1632.39 , -2280.05 , -343.82
+1632.39 , -2207.86 , -332.88
+1632.39 , -2135.67 , -321.90
+1632.39 , -2062.42 , -311.07
+1632.39 , -1988.91 , -300.24
+1632.39 , -1915.07 , -289.41
+1632.39 , -1839.79 , -278.81
+1632.39 , -1764.51 , -268.16
+1632.39 , -1689.22 , -257.47
+1632.39 , -1613.94 , -246.74
+1632.39 , -1538.66 , -235.97
+1632.39 , -1463.38 , -225.16
+1632.39 , -1388.09 , -214.30
+1632.39 , -1312.81 , -203.41
+1632.39 , -1237.53 , -192.47
+1632.39 , -1162.24 , -181.50
+1632.39 , -1086.96 , -170.48
+1632.39 , -1011.68 , -159.43
+1632.39 , -936.40 , -148.33
+1632.39 , -861.11 , -137.19
+1632.39 , -785.83 , -126.01
+1632.39 , -710.55 , -114.79
+1632.39 , -635.26 , -103.53
+1632.39 , -559.98 , -92.23
+1632.39 , -484.70 , -80.89
+1632.39 , -409.42 , -69.51
+1632.39 , -334.13 , -58.08
+1632.39 , -258.85 , -46.62
+1632.39 , -183.57 , -35.12
+1632.39 , -108.28 , -23.57
+1632.39 , -33.00 , -11.98
+1632.39 , 42.28 , -0.12
+1632.39 , 111.66 , 12.00
+1632.39 , 181.04 , 24.15
+1632.39 , 250.42 , 36.35
+1632.39 , 319.80 , 48.58
+1632.39 , 389.18 , 60.86
+1632.39 , 458.56 , 73.18
+1632.39 , 527.95 , 85.54
+1632.39 , 597.33 , 97.95
+1632.39 , 666.71 , 110.39
+1632.39 , 736.09 , 122.88
+1632.39 , 805.47 , 135.40
+1632.39 , 874.85 , 147.97
+1632.39 , 944.23 , 160.58
+1632.39 , 1013.61 , 173.24
+1632.39 , 1082.99 , 185.93
+1632.39 , 1152.37 , 198.66
+1632.39 , 1221.75 , 211.44
+1632.39 , 1291.13 , 224.26
+1632.39 , 1360.51 , 237.11
+1632.39 , 1429.89 , 250.03
+1632.39 , 1499.27 , 262.97
+1632.39 , 1568.65 , 275.94
+1632.39 , 1638.04 , 288.96
+1632.39 , 1707.42 , 302.03
+1632.39 , 1776.80 , 315.14
+1632.39 , 1846.18 , 328.30
+1632.39 , 1915.56 , 341.49
+1632.39 , 1984.94 , 354.73
+1632.39 , 2054.32 , 367.99
+1632.39 , 2123.70 , 381.32
+1632.39 , 2193.08 , 394.67
+1632.39 , 2262.46 , 408.08
+1836.41 , -2355.51 , -400.84
+1836.41 , -2283.01 , -388.48
+1836.41 , -2210.09 , -376.15
+1836.41 , -2137.17 , -363.80
+1836.41 , -2062.36 , -351.73
+1836.41 , -1987.08 , -339.76
+1836.41 , -1911.79 , -327.72
+1836.41 , -1836.51 , -315.65
+1836.41 , -1761.23 , -303.53
+1836.41 , -1685.95 , -291.37
+1836.41 , -1610.66 , -279.18
+1836.41 , -1535.38 , -266.94
+1836.41 , -1460.10 , -254.66
+1836.41 , -1384.82 , -242.34
+1836.41 , -1309.53 , -229.98
+1836.41 , -1234.25 , -217.58
+1836.41 , -1158.97 , -205.14
+1836.41 , -1083.68 , -192.65
+1836.41 , -1008.40 , -180.13
+1836.41 , -933.12 , -167.57
+1836.41 , -857.84 , -154.96
+1836.41 , -782.55 , -142.32
+1836.41 , -707.27 , -129.63
+1836.41 , -631.99 , -116.91
+1836.41 , -556.70 , -104.14
+1836.41 , -481.42 , -91.33
+1836.41 , -406.14 , -78.49
+1836.41 , -330.86 , -65.60
+1836.41 , -255.57 , -52.67
+1836.41 , -180.29 , -39.70
+1836.41 , -105.01 , -26.69
+1836.41 , -29.73 , -13.63
+1836.41 , 45.56 , -0.27
+1836.41 , 114.94 , 13.35
+1836.41 , 184.32 , 27.00
+1836.41 , 253.70 , 40.69
+1836.41 , 323.08 , 54.43
+1836.41 , 392.46 , 68.20
+1836.41 , 461.84 , 82.02
+1836.41 , 531.22 , 95.88
+1836.41 , 600.60 , 109.78
+1836.41 , 669.98 , 123.73
+1836.41 , 739.36 , 137.71
+1836.41 , 808.74 , 151.74
+1836.41 , 878.13 , 165.81
+1836.41 , 947.51 , 179.92
+1836.41 , 1016.89 , 194.07
+1836.41 , 1086.27 , 208.26
+1836.41 , 1155.65 , 222.49
+1836.41 , 1225.03 , 236.78
+1836.41 , 1294.41 , 251.10
+1836.41 , 1363.79 , 265.44
+1836.41 , 1433.17 , 279.85
+1836.41 , 1502.55 , 294.29
+1836.41 , 1571.93 , 308.76
+1836.41 , 1641.31 , 323.29
+1836.41 , 1710.69 , 337.85
+1836.41 , 1780.07 , 352.46
+1836.41 , 1849.45 , 367.12
+1836.41 , 1918.83 , 381.80
+1836.41 , 1988.22 , 396.53
+1836.41 , 2057.60 , 411.31
+1836.41 , 2126.98 , 426.13
+1836.41 , 2196.36 , 440.98
+1836.41 , 2265.74 , 455.88
+2040.43 , -2358.50 , -446.80
+2040.43 , -2284.93 , -433.14
+2040.43 , -2209.65 , -419.80
+2040.43 , -2134.37 , -406.41
+2040.43 , -2059.08 , -392.99
+2040.43 , -1983.80 , -379.53
+2040.43 , -1908.52 , -366.04
+2040.43 , -1833.24 , -352.51
+2040.43 , -1757.95 , -338.92
+2040.43 , -1682.67 , -325.29
+2040.43 , -1607.39 , -311.63
+2040.43 , -1532.10 , -297.93
+2040.43 , -1456.82 , -284.17
+2040.43 , -1381.54 , -270.40
+2040.43 , -1306.26 , -256.57
+2040.43 , -1230.97 , -242.71
+2040.43 , -1155.69 , -228.80
+2040.43 , -1080.41 , -214.85
+2040.43 , -1005.12 , -200.86
+2040.43 , -929.84 , -186.83
+2040.43 , -854.56 , -172.77
+2040.43 , -779.28 , -158.66
+2040.43 , -703.99 , -144.50
+2040.43 , -628.71 , -130.31
+2040.43 , -553.43 , -116.08
+2040.43 , -478.14 , -101.81
+2040.43 , -402.86 , -87.49
+2040.43 , -327.58 , -73.14
+2040.43 , -252.30 , -58.74
+2040.43 , -177.01 , -44.31
+2040.43 , -101.73 , -29.83
+2040.43 , -26.45 , -15.31
+2040.43 , 48.83 , -0.44
+2040.43 , 118.22 , 14.67
+2040.43 , 187.60 , 29.82
+2040.43 , 256.98 , 45.01
+2040.43 , 326.36 , 60.25
+2040.43 , 395.74 , 75.52
+2040.43 , 465.12 , 90.84
+2040.43 , 534.50 , 106.20
+2040.43 , 603.88 , 121.60
+2040.43 , 673.26 , 137.04
+2040.43 , 742.64 , 152.52
+2040.43 , 812.02 , 168.05
+2040.43 , 881.40 , 183.61
+2040.43 , 950.78 , 199.22
+2040.43 , 1020.16 , 214.87
+2040.43 , 1089.54 , 230.57
+2040.43 , 1158.92 , 246.29
+2040.43 , 1228.31 , 262.08
+2040.43 , 1297.69 , 277.89
+2040.43 , 1367.07 , 293.75
+2040.43 , 1436.45 , 309.63
+2040.43 , 1505.83 , 325.57
+2040.43 , 1575.21 , 341.55
+2040.43 , 1644.59 , 357.58
+2040.43 , 1713.97 , 373.66
+2040.43 , 1783.35 , 389.76
+2040.43 , 1852.73 , 405.89
+2040.43 , 1922.11 , 422.09
+2040.43 , 1991.49 , 438.31
+2040.43 , 2060.87 , 454.58
+2040.43 , 2130.25 , 470.90
+2040.43 , 2199.63 , 487.25
+2040.43 , 2269.01 , 503.67
+2244.53 , -2356.67 , -493.64
+2244.53 , -2281.65 , -478.82
+2244.53 , -2206.37 , -464.01
+2244.53 , -2131.09 , -449.18
+2244.53 , -2055.81 , -434.29
+2244.53 , -1980.52 , -419.36
+2244.53 , -1905.24 , -404.39
+2244.53 , -1829.96 , -389.38
+2244.53 , -1754.67 , -374.33
+2244.53 , -1679.39 , -359.26
+2244.53 , -1604.11 , -344.13
+2244.53 , -1528.83 , -328.96
+2244.53 , -1453.54 , -313.74
+2244.53 , -1378.26 , -298.49
+2244.53 , -1302.98 , -283.20
+2244.53 , -1227.69 , -267.88
+2244.53 , -1152.41 , -252.49
+2244.53 , -1077.13 , -237.08
+2244.53 , -1001.85 , -221.63
+2244.53 , -926.56 , -206.13
+2244.53 , -851.28 , -190.60
+2244.53 , -776.00 , -175.02
+2244.53 , -700.72 , -159.41
+2244.53 , -625.43 , -143.75
+2244.53 , -550.15 , -128.05
+2244.53 , -474.87 , -112.31
+2244.53 , -399.58 , -96.53
+2244.53 , -324.30 , -80.71
+2244.53 , -249.02 , -64.85
+2244.53 , -173.74 , -48.95
+2244.53 , -98.45 , -33.01
+2244.53 , -23.17 , -17.02
+2244.53 , 52.11 , -0.65
+2244.53 , 121.49 , 15.96
+2244.53 , 190.87 , 32.61
+2244.53 , 260.25 , 49.30
+2244.53 , 329.64 , 66.03
+2244.53 , 399.02 , 82.81
+2244.53 , 468.40 , 99.62
+2244.53 , 537.78 , 116.48
+2244.53 , 607.16 , 133.38
+2244.53 , 676.54 , 150.32
+2244.53 , 745.92 , 167.30
+2244.53 , 815.30 , 184.33
+2244.53 , 884.68 , 201.39
+2244.53 , 954.06 , 218.50
+2244.53 , 1023.44 , 235.65
+2244.53 , 1092.82 , 252.84
+2244.53 , 1162.20 , 270.07
+2244.53 , 1231.58 , 287.33
+2244.53 , 1300.96 , 304.66
+2244.53 , 1370.34 , 322.02
+2244.53 , 1439.73 , 339.40
+2244.53 , 1509.11 , 356.85
+2244.53 , 1578.49 , 374.32
+2244.53 , 1647.87 , 391.85
+2244.53 , 1717.25 , 409.42
+2244.53 , 1786.63 , 427.02
+2244.53 , 1856.01 , 444.66
+2244.53 , 1925.39 , 462.36
+2244.53 , 1994.77 , 480.07
+2244.53 , 2064.15 , 497.84
+2244.53 , 2133.53 , 515.65
+2244.53 , 2202.91 , 533.52
+2244.53 , 2272.29 , 551.40
+2448.55 , -2353.66 , -540.77
+2448.55 , -2278.38 , -524.54
+2448.55 , -2203.09 , -508.27
+2448.55 , -2127.81 , -491.96
+2448.55 , -2052.53 , -475.59
+2448.55 , -1977.25 , -459.22
+2448.55 , -1901.96 , -442.77
+2448.55 , -1826.68 , -426.30
+2448.55 , -1751.40 , -409.78
+2448.55 , -1676.11 , -393.24
+2448.55 , -1600.83 , -376.65
+2448.55 , -1525.55 , -360.01
+2448.55 , -1450.27 , -343.34
+2448.55 , -1374.98 , -326.61
+2448.55 , -1299.70 , -309.87
+2448.55 , -1224.42 , -293.06
+2448.55 , -1149.14 , -276.23
+2448.55 , -1073.85 , -259.35
+2448.55 , -998.57 , -242.42
+2448.55 , -923.29 , -225.46
+2448.55 , -848.00 , -208.46
+2448.55 , -772.72 , -191.42
+2448.55 , -697.44 , -174.34
+2448.55 , -622.16 , -157.21
+2448.55 , -546.87 , -140.05
+2448.55 , -471.59 , -122.84
+2448.55 , -396.31 , -105.60
+2448.55 , -321.02 , -88.31
+2448.55 , -245.74 , -70.99
+2448.55 , -170.46 , -53.62
+2448.55 , -95.18 , -36.21
+2448.55 , -19.89 , -18.76
+2448.55 , 55.39 , -0.88
+2448.55 , 124.77 , 17.23
+2448.55 , 194.15 , 35.38
+2448.55 , 263.53 , 53.57
+2448.55 , 332.91 , 71.80
+2448.55 , 402.29 , 90.07
+2448.55 , 471.67 , 108.38
+2448.55 , 541.05 , 126.74
+2448.55 , 610.43 , 145.14
+2448.55 , 679.82 , 163.58
+2448.55 , 749.20 , 182.06
+2448.55 , 818.58 , 200.58
+2448.55 , 887.96 , 219.14
+2448.55 , 957.34 , 237.75
+2448.55 , 1026.72 , 256.39
+2448.55 , 1096.10 , 275.09
+2448.55 , 1165.48 , 293.82
+2448.55 , 1234.86 , 312.59
+2448.55 , 1304.24 , 331.39
+2448.55 , 1373.62 , 350.24
+2448.55 , 1443.00 , 369.14
+2448.55 , 1512.38 , 388.09
+2448.55 , 1581.76 , 407.06
+2448.55 , 1651.14 , 426.07
+2448.55 , 1720.52 , 445.14
+2448.55 , 1789.91 , 464.26
+2448.55 , 1859.29 , 483.39
+2448.55 , 1928.67 , 502.58
+2448.55 , 1998.05 , 521.79
+2448.55 , 2067.43 , 541.08
+2448.55 , 2136.81 , 560.39
+2448.55 , 2206.19 , 579.74
+2448.55 , 2275.57 , 599.13
+2652.56 , -2350.38 , -587.98
+2652.56 , -2275.10 , -570.28
+2652.56 , -2199.82 , -552.54
+2652.56 , -2124.53 , -534.77
+2652.56 , -2049.25 , -516.95
+2652.56 , -1973.97 , -499.09
+2652.56 , -1898.69 , -481.20
+2652.56 , -1823.40 , -463.26
+2652.56 , -1748.12 , -445.28
+2652.56 , -1672.84 , -427.27
+2652.56 , -1597.55 , -409.21
+2652.56 , -1522.27 , -391.10
+2652.56 , -1446.99 , -372.94
+2652.56 , -1371.71 , -354.76
+2652.56 , -1296.42 , -336.54
+2652.56 , -1221.14 , -318.28
+2652.56 , -1145.86 , -299.98
+2652.56 , -1070.58 , -281.63
+2652.56 , -995.29 , -263.24
+2652.56 , -920.01 , -244.82
+2652.56 , -844.73 , -226.36
+2652.56 , -769.44 , -207.85
+2652.56 , -694.16 , -189.30
+2652.56 , -618.88 , -170.71
+2652.56 , -543.60 , -152.08
+2652.56 , -468.31 , -133.41
+2652.56 , -393.03 , -114.70
+2652.56 , -317.75 , -95.95
+2652.56 , -242.46 , -77.15
+2652.56 , -167.18 , -58.32
+2652.56 , -91.90 , -39.45
+2652.56 , -16.62 , -20.53
+2652.56 , 58.67 , -1.14
+2652.56 , 128.05 , 18.47
+2652.56 , 197.43 , 38.11
+2652.56 , 266.81 , 57.80
+2652.56 , 336.19 , 77.53
+2652.56 , 405.57 , 97.30
+2652.56 , 474.95 , 117.12
+2652.56 , 544.33 , 136.97
+2652.56 , 613.71 , 156.87
+2652.56 , 683.09 , 176.80
+2652.56 , 752.47 , 196.78
+2652.56 , 821.85 , 216.81
+2652.56 , 891.23 , 236.87
+2652.56 , 960.61 , 256.97
+2652.56 , 1030.00 , 277.12
+2652.56 , 1099.38 , 297.29
+2652.56 , 1168.76 , 317.54
+2652.56 , 1238.14 , 337.81
+2652.56 , 1307.52 , 358.11
+2652.56 , 1376.90 , 378.47
+2652.56 , 1446.28 , 398.86
+2652.56 , 1515.66 , 419.30
+2652.56 , 1585.04 , 439.77
+2652.56 , 1654.42 , 460.28
+2652.56 , 1723.80 , 480.84
+2652.56 , 1793.18 , 501.45
+2652.56 , 1862.56 , 522.11
+2652.56 , 1931.94 , 542.79
+2652.56 , 2001.32 , 563.50
+2652.56 , 2070.70 , 584.27
+2652.56 , 2140.09 , 605.08
+2652.56 , 2209.47 , 625.93
+2652.56 , 2278.85 , 646.83
+2856.67 , -2347.10 , -635.21
+2856.67 , -2271.82 , -616.04
+2856.67 , -2196.54 , -596.86
+2856.67 , -2121.26 , -577.60
+2856.67 , -2045.97 , -558.31
+2856.67 , -1970.69 , -539.00
+2856.67 , -1895.41 , -519.65
+2856.67 , -1820.13 , -500.24
+2856.67 , -1744.84 , -480.79
+2856.67 , -1669.56 , -461.31
+2856.67 , -1594.28 , -441.79
+2856.67 , -1518.99 , -422.21
+2856.67 , -1443.71 , -402.61
+2856.67 , -1368.43 , -382.94
+2856.67 , -1293.15 , -363.27
+2856.67 , -1217.86 , -343.53
+2856.67 , -1142.58 , -323.76
+2856.67 , -1067.30 , -303.94
+2856.67 , -992.01 , -284.10
+2856.67 , -916.73 , -264.21
+2856.67 , -841.45 , -244.28
+2856.67 , -766.17 , -224.30
+2856.67 , -690.88 , -204.29
+2856.67 , -615.60 , -184.23
+2856.67 , -540.32 , -164.14
+2856.67 , -465.03 , -144.00
+2856.67 , -389.75 , -123.83
+2856.67 , -314.47 , -103.61
+2856.67 , -239.19 , -83.35
+2856.67 , -163.90 , -63.05
+2856.67 , -88.62 , -42.71
+2856.67 , -13.34 , -22.33
+2856.67 , 61.94 , -1.43
+2856.67 , 131.33 , 19.68
+2856.67 , 200.71 , 40.82
+2856.67 , 270.09 , 62.01
+2856.67 , 339.47 , 83.24
+2856.67 , 408.85 , 104.51
+2856.67 , 478.23 , 125.82
+2856.67 , 547.61 , 147.17
+2856.67 , 616.99 , 168.57
+2856.67 , 686.37 , 190.00
+2856.67 , 755.75 , 211.48
+2856.67 , 825.13 , 233.00
+2856.67 , 894.51 , 254.57
+2856.67 , 963.89 , 276.17
+2856.67 , 1033.27 , 297.81
+2856.67 , 1102.65 , 319.50
+2856.67 , 1172.03 , 341.22
+2856.67 , 1241.42 , 362.99
+2856.67 , 1310.80 , 384.80
+2856.67 , 1380.18 , 406.66
+2856.67 , 1449.56 , 428.54
+2856.67 , 1518.94 , 450.48
+2856.67 , 1588.32 , 472.46
+2856.67 , 1657.70 , 494.47
+2856.67 , 1727.08 , 516.52
+2856.67 , 1796.46 , 538.63
+2856.67 , 1865.84 , 560.78
+2856.67 , 1935.22 , 582.95
+2856.67 , 2004.60 , 605.18
+2856.67 , 2073.98 , 627.45
+2856.67 , 2143.36 , 649.75
+2856.67 , 2212.74 , 672.12
+2856.67 , 2282.12 , 694.49
+3060.68 , -2343.83 , -682.48
+3060.68 , -2268.54 , -661.85
+3060.68 , -2193.26 , -641.19
+3060.68 , -2117.98 , -620.47
+3060.68 , -2042.70 , -599.74
+3060.68 , -1967.41 , -578.94
+3060.68 , -1892.13 , -558.12
+3060.68 , -1816.85 , -537.24
+3060.68 , -1741.57 , -516.32
+3060.68 , -1666.28 , -495.38
+3060.68 , -1591.00 , -474.38
+3060.68 , -1515.72 , -453.34
+3060.68 , -1440.43 , -432.28
+3060.68 , -1365.15 , -411.16
+3060.68 , -1289.87 , -390.02
+3060.68 , -1214.59 , -368.81
+3060.68 , -1139.30 , -347.58
+3060.68 , -1064.02 , -326.29
+3060.68 , -988.74 , -304.99
+3060.68 , -913.45 , -283.63
+3060.68 , -838.17 , -262.22
+3060.68 , -762.89 , -240.79
+3060.68 , -687.61 , -219.31
+3060.68 , -612.32 , -197.79
+3060.68 , -537.04 , -176.23
+3060.68 , -461.76 , -154.63
+3060.68 , -386.48 , -132.98
+3060.68 , -311.19 , -111.30
+3060.68 , -235.91 , -89.58
+3060.68 , -160.63 , -67.81
+3060.68 , -85.34 , -46.00
+3060.68 , -10.06 , -24.16
+3060.68 , 65.22 , -1.74
+3060.68 , 134.60 , 20.86
+3060.68 , 203.98 , 43.50
+3060.68 , 273.36 , 66.19
+3060.68 , 342.74 , 88.92
+3060.68 , 412.12 , 111.68
+3060.68 , 481.51 , 134.50
+3060.68 , 550.89 , 157.35
+3060.68 , 620.27 , 180.24
+3060.68 , 689.65 , 203.18
+3060.68 , 759.03 , 226.15
+3060.68 , 828.41 , 249.17
+3060.68 , 897.79 , 272.23
+3060.68 , 967.17 , 295.32
+3060.68 , 1036.55 , 318.49
+3060.68 , 1105.93 , 341.65
+3060.68 , 1175.31 , 364.88
+3060.68 , 1244.69 , 388.14
+3060.68 , 1314.07 , 411.45
+3060.68 , 1383.45 , 434.80
+3060.68 , 1452.83 , 458.21
+3060.68 , 1522.21 , 481.64
+3060.68 , 1591.60 , 505.11
+3060.68 , 1660.98 , 528.64
+3060.68 , 1730.36 , 552.19
+3060.68 , 1799.74 , 575.78
+3060.68 , 1869.12 , 599.43
+3060.68 , 1938.50 , 623.10
+3060.68 , 2007.88 , 646.82
+3060.68 , 2077.26 , 670.58
+3060.68 , 2146.64 , 694.40
+3060.68 , 2216.02 , 718.24
+3060.68 , 2285.40 , 742.13
+3264.70 , -2340.55 , -729.77
+3264.70 , -2265.27 , -707.67
+3264.70 , -2189.99 , -685.55
+3264.70 , -2114.70 , -663.38
+3264.70 , -2039.42 , -641.16
+3264.70 , -1964.14 , -618.92
+3264.70 , -1888.85 , -596.60
+3264.70 , -1813.57 , -574.29
+3264.70 , -1738.29 , -551.90
+3264.70 , -1663.01 , -529.49
+3264.70 , -1587.72 , -507.03
+3264.70 , -1512.44 , -484.54
+3264.70 , -1437.16 , -461.98
+3264.70 , -1361.87 , -439.40
+3264.70 , -1286.59 , -416.80
+3264.70 , -1211.31 , -394.12
+3264.70 , -1136.03 , -371.41
+3264.70 , -1060.74 , -348.69
+3264.70 , -985.46 , -325.91
+3264.70 , -910.18 , -303.09
+3264.70 , -834.89 , -280.22
+3264.70 , -759.61 , -257.31
+3264.70 , -684.33 , -234.36
+3264.70 , -609.05 , -211.38
+3264.70 , -533.76 , -188.35
+3264.70 , -458.48 , -165.28
+3264.70 , -383.20 , -142.17
+3264.70 , -307.92 , -119.02
+3264.70 , -232.63 , -95.83
+3264.70 , -157.35 , -72.60
+3264.70 , -82.07 , -49.33
+3264.70 , -6.78 , -26.02
+3264.70 , 68.50 , -2.09
+3264.70 , 137.88 , 22.01
+3264.70 , 207.26 , 46.16
+3264.70 , 276.64 , 70.34
+3264.70 , 346.02 , 94.57
+3264.70 , 415.40 , 118.83
+3264.70 , 484.78 , 143.14
+3264.70 , 554.16 , 167.50
+3264.70 , 623.54 , 191.89
+3264.70 , 692.92 , 216.32
+3264.70 , 762.30 , 240.81
+3264.70 , 831.69 , 265.32
+3264.70 , 901.07 , 289.88
+3264.70 , 970.45 , 314.46
+3264.70 , 1039.83 , 339.12
+3264.70 , 1109.21 , 363.80
+3264.70 , 1178.59 , 388.52
+3264.70 , 1247.97 , 413.28
+3264.70 , 1317.35 , 438.10
+3264.70 , 1386.73 , 462.95
+3264.70 , 1456.11 , 487.83
+3264.70 , 1525.49 , 512.77
+3264.70 , 1594.87 , 537.74
+3264.70 , 1664.25 , 562.76
+3264.70 , 1733.63 , 587.81
+3264.70 , 1803.01 , 612.90
+3264.70 , 1872.39 , 638.04
+3264.70 , 1941.78 , 663.22
+3264.70 , 2011.16 , 688.44
+3264.70 , 2080.54 , 713.72
+3264.70 , 2149.92 , 739.01
+3264.70 , 2219.30 , 764.37
+3264.70 , 2288.68 , 789.75
+3468.80 , -2337.27 , -777.10
+3468.80 , -2261.99 , -753.54
+3468.80 , -2186.71 , -729.95
+3468.80 , -2111.42 , -706.31
+3468.80 , -2036.14 , -682.62
+3468.80 , -1960.86 , -658.91
+3468.80 , -1885.58 , -635.16
+3468.80 , -1810.29 , -611.35
+3468.80 , -1735.01 , -587.49
+3468.80 , -1659.73 , -563.61
+3468.80 , -1584.44 , -539.69
+3468.80 , -1509.16 , -515.73
+3468.80 , -1433.88 , -491.73
+3468.80 , -1358.60 , -467.68
+3468.80 , -1283.31 , -443.59
+3468.80 , -1208.03 , -419.47
+3468.80 , -1132.75 , -395.30
+3468.80 , -1057.47 , -371.10
+3468.80 , -982.18 , -346.83
+3468.80 , -906.90 , -322.54
+3468.80 , -831.62 , -298.23
+3468.80 , -756.33 , -273.86
+3468.80 , -681.05 , -249.44
+3468.80 , -605.77 , -224.99
+3468.80 , -530.49 , -200.50
+3468.80 , -455.20 , -175.96
+3468.80 , -379.92 , -151.39
+3468.80 , -304.64 , -126.77
+3468.80 , -229.35 , -102.12
+3468.80 , -154.07 , -77.42
+3468.80 , -78.79 , -52.69
+3468.80 , -3.51 , -27.91
+3468.80 , 71.78 , -2.46
+3468.80 , 141.16 , 23.14
+3468.80 , 210.54 , 48.78
+3468.80 , 279.92 , 74.47
+3468.80 , 349.30 , 100.19
+3468.80 , 418.68 , 125.96
+3468.80 , 488.06 , 151.76
+3468.80 , 557.44 , 177.61
+3468.80 , 626.82 , 203.51
+3468.80 , 696.20 , 229.44
+3468.80 , 765.58 , 255.42
+3468.80 , 834.96 , 281.42
+3468.80 , 904.34 , 307.47
+3468.80 , 973.72 , 333.58
+3468.80 , 1043.11 , 359.73
+3468.80 , 1112.49 , 385.90
+3468.80 , 1181.87 , 412.12
+3468.80 , 1251.25 , 438.39
+3468.80 , 1320.63 , 464.69
+3468.80 , 1390.01 , 491.03
+3468.80 , 1459.39 , 517.42
+3468.80 , 1528.77 , 543.87
+3468.80 , 1598.15 , 570.33
+3468.80 , 1667.53 , 596.84
+3468.80 , 1736.91 , 623.40
+3468.80 , 1806.29 , 649.99
+3468.80 , 1875.67 , 676.65
+3468.80 , 1945.05 , 703.31
+3468.80 , 2014.43 , 730.04
+3468.80 , 2083.81 , 756.79
+3468.80 , 2153.20 , 783.60
+3468.80 , 2222.58 , 810.45
+3468.80 , 2291.96 , 837.35
+3672.82 , -2334.00 , -824.45
+3672.82 , -2258.71 , -799.45
+3672.82 , -2183.43 , -774.37
+3672.82 , -2108.15 , -749.26
+3672.82 , -2032.86 , -724.13
+3672.82 , -1957.58 , -698.93
+3672.82 , -1882.30 , -673.70
+3672.82 , -1807.02 , -648.45
+3672.82 , -1731.73 , -623.13
+3672.82 , -1656.45 , -597.78
+3672.82 , -1581.17 , -572.39
+3672.82 , -1505.89 , -546.97
+3672.82 , -1430.60 , -521.50
+3672.82 , -1355.32 , -495.99
+3672.82 , -1280.04 , -470.45
+3672.82 , -1204.75 , -444.83
+3672.82 , -1129.47 , -419.22
+3672.82 , -1054.19 , -393.53
+3672.82 , -978.91 , -367.82
+3672.82 , -903.62 , -342.07
+3672.82 , -828.34 , -316.26
+3672.82 , -753.06 , -290.43
+3672.82 , -677.77 , -264.55
+3672.82 , -602.49 , -238.64
+3672.82 , -527.21 , -212.68
+3672.82 , -451.93 , -186.68
+3672.82 , -376.64 , -160.64
+3672.82 , -301.36 , -134.56
+3672.82 , -226.08 , -108.43
+3672.82 , -150.79 , -82.27
+3672.82 , -75.51 , -56.07
+3672.82 , -0.23 , -29.83
+3672.82 , 75.05 , -2.86
+3672.82 , 144.43 , 24.24
+3672.82 , 213.81 , 51.38
+3672.82 , 283.20 , 78.56
+3672.82 , 352.58 , 105.79
+3672.82 , 421.96 , 133.05
+3672.82 , 491.34 , 160.36
+3672.82 , 560.72 , 187.71
+3672.82 , 630.10 , 215.11
+3672.82 , 699.48 , 242.53
+3672.82 , 768.86 , 270.01
+3672.82 , 838.24 , 297.51
+3672.82 , 907.62 , 325.08
+3672.82 , 977.00 , 352.67
+3672.82 , 1046.38 , 380.29
+3672.82 , 1115.76 , 407.99
+3672.82 , 1185.14 , 435.70
+3672.82 , 1254.52 , 463.47
+3672.82 , 1323.90 , 491.28
+3672.82 , 1393.29 , 519.12
+3672.82 , 1462.67 , 547.01
+3672.82 , 1532.05 , 574.94
+3672.82 , 1601.43 , 602.90
+3672.82 , 1670.81 , 630.93
+3672.82 , 1740.19 , 658.96
+3672.82 , 1809.57 , 687.07
+3672.82 , 1878.95 , 715.19
+3672.82 , 1948.33 , 743.37
+3672.82 , 2017.71 , 771.60
+3672.82 , 2087.09 , 799.87
+3672.82 , 2156.47 , 828.17
+3672.82 , 2225.85 , 856.51
+3672.82 , 2295.23 , 884.91
+3876.84 , -2330.72 , -871.85
+3876.84 , -2255.44 , -845.35
+3876.84 , -2180.15 , -818.83
+3876.84 , -2104.87 , -792.25
+3876.84 , -2029.59 , -765.66
+3876.84 , -1954.30 , -738.99
+3876.84 , -1879.02 , -712.30
+3876.84 , -1803.74 , -685.58
+3876.84 , -1728.46 , -658.79
+3876.84 , -1653.17 , -631.97
+3876.84 , -1577.89 , -605.14
+3876.84 , -1502.61 , -578.22
+3876.84 , -1427.33 , -551.29
+3876.84 , -1352.04 , -524.31
+3876.84 , -1276.76 , -497.30
+3876.84 , -1201.48 , -470.24
+3876.84 , -1126.19 , -443.14
+3876.84 , -1050.91 , -416.01
+3876.84 , -975.63 , -388.83
+3876.84 , -900.35 , -361.61
+3876.84 , -825.06 , -334.33
+3876.84 , -749.78 , -307.03
+3876.84 , -674.50 , -279.69
+3876.84 , -599.21 , -252.31
+3876.84 , -523.93 , -224.89
+3876.84 , -448.65 , -197.42
+3876.84 , -373.37 , -169.91
+3876.84 , -298.08 , -142.37
+3876.84 , -222.80 , -114.78
+3876.84 , -147.52 , -87.15
+3876.84 , -72.23 , -59.48
+3876.84 , 3.05 , -31.77
+3876.84 , 78.33 , -3.28
+3876.84 , 147.71 , 25.31
+3876.84 , 217.09 , 53.95
+3876.84 , 286.47 , 82.63
+3876.84 , 355.85 , 111.36
+3876.84 , 425.23 , 140.12
+3876.84 , 494.61 , 168.93
+3876.84 , 563.99 , 197.77
+3876.84 , 633.38 , 226.67
+3876.84 , 702.76 , 255.59
+3876.84 , 772.14 , 284.56
+3876.84 , 841.52 , 313.57
+3876.84 , 910.90 , 342.61
+3876.84 , 980.28 , 371.73
+3876.84 , 1049.66 , 400.87
+3876.84 , 1119.04 , 430.03
+3876.84 , 1188.42 , 459.26
+3876.84 , 1257.80 , 488.52
+3876.84 , 1327.18 , 517.83
+3876.84 , 1396.56 , 547.16
+3876.84 , 1465.94 , 576.54
+3876.84 , 1535.32 , 605.97
+3876.84 , 1604.70 , 635.45
+3876.84 , 1674.08 , 664.95
+3876.84 , 1743.47 , 694.52
+3876.84 , 1812.85 , 724.10
+3876.84 , 1882.23 , 753.74
+3876.84 , 1951.61 , 783.42
+3876.84 , 2020.99 , 813.13
+3876.84 , 2090.37 , 842.90
+3876.84 , 2159.75 , 872.69
+3876.84 , 2229.13 , 902.53
+3876.84 , 2298.51 , 932.42
+4080.85 , -2327.44 , -919.26
+4080.85 , -2252.16 , -891.32
+4080.85 , -2176.88 , -863.31
+4080.85 , -2101.59 , -835.27
+4080.85 , -2026.31 , -807.20
+4080.85 , -1951.03 , -779.09
+4080.85 , -1875.75 , -750.93
+4080.85 , -1800.46 , -722.72
+4080.85 , -1725.18 , -694.49
+4080.85 , -1649.90 , -666.21
+4080.85 , -1574.61 , -637.88
+4080.85 , -1499.33 , -609.52
+4080.85 , -1424.05 , -581.12
+4080.85 , -1348.77 , -552.67
+4080.85 , -1273.48 , -524.19
+4080.85 , -1198.20 , -495.67
+4080.85 , -1122.92 , -467.10
+4080.85 , -1047.63 , -438.50
+4080.85 , -972.35 , -409.86
+4080.85 , -897.07 , -381.17
+4080.85 , -821.79 , -352.45
+4080.85 , -746.50 , -323.68
+4080.85 , -671.22 , -294.87
+4080.85 , -595.94 , -266.01
+4080.85 , -520.65 , -237.12
+4080.85 , -445.37 , -208.19
+4080.85 , -370.09 , -179.22
+4080.85 , -294.81 , -150.21
+4080.85 , -219.52 , -121.16
+4080.85 , -144.24 , -92.06
+4080.85 , -68.96 , -62.93
+4080.85 , 6.32 , -33.74
+4080.85 , 81.61 , -3.74
+4080.85 , 150.99 , 26.36
+4080.85 , 220.37 , 56.49
+4080.85 , 289.75 , 86.67
+4080.85 , 359.13 , 116.90
+4080.85 , 428.51 , 147.16
+4080.85 , 497.89 , 177.46
+4080.85 , 567.27 , 207.82
+4080.85 , 636.65 , 238.18
+4080.85 , 706.03 , 268.62
+4080.85 , 775.41 , 299.09
+4080.85 , 844.79 , 329.60
+4080.85 , 914.17 , 360.16
+4080.85 , 983.56 , 390.74
+4080.85 , 1052.94 , 421.40
+4080.85 , 1122.32 , 452.05
+4080.85 , 1191.70 , 482.78
+4080.85 , 1261.08 , 513.54
+4080.85 , 1330.46 , 544.34
+4080.85 , 1399.84 , 575.19
+4080.85 , 1469.22 , 606.06
+4080.85 , 1538.60 , 637.01
+4080.85 , 1607.98 , 667.96
+4080.85 , 1677.36 , 698.98
+4080.85 , 1746.74 , 730.02
+4080.85 , 1816.12 , 761.11
+4080.85 , 1885.50 , 792.25
+4080.85 , 1954.88 , 823.44
+4080.85 , 2024.26 , 854.65
+4080.85 , 2093.65 , 885.92
+4080.85 , 2163.03 , 917.20
+4080.85 , 2232.41 , 948.54
+4080.85 , 2301.79 , 979.92
+4268.63 , -2324.43 , -962.91
+4268.63 , -2249.14 , -933.62
+4268.63 , -2173.86 , -904.26
+4268.63 , -2098.58 , -874.89
+4268.63 , -2023.29 , -845.46
+4268.63 , -1948.01 , -816.00
+4268.63 , -1872.73 , -786.49
+4268.63 , -1797.45 , -756.93
+4268.63 , -1722.16 , -727.35
+4268.63 , -1646.88 , -697.72
+4268.63 , -1571.60 , -668.06
+4268.63 , -1496.32 , -638.34
+4268.63 , -1421.03 , -608.58
+4268.63 , -1345.75 , -578.81
+4268.63 , -1270.47 , -548.96
+4268.63 , -1195.18 , -519.09
+4268.63 , -1119.90 , -489.19
+4268.63 , -1044.62 , -459.22
+4268.63 , -969.34 , -429.23
+4268.63 , -894.05 , -399.19
+4268.63 , -818.77 , -369.12
+4268.63 , -743.49 , -339.01
+4268.63 , -668.20 , -308.84
+4268.63 , -592.92 , -278.66
+4268.63 , -517.64 , -248.41
+4268.63 , -442.36 , -218.13
+4268.63 , -367.07 , -187.81
+4268.63 , -291.79 , -157.45
+4268.63 , -216.51 , -127.05
+4268.63 , -141.22 , -96.61
+4268.63 , -65.94 , -66.12
+4268.63 , 9.34 , -35.56
+4268.63 , 84.62 , -4.18
+4268.63 , 154.00 , 27.29
+4268.63 , 223.38 , 58.81
+4268.63 , 292.77 , 90.37
+4268.63 , 362.15 , 121.97
+4268.63 , 431.53 , 153.61
+4268.63 , 500.91 , 185.29
+4268.63 , 570.29 , 217.01
+4268.63 , 639.67 , 248.78
+4268.63 , 709.05 , 280.59
+4268.63 , 778.43 , 312.43
+4268.63 , 847.81 , 344.32
+4268.63 , 917.19 , 376.25
+4268.63 , 986.57 , 408.23
+4268.63 , 1055.95 , 440.24
+4268.63 , 1125.33 , 472.30
+4268.63 , 1194.71 , 504.40
+4268.63 , 1264.09 , 536.53
+4268.63 , 1333.47 , 568.71
+4268.63 , 1402.86 , 600.94
+4268.63 , 1472.24 , 633.21
+4268.63 , 1541.62 , 665.51
+4268.63 , 1611.00 , 697.85
+4268.63 , 1680.38 , 730.25
+4268.63 , 1749.76 , 762.67
+4268.63 , 1819.14 , 795.14
+4268.63 , 1888.52 , 827.65
+4268.63 , 1957.90 , 860.22
+4268.63 , 2027.28 , 892.81
+4268.63 , 2096.66 , 925.44
+4268.63 , 2166.04 , 958.13
+4268.63 , 2235.42 , 990.84
+4268.63 , 2304.80 , 1023.60
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G4.vemo b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G4.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..3fca17419f53cfb5ebc77275808c634b9f977ae0
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G4.vemo
@@ -0,0 +1,2016 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00 , -2303.92 , 23.82
+0.00 , -2232.40 , 22.44
+0.00 , -2160.89 , 21.09
+0.00 , -2089.37 , 19.79
+0.00 , -2017.86 , 18.53
+0.00 , -1946.34 , 17.31
+0.00 , -1874.83 , 16.13
+0.00 , -1803.31 , 14.99
+0.00 , -1731.80 , 13.89
+0.00 , -1660.28 , 12.84
+0.00 , -1588.77 , 11.83
+0.00 , -1517.25 , 10.85
+0.00 , -1445.74 , 9.92
+0.00 , -1374.22 , 9.04
+0.00 , -1302.71 , 8.19
+0.00 , -1231.19 , 7.38
+0.00 , -1159.68 , 6.62
+0.00 , -1088.17 , 5.90
+0.00 , -1016.65 , 5.21
+0.00 , -945.14 , 4.57
+0.00 , -873.62 , 3.98
+0.00 , -802.11 , 3.42
+0.00 , -728.89 , 2.90
+0.00 , -654.46 , 2.43
+0.00 , -580.03 , 2.00
+0.00 , -505.59 , 1.61
+0.00 , -431.16 , 1.26
+0.00 , -356.72 , 0.95
+0.00 , -282.29 , 0.69
+0.00 , -207.86 , 0.46
+0.00 , -133.42 , 0.28
+0.00 , -58.99 , 0.14
+0.00 , 15.44 , 0.09
+0.00 , 85.48 , 0.21
+0.00 , 155.51 , 0.38
+0.00 , 225.55 , 0.58
+0.00 , 295.58 , 0.83
+0.00 , 365.62 , 1.12
+0.00 , 435.65 , 1.45
+0.00 , 505.69 , 1.82
+0.00 , 575.72 , 2.23
+0.00 , 645.76 , 2.69
+0.00 , 715.79 , 3.19
+0.00 , 785.83 , 3.72
+0.00 , 855.86 , 4.30
+0.00 , 925.89 , 4.93
+0.00 , 995.93 , 5.59
+0.00 , 1065.96 , 6.29
+0.00 , 1136.00 , 7.04
+0.00 , 1206.03 , 7.83
+0.00 , 1276.07 , 8.65
+0.00 , 1346.10 , 9.52
+0.00 , 1416.14 , 10.44
+0.00 , 1486.17 , 11.39
+0.00 , 1556.21 , 12.38
+0.00 , 1626.24 , 13.42
+0.00 , 1696.28 , 14.50
+0.00 , 1766.31 , 15.62
+0.00 , 1836.35 , 16.78
+0.00 , 1906.38 , 17.98
+0.00 , 1976.42 , 19.22
+0.00 , 2046.45 , 20.51
+0.00 , 2116.48 , 21.84
+0.00 , 2186.52 , 23.20
+0.00 , 2256.55 , 24.61
+40.81 , -2304.55 , 13.99
+40.81 , -2233.03 , 12.92
+40.81 , -2161.52 , 11.89
+40.81 , -2090.00 , 10.89
+40.81 , -2018.49 , 9.94
+40.81 , -1946.97 , 9.04
+40.81 , -1875.46 , 8.17
+40.81 , -1803.94 , 7.34
+40.81 , -1732.43 , 6.56
+40.81 , -1660.91 , 5.82
+40.81 , -1589.40 , 5.12
+40.81 , -1517.88 , 4.46
+40.81 , -1446.37 , 3.84
+40.81 , -1374.85 , 3.26
+40.81 , -1303.34 , 2.73
+40.81 , -1231.82 , 2.23
+40.81 , -1160.31 , 1.78
+40.81 , -1088.80 , 1.37
+40.81 , -1017.28 , 1.01
+40.81 , -945.66 , 0.68
+40.81 , -873.67 , 0.40
+40.81 , -801.68 , 0.16
+40.81 , -728.26 , -0.05
+40.81 , -653.83 , -0.23
+40.81 , -579.40 , -0.36
+40.81 , -504.96 , -0.45
+40.81 , -430.53 , -0.50
+40.81 , -356.09 , -0.51
+40.81 , -281.66 , -0.48
+40.81 , -207.23 , -0.41
+40.81 , -132.79 , -0.29
+40.81 , -58.36 , -0.14
+40.81 , 16.07 , 0.11
+40.81 , 86.11 , 0.53
+40.81 , 156.14 , 0.99
+40.81 , 226.18 , 1.50
+40.81 , 296.21 , 2.05
+40.81 , 366.25 , 2.64
+40.81 , 436.28 , 3.27
+40.81 , 506.32 , 3.94
+40.81 , 576.35 , 4.65
+40.81 , 646.39 , 5.41
+40.81 , 716.42 , 6.21
+40.81 , 786.46 , 7.04
+40.81 , 856.49 , 7.92
+40.81 , 926.53 , 8.84
+40.81 , 996.56 , 9.81
+40.81 , 1066.59 , 10.81
+40.81 , 1136.63 , 11.86
+40.81 , 1206.66 , 12.94
+40.81 , 1276.70 , 14.07
+40.81 , 1346.73 , 15.24
+40.81 , 1416.77 , 16.45
+40.81 , 1486.80 , 17.71
+40.81 , 1556.84 , 19.00
+40.81 , 1626.87 , 20.34
+40.81 , 1696.91 , 21.72
+40.81 , 1766.94 , 23.14
+40.81 , 1836.98 , 24.60
+40.81 , 1907.01 , 26.10
+40.81 , 1977.05 , 27.64
+40.81 , 2047.08 , 29.23
+40.81 , 2117.11 , 30.85
+40.81 , 2187.15 , 32.52
+40.81 , 2257.18 , 34.23
+81.62 , -2305.18 , 4.17
+81.62 , -2233.66 , 3.41
+81.62 , -2162.15 , 2.69
+81.62 , -2090.63 , 2.02
+81.62 , -2019.12 , 1.39
+81.62 , -1947.60 , 0.81
+81.62 , -1876.09 , 0.26
+81.62 , -1804.57 , -0.25
+81.62 , -1733.06 , -0.71
+81.62 , -1661.54 , -1.13
+81.62 , -1590.03 , -1.52
+81.62 , -1518.51 , -1.86
+81.62 , -1447.00 , -2.16
+81.62 , -1375.48 , -2.42
+81.62 , -1303.97 , -2.64
+81.62 , -1232.46 , -2.82
+81.62 , -1160.94 , -2.96
+81.62 , -1089.43 , -3.06
+81.62 , -1017.91 , -3.11
+81.62 , -946.18 , -3.13
+81.62 , -873.71 , -3.12
+81.62 , -801.24 , -3.06
+81.62 , -727.63 , -2.97
+81.62 , -653.20 , -2.85
+81.62 , -578.77 , -2.69
+81.62 , -504.33 , -2.49
+81.62 , -429.90 , -2.24
+81.62 , -355.46 , -1.96
+81.62 , -281.03 , -1.64
+81.62 , -206.60 , -1.27
+81.62 , -132.16 , -0.87
+81.62 , -57.73 , -0.42
+81.62 , 16.70 , 0.12
+81.62 , 86.74 , 0.85
+81.62 , 156.77 , 1.61
+81.62 , 226.81 , 2.42
+81.62 , 296.84 , 3.27
+81.62 , 366.88 , 4.16
+81.62 , 436.91 , 5.09
+81.62 , 506.95 , 6.06
+81.62 , 576.98 , 7.07
+81.62 , 647.02 , 8.13
+81.62 , 717.05 , 9.22
+81.62 , 787.09 , 10.36
+81.62 , 857.12 , 11.54
+81.62 , 927.16 , 12.76
+81.62 , 997.19 , 14.02
+81.62 , 1067.22 , 15.33
+81.62 , 1137.26 , 16.67
+81.62 , 1207.29 , 18.06
+81.62 , 1277.33 , 19.49
+81.62 , 1347.36 , 20.96
+81.62 , 1417.40 , 22.47
+81.62 , 1487.43 , 24.03
+81.62 , 1557.47 , 25.62
+81.62 , 1627.50 , 27.26
+81.62 , 1697.54 , 28.93
+81.62 , 1767.57 , 30.65
+81.62 , 1837.61 , 32.41
+81.62 , 1907.64 , 34.22
+81.62 , 1977.68 , 36.06
+81.62 , 2047.71 , 37.94
+81.62 , 2117.74 , 39.87
+81.62 , 2187.78 , 41.84
+81.62 , 2257.81 , 43.85
+122.43 , -2305.81 , -5.48
+122.43 , -2234.29 , -5.92
+122.43 , -2162.78 , -6.32
+122.43 , -2091.26 , -6.68
+122.43 , -2019.75 , -7.00
+122.43 , -1948.23 , -7.28
+122.43 , -1876.72 , -7.52
+122.43 , -1805.20 , -7.72
+122.43 , -1733.69 , -7.88
+122.43 , -1662.17 , -8.00
+122.43 , -1590.66 , -8.07
+122.43 , -1519.14 , -8.11
+122.43 , -1447.63 , -8.11
+122.43 , -1376.11 , -8.06
+122.43 , -1304.60 , -7.98
+122.43 , -1233.09 , -7.85
+122.43 , -1161.57 , -7.68
+122.43 , -1090.06 , -7.47
+122.43 , -1018.54 , -7.23
+122.43 , -946.70 , -6.94
+122.43 , -873.76 , -6.63
+122.43 , -800.81 , -6.28
+122.43 , -727.00 , -5.89
+122.43 , -652.57 , -5.48
+122.43 , -578.13 , -5.02
+122.43 , -503.70 , -4.53
+122.43 , -429.27 , -3.99
+122.43 , -354.83 , -3.41
+122.43 , -280.40 , -2.80
+122.43 , -205.97 , -2.14
+122.43 , -131.53 , -1.44
+122.43 , -57.10 , -0.70
+122.43 , 17.33 , 0.14
+122.43 , 87.37 , 1.17
+122.43 , 157.40 , 2.23
+122.43 , 227.44 , 3.34
+122.43 , 297.47 , 4.48
+122.43 , 367.51 , 5.67
+122.43 , 437.54 , 6.90
+122.43 , 507.58 , 8.18
+122.43 , 577.61 , 9.49
+122.43 , 647.65 , 10.84
+122.43 , 717.68 , 12.24
+122.43 , 787.72 , 13.68
+122.43 , 857.75 , 15.16
+122.43 , 927.79 , 16.68
+122.43 , 997.82 , 18.24
+122.43 , 1067.85 , 19.85
+122.43 , 1137.89 , 21.49
+122.43 , 1207.92 , 23.18
+122.43 , 1277.96 , 24.91
+122.43 , 1347.99 , 26.68
+122.43 , 1418.03 , 28.49
+122.43 , 1488.06 , 30.34
+122.43 , 1558.10 , 32.24
+122.43 , 1628.13 , 34.17
+122.43 , 1698.17 , 36.15
+122.43 , 1768.20 , 38.17
+122.43 , 1838.24 , 40.23
+122.43 , 1908.27 , 42.33
+122.43 , 1978.31 , 44.48
+122.43 , 2048.34 , 46.66
+122.43 , 2118.38 , 48.89
+122.43 , 2188.41 , 51.16
+122.43 , 2258.44 , 53.47
+163.24 , -2306.44 , -15.09
+163.24 , -2234.92 , -15.22
+163.24 , -2163.41 , -15.32
+163.24 , -2091.89 , -15.37
+163.24 , -2020.38 , -15.39
+163.24 , -1948.86 , -15.36
+163.24 , -1877.35 , -15.30
+163.24 , -1805.83 , -15.19
+163.24 , -1734.32 , -15.04
+163.24 , -1662.80 , -14.85
+163.24 , -1591.29 , -14.62
+163.24 , -1519.77 , -14.35
+163.24 , -1448.26 , -14.04
+163.24 , -1376.75 , -13.69
+163.24 , -1305.23 , -13.30
+163.24 , -1233.72 , -12.87
+163.24 , -1162.20 , -12.40
+163.24 , -1090.69 , -11.88
+163.24 , -1019.17 , -11.33
+163.24 , -947.22 , -10.74
+163.24 , -873.80 , -10.14
+163.24 , -800.38 , -9.49
+163.24 , -726.37 , -8.82
+163.24 , -651.94 , -8.11
+163.24 , -577.50 , -7.36
+163.24 , -503.07 , -6.57
+163.24 , -428.64 , -5.74
+163.24 , -354.20 , -4.87
+163.24 , -279.77 , -3.96
+163.24 , -205.34 , -3.01
+163.24 , -130.90 , -2.01
+163.24 , -56.47 , -0.98
+163.24 , 17.97 , 0.16
+163.24 , 88.00 , 1.48
+163.24 , 158.03 , 2.85
+163.24 , 228.07 , 4.25
+163.24 , 298.10 , 5.70
+163.24 , 368.14 , 7.19
+163.24 , 438.17 , 8.72
+163.24 , 508.21 , 10.29
+163.24 , 578.24 , 11.90
+163.24 , 648.28 , 13.56
+163.24 , 718.31 , 15.26
+163.24 , 788.35 , 16.99
+163.24 , 858.38 , 18.77
+163.24 , 928.42 , 20.60
+163.24 , 998.45 , 22.46
+163.24 , 1068.49 , 24.36
+163.24 , 1138.52 , 26.31
+163.24 , 1208.55 , 28.30
+163.24 , 1278.59 , 30.32
+163.24 , 1348.62 , 32.39
+163.24 , 1418.66 , 34.50
+163.24 , 1488.69 , 36.66
+163.24 , 1558.73 , 38.85
+163.24 , 1628.76 , 41.09
+163.24 , 1698.80 , 43.36
+163.24 , 1768.83 , 45.68
+163.24 , 1838.87 , 48.05
+163.24 , 1908.90 , 50.45
+163.24 , 1978.94 , 52.89
+163.24 , 2048.97 , 55.38
+163.24 , 2119.01 , 57.90
+163.24 , 2189.04 , 60.47
+163.24 , 2259.07 , 63.08
+204.04 , -2307.07 , -24.68
+204.04 , -2235.55 , -24.52
+204.04 , -2164.04 , -24.31
+204.04 , -2092.52 , -24.06
+204.04 , -2021.01 , -23.76
+204.04 , -1949.49 , -23.43
+204.04 , -1877.98 , -23.06
+204.04 , -1806.46 , -22.65
+204.04 , -1734.95 , -22.19
+204.04 , -1663.43 , -21.70
+204.04 , -1591.92 , -21.16
+204.04 , -1520.40 , -20.59
+204.04 , -1448.89 , -19.97
+204.04 , -1377.38 , -19.31
+204.04 , -1305.86 , -18.62
+204.04 , -1234.35 , -17.88
+204.04 , -1162.83 , -17.10
+204.04 , -1091.32 , -16.28
+204.04 , -1019.80 , -15.42
+204.04 , -947.75 , -14.53
+204.04 , -873.85 , -13.64
+204.04 , -799.95 , -12.71
+204.04 , -725.74 , -11.74
+204.04 , -651.31 , -10.74
+204.04 , -576.87 , -9.70
+204.04 , -502.44 , -8.61
+204.04 , -428.01 , -7.49
+204.04 , -353.57 , -6.32
+204.04 , -279.14 , -5.12
+204.04 , -204.71 , -3.87
+204.04 , -130.27 , -2.59
+204.04 , -55.84 , -1.26
+204.04 , 18.60 , 0.17
+204.04 , 88.63 , 1.80
+204.04 , 158.66 , 3.46
+204.04 , 228.70 , 5.17
+204.04 , 298.73 , 6.92
+204.04 , 368.77 , 8.70
+204.04 , 438.80 , 10.53
+204.04 , 508.84 , 12.41
+204.04 , 578.87 , 14.32
+204.04 , 648.91 , 16.28
+204.04 , 718.94 , 18.27
+204.04 , 788.98 , 20.31
+204.04 , 859.01 , 22.39
+204.04 , 929.05 , 24.51
+204.04 , 999.08 , 26.67
+204.04 , 1069.12 , 28.88
+204.04 , 1139.15 , 31.12
+204.04 , 1209.18 , 33.41
+204.04 , 1279.22 , 35.74
+204.04 , 1349.25 , 38.11
+204.04 , 1419.29 , 40.52
+204.04 , 1489.32 , 42.97
+204.04 , 1559.36 , 45.47
+204.04 , 1629.39 , 48.00
+204.04 , 1699.43 , 50.58
+204.04 , 1769.46 , 53.20
+204.04 , 1839.50 , 55.86
+204.04 , 1909.53 , 58.56
+204.04 , 1979.57 , 61.31
+204.04 , 2049.60 , 64.09
+204.04 , 2119.64 , 66.92
+204.04 , 2189.67 , 69.79
+204.04 , 2259.70 , 72.70
+244.85 , -2307.70 , -34.27
+244.85 , -2236.18 , -33.80
+244.85 , -2164.67 , -33.28
+244.85 , -2093.15 , -32.73
+244.85 , -2021.64 , -32.13
+244.85 , -1950.12 , -31.49
+244.85 , -1878.61 , -30.81
+244.85 , -1807.09 , -30.09
+244.85 , -1735.58 , -29.34
+244.85 , -1664.06 , -28.53
+244.85 , -1592.55 , -27.69
+244.85 , -1521.04 , -26.81
+244.85 , -1449.52 , -25.89
+244.85 , -1378.01 , -24.93
+244.85 , -1306.49 , -23.92
+244.85 , -1234.98 , -22.88
+244.85 , -1163.46 , -21.79
+244.85 , -1091.95 , -20.67
+244.85 , -1020.43 , -19.50
+244.85 , -948.27 , -18.31
+244.85 , -873.89 , -17.13
+244.85 , -799.52 , -15.92
+244.85 , -725.11 , -14.66
+244.85 , -650.68 , -13.37
+244.85 , -576.24 , -12.03
+244.85 , -501.81 , -10.66
+244.85 , -427.38 , -9.24
+244.85 , -352.94 , -7.78
+244.85 , -278.51 , -6.28
+244.85 , -204.08 , -4.74
+244.85 , -129.64 , -3.16
+244.85 , -55.21 , -1.54
+244.85 , 19.23 , 0.19
+244.85 , 89.26 , 2.11
+244.85 , 159.29 , 4.08
+244.85 , 229.33 , 6.08
+244.85 , 299.36 , 8.13
+244.85 , 369.40 , 10.22
+244.85 , 439.43 , 12.35
+244.85 , 509.47 , 14.52
+244.85 , 579.50 , 16.74
+244.85 , 649.54 , 18.99
+244.85 , 719.57 , 21.29
+244.85 , 789.61 , 23.62
+244.85 , 859.64 , 26.00
+244.85 , 929.68 , 28.43
+244.85 , 999.71 , 30.89
+244.85 , 1069.75 , 33.39
+244.85 , 1139.78 , 35.94
+244.85 , 1209.82 , 38.52
+244.85 , 1279.85 , 41.15
+244.85 , 1349.88 , 43.82
+244.85 , 1419.92 , 46.53
+244.85 , 1489.95 , 49.29
+244.85 , 1559.99 , 52.08
+244.85 , 1630.02 , 54.92
+244.85 , 1700.06 , 57.79
+244.85 , 1770.09 , 60.71
+244.85 , 1840.13 , 63.68
+244.85 , 1910.16 , 66.68
+244.85 , 1980.20 , 69.72
+244.85 , 2050.23 , 72.80
+244.85 , 2120.27 , 75.93
+244.85 , 2190.30 , 79.10
+244.85 , 2260.34 , 82.31
+285.67 , -2308.33 , -43.85
+285.67 , -2236.81 , -43.07
+285.67 , -2165.30 , -42.25
+285.67 , -2093.78 , -41.39
+285.67 , -2022.27 , -40.49
+285.67 , -1950.75 , -39.54
+285.67 , -1879.24 , -38.56
+285.67 , -1807.72 , -37.53
+285.67 , -1736.21 , -36.47
+285.67 , -1664.69 , -35.36
+285.67 , -1593.18 , -34.21
+285.67 , -1521.67 , -33.02
+285.67 , -1450.15 , -31.80
+285.67 , -1378.64 , -30.53
+285.67 , -1307.12 , -29.22
+285.67 , -1235.61 , -27.87
+285.67 , -1164.09 , -26.48
+285.67 , -1092.21 , -25.06
+285.67 , -1020.28 , -23.59
+285.67 , -947.78 , -22.11
+285.67 , -873.35 , -20.64
+285.67 , -798.91 , -19.14
+285.67 , -724.48 , -17.59
+285.67 , -650.05 , -16.00
+285.67 , -575.61 , -14.37
+285.67 , -501.18 , -12.70
+285.67 , -426.75 , -10.99
+285.67 , -352.31 , -9.24
+285.67 , -277.88 , -7.45
+285.67 , -203.45 , -5.61
+285.67 , -129.01 , -3.74
+285.67 , -54.58 , -1.83
+285.67 , 19.86 , 0.20
+285.67 , 89.89 , 2.43
+285.67 , 159.93 , 4.69
+285.67 , 229.96 , 7.00
+285.67 , 299.99 , 9.34
+285.67 , 370.03 , 11.73
+285.67 , 440.06 , 14.16
+285.67 , 510.10 , 16.64
+285.67 , 580.13 , 19.15
+285.67 , 650.17 , 21.70
+285.67 , 720.20 , 24.30
+285.67 , 790.24 , 26.94
+285.67 , 860.27 , 29.62
+285.67 , 930.31 , 32.34
+285.67 , 1000.34 , 35.10
+285.67 , 1070.38 , 37.90
+285.67 , 1140.41 , 40.75
+285.67 , 1210.45 , 43.64
+285.67 , 1280.48 , 46.57
+285.67 , 1350.51 , 49.54
+285.67 , 1420.55 , 52.55
+285.67 , 1490.58 , 55.60
+285.67 , 1560.62 , 58.69
+285.67 , 1630.65 , 61.83
+285.67 , 1700.69 , 65.01
+285.67 , 1770.72 , 68.23
+285.67 , 1840.76 , 71.49
+285.67 , 1910.79 , 74.79
+285.67 , 1980.83 , 78.13
+285.67 , 2050.86 , 81.52
+285.67 , 2120.90 , 84.95
+285.67 , 2190.93 , 88.41
+285.67 , 2260.97 , 91.92
+326.47 , -2308.96 , -53.42
+326.47 , -2237.44 , -52.34
+326.47 , -2165.93 , -51.21
+326.47 , -2094.41 , -50.04
+326.47 , -2022.90 , -48.83
+326.47 , -1951.38 , -47.58
+326.47 , -1879.87 , -46.29
+326.47 , -1808.35 , -44.96
+326.47 , -1736.84 , -43.59
+326.47 , -1665.33 , -42.18
+326.47 , -1593.81 , -40.72
+326.47 , -1522.30 , -39.23
+326.47 , -1450.78 , -37.70
+326.47 , -1379.27 , -36.12
+326.47 , -1307.75 , -34.50
+326.47 , -1236.24 , -32.85
+326.47 , -1164.72 , -31.15
+326.47 , -1092.43 , -29.44
+326.47 , -1020.02 , -27.69
+326.47 , -947.15 , -25.92
+326.47 , -872.72 , -24.16
+326.47 , -798.28 , -22.36
+326.47 , -723.85 , -20.51
+326.47 , -649.42 , -18.63
+326.47 , -574.98 , -16.71
+326.47 , -500.55 , -14.75
+326.47 , -426.12 , -12.74
+326.47 , -351.68 , -10.70
+326.47 , -277.25 , -8.61
+326.47 , -202.82 , -6.48
+326.47 , -128.38 , -4.32
+326.47 , -53.95 , -2.11
+326.47 , 20.49 , 0.22
+326.47 , 90.52 , 2.74
+326.47 , 160.56 , 5.30
+326.47 , 230.59 , 7.91
+326.47 , 300.62 , 10.56
+326.47 , 370.66 , 13.25
+326.47 , 440.69 , 15.98
+326.47 , 510.73 , 18.75
+326.47 , 580.76 , 21.56
+326.47 , 650.80 , 24.42
+326.47 , 720.83 , 27.31
+326.47 , 790.87 , 30.25
+326.47 , 860.90 , 33.23
+326.47 , 930.94 , 36.25
+326.47 , 1000.97 , 39.31
+326.47 , 1071.01 , 42.42
+326.47 , 1141.04 , 45.56
+326.47 , 1211.08 , 48.75
+326.47 , 1281.11 , 51.98
+326.47 , 1351.14 , 55.25
+326.47 , 1421.18 , 58.56
+326.47 , 1491.21 , 61.91
+326.47 , 1561.25 , 65.31
+326.47 , 1631.28 , 68.74
+326.47 , 1701.32 , 72.22
+326.47 , 1771.35 , 75.74
+326.47 , 1841.39 , 79.30
+326.47 , 1911.42 , 82.90
+326.47 , 1981.46 , 86.54
+326.47 , 2051.49 , 90.23
+326.47 , 2121.53 , 93.96
+326.47 , 2191.56 , 97.72
+326.47 , 2261.60 , 101.53
+367.28 , -2309.59 , -62.98
+367.28 , -2238.07 , -61.59
+367.28 , -2166.56 , -60.16
+367.28 , -2095.04 , -58.68
+367.28 , -2023.53 , -57.17
+367.28 , -1952.01 , -55.61
+367.28 , -1880.50 , -54.02
+367.28 , -1808.98 , -52.38
+367.28 , -1737.47 , -50.70
+367.28 , -1665.96 , -48.98
+367.28 , -1594.44 , -47.22
+367.28 , -1522.93 , -45.42
+367.28 , -1451.41 , -43.58
+367.28 , -1379.90 , -41.70
+367.28 , -1308.38 , -39.78
+367.28 , -1236.87 , -37.82
+367.28 , -1165.35 , -35.81
+367.28 , -1092.64 , -33.82
+367.28 , -1019.76 , -31.78
+367.28 , -946.52 , -29.73
+367.28 , -872.09 , -27.67
+367.28 , -797.65 , -25.58
+367.28 , -723.22 , -23.44
+367.28 , -648.79 , -21.27
+367.28 , -574.35 , -19.05
+367.28 , -499.92 , -16.79
+367.28 , -425.49 , -14.49
+367.28 , -351.05 , -12.16
+367.28 , -276.62 , -9.78
+367.28 , -202.18 , -7.36
+367.28 , -127.75 , -4.90
+367.28 , -53.32 , -2.39
+367.28 , 21.12 , 0.23
+367.28 , 91.15 , 3.05
+367.28 , 161.19 , 5.92
+367.28 , 231.22 , 8.82
+367.28 , 301.26 , 11.77
+367.28 , 371.29 , 14.76
+367.28 , 441.32 , 17.79
+367.28 , 511.36 , 20.86
+367.28 , 581.39 , 23.97
+367.28 , 651.43 , 27.13
+367.28 , 721.46 , 30.33
+367.28 , 791.50 , 33.56
+367.28 , 861.53 , 36.84
+367.28 , 931.57 , 40.16
+367.28 , 1001.60 , 43.53
+367.28 , 1071.64 , 46.93
+367.28 , 1141.67 , 50.37
+367.28 , 1211.71 , 53.86
+367.28 , 1281.74 , 57.39
+367.28 , 1351.78 , 60.96
+367.28 , 1421.81 , 64.57
+367.28 , 1491.84 , 68.22
+367.28 , 1561.88 , 71.92
+367.28 , 1631.91 , 75.65
+367.28 , 1701.95 , 79.43
+367.28 , 1771.98 , 83.25
+367.28 , 1842.02 , 87.11
+367.28 , 1912.05 , 91.01
+367.28 , 1982.09 , 94.96
+367.28 , 2052.12 , 98.94
+367.28 , 2122.16 , 102.97
+367.28 , 2192.19 , 107.03
+367.28 , 2262.23 , 111.14
+408.09 , -2310.22 , -72.54
+408.09 , -2238.70 , -70.84
+408.09 , -2167.19 , -69.10
+408.09 , -2095.67 , -67.32
+408.09 , -2024.16 , -65.50
+408.09 , -1952.64 , -63.63
+408.09 , -1881.13 , -61.73
+408.09 , -1809.62 , -59.79
+408.09 , -1738.10 , -57.80
+408.09 , -1666.59 , -55.78
+408.09 , -1595.07 , -53.71
+408.09 , -1523.56 , -51.61
+408.09 , -1452.04 , -49.46
+408.09 , -1380.53 , -47.27
+408.09 , -1309.01 , -45.05
+408.09 , -1237.50 , -42.78
+408.09 , -1165.98 , -40.47
+408.09 , -1092.86 , -38.19
+408.09 , -1019.50 , -35.88
+408.09 , -945.89 , -33.53
+408.09 , -871.46 , -31.19
+408.09 , -797.02 , -28.80
+408.09 , -722.59 , -26.37
+408.09 , -648.16 , -23.90
+408.09 , -573.72 , -21.39
+408.09 , -499.29 , -18.84
+408.09 , -424.86 , -16.25
+408.09 , -350.42 , -13.62
+408.09 , -275.99 , -10.94
+408.09 , -201.55 , -8.23
+408.09 , -127.12 , -5.48
+408.09 , -52.69 , -2.68
+408.09 , 21.75 , 0.24
+408.09 , 91.78 , 3.36
+408.09 , 161.82 , 6.53
+408.09 , 231.85 , 9.73
+408.09 , 301.89 , 12.98
+408.09 , 371.92 , 16.27
+408.09 , 441.95 , 19.60
+408.09 , 511.99 , 22.97
+408.09 , 582.02 , 26.39
+408.09 , 652.06 , 29.84
+408.09 , 722.09 , 33.33
+408.09 , 792.13 , 36.87
+408.09 , 862.16 , 40.45
+408.09 , 932.20 , 44.07
+408.09 , 1002.23 , 47.74
+408.09 , 1072.27 , 51.44
+408.09 , 1142.30 , 55.19
+408.09 , 1212.34 , 58.97
+408.09 , 1282.37 , 62.80
+408.09 , 1352.41 , 66.67
+408.09 , 1422.44 , 70.58
+408.09 , 1492.47 , 74.53
+408.09 , 1562.51 , 78.53
+408.09 , 1632.54 , 82.56
+408.09 , 1702.58 , 86.64
+408.09 , 1772.61 , 90.76
+408.09 , 1842.65 , 94.92
+408.09 , 1912.68 , 99.12
+408.09 , 1982.72 , 103.37
+408.09 , 2052.75 , 107.65
+408.09 , 2122.79 , 111.98
+408.09 , 2192.82 , 116.34
+408.09 , 2262.86 , 120.75
+448.90 , -2310.85 , -82.08
+448.90 , -2239.33 , -80.07
+448.90 , -2167.82 , -78.03
+448.90 , -2096.30 , -75.94
+448.90 , -2024.79 , -73.81
+448.90 , -1953.27 , -71.64
+448.90 , -1881.76 , -69.44
+448.90 , -1810.25 , -67.19
+448.90 , -1738.73 , -64.90
+448.90 , -1667.22 , -62.57
+448.90 , -1595.70 , -60.20
+448.90 , -1524.19 , -57.78
+448.90 , -1452.67 , -55.33
+448.90 , -1381.16 , -52.84
+448.90 , -1309.64 , -50.30
+448.90 , -1238.13 , -47.73
+448.90 , -1166.61 , -45.11
+448.90 , -1093.07 , -42.55
+448.90 , -1019.23 , -39.97
+448.90 , -945.26 , -37.34
+448.90 , -870.83 , -34.70
+448.90 , -796.39 , -32.02
+448.90 , -721.96 , -29.30
+448.90 , -647.53 , -26.54
+448.90 , -573.09 , -23.73
+448.90 , -498.66 , -20.89
+448.90 , -424.23 , -18.00
+448.90 , -349.79 , -15.08
+448.90 , -275.36 , -12.11
+448.90 , -200.92 , -9.10
+448.90 , -126.49 , -6.06
+448.90 , -52.06 , -2.97
+448.90 , 22.38 , 0.25
+448.90 , 92.41 , 3.67
+448.90 , 162.45 , 7.14
+448.90 , 232.48 , 10.64
+448.90 , 302.52 , 14.19
+448.90 , 372.55 , 17.78
+448.90 , 442.58 , 21.41
+448.90 , 512.62 , 25.08
+448.90 , 582.65 , 28.79
+448.90 , 652.69 , 32.55
+448.90 , 722.72 , 36.34
+448.90 , 792.76 , 40.18
+448.90 , 862.79 , 44.06
+448.90 , 932.83 , 47.98
+448.90 , 1002.86 , 51.95
+448.90 , 1072.90 , 55.95
+448.90 , 1142.93 , 59.99
+448.90 , 1212.97 , 64.08
+448.90 , 1283.00 , 68.21
+448.90 , 1353.04 , 72.38
+448.90 , 1423.07 , 76.59
+448.90 , 1493.11 , 80.84
+448.90 , 1563.14 , 85.14
+448.90 , 1633.17 , 89.47
+448.90 , 1703.21 , 93.85
+448.90 , 1773.24 , 98.27
+448.90 , 1843.28 , 102.73
+448.90 , 1913.31 , 107.23
+448.90 , 1983.35 , 111.78
+448.90 , 2053.38 , 116.36
+448.90 , 2123.42 , 120.99
+448.90 , 2193.45 , 125.65
+448.90 , 2263.49 , 130.36
+489.71 , -2311.48 , -91.61
+489.71 , -2239.96 , -89.30
+489.71 , -2168.45 , -86.94
+489.71 , -2096.93 , -84.55
+489.71 , -2025.42 , -82.12
+489.71 , -1953.91 , -79.65
+489.71 , -1882.39 , -77.13
+489.71 , -1810.88 , -74.58
+489.71 , -1739.36 , -71.98
+489.71 , -1667.85 , -69.34
+489.71 , -1596.33 , -66.67
+489.71 , -1524.82 , -63.95
+489.71 , -1453.30 , -61.19
+489.71 , -1381.79 , -58.39
+489.71 , -1310.27 , -55.55
+489.71 , -1238.76 , -52.67
+489.71 , -1167.24 , -49.75
+489.71 , -1093.29 , -46.91
+489.71 , -1018.97 , -44.05
+489.71 , -944.63 , -41.15
+489.71 , -870.20 , -38.22
+489.71 , -795.76 , -35.24
+489.71 , -721.33 , -32.23
+489.71 , -646.90 , -29.17
+489.71 , -572.46 , -26.08
+489.71 , -498.03 , -22.94
+489.71 , -423.60 , -19.76
+489.71 , -349.16 , -16.54
+489.71 , -274.73 , -13.28
+489.71 , -200.29 , -9.98
+489.71 , -125.86 , -6.64
+489.71 , -51.43 , -3.26
+489.71 , 23.01 , 0.26
+489.71 , 93.04 , 3.98
+489.71 , 163.08 , 7.75
+489.71 , 233.11 , 11.55
+489.71 , 303.15 , 15.40
+489.71 , 373.18 , 19.29
+489.71 , 443.22 , 23.22
+489.71 , 513.25 , 27.19
+489.71 , 583.28 , 31.20
+489.71 , 653.32 , 35.26
+489.71 , 723.35 , 39.36
+489.71 , 793.39 , 43.49
+489.71 , 863.42 , 47.67
+489.71 , 933.46 , 51.89
+489.71 , 1003.49 , 56.15
+489.71 , 1073.53 , 60.46
+489.71 , 1143.56 , 64.80
+489.71 , 1213.60 , 69.19
+489.71 , 1283.63 , 73.62
+489.71 , 1353.67 , 78.09
+489.71 , 1423.70 , 82.60
+489.71 , 1493.74 , 87.15
+489.71 , 1563.77 , 91.75
+489.71 , 1633.80 , 96.38
+489.71 , 1703.84 , 101.06
+489.71 , 1773.87 , 105.78
+489.71 , 1843.91 , 110.54
+489.71 , 1913.94 , 115.34
+489.71 , 1983.98 , 120.18
+489.71 , 2054.01 , 125.07
+489.71 , 2124.05 , 129.99
+489.71 , 2194.08 , 134.96
+489.71 , 2264.12 , 139.97
+816.18 , -2316.52 , -167.50
+816.18 , -2245.01 , -162.74
+816.18 , -2173.49 , -157.95
+816.18 , -2101.98 , -153.10
+816.18 , -2030.46 , -148.22
+816.18 , -1958.95 , -143.30
+816.18 , -1887.43 , -138.34
+816.18 , -1815.92 , -133.33
+816.18 , -1744.40 , -128.29
+816.18 , -1672.89 , -123.21
+816.18 , -1601.37 , -118.08
+816.18 , -1529.73 , -112.93
+816.18 , -1457.44 , -107.78
+816.18 , -1385.16 , -102.60
+816.18 , -1311.76 , -97.48
+816.18 , -1237.32 , -92.40
+816.18 , -1162.89 , -87.28
+816.18 , -1088.46 , -82.12
+816.18 , -1014.02 , -76.91
+816.18 , -939.59 , -71.67
+816.18 , -865.16 , -66.39
+816.18 , -790.72 , -61.07
+816.18 , -716.29 , -55.70
+816.18 , -641.85 , -50.30
+816.18 , -567.42 , -44.85
+816.18 , -492.99 , -39.37
+816.18 , -418.55 , -33.84
+816.18 , -344.12 , -28.27
+816.18 , -269.69 , -22.66
+816.18 , -195.25 , -17.02
+816.18 , -120.82 , -11.33
+816.18 , -46.38 , -5.60
+816.18 , 28.05 , 0.30
+816.18 , 98.08 , 6.43
+816.18 , 168.12 , 12.59
+816.18 , 238.15 , 18.80
+816.18 , 308.19 , 25.04
+816.18 , 378.22 , 31.33
+816.18 , 448.26 , 37.66
+816.18 , 518.29 , 44.03
+816.18 , 588.33 , 50.44
+816.18 , 658.36 , 56.90
+816.18 , 728.40 , 63.40
+816.18 , 798.43 , 69.93
+816.18 , 868.47 , 76.51
+816.18 , 938.50 , 83.13
+816.18 , 1008.53 , 89.79
+816.18 , 1078.57 , 96.50
+816.18 , 1148.60 , 103.24
+816.18 , 1218.64 , 110.03
+816.18 , 1288.67 , 116.86
+816.18 , 1358.71 , 123.72
+816.18 , 1428.74 , 130.64
+816.18 , 1498.78 , 137.59
+816.18 , 1568.81 , 144.58
+816.18 , 1638.85 , 151.62
+816.18 , 1708.88 , 158.69
+816.18 , 1778.92 , 165.81
+816.18 , 1848.95 , 172.97
+816.18 , 1918.99 , 180.18
+816.18 , 1989.02 , 187.42
+816.18 , 2059.05 , 194.70
+816.18 , 2129.09 , 202.03
+816.18 , 2199.12 , 209.40
+816.18 , 2269.16 , 216.81
+1020.26 , -2319.67 , -214.62
+1020.26 , -2248.16 , -208.33
+1020.26 , -2176.64 , -202.00
+1020.26 , -2105.13 , -195.63
+1020.26 , -2033.61 , -189.22
+1020.26 , -1962.10 , -182.77
+1020.26 , -1890.58 , -176.27
+1020.26 , -1819.07 , -169.74
+1020.26 , -1747.55 , -163.17
+1020.26 , -1675.85 , -156.57
+1020.26 , -1604.10 , -149.94
+1020.26 , -1531.91 , -143.32
+1020.26 , -1457.47 , -136.89
+1020.26 , -1383.04 , -130.43
+1020.26 , -1308.61 , -123.92
+1020.26 , -1234.17 , -117.38
+1020.26 , -1159.74 , -110.79
+1020.26 , -1085.30 , -104.16
+1020.26 , -1010.87 , -97.49
+1020.26 , -936.44 , -90.78
+1020.26 , -862.00 , -84.03
+1020.26 , -787.57 , -77.24
+1020.26 , -713.14 , -70.41
+1020.26 , -638.70 , -63.53
+1020.26 , -564.27 , -56.62
+1020.26 , -489.84 , -49.67
+1020.26 , -415.40 , -42.67
+1020.26 , -340.97 , -35.64
+1020.26 , -266.53 , -28.56
+1020.26 , -192.10 , -21.45
+1020.26 , -117.67 , -14.29
+1020.26 , -43.23 , -7.09
+1020.26 , 31.20 , 0.30
+1020.26 , 101.24 , 7.92
+1020.26 , 171.27 , 15.59
+1020.26 , 241.30 , 23.29
+1020.26 , 311.34 , 31.04
+1020.26 , 381.37 , 38.83
+1020.26 , 451.41 , 46.66
+1020.26 , 521.44 , 54.53
+1020.26 , 591.48 , 62.44
+1020.26 , 661.51 , 70.40
+1020.26 , 731.55 , 78.39
+1020.26 , 801.58 , 86.43
+1020.26 , 871.62 , 94.51
+1020.26 , 941.65 , 102.63
+1020.26 , 1011.69 , 110.79
+1020.26 , 1081.72 , 118.99
+1020.26 , 1151.76 , 127.24
+1020.26 , 1221.79 , 135.52
+1020.26 , 1291.83 , 143.85
+1020.26 , 1361.86 , 152.22
+1020.26 , 1431.89 , 160.63
+1020.26 , 1501.93 , 169.08
+1020.26 , 1571.96 , 177.58
+1020.26 , 1642.00 , 186.11
+1020.26 , 1712.03 , 194.69
+1020.26 , 1782.07 , 203.31
+1020.26 , 1852.10 , 211.97
+1020.26 , 1922.14 , 220.67
+1020.26 , 1992.17 , 229.41
+1020.26 , 2062.21 , 238.19
+1020.26 , 2132.24 , 247.02
+1020.26 , 2202.28 , 255.90
+1020.26 , 2272.31 , 264.80
+1224.27 , -2322.82 , -261.49
+1224.27 , -2251.31 , -253.68
+1224.27 , -2179.79 , -245.82
+1224.27 , -2108.28 , -237.91
+1224.27 , -2036.76 , -229.97
+1224.27 , -1965.25 , -221.99
+1224.27 , -1893.73 , -213.97
+1224.27 , -1822.22 , -205.90
+1224.27 , -1750.71 , -197.80
+1224.27 , -1677.07 , -189.93
+1224.27 , -1602.94 , -182.08
+1224.27 , -1528.76 , -174.19
+1224.27 , -1454.32 , -166.30
+1224.27 , -1379.89 , -158.36
+1224.27 , -1305.46 , -150.39
+1224.27 , -1231.02 , -142.38
+1224.27 , -1156.59 , -134.32
+1224.27 , -1082.15 , -126.22
+1224.27 , -1007.72 , -118.09
+1224.27 , -933.29 , -109.91
+1224.27 , -858.85 , -101.69
+1224.27 , -784.42 , -93.43
+1224.27 , -709.99 , -85.13
+1224.27 , -635.55 , -76.80
+1224.27 , -561.12 , -68.41
+1224.27 , -486.68 , -59.99
+1224.27 , -412.25 , -51.53
+1224.27 , -337.82 , -43.03
+1224.27 , -263.38 , -34.48
+1224.27 , -188.95 , -25.90
+1224.27 , -114.52 , -17.28
+1224.27 , -40.08 , -8.61
+1224.27 , 34.35 , 0.28
+1224.27 , 104.39 , 9.40
+1224.27 , 174.42 , 18.56
+1224.27 , 244.46 , 27.77
+1224.27 , 314.49 , 37.01
+1224.27 , 384.53 , 46.30
+1224.27 , 454.56 , 55.63
+1224.27 , 524.59 , 65.00
+1224.27 , 594.63 , 74.42
+1224.27 , 664.66 , 83.87
+1224.27 , 734.70 , 93.37
+1224.27 , 804.73 , 102.90
+1224.27 , 874.77 , 112.48
+1224.27 , 944.80 , 122.10
+1224.27 , 1014.84 , 131.76
+1224.27 , 1084.87 , 141.47
+1224.27 , 1154.91 , 151.21
+1224.27 , 1224.94 , 161.00
+1224.27 , 1294.98 , 170.82
+1224.27 , 1365.01 , 180.69
+1224.27 , 1435.05 , 190.60
+1224.27 , 1505.08 , 200.56
+1224.27 , 1575.11 , 210.55
+1224.27 , 1645.15 , 220.59
+1224.27 , 1715.18 , 230.66
+1224.27 , 1785.22 , 240.77
+1224.27 , 1855.25 , 250.93
+1224.27 , 1925.29 , 261.13
+1224.27 , 1995.32 , 271.39
+1224.27 , 2065.36 , 281.66
+1224.27 , 2135.39 , 291.99
+1224.27 , 2205.43 , 302.37
+1224.27 , 2275.46 , 312.77
+1428.29 , -2325.97 , -308.11
+1428.29 , -2254.46 , -298.77
+1428.29 , -2182.94 , -289.38
+1428.29 , -2111.43 , -279.94
+1428.29 , -2039.92 , -270.48
+1428.29 , -1968.40 , -260.97
+1428.29 , -1895.94 , -251.55
+1428.29 , -1822.34 , -242.27
+1428.29 , -1748.75 , -232.95
+1428.29 , -1674.47 , -223.69
+1428.29 , -1600.04 , -214.41
+1428.29 , -1525.61 , -205.09
+1428.29 , -1451.17 , -195.73
+1428.29 , -1376.74 , -186.33
+1428.29 , -1302.30 , -176.89
+1428.29 , -1227.87 , -167.40
+1428.29 , -1153.44 , -157.88
+1428.29 , -1079.00 , -148.32
+1428.29 , -1004.57 , -138.71
+1428.29 , -930.14 , -129.07
+1428.29 , -855.70 , -119.38
+1428.29 , -781.27 , -109.65
+1428.29 , -706.83 , -99.89
+1428.29 , -632.40 , -90.08
+1428.29 , -557.97 , -80.23
+1428.29 , -483.53 , -70.34
+1428.29 , -409.10 , -60.41
+1428.29 , -334.67 , -50.44
+1428.29 , -260.23 , -40.43
+1428.29 , -185.80 , -30.38
+1428.29 , -111.36 , -20.29
+1428.29 , -36.93 , -10.15
+1428.29 , 37.50 , 0.23
+1428.29 , 107.54 , 10.85
+1428.29 , 177.57 , 21.52
+1428.29 , 247.61 , 32.22
+1428.29 , 317.64 , 42.97
+1428.29 , 387.68 , 53.75
+1428.29 , 457.71 , 64.58
+1428.29 , 527.75 , 75.46
+1428.29 , 597.78 , 86.37
+1428.29 , 667.81 , 97.32
+1428.29 , 737.85 , 108.32
+1428.29 , 807.88 , 119.35
+1428.29 , 877.92 , 130.43
+1428.29 , 947.95 , 141.55
+1428.29 , 1017.99 , 152.71
+1428.29 , 1088.02 , 163.92
+1428.29 , 1158.06 , 175.16
+1428.29 , 1228.09 , 186.45
+1428.29 , 1298.13 , 197.77
+1428.29 , 1368.16 , 209.14
+1428.29 , 1438.20 , 220.55
+1428.29 , 1508.23 , 232.00
+1428.29 , 1578.27 , 243.49
+1428.29 , 1648.30 , 255.04
+1428.29 , 1718.33 , 266.60
+1428.29 , 1788.37 , 278.23
+1428.29 , 1858.40 , 289.88
+1428.29 , 1928.44 , 301.58
+1428.29 , 1998.47 , 313.33
+1428.29 , 2068.51 , 325.10
+1428.29 , 2138.54 , 336.95
+1428.29 , 2208.58 , 348.80
+1428.29 , 2278.61 , 360.72
+1632.39 , -2329.13 , -354.50
+1632.39 , -2257.61 , -343.63
+1632.39 , -2186.10 , -332.70
+1632.39 , -2114.43 , -321.76
+1632.39 , -2041.37 , -311.03
+1632.39 , -1968.31 , -300.25
+1632.39 , -1894.62 , -289.53
+1632.39 , -1820.19 , -278.92
+1632.39 , -1745.75 , -268.25
+1632.39 , -1671.32 , -257.54
+1632.39 , -1596.89 , -246.80
+1632.39 , -1522.45 , -236.01
+1632.39 , -1448.02 , -225.18
+1632.39 , -1373.59 , -214.31
+1632.39 , -1299.15 , -203.40
+1632.39 , -1224.72 , -192.45
+1632.39 , -1150.28 , -181.46
+1632.39 , -1075.85 , -170.43
+1632.39 , -1001.42 , -159.36
+1632.39 , -926.98 , -148.25
+1632.39 , -852.55 , -137.09
+1632.39 , -778.12 , -125.90
+1632.39 , -703.68 , -114.67
+1632.39 , -629.25 , -103.39
+1632.39 , -554.82 , -92.07
+1632.39 , -480.38 , -80.72
+1632.39 , -405.95 , -69.32
+1632.39 , -331.51 , -57.88
+1632.39 , -257.08 , -46.40
+1632.39 , -182.65 , -34.88
+1632.39 , -108.21 , -23.32
+1632.39 , -33.78 , -11.72
+1632.39 , 40.65 , 0.16
+1632.39 , 110.69 , 12.28
+1632.39 , 180.72 , 24.45
+1632.39 , 250.76 , 36.65
+1632.39 , 320.79 , 48.90
+1632.39 , 390.83 , 61.19
+1632.39 , 460.86 , 73.52
+1632.39 , 530.90 , 85.89
+1632.39 , 600.93 , 98.30
+1632.39 , 670.97 , 110.75
+1632.39 , 741.00 , 123.25
+1632.39 , 811.04 , 135.78
+1632.39 , 881.07 , 148.36
+1632.39 , 951.11 , 160.98
+1632.39 , 1021.14 , 173.64
+1632.39 , 1091.17 , 186.35
+1632.39 , 1161.21 , 199.09
+1632.39 , 1231.24 , 211.87
+1632.39 , 1301.28 , 224.70
+1632.39 , 1371.31 , 237.56
+1632.39 , 1441.35 , 250.49
+1632.39 , 1511.38 , 263.44
+1632.39 , 1581.42 , 276.42
+1632.39 , 1651.45 , 289.45
+1632.39 , 1721.49 , 302.52
+1632.39 , 1791.52 , 315.65
+1632.39 , 1861.56 , 328.82
+1632.39 , 1931.59 , 342.02
+1632.39 , 2001.63 , 355.26
+1632.39 , 2071.66 , 368.53
+1632.39 , 2141.70 , 381.87
+1632.39 , 2211.73 , 395.24
+1632.39 , 2281.76 , 408.65
+1836.41 , -2332.28 , -400.63
+1836.41 , -2260.01 , -388.37
+1836.41 , -2187.49 , -376.11
+1836.41 , -2114.77 , -363.87
+1836.41 , -2040.34 , -351.88
+1836.41 , -1965.90 , -339.89
+1836.41 , -1891.47 , -327.83
+1836.41 , -1817.04 , -315.74
+1836.41 , -1742.60 , -303.61
+1836.41 , -1668.17 , -291.42
+1836.41 , -1593.74 , -279.22
+1836.41 , -1519.30 , -266.96
+1836.41 , -1444.87 , -254.66
+1836.41 , -1370.43 , -242.33
+1836.41 , -1296.00 , -229.95
+1836.41 , -1221.57 , -217.53
+1836.41 , -1147.13 , -205.07
+1836.41 , -1072.70 , -192.57
+1836.41 , -998.27 , -180.03
+1836.41 , -923.83 , -167.45
+1836.41 , -849.40 , -154.83
+1836.41 , -774.97 , -142.17
+1836.41 , -700.53 , -129.47
+1836.41 , -626.10 , -116.72
+1836.41 , -551.66 , -103.94
+1836.41 , -477.23 , -91.12
+1836.41 , -402.80 , -78.25
+1836.41 , -328.36 , -65.35
+1836.41 , -253.93 , -52.40
+1836.41 , -179.50 , -39.41
+1836.41 , -105.06 , -26.38
+1836.41 , -30.63 , -13.31
+1836.41 , 43.81 , 0.07
+1836.41 , 113.84 , 13.69
+1836.41 , 183.87 , 27.36
+1836.41 , 253.91 , 41.06
+1836.41 , 323.94 , 54.81
+1836.41 , 393.98 , 68.59
+1836.41 , 464.01 , 82.42
+1836.41 , 534.05 , 96.29
+1836.41 , 604.08 , 110.20
+1836.41 , 674.12 , 124.16
+1836.41 , 744.15 , 138.15
+1836.41 , 814.19 , 152.19
+1836.41 , 884.22 , 166.27
+1836.41 , 954.26 , 180.39
+1836.41 , 1024.29 , 194.55
+1836.41 , 1094.33 , 208.75
+1836.41 , 1164.36 , 223.00
+1836.41 , 1234.40 , 237.29
+1836.41 , 1304.43 , 251.62
+1836.41 , 1374.46 , 265.97
+1836.41 , 1444.50 , 280.40
+1836.41 , 1514.53 , 294.85
+1836.41 , 1584.57 , 309.32
+1836.41 , 1654.60 , 323.87
+1836.41 , 1724.64 , 338.44
+1836.41 , 1794.67 , 353.06
+1836.41 , 1864.71 , 367.72
+1836.41 , 1934.74 , 382.41
+1836.41 , 2004.78 , 397.15
+1836.41 , 2074.81 , 411.94
+1836.41 , 2144.85 , 426.78
+1836.41 , 2214.88 , 441.64
+1836.41 , 2284.92 , 456.55
+2040.43 , -2334.30 , -446.77
+2040.43 , -2260.49 , -433.33
+2040.43 , -2186.05 , -419.97
+2040.43 , -2111.62 , -406.56
+2040.43 , -2037.19 , -393.12
+2040.43 , -1962.75 , -379.64
+2040.43 , -1888.32 , -366.14
+2040.43 , -1813.89 , -352.58
+2040.43 , -1739.45 , -338.98
+2040.43 , -1665.02 , -325.33
+2040.43 , -1590.59 , -311.65
+2040.43 , -1516.15 , -297.93
+2040.43 , -1441.72 , -284.15
+2040.43 , -1367.28 , -270.36
+2040.43 , -1292.85 , -256.51
+2040.43 , -1218.42 , -242.63
+2040.43 , -1143.98 , -228.70
+2040.43 , -1069.55 , -214.74
+2040.43 , -995.12 , -200.73
+2040.43 , -920.68 , -186.68
+2040.43 , -846.25 , -172.59
+2040.43 , -771.81 , -158.46
+2040.43 , -697.38 , -144.29
+2040.43 , -622.95 , -130.08
+2040.43 , -548.51 , -115.83
+2040.43 , -474.08 , -101.54
+2040.43 , -399.65 , -87.20
+2040.43 , -325.21 , -72.83
+2040.43 , -250.78 , -58.42
+2040.43 , -176.34 , -43.96
+2040.43 , -101.91 , -29.47
+2040.43 , -27.48 , -14.93
+2040.43 , 46.96 , -0.04
+2040.43 , 116.99 , 15.08
+2040.43 , 187.03 , 30.24
+2040.43 , 257.06 , 45.45
+2040.43 , 327.10 , 60.69
+2040.43 , 397.13 , 75.98
+2040.43 , 467.16 , 91.31
+2040.43 , 537.20 , 106.68
+2040.43 , 607.23 , 122.09
+2040.43 , 677.27 , 137.54
+2040.43 , 747.30 , 153.04
+2040.43 , 817.34 , 168.58
+2040.43 , 887.37 , 184.15
+2040.43 , 957.41 , 199.77
+2040.43 , 1027.44 , 215.43
+2040.43 , 1097.48 , 231.15
+2040.43 , 1167.51 , 246.87
+2040.43 , 1237.55 , 262.67
+2040.43 , 1307.58 , 278.50
+2040.43 , 1377.62 , 294.37
+2040.43 , 1447.65 , 310.27
+2040.43 , 1517.68 , 326.21
+2040.43 , 1587.72 , 342.20
+2040.43 , 1657.75 , 358.25
+2040.43 , 1727.79 , 374.34
+2040.43 , 1797.82 , 390.45
+2040.43 , 1867.86 , 406.59
+2040.43 , 1937.89 , 422.80
+2040.43 , 2007.93 , 439.03
+2040.43 , 2077.96 , 455.32
+2040.43 , 2148.00 , 471.65
+2040.43 , 2218.03 , 488.01
+2040.43 , 2288.07 , 504.43
+2244.53 , -2331.75 , -493.78
+2244.53 , -2257.34 , -479.00
+2244.53 , -2182.90 , -464.17
+2244.53 , -2108.47 , -449.31
+2244.53 , -2034.04 , -434.41
+2244.53 , -1959.60 , -419.46
+2244.53 , -1885.17 , -404.46
+2244.53 , -1810.73 , -389.43
+2244.53 , -1736.30 , -374.36
+2244.53 , -1661.87 , -359.26
+2244.53 , -1587.43 , -344.12
+2244.53 , -1513.00 , -328.93
+2244.53 , -1438.57 , -313.68
+2244.53 , -1364.13 , -298.42
+2244.53 , -1289.70 , -283.10
+2244.53 , -1215.26 , -267.77
+2244.53 , -1140.83 , -252.35
+2244.53 , -1066.40 , -236.93
+2244.53 , -991.96 , -221.45
+2244.53 , -917.53 , -205.93
+2244.53 , -843.10 , -190.38
+2244.53 , -768.66 , -174.78
+2244.53 , -694.23 , -159.14
+2244.53 , -619.79 , -143.47
+2244.53 , -545.36 , -127.75
+2244.53 , -470.93 , -111.99
+2244.53 , -396.49 , -96.19
+2244.53 , -322.06 , -80.34
+2244.53 , -247.63 , -64.46
+2244.53 , -173.19 , -48.54
+2244.53 , -98.76 , -32.58
+2244.53 , -24.33 , -16.57
+2244.53 , 50.11 , -0.18
+2244.53 , 120.14 , 16.44
+2244.53 , 190.18 , 33.11
+2244.53 , 260.21 , 49.81
+2244.53 , 330.25 , 66.56
+2244.53 , 400.28 , 83.34
+2244.53 , 470.32 , 100.17
+2244.53 , 540.35 , 117.04
+2244.53 , 610.39 , 133.95
+2244.53 , 680.42 , 150.91
+2244.53 , 750.46 , 167.90
+2244.53 , 820.49 , 184.94
+2244.53 , 890.52 , 202.02
+2244.53 , 960.56 , 219.13
+2244.53 , 1030.59 , 236.30
+2244.53 , 1100.63 , 253.50
+2244.53 , 1170.66 , 270.75
+2244.53 , 1240.70 , 288.02
+2244.53 , 1310.73 , 305.36
+2244.53 , 1380.77 , 322.73
+2244.53 , 1450.80 , 340.12
+2244.53 , 1520.84 , 357.58
+2244.53 , 1590.87 , 375.07
+2244.53 , 1660.91 , 392.61
+2244.53 , 1730.94 , 410.20
+2244.53 , 1800.98 , 427.80
+2244.53 , 1871.01 , 445.46
+2244.53 , 1941.04 , 463.17
+2244.53 , 2011.08 , 480.90
+2244.53 , 2081.11 , 498.68
+2244.53 , 2151.15 , 516.50
+2244.53 , 2221.18 , 534.38
+2244.53 , 2291.22 , 552.28
+2448.55 , -2328.62 , -540.95
+2448.55 , -2254.19 , -524.70
+2448.55 , -2179.75 , -508.40
+2448.55 , -2105.32 , -492.08
+2448.55 , -2030.88 , -475.68
+2448.55 , -1956.45 , -459.29
+2448.55 , -1882.02 , -442.82
+2448.55 , -1807.58 , -426.32
+2448.55 , -1733.15 , -409.78
+2448.55 , -1658.72 , -393.22
+2448.55 , -1584.28 , -376.60
+2448.55 , -1509.85 , -359.94
+2448.55 , -1435.41 , -343.25
+2448.55 , -1360.98 , -326.49
+2448.55 , -1286.55 , -309.73
+2448.55 , -1212.11 , -292.90
+2448.55 , -1137.68 , -276.05
+2448.55 , -1063.25 , -259.14
+2448.55 , -988.81 , -242.20
+2448.55 , -914.38 , -225.21
+2448.55 , -839.95 , -208.19
+2448.55 , -765.51 , -191.12
+2448.55 , -691.08 , -174.02
+2448.55 , -616.64 , -156.87
+2448.55 , -542.21 , -139.68
+2448.55 , -467.78 , -122.46
+2448.55 , -393.34 , -105.19
+2448.55 , -318.91 , -87.88
+2448.55 , -244.48 , -70.53
+2448.55 , -170.04 , -53.14
+2448.55 , -95.61 , -35.71
+2448.55 , -21.17 , -18.24
+2448.55 , 53.26 , -0.33
+2448.55 , 123.29 , 17.79
+2448.55 , 193.33 , 35.95
+2448.55 , 263.36 , 54.15
+2448.55 , 333.40 , 72.40
+2448.55 , 403.43 , 90.69
+2448.55 , 473.47 , 109.01
+2448.55 , 543.50 , 127.38
+2448.55 , 613.54 , 145.80
+2448.55 , 683.57 , 164.25
+2448.55 , 753.61 , 182.74
+2448.55 , 823.64 , 201.28
+2448.55 , 893.68 , 219.85
+2448.55 , 963.71 , 238.48
+2448.55 , 1033.74 , 257.12
+2448.55 , 1103.78 , 275.84
+2448.55 , 1173.81 , 294.58
+2448.55 , 1243.85 , 313.37
+2448.55 , 1313.88 , 332.19
+2448.55 , 1383.92 , 351.05
+2448.55 , 1453.95 , 369.96
+2448.55 , 1523.99 , 388.92
+2448.55 , 1594.02 , 407.91
+2448.55 , 1664.06 , 426.94
+2448.55 , 1734.09 , 446.02
+2448.55 , 1804.13 , 465.15
+2448.55 , 1874.16 , 484.30
+2448.55 , 1944.20 , 503.50
+2448.55 , 2014.23 , 522.73
+2448.55 , 2084.27 , 542.03
+2448.55 , 2154.30 , 561.35
+2448.55 , 2224.33 , 580.72
+2448.55 , 2294.37 , 600.11
+2652.56 , -2325.47 , -588.14
+2652.56 , -2251.03 , -570.42
+2652.56 , -2176.60 , -552.65
+2652.56 , -2102.17 , -534.86
+2652.56 , -2027.73 , -517.02
+2652.56 , -1953.30 , -499.13
+2652.56 , -1878.87 , -481.22
+2652.56 , -1804.43 , -463.25
+2652.56 , -1730.00 , -445.24
+2652.56 , -1655.57 , -427.21
+2652.56 , -1581.13 , -409.12
+2652.56 , -1506.70 , -390.99
+2652.56 , -1432.26 , -372.81
+2652.56 , -1357.83 , -354.61
+2652.56 , -1283.40 , -336.35
+2652.56 , -1208.96 , -318.08
+2652.56 , -1134.53 , -299.75
+2652.56 , -1060.10 , -281.38
+2652.56 , -985.66 , -262.96
+2652.56 , -911.23 , -244.52
+2652.56 , -836.79 , -226.02
+2652.56 , -762.36 , -207.49
+2652.56 , -687.93 , -188.92
+2652.56 , -613.49 , -170.31
+2652.56 , -539.06 , -151.65
+2652.56 , -464.63 , -132.96
+2652.56 , -390.19 , -114.22
+2652.56 , -315.76 , -95.44
+2652.56 , -241.32 , -76.62
+2652.56 , -166.89 , -57.77
+2652.56 , -92.46 , -38.87
+2652.56 , -18.02 , -19.93
+2652.56 , 56.41 , -0.51
+2652.56 , 126.44 , 19.11
+2652.56 , 196.48 , 38.77
+2652.56 , 266.51 , 58.47
+2652.56 , 336.55 , 78.22
+2652.56 , 406.58 , 98.00
+2652.56 , 476.62 , 117.83
+2652.56 , 546.65 , 137.70
+2652.56 , 616.69 , 157.61
+2652.56 , 686.72 , 177.57
+2652.56 , 756.76 , 197.56
+2652.56 , 826.79 , 217.60
+2652.56 , 896.83 , 237.68
+2652.56 , 966.86 , 257.79
+2652.56 , 1036.90 , 277.96
+2652.56 , 1106.93 , 298.15
+2652.56 , 1176.97 , 318.41
+2652.56 , 1247.00 , 338.69
+2652.56 , 1317.03 , 359.00
+2652.56 , 1387.07 , 379.38
+2652.56 , 1457.10 , 399.79
+2652.56 , 1527.14 , 420.24
+2652.56 , 1597.17 , 440.72
+2652.56 , 1667.21 , 461.25
+2652.56 , 1737.24 , 481.83
+2652.56 , 1807.28 , 502.45
+2652.56 , 1877.31 , 523.12
+2652.56 , 1947.35 , 543.82
+2652.56 , 2017.38 , 564.54
+2652.56 , 2087.42 , 585.33
+2652.56 , 2157.45 , 606.15
+2652.56 , 2227.49 , 627.02
+2652.56 , 2297.52 , 647.93
+2856.67 , -2322.32 , -635.35
+2856.67 , -2247.88 , -616.16
+2856.67 , -2173.45 , -596.94
+2856.67 , -2099.02 , -577.66
+2856.67 , -2024.58 , -558.35
+2856.67 , -1950.15 , -539.01
+2856.67 , -1875.71 , -519.63
+2856.67 , -1801.28 , -500.20
+2856.67 , -1726.85 , -480.72
+2856.67 , -1652.41 , -461.21
+2856.67 , -1577.98 , -441.66
+2856.67 , -1503.55 , -422.06
+2856.67 , -1429.11 , -402.43
+2856.67 , -1354.68 , -382.73
+2856.67 , -1280.24 , -363.04
+2856.67 , -1205.81 , -343.27
+2856.67 , -1131.38 , -323.47
+2856.67 , -1056.94 , -303.63
+2856.67 , -982.51 , -283.76
+2856.67 , -908.08 , -263.85
+2856.67 , -833.64 , -243.88
+2856.67 , -759.21 , -223.88
+2856.67 , -684.77 , -203.84
+2856.67 , -610.34 , -183.76
+2856.67 , -535.91 , -163.64
+2856.67 , -461.47 , -143.48
+2856.67 , -387.04 , -123.27
+2856.67 , -312.61 , -103.03
+2856.67 , -238.17 , -82.74
+2856.67 , -163.74 , -62.42
+2856.67 , -89.31 , -42.05
+2856.67 , -14.87 , -21.64
+2856.67 , 59.56 , -0.72
+2856.67 , 129.60 , 20.40
+2856.67 , 199.63 , 41.57
+2856.67 , 269.67 , 62.77
+2856.67 , 339.70 , 84.01
+2856.67 , 409.74 , 105.30
+2856.67 , 479.77 , 126.63
+2856.67 , 549.81 , 148.00
+2856.67 , 619.84 , 169.41
+2856.67 , 689.87 , 190.86
+2856.67 , 759.91 , 212.36
+2856.67 , 829.94 , 233.89
+2856.67 , 899.98 , 255.48
+2856.67 , 970.01 , 277.09
+2856.67 , 1040.05 , 298.75
+2856.67 , 1110.08 , 320.46
+2856.67 , 1180.12 , 342.19
+2856.67 , 1250.15 , 363.97
+2856.67 , 1320.19 , 385.80
+2856.67 , 1390.22 , 407.68
+2856.67 , 1460.26 , 429.58
+2856.67 , 1530.29 , 451.53
+2856.67 , 1600.33 , 473.53
+2856.67 , 1670.36 , 495.55
+2856.67 , 1740.39 , 517.62
+2856.67 , 1810.43 , 539.74
+2856.67 , 1880.46 , 561.91
+2856.67 , 1950.50 , 584.10
+2856.67 , 2020.53 , 606.34
+2856.67 , 2090.57 , 628.63
+2856.67 , 2160.60 , 650.94
+2856.67 , 2230.64 , 673.33
+2856.67 , 2300.67 , 695.71
+3060.68 , -2319.17 , -682.59
+3060.68 , -2244.73 , -661.93
+3060.68 , -2170.30 , -641.24
+3060.68 , -2095.86 , -620.49
+3060.68 , -2021.43 , -599.73
+3060.68 , -1947.00 , -578.90
+3060.68 , -1872.56 , -558.05
+3060.68 , -1798.13 , -537.15
+3060.68 , -1723.70 , -516.20
+3060.68 , -1649.26 , -495.23
+3060.68 , -1574.83 , -474.21
+3060.68 , -1500.39 , -453.14
+3060.68 , -1425.96 , -432.04
+3060.68 , -1351.53 , -410.90
+3060.68 , -1277.09 , -389.73
+3060.68 , -1202.66 , -368.49
+3060.68 , -1128.23 , -347.23
+3060.68 , -1053.79 , -325.92
+3060.68 , -979.36 , -304.58
+3060.68 , -904.93 , -283.20
+3060.68 , -830.49 , -261.76
+3060.68 , -756.06 , -240.30
+3060.68 , -681.62 , -218.79
+3060.68 , -607.19 , -197.24
+3060.68 , -532.76 , -175.65
+3060.68 , -458.32 , -154.02
+3060.68 , -383.89 , -132.35
+3060.68 , -309.46 , -110.64
+3060.68 , -235.02 , -88.89
+3060.68 , -160.59 , -67.09
+3060.68 , -86.15 , -45.26
+3060.68 , -11.72 , -23.38
+3060.68 , 62.71 , -0.94
+3060.68 , 132.75 , 21.68
+3060.68 , 202.78 , 44.34
+3060.68 , 272.82 , 67.04
+3060.68 , 342.85 , 89.79
+3060.68 , 412.89 , 112.58
+3060.68 , 482.92 , 135.40
+3060.68 , 552.96 , 158.27
+3060.68 , 622.99 , 181.18
+3060.68 , 693.03 , 204.13
+3060.68 , 763.06 , 227.13
+3060.68 , 833.09 , 250.16
+3060.68 , 903.13 , 273.25
+3060.68 , 973.16 , 296.35
+3060.68 , 1043.20 , 319.53
+3060.68 , 1113.23 , 342.71
+3060.68 , 1183.27 , 365.96
+3060.68 , 1253.30 , 389.24
+3060.68 , 1323.34 , 412.56
+3060.68 , 1393.37 , 435.93
+3060.68 , 1463.41 , 459.36
+3060.68 , 1533.44 , 482.80
+3060.68 , 1603.48 , 506.29
+3060.68 , 1673.51 , 529.84
+3060.68 , 1743.55 , 553.40
+3060.68 , 1813.58 , 577.02
+3060.68 , 1883.61 , 600.68
+3060.68 , 1953.65 , 624.37
+3060.68 , 2023.68 , 648.10
+3060.68 , 2093.72 , 671.89
+3060.68 , 2163.75 , 695.72
+3060.68 , 2233.79 , 719.58
+3060.68 , 2303.82 , 743.48
+3264.70 , -2316.01 , -729.84
+3264.70 , -2241.58 , -707.71
+3264.70 , -2167.15 , -685.56
+3264.70 , -2092.71 , -663.36
+3264.70 , -2018.28 , -641.11
+3264.70 , -1943.85 , -618.84
+3264.70 , -1869.41 , -596.49
+3264.70 , -1794.98 , -574.15
+3264.70 , -1720.55 , -551.73
+3264.70 , -1646.11 , -529.28
+3264.70 , -1571.68 , -506.79
+3264.70 , -1497.24 , -484.28
+3264.70 , -1422.81 , -461.69
+3264.70 , -1348.38 , -439.08
+3264.70 , -1273.94 , -416.44
+3264.70 , -1199.51 , -393.73
+3264.70 , -1125.08 , -371.00
+3264.70 , -1050.64 , -348.24
+3264.70 , -976.21 , -325.44
+3264.70 , -901.77 , -302.58
+3264.70 , -827.34 , -279.68
+3264.70 , -752.91 , -256.74
+3264.70 , -678.47 , -233.76
+3264.70 , -604.04 , -210.75
+3264.70 , -529.61 , -187.69
+3264.70 , -455.17 , -164.59
+3264.70 , -380.74 , -141.45
+3264.70 , -306.30 , -118.27
+3264.70 , -231.87 , -95.05
+3264.70 , -157.44 , -71.79
+3264.70 , -83.00 , -48.49
+3264.70 , -8.57 , -25.15
+3264.70 , 65.86 , -1.19
+3264.70 , 135.90 , 22.93
+3264.70 , 205.93 , 47.09
+3264.70 , 275.97 , 71.30
+3264.70 , 346.00 , 95.54
+3264.70 , 416.04 , 119.83
+3264.70 , 486.07 , 144.16
+3264.70 , 556.11 , 168.52
+3264.70 , 626.14 , 192.94
+3264.70 , 696.18 , 217.39
+3264.70 , 766.21 , 241.89
+3264.70 , 836.25 , 266.42
+3264.70 , 906.28 , 291.00
+3264.70 , 976.31 , 315.60
+3264.70 , 1046.35 , 340.27
+3264.70 , 1116.38 , 364.97
+3264.70 , 1186.42 , 389.72
+3264.70 , 1256.45 , 414.49
+3264.70 , 1326.49 , 439.33
+3264.70 , 1396.52 , 464.20
+3264.70 , 1466.56 , 489.09
+3264.70 , 1536.59 , 514.06
+3264.70 , 1606.63 , 539.05
+3264.70 , 1676.66 , 564.09
+3264.70 , 1746.70 , 589.15
+3264.70 , 1816.73 , 614.26
+3264.70 , 1886.77 , 639.42
+3264.70 , 1956.80 , 664.62
+3264.70 , 2026.84 , 689.85
+3264.70 , 2096.87 , 715.16
+3264.70 , 2166.90 , 740.46
+3264.70 , 2236.94 , 765.84
+3264.70 , 2306.97 , 791.24
+3468.80 , -2312.86 , -777.13
+3468.80 , -2238.43 , -753.54
+3468.80 , -2164.00 , -729.91
+3468.80 , -2089.56 , -706.24
+3468.80 , -2015.13 , -682.53
+3468.80 , -1940.69 , -658.78
+3468.80 , -1866.26 , -634.99
+3468.80 , -1791.83 , -611.15
+3468.80 , -1717.39 , -587.27
+3468.80 , -1642.96 , -563.35
+3468.80 , -1568.53 , -539.39
+3468.80 , -1494.09 , -515.41
+3468.80 , -1419.66 , -491.38
+3468.80 , -1345.22 , -467.30
+3468.80 , -1270.79 , -443.17
+3468.80 , -1196.36 , -419.01
+3468.80 , -1121.92 , -394.81
+3468.80 , -1047.49 , -370.58
+3468.80 , -973.06 , -346.28
+3468.80 , -898.62 , -321.96
+3468.80 , -824.19 , -297.61
+3468.80 , -749.75 , -273.22
+3468.80 , -675.32 , -248.76
+3468.80 , -600.89 , -224.28
+3468.80 , -526.45 , -199.75
+3468.80 , -452.02 , -175.19
+3468.80 , -377.59 , -150.58
+3468.80 , -303.15 , -125.93
+3468.80 , -228.72 , -101.24
+3468.80 , -154.28 , -76.52
+3468.80 , -79.85 , -51.75
+3468.80 , -5.42 , -26.94
+3468.80 , 69.02 , -1.46
+3468.80 , 139.05 , 24.16
+3468.80 , 209.09 , 49.82
+3468.80 , 279.12 , 75.53
+3468.80 , 349.15 , 101.27
+3468.80 , 419.19 , 127.06
+3468.80 , 489.22 , 152.88
+3468.80 , 559.26 , 178.75
+3468.80 , 629.29 , 204.67
+3468.80 , 699.33 , 230.61
+3468.80 , 769.36 , 256.61
+3468.80 , 839.40 , 282.64
+3468.80 , 909.43 , 308.71
+3468.80 , 979.47 , 334.83
+3468.80 , 1049.50 , 361.00
+3468.80 , 1119.54 , 387.20
+3468.80 , 1189.57 , 413.44
+3468.80 , 1259.61 , 439.73
+3468.80 , 1329.64 , 466.04
+3468.80 , 1399.68 , 492.41
+3468.80 , 1469.71 , 518.82
+3468.80 , 1539.74 , 545.28
+3468.80 , 1609.78 , 571.76
+3468.80 , 1679.81 , 598.30
+3468.80 , 1749.85 , 624.88
+3468.80 , 1819.88 , 651.48
+3468.80 , 1889.92 , 678.16
+3468.80 , 1959.95 , 704.84
+3468.80 , 2029.99 , 731.59
+3468.80 , 2100.02 , 758.36
+3468.80 , 2170.06 , 785.18
+3468.80 , 2240.09 , 812.06
+3468.80 , 2310.13 , 838.98
+3672.82 , -2309.71 , -824.44
+3672.82 , -2235.28 , -799.40
+3672.82 , -2160.84 , -774.28
+3672.82 , -2086.41 , -749.14
+3672.82 , -2011.98 , -723.98
+3672.82 , -1937.54 , -698.74
+3672.82 , -1863.11 , -673.48
+3672.82 , -1788.68 , -648.20
+3672.82 , -1714.24 , -622.84
+3672.82 , -1639.81 , -597.46
+3672.82 , -1565.37 , -572.03
+3672.82 , -1490.94 , -546.58
+3672.82 , -1416.51 , -521.08
+3672.82 , -1342.07 , -495.53
+3672.82 , -1267.64 , -469.95
+3672.82 , -1193.21 , -444.30
+3672.82 , -1118.77 , -418.66
+3672.82 , -1044.34 , -392.94
+3672.82 , -969.90 , -367.19
+3672.82 , -895.47 , -341.40
+3672.82 , -821.04 , -315.56
+3672.82 , -746.60 , -289.69
+3672.82 , -672.17 , -263.79
+3672.82 , -597.74 , -237.83
+3672.82 , -523.30 , -211.84
+3672.82 , -448.87 , -185.81
+3672.82 , -374.44 , -159.73
+3672.82 , -300.00 , -133.62
+3672.82 , -225.57 , -107.46
+3672.82 , -151.13 , -81.26
+3672.82 , -76.70 , -55.03
+3672.82 , -2.27 , -28.75
+3672.82 , 72.17 , -1.75
+3672.82 , 142.20 , 25.37
+3672.82 , 212.24 , 52.53
+3672.82 , 282.27 , 79.74
+3672.82 , 352.31 , 106.98
+3672.82 , 422.34 , 134.27
+3672.82 , 492.38 , 161.59
+3672.82 , 562.41 , 188.96
+3672.82 , 632.44 , 216.38
+3672.82 , 702.48 , 243.83
+3672.82 , 772.51 , 271.33
+3672.82 , 842.55 , 298.84
+3672.82 , 912.58 , 326.44
+3672.82 , 982.62 , 354.05
+3672.82 , 1052.65 , 381.69
+3672.82 , 1122.69 , 409.41
+3672.82 , 1192.72 , 437.14
+3672.82 , 1262.76 , 464.93
+3672.82 , 1332.79 , 492.76
+3672.82 , 1402.83 , 520.62
+3672.82 , 1472.86 , 548.53
+3672.82 , 1542.90 , 576.49
+3672.82 , 1612.93 , 604.46
+3672.82 , 1682.96 , 632.52
+3672.82 , 1753.00 , 660.57
+3672.82 , 1823.03 , 688.69
+3672.82 , 1893.07 , 716.84
+3672.82 , 1963.10 , 745.04
+3672.82 , 2033.14 , 773.29
+3672.82 , 2103.17 , 801.58
+3672.82 , 2173.21 , 829.90
+3672.82 , 2243.24 , 858.26
+3672.82 , 2313.28 , 886.68
+3876.84 , -2306.56 , -871.78
+3876.84 , -2232.13 , -845.25
+3876.84 , -2157.69 , -818.69
+3876.84 , -2083.26 , -792.08
+3876.84 , -2008.83 , -765.45
+3876.84 , -1934.39 , -738.74
+3876.84 , -1859.96 , -712.01
+3876.84 , -1785.52 , -685.26
+3876.84 , -1711.09 , -658.43
+3876.84 , -1636.66 , -631.58
+3876.84 , -1562.22 , -604.71
+3876.84 , -1487.79 , -577.76
+3876.84 , -1413.36 , -550.79
+3876.84 , -1338.92 , -523.77
+3876.84 , -1264.49 , -496.72
+3876.84 , -1190.06 , -469.63
+3876.84 , -1115.62 , -442.49
+3876.84 , -1041.19 , -415.33
+3876.84 , -966.75 , -388.11
+3876.84 , -892.32 , -360.85
+3876.84 , -817.89 , -333.54
+3876.84 , -743.45 , -306.21
+3876.84 , -669.02 , -278.83
+3876.84 , -594.59 , -251.41
+3876.84 , -520.15 , -223.95
+3876.84 , -445.72 , -196.45
+3876.84 , -371.28 , -168.91
+3876.84 , -296.85 , -141.32
+3876.84 , -222.42 , -113.70
+3876.84 , -147.98 , -86.04
+3876.84 , -73.55 , -58.33
+3876.84 , 0.88 , -30.59
+3876.84 , 75.32 , -2.06
+3876.84 , 145.35 , 26.56
+3876.84 , 215.39 , 55.22
+3876.84 , 285.42 , 83.92
+3876.84 , 355.46 , 112.67
+3876.84 , 425.49 , 141.45
+3876.84 , 495.53 , 170.28
+3876.84 , 565.56 , 199.15
+3876.84 , 635.60 , 228.06
+3876.84 , 705.63 , 257.01
+3876.84 , 775.66 , 286.00
+3876.84 , 845.70 , 315.04
+3876.84 , 915.73 , 344.10
+3876.84 , 985.77 , 373.24
+3876.84 , 1055.80 , 402.40
+3876.84 , 1125.84 , 431.58
+3876.84 , 1195.87 , 460.84
+3876.84 , 1265.91 , 490.12
+3876.84 , 1335.94 , 519.45
+3876.84 , 1405.98 , 548.80
+3876.84 , 1476.01 , 578.20
+3876.84 , 1546.05 , 607.65
+3876.84 , 1616.08 , 637.15
+3876.84 , 1686.12 , 666.68
+3876.84 , 1756.15 , 696.27
+3876.84 , 1826.18 , 725.87
+3876.84 , 1896.22 , 755.54
+3876.84 , 1966.25 , 785.23
+3876.84 , 2036.29 , 814.97
+3876.84 , 2106.32 , 844.76
+3876.84 , 2176.36 , 874.57
+3876.84 , 2246.39 , 904.43
+3876.84 , 2316.43 , 934.34
+4080.85 , -2303.41 , -919.14
+4080.85 , -2228.98 , -891.16
+4080.85 , -2154.54 , -863.10
+4080.85 , -2080.11 , -835.03
+4080.85 , -2005.68 , -806.93
+4080.85 , -1931.24 , -778.78
+4080.85 , -1856.81 , -750.58
+4080.85 , -1782.37 , -722.33
+4080.85 , -1707.94 , -694.06
+4080.85 , -1633.51 , -665.74
+4080.85 , -1559.07 , -637.37
+4080.85 , -1484.64 , -608.98
+4080.85 , -1410.21 , -580.54
+4080.85 , -1335.77 , -552.05
+4080.85 , -1261.34 , -523.54
+4080.85 , -1186.90 , -494.98
+4080.85 , -1112.47 , -466.37
+4080.85 , -1038.04 , -437.73
+4080.85 , -963.60 , -409.05
+4080.85 , -889.17 , -380.32
+4080.85 , -814.74 , -351.56
+4080.85 , -740.30 , -322.76
+4080.85 , -665.87 , -293.91
+4080.85 , -591.43 , -265.01
+4080.85 , -517.00 , -236.09
+4080.85 , -442.57 , -207.12
+4080.85 , -368.13 , -178.11
+4080.85 , -293.70 , -149.06
+4080.85 , -219.27 , -119.97
+4080.85 , -144.83 , -90.83
+4080.85 , -70.40 , -61.66
+4080.85 , 4.04 , -32.44
+4080.85 , 78.47 , -2.40
+4080.85 , 148.50 , 27.72
+4080.85 , 218.54 , 57.88
+4080.85 , 288.57 , 88.09
+4080.85 , 358.61 , 118.33
+4080.85 , 428.64 , 148.61
+4080.85 , 498.68 , 178.94
+4080.85 , 568.71 , 209.32
+4080.85 , 638.75 , 239.71
+4080.85 , 708.78 , 270.17
+4080.85 , 778.82 , 300.66
+4080.85 , 848.85 , 331.19
+4080.85 , 918.88 , 361.77
+4080.85 , 988.92 , 392.38
+4080.85 , 1058.95 , 423.06
+4080.85 , 1128.99 , 453.74
+4080.85 , 1199.02 , 484.49
+4080.85 , 1269.06 , 515.27
+4080.85 , 1339.09 , 546.09
+4080.85 , 1409.13 , 576.97
+4080.85 , 1479.16 , 607.86
+4080.85 , 1549.20 , 638.83
+4080.85 , 1619.23 , 669.80
+4080.85 , 1689.27 , 700.85
+4080.85 , 1759.30 , 731.91
+4080.85 , 1829.34 , 763.03
+4080.85 , 1899.37 , 794.19
+4080.85 , 1969.41 , 825.40
+4080.85 , 2039.44 , 856.64
+4080.85 , 2109.47 , 887.92
+4080.85 , 2179.51 , 919.23
+4080.85 , 2249.54 , 950.59
+4080.85 , 2319.58 , 982.00
+4268.63 , -2300.51 , -962.73
+4268.63 , -2226.08 , -933.40
+4268.63 , -2151.64 , -904.00
+4268.63 , -2077.21 , -874.59
+4268.63 , -2002.78 , -845.12
+4268.63 , -1928.34 , -815.62
+4268.63 , -1853.91 , -786.07
+4268.63 , -1779.47 , -756.47
+4268.63 , -1705.04 , -726.85
+4268.63 , -1630.61 , -697.18
+4268.63 , -1556.17 , -667.48
+4268.63 , -1481.74 , -637.72
+4268.63 , -1407.31 , -607.92
+4268.63 , -1332.87 , -578.11
+4268.63 , -1258.44 , -548.22
+4268.63 , -1184.00 , -518.31
+4268.63 , -1109.57 , -488.37
+4268.63 , -1035.14 , -458.36
+4268.63 , -960.70 , -428.33
+4268.63 , -886.27 , -398.25
+4268.63 , -811.84 , -368.14
+4268.63 , -737.40 , -337.99
+4268.63 , -662.97 , -307.79
+4268.63 , -588.53 , -277.56
+4268.63 , -514.10 , -247.27
+4268.63 , -439.67 , -216.96
+4268.63 , -365.23 , -186.60
+4268.63 , -290.80 , -156.19
+4268.63 , -216.37 , -125.75
+4268.63 , -141.93 , -95.27
+4268.63 , -67.50 , -64.75
+4268.63 , 6.94 , -34.15
+4268.63 , 81.37 , -2.73
+4268.63 , 151.40 , 28.77
+4268.63 , 221.44 , 60.31
+4268.63 , 291.47 , 91.89
+4268.63 , 361.51 , 123.52
+4268.63 , 431.54 , 155.18
+4268.63 , 501.58 , 186.89
+4268.63 , 571.61 , 218.63
+4268.63 , 641.65 , 250.42
+4268.63 , 711.68 , 282.26
+4268.63 , 781.72 , 314.12
+4268.63 , 851.75 , 346.04
+4268.63 , 921.78 , 377.99
+4268.63 , 991.82 , 410.00
+4268.63 , 1061.85 , 442.03
+4268.63 , 1131.89 , 474.11
+4268.63 , 1201.92 , 506.24
+4268.63 , 1271.96 , 538.40
+4268.63 , 1341.99 , 570.60
+4268.63 , 1412.03 , 602.85
+4268.63 , 1482.06 , 635.15
+4268.63 , 1552.10 , 667.47
+4268.63 , 1622.13 , 699.84
+4268.63 , 1692.17 , 732.26
+4268.63 , 1762.20 , 764.70
+4268.63 , 1832.24 , 797.19
+4268.63 , 1902.27 , 829.73
+4268.63 , 1972.31 , 862.32
+4268.63 , 2042.34 , 894.93
+4268.63 , 2112.37 , 927.60
+4268.63 , 2182.41 , 960.31
+4268.63 , 2252.44 , 993.04
+4268.63 , 2322.48 , 1025.82
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G5.vemo b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G5.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..d20d4a5bd74aae53a41fa7b6127b1449b2082507
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G5.vemo
@@ -0,0 +1,2016 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00 , -2281.64 , 23.82
+0.00 , -2210.78 , 22.44
+0.00 , -2139.93 , 21.09
+0.00 , -2069.07 , 19.79
+0.00 , -1998.21 , 18.53
+0.00 , -1927.35 , 17.31
+0.00 , -1856.50 , 16.13
+0.00 , -1785.64 , 14.99
+0.00 , -1714.78 , 13.89
+0.00 , -1643.92 , 12.84
+0.00 , -1573.07 , 11.83
+0.00 , -1502.21 , 10.85
+0.00 , -1431.35 , 9.92
+0.00 , -1360.50 , 9.04
+0.00 , -1289.64 , 8.19
+0.00 , -1218.78 , 7.38
+0.00 , -1147.92 , 6.62
+0.00 , -1077.07 , 5.90
+0.00 , -1006.21 , 5.21
+0.00 , -935.35 , 4.57
+0.00 , -864.50 , 3.98
+0.00 , -793.64 , 3.42
+0.00 , -721.12 , 2.90
+0.00 , -647.87 , 2.43
+0.00 , -574.61 , 2.00
+0.00 , -501.01 , 1.61
+0.00 , -427.40 , 1.26
+0.00 , -353.80 , 0.95
+0.00 , -280.20 , 0.69
+0.00 , -206.60 , 0.46
+0.00 , -133.00 , 0.28
+0.00 , -59.39 , 0.14
+0.00 , 14.21 , 0.09
+0.00 , 84.90 , 0.21
+0.00 , 155.58 , 0.38
+0.00 , 226.27 , 0.58
+0.00 , 296.96 , 0.83
+0.00 , 367.65 , 1.12
+0.00 , 438.33 , 1.45
+0.00 , 509.02 , 1.82
+0.00 , 579.71 , 2.23
+0.00 , 650.39 , 2.69
+0.00 , 721.08 , 3.19
+0.00 , 791.77 , 3.72
+0.00 , 862.46 , 4.30
+0.00 , 933.14 , 4.93
+0.00 , 1003.83 , 5.59
+0.00 , 1074.52 , 6.29
+0.00 , 1145.21 , 7.04
+0.00 , 1215.89 , 7.83
+0.00 , 1286.58 , 8.65
+0.00 , 1357.27 , 9.52
+0.00 , 1427.95 , 10.44
+0.00 , 1498.64 , 11.39
+0.00 , 1569.33 , 12.38
+0.00 , 1640.02 , 13.42
+0.00 , 1710.70 , 14.50
+0.00 , 1781.39 , 15.62
+0.00 , 1852.08 , 16.78
+0.00 , 1922.77 , 17.98
+0.00 , 1993.45 , 19.22
+0.00 , 2064.14 , 20.51
+0.00 , 2134.83 , 21.84
+0.00 , 2205.52 , 23.20
+0.00 , 2276.20 , 24.61
+40.81 , -2282.22 , 14.00
+40.81 , -2211.36 , 12.93
+40.81 , -2140.51 , 11.89
+40.81 , -2069.65 , 10.90
+40.81 , -1998.79 , 9.95
+40.81 , -1927.93 , 9.04
+40.81 , -1857.08 , 8.17
+40.81 , -1786.22 , 7.35
+40.81 , -1715.36 , 6.56
+40.81 , -1644.50 , 5.82
+40.81 , -1573.65 , 5.12
+40.81 , -1502.79 , 4.46
+40.81 , -1431.93 , 3.84
+40.81 , -1361.08 , 3.26
+40.81 , -1290.22 , 2.73
+40.81 , -1219.36 , 2.23
+40.81 , -1148.50 , 1.78
+40.81 , -1077.65 , 1.37
+40.81 , -1006.79 , 1.01
+40.81 , -935.90 , 0.68
+40.81 , -864.96 , 0.40
+40.81 , -794.01 , 0.16
+40.81 , -721.23 , -0.05
+40.81 , -647.63 , -0.22
+40.81 , -574.03 , -0.35
+40.81 , -500.43 , -0.45
+40.81 , -426.82 , -0.50
+40.81 , -353.22 , -0.50
+40.81 , -279.62 , -0.47
+40.81 , -206.02 , -0.40
+40.81 , -132.42 , -0.29
+40.81 , -58.81 , -0.14
+40.81 , 14.79 , 0.11
+40.81 , 85.48 , 0.54
+40.81 , 156.16 , 1.00
+40.81 , 226.85 , 1.51
+40.81 , 297.54 , 2.05
+40.81 , 368.22 , 2.64
+40.81 , 438.91 , 3.27
+40.81 , 509.60 , 3.95
+40.81 , 580.29 , 4.66
+40.81 , 650.97 , 5.42
+40.81 , 721.66 , 6.21
+40.81 , 792.35 , 7.05
+40.81 , 863.04 , 7.93
+40.81 , 933.72 , 8.85
+40.81 , 1004.41 , 9.82
+40.81 , 1075.10 , 10.82
+40.81 , 1145.79 , 11.87
+40.81 , 1216.47 , 12.95
+40.81 , 1287.16 , 14.08
+40.81 , 1357.85 , 15.25
+40.81 , 1428.53 , 16.46
+40.81 , 1499.22 , 17.72
+40.81 , 1569.91 , 19.01
+40.81 , 1640.60 , 20.35
+40.81 , 1711.28 , 21.73
+40.81 , 1781.97 , 23.15
+40.81 , 1852.66 , 24.61
+40.81 , 1923.35 , 26.11
+40.81 , 1994.03 , 27.66
+40.81 , 2064.72 , 29.24
+40.81 , 2135.41 , 30.87
+40.81 , 2206.10 , 32.53
+40.81 , 2276.78 , 34.24
+81.62 , -2282.80 , 4.19
+81.62 , -2211.94 , 3.42
+81.62 , -2141.09 , 2.70
+81.62 , -2070.23 , 2.03
+81.62 , -1999.37 , 1.40
+81.62 , -1928.51 , 0.81
+81.62 , -1857.66 , 0.27
+81.62 , -1786.80 , -0.24
+81.62 , -1715.94 , -0.70
+81.62 , -1645.08 , -1.13
+81.62 , -1574.23 , -1.51
+81.62 , -1503.37 , -1.85
+81.62 , -1432.51 , -2.16
+81.62 , -1361.66 , -2.42
+81.62 , -1290.80 , -2.64
+81.62 , -1219.94 , -2.82
+81.62 , -1149.08 , -2.96
+81.62 , -1078.23 , -3.06
+81.62 , -1007.37 , -3.12
+81.62 , -936.32 , -3.13
+81.62 , -864.94 , -3.12
+81.62 , -793.57 , -3.06
+81.62 , -720.65 , -2.97
+81.62 , -647.05 , -2.85
+81.62 , -573.45 , -2.68
+81.62 , -499.85 , -2.48
+81.62 , -426.24 , -2.24
+81.62 , -352.64 , -1.95
+81.62 , -279.04 , -1.63
+81.62 , -205.44 , -1.26
+81.62 , -131.84 , -0.86
+81.62 , -58.23 , -0.41
+81.62 , 15.37 , 0.14
+81.62 , 86.06 , 0.86
+81.62 , 156.74 , 1.62
+81.62 , 227.43 , 2.43
+81.62 , 298.12 , 3.28
+81.62 , 368.80 , 4.17
+81.62 , 439.49 , 5.10
+81.62 , 510.18 , 6.07
+81.62 , 580.87 , 7.09
+81.62 , 651.55 , 8.14
+81.62 , 722.24 , 9.24
+81.62 , 792.93 , 10.38
+81.62 , 863.62 , 11.56
+81.62 , 934.30 , 12.78
+81.62 , 1004.99 , 14.04
+81.62 , 1075.68 , 15.35
+81.62 , 1146.37 , 16.69
+81.62 , 1217.05 , 18.08
+81.62 , 1287.74 , 19.51
+81.62 , 1358.43 , 20.98
+81.62 , 1429.11 , 22.49
+81.62 , 1499.80 , 24.05
+81.62 , 1570.49 , 25.64
+81.62 , 1641.18 , 27.28
+81.62 , 1711.86 , 28.96
+81.62 , 1782.55 , 30.68
+81.62 , 1853.24 , 32.44
+81.62 , 1923.93 , 34.24
+81.62 , 1994.61 , 36.08
+81.62 , 2065.30 , 37.97
+81.62 , 2135.99 , 39.90
+81.62 , 2206.67 , 41.86
+81.62 , 2277.36 , 43.88
+122.43 , -2283.38 , -5.46
+122.43 , -2212.52 , -5.90
+122.43 , -2141.66 , -6.31
+122.43 , -2070.81 , -6.67
+122.43 , -1999.95 , -6.99
+122.43 , -1929.09 , -7.27
+122.43 , -1858.24 , -7.51
+122.43 , -1787.38 , -7.71
+122.43 , -1716.52 , -7.87
+122.43 , -1645.66 , -7.99
+122.43 , -1574.81 , -8.07
+122.43 , -1503.95 , -8.11
+122.43 , -1433.09 , -8.10
+122.43 , -1362.24 , -8.06
+122.43 , -1291.38 , -7.97
+122.43 , -1220.52 , -7.85
+122.43 , -1149.66 , -7.68
+122.43 , -1078.81 , -7.47
+122.43 , -1007.95 , -7.23
+122.43 , -936.74 , -6.94
+122.43 , -864.93 , -6.63
+122.43 , -793.12 , -6.27
+122.43 , -720.07 , -5.89
+122.43 , -646.47 , -5.47
+122.43 , -572.87 , -5.02
+122.43 , -499.27 , -4.52
+122.43 , -425.66 , -3.98
+122.43 , -352.06 , -3.40
+122.43 , -278.46 , -2.78
+122.43 , -204.86 , -2.12
+122.43 , -131.26 , -1.42
+122.43 , -57.65 , -0.68
+122.43 , 15.95 , 0.16
+122.43 , 86.64 , 1.18
+122.43 , 157.32 , 2.25
+122.43 , 228.01 , 3.36
+122.43 , 298.70 , 4.50
+122.43 , 369.38 , 5.69
+122.43 , 440.07 , 6.93
+122.43 , 510.76 , 8.20
+122.43 , 581.45 , 9.51
+122.43 , 652.13 , 10.87
+122.43 , 722.82 , 12.27
+122.43 , 793.51 , 13.70
+122.43 , 864.20 , 15.18
+122.43 , 934.88 , 16.71
+122.43 , 1005.57 , 18.27
+122.43 , 1076.26 , 19.87
+122.43 , 1146.95 , 21.52
+122.43 , 1217.63 , 23.21
+122.43 , 1288.32 , 24.94
+122.43 , 1359.01 , 26.71
+122.43 , 1429.69 , 28.52
+122.43 , 1500.38 , 30.38
+122.43 , 1571.07 , 32.27
+122.43 , 1641.76 , 34.21
+122.43 , 1712.44 , 36.19
+122.43 , 1783.13 , 38.20
+122.43 , 1853.82 , 40.27
+122.43 , 1924.51 , 42.37
+122.43 , 1995.19 , 44.51
+122.43 , 2065.88 , 46.70
+122.43 , 2136.57 , 48.93
+122.43 , 2207.25 , 51.20
+122.43 , 2277.94 , 53.51
+163.24 , -2283.96 , -15.06
+163.24 , -2213.10 , -15.20
+163.24 , -2142.24 , -15.30
+163.24 , -2071.39 , -15.36
+163.24 , -2000.53 , -15.37
+163.24 , -1929.67 , -15.35
+163.24 , -1858.82 , -15.28
+163.24 , -1787.96 , -15.18
+163.24 , -1717.10 , -15.03
+163.24 , -1646.24 , -14.84
+163.24 , -1575.39 , -14.62
+163.24 , -1504.53 , -14.35
+163.24 , -1433.67 , -14.04
+163.24 , -1362.82 , -13.69
+163.24 , -1291.96 , -13.30
+163.24 , -1221.10 , -12.87
+163.24 , -1150.24 , -12.40
+163.24 , -1079.39 , -11.88
+163.24 , -1008.53 , -11.33
+163.24 , -937.17 , -10.74
+163.24 , -864.92 , -10.13
+163.24 , -792.67 , -9.48
+163.24 , -719.49 , -8.81
+163.24 , -645.89 , -8.10
+163.24 , -572.29 , -7.35
+163.24 , -498.69 , -6.56
+163.24 , -425.08 , -5.72
+163.24 , -351.48 , -4.85
+163.24 , -277.88 , -3.94
+163.24 , -204.28 , -2.98
+163.24 , -130.68 , -1.99
+163.24 , -57.07 , -0.96
+163.24 , 16.53 , 0.18
+163.24 , 87.22 , 1.51
+163.24 , 157.90 , 2.87
+163.24 , 228.59 , 4.28
+163.24 , 299.28 , 5.73
+163.24 , 369.96 , 7.22
+163.24 , 440.65 , 8.75
+163.24 , 511.34 , 10.32
+163.24 , 582.03 , 11.94
+163.24 , 652.71 , 13.59
+163.24 , 723.40 , 15.29
+163.24 , 794.09 , 17.03
+163.24 , 864.78 , 18.81
+163.24 , 935.46 , 20.63
+163.24 , 1006.15 , 22.50
+163.24 , 1076.84 , 24.40
+163.24 , 1147.52 , 26.35
+163.24 , 1218.21 , 28.34
+163.24 , 1288.90 , 30.37
+163.24 , 1359.59 , 32.44
+163.24 , 1430.27 , 34.55
+163.24 , 1500.96 , 36.70
+163.24 , 1571.65 , 38.90
+163.24 , 1642.34 , 41.14
+163.24 , 1713.02 , 43.41
+163.24 , 1783.71 , 45.73
+163.24 , 1854.40 , 48.10
+163.24 , 1925.09 , 50.50
+163.24 , 1995.77 , 52.94
+163.24 , 2066.46 , 55.43
+163.24 , 2137.15 , 57.96
+163.24 , 2207.83 , 60.53
+163.24 , 2278.52 , 63.14
+204.04 , -2284.54 , -24.66
+204.04 , -2213.68 , -24.49
+204.04 , -2142.82 , -24.28
+204.04 , -2071.97 , -24.03
+204.04 , -2001.11 , -23.74
+204.04 , -1930.25 , -23.41
+204.04 , -1859.40 , -23.04
+204.04 , -1788.54 , -22.63
+204.04 , -1717.68 , -22.18
+204.04 , -1646.82 , -21.69
+204.04 , -1575.97 , -21.15
+204.04 , -1505.11 , -20.58
+204.04 , -1434.25 , -19.97
+204.04 , -1363.39 , -19.31
+204.04 , -1292.54 , -18.61
+204.04 , -1221.68 , -17.88
+204.04 , -1150.82 , -17.10
+204.04 , -1079.97 , -16.28
+204.04 , -1009.11 , -15.42
+204.04 , -937.59 , -14.54
+204.04 , -864.91 , -13.64
+204.04 , -792.23 , -12.70
+204.04 , -718.91 , -11.73
+204.04 , -645.31 , -10.72
+204.04 , -571.71 , -9.68
+204.04 , -498.11 , -8.59
+204.04 , -424.50 , -7.47
+204.04 , -350.90 , -6.30
+204.04 , -277.30 , -5.09
+204.04 , -203.70 , -3.85
+204.04 , -130.10 , -2.56
+204.04 , -56.49 , -1.23
+204.04 , 17.11 , 0.21
+204.04 , 87.79 , 1.83
+204.04 , 158.48 , 3.50
+204.04 , 229.17 , 5.20
+204.04 , 299.86 , 6.95
+204.04 , 370.54 , 8.74
+204.04 , 441.23 , 10.57
+204.04 , 511.92 , 12.45
+204.04 , 582.61 , 14.36
+204.04 , 653.29 , 16.32
+204.04 , 723.98 , 18.32
+204.04 , 794.67 , 20.35
+204.04 , 865.36 , 22.44
+204.04 , 936.04 , 24.56
+204.04 , 1006.73 , 26.72
+204.04 , 1077.42 , 28.93
+204.04 , 1148.10 , 31.17
+204.04 , 1218.79 , 33.46
+204.04 , 1289.48 , 35.79
+204.04 , 1360.17 , 38.16
+204.04 , 1430.85 , 40.57
+204.04 , 1501.54 , 43.03
+204.04 , 1572.23 , 45.52
+204.04 , 1642.92 , 48.06
+204.04 , 1713.60 , 50.64
+204.04 , 1784.29 , 53.26
+204.04 , 1854.98 , 55.92
+204.04 , 1925.67 , 58.63
+204.04 , 1996.35 , 61.37
+204.04 , 2067.04 , 64.16
+204.04 , 2137.73 , 66.99
+204.04 , 2208.41 , 69.85
+204.04 , 2279.10 , 72.77
+244.85 , -2285.12 , -34.24
+244.85 , -2214.26 , -33.77
+244.85 , -2143.40 , -33.26
+244.85 , -2072.55 , -32.70
+244.85 , -2001.69 , -32.11
+244.85 , -1930.83 , -31.47
+244.85 , -1859.98 , -30.80
+244.85 , -1789.12 , -30.08
+244.85 , -1718.26 , -29.32
+244.85 , -1647.40 , -28.52
+244.85 , -1576.55 , -27.68
+244.85 , -1505.69 , -26.80
+244.85 , -1434.83 , -25.88
+244.85 , -1363.97 , -24.92
+244.85 , -1293.12 , -23.92
+244.85 , -1222.26 , -22.88
+244.85 , -1151.40 , -21.80
+244.85 , -1080.55 , -20.67
+244.85 , -1009.69 , -19.51
+244.85 , -938.01 , -18.32
+244.85 , -864.90 , -17.14
+244.85 , -791.78 , -15.91
+244.85 , -718.33 , -14.65
+244.85 , -644.73 , -13.35
+244.85 , -571.13 , -12.01
+244.85 , -497.53 , -10.63
+244.85 , -423.92 , -9.21
+244.85 , -350.32 , -7.75
+244.85 , -276.72 , -6.25
+244.85 , -203.12 , -4.71
+244.85 , -129.52 , -3.13
+244.85 , -55.91 , -1.50
+244.85 , 17.69 , 0.23
+244.85 , 88.37 , 2.15
+244.85 , 159.06 , 4.12
+244.85 , 229.75 , 6.13
+244.85 , 300.44 , 8.18
+244.85 , 371.12 , 10.27
+244.85 , 441.81 , 12.40
+244.85 , 512.50 , 14.57
+244.85 , 583.19 , 16.79
+244.85 , 653.87 , 19.04
+244.85 , 724.56 , 21.34
+244.85 , 795.25 , 23.68
+244.85 , 865.94 , 26.06
+244.85 , 936.62 , 28.48
+244.85 , 1007.31 , 30.95
+244.85 , 1078.00 , 33.45
+244.85 , 1148.68 , 36.00
+244.85 , 1219.37 , 38.59
+244.85 , 1290.06 , 41.22
+244.85 , 1360.75 , 43.89
+244.85 , 1431.43 , 46.60
+244.85 , 1502.12 , 49.36
+244.85 , 1572.81 , 52.15
+244.85 , 1643.50 , 54.99
+244.85 , 1714.18 , 57.87
+244.85 , 1784.87 , 60.79
+244.85 , 1855.56 , 63.75
+244.85 , 1926.25 , 66.75
+244.85 , 1996.93 , 69.80
+244.85 , 2067.62 , 72.88
+244.85 , 2138.31 , 76.01
+244.85 , 2208.99 , 79.18
+244.85 , 2279.68 , 82.39
+285.67 , -2285.70 , -43.82
+285.67 , -2214.84 , -43.04
+285.67 , -2143.98 , -42.22
+285.67 , -2073.13 , -41.36
+285.67 , -2002.27 , -40.46
+285.67 , -1931.41 , -39.52
+285.67 , -1860.56 , -38.54
+285.67 , -1789.70 , -37.52
+285.67 , -1718.84 , -36.45
+285.67 , -1647.98 , -35.35
+285.67 , -1577.13 , -34.20
+285.67 , -1506.27 , -33.02
+285.67 , -1435.41 , -31.79
+285.67 , -1364.55 , -30.52
+285.67 , -1293.70 , -29.22
+285.67 , -1222.84 , -27.87
+285.67 , -1151.98 , -26.48
+285.67 , -1081.13 , -25.05
+285.67 , -1010.27 , -23.58
+285.67 , -938.43 , -22.10
+285.67 , -864.89 , -20.63
+285.67 , -791.34 , -19.12
+285.67 , -717.75 , -17.57
+285.67 , -644.15 , -15.98
+285.67 , -570.55 , -14.34
+285.67 , -496.95 , -12.67
+285.67 , -423.34 , -10.96
+285.67 , -349.74 , -9.20
+285.67 , -276.14 , -7.41
+285.67 , -202.54 , -5.57
+285.67 , -128.94 , -3.70
+285.67 , -55.33 , -1.78
+285.67 , 18.27 , 0.25
+285.67 , 88.95 , 2.48
+285.67 , 159.64 , 4.74
+285.67 , 230.33 , 7.05
+285.67 , 301.02 , 9.40
+285.67 , 371.70 , 11.79
+285.67 , 442.39 , 14.22
+285.67 , 513.08 , 16.69
+285.67 , 583.77 , 19.21
+285.67 , 654.45 , 21.77
+285.67 , 725.14 , 24.36
+285.67 , 795.83 , 27.00
+285.67 , 866.52 , 29.69
+285.67 , 937.20 , 32.41
+285.67 , 1007.89 , 35.17
+285.67 , 1078.58 , 37.98
+285.67 , 1149.26 , 40.82
+285.67 , 1219.95 , 43.71
+285.67 , 1290.64 , 46.64
+285.67 , 1361.33 , 49.61
+285.67 , 1432.01 , 52.63
+285.67 , 1502.70 , 55.68
+285.67 , 1573.39 , 58.78
+285.67 , 1644.08 , 61.91
+285.67 , 1714.76 , 65.09
+285.67 , 1785.45 , 68.32
+285.67 , 1856.14 , 71.58
+285.67 , 1926.82 , 74.88
+285.67 , 1997.51 , 78.23
+285.67 , 2068.20 , 81.61
+285.67 , 2138.89 , 85.04
+285.67 , 2209.57 , 88.51
+285.67 , 2280.26 , 92.02
+326.47 , -2286.28 , -53.39
+326.47 , -2215.42 , -52.30
+326.47 , -2144.56 , -51.18
+326.47 , -2073.71 , -50.01
+326.47 , -2002.85 , -48.81
+326.47 , -1931.99 , -47.56
+326.47 , -1861.14 , -46.27
+326.47 , -1790.28 , -44.94
+326.47 , -1719.42 , -43.57
+326.47 , -1648.56 , -42.17
+326.47 , -1577.71 , -40.71
+326.47 , -1506.85 , -39.22
+326.47 , -1435.99 , -37.69
+326.47 , -1365.13 , -36.12
+326.47 , -1294.28 , -34.51
+326.47 , -1223.42 , -32.85
+326.47 , -1152.55 , -31.16
+326.47 , -1081.31 , -29.44
+326.47 , -1010.08 , -27.67
+326.47 , -937.98 , -25.90
+326.47 , -864.38 , -24.14
+326.47 , -790.77 , -22.33
+326.47 , -717.17 , -20.49
+326.47 , -643.57 , -18.60
+326.47 , -569.97 , -16.68
+326.47 , -496.37 , -14.71
+326.47 , -422.76 , -12.70
+326.47 , -349.16 , -10.66
+326.47 , -275.56 , -8.57
+326.47 , -201.96 , -6.44
+326.47 , -128.36 , -4.27
+326.47 , -54.75 , -2.06
+326.47 , 18.85 , 0.27
+326.47 , 89.53 , 2.80
+326.47 , 160.22 , 5.36
+326.47 , 230.91 , 7.97
+326.47 , 301.60 , 10.62
+326.47 , 372.28 , 13.31
+326.47 , 442.97 , 16.04
+326.47 , 513.66 , 18.82
+326.47 , 584.35 , 21.63
+326.47 , 655.03 , 24.49
+326.47 , 725.72 , 27.39
+326.47 , 796.41 , 30.33
+326.47 , 867.09 , 33.31
+326.47 , 937.78 , 36.33
+326.47 , 1008.47 , 39.40
+326.47 , 1079.16 , 42.50
+326.47 , 1149.84 , 45.65
+326.47 , 1220.53 , 48.84
+326.47 , 1291.22 , 52.07
+326.47 , 1361.91 , 55.34
+326.47 , 1432.59 , 58.65
+326.47 , 1503.28 , 62.01
+326.47 , 1573.97 , 65.40
+326.47 , 1644.66 , 68.84
+326.47 , 1715.34 , 72.32
+326.47 , 1786.03 , 75.84
+326.47 , 1856.72 , 79.40
+326.47 , 1927.40 , 83.01
+326.47 , 1998.09 , 86.65
+326.47 , 2068.78 , 90.34
+326.47 , 2139.47 , 94.07
+326.47 , 2210.15 , 97.84
+326.47 , 2280.84 , 101.65
+367.28 , -2286.86 , -62.94
+367.28 , -2216.00 , -61.55
+367.28 , -2145.14 , -60.12
+367.28 , -2074.29 , -58.65
+367.28 , -2003.43 , -57.14
+367.28 , -1932.57 , -55.59
+367.28 , -1861.71 , -53.99
+367.28 , -1790.86 , -52.36
+367.28 , -1720.00 , -50.69
+367.28 , -1649.14 , -48.97
+367.28 , -1578.29 , -47.21
+367.28 , -1507.43 , -45.42
+367.28 , -1436.57 , -43.58
+367.28 , -1365.71 , -41.70
+367.28 , -1294.86 , -39.78
+367.28 , -1224.00 , -37.82
+367.28 , -1153.11 , -35.83
+367.28 , -1081.44 , -33.82
+367.28 , -1009.77 , -31.77
+367.28 , -937.40 , -29.70
+367.28 , -863.80 , -27.65
+367.28 , -790.19 , -25.55
+367.28 , -716.59 , -23.41
+367.28 , -642.99 , -21.23
+367.28 , -569.39 , -19.01
+367.28 , -495.79 , -16.75
+367.28 , -422.18 , -14.45
+367.28 , -348.58 , -12.11
+367.28 , -274.98 , -9.72
+367.28 , -201.38 , -7.30
+367.28 , -127.78 , -4.84
+367.28 , -54.17 , -2.33
+367.28 , 19.43 , 0.29
+367.28 , 90.11 , 3.12
+367.28 , 160.80 , 5.99
+367.28 , 231.49 , 8.89
+367.28 , 302.18 , 11.84
+367.28 , 372.86 , 14.83
+367.28 , 443.55 , 17.87
+367.28 , 514.24 , 20.94
+367.28 , 584.93 , 24.05
+367.28 , 655.61 , 27.21
+367.28 , 726.30 , 30.41
+367.28 , 796.99 , 33.65
+367.28 , 867.67 , 36.93
+367.28 , 938.36 , 40.25
+367.28 , 1009.05 , 43.62
+367.28 , 1079.74 , 47.03
+367.28 , 1150.42 , 50.47
+367.28 , 1221.11 , 53.96
+367.28 , 1291.80 , 57.49
+367.28 , 1362.49 , 61.06
+367.28 , 1433.17 , 64.68
+367.28 , 1503.86 , 68.33
+367.28 , 1574.55 , 72.03
+367.28 , 1645.24 , 75.77
+367.28 , 1715.92 , 79.55
+367.28 , 1786.61 , 83.37
+367.28 , 1857.30 , 87.23
+367.28 , 1927.98 , 91.13
+367.28 , 1998.67 , 95.08
+367.28 , 2069.36 , 99.07
+367.28 , 2140.05 , 103.10
+367.28 , 2210.73 , 107.16
+367.28 , 2281.42 , 111.28
+408.09 , -2287.44 , -72.49
+408.09 , -2216.58 , -70.79
+408.09 , -2145.72 , -69.06
+408.09 , -2074.87 , -67.28
+408.09 , -2004.01 , -65.47
+408.09 , -1933.15 , -63.61
+408.09 , -1862.29 , -61.71
+408.09 , -1791.44 , -59.77
+408.09 , -1720.58 , -57.79
+408.09 , -1649.72 , -55.77
+408.09 , -1578.87 , -53.71
+408.09 , -1508.01 , -51.61
+408.09 , -1437.15 , -49.46
+408.09 , -1366.29 , -47.28
+408.09 , -1295.44 , -45.05
+408.09 , -1224.58 , -42.79
+408.09 , -1153.68 , -40.48
+408.09 , -1081.57 , -38.19
+408.09 , -1009.47 , -35.86
+408.09 , -936.82 , -33.51
+408.09 , -863.22 , -31.16
+408.09 , -789.61 , -28.77
+408.09 , -716.01 , -26.33
+408.09 , -642.41 , -23.86
+408.09 , -568.81 , -21.35
+408.09 , -495.21 , -18.79
+408.09 , -421.60 , -16.20
+408.09 , -348.00 , -13.56
+408.09 , -274.40 , -10.88
+408.09 , -200.80 , -8.17
+408.09 , -127.20 , -5.41
+408.09 , -53.60 , -2.61
+408.09 , 20.01 , 0.31
+408.09 , 90.69 , 3.44
+408.09 , 161.38 , 6.61
+408.09 , 232.07 , 9.81
+408.09 , 302.76 , 13.06
+408.09 , 373.44 , 16.35
+408.09 , 444.13 , 19.69
+408.09 , 514.82 , 23.06
+408.09 , 585.51 , 26.48
+408.09 , 656.19 , 29.93
+408.09 , 726.88 , 33.43
+408.09 , 797.57 , 36.97
+408.09 , 868.25 , 40.56
+408.09 , 938.94 , 44.18
+408.09 , 1009.63 , 47.84
+408.09 , 1080.32 , 51.55
+408.09 , 1151.00 , 55.30
+408.09 , 1221.69 , 59.09
+408.09 , 1292.38 , 62.92
+408.09 , 1363.07 , 66.79
+408.09 , 1433.75 , 70.70
+408.09 , 1504.44 , 74.66
+408.09 , 1575.13 , 78.65
+408.09 , 1645.82 , 82.69
+408.09 , 1716.50 , 86.77
+408.09 , 1787.19 , 90.89
+408.09 , 1857.88 , 95.06
+408.09 , 1928.56 , 99.26
+408.09 , 1999.25 , 103.51
+408.09 , 2069.94 , 107.79
+408.09 , 2140.63 , 112.12
+408.09 , 2211.31 , 116.49
+408.09 , 2282.00 , 120.90
+448.90 , -2288.02 , -82.03
+448.90 , -2217.16 , -80.03
+448.90 , -2146.30 , -77.99
+448.90 , -2075.45 , -75.90
+448.90 , -2004.59 , -73.78
+448.90 , -1933.73 , -71.62
+448.90 , -1862.87 , -69.41
+448.90 , -1792.02 , -67.17
+448.90 , -1721.16 , -64.88
+448.90 , -1650.30 , -62.56
+448.90 , -1579.45 , -60.19
+448.90 , -1508.59 , -57.78
+448.90 , -1437.73 , -55.33
+448.90 , -1366.87 , -52.84
+448.90 , -1296.02 , -50.31
+448.90 , -1225.16 , -47.74
+448.90 , -1154.24 , -45.13
+448.90 , -1081.70 , -42.56
+448.90 , -1009.16 , -39.95
+448.90 , -936.24 , -37.31
+448.90 , -862.64 , -34.67
+448.90 , -789.03 , -31.98
+448.90 , -715.43 , -29.26
+448.90 , -641.83 , -26.49
+448.90 , -568.23 , -23.68
+448.90 , -494.63 , -20.83
+448.90 , -421.03 , -17.94
+448.90 , -347.42 , -15.01
+448.90 , -273.82 , -12.04
+448.90 , -200.22 , -9.03
+448.90 , -126.62 , -5.98
+448.90 , -53.02 , -2.89
+448.90 , 20.59 , 0.33
+448.90 , 91.27 , 3.76
+448.90 , 161.96 , 7.23
+448.90 , 232.65 , 10.73
+448.90 , 303.34 , 14.28
+448.90 , 374.02 , 17.88
+448.90 , 444.71 , 21.51
+448.90 , 515.40 , 25.18
+448.90 , 586.09 , 28.90
+448.90 , 656.77 , 32.66
+448.90 , 727.46 , 36.46
+448.90 , 798.15 , 40.30
+448.90 , 868.83 , 44.18
+448.90 , 939.52 , 48.10
+448.90 , 1010.21 , 52.07
+448.90 , 1080.90 , 56.07
+448.90 , 1151.58 , 60.12
+448.90 , 1222.27 , 64.21
+448.90 , 1292.96 , 68.34
+448.90 , 1363.65 , 72.51
+448.90 , 1434.33 , 76.73
+448.90 , 1505.02 , 80.98
+448.90 , 1575.71 , 85.28
+448.90 , 1646.39 , 89.62
+448.90 , 1717.08 , 94.00
+448.90 , 1787.77 , 98.42
+448.90 , 1858.46 , 102.88
+448.90 , 1929.14 , 107.38
+448.90 , 1999.83 , 111.93
+448.90 , 2070.52 , 116.52
+448.90 , 2141.21 , 121.15
+448.90 , 2211.89 , 125.82
+448.90 , 2282.58 , 130.53
+489.71 , -2288.60 , -91.56
+489.71 , -2217.74 , -89.25
+489.71 , -2146.88 , -86.90
+489.71 , -2076.03 , -84.52
+489.71 , -2005.17 , -82.09
+489.71 , -1934.31 , -79.62
+489.71 , -1863.45 , -77.11
+489.71 , -1792.60 , -74.56
+489.71 , -1721.74 , -71.97
+489.71 , -1650.88 , -69.33
+489.71 , -1580.03 , -66.66
+489.71 , -1509.17 , -63.95
+489.71 , -1438.31 , -61.19
+489.71 , -1367.45 , -58.40
+489.71 , -1296.60 , -55.56
+489.71 , -1225.74 , -52.69
+489.71 , -1154.81 , -49.78
+489.71 , -1081.83 , -46.93
+489.71 , -1008.86 , -44.04
+489.71 , -935.66 , -41.12
+489.71 , -862.06 , -38.18
+489.71 , -788.45 , -35.20
+489.71 , -714.85 , -32.18
+489.71 , -641.25 , -29.12
+489.71 , -567.65 , -26.02
+489.71 , -494.05 , -22.87
+489.71 , -420.45 , -19.69
+489.71 , -346.84 , -16.47
+489.71 , -273.24 , -13.20
+489.71 , -199.64 , -9.90
+489.71 , -126.04 , -6.55
+489.71 , -52.44 , -3.17
+489.71 , 21.17 , 0.35
+489.71 , 91.85 , 4.08
+489.71 , 162.54 , 7.85
+489.71 , 233.23 , 11.66
+489.71 , 303.92 , 15.51
+489.71 , 374.60 , 19.40
+489.71 , 445.29 , 23.33
+489.71 , 515.98 , 27.30
+489.71 , 586.67 , 31.32
+489.71 , 657.35 , 35.38
+489.71 , 728.04 , 39.48
+489.71 , 798.73 , 43.62
+489.71 , 869.41 , 47.80
+489.71 , 940.10 , 52.02
+489.71 , 1010.79 , 56.29
+489.71 , 1081.48 , 60.60
+489.71 , 1152.16 , 64.94
+489.71 , 1222.85 , 69.33
+489.71 , 1293.54 , 73.76
+489.71 , 1364.23 , 78.24
+489.71 , 1434.91 , 82.75
+489.71 , 1505.60 , 87.31
+489.71 , 1576.29 , 91.90
+489.71 , 1646.97 , 96.54
+489.71 , 1717.66 , 101.22
+489.71 , 1788.35 , 105.94
+489.71 , 1859.04 , 110.71
+489.71 , 1929.72 , 115.51
+489.71 , 2000.41 , 120.36
+489.71 , 2071.10 , 125.24
+489.71 , 2141.79 , 130.17
+489.71 , 2212.47 , 135.14
+489.71 , 2283.16 , 140.16
+816.18 , -2293.24 , -167.46
+816.18 , -2222.38 , -162.70
+816.18 , -2151.52 , -157.91
+816.18 , -2080.66 , -153.08
+816.18 , -2009.81 , -148.21
+816.18 , -1938.95 , -143.29
+816.18 , -1868.09 , -138.34
+816.18 , -1797.24 , -133.34
+816.18 , -1726.38 , -128.30
+816.18 , -1655.52 , -123.23
+816.18 , -1584.66 , -118.11
+816.18 , -1513.77 , -112.95
+816.18 , -1442.82 , -107.76
+816.18 , -1371.86 , -102.53
+816.18 , -1299.03 , -97.42
+816.18 , -1225.43 , -92.33
+816.18 , -1151.83 , -87.20
+816.18 , -1078.22 , -82.04
+816.18 , -1004.62 , -76.83
+816.18 , -931.02 , -71.58
+816.18 , -857.42 , -66.29
+816.18 , -783.82 , -60.96
+816.18 , -710.21 , -55.59
+816.18 , -636.61 , -50.17
+816.18 , -563.01 , -44.72
+816.18 , -489.41 , -39.23
+816.18 , -415.81 , -33.69
+816.18 , -342.20 , -28.12
+816.18 , -268.60 , -22.50
+816.18 , -195.00 , -16.85
+816.18 , -121.40 , -11.15
+816.18 , -47.80 , -5.41
+816.18 , 25.81 , 0.50
+816.18 , 96.49 , 6.62
+816.18 , 167.18 , 12.79
+816.18 , 237.87 , 19.00
+816.18 , 308.55 , 25.25
+816.18 , 379.24 , 31.55
+816.18 , 449.93 , 37.88
+816.18 , 520.62 , 44.26
+816.18 , 591.30 , 50.67
+816.18 , 661.99 , 57.13
+816.18 , 732.68 , 63.63
+816.18 , 803.37 , 70.18
+816.18 , 874.05 , 76.76
+816.18 , 944.74 , 83.38
+816.18 , 1015.43 , 90.05
+816.18 , 1086.11 , 96.76
+816.18 , 1156.80 , 103.51
+816.18 , 1227.49 , 110.30
+816.18 , 1298.18 , 117.13
+816.18 , 1368.86 , 124.01
+816.18 , 1439.55 , 130.92
+816.18 , 1510.24 , 137.88
+816.18 , 1580.93 , 144.88
+816.18 , 1651.61 , 151.92
+816.18 , 1722.30 , 159.00
+816.18 , 1792.99 , 166.12
+816.18 , 1863.68 , 173.29
+816.18 , 1934.36 , 180.50
+816.18 , 2005.05 , 187.74
+816.18 , 2075.74 , 195.03
+816.18 , 2146.42 , 202.36
+816.18 , 2217.11 , 209.74
+816.18 , 2287.80 , 217.15
+1020.26 , -2296.14 , -214.59
+1020.26 , -2225.28 , -208.31
+1020.26 , -2154.42 , -201.99
+1020.26 , -2083.56 , -195.63
+1020.26 , -2012.71 , -189.23
+1020.26 , -1941.85 , -182.78
+1020.26 , -1870.99 , -176.30
+1020.26 , -1800.14 , -169.78
+1020.26 , -1729.28 , -163.21
+1020.26 , -1658.42 , -156.60
+1020.26 , -1587.56 , -149.96
+1020.26 , -1515.84 , -143.36
+1020.26 , -1442.72 , -136.88
+1020.26 , -1369.59 , -130.35
+1020.26 , -1296.13 , -123.82
+1020.26 , -1222.53 , -117.27
+1020.26 , -1148.93 , -110.67
+1020.26 , -1075.32 , -104.03
+1020.26 , -1001.72 , -97.35
+1020.26 , -928.12 , -90.64
+1020.26 , -854.52 , -83.88
+1020.26 , -780.92 , -77.07
+1020.26 , -707.31 , -70.23
+1020.26 , -633.71 , -63.35
+1020.26 , -560.11 , -56.43
+1020.26 , -486.51 , -49.47
+1020.26 , -412.91 , -42.46
+1020.26 , -339.30 , -35.42
+1020.26 , -265.70 , -28.33
+1020.26 , -192.10 , -21.21
+1020.26 , -118.50 , -14.04
+1020.26 , -44.90 , -6.83
+1020.26 , 28.70 , 0.57
+1020.26 , 99.39 , 8.20
+1020.26 , 170.08 , 15.87
+1020.26 , 240.77 , 23.58
+1020.26 , 311.45 , 31.33
+1020.26 , 382.14 , 39.12
+1020.26 , 452.83 , 46.96
+1020.26 , 523.52 , 54.84
+1020.26 , 594.20 , 62.76
+1020.26 , 664.89 , 70.71
+1020.26 , 735.58 , 78.72
+1020.26 , 806.27 , 86.76
+1020.26 , 876.95 , 94.84
+1020.26 , 947.64 , 102.97
+1020.26 , 1018.33 , 111.14
+1020.26 , 1089.01 , 119.35
+1020.26 , 1159.70 , 127.60
+1020.26 , 1230.39 , 135.89
+1020.26 , 1301.08 , 144.22
+1020.26 , 1371.76 , 152.60
+1020.26 , 1442.45 , 161.01
+1020.26 , 1513.14 , 169.47
+1020.26 , 1583.83 , 177.97
+1020.26 , 1654.51 , 186.52
+1020.26 , 1725.20 , 195.10
+1020.26 , 1795.89 , 203.72
+1020.26 , 1866.58 , 212.39
+1020.26 , 1937.26 , 221.10
+1020.26 , 2007.95 , 229.84
+1020.26 , 2078.64 , 238.62
+1020.26 , 2149.32 , 247.46
+1020.26 , 2220.01 , 256.35
+1020.26 , 2290.70 , 265.26
+1224.27 , -2299.03 , -261.49
+1224.27 , -2228.18 , -253.69
+1224.27 , -2157.32 , -245.84
+1224.27 , -2086.46 , -237.94
+1224.27 , -2015.61 , -230.01
+1224.27 , -1944.75 , -222.04
+1224.27 , -1873.89 , -214.03
+1224.27 , -1803.03 , -205.97
+1224.27 , -1732.08 , -197.89
+1224.27 , -1659.54 , -189.98
+1224.27 , -1586.99 , -182.02
+1224.27 , -1514.04 , -174.07
+1224.27 , -1440.44 , -166.17
+1224.27 , -1366.83 , -158.22
+1224.27 , -1293.23 , -150.24
+1224.27 , -1219.63 , -142.21
+1224.27 , -1146.03 , -134.15
+1224.27 , -1072.43 , -126.04
+1224.27 , -998.82 , -117.89
+1224.27 , -925.22 , -109.70
+1224.27 , -851.62 , -101.48
+1224.27 , -778.02 , -93.21
+1224.27 , -704.42 , -84.89
+1224.27 , -630.81 , -76.54
+1224.27 , -557.21 , -68.15
+1224.27 , -483.61 , -59.72
+1224.27 , -410.01 , -51.25
+1224.27 , -336.41 , -42.73
+1224.27 , -262.80 , -34.18
+1224.27 , -189.20 , -25.58
+1224.27 , -115.60 , -16.95
+1224.27 , -42.00 , -8.27
+1224.27 , 31.60 , 0.63
+1224.27 , 102.29 , 9.76
+1224.27 , 172.98 , 18.93
+1224.27 , 243.67 , 28.14
+1224.27 , 314.35 , 37.39
+1224.27 , 385.04 , 46.69
+1224.27 , 455.73 , 56.03
+1224.27 , 526.41 , 65.41
+1224.27 , 597.10 , 74.82
+1224.27 , 667.79 , 84.28
+1224.27 , 738.48 , 93.79
+1224.27 , 809.16 , 103.33
+1224.27 , 879.85 , 112.92
+1224.27 , 950.54 , 122.54
+1224.27 , 1021.23 , 132.21
+1224.27 , 1091.91 , 141.92
+1224.27 , 1162.60 , 151.67
+1224.27 , 1233.29 , 161.47
+1224.27 , 1303.98 , 171.30
+1224.27 , 1374.66 , 181.18
+1224.27 , 1445.35 , 191.10
+1224.27 , 1516.04 , 201.06
+1224.27 , 1586.72 , 211.06
+1224.27 , 1657.41 , 221.10
+1224.27 , 1728.10 , 231.18
+1224.27 , 1798.79 , 241.30
+1224.27 , 1869.47 , 251.46
+1224.27 , 1940.16 , 261.68
+1224.27 , 2010.85 , 271.94
+1224.27 , 2081.54 , 282.22
+1224.27 , 2152.22 , 292.56
+1224.27 , 2222.91 , 302.94
+1224.27 , 2293.60 , 313.34
+1428.29 , -2301.93 , -308.14
+1428.29 , -2231.08 , -298.81
+1428.29 , -2160.22 , -289.44
+1428.29 , -2089.36 , -280.01
+1428.29 , -2018.50 , -270.56
+1428.29 , -1947.65 , -261.06
+1428.29 , -1875.98 , -251.64
+1428.29 , -1804.01 , -242.23
+1428.29 , -1731.94 , -232.79
+1428.29 , -1658.34 , -223.54
+1428.29 , -1584.74 , -214.25
+1428.29 , -1511.14 , -204.91
+1428.29 , -1437.54 , -195.54
+1428.29 , -1363.93 , -186.13
+1428.29 , -1290.33 , -176.67
+1428.29 , -1216.73 , -167.18
+1428.29 , -1143.13 , -157.64
+1428.29 , -1069.53 , -148.06
+1428.29 , -995.93 , -138.45
+1428.29 , -922.32 , -128.79
+1428.29 , -848.72 , -119.09
+1428.29 , -775.12 , -109.35
+1428.29 , -701.52 , -99.57
+1428.29 , -627.92 , -89.75
+1428.29 , -554.31 , -79.89
+1428.29 , -480.71 , -69.99
+1428.29 , -407.11 , -60.04
+1428.29 , -333.51 , -50.06
+1428.29 , -259.91 , -40.03
+1428.29 , -186.30 , -29.97
+1428.29 , -112.70 , -19.86
+1428.29 , -39.10 , -9.72
+1428.29 , 34.50 , 0.68
+1428.29 , 105.19 , 11.31
+1428.29 , 175.88 , 21.98
+1428.29 , 246.56 , 32.69
+1428.29 , 317.25 , 43.45
+1428.29 , 387.94 , 54.24
+1428.29 , 458.63 , 65.08
+1428.29 , 529.31 , 75.96
+1428.29 , 600.00 , 86.88
+1428.29 , 670.69 , 97.84
+1428.29 , 741.38 , 108.85
+1428.29 , 812.06 , 119.89
+1428.29 , 882.75 , 130.98
+1428.29 , 953.44 , 142.11
+1428.29 , 1024.12 , 153.28
+1428.29 , 1094.81 , 164.49
+1428.29 , 1165.50 , 175.74
+1428.29 , 1236.19 , 187.04
+1428.29 , 1306.87 , 198.37
+1428.29 , 1377.56 , 209.75
+1428.29 , 1448.25 , 221.17
+1428.29 , 1518.94 , 232.63
+1428.29 , 1589.62 , 244.12
+1428.29 , 1660.31 , 255.68
+1428.29 , 1731.00 , 267.25
+1428.29 , 1801.69 , 278.88
+1428.29 , 1872.37 , 290.54
+1428.29 , 1943.06 , 302.25
+1428.29 , 2013.75 , 314.01
+1428.29 , 2084.43 , 325.79
+1428.29 , 2155.12 , 337.65
+1428.29 , 2225.81 , 349.50
+1428.29 , 2296.50 , 361.43
+1632.39 , -2304.83 , -354.58
+1632.39 , -2233.98 , -343.72
+1632.39 , -2163.12 , -332.81
+1632.39 , -2092.05 , -321.90
+1632.39 , -2020.65 , -311.01
+1632.39 , -1949.25 , -300.07
+1632.39 , -1876.25 , -289.36
+1632.39 , -1802.65 , -278.73
+1632.39 , -1729.04 , -268.05
+1632.39 , -1655.44 , -257.32
+1632.39 , -1581.84 , -246.57
+1632.39 , -1508.24 , -235.77
+1632.39 , -1434.64 , -224.92
+1632.39 , -1361.03 , -214.04
+1632.39 , -1287.43 , -203.12
+1632.39 , -1213.83 , -192.15
+1632.39 , -1140.23 , -181.15
+1632.39 , -1066.63 , -170.10
+1632.39 , -993.03 , -159.01
+1632.39 , -919.42 , -147.89
+1632.39 , -845.82 , -136.72
+1632.39 , -772.22 , -125.51
+1632.39 , -698.62 , -114.26
+1632.39 , -625.02 , -102.97
+1632.39 , -551.41 , -91.64
+1632.39 , -477.81 , -80.27
+1632.39 , -404.21 , -68.85
+1632.39 , -330.61 , -57.40
+1632.39 , -257.01 , -45.91
+1632.39 , -183.40 , -34.37
+1632.39 , -109.80 , -22.80
+1632.39 , -36.20 , -11.18
+1632.39 , 37.40 , 0.72
+1632.39 , 108.09 , 12.85
+1632.39 , 178.78 , 25.02
+1632.39 , 249.46 , 37.24
+1632.39 , 320.15 , 49.49
+1632.39 , 390.84 , 61.79
+1632.39 , 461.53 , 74.13
+1632.39 , 532.21 , 86.51
+1632.39 , 602.90 , 98.93
+1632.39 , 673.59 , 111.39
+1632.39 , 744.28 , 123.90
+1632.39 , 814.96 , 136.44
+1632.39 , 885.65 , 149.03
+1632.39 , 956.34 , 161.66
+1632.39 , 1027.02 , 174.33
+1632.39 , 1097.71 , 187.04
+1632.39 , 1168.40 , 199.80
+1632.39 , 1239.09 , 212.59
+1632.39 , 1309.77 , 225.43
+1632.39 , 1380.46 , 238.30
+1632.39 , 1451.15 , 251.23
+1632.39 , 1521.84 , 264.20
+1632.39 , 1592.52 , 277.19
+1632.39 , 1663.21 , 290.22
+1632.39 , 1733.90 , 303.31
+1632.39 , 1804.59 , 316.44
+1632.39 , 1875.27 , 329.62
+1632.39 , 1945.96 , 342.83
+1632.39 , 2016.65 , 356.08
+1632.39 , 2087.33 , 369.36
+1632.39 , 2158.02 , 382.71
+1632.39 , 2228.71 , 396.09
+1632.39 , 2299.40 , 409.51
+1836.41 , -2307.73 , -400.77
+1836.41 , -2236.88 , -388.38
+1836.41 , -2166.02 , -375.94
+1836.41 , -2094.08 , -363.69
+1836.41 , -2020.51 , -351.68
+1836.41 , -1946.94 , -339.67
+1836.41 , -1873.35 , -327.59
+1836.41 , -1799.75 , -315.49
+1836.41 , -1726.15 , -303.34
+1836.41 , -1652.54 , -291.14
+1836.41 , -1578.94 , -278.91
+1836.41 , -1505.34 , -266.64
+1836.41 , -1431.74 , -254.32
+1836.41 , -1358.14 , -241.97
+1836.41 , -1284.53 , -229.57
+1836.41 , -1210.93 , -217.14
+1836.41 , -1137.33 , -204.67
+1836.41 , -1063.73 , -192.15
+1836.41 , -990.13 , -179.59
+1836.41 , -916.52 , -167.00
+1836.41 , -842.92 , -154.36
+1836.41 , -769.32 , -141.68
+1836.41 , -695.72 , -128.96
+1836.41 , -622.12 , -116.20
+1836.41 , -548.51 , -103.40
+1836.41 , -474.91 , -90.56
+1836.41 , -401.31 , -77.68
+1836.41 , -327.71 , -64.76
+1836.41 , -254.11 , -51.79
+1836.41 , -180.50 , -38.79
+1836.41 , -106.90 , -25.74
+1836.41 , -33.30 , -12.66
+1836.41 , 40.30 , 0.75
+1836.41 , 110.99 , 14.38
+1836.41 , 181.68 , 28.05
+1836.41 , 252.36 , 41.77
+1836.41 , 323.05 , 55.52
+1836.41 , 393.74 , 69.32
+1836.41 , 464.42 , 83.16
+1836.41 , 535.11 , 97.04
+1836.41 , 605.80 , 110.96
+1836.41 , 676.49 , 124.93
+1836.41 , 747.17 , 138.93
+1836.41 , 817.86 , 152.98
+1836.41 , 888.55 , 167.07
+1836.41 , 959.24 , 181.20
+1836.41 , 1029.92 , 195.37
+1836.41 , 1100.61 , 209.58
+1836.41 , 1171.30 , 223.84
+1836.41 , 1241.99 , 238.14
+1836.41 , 1312.67 , 252.48
+1836.41 , 1383.36 , 266.85
+1836.41 , 1454.05 , 281.28
+1836.41 , 1524.73 , 295.74
+1836.41 , 1595.42 , 310.23
+1836.41 , 1666.11 , 324.78
+1836.41 , 1736.80 , 339.37
+1836.41 , 1807.48 , 354.00
+1836.41 , 1878.17 , 368.67
+1836.41 , 1948.86 , 383.38
+1836.41 , 2019.55 , 398.13
+1836.41 , 2090.23 , 412.92
+1836.41 , 2160.92 , 427.77
+1836.41 , 2231.61 , 442.64
+1836.41 , 2302.30 , 457.56
+2040.43 , -2310.48 , -446.77
+2040.43 , -2237.48 , -433.31
+2040.43 , -2164.49 , -419.80
+2040.43 , -2091.26 , -406.29
+2040.43 , -2017.65 , -392.84
+2040.43 , -1944.05 , -379.34
+2040.43 , -1870.45 , -365.82
+2040.43 , -1796.85 , -352.24
+2040.43 , -1723.25 , -338.62
+2040.43 , -1649.65 , -324.95
+2040.43 , -1576.04 , -311.26
+2040.43 , -1502.44 , -297.51
+2040.43 , -1428.84 , -283.72
+2040.43 , -1355.24 , -269.91
+2040.43 , -1281.64 , -256.04
+2040.43 , -1208.03 , -242.14
+2040.43 , -1134.43 , -228.20
+2040.43 , -1060.83 , -214.21
+2040.43 , -987.23 , -200.19
+2040.43 , -913.63 , -186.12
+2040.43 , -840.02 , -172.01
+2040.43 , -766.42 , -157.86
+2040.43 , -692.82 , -143.68
+2040.43 , -619.22 , -129.45
+2040.43 , -545.62 , -115.18
+2040.43 , -472.01 , -100.87
+2040.43 , -398.41 , -86.51
+2040.43 , -324.81 , -72.12
+2040.43 , -251.21 , -57.69
+2040.43 , -177.61 , -43.22
+2040.43 , -104.00 , -28.70
+2040.43 , -30.40 , -14.15
+2040.43 , 43.20 , 0.76
+2040.43 , 113.89 , 15.90
+2040.43 , 184.57 , 31.07
+2040.43 , 255.26 , 46.29
+2040.43 , 325.95 , 61.54
+2040.43 , 396.64 , 76.84
+2040.43 , 467.32 , 92.18
+2040.43 , 538.01 , 107.56
+2040.43 , 608.70 , 122.99
+2040.43 , 679.39 , 138.45
+2040.43 , 750.07 , 153.96
+2040.43 , 820.76 , 169.51
+2040.43 , 891.45 , 185.10
+2040.43 , 962.13 , 200.73
+2040.43 , 1032.82 , 216.40
+2040.43 , 1103.51 , 232.13
+2040.43 , 1174.20 , 247.87
+2040.43 , 1244.88 , 263.68
+2040.43 , 1315.57 , 279.51
+2040.43 , 1386.26 , 295.40
+2040.43 , 1456.95 , 311.30
+2040.43 , 1527.63 , 327.26
+2040.43 , 1598.32 , 343.27
+2040.43 , 1669.01 , 359.32
+2040.43 , 1739.70 , 375.42
+2040.43 , 1810.38 , 391.55
+2040.43 , 1881.07 , 407.70
+2040.43 , 1951.76 , 423.92
+2040.43 , 2022.44 , 440.17
+2040.43 , 2093.13 , 456.46
+2040.43 , 2163.82 , 472.81
+2040.43 , 2234.51 , 489.17
+2040.43 , 2305.19 , 505.61
+2244.53 , -2309.16 , -493.49
+2244.53 , -2235.56 , -478.69
+2244.53 , -2161.96 , -463.84
+2244.53 , -2088.36 , -448.96
+2244.53 , -2014.75 , -434.04
+2244.53 , -1941.15 , -419.07
+2244.53 , -1867.55 , -404.05
+2244.53 , -1793.95 , -389.00
+2244.53 , -1720.35 , -373.91
+2244.53 , -1646.75 , -358.79
+2244.53 , -1573.14 , -343.63
+2244.53 , -1499.54 , -328.41
+2244.53 , -1425.94 , -313.15
+2244.53 , -1352.34 , -297.87
+2244.53 , -1278.74 , -282.53
+2244.53 , -1205.13 , -267.17
+2244.53 , -1131.53 , -251.74
+2244.53 , -1057.93 , -236.29
+2244.53 , -984.33 , -220.79
+2244.53 , -910.73 , -205.26
+2244.53 , -837.12 , -189.68
+2244.53 , -763.52 , -174.06
+2244.53 , -689.92 , -158.41
+2244.53 , -616.32 , -142.71
+2244.53 , -542.72 , -126.97
+2244.53 , -469.11 , -111.19
+2244.53 , -395.51 , -95.37
+2244.53 , -321.91 , -79.50
+2244.53 , -248.31 , -63.60
+2244.53 , -174.71 , -47.66
+2244.53 , -101.10 , -31.68
+2244.53 , -27.50 , -15.65
+2244.53 , 46.10 , 0.77
+2244.53 , 116.79 , 17.40
+2244.53 , 187.47 , 34.07
+2244.53 , 258.16 , 50.79
+2244.53 , 328.85 , 67.55
+2244.53 , 399.54 , 84.35
+2244.53 , 470.22 , 101.19
+2244.53 , 540.91 , 118.08
+2244.53 , 611.60 , 135.00
+2244.53 , 682.29 , 151.96
+2244.53 , 752.97 , 168.97
+2244.53 , 823.66 , 186.02
+2244.53 , 894.35 , 203.11
+2244.53 , 965.03 , 220.24
+2244.53 , 1035.72 , 237.43
+2244.53 , 1106.41 , 254.64
+2244.53 , 1177.10 , 271.90
+2244.53 , 1247.78 , 289.18
+2244.53 , 1318.47 , 306.54
+2244.53 , 1389.16 , 323.92
+2244.53 , 1459.85 , 341.32
+2244.53 , 1530.53 , 358.80
+2244.53 , 1601.22 , 376.30
+2244.53 , 1671.91 , 393.85
+2244.53 , 1742.60 , 411.45
+2244.53 , 1813.28 , 429.07
+2244.53 , 1883.97 , 446.74
+2244.53 , 1954.66 , 464.46
+2244.53 , 2025.34 , 482.20
+2244.53 , 2096.03 , 500.00
+2244.53 , 2166.72 , 517.84
+2244.53 , 2237.41 , 535.73
+2244.53 , 2308.09 , 553.64
+2448.55 , -2306.26 , -540.58
+2448.55 , -2232.66 , -524.30
+2448.55 , -2159.06 , -507.98
+2448.55 , -2085.46 , -491.63
+2448.55 , -2011.86 , -475.22
+2448.55 , -1938.25 , -458.80
+2448.55 , -1864.65 , -442.31
+2448.55 , -1791.05 , -425.79
+2448.55 , -1717.45 , -409.23
+2448.55 , -1643.85 , -392.64
+2448.55 , -1570.24 , -376.00
+2448.55 , -1496.64 , -359.32
+2448.55 , -1423.04 , -342.61
+2448.55 , -1349.44 , -325.83
+2448.55 , -1275.84 , -309.04
+2448.55 , -1202.23 , -292.19
+2448.55 , -1128.63 , -275.31
+2448.55 , -1055.03 , -258.38
+2448.55 , -981.43 , -241.42
+2448.55 , -907.83 , -224.41
+2448.55 , -834.22 , -207.36
+2448.55 , -760.62 , -190.28
+2448.55 , -687.02 , -173.15
+2448.55 , -613.42 , -155.98
+2448.55 , -539.82 , -138.77
+2448.55 , -466.22 , -121.52
+2448.55 , -392.61 , -104.23
+2448.55 , -319.01 , -86.90
+2448.55 , -245.41 , -69.53
+2448.55 , -171.81 , -52.12
+2448.55 , -98.21 , -34.66
+2448.55 , -24.60 , -17.17
+2448.55 , 49.00 , 0.76
+2448.55 , 119.69 , 18.89
+2448.55 , 190.37 , 37.07
+2448.55 , 261.06 , 55.29
+2448.55 , 331.75 , 73.55
+2448.55 , 402.44 , 91.85
+2448.55 , 473.12 , 110.19
+2448.55 , 543.81 , 128.57
+2448.55 , 614.50 , 147.00
+2448.55 , 685.18 , 165.47
+2448.55 , 755.87 , 183.98
+2448.55 , 826.56 , 202.53
+2448.55 , 897.25 , 221.12
+2448.55 , 967.93 , 239.76
+2448.55 , 1038.62 , 258.42
+2448.55 , 1109.31 , 277.15
+2448.55 , 1180.00 , 295.90
+2448.55 , 1250.68 , 314.71
+2448.55 , 1321.37 , 333.54
+2448.55 , 1392.06 , 352.41
+2448.55 , 1462.74 , 371.34
+2448.55 , 1533.43 , 390.31
+2448.55 , 1604.12 , 409.31
+2448.55 , 1674.81 , 428.36
+2448.55 , 1745.49 , 447.45
+2448.55 , 1816.18 , 466.59
+2448.55 , 1886.87 , 485.76
+2448.55 , 1957.56 , 504.98
+2448.55 , 2028.24 , 524.22
+2448.55 , 2098.93 , 543.53
+2448.55 , 2169.62 , 562.86
+2448.55 , 2240.31 , 582.25
+2448.55 , 2310.99 , 601.66
+2652.56 , -2303.37 , -587.66
+2652.56 , -2229.76 , -569.92
+2652.56 , -2156.16 , -552.13
+2652.56 , -2082.56 , -534.31
+2652.56 , -2008.96 , -516.44
+2652.56 , -1935.36 , -498.53
+2652.56 , -1861.75 , -480.59
+2652.56 , -1788.15 , -462.60
+2652.56 , -1714.55 , -444.57
+2652.56 , -1640.95 , -426.51
+2652.56 , -1567.35 , -408.40
+2652.56 , -1493.74 , -390.25
+2652.56 , -1420.14 , -372.04
+2652.56 , -1346.54 , -353.81
+2652.56 , -1272.94 , -335.54
+2652.56 , -1199.34 , -317.24
+2652.56 , -1125.73 , -298.89
+2652.56 , -1052.13 , -280.49
+2652.56 , -978.53 , -262.04
+2652.56 , -904.93 , -243.58
+2652.56 , -831.33 , -225.06
+2652.56 , -757.72 , -206.50
+2652.56 , -684.12 , -187.91
+2652.56 , -610.52 , -169.27
+2652.56 , -536.92 , -150.59
+2652.56 , -463.32 , -131.87
+2652.56 , -389.71 , -113.11
+2652.56 , -316.11 , -94.31
+2652.56 , -242.51 , -75.47
+2652.56 , -168.91 , -56.59
+2652.56 , -95.31 , -37.66
+2652.56 , -21.70 , -18.70
+2652.56 , 51.90 , 0.74
+2652.56 , 122.58 , 20.38
+2652.56 , 193.27 , 40.05
+2652.56 , 263.96 , 59.77
+2652.56 , 334.65 , 79.53
+2652.56 , 405.33 , 99.34
+2652.56 , 476.02 , 119.18
+2652.56 , 546.71 , 139.06
+2652.56 , 617.40 , 158.99
+2652.56 , 688.08 , 178.96
+2652.56 , 758.77 , 198.97
+2652.56 , 829.46 , 219.02
+2652.56 , 900.15 , 239.11
+2652.56 , 970.83 , 259.25
+2652.56 , 1041.52 , 279.43
+2652.56 , 1112.21 , 299.63
+2652.56 , 1182.89 , 319.91
+2652.56 , 1253.58 , 340.21
+2652.56 , 1324.27 , 360.53
+2652.56 , 1394.96 , 380.93
+2652.56 , 1465.64 , 401.35
+2652.56 , 1536.33 , 421.82
+2652.56 , 1607.02 , 442.31
+2652.56 , 1677.71 , 462.86
+2652.56 , 1748.39 , 483.45
+2652.56 , 1819.08 , 504.09
+2652.56 , 1889.77 , 524.78
+2652.56 , 1960.45 , 545.49
+2652.56 , 2031.14 , 566.22
+2652.56 , 2101.83 , 587.03
+2652.56 , 2172.52 , 607.87
+2652.56 , 2243.20 , 628.75
+2652.56 , 2313.89 , 649.68
+2856.67 , -2300.47 , -634.75
+2856.67 , -2226.86 , -615.54
+2856.67 , -2153.26 , -596.30
+2856.67 , -2079.66 , -576.99
+2856.67 , -2006.06 , -557.65
+2856.67 , -1932.46 , -538.29
+2856.67 , -1858.85 , -518.88
+2856.67 , -1785.25 , -499.42
+2856.67 , -1711.65 , -479.92
+2856.67 , -1638.05 , -460.39
+2856.67 , -1564.45 , -440.81
+2856.67 , -1490.84 , -421.18
+2856.67 , -1417.24 , -401.53
+2856.67 , -1343.64 , -381.80
+2856.67 , -1270.04 , -362.08
+2856.67 , -1196.44 , -342.28
+2856.67 , -1122.83 , -322.46
+2856.67 , -1049.23 , -302.59
+2856.67 , -975.63 , -282.70
+2856.67 , -902.03 , -262.76
+2856.67 , -828.43 , -242.77
+2856.67 , -754.82 , -222.75
+2856.67 , -681.22 , -202.68
+2856.67 , -607.62 , -182.57
+2856.67 , -534.02 , -162.42
+2856.67 , -460.42 , -142.23
+2856.67 , -386.81 , -122.00
+2856.67 , -313.21 , -101.73
+2856.67 , -239.61 , -81.42
+2856.67 , -166.01 , -61.07
+2856.67 , -92.41 , -40.68
+2856.67 , -18.80 , -20.25
+2856.67 , 54.80 , 0.71
+2856.67 , 125.48 , 21.85
+2856.67 , 196.17 , 43.02
+2856.67 , 266.86 , 64.24
+2856.67 , 337.55 , 85.50
+2856.67 , 408.23 , 106.81
+2856.67 , 478.92 , 128.15
+2856.67 , 549.61 , 149.54
+2856.67 , 620.30 , 170.97
+2856.67 , 690.98 , 192.44
+2856.67 , 761.67 , 213.95
+2856.67 , 832.36 , 235.50
+2856.67 , 903.05 , 257.10
+2856.67 , 973.73 , 278.73
+2856.67 , 1044.42 , 300.41
+2856.67 , 1115.11 , 322.13
+2856.67 , 1185.79 , 343.88
+2856.67 , 1256.48 , 365.68
+2856.67 , 1327.17 , 387.52
+2856.67 , 1397.86 , 409.42
+2856.67 , 1468.54 , 431.34
+2856.67 , 1539.23 , 453.30
+2856.67 , 1609.92 , 475.32
+2856.67 , 1680.61 , 497.36
+2856.67 , 1751.29 , 519.44
+2856.67 , 1821.98 , 541.58
+2856.67 , 1892.67 , 563.76
+2856.67 , 1963.35 , 585.97
+2856.67 , 2034.04 , 608.23
+2856.67 , 2104.73 , 630.53
+2856.67 , 2175.42 , 652.86
+2856.67 , 2246.10 , 675.27
+2856.67 , 2316.79 , 697.67
+3060.68 , -2297.57 , -681.87
+3060.68 , -2223.96 , -661.18
+3060.68 , -2150.36 , -640.47
+3060.68 , -2076.76 , -619.69
+3060.68 , -2003.16 , -598.91
+3060.68 , -1929.56 , -578.05
+3060.68 , -1855.95 , -557.17
+3060.68 , -1782.35 , -536.24
+3060.68 , -1708.75 , -515.26
+3060.68 , -1635.15 , -494.26
+3060.68 , -1561.55 , -473.21
+3060.68 , -1487.94 , -452.12
+3060.68 , -1414.34 , -430.99
+3060.68 , -1340.74 , -409.82
+3060.68 , -1267.14 , -388.63
+3060.68 , -1193.54 , -367.36
+3060.68 , -1119.94 , -346.07
+3060.68 , -1046.33 , -324.73
+3060.68 , -972.73 , -303.36
+3060.68 , -899.13 , -281.95
+3060.68 , -825.53 , -260.49
+3060.68 , -751.93 , -239.00
+3060.68 , -678.32 , -217.46
+3060.68 , -604.72 , -195.89
+3060.68 , -531.12 , -174.27
+3060.68 , -457.52 , -152.61
+3060.68 , -383.92 , -130.91
+3060.68 , -310.31 , -109.17
+3060.68 , -236.71 , -87.39
+3060.68 , -163.11 , -65.57
+3060.68 , -89.51 , -43.71
+3060.68 , -15.91 , -21.80
+3060.68 , 57.70 , 0.67
+3060.68 , 128.38 , 23.30
+3060.68 , 199.07 , 45.99
+3060.68 , 269.76 , 68.71
+3060.68 , 340.45 , 91.47
+3060.68 , 411.13 , 114.27
+3060.68 , 481.82 , 137.12
+3060.68 , 552.51 , 160.00
+3060.68 , 623.19 , 182.93
+3060.68 , 693.88 , 205.90
+3060.68 , 764.57 , 228.91
+3060.68 , 835.26 , 251.97
+3060.68 , 905.94 , 275.07
+3060.68 , 976.63 , 298.19
+3060.68 , 1047.32 , 321.39
+3060.68 , 1118.01 , 344.58
+3060.68 , 1188.69 , 367.85
+3060.68 , 1259.38 , 391.15
+3060.68 , 1330.07 , 414.49
+3060.68 , 1400.76 , 437.88
+3060.68 , 1471.44 , 461.32
+3060.68 , 1542.13 , 484.78
+3060.68 , 1612.82 , 508.29
+3060.68 , 1683.50 , 531.85
+3060.68 , 1754.19 , 555.44
+3060.68 , 1824.88 , 579.07
+3060.68 , 1895.57 , 602.75
+3060.68 , 1966.25 , 626.45
+3060.68 , 2036.94 , 650.21
+3060.68 , 2107.63 , 674.01
+3060.68 , 2178.32 , 697.86
+3060.68 , 2249.00 , 721.73
+3060.68 , 2319.69 , 745.66
+3264.70 , -2294.67 , -728.99
+3264.70 , -2221.07 , -706.83
+3264.70 , -2147.46 , -684.65
+3264.70 , -2073.86 , -662.42
+3264.70 , -2000.26 , -640.14
+3264.70 , -1926.66 , -617.84
+3264.70 , -1853.06 , -595.46
+3264.70 , -1779.45 , -573.09
+3264.70 , -1705.85 , -550.64
+3264.70 , -1632.25 , -528.17
+3264.70 , -1558.65 , -505.65
+3264.70 , -1485.05 , -483.10
+3264.70 , -1411.44 , -460.48
+3264.70 , -1337.84 , -437.84
+3264.70 , -1264.24 , -415.18
+3264.70 , -1190.64 , -392.44
+3264.70 , -1117.04 , -369.68
+3264.70 , -1043.43 , -346.89
+3264.70 , -969.83 , -324.05
+3264.70 , -896.23 , -301.17
+3264.70 , -822.63 , -278.24
+3264.70 , -749.03 , -255.27
+3264.70 , -675.42 , -232.26
+3264.70 , -601.82 , -209.22
+3264.70 , -528.22 , -186.13
+3264.70 , -454.62 , -163.00
+3264.70 , -381.02 , -139.83
+3264.70 , -307.41 , -116.62
+3264.70 , -233.81 , -93.37
+3264.70 , -160.21 , -70.08
+3264.70 , -86.61 , -46.75
+3264.70 , -13.01 , -23.38
+3264.70 , 60.59 , 0.61
+3264.70 , 131.28 , 24.75
+3264.70 , 201.97 , 48.93
+3264.70 , 272.66 , 73.15
+3264.70 , 343.34 , 97.42
+3264.70 , 414.03 , 121.72
+3264.70 , 484.72 , 146.07
+3264.70 , 555.41 , 170.46
+3264.70 , 626.09 , 194.89
+3264.70 , 696.78 , 219.36
+3264.70 , 767.47 , 243.88
+3264.70 , 838.16 , 268.43
+3264.70 , 908.84 , 293.03
+3264.70 , 979.53 , 317.65
+3264.70 , 1050.22 , 342.34
+3264.70 , 1120.90 , 367.06
+3264.70 , 1191.59 , 391.82
+3264.70 , 1262.28 , 416.61
+3264.70 , 1332.97 , 441.48
+3264.70 , 1403.65 , 466.36
+3264.70 , 1474.34 , 491.27
+3264.70 , 1545.03 , 516.26
+3264.70 , 1615.72 , 541.27
+3264.70 , 1686.40 , 566.32
+3264.70 , 1757.09 , 591.40
+3264.70 , 1827.78 , 616.53
+3264.70 , 1898.47 , 641.71
+3264.70 , 1969.15 , 666.93
+3264.70 , 2039.84 , 692.18
+3264.70 , 2110.53 , 717.51
+3264.70 , 2181.21 , 742.83
+3264.70 , 2251.90 , 768.22
+3264.70 , 2322.59 , 793.64
+3468.80 , -2291.77 , -776.14
+3468.80 , -2218.17 , -752.51
+3468.80 , -2144.56 , -728.86
+3468.80 , -2070.96 , -705.16
+3468.80 , -1997.36 , -681.41
+3468.80 , -1923.76 , -657.63
+3468.80 , -1850.16 , -633.81
+3468.80 , -1776.55 , -609.94
+3468.80 , -1702.95 , -586.02
+3468.80 , -1629.35 , -562.08
+3468.80 , -1555.75 , -538.08
+3468.80 , -1482.15 , -514.07
+3468.80 , -1408.54 , -490.00
+3468.80 , -1334.94 , -465.89
+3468.80 , -1261.34 , -441.73
+3468.80 , -1187.74 , -417.54
+3468.80 , -1114.14 , -393.31
+3468.80 , -1040.53 , -369.05
+3468.80 , -966.93 , -344.72
+3468.80 , -893.33 , -320.37
+3468.80 , -819.73 , -295.99
+3468.80 , -746.13 , -271.56
+3468.80 , -672.52 , -247.07
+3468.80 , -598.92 , -222.56
+3468.80 , -525.32 , -198.00
+3468.80 , -451.72 , -173.40
+3468.80 , -378.12 , -148.76
+3468.80 , -304.51 , -124.09
+3468.80 , -230.91 , -99.36
+3468.80 , -157.31 , -74.61
+3468.80 , -83.71 , -49.81
+3468.80 , -10.11 , -24.96
+3468.80 , 63.49 , 0.55
+3468.80 , 134.18 , 26.19
+3468.80 , 204.87 , 51.87
+3468.80 , 275.56 , 77.59
+3468.80 , 346.24 , 103.36
+3468.80 , 416.93 , 129.16
+3468.80 , 487.62 , 155.01
+3468.80 , 558.31 , 180.90
+3468.80 , 628.99 , 206.83
+3468.80 , 699.68 , 232.80
+3468.80 , 770.37 , 258.82
+3468.80 , 841.06 , 284.87
+3468.80 , 911.74 , 310.96
+3468.80 , 982.43 , 337.10
+3468.80 , 1053.12 , 363.29
+3468.80 , 1123.80 , 389.50
+3468.80 , 1194.49 , 415.76
+3468.80 , 1265.18 , 442.08
+3468.80 , 1335.87 , 468.41
+3468.80 , 1406.55 , 494.79
+3468.80 , 1477.24 , 521.23
+3468.80 , 1547.93 , 547.71
+3468.80 , 1618.62 , 574.21
+3468.80 , 1689.30 , 600.76
+3468.80 , 1759.99 , 627.36
+3468.80 , 1830.68 , 653.99
+3468.80 , 1901.37 , 680.69
+3468.80 , 1972.05 , 707.38
+3468.80 , 2042.74 , 734.15
+3468.80 , 2113.43 , 760.95
+3468.80 , 2184.11 , 787.79
+3468.80 , 2254.80 , 814.68
+3468.80 , 2325.49 , 841.62
+3672.82 , -2288.87 , -823.29
+3672.82 , -2215.27 , -798.21
+3672.82 , -2141.66 , -773.07
+3672.82 , -2068.06 , -747.89
+3672.82 , -1994.46 , -722.70
+3672.82 , -1920.86 , -697.43
+3672.82 , -1847.26 , -672.13
+3672.82 , -1773.66 , -646.82
+3672.82 , -1700.05 , -621.43
+3672.82 , -1626.45 , -596.01
+3672.82 , -1552.85 , -570.55
+3672.82 , -1479.25 , -545.06
+3672.82 , -1405.65 , -519.53
+3672.82 , -1332.04 , -493.94
+3672.82 , -1258.44 , -468.33
+3672.82 , -1184.84 , -442.65
+3672.82 , -1111.24 , -416.97
+3672.82 , -1037.64 , -391.22
+3672.82 , -964.03 , -365.44
+3672.82 , -890.43 , -339.61
+3672.82 , -816.83 , -313.74
+3672.82 , -743.23 , -287.84
+3672.82 , -669.63 , -261.90
+3672.82 , -596.02 , -235.91
+3672.82 , -522.42 , -209.89
+3672.82 , -448.82 , -183.82
+3672.82 , -375.22 , -157.71
+3672.82 , -301.62 , -131.56
+3672.82 , -228.01 , -105.37
+3672.82 , -154.41 , -79.14
+3672.82 , -80.81 , -52.87
+3672.82 , -7.21 , -26.56
+3672.82 , 66.39 , 0.47
+3672.82 , 137.08 , 27.61
+3672.82 , 207.77 , 54.80
+3672.82 , 278.46 , 82.02
+3672.82 , 349.14 , 109.28
+3672.82 , 419.83 , 136.59
+3672.82 , 490.52 , 163.94
+3672.82 , 561.20 , 191.33
+3672.82 , 631.89 , 218.77
+3672.82 , 702.58 , 246.24
+3672.82 , 773.27 , 273.76
+3672.82 , 843.95 , 301.30
+3672.82 , 914.64 , 328.91
+3672.82 , 985.33 , 356.55
+3672.82 , 1056.02 , 384.21
+3672.82 , 1126.70 , 411.95
+3672.82 , 1197.39 , 439.70
+3672.82 , 1268.08 , 467.51
+3672.82 , 1338.77 , 495.37
+3672.82 , 1409.45 , 523.25
+3672.82 , 1480.14 , 551.18
+3672.82 , 1550.83 , 579.15
+3672.82 , 1621.51 , 607.15
+3672.82 , 1692.20 , 635.23
+3672.82 , 1762.89 , 663.30
+3672.82 , 1833.58 , 691.44
+3672.82 , 1904.26 , 719.61
+3672.82 , 1974.95 , 747.83
+3672.82 , 2045.64 , 776.10
+3672.82 , 2116.33 , 804.42
+3672.82 , 2187.01 , 832.75
+3672.82 , 2257.70 , 861.14
+3672.82 , 2328.39 , 889.58
+3876.84 , -2285.97 , -870.47
+3876.84 , -2212.37 , -843.90
+3876.84 , -2138.77 , -817.30
+3876.84 , -2065.16 , -790.66
+3876.84 , -1991.56 , -763.99
+3876.84 , -1917.96 , -737.25
+3876.84 , -1844.36 , -710.48
+3876.84 , -1770.76 , -683.70
+3876.84 , -1697.15 , -656.83
+3876.84 , -1623.55 , -629.95
+3876.84 , -1549.95 , -603.04
+3876.84 , -1476.35 , -576.06
+3876.84 , -1402.75 , -549.05
+3876.84 , -1329.14 , -521.99
+3876.84 , -1255.54 , -494.92
+3876.84 , -1181.94 , -467.79
+3876.84 , -1108.34 , -440.61
+3876.84 , -1034.74 , -413.41
+3876.84 , -961.13 , -386.16
+3876.84 , -887.53 , -358.87
+3876.84 , -813.93 , -331.52
+3876.84 , -740.33 , -304.15
+3876.84 , -666.73 , -276.73
+3876.84 , -593.13 , -249.28
+3876.84 , -519.52 , -221.79
+3876.84 , -445.92 , -194.25
+3876.84 , -372.32 , -166.67
+3876.84 , -298.72 , -139.05
+3876.84 , -225.12 , -111.40
+3876.84 , -151.51 , -83.70
+3876.84 , -77.91 , -55.96
+3876.84 , -4.31 , -28.18
+3876.84 , 69.29 , 0.39
+3876.84 , 139.98 , 29.03
+3876.84 , 210.67 , 57.71
+3876.84 , 281.35 , 86.44
+3876.84 , 352.04 , 115.20
+3876.84 , 422.73 , 144.01
+3876.84 , 493.42 , 172.86
+3876.84 , 564.10 , 201.75
+3876.84 , 634.79 , 230.69
+3876.84 , 705.48 , 259.65
+3876.84 , 776.17 , 288.67
+3876.84 , 846.85 , 317.73
+3876.84 , 917.54 , 346.82
+3876.84 , 988.23 , 375.97
+3876.84 , 1058.91 , 405.16
+3876.84 , 1129.60 , 434.36
+3876.84 , 1200.29 , 463.64
+3876.84 , 1270.98 , 492.95
+3876.84 , 1341.66 , 522.30
+3876.84 , 1412.35 , 551.67
+3876.84 , 1483.04 , 581.10
+3876.84 , 1553.73 , 610.57
+3876.84 , 1624.41 , 640.09
+3876.84 , 1695.10 , 669.64
+3876.84 , 1765.79 , 699.26
+3876.84 , 1836.48 , 728.87
+3876.84 , 1907.16 , 758.56
+3876.84 , 1977.85 , 788.28
+3876.84 , 2048.54 , 818.04
+3876.84 , 2119.22 , 847.85
+3876.84 , 2189.91 , 877.69
+3876.84 , 2260.60 , 907.57
+3876.84 , 2331.29 , 937.51
+4080.85 , -2283.07 , -917.65
+4080.85 , -2209.47 , -889.63
+4080.85 , -2135.87 , -861.54
+4080.85 , -2062.27 , -833.42
+4080.85 , -1988.66 , -805.29
+4080.85 , -1915.06 , -777.10
+4080.85 , -1841.46 , -748.86
+4080.85 , -1767.86 , -720.58
+4080.85 , -1694.26 , -692.27
+4080.85 , -1620.65 , -663.91
+4080.85 , -1547.05 , -635.51
+4080.85 , -1473.45 , -607.08
+4080.85 , -1399.85 , -578.60
+4080.85 , -1326.25 , -550.07
+4080.85 , -1252.64 , -521.52
+4080.85 , -1179.04 , -492.93
+4080.85 , -1105.44 , -464.28
+4080.85 , -1031.84 , -435.61
+4080.85 , -958.24 , -406.89
+4080.85 , -884.63 , -378.12
+4080.85 , -811.03 , -349.33
+4080.85 , -737.43 , -320.49
+4080.85 , -663.83 , -291.60
+4080.85 , -590.23 , -262.67
+4080.85 , -516.62 , -233.70
+4080.85 , -443.02 , -204.70
+4080.85 , -369.42 , -175.65
+4080.85 , -295.82 , -146.56
+4080.85 , -222.22 , -117.43
+4080.85 , -148.61 , -88.26
+4080.85 , -75.01 , -59.05
+4080.85 , -1.41 , -29.79
+4080.85 , 72.19 , 0.29
+4080.85 , 142.88 , 30.43
+4080.85 , 213.57 , 60.61
+4080.85 , 284.25 , 90.84
+4080.85 , 354.94 , 121.11
+4080.85 , 425.63 , 151.41
+4080.85 , 496.32 , 181.77
+4080.85 , 567.00 , 212.17
+4080.85 , 637.69 , 242.58
+4080.85 , 708.38 , 273.07
+4080.85 , 779.06 , 303.58
+4080.85 , 849.75 , 334.13
+4080.85 , 920.44 , 364.74
+4080.85 , 991.13 , 395.37
+4080.85 , 1061.81 , 426.07
+4080.85 , 1132.50 , 456.78
+4080.85 , 1203.19 , 487.55
+4080.85 , 1273.88 , 518.35
+4080.85 , 1344.56 , 549.20
+4080.85 , 1415.25 , 580.10
+4080.85 , 1485.94 , 611.02
+4080.85 , 1556.62 , 642.01
+4080.85 , 1627.31 , 673.01
+4080.85 , 1698.00 , 704.07
+4080.85 , 1768.69 , 735.16
+4080.85 , 1839.37 , 766.30
+4080.85 , 1910.06 , 797.49
+4080.85 , 1980.75 , 828.72
+4080.85 , 2051.44 , 859.98
+4080.85 , 2122.12 , 891.29
+4080.85 , 2192.81 , 922.62
+4080.85 , 2263.50 , 954.00
+4080.85 , 2334.19 , 985.43
+4268.63 , -2280.40 , -961.07
+4268.63 , -2206.80 , -931.70
+4268.63 , -2133.20 , -902.26
+4268.63 , -2059.60 , -872.81
+4268.63 , -1986.00 , -843.30
+4268.63 , -1912.39 , -813.76
+4268.63 , -1838.79 , -784.17
+4268.63 , -1765.19 , -754.53
+4268.63 , -1691.59 , -724.87
+4268.63 , -1617.99 , -695.16
+4268.63 , -1544.38 , -665.43
+4268.63 , -1470.78 , -635.62
+4268.63 , -1397.18 , -605.79
+4268.63 , -1323.58 , -575.94
+4268.63 , -1249.98 , -546.01
+4268.63 , -1176.37 , -516.06
+4268.63 , -1102.77 , -486.09
+4268.63 , -1029.17 , -456.04
+4268.63 , -955.57 , -425.97
+4268.63 , -881.97 , -395.84
+4268.63 , -808.36 , -365.70
+4268.63 , -734.76 , -335.51
+4268.63 , -661.16 , -305.27
+4268.63 , -587.56 , -275.00
+4268.63 , -513.96 , -244.68
+4268.63 , -440.35 , -214.32
+4268.63 , -366.75 , -183.92
+4268.63 , -293.15 , -153.48
+4268.63 , -219.55 , -123.00
+4268.63 , -145.95 , -92.48
+4268.63 , -72.34 , -61.91
+4268.63 , 1.26 , -31.27
+4268.63 , 74.86 , 0.18
+4268.63 , 145.55 , 31.71
+4268.63 , 216.23 , 63.27
+4268.63 , 286.92 , 94.88
+4268.63 , 357.61 , 126.53
+4268.63 , 428.30 , 158.22
+4268.63 , 498.98 , 189.95
+4268.63 , 569.67 , 221.72
+4268.63 , 640.36 , 253.53
+4268.63 , 711.05 , 285.39
+4268.63 , 781.73 , 317.28
+4268.63 , 852.42 , 349.22
+4268.63 , 923.11 , 381.20
+4268.63 , 993.79 , 413.23
+4268.63 , 1064.48 , 445.29
+4268.63 , 1135.17 , 477.39
+4268.63 , 1205.86 , 509.55
+4268.63 , 1276.54 , 541.73
+4268.63 , 1347.23 , 573.95
+4268.63 , 1417.92 , 606.23
+4268.63 , 1488.61 , 638.55
+4268.63 , 1559.29 , 670.90
+4268.63 , 1629.98 , 703.29
+4268.63 , 1700.67 , 735.74
+4268.63 , 1771.35 , 768.20
+4268.63 , 1842.04 , 800.72
+4268.63 , 1912.73 , 833.28
+4268.63 , 1983.42 , 865.90
+4268.63 , 2054.10 , 898.54
+4268.63 , 2124.79 , 931.22
+4268.63 , 2195.48 , 963.96
+4268.63 , 2266.17 , 996.71
+4268.63 , 2336.85 , 1029.52
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G6.vemo b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G6.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..499d82e7251224248137dcca47f789e943303338
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G6.vemo
@@ -0,0 +1,2016 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00 , -2271.19 , 23.82
+0.00 , -2200.62 , 22.44
+0.00 , -2130.06 , 21.09
+0.00 , -2059.49 , 19.79
+0.00 , -1988.92 , 18.53
+0.00 , -1918.35 , 17.31
+0.00 , -1847.78 , 16.13
+0.00 , -1777.21 , 14.99
+0.00 , -1706.64 , 13.89
+0.00 , -1636.07 , 12.84
+0.00 , -1565.50 , 11.83
+0.00 , -1494.93 , 10.85
+0.00 , -1424.36 , 9.92
+0.00 , -1353.79 , 9.04
+0.00 , -1283.22 , 8.19
+0.00 , -1212.65 , 7.38
+0.00 , -1142.08 , 6.62
+0.00 , -1071.51 , 5.90
+0.00 , -1000.94 , 5.21
+0.00 , -930.38 , 4.57
+0.00 , -859.81 , 3.98
+0.00 , -789.24 , 3.42
+0.00 , -717.25 , 2.90
+0.00 , -644.79 , 2.43
+0.00 , -572.28 , 2.00
+0.00 , -499.12 , 1.61
+0.00 , -425.97 , 1.26
+0.00 , -352.81 , 0.95
+0.00 , -279.65 , 0.69
+0.00 , -206.50 , 0.46
+0.00 , -133.34 , 0.28
+0.00 , -60.18 , 0.14
+0.00 , 12.97 , 0.09
+0.00 , 83.95 , 0.21
+0.00 , 154.93 , 0.38
+0.00 , 225.91 , 0.58
+0.00 , 296.89 , 0.83
+0.00 , 367.86 , 1.12
+0.00 , 438.84 , 1.45
+0.00 , 509.82 , 1.82
+0.00 , 580.80 , 2.23
+0.00 , 651.78 , 2.69
+0.00 , 722.76 , 3.19
+0.00 , 793.73 , 3.72
+0.00 , 864.71 , 4.30
+0.00 , 935.69 , 4.93
+0.00 , 1006.67 , 5.59
+0.00 , 1077.65 , 6.29
+0.00 , 1148.62 , 7.04
+0.00 , 1219.60 , 7.83
+0.00 , 1290.58 , 8.65
+0.00 , 1361.56 , 9.52
+0.00 , 1432.54 , 10.44
+0.00 , 1503.52 , 11.39
+0.00 , 1574.49 , 12.38
+0.00 , 1645.47 , 13.42
+0.00 , 1716.45 , 14.50
+0.00 , 1787.43 , 15.62
+0.00 , 1858.41 , 16.78
+0.00 , 1929.39 , 17.98
+0.00 , 2000.36 , 19.22
+0.00 , 2071.34 , 20.51
+0.00 , 2142.32 , 21.84
+0.00 , 2213.30 , 23.20
+0.00 , 2284.28 , 24.61
+40.81 , -2271.72 , 14.01
+40.81 , -2201.15 , 12.93
+40.81 , -2130.58 , 11.90
+40.81 , -2060.02 , 10.90
+40.81 , -1989.45 , 9.95
+40.81 , -1918.88 , 9.04
+40.81 , -1848.31 , 8.18
+40.81 , -1777.74 , 7.35
+40.81 , -1707.17 , 6.57
+40.81 , -1636.60 , 5.82
+40.81 , -1566.03 , 5.12
+40.81 , -1495.46 , 4.46
+40.81 , -1424.89 , 3.84
+40.81 , -1354.32 , 3.26
+40.81 , -1283.75 , 2.73
+40.81 , -1213.18 , 2.23
+40.81 , -1142.61 , 1.78
+40.81 , -1072.04 , 1.37
+40.81 , -1001.47 , 1.01
+40.81 , -930.90 , 0.68
+40.81 , -860.34 , 0.40
+40.81 , -789.77 , 0.16
+40.81 , -717.49 , -0.05
+40.81 , -644.63 , -0.22
+40.81 , -571.75 , -0.35
+40.81 , -498.59 , -0.44
+40.81 , -425.44 , -0.49
+40.81 , -352.28 , -0.50
+40.81 , -279.12 , -0.47
+40.81 , -205.97 , -0.40
+40.81 , -132.81 , -0.28
+40.81 , -59.65 , -0.13
+40.81 , 13.50 , 0.12
+40.81 , 84.48 , 0.54
+40.81 , 155.46 , 1.01
+40.81 , 226.44 , 1.51
+40.81 , 297.42 , 2.06
+40.81 , 368.39 , 2.65
+40.81 , 439.37 , 3.28
+40.81 , 510.35 , 3.95
+40.81 , 581.33 , 4.67
+40.81 , 652.31 , 5.42
+40.81 , 723.28 , 6.22
+40.81 , 794.26 , 7.06
+40.81 , 865.24 , 7.94
+40.81 , 936.22 , 8.86
+40.81 , 1007.20 , 9.82
+40.81 , 1078.18 , 10.83
+40.81 , 1149.15 , 11.88
+40.81 , 1220.13 , 12.96
+40.81 , 1291.11 , 14.09
+40.81 , 1362.09 , 15.26
+40.81 , 1433.07 , 16.48
+40.81 , 1504.05 , 17.73
+40.81 , 1575.02 , 19.02
+40.81 , 1646.00 , 20.36
+40.81 , 1716.98 , 21.74
+40.81 , 1787.96 , 23.16
+40.81 , 1858.94 , 24.62
+40.81 , 1929.91 , 26.12
+40.81 , 2000.89 , 27.67
+40.81 , 2071.87 , 29.25
+40.81 , 2142.85 , 30.88
+40.81 , 2213.83 , 32.55
+40.81 , 2284.81 , 34.26
+81.62 , -2272.25 , 4.20
+81.62 , -2201.68 , 3.43
+81.62 , -2131.11 , 2.71
+81.62 , -2060.54 , 2.04
+81.62 , -1989.98 , 1.41
+81.62 , -1919.41 , 0.82
+81.62 , -1848.84 , 0.27
+81.62 , -1778.27 , -0.23
+81.62 , -1707.70 , -0.70
+81.62 , -1637.13 , -1.12
+81.62 , -1566.56 , -1.51
+81.62 , -1495.99 , -1.85
+81.62 , -1425.42 , -2.15
+81.62 , -1354.85 , -2.42
+81.62 , -1284.28 , -2.64
+81.62 , -1213.71 , -2.82
+81.62 , -1143.14 , -2.96
+81.62 , -1072.57 , -3.06
+81.62 , -1002.00 , -3.12
+81.62 , -931.39 , -3.14
+81.62 , -860.72 , -3.11
+81.62 , -790.06 , -3.05
+81.62 , -717.53 , -2.96
+81.62 , -644.38 , -2.84
+81.62 , -571.22 , -2.68
+81.62 , -498.06 , -2.47
+81.62 , -424.91 , -2.23
+81.62 , -351.75 , -1.95
+81.62 , -278.59 , -1.62
+81.62 , -205.44 , -1.25
+81.62 , -132.28 , -0.85
+81.62 , -59.12 , -0.40
+81.62 , 14.03 , 0.15
+81.62 , 85.01 , 0.87
+81.62 , 155.99 , 1.64
+81.62 , 226.97 , 2.44
+81.62 , 297.94 , 3.29
+81.62 , 368.92 , 4.18
+81.62 , 439.90 , 5.11
+81.62 , 510.88 , 6.09
+81.62 , 581.86 , 7.10
+81.62 , 652.84 , 8.16
+81.62 , 723.81 , 9.26
+81.62 , 794.79 , 10.40
+81.62 , 865.77 , 11.58
+81.62 , 936.75 , 12.80
+81.62 , 1007.73 , 14.06
+81.62 , 1078.71 , 15.37
+81.62 , 1149.68 , 16.71
+81.62 , 1220.66 , 18.10
+81.62 , 1291.64 , 19.53
+81.62 , 1362.62 , 21.00
+81.62 , 1433.60 , 22.51
+81.62 , 1504.57 , 24.07
+81.62 , 1575.55 , 25.66
+81.62 , 1646.53 , 27.30
+81.62 , 1717.51 , 28.98
+81.62 , 1788.49 , 30.70
+81.62 , 1859.47 , 32.46
+81.62 , 1930.44 , 34.27
+81.62 , 2001.42 , 36.11
+81.62 , 2072.40 , 38.00
+81.62 , 2143.38 , 39.92
+81.62 , 2214.36 , 41.89
+81.62 , 2285.34 , 43.91
+122.43 , -2272.78 , -5.44
+122.43 , -2202.21 , -5.89
+122.43 , -2131.64 , -6.29
+122.43 , -2061.07 , -6.66
+122.43 , -1990.50 , -6.98
+122.43 , -1919.94 , -7.26
+122.43 , -1849.37 , -7.50
+122.43 , -1778.80 , -7.70
+122.43 , -1708.23 , -7.87
+122.43 , -1637.66 , -7.98
+122.43 , -1567.09 , -8.06
+122.43 , -1496.52 , -8.10
+122.43 , -1425.95 , -8.10
+122.43 , -1355.38 , -8.06
+122.43 , -1284.81 , -7.97
+122.43 , -1214.24 , -7.85
+122.43 , -1143.67 , -7.68
+122.43 , -1073.10 , -7.48
+122.43 , -1002.53 , -7.23
+122.43 , -931.75 , -6.95
+122.43 , -860.69 , -6.63
+122.43 , -789.63 , -6.26
+122.43 , -717.00 , -5.88
+122.43 , -643.85 , -5.46
+122.43 , -570.69 , -5.01
+122.43 , -497.53 , -4.51
+122.43 , -424.38 , -3.97
+122.43 , -351.22 , -3.39
+122.43 , -278.06 , -2.77
+122.43 , -204.91 , -2.11
+122.43 , -131.75 , -1.41
+122.43 , -58.60 , -0.66
+122.43 , 14.56 , 0.18
+122.43 , 85.54 , 1.20
+122.43 , 156.52 , 2.27
+122.43 , 227.50 , 3.38
+122.43 , 298.47 , 4.53
+122.43 , 369.45 , 5.72
+122.43 , 440.43 , 6.95
+122.43 , 511.41 , 8.22
+122.43 , 582.39 , 9.54
+122.43 , 653.37 , 10.89
+122.43 , 724.34 , 12.29
+122.43 , 795.32 , 13.73
+122.43 , 866.30 , 15.21
+122.43 , 937.28 , 16.73
+122.43 , 1008.26 , 18.30
+122.43 , 1079.23 , 19.90
+122.43 , 1150.21 , 21.55
+122.43 , 1221.19 , 23.24
+122.43 , 1292.17 , 24.97
+122.43 , 1363.15 , 26.74
+122.43 , 1434.13 , 28.56
+122.43 , 1505.10 , 30.41
+122.43 , 1576.08 , 32.31
+122.43 , 1647.06 , 34.24
+122.43 , 1718.04 , 36.22
+122.43 , 1789.02 , 38.24
+122.43 , 1860.00 , 40.31
+122.43 , 1930.97 , 42.41
+122.43 , 2001.95 , 44.55
+122.43 , 2072.93 , 46.74
+122.43 , 2143.91 , 48.97
+122.43 , 2214.89 , 51.24
+122.43 , 2285.86 , 53.55
+163.24 , -2273.31 , -15.04
+163.24 , -2202.74 , -15.18
+163.24 , -2132.17 , -15.28
+163.24 , -2061.60 , -15.34
+163.24 , -1991.03 , -15.36
+163.24 , -1920.46 , -15.34
+163.24 , -1849.90 , -15.27
+163.24 , -1779.33 , -15.17
+163.24 , -1708.76 , -15.02
+163.24 , -1638.19 , -14.84
+163.24 , -1567.62 , -14.61
+163.24 , -1497.05 , -14.34
+163.24 , -1426.48 , -14.04
+163.24 , -1355.91 , -13.69
+163.24 , -1285.34 , -13.30
+163.24 , -1214.77 , -12.87
+163.24 , -1144.20 , -12.40
+163.24 , -1073.63 , -11.89
+163.24 , -1003.06 , -11.34
+163.24 , -932.11 , -10.75
+163.24 , -860.65 , -10.13
+163.24 , -789.20 , -9.47
+163.24 , -716.47 , -8.80
+163.24 , -643.32 , -8.08
+163.24 , -570.16 , -7.33
+163.24 , -497.00 , -6.54
+163.24 , -423.85 , -5.71
+163.24 , -350.69 , -4.83
+163.24 , -277.54 , -3.92
+163.24 , -204.38 , -2.96
+163.24 , -131.22 , -1.97
+163.24 , -58.07 , -0.93
+163.24 , 15.09 , 0.21
+163.24 , 86.07 , 1.53
+163.24 , 157.05 , 2.90
+163.24 , 228.03 , 4.31
+163.24 , 299.00 , 5.76
+163.24 , 369.98 , 7.25
+163.24 , 440.96 , 8.78
+163.24 , 511.94 , 10.35
+163.24 , 582.92 , 11.97
+163.24 , 653.89 , 13.63
+163.24 , 724.87 , 15.33
+163.24 , 795.85 , 17.07
+163.24 , 866.83 , 18.85
+163.24 , 937.81 , 20.67
+163.24 , 1008.79 , 22.54
+163.24 , 1079.76 , 24.44
+163.24 , 1150.74 , 26.39
+163.24 , 1221.72 , 28.38
+163.24 , 1292.70 , 30.41
+163.24 , 1363.68 , 32.48
+163.24 , 1434.66 , 34.59
+163.24 , 1505.63 , 36.75
+163.24 , 1576.61 , 38.95
+163.24 , 1647.59 , 41.18
+163.24 , 1718.57 , 43.46
+163.24 , 1789.55 , 45.78
+163.24 , 1860.52 , 48.15
+163.24 , 1931.50 , 50.55
+163.24 , 2002.48 , 53.00
+163.24 , 2073.46 , 55.48
+163.24 , 2144.44 , 58.01
+163.24 , 2215.42 , 60.58
+163.24 , 2286.39 , 63.20
+204.04 , -2273.84 , -24.63
+204.04 , -2203.27 , -24.47
+204.04 , -2132.70 , -24.26
+204.04 , -2062.13 , -24.02
+204.04 , -1991.56 , -23.73
+204.04 , -1920.99 , -23.40
+204.04 , -1850.42 , -23.03
+204.04 , -1779.86 , -22.62
+204.04 , -1709.29 , -22.17
+204.04 , -1638.72 , -21.68
+204.04 , -1568.15 , -21.15
+204.04 , -1497.58 , -20.58
+204.04 , -1427.01 , -19.96
+204.04 , -1356.44 , -19.31
+204.04 , -1285.87 , -18.62
+204.04 , -1215.30 , -17.88
+204.04 , -1144.73 , -17.11
+204.04 , -1074.16 , -16.29
+204.04 , -1003.59 , -15.43
+204.04 , -932.47 , -14.55
+204.04 , -860.62 , -13.63
+204.04 , -788.77 , -12.68
+204.04 , -715.94 , -11.71
+204.04 , -642.79 , -10.71
+204.04 , -569.63 , -9.66
+204.04 , -496.48 , -8.57
+204.04 , -423.32 , -7.45
+204.04 , -350.16 , -6.28
+204.04 , -277.01 , -5.07
+204.04 , -203.85 , -3.82
+204.04 , -130.69 , -2.53
+204.04 , -57.54 , -1.20
+204.04 , 15.62 , 0.24
+204.04 , 86.60 , 1.86
+204.04 , 157.58 , 3.53
+204.04 , 228.55 , 5.24
+204.04 , 299.53 , 6.99
+204.04 , 370.51 , 8.78
+204.04 , 441.49 , 10.61
+204.04 , 512.47 , 12.49
+204.04 , 583.45 , 14.40
+204.04 , 654.42 , 16.36
+204.04 , 725.40 , 18.36
+204.04 , 796.38 , 20.40
+204.04 , 867.36 , 22.48
+204.04 , 938.34 , 24.61
+204.04 , 1009.32 , 26.77
+204.04 , 1080.29 , 28.98
+204.04 , 1151.27 , 31.23
+204.04 , 1222.25 , 33.52
+204.04 , 1293.23 , 35.85
+204.04 , 1364.21 , 38.22
+204.04 , 1435.18 , 40.63
+204.04 , 1506.16 , 43.09
+204.04 , 1577.14 , 45.59
+204.04 , 1648.12 , 48.12
+204.04 , 1719.10 , 50.70
+204.04 , 1790.08 , 53.33
+204.04 , 1861.05 , 55.99
+204.04 , 1932.03 , 58.69
+204.04 , 2003.01 , 61.44
+204.04 , 2073.99 , 64.23
+204.04 , 2144.97 , 67.06
+204.04 , 2215.95 , 69.93
+204.04 , 2286.92 , 72.84
+244.85 , -2274.37 , -34.22
+244.85 , -2203.80 , -33.75
+244.85 , -2133.23 , -33.23
+244.85 , -2062.66 , -32.68
+244.85 , -1992.09 , -32.09
+244.85 , -1921.52 , -31.46
+244.85 , -1850.95 , -30.78
+244.85 , -1780.38 , -30.07
+244.85 , -1709.82 , -29.31
+244.85 , -1639.25 , -28.52
+244.85 , -1568.68 , -27.68
+244.85 , -1498.11 , -26.80
+244.85 , -1427.54 , -25.88
+244.85 , -1356.97 , -24.92
+244.85 , -1286.40 , -23.92
+244.85 , -1215.83 , -22.88
+244.85 , -1145.26 , -21.80
+244.85 , -1074.69 , -20.68
+244.85 , -1004.12 , -19.52
+244.85 , -932.83 , -18.33
+244.85 , -860.58 , -17.13
+244.85 , -788.34 , -15.89
+244.85 , -715.42 , -14.63
+244.85 , -642.26 , -13.33
+244.85 , -569.10 , -11.99
+244.85 , -495.95 , -10.61
+244.85 , -422.79 , -9.19
+244.85 , -349.63 , -7.72
+244.85 , -276.48 , -6.22
+244.85 , -203.32 , -4.68
+244.85 , -130.16 , -3.09
+244.85 , -57.01 , -1.47
+244.85 , 16.15 , 0.27
+244.85 , 87.13 , 2.19
+244.85 , 158.11 , 4.16
+244.85 , 229.08 , 6.17
+244.85 , 300.06 , 8.22
+244.85 , 371.04 , 10.31
+244.85 , 442.02 , 12.45
+244.85 , 513.00 , 14.62
+244.85 , 583.98 , 16.84
+244.85 , 654.95 , 19.10
+244.85 , 725.93 , 21.40
+244.85 , 796.91 , 23.74
+244.85 , 867.89 , 26.12
+244.85 , 938.87 , 28.54
+244.85 , 1009.84 , 31.01
+244.85 , 1080.82 , 33.52
+244.85 , 1151.80 , 36.06
+244.85 , 1222.78 , 38.65
+244.85 , 1293.76 , 41.29
+244.85 , 1364.74 , 43.96
+244.85 , 1435.71 , 46.67
+244.85 , 1506.69 , 49.43
+244.85 , 1577.67 , 52.23
+244.85 , 1648.65 , 55.06
+244.85 , 1719.63 , 57.95
+244.85 , 1790.61 , 60.87
+244.85 , 1861.58 , 63.83
+244.85 , 1932.56 , 66.84
+244.85 , 2003.54 , 69.88
+244.85 , 2074.52 , 72.97
+244.85 , 2145.50 , 76.10
+244.85 , 2216.47 , 79.27
+244.85 , 2287.45 , 82.48
+285.67 , -2274.90 , -43.79
+285.67 , -2204.33 , -43.01
+285.67 , -2133.76 , -42.20
+285.67 , -2063.19 , -41.34
+285.67 , -1992.62 , -40.44
+285.67 , -1922.05 , -39.50
+285.67 , -1851.48 , -38.52
+285.67 , -1780.91 , -37.50
+285.67 , -1710.34 , -36.44
+285.67 , -1639.78 , -35.34
+285.67 , -1569.21 , -34.20
+285.67 , -1498.64 , -33.02
+285.67 , -1428.07 , -31.79
+285.67 , -1357.50 , -30.53
+285.67 , -1286.93 , -29.22
+285.67 , -1216.36 , -27.88
+285.67 , -1145.79 , -26.49
+285.67 , -1075.22 , -25.07
+285.67 , -1004.65 , -23.60
+285.67 , -933.19 , -22.12
+285.67 , -860.55 , -20.63
+285.67 , -787.91 , -19.10
+285.67 , -714.89 , -17.54
+285.67 , -641.73 , -15.95
+285.67 , -568.57 , -14.32
+285.67 , -495.42 , -12.64
+285.67 , -422.26 , -10.92
+285.67 , -349.10 , -9.17
+285.67 , -275.95 , -7.37
+285.67 , -202.79 , -5.53
+285.67 , -129.63 , -3.65
+285.67 , -56.48 , -1.74
+285.67 , 16.68 , 0.30
+285.67 , 87.66 , 2.53
+285.67 , 158.64 , 4.79
+285.67 , 229.61 , 7.10
+285.67 , 300.59 , 9.45
+285.67 , 371.57 , 11.85
+285.67 , 442.55 , 14.28
+285.67 , 513.53 , 16.75
+285.67 , 584.50 , 19.27
+285.67 , 655.48 , 21.83
+285.67 , 726.46 , 24.43
+285.67 , 797.44 , 27.07
+285.67 , 868.42 , 29.76
+285.67 , 939.40 , 32.48
+285.67 , 1010.37 , 35.24
+285.67 , 1081.35 , 38.05
+285.67 , 1152.33 , 40.90
+285.67 , 1223.31 , 43.79
+285.67 , 1294.29 , 46.72
+285.67 , 1365.27 , 49.70
+285.67 , 1436.24 , 52.71
+285.67 , 1507.22 , 55.77
+285.67 , 1578.20 , 58.87
+285.67 , 1649.18 , 62.01
+285.67 , 1720.16 , 65.19
+285.67 , 1791.13 , 68.41
+285.67 , 1862.11 , 71.67
+285.67 , 1933.09 , 74.98
+285.67 , 2004.07 , 78.33
+285.67 , 2075.05 , 81.72
+285.67 , 2146.03 , 85.15
+285.67 , 2217.00 , 88.62
+285.67 , 2287.98 , 92.13
+326.47 , -2275.43 , -53.36
+326.47 , -2204.86 , -52.27
+326.47 , -2134.29 , -51.15
+326.47 , -2063.72 , -49.99
+326.47 , -1993.15 , -48.79
+326.47 , -1922.58 , -47.54
+326.47 , -1852.01 , -46.26
+326.47 , -1781.44 , -44.93
+326.47 , -1710.87 , -43.57
+326.47 , -1640.30 , -42.16
+326.47 , -1569.74 , -40.71
+326.47 , -1499.17 , -39.22
+326.47 , -1428.60 , -37.69
+326.47 , -1358.03 , -36.12
+326.47 , -1287.46 , -34.51
+326.47 , -1216.89 , -32.86
+326.47 , -1146.32 , -31.17
+326.47 , -1075.75 , -29.44
+326.47 , -1005.18 , -27.66
+326.47 , -933.55 , -25.89
+326.47 , -860.51 , -24.12
+326.47 , -787.48 , -22.31
+326.47 , -714.36 , -20.46
+326.47 , -641.20 , -18.57
+326.47 , -568.04 , -16.64
+326.47 , -494.89 , -14.67
+326.47 , -421.73 , -12.66
+326.47 , -348.57 , -10.61
+326.47 , -275.42 , -8.52
+326.47 , -202.26 , -6.39
+326.47 , -129.10 , -4.22
+326.47 , -55.95 , -2.00
+326.47 , 17.21 , 0.33
+326.47 , 88.19 , 2.86
+326.47 , 159.16 , 5.42
+326.47 , 230.14 , 8.03
+326.47 , 301.12 , 10.68
+326.47 , 372.10 , 13.38
+326.47 , 443.08 , 16.11
+326.47 , 514.06 , 18.89
+326.47 , 585.03 , 21.71
+326.47 , 656.01 , 24.56
+326.47 , 726.99 , 27.47
+326.47 , 797.97 , 30.41
+326.47 , 868.95 , 33.39
+326.47 , 939.93 , 36.41
+326.47 , 1010.90 , 39.48
+326.47 , 1081.88 , 42.59
+326.47 , 1152.86 , 45.74
+326.47 , 1223.84 , 48.93
+326.47 , 1294.82 , 52.16
+326.47 , 1365.79 , 55.44
+326.47 , 1436.77 , 58.75
+326.47 , 1507.75 , 62.11
+326.47 , 1578.73 , 65.51
+326.47 , 1649.71 , 68.95
+326.47 , 1720.69 , 72.43
+326.47 , 1791.66 , 75.95
+326.47 , 1862.64 , 79.52
+326.47 , 1933.62 , 83.12
+326.47 , 2004.60 , 86.77
+326.47 , 2075.58 , 90.46
+326.47 , 2146.56 , 94.19
+326.47 , 2217.53 , 97.96
+326.47 , 2288.51 , 101.77
+367.28 , -2275.96 , -62.91
+367.28 , -2205.39 , -61.52
+367.28 , -2134.82 , -60.10
+367.28 , -2064.25 , -58.63
+367.28 , -1993.68 , -57.12
+367.28 , -1923.11 , -55.57
+367.28 , -1852.54 , -53.98
+367.28 , -1781.97 , -52.35
+367.28 , -1711.40 , -50.68
+367.28 , -1640.83 , -48.97
+367.28 , -1570.26 , -47.21
+367.28 , -1499.70 , -45.42
+367.28 , -1429.13 , -43.58
+367.28 , -1358.56 , -41.71
+367.28 , -1287.99 , -39.79
+367.28 , -1217.42 , -37.84
+367.28 , -1146.82 , -35.84
+367.28 , -1075.98 , -33.82
+367.28 , -1005.14 , -31.75
+367.28 , -933.30 , -29.68
+367.28 , -860.14 , -27.62
+367.28 , -786.98 , -25.52
+367.28 , -713.83 , -23.38
+367.28 , -640.67 , -21.19
+367.28 , -567.51 , -18.97
+367.28 , -494.36 , -16.71
+367.28 , -421.20 , -14.40
+367.28 , -348.04 , -12.06
+367.28 , -274.89 , -9.67
+367.28 , -201.73 , -7.25
+367.28 , -128.58 , -4.78
+367.28 , -55.42 , -2.27
+367.28 , 17.74 , 0.36
+367.28 , 88.72 , 3.19
+367.28 , 159.69 , 6.05
+367.28 , 230.67 , 8.97
+367.28 , 301.65 , 11.92
+367.28 , 372.63 , 14.91
+367.28 , 443.61 , 17.95
+367.28 , 514.59 , 21.02
+367.28 , 585.56 , 24.14
+367.28 , 656.54 , 27.30
+367.28 , 727.52 , 30.50
+367.28 , 798.50 , 33.74
+367.28 , 869.48 , 37.03
+367.28 , 940.45 , 40.35
+367.28 , 1011.43 , 43.72
+367.28 , 1082.41 , 47.13
+367.28 , 1153.39 , 50.58
+367.28 , 1224.37 , 54.07
+367.28 , 1295.35 , 57.60
+367.28 , 1366.32 , 61.18
+367.28 , 1437.30 , 64.79
+367.28 , 1508.28 , 68.45
+367.28 , 1579.26 , 72.15
+367.28 , 1650.24 , 75.89
+367.28 , 1721.22 , 79.67
+367.28 , 1792.19 , 83.49
+367.28 , 1863.17 , 87.36
+367.28 , 1934.15 , 91.26
+367.28 , 2005.13 , 95.21
+367.28 , 2076.11 , 99.20
+367.28 , 2147.08 , 103.23
+367.28 , 2218.06 , 107.30
+367.28 , 2289.04 , 111.42
+408.09 , -2276.49 , -72.46
+408.09 , -2205.92 , -70.76
+408.09 , -2135.35 , -69.03
+408.09 , -2064.78 , -67.26
+408.09 , -1994.21 , -65.45
+408.09 , -1923.64 , -63.59
+408.09 , -1853.07 , -61.70
+408.09 , -1782.50 , -59.76
+408.09 , -1711.93 , -57.78
+408.09 , -1641.36 , -55.77
+408.09 , -1570.79 , -53.71
+408.09 , -1500.22 , -51.61
+408.09 , -1429.66 , -49.47
+408.09 , -1359.09 , -47.29
+408.09 , -1288.52 , -45.07
+408.09 , -1217.95 , -42.81
+408.09 , -1147.30 , -40.51
+408.09 , -1076.07 , -38.19
+408.09 , -1004.83 , -35.84
+408.09 , -932.77 , -33.48
+408.09 , -859.61 , -31.12
+408.09 , -786.45 , -28.73
+408.09 , -713.30 , -26.29
+408.09 , -640.14 , -23.82
+408.09 , -566.98 , -21.30
+408.09 , -493.83 , -18.74
+408.09 , -420.67 , -16.14
+408.09 , -347.52 , -13.50
+408.09 , -274.36 , -10.82
+408.09 , -201.20 , -8.10
+408.09 , -128.05 , -5.34
+408.09 , -54.89 , -2.54
+408.09 , 18.27 , 0.39
+408.09 , 89.25 , 3.52
+408.09 , 160.22 , 6.69
+408.09 , 231.20 , 9.90
+408.09 , 302.18 , 13.15
+408.09 , 373.16 , 16.44
+408.09 , 444.14 , 19.78
+408.09 , 515.11 , 23.16
+408.09 , 586.09 , 26.57
+408.09 , 657.07 , 30.03
+408.09 , 728.05 , 33.53
+408.09 , 799.03 , 37.08
+408.09 , 870.01 , 40.66
+408.09 , 940.98 , 44.29
+408.09 , 1011.96 , 47.96
+408.09 , 1082.94 , 51.66
+408.09 , 1153.92 , 55.42
+408.09 , 1224.90 , 59.21
+408.09 , 1295.88 , 63.04
+408.09 , 1366.85 , 66.91
+408.09 , 1437.83 , 70.83
+408.09 , 1508.81 , 74.79
+408.09 , 1579.79 , 78.79
+408.09 , 1650.77 , 82.83
+408.09 , 1721.74 , 86.91
+408.09 , 1792.72 , 91.03
+408.09 , 1863.70 , 95.20
+408.09 , 1934.68 , 99.41
+408.09 , 2005.66 , 103.66
+408.09 , 2076.64 , 107.95
+408.09 , 2147.61 , 112.28
+408.09 , 2218.59 , 116.65
+408.09 , 2289.57 , 121.06
+448.90 , -2277.02 , -81.99
+448.90 , -2206.45 , -80.00
+448.90 , -2135.88 , -77.96
+448.90 , -2065.31 , -75.88
+448.90 , -1994.74 , -73.76
+448.90 , -1924.17 , -71.60
+448.90 , -1853.60 , -69.40
+448.90 , -1783.03 , -67.16
+448.90 , -1712.46 , -64.88
+448.90 , -1641.89 , -62.55
+448.90 , -1571.32 , -60.19
+448.90 , -1500.75 , -57.79
+448.90 , -1430.18 , -55.34
+448.90 , -1359.62 , -52.86
+448.90 , -1289.05 , -50.33
+448.90 , -1218.48 , -47.76
+448.90 , -1147.78 , -45.16
+448.90 , -1076.15 , -42.56
+448.90 , -1004.53 , -39.93
+448.90 , -932.24 , -37.28
+448.90 , -859.08 , -34.63
+448.90 , -785.92 , -31.94
+448.90 , -712.77 , -29.21
+448.90 , -639.61 , -26.44
+448.90 , -566.46 , -23.63
+448.90 , -493.30 , -20.77
+448.90 , -420.14 , -17.88
+448.90 , -346.99 , -14.95
+448.90 , -273.83 , -11.97
+448.90 , -200.67 , -8.96
+448.90 , -127.52 , -5.90
+448.90 , -54.36 , -2.81
+448.90 , 18.80 , 0.42
+448.90 , 89.77 , 3.85
+448.90 , 160.75 , 7.32
+448.90 , 231.73 , 10.83
+448.90 , 302.71 , 14.38
+448.90 , 373.69 , 17.97
+448.90 , 444.67 , 21.61
+448.90 , 515.64 , 25.29
+448.90 , 586.62 , 29.01
+448.90 , 657.60 , 32.77
+448.90 , 728.58 , 36.57
+448.90 , 799.56 , 40.41
+448.90 , 870.54 , 44.30
+448.90 , 941.51 , 48.22
+448.90 , 1012.49 , 52.19
+448.90 , 1083.47 , 56.20
+448.90 , 1154.45 , 60.25
+448.90 , 1225.43 , 64.34
+448.90 , 1296.40 , 68.48
+448.90 , 1367.38 , 72.65
+448.90 , 1438.36 , 76.87
+448.90 , 1509.34 , 81.13
+448.90 , 1580.32 , 85.43
+448.90 , 1651.30 , 89.77
+448.90 , 1722.27 , 94.15
+448.90 , 1793.25 , 98.58
+448.90 , 1864.23 , 103.04
+448.90 , 1935.21 , 107.55
+448.90 , 2006.19 , 112.10
+448.90 , 2077.17 , 116.69
+448.90 , 2148.14 , 121.32
+448.90 , 2219.12 , 126.00
+448.90 , 2290.10 , 130.71
+489.71 , -2277.55 , -91.52
+489.71 , -2206.98 , -89.22
+489.71 , -2136.41 , -86.88
+489.71 , -2065.84 , -84.50
+489.71 , -1995.27 , -82.07
+489.71 , -1924.70 , -79.60
+489.71 , -1854.13 , -77.10
+489.71 , -1783.56 , -74.55
+489.71 , -1712.99 , -71.96
+489.71 , -1642.42 , -69.34
+489.71 , -1571.85 , -66.67
+489.71 , -1501.28 , -63.96
+489.71 , -1430.71 , -61.21
+489.71 , -1360.14 , -58.42
+489.71 , -1289.58 , -55.58
+489.71 , -1219.01 , -52.71
+489.71 , -1148.26 , -49.81
+489.71 , -1076.24 , -46.93
+489.71 , -1004.22 , -44.01
+489.71 , -931.71 , -41.08
+489.71 , -858.55 , -38.13
+489.71 , -785.40 , -35.15
+489.71 , -712.24 , -32.12
+489.71 , -639.08 , -29.06
+489.71 , -565.93 , -25.96
+489.71 , -492.77 , -22.81
+489.71 , -419.61 , -19.62
+489.71 , -346.46 , -16.39
+489.71 , -273.30 , -13.12
+489.71 , -200.14 , -9.82
+489.71 , -126.99 , -6.47
+489.71 , -53.83 , -3.08
+489.71 , 19.33 , 0.45
+489.71 , 90.30 , 4.18
+489.71 , 161.28 , 7.95
+489.71 , 232.26 , 11.76
+489.71 , 303.24 , 15.61
+489.71 , 374.22 , 19.51
+489.71 , 445.20 , 23.44
+489.71 , 516.17 , 27.42
+489.71 , 587.15 , 31.44
+489.71 , 658.13 , 35.50
+489.71 , 729.11 , 39.60
+489.71 , 800.09 , 43.75
+489.71 , 871.06 , 47.93
+489.71 , 942.04 , 52.16
+489.71 , 1013.02 , 56.43
+489.71 , 1084.00 , 60.74
+489.71 , 1154.98 , 65.09
+489.71 , 1225.96 , 69.48
+489.71 , 1296.93 , 73.92
+489.71 , 1367.91 , 78.39
+489.71 , 1438.89 , 82.91
+489.71 , 1509.87 , 87.47
+489.71 , 1580.85 , 92.07
+489.71 , 1651.83 , 96.71
+489.71 , 1722.80 , 101.39
+489.71 , 1793.78 , 106.12
+489.71 , 1864.76 , 110.88
+489.71 , 1935.74 , 115.69
+489.71 , 2006.72 , 120.54
+489.71 , 2077.69 , 125.43
+489.71 , 2148.67 , 130.36
+489.71 , 2219.65 , 135.34
+489.71 , 2290.63 , 140.35
+816.18 , -2281.78 , -167.43
+816.18 , -2211.21 , -162.69
+816.18 , -2140.64 , -157.90
+816.18 , -2070.07 , -153.08
+816.18 , -1999.50 , -148.21
+816.18 , -1928.94 , -143.30
+816.18 , -1858.37 , -138.35
+816.18 , -1787.80 , -133.36
+816.18 , -1717.23 , -128.33
+816.18 , -1646.66 , -123.26
+816.18 , -1576.09 , -118.15
+816.18 , -1505.52 , -113.00
+816.18 , -1434.95 , -107.81
+816.18 , -1364.38 , -102.57
+816.18 , -1292.19 , -97.44
+816.18 , -1219.60 , -92.30
+816.18 , -1146.94 , -87.12
+816.18 , -1073.79 , -81.95
+816.18 , -1000.63 , -76.73
+816.18 , -927.47 , -71.48
+816.18 , -854.32 , -66.18
+816.18 , -781.16 , -60.84
+816.18 , -708.00 , -55.46
+816.18 , -634.85 , -50.04
+816.18 , -561.69 , -44.58
+816.18 , -488.53 , -39.08
+816.18 , -415.38 , -33.54
+816.18 , -342.22 , -27.96
+816.18 , -269.06 , -22.34
+816.18 , -195.91 , -16.67
+816.18 , -122.75 , -10.97
+816.18 , -49.60 , -5.23
+816.18 , 23.56 , 0.69
+816.18 , 94.54 , 6.82
+816.18 , 165.52 , 12.99
+816.18 , 236.50 , 19.21
+816.18 , 307.47 , 25.47
+816.18 , 378.45 , 31.77
+816.18 , 449.43 , 38.11
+816.18 , 520.41 , 44.49
+816.18 , 591.39 , 50.91
+816.18 , 662.37 , 57.37
+816.18 , 733.34 , 63.88
+816.18 , 804.32 , 70.43
+816.18 , 875.30 , 77.02
+816.18 , 946.28 , 83.65
+816.18 , 1017.26 , 90.32
+816.18 , 1088.23 , 97.03
+816.18 , 1159.21 , 103.79
+816.18 , 1230.19 , 110.58
+816.18 , 1301.17 , 117.42
+816.18 , 1372.15 , 124.30
+816.18 , 1443.13 , 131.22
+816.18 , 1514.10 , 138.18
+816.18 , 1585.08 , 145.19
+816.18 , 1656.06 , 152.23
+816.18 , 1727.04 , 159.32
+816.18 , 1798.02 , 166.45
+816.18 , 1869.00 , 173.62
+816.18 , 1939.97 , 180.83
+816.18 , 2010.95 , 188.08
+816.18 , 2081.93 , 195.38
+816.18 , 2152.91 , 202.72
+816.18 , 2223.89 , 210.09
+816.18 , 2294.87 , 217.51
+1020.26 , -2284.43 , -214.59
+1020.26 , -2213.86 , -208.31
+1020.26 , -2143.29 , -202.00
+1020.26 , -2072.72 , -195.65
+1020.26 , -2002.15 , -189.26
+1020.26 , -1931.58 , -182.82
+1020.26 , -1861.01 , -176.35
+1020.26 , -1790.44 , -169.83
+1020.26 , -1719.87 , -163.27
+1020.26 , -1649.31 , -156.68
+1020.26 , -1578.74 , -150.04
+1020.26 , -1507.48 , -143.43
+1020.26 , -1435.51 , -136.87
+1020.26 , -1363.53 , -130.26
+1020.26 , -1290.61 , -123.71
+1020.26 , -1217.45 , -117.14
+1020.26 , -1144.29 , -110.54
+1020.26 , -1071.14 , -103.89
+1020.26 , -997.98 , -97.21
+1020.26 , -924.83 , -90.48
+1020.26 , -851.67 , -83.71
+1020.26 , -778.51 , -76.90
+1020.26 , -705.36 , -70.05
+1020.26 , -632.20 , -63.16
+1020.26 , -559.04 , -56.23
+1020.26 , -485.89 , -49.26
+1020.26 , -412.73 , -42.25
+1020.26 , -339.57 , -35.19
+1020.26 , -266.42 , -28.10
+1020.26 , -193.26 , -20.97
+1020.26 , -120.10 , -13.79
+1020.26 , -46.95 , -6.58
+1020.26 , 26.21 , 0.83
+1020.26 , 97.19 , 8.47
+1020.26 , 168.17 , 16.15
+1020.26 , 239.14 , 23.86
+1020.26 , 310.12 , 31.62
+1020.26 , 381.10 , 39.42
+1020.26 , 452.08 , 47.27
+1020.26 , 523.06 , 55.15
+1020.26 , 594.03 , 63.08
+1020.26 , 665.01 , 71.04
+1020.26 , 735.99 , 79.05
+1020.26 , 806.97 , 87.10
+1020.26 , 877.95 , 95.19
+1020.26 , 948.93 , 103.33
+1020.26 , 1019.90 , 111.50
+1020.26 , 1090.88 , 119.71
+1020.26 , 1161.86 , 127.97
+1020.26 , 1232.84 , 136.27
+1020.26 , 1303.82 , 144.61
+1020.26 , 1374.80 , 152.99
+1020.26 , 1445.77 , 161.42
+1020.26 , 1516.75 , 169.88
+1020.26 , 1587.73 , 178.39
+1020.26 , 1658.71 , 186.94
+1020.26 , 1729.69 , 195.52
+1020.26 , 1800.66 , 204.16
+1020.26 , 1871.64 , 212.83
+1020.26 , 1942.62 , 221.54
+1020.26 , 2013.60 , 230.30
+1020.26 , 2084.58 , 239.09
+1020.26 , 2155.56 , 247.93
+1020.26 , 2226.53 , 256.82
+1020.26 , 2297.51 , 265.74
+1224.27 , -2287.08 , -261.52
+1224.27 , -2216.51 , -253.73
+1224.27 , -2145.94 , -245.89
+1224.27 , -2075.37 , -238.00
+1224.27 , -2004.80 , -230.08
+1224.27 , -1934.23 , -222.12
+1224.27 , -1863.66 , -214.12
+1224.27 , -1793.09 , -206.07
+1224.27 , -1722.38 , -198.01
+1224.27 , -1651.03 , -189.99
+1224.27 , -1579.67 , -181.93
+1224.27 , -1507.43 , -173.93
+1224.27 , -1434.27 , -166.02
+1224.27 , -1361.12 , -158.06
+1224.27 , -1287.96 , -150.07
+1224.27 , -1214.80 , -142.03
+1224.27 , -1141.65 , -133.96
+1224.27 , -1068.49 , -125.84
+1224.27 , -995.34 , -117.68
+1224.27 , -922.18 , -109.48
+1224.27 , -849.02 , -101.24
+1224.27 , -775.87 , -92.96
+1224.27 , -702.71 , -84.64
+1224.27 , -629.55 , -76.28
+1224.27 , -556.40 , -67.88
+1224.27 , -483.24 , -59.44
+1224.27 , -410.08 , -50.95
+1224.27 , -336.93 , -42.43
+1224.27 , -263.77 , -33.86
+1224.27 , -190.61 , -25.26
+1224.27 , -117.46 , -16.61
+1224.27 , -44.30 , -7.93
+1224.27 , 28.86 , 0.98
+1224.27 , 99.83 , 10.12
+1224.27 , 170.81 , 19.30
+1224.27 , 241.79 , 28.52
+1224.27 , 312.77 , 37.78
+1224.27 , 383.75 , 47.08
+1224.27 , 454.72 , 56.43
+1224.27 , 525.70 , 65.81
+1224.27 , 596.68 , 75.24
+1224.27 , 667.66 , 84.71
+1224.27 , 738.64 , 94.22
+1224.27 , 809.62 , 103.77
+1224.27 , 880.59 , 113.37
+1224.27 , 951.57 , 123.00
+1224.27 , 1022.55 , 132.68
+1224.27 , 1093.53 , 142.40
+1224.27 , 1164.51 , 152.16
+1224.27 , 1235.49 , 161.96
+1224.27 , 1306.46 , 171.80
+1224.27 , 1377.44 , 181.68
+1224.27 , 1448.42 , 191.61
+1224.27 , 1519.40 , 201.58
+1224.27 , 1590.38 , 211.59
+1224.27 , 1661.36 , 221.64
+1224.27 , 1732.33 , 231.73
+1224.27 , 1803.31 , 241.85
+1224.27 , 1874.29 , 252.03
+1224.27 , 1945.27 , 262.25
+1224.27 , 2016.25 , 272.52
+1224.27 , 2087.22 , 282.81
+1224.27 , 2158.20 , 293.15
+1224.27 , 2229.18 , 303.54
+1224.27 , 2300.16 , 313.96
+1428.29 , -2289.72 , -308.21
+1428.29 , -2219.15 , -298.90
+1428.29 , -2148.58 , -289.53
+1428.29 , -2078.02 , -280.12
+1428.29 , -2007.45 , -270.68
+1428.29 , -1936.88 , -261.19
+1428.29 , -1866.16 , -251.68
+1428.29 , -1795.42 , -242.14
+1428.29 , -1724.25 , -232.62
+1428.29 , -1651.10 , -223.36
+1428.29 , -1577.94 , -214.06
+1428.29 , -1504.78 , -204.71
+1428.29 , -1431.63 , -195.33
+1428.29 , -1358.47 , -185.90
+1428.29 , -1285.31 , -176.43
+1428.29 , -1212.16 , -166.93
+1428.29 , -1139.00 , -157.38
+1428.29 , -1065.85 , -147.79
+1428.29 , -992.69 , -138.16
+1428.29 , -919.53 , -128.49
+1428.29 , -846.38 , -118.78
+1428.29 , -773.22 , -109.03
+1428.29 , -700.06 , -99.24
+1428.29 , -626.91 , -89.41
+1428.29 , -553.75 , -79.53
+1428.29 , -480.59 , -69.62
+1428.29 , -407.44 , -59.66
+1428.29 , -334.28 , -49.67
+1428.29 , -261.12 , -39.63
+1428.29 , -187.97 , -29.56
+1428.29 , -114.81 , -19.44
+1428.29 , -41.65 , -9.28
+1428.29 , 31.50 , 1.13
+1428.29 , 102.48 , 11.77
+1428.29 , 173.46 , 22.45
+1428.29 , 244.44 , 33.17
+1428.29 , 315.42 , 43.94
+1428.29 , 386.39 , 54.74
+1428.29 , 457.37 , 65.59
+1428.29 , 528.35 , 76.48
+1428.29 , 599.33 , 87.41
+1428.29 , 670.31 , 98.38
+1428.29 , 741.28 , 109.39
+1428.29 , 812.26 , 120.45
+1428.29 , 883.24 , 131.54
+1428.29 , 954.22 , 142.68
+1428.29 , 1025.20 , 153.86
+1428.29 , 1096.18 , 165.08
+1428.29 , 1167.15 , 176.34
+1428.29 , 1238.13 , 187.65
+1428.29 , 1309.11 , 198.99
+1428.29 , 1380.09 , 210.38
+1428.29 , 1451.07 , 221.80
+1428.29 , 1522.05 , 233.27
+1428.29 , 1593.02 , 244.77
+1428.29 , 1664.00 , 256.35
+1428.29 , 1734.98 , 267.92
+1428.29 , 1805.96 , 279.57
+1428.29 , 1876.94 , 291.24
+1428.29 , 1947.91 , 302.96
+1428.29 , 2018.89 , 314.72
+1428.29 , 2089.87 , 326.51
+1428.29 , 2160.85 , 338.38
+1428.29 , 2231.83 , 350.24
+1428.29 , 2302.81 , 362.18
+1632.39 , -2292.37 , -354.70
+1632.39 , -2221.80 , -343.86
+1632.39 , -2151.23 , -332.97
+1632.39 , -2080.66 , -322.02
+1632.39 , -2010.09 , -311.06
+1632.39 , -1939.52 , -300.04
+1632.39 , -1867.11 , -289.30
+1632.39 , -1794.40 , -278.58
+1632.39 , -1721.61 , -267.82
+1632.39 , -1648.45 , -257.08
+1632.39 , -1575.29 , -246.31
+1632.39 , -1502.14 , -235.49
+1632.39 , -1428.98 , -224.64
+1632.39 , -1355.82 , -213.74
+1632.39 , -1282.67 , -202.80
+1632.39 , -1209.51 , -191.82
+1632.39 , -1136.35 , -180.81
+1632.39 , -1063.20 , -169.75
+1632.39 , -990.04 , -158.65
+1632.39 , -916.88 , -147.50
+1632.39 , -843.73 , -136.32
+1632.39 , -770.57 , -125.10
+1632.39 , -697.41 , -113.84
+1632.39 , -624.26 , -102.53
+1632.39 , -551.10 , -91.19
+1632.39 , -477.95 , -79.80
+1632.39 , -404.79 , -68.38
+1632.39 , -331.63 , -56.91
+1632.39 , -258.48 , -45.40
+1632.39 , -185.32 , -33.86
+1632.39 , -112.16 , -22.27
+1632.39 , -39.01 , -10.64
+1632.39 , 34.15 , 1.27
+1632.39 , 105.13 , 13.42
+1632.39 , 176.11 , 25.60
+1632.39 , 247.08 , 37.82
+1632.39 , 318.06 , 50.09
+1632.39 , 389.04 , 62.40
+1632.39 , 460.02 , 74.75
+1632.39 , 531.00 , 87.14
+1632.39 , 601.98 , 99.57
+1632.39 , 672.95 , 112.05
+1632.39 , 743.93 , 124.56
+1632.39 , 814.91 , 137.12
+1632.39 , 885.89 , 149.72
+1632.39 , 956.87 , 162.36
+1632.39 , 1027.85 , 175.04
+1632.39 , 1098.82 , 187.76
+1632.39 , 1169.80 , 200.52
+1632.39 , 1240.78 , 213.33
+1632.39 , 1311.76 , 226.18
+1632.39 , 1382.74 , 239.06
+1632.39 , 1453.71 , 252.01
+1632.39 , 1524.69 , 264.98
+1632.39 , 1595.67 , 277.98
+1632.39 , 1666.65 , 291.03
+1632.39 , 1737.63 , 304.12
+1632.39 , 1808.61 , 317.27
+1632.39 , 1879.58 , 330.46
+1632.39 , 1950.56 , 343.67
+1632.39 , 2021.54 , 356.94
+1632.39 , 2092.52 , 370.23
+1632.39 , 2163.50 , 383.59
+1632.39 , 2234.48 , 396.98
+1632.39 , 2305.45 , 410.41
+1836.41 , -2295.02 , -400.96
+1836.41 , -2224.45 , -388.59
+1836.41 , -2153.88 , -376.16
+1836.41 , -2082.47 , -363.88
+1836.41 , -2010.38 , -351.65
+1836.41 , -1938.28 , -339.43
+1836.41 , -1865.27 , -327.31
+1836.41 , -1792.12 , -315.19
+1836.41 , -1718.96 , -303.03
+1836.41 , -1645.80 , -290.81
+1836.41 , -1572.65 , -278.57
+1836.41 , -1499.49 , -266.29
+1836.41 , -1426.33 , -253.95
+1836.41 , -1353.18 , -241.58
+1836.41 , -1280.02 , -229.17
+1836.41 , -1206.86 , -216.72
+1836.41 , -1133.71 , -204.23
+1836.41 , -1060.55 , -191.70
+1836.41 , -987.39 , -179.13
+1836.41 , -914.24 , -166.52
+1836.41 , -841.08 , -153.87
+1836.41 , -767.92 , -141.17
+1836.41 , -694.77 , -128.44
+1836.41 , -621.61 , -115.66
+1836.41 , -548.46 , -102.85
+1836.41 , -475.30 , -89.99
+1836.41 , -402.14 , -77.09
+1836.41 , -328.99 , -64.16
+1836.41 , -255.83 , -51.18
+1836.41 , -182.67 , -38.16
+1836.41 , -109.52 , -25.10
+1836.41 , -36.36 , -12.00
+1836.41 , 36.80 , 1.42
+1836.41 , 107.77 , 15.06
+1836.41 , 178.75 , 28.75
+1836.41 , 249.73 , 42.48
+1836.41 , 320.71 , 56.25
+1836.41 , 391.69 , 70.05
+1836.41 , 462.67 , 83.91
+1836.41 , 533.64 , 97.80
+1836.41 , 604.62 , 111.73
+1836.41 , 675.60 , 125.71
+1836.41 , 746.58 , 139.73
+1836.41 , 817.56 , 153.79
+1836.41 , 888.54 , 167.89
+1836.41 , 959.51 , 182.03
+1836.41 , 1030.49 , 196.22
+1836.41 , 1101.47 , 210.44
+1836.41 , 1172.45 , 224.71
+1836.41 , 1243.43 , 239.02
+1836.41 , 1314.41 , 253.38
+1836.41 , 1385.38 , 267.75
+1836.41 , 1456.36 , 282.20
+1836.41 , 1527.34 , 296.67
+1836.41 , 1598.32 , 311.17
+1836.41 , 1669.30 , 325.74
+1836.41 , 1740.27 , 340.33
+1836.41 , 1811.25 , 354.97
+1836.41 , 1882.23 , 369.66
+1836.41 , 1953.21 , 384.38
+1836.41 , 2024.19 , 399.14
+1836.41 , 2095.17 , 413.95
+1836.41 , 2166.14 , 428.81
+1836.41 , 2237.12 , 443.69
+1836.41 , 2308.10 , 458.63
+2040.43 , -2297.45 , -447.05
+2040.43 , -2225.97 , -433.34
+2040.43 , -2154.50 , -419.59
+2040.43 , -2082.09 , -405.98
+2040.43 , -2008.94 , -392.51
+2040.43 , -1935.78 , -378.99
+2040.43 , -1862.63 , -365.45
+2040.43 , -1789.47 , -351.86
+2040.43 , -1716.31 , -338.22
+2040.43 , -1643.16 , -324.54
+2040.43 , -1570.00 , -310.82
+2040.43 , -1496.84 , -297.07
+2040.43 , -1423.69 , -283.26
+2040.43 , -1350.53 , -269.42
+2040.43 , -1277.37 , -255.54
+2040.43 , -1204.22 , -241.63
+2040.43 , -1131.06 , -227.66
+2040.43 , -1057.90 , -213.66
+2040.43 , -984.75 , -199.62
+2040.43 , -911.59 , -185.54
+2040.43 , -838.43 , -171.41
+2040.43 , -765.28 , -157.25
+2040.43 , -692.12 , -143.04
+2040.43 , -618.96 , -128.80
+2040.43 , -545.81 , -114.51
+2040.43 , -472.65 , -100.18
+2040.43 , -399.50 , -85.81
+2040.43 , -326.34 , -71.40
+2040.43 , -253.18 , -56.95
+2040.43 , -180.03 , -42.46
+2040.43 , -106.87 , -27.93
+2040.43 , -33.71 , -13.36
+2040.43 , 39.44 , 1.56
+2040.43 , 110.42 , 16.71
+2040.43 , 181.40 , 31.90
+2040.43 , 252.38 , 47.13
+2040.43 , 323.36 , 62.40
+2040.43 , 394.33 , 77.71
+2040.43 , 465.31 , 93.06
+2040.43 , 536.29 , 108.46
+2040.43 , 607.27 , 123.90
+2040.43 , 678.25 , 139.38
+2040.43 , 749.23 , 154.90
+2040.43 , 820.20 , 170.46
+2040.43 , 891.18 , 186.06
+2040.43 , 962.16 , 201.71
+2040.43 , 1033.14 , 217.39
+2040.43 , 1104.12 , 233.13
+2040.43 , 1175.10 , 248.88
+2040.43 , 1246.07 , 264.71
+2040.43 , 1317.05 , 280.56
+2040.43 , 1388.03 , 296.45
+2040.43 , 1459.01 , 312.38
+2040.43 , 1529.99 , 328.35
+2040.43 , 1600.96 , 344.36
+2040.43 , 1671.94 , 360.43
+2040.43 , 1742.92 , 376.55
+2040.43 , 1813.90 , 392.69
+2040.43 , 1884.88 , 408.85
+2040.43 , 1955.86 , 425.09
+2040.43 , 2026.83 , 441.35
+2040.43 , 2097.81 , 457.66
+2040.43 , 2168.79 , 474.01
+2040.43 , 2239.77 , 490.39
+2040.43 , 2310.75 , 506.85
+2244.53 , -2298.92 , -493.14
+2244.53 , -2225.76 , -478.32
+2244.53 , -2152.60 , -463.45
+2244.53 , -2079.45 , -448.56
+2244.53 , -2006.29 , -433.62
+2244.53 , -1933.13 , -418.63
+2244.53 , -1859.98 , -403.59
+2244.53 , -1786.82 , -388.52
+2244.53 , -1713.66 , -373.41
+2244.53 , -1640.51 , -358.28
+2244.53 , -1567.35 , -343.09
+2244.53 , -1494.19 , -327.86
+2244.53 , -1421.04 , -312.58
+2244.53 , -1347.88 , -297.28
+2244.53 , -1274.73 , -281.92
+2244.53 , -1201.57 , -266.54
+2244.53 , -1128.41 , -251.09
+2244.53 , -1055.26 , -235.63
+2244.53 , -982.10 , -220.11
+2244.53 , -908.94 , -204.56
+2244.53 , -835.79 , -188.96
+2244.53 , -762.63 , -173.33
+2244.53 , -689.47 , -157.65
+2244.53 , -616.32 , -141.93
+2244.53 , -543.16 , -126.17
+2244.53 , -470.00 , -110.38
+2244.53 , -396.85 , -94.54
+2244.53 , -323.69 , -78.65
+2244.53 , -250.53 , -62.74
+2244.53 , -177.38 , -46.77
+2244.53 , -104.22 , -30.77
+2244.53 , -31.07 , -14.73
+2244.53 , 42.09 , 1.71
+2244.53 , 113.07 , 18.36
+2244.53 , 184.05 , 35.05
+2244.53 , 255.03 , 51.78
+2244.53 , 326.00 , 68.55
+2244.53 , 396.98 , 85.37
+2244.53 , 467.96 , 102.22
+2244.53 , 538.94 , 119.12
+2244.53 , 609.92 , 136.06
+2244.53 , 680.90 , 153.04
+2244.53 , 751.87 , 170.06
+2244.53 , 822.85 , 187.13
+2244.53 , 893.83 , 204.23
+2244.53 , 964.81 , 221.38
+2244.53 , 1035.79 , 238.58
+2244.53 , 1106.76 , 255.80
+2244.53 , 1177.74 , 273.08
+2244.53 , 1248.72 , 290.37
+2244.53 , 1319.70 , 307.75
+2244.53 , 1390.68 , 325.14
+2244.53 , 1461.66 , 342.56
+2244.53 , 1532.63 , 360.05
+2244.53 , 1603.61 , 377.57
+2244.53 , 1674.59 , 395.13
+2244.53 , 1745.57 , 412.75
+2244.53 , 1816.55 , 430.38
+2244.53 , 1887.53 , 448.07
+2244.53 , 1958.50 , 465.80
+2244.53 , 2029.48 , 483.56
+2244.53 , 2100.46 , 501.37
+2244.53 , 2171.44 , 519.22
+2244.53 , 2242.42 , 537.13
+2244.53 , 2313.39 , 555.05
+2448.55 , -2296.27 , -540.13
+2448.55 , -2223.11 , -523.84
+2448.55 , -2149.96 , -507.49
+2448.55 , -2076.80 , -491.13
+2448.55 , -2003.64 , -474.69
+2448.55 , -1930.49 , -458.25
+2448.55 , -1857.33 , -441.74
+2448.55 , -1784.17 , -425.20
+2448.55 , -1711.02 , -408.62
+2448.55 , -1637.86 , -392.01
+2448.55 , -1564.70 , -375.35
+2448.55 , -1491.55 , -358.65
+2448.55 , -1418.39 , -341.92
+2448.55 , -1345.24 , -325.12
+2448.55 , -1272.08 , -308.32
+2448.55 , -1198.92 , -291.44
+2448.55 , -1125.77 , -274.54
+2448.55 , -1052.61 , -257.60
+2448.55 , -979.45 , -240.61
+2448.55 , -906.30 , -223.58
+2448.55 , -833.14 , -206.51
+2448.55 , -759.98 , -189.41
+2448.55 , -686.83 , -172.26
+2448.55 , -613.67 , -155.07
+2448.55 , -540.51 , -137.84
+2448.55 , -467.36 , -120.57
+2448.55 , -394.20 , -103.26
+2448.55 , -321.04 , -85.91
+2448.55 , -247.89 , -68.52
+2448.55 , -174.73 , -51.08
+2448.55 , -101.58 , -33.61
+2448.55 , -28.42 , -16.10
+2448.55 , 44.74 , 1.85
+2448.55 , 115.72 , 20.00
+2448.55 , 186.69 , 38.19
+2448.55 , 257.67 , 56.43
+2448.55 , 328.65 , 74.71
+2448.55 , 399.63 , 93.02
+2448.55 , 470.61 , 111.38
+2448.55 , 541.59 , 129.78
+2448.55 , 612.56 , 148.22
+2448.55 , 683.54 , 166.70
+2448.55 , 754.52 , 185.23
+2448.55 , 825.50 , 203.80
+2448.55 , 896.48 , 222.40
+2448.55 , 967.46 , 241.06
+2448.55 , 1038.43 , 259.73
+2448.55 , 1109.41 , 278.48
+2448.55 , 1180.39 , 297.25
+2448.55 , 1251.37 , 316.07
+2448.55 , 1322.35 , 334.92
+2448.55 , 1393.32 , 353.81
+2448.55 , 1464.30 , 372.75
+2448.55 , 1535.28 , 391.74
+2448.55 , 1606.26 , 410.76
+2448.55 , 1677.24 , 429.82
+2448.55 , 1748.22 , 448.93
+2448.55 , 1819.19 , 468.09
+2448.55 , 1890.17 , 487.27
+2448.55 , 1961.15 , 506.50
+2448.55 , 2032.13 , 525.76
+2448.55 , 2103.11 , 545.09
+2448.55 , 2174.09 , 564.44
+2448.55 , 2245.06 , 583.84
+2448.55 , 2316.04 , 603.27
+2652.56 , -2293.62 , -587.11
+2652.56 , -2220.47 , -569.34
+2652.56 , -2147.31 , -551.53
+2652.56 , -2074.15 , -533.69
+2652.56 , -2001.00 , -515.80
+2652.56 , -1927.84 , -497.87
+2652.56 , -1854.68 , -479.91
+2652.56 , -1781.53 , -461.90
+2652.56 , -1708.37 , -443.84
+2652.56 , -1635.21 , -425.76
+2652.56 , -1562.06 , -407.63
+2652.56 , -1488.90 , -389.45
+2652.56 , -1415.74 , -371.23
+2652.56 , -1342.59 , -352.98
+2652.56 , -1269.43 , -334.68
+2652.56 , -1196.28 , -316.35
+2652.56 , -1123.12 , -297.98
+2652.56 , -1049.96 , -279.56
+2652.56 , -976.81 , -261.09
+2652.56 , -903.65 , -242.61
+2652.56 , -830.49 , -224.07
+2652.56 , -757.34 , -205.49
+2652.56 , -684.18 , -186.87
+2652.56 , -611.02 , -168.21
+2652.56 , -537.87 , -149.51
+2652.56 , -464.71 , -130.77
+2652.56 , -391.55 , -111.99
+2652.56 , -318.40 , -93.17
+2652.56 , -245.24 , -74.30
+2652.56 , -172.08 , -55.40
+2652.56 , -98.93 , -36.45
+2652.56 , -25.77 , -17.47
+2652.56 , 47.38 , 1.99
+2652.56 , 118.36 , 21.65
+2652.56 , 189.34 , 41.34
+2652.56 , 260.32 , 61.08
+2652.56 , 331.30 , 80.86
+2652.56 , 402.28 , 100.68
+2652.56 , 473.25 , 120.54
+2652.56 , 544.23 , 140.44
+2652.56 , 615.21 , 160.38
+2652.56 , 686.19 , 180.37
+2652.56 , 757.17 , 200.40
+2652.56 , 828.15 , 220.47
+2652.56 , 899.12 , 240.58
+2652.56 , 970.10 , 260.73
+2652.56 , 1041.08 , 280.92
+2652.56 , 1112.06 , 301.15
+2652.56 , 1183.04 , 321.44
+2652.56 , 1254.01 , 341.76
+2652.56 , 1324.99 , 362.10
+2652.56 , 1395.97 , 382.51
+2652.56 , 1466.95 , 402.95
+2652.56 , 1537.93 , 423.44
+2652.56 , 1608.91 , 443.95
+2652.56 , 1679.88 , 464.51
+2652.56 , 1750.86 , 485.12
+2652.56 , 1821.84 , 505.78
+2652.56 , 1892.82 , 526.48
+2652.56 , 1963.80 , 547.21
+2652.56 , 2034.78 , 567.97
+2652.56 , 2105.75 , 588.79
+2652.56 , 2176.73 , 609.64
+2652.56 , 2247.71 , 630.54
+2652.56 , 2318.69 , 651.49
+2856.67 , -2290.97 , -634.08
+2856.67 , -2217.82 , -614.84
+2856.67 , -2144.66 , -595.58
+2856.67 , -2071.51 , -576.24
+2856.67 , -1998.35 , -556.88
+2856.67 , -1925.19 , -537.50
+2856.67 , -1852.04 , -518.07
+2856.67 , -1778.88 , -498.59
+2856.67 , -1705.72 , -479.06
+2856.67 , -1632.57 , -459.50
+2856.67 , -1559.41 , -439.90
+2856.67 , -1486.25 , -420.25
+2856.67 , -1413.10 , -400.57
+2856.67 , -1339.94 , -380.83
+2856.67 , -1266.78 , -361.08
+2856.67 , -1193.63 , -341.26
+2856.67 , -1120.47 , -321.42
+2856.67 , -1047.31 , -301.52
+2856.67 , -974.16 , -281.61
+2856.67 , -901.00 , -261.64
+2856.67 , -827.85 , -241.63
+2856.67 , -754.69 , -221.58
+2856.67 , -681.53 , -201.49
+2856.67 , -608.38 , -181.36
+2856.67 , -535.22 , -161.19
+2856.67 , -462.06 , -140.97
+2856.67 , -388.91 , -120.72
+2856.67 , -315.75 , -100.43
+2856.67 , -242.59 , -80.09
+2856.67 , -169.44 , -59.72
+2856.67 , -96.28 , -39.30
+2856.67 , -23.12 , -18.84
+2856.67 , 50.03 , 2.13
+2856.67 , 121.01 , 23.29
+2856.67 , 191.99 , 44.49
+2856.67 , 262.97 , 65.73
+2856.67 , 333.95 , 87.01
+2856.67 , 404.92 , 108.33
+2856.67 , 475.90 , 129.69
+2856.67 , 546.88 , 151.10
+2856.67 , 617.86 , 172.54
+2856.67 , 688.84 , 194.03
+2856.67 , 759.81 , 215.56
+2856.67 , 830.79 , 237.13
+2856.67 , 901.77 , 258.75
+2856.67 , 972.75 , 280.40
+2856.67 , 1043.73 , 302.10
+2856.67 , 1114.71 , 323.84
+2856.67 , 1185.68 , 345.61
+2856.67 , 1256.66 , 367.42
+2856.67 , 1327.64 , 389.29
+2856.67 , 1398.62 , 411.20
+2856.67 , 1469.60 , 433.14
+2856.67 , 1540.58 , 455.12
+2856.67 , 1611.55 , 477.16
+2856.67 , 1682.53 , 499.21
+2856.67 , 1753.51 , 521.32
+2856.67 , 1824.49 , 543.48
+2856.67 , 1895.47 , 565.68
+2856.67 , 1966.44 , 587.91
+2856.67 , 2037.42 , 610.18
+2856.67 , 2108.40 , 632.51
+2856.67 , 2179.38 , 654.85
+2856.67 , 2250.36 , 677.28
+2856.67 , 2321.34 , 699.70
+3060.68 , -2288.33 , -681.07
+3060.68 , -2215.17 , -660.36
+3060.68 , -2142.02 , -639.62
+3060.68 , -2068.86 , -618.82
+3060.68 , -1995.70 , -598.01
+3060.68 , -1922.55 , -577.12
+3060.68 , -1849.39 , -556.22
+3060.68 , -1776.23 , -535.27
+3060.68 , -1703.08 , -514.26
+3060.68 , -1629.92 , -493.24
+3060.68 , -1556.76 , -472.16
+3060.68 , -1483.61 , -451.04
+3060.68 , -1410.45 , -429.89
+3060.68 , -1337.29 , -408.69
+3060.68 , -1264.14 , -387.47
+3060.68 , -1190.98 , -366.18
+3060.68 , -1117.82 , -344.86
+3060.68 , -1044.67 , -323.50
+3060.68 , -971.51 , -302.11
+3060.68 , -898.36 , -280.67
+3060.68 , -825.20 , -259.18
+3060.68 , -752.04 , -237.67
+3060.68 , -678.89 , -216.11
+3060.68 , -605.73 , -194.51
+3060.68 , -532.57 , -172.86
+3060.68 , -459.42 , -151.18
+3060.68 , -386.26 , -129.45
+3060.68 , -313.10 , -107.69
+3060.68 , -239.95 , -85.88
+3060.68 , -166.79 , -64.04
+3060.68 , -93.63 , -42.15
+3060.68 , -20.48 , -20.22
+3060.68 , 52.68 , 2.28
+3060.68 , 123.66 , 24.93
+3060.68 , 194.64 , 47.63
+3060.68 , 265.61 , 70.37
+3060.68 , 336.59 , 93.16
+3060.68 , 407.57 , 115.98
+3060.68 , 478.55 , 138.85
+3060.68 , 549.53 , 161.75
+3060.68 , 620.51 , 184.70
+3060.68 , 691.48 , 207.69
+3060.68 , 762.46 , 230.72
+3060.68 , 833.44 , 253.80
+3060.68 , 904.42 , 276.92
+3060.68 , 975.40 , 300.06
+3060.68 , 1046.37 , 323.28
+3060.68 , 1117.35 , 346.49
+3060.68 , 1188.33 , 369.78
+3060.68 , 1259.31 , 393.10
+3060.68 , 1330.29 , 416.46
+3060.68 , 1401.27 , 439.87
+3060.68 , 1472.24 , 463.33
+3060.68 , 1543.22 , 486.81
+3060.68 , 1614.20 , 510.34
+3060.68 , 1685.18 , 533.92
+3060.68 , 1756.16 , 557.53
+3060.68 , 1827.14 , 581.18
+3060.68 , 1898.11 , 604.88
+3060.68 , 1969.09 , 628.61
+3060.68 , 2040.07 , 652.38
+3060.68 , 2111.05 , 676.20
+3060.68 , 2182.03 , 700.07
+3060.68 , 2253.00 , 723.97
+3060.68 , 2323.98 , 747.91
+3264.70 , -2285.68 , -728.05
+3264.70 , -2212.52 , -705.87
+3264.70 , -2139.37 , -683.66
+3264.70 , -2066.21 , -661.40
+3264.70 , -1993.06 , -639.10
+3264.70 , -1919.90 , -616.77
+3264.70 , -1846.74 , -594.36
+3264.70 , -1773.59 , -571.96
+3264.70 , -1700.43 , -549.49
+3264.70 , -1627.27 , -526.99
+3264.70 , -1554.12 , -504.44
+3264.70 , -1480.96 , -481.87
+3264.70 , -1407.80 , -459.22
+3264.70 , -1334.65 , -436.55
+3264.70 , -1261.49 , -413.86
+3264.70 , -1188.33 , -391.09
+3264.70 , -1115.18 , -368.31
+3264.70 , -1042.02 , -345.49
+3264.70 , -968.86 , -322.63
+3264.70 , -895.71 , -299.72
+3264.70 , -822.55 , -276.76
+3264.70 , -749.40 , -253.76
+3264.70 , -676.24 , -230.73
+3264.70 , -603.08 , -207.66
+3264.70 , -529.93 , -184.54
+3264.70 , -456.77 , -161.39
+3264.70 , -383.61 , -138.19
+3264.70 , -310.46 , -114.95
+3264.70 , -237.30 , -91.68
+3264.70 , -164.14 , -68.36
+3264.70 , -90.99 , -45.00
+3264.70 , -17.83 , -21.60
+3264.70 , 55.33 , 2.42
+3264.70 , 126.30 , 26.58
+3264.70 , 197.28 , 50.78
+3264.70 , 268.26 , 75.02
+3264.70 , 339.24 , 99.31
+3264.70 , 410.22 , 123.63
+3264.70 , 481.20 , 148.00
+3264.70 , 552.17 , 172.41
+3264.70 , 623.15 , 196.86
+3264.70 , 694.13 , 221.35
+3264.70 , 765.11 , 245.90
+3264.70 , 836.09 , 270.47
+3264.70 , 907.06 , 295.09
+3264.70 , 978.04 , 319.73
+3264.70 , 1049.02 , 344.44
+3264.70 , 1120.00 , 369.18
+3264.70 , 1190.98 , 393.97
+3264.70 , 1261.96 , 418.78
+3264.70 , 1332.93 , 443.66
+3264.70 , 1403.91 , 468.57
+3264.70 , 1474.89 , 493.51
+3264.70 , 1545.87 , 518.51
+3264.70 , 1616.85 , 543.54
+3264.70 , 1687.83 , 568.62
+3264.70 , 1758.80 , 593.72
+3264.70 , 1829.78 , 618.87
+3264.70 , 1900.76 , 644.07
+3264.70 , 1971.74 , 669.32
+3264.70 , 2042.72 , 694.59
+3264.70 , 2113.69 , 719.93
+3264.70 , 2184.67 , 745.28
+3264.70 , 2255.65 , 770.69
+3264.70 , 2326.63 , 796.13
+3468.80 , -2283.03 , -775.05
+3468.80 , -2209.88 , -751.39
+3468.80 , -2136.72 , -727.71
+3468.80 , -2063.56 , -703.98
+3468.80 , -1990.41 , -680.20
+3468.80 , -1917.25 , -656.40
+3468.80 , -1844.09 , -632.55
+3468.80 , -1770.94 , -608.65
+3468.80 , -1697.78 , -584.70
+3468.80 , -1624.63 , -560.73
+3468.80 , -1551.47 , -536.71
+3468.80 , -1478.31 , -512.66
+3468.80 , -1405.16 , -488.57
+3468.80 , -1332.00 , -464.43
+3468.80 , -1258.84 , -440.24
+3468.80 , -1185.69 , -416.03
+3468.80 , -1112.53 , -391.76
+3468.80 , -1039.37 , -367.48
+3468.80 , -966.22 , -343.12
+3468.80 , -893.06 , -318.73
+3468.80 , -819.90 , -294.33
+3468.80 , -746.75 , -269.87
+3468.80 , -673.59 , -245.36
+3468.80 , -600.43 , -220.81
+3468.80 , -527.28 , -196.23
+3468.80 , -454.12 , -171.60
+3468.80 , -380.97 , -146.93
+3468.80 , -307.81 , -122.22
+3468.80 , -234.65 , -97.47
+3468.80 , -161.50 , -72.69
+3468.80 , -88.34 , -47.86
+3468.80 , -15.18 , -22.99
+3468.80 , 57.97 , 2.55
+3468.80 , 128.95 , 28.22
+3468.80 , 199.93 , 53.92
+3468.80 , 270.91 , 79.67
+3468.80 , 341.89 , 105.45
+3468.80 , 412.86 , 131.28
+3468.80 , 483.84 , 157.15
+3468.80 , 554.82 , 183.07
+3468.80 , 625.80 , 209.02
+3468.80 , 696.78 , 235.01
+3468.80 , 767.76 , 261.06
+3468.80 , 838.73 , 287.12
+3468.80 , 909.71 , 313.24
+3468.80 , 980.69 , 339.40
+3468.80 , 1051.67 , 365.61
+3468.80 , 1122.65 , 391.85
+3468.80 , 1193.63 , 418.14
+3468.80 , 1264.60 , 444.47
+3468.80 , 1335.58 , 470.83
+3468.80 , 1406.56 , 497.23
+3468.80 , 1477.54 , 523.69
+3468.80 , 1548.52 , 550.19
+3468.80 , 1619.49 , 576.72
+3468.80 , 1690.47 , 603.29
+3468.80 , 1761.45 , 629.92
+3468.80 , 1832.43 , 656.57
+3468.80 , 1903.41 , 683.29
+3468.80 , 1974.39 , 710.01
+3468.80 , 2045.36 , 736.80
+3468.80 , 2116.34 , 763.62
+3468.80 , 2187.32 , 790.48
+3468.80 , 2258.30 , 817.40
+3468.80 , 2329.28 , 844.36
+3672.82 , -2280.39 , -822.04
+3672.82 , -2207.23 , -796.93
+3672.82 , -2134.07 , -771.75
+3672.82 , -2060.92 , -746.55
+3672.82 , -1987.76 , -721.32
+3672.82 , -1914.60 , -696.03
+3672.82 , -1841.45 , -670.70
+3672.82 , -1768.29 , -645.35
+3672.82 , -1695.14 , -619.93
+3672.82 , -1621.98 , -594.49
+3672.82 , -1548.82 , -568.99
+3672.82 , -1475.67 , -543.48
+3672.82 , -1402.51 , -517.91
+3672.82 , -1329.35 , -492.30
+3672.82 , -1256.20 , -466.66
+3672.82 , -1183.04 , -440.95
+3672.82 , -1109.88 , -415.24
+3672.82 , -1036.73 , -389.45
+3672.82 , -963.57 , -363.64
+3672.82 , -890.41 , -337.79
+3672.82 , -817.26 , -311.88
+3672.82 , -744.10 , -285.95
+3672.82 , -670.94 , -259.98
+3672.82 , -597.79 , -233.97
+3672.82 , -524.63 , -207.91
+3672.82 , -451.48 , -181.81
+3672.82 , -378.32 , -155.67
+3672.82 , -305.16 , -129.50
+3672.82 , -232.01 , -103.27
+3672.82 , -158.85 , -77.01
+3672.82 , -85.69 , -50.71
+3672.82 , -12.54 , -24.37
+3672.82 , 60.62 , 2.69
+3672.82 , 131.60 , 29.86
+3672.82 , 202.58 , 57.06
+3672.82 , 273.56 , 84.31
+3672.82 , 344.53 , 111.60
+3672.82 , 415.51 , 138.93
+3672.82 , 486.49 , 166.31
+3672.82 , 557.47 , 193.72
+3672.82 , 628.45 , 221.19
+3672.82 , 699.42 , 248.68
+3672.82 , 770.40 , 276.22
+3672.82 , 841.38 , 303.79
+3672.82 , 912.36 , 331.42
+3672.82 , 983.34 , 359.09
+3672.82 , 1054.32 , 386.77
+3672.82 , 1125.29 , 414.53
+3672.82 , 1196.27 , 442.31
+3672.82 , 1267.25 , 470.14
+3672.82 , 1338.23 , 498.02
+3672.82 , 1409.21 , 525.93
+3672.82 , 1480.19 , 553.88
+3672.82 , 1551.16 , 581.88
+3672.82 , 1622.14 , 609.91
+3672.82 , 1693.12 , 638.00
+3672.82 , 1764.10 , 666.10
+3672.82 , 1835.08 , 694.27
+3672.82 , 1906.05 , 722.47
+3672.82 , 1977.03 , 750.71
+3672.82 , 2048.01 , 779.00
+3672.82 , 2118.99 , 807.34
+3672.82 , 2189.97 , 835.70
+3672.82 , 2260.95 , 864.11
+3672.82 , 2331.92 , 892.57
+3876.84 , -2277.74 , -869.05
+3876.84 , -2204.58 , -842.44
+3876.84 , -2131.43 , -815.81
+3876.84 , -2058.27 , -789.14
+3876.84 , -1985.11 , -762.44
+3876.84 , -1911.96 , -735.67
+3876.84 , -1838.80 , -708.87
+3876.84 , -1765.64 , -682.05
+3876.84 , -1692.49 , -655.16
+3876.84 , -1619.33 , -628.24
+3876.84 , -1546.18 , -601.30
+3876.84 , -1473.02 , -574.28
+3876.84 , -1399.86 , -547.24
+3876.84 , -1326.71 , -520.16
+3876.84 , -1253.55 , -493.05
+3876.84 , -1180.39 , -465.89
+3876.84 , -1107.24 , -438.68
+3876.84 , -1034.08 , -411.45
+3876.84 , -960.92 , -384.16
+3876.84 , -887.77 , -356.84
+3876.84 , -814.61 , -329.46
+3876.84 , -741.45 , -302.06
+3876.84 , -668.30 , -274.61
+3876.84 , -595.14 , -247.12
+3876.84 , -521.98 , -219.60
+3876.84 , -448.83 , -192.03
+3876.84 , -375.67 , -164.42
+3876.84 , -302.52 , -136.77
+3876.84 , -229.36 , -109.08
+3876.84 , -156.20 , -81.35
+3876.84 , -83.05 , -53.57
+3876.84 , -9.89 , -25.76
+3876.84 , 63.27 , 2.83
+3876.84 , 134.25 , 31.50
+3876.84 , 205.22 , 60.21
+3876.84 , 276.20 , 88.96
+3876.84 , 347.18 , 117.75
+3876.84 , 418.16 , 146.58
+3876.84 , 489.14 , 175.46
+3876.84 , 560.11 , 204.37
+3876.84 , 631.09 , 233.34
+3876.84 , 702.07 , 262.33
+3876.84 , 773.05 , 291.37
+3876.84 , 844.03 , 320.46
+3876.84 , 915.01 , 349.57
+3876.84 , 985.98 , 378.75
+3876.84 , 1056.96 , 407.96
+3876.84 , 1127.94 , 437.19
+3876.84 , 1198.92 , 466.50
+3876.84 , 1269.90 , 495.83
+3876.84 , 1340.88 , 525.20
+3876.84 , 1411.85 , 554.61
+3876.84 , 1482.83 , 584.06
+3876.84 , 1553.81 , 613.55
+3876.84 , 1624.79 , 643.10
+3876.84 , 1695.77 , 672.67
+3876.84 , 1766.74 , 702.32
+3876.84 , 1837.72 , 731.96
+3876.84 , 1908.70 , 761.68
+3876.84 , 1979.68 , 791.42
+3876.84 , 2050.66 , 821.21
+3876.84 , 2121.64 , 851.04
+3876.84 , 2192.61 , 880.90
+3876.84 , 2263.59 , 910.81
+3876.84 , 2334.57 , 940.77
+4080.85 , -2275.09 , -916.04
+4080.85 , -2201.94 , -887.99
+4080.85 , -2128.78 , -859.87
+4080.85 , -2055.62 , -831.72
+4080.85 , -1982.47 , -803.55
+4080.85 , -1909.31 , -775.32
+4080.85 , -1836.15 , -747.06
+4080.85 , -1763.00 , -718.74
+4080.85 , -1689.84 , -690.40
+4080.85 , -1616.69 , -662.01
+4080.85 , -1543.53 , -633.57
+4080.85 , -1470.37 , -605.10
+4080.85 , -1397.22 , -576.59
+4080.85 , -1324.06 , -548.03
+4080.85 , -1250.90 , -519.45
+4080.85 , -1177.75 , -490.82
+4080.85 , -1104.59 , -462.13
+4080.85 , -1031.43 , -433.43
+4080.85 , -958.28 , -404.68
+4080.85 , -885.12 , -375.87
+4080.85 , -811.96 , -347.05
+4080.85 , -738.81 , -318.17
+4080.85 , -665.65 , -289.25
+4080.85 , -592.49 , -260.29
+4080.85 , -519.34 , -231.29
+4080.85 , -446.18 , -202.25
+4080.85 , -373.03 , -173.17
+4080.85 , -299.87 , -144.05
+4080.85 , -226.71 , -114.88
+4080.85 , -153.56 , -85.68
+4080.85 , -80.40 , -56.44
+4080.85 , -7.24 , -27.14
+4080.85 , 65.91 , 2.97
+4080.85 , 136.89 , 33.14
+4080.85 , 207.87 , 63.35
+4080.85 , 278.85 , 93.60
+4080.85 , 349.83 , 123.90
+4080.85 , 420.80 , 154.23
+4080.85 , 491.78 , 184.61
+4080.85 , 562.76 , 215.04
+4080.85 , 633.74 , 245.48
+4080.85 , 704.72 , 275.99
+4080.85 , 775.70 , 306.53
+4080.85 , 846.67 , 337.11
+4080.85 , 917.65 , 367.75
+4080.85 , 988.63 , 398.40
+4080.85 , 1059.61 , 429.13
+4080.85 , 1130.59 , 459.86
+4080.85 , 1201.57 , 490.67
+4080.85 , 1272.54 , 521.49
+4080.85 , 1343.52 , 552.37
+4080.85 , 1414.50 , 583.29
+4080.85 , 1485.48 , 614.24
+4080.85 , 1556.46 , 645.26
+4080.85 , 1627.44 , 676.28
+4080.85 , 1698.41 , 707.37
+4080.85 , 1769.39 , 738.49
+4080.85 , 1840.37 , 769.66
+4080.85 , 1911.35 , 800.87
+4080.85 , 1982.33 , 832.13
+4080.85 , 2053.30 , 863.42
+4080.85 , 2124.28 , 894.75
+4080.85 , 2195.26 , 926.11
+4080.85 , 2266.24 , 957.52
+4080.85 , 2337.22 , 988.98
+4268.63 , -2272.66 , -959.29
+4268.63 , -2199.50 , -929.88
+4268.63 , -2126.34 , -900.40
+4268.63 , -2053.19 , -870.92
+4268.63 , -1980.03 , -841.37
+4268.63 , -1906.88 , -811.80
+4268.63 , -1833.72 , -782.18
+4268.63 , -1760.56 , -752.50
+4268.63 , -1687.41 , -722.81
+4268.63 , -1614.25 , -693.06
+4268.63 , -1541.09 , -663.29
+4268.63 , -1467.94 , -633.45
+4268.63 , -1394.78 , -603.59
+4268.63 , -1321.62 , -573.70
+4268.63 , -1248.47 , -543.74
+4268.63 , -1175.31 , -513.75
+4268.63 , -1102.15 , -483.74
+4268.63 , -1029.00 , -453.66
+4268.63 , -955.84 , -423.55
+4268.63 , -882.68 , -393.39
+4268.63 , -809.53 , -363.21
+4268.63 , -736.37 , -332.98
+4268.63 , -663.22 , -302.71
+4268.63 , -590.06 , -272.41
+4268.63 , -516.90 , -242.05
+4268.63 , -443.75 , -211.65
+4268.63 , -370.59 , -181.22
+4268.63 , -297.43 , -150.75
+4268.63 , -224.28 , -120.23
+4268.63 , -151.12 , -89.67
+4268.63 , -77.96 , -59.08
+4268.63 , -4.81 , -28.40
+4268.63 , 68.35 , 3.09
+4268.63 , 139.33 , 34.64
+4268.63 , 210.31 , 66.24
+4268.63 , 281.28 , 97.87
+4268.63 , 352.26 , 129.55
+4268.63 , 423.24 , 161.27
+4268.63 , 494.22 , 193.03
+4268.63 , 565.20 , 224.82
+4268.63 , 636.18 , 256.67
+4268.63 , 707.15 , 288.56
+4268.63 , 778.13 , 320.47
+4268.63 , 849.11 , 352.44
+4268.63 , 920.09 , 384.45
+4268.63 , 991.07 , 416.51
+4268.63 , 1062.05 , 448.59
+4268.63 , 1133.02 , 480.73
+4268.63 , 1204.00 , 512.91
+4268.63 , 1274.98 , 545.11
+4268.63 , 1345.96 , 577.37
+4268.63 , 1416.94 , 609.67
+4268.63 , 1487.91 , 642.02
+4268.63 , 1558.89 , 674.40
+4268.63 , 1629.87 , 706.82
+4268.63 , 1700.85 , 739.29
+4268.63 , 1771.83 , 771.79
+4268.63 , 1842.81 , 804.33
+4268.63 , 1913.78 , 836.93
+4268.63 , 1984.76 , 869.57
+4268.63 , 2055.74 , 902.23
+4268.63 , 2126.72 , 934.95
+4268.63 , 2197.70 , 967.71
+4268.63 , 2268.68 , 1000.50
+4268.63 , 2339.65 , 1033.33
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-GBX_6.vgbx b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-GBX_6.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..5865a3e480a3c6fe3797b0d10eb7256b77a493c9
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/IHPC-GBX_6.vgbx
@@ -0,0 +1,75 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:26:44.5653903Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "tractor_12gear_example",
+ "Inertia": 0.0,
+ "TracInt": 1.0,
+ "Gears": [
+ {
+ "Ratio": 2.64,
+ "LossMap": "Axle_4x2_Tractor.vtlm"
+ },
+ {
+ "Ratio": 9.15,
+ "LossMap": "Gear_1.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 5.46,
+ "LossMap": "Gear_2.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 3.69,
+ "LossMap": "Gear_3.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 2.15,
+ "LossMap": "Gear_4.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.05,
+ "LossMap": "Gear_5.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 0.95,
+ "LossMap": "Gear_6.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ }
+ ],
+ "TqReserve": 20.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.0,
+ "StartAcc": 0.6,
+ "GearboxType": "IHPC",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAfterUpshiftDelay": 6.0,
+ "UpshiftAfterDownshiftDelay": 6.0,
+ "UpshiftMinAcceleration": 0.1,
+ "PowershiftShiftTime": 0.8
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/MaxCurrent.vimax b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/MaxCurrent.vimax
new file mode 100644
index 0000000000000000000000000000000000000000..5552bda2b03a9e6d5f0b2de49ea79b598013047f
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/MaxCurrent.vimax
@@ -0,0 +1,3 @@
+SOC, I_charge, I_discharge
+0, 280, 280
+100, 280, 280
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Truck.vacc b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Truck.vacc
new file mode 100644
index 0000000000000000000000000000000000000000..54e77864874d21d67e8f8d69a97b35c5c6031749
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/Truck.vacc
@@ -0,0 +1,6 @@
+v [km/h],acc [m/s²],dec [m/s²]
+0,1,-1
+25,1,-1
+50,0.642857143,-1
+60,0.5,-0.5
+120,0.5,-0.5
diff --git a/Generic Vehicles/Engineering Mode/GenericVehicleE2/BEV_ENG_PTO.vecto b/Generic Vehicles/Engineering Mode/GenericVehicleE2/BEV_ENG_PTO.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..ef6bce22665e635241f43acc8dc6452e9c3559cd
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericVehicleE2/BEV_ENG_PTO.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 9
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "BatteryElectricVehicle_PTO.vveh",
+ "GearboxFile": "AMT.vgbx",
+ "TCU": "AMT.vgbx",
+ "Padd_electric": 3540.0,
+
+ "VACC": "Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericVehicleE2/BatteryElectricVehicle.vveh b/Generic Vehicles/Engineering Mode/GenericVehicleE2/BatteryElectricVehicle.vveh
index 87c91d06aeb4ea0e100a6964bbe28b5fe8239b70..880bb724f08f6bf9341db6ce4c3aaa8b3075da7a 100644
--- a/Generic Vehicles/Engineering Mode/GenericVehicleE2/BatteryElectricVehicle.vveh
+++ b/Generic Vehicles/Engineering Mode/GenericVehicleE2/BatteryElectricVehicle.vveh
@@ -78,7 +78,7 @@
"EcoRoll": "None",
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
- "CdxA": 4.83,
+ "CdA": 4.83,
"VehicleHeight": 3.0
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericVehicleE2/BatteryElectricVehicle_Cont30kW.vveh b/Generic Vehicles/Engineering Mode/GenericVehicleE2/BatteryElectricVehicle_Cont30kW.vveh
index 5b4fb6ac9a57ab7d750a1fa98d2d308aa59a7f2e..940dd8d01bf8f5e96ae78074802e1e8eefb54b5a 100644
--- a/Generic Vehicles/Engineering Mode/GenericVehicleE2/BatteryElectricVehicle_Cont30kW.vveh
+++ b/Generic Vehicles/Engineering Mode/GenericVehicleE2/BatteryElectricVehicle_Cont30kW.vveh
@@ -78,7 +78,7 @@
"EcoRoll": "None",
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
- "CdxA": 4.83,
+ "CdA": 4.83,
"VehicleHeight": 3.0
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericVehicleE2/BatteryElectricVehicle_PTO.vveh b/Generic Vehicles/Engineering Mode/GenericVehicleE2/BatteryElectricVehicle_PTO.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..80fdc6da2c23dc2bce6589a30ec28ce31f8438ee
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericVehicleE2/BatteryElectricVehicle_PTO.vveh
@@ -0,0 +1,90 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2022-05-30T15:23:54.1506819Z",
+ "AppVersion": "3",
+ "FileVersion": 10
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "MassMax": 11.99,
+ "Loading": 3020.0,
+ "rdyn": 421.0,
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": false,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "VehicleHeight": 3.0,
+ "InitialSoC": 80.0,
+ "PowertrainConfiguration": "BatteryElectric",
+ "ElectricMotors": [
+ {
+ "Count": 2,
+ "Ratio": 2.0,
+ "Position": "E2",
+ "MotorFile": "GenericEMotor_125kW_485Nm.vem",
+ "MechanicalEfficiency": 0.97
+ }
+ ],
+ "Batteries": [
+ {
+ "NumPacks": 2,
+ "BatteryFile": "GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ }
+ ],
+ "PTO": {
+ "Type": "drive shaft and/or up to 2 gear wheels - multi-disc clutch, oil pump",
+ "LossMap": "PTO-idle.vptol",
+ "Cycle": "",
+ "CycleDriving": ""
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericVehicleE2/PTO-idle.vptol b/Generic Vehicles/Engineering Mode/GenericVehicleE2/PTO-idle.vptol
new file mode 100644
index 0000000000000000000000000000000000000000..7d1bdd293625e7cbbfc19603ecffe142ebbf60fe
--- /dev/null
+++ b/Generic Vehicles/Engineering Mode/GenericVehicleE2/PTO-idle.vptol
@@ -0,0 +1,15 @@
+Engine speed,PTO Torque
+# [rpm],[Nm]
+600,8.04746666666667
+800,11.4109530864198
+1000,15.4686419753086
+1200,20.2205333333333
+1400,25.6666271604938
+1600,31.8069234567901
+1800,38.6414222222222
+2000,46.1701234567901
+2200,54.3930271604938
+2400,63.3101333333333
+2600,72.9214419753087
+2800,83.2269530864197
+3000,94.2266666666667
diff --git a/Generic Vehicles/Engineering Mode/GenericVehicleE4/BatteryElectricVehicle.vveh b/Generic Vehicles/Engineering Mode/GenericVehicleE4/BatteryElectricVehicle.vveh
index f99a29f3ab8ec7bb395b11952d7d315057f3d598..74503285f56623bf66d9895d7ce51bc40e79cd61 100644
--- a/Generic Vehicles/Engineering Mode/GenericVehicleE4/BatteryElectricVehicle.vveh
+++ b/Generic Vehicles/Engineering Mode/GenericVehicleE4/BatteryElectricVehicle.vveh
@@ -78,7 +78,7 @@
"EcoRoll": "None",
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
- "CdxA": 4.83,
+ "CdA": 4.83,
"VehicleHeight": 3.0
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Engineering Mode/GenericVehicle_S2_Job/SerialHybrid_S2.vveh b/Generic Vehicles/Engineering Mode/GenericVehicle_S2_Job/SerialHybrid_S2.vveh
index 4e6c2723b5301a73a6893d559a951305e0ab0466..2798829bcdf02e9d5bf4f652d46cea17c277031a 100644
--- a/Generic Vehicles/Engineering Mode/GenericVehicle_S2_Job/SerialHybrid_S2.vveh
+++ b/Generic Vehicles/Engineering Mode/GenericVehicle_S2_Job/SerialHybrid_S2.vveh
@@ -93,7 +93,7 @@
"EcoRoll": "None",
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
- "CdxA": 4.83,
+ "CdA": 4.83,
"VehicleHeight": 3.0
}
}
\ No newline at end of file
diff --git a/HashingTool/HashingTool.csproj b/HashingTool/HashingTool.csproj
index 257527e231ddca3bd539f2ba7db84ba9ddc00746..a5fc2a097d0c62da58451a1f4443035cfd4818b0 100644
--- a/HashingTool/HashingTool.csproj
+++ b/HashingTool/HashingTool.csproj
@@ -8,7 +8,7 @@
<RootNamespace>HashingTool</RootNamespace>
<AssemblyName>HashingTool</AssemblyName>
<UseWPF>true</UseWPF>
- <TargetFrameworks>net45</TargetFrameworks>
+ <TargetFrameworks>net45;net6.0-windows</TargetFrameworks>
<DefineConstants />
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<ApplicationIcon>HashingIcon.ico</ApplicationIcon>
diff --git a/HashingTool/ViewModel/UserControl/XMLFileSelector.cs b/HashingTool/ViewModel/UserControl/XMLFileSelector.cs
index 30d3d6be33af60b0ad2dca905997508f73f2cea9..1bcf23c1ccd3699d81beec8b449958e05febc08a 100644
--- a/HashingTool/ViewModel/UserControl/XMLFileSelector.cs
+++ b/HashingTool/ViewModel/UserControl/XMLFileSelector.cs
@@ -177,6 +177,8 @@ namespace HashingTool.ViewModel.UserControl
}
try {
+ _source = fileName;
+ RaisePropertyChanged("Source");
using (var stream = File.OpenRead(fileName)) {
await LoadXMLFile(stream);
}
diff --git a/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml b/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml
index 9de941b9b64fedc0ea43a7ee73e7557cf94a23f7..a50c8504eab7d2d40ec45c665ed724a361d12d5e 100644
--- a/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml
+++ b/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml
@@ -7,12 +7,12 @@
xmlns:userControl="clr-namespace:HashingTool.ViewModel.UserControl"
x:Class="HashingTool.Views.VectoXMLFileSelector"
mc:Ignorable="d" d:DesignWidth="456" MinHeight="32"
- d:DataContext="{d:DesignInstance views:VectoXMLFileSelector}">
+ d:DataContext="{d:DesignInstance views:VectoXMLFileSelector}" >
<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="BoolToVis" />
</UserControl.Resources>
<StackPanel Margin="0,5" HorizontalAlignment="Stretch">
- <DockPanel HorizontalAlignment="Stretch" Height="Auto" Margin="0" VerticalAlignment="Top">
+ <DockPanel HorizontalAlignment="Stretch" Height="Auto" Margin="0" VerticalAlignment="Top" AllowDrop="True" Drop="XMLFileBrowser_Drop">
<!--<ContentControl DockPanel.Dock="Right"
Visibility="{Binding XMLFile.HasContentValidation, Converter={StaticResource BoolToVis}}" Width="40" Height="40"
@@ -75,7 +75,7 @@
VerticalAlignment="Top" HorizontalAlignment="Right" Width="75" />
<TextBox DockPanel.Dock="Left" HorizontalAlignment="Stretch" VerticalAlignment="Top" Height="23"
- Margin="0,0,10,0" TextWrapping="NoWrap" Text="{Binding XMLFile.Source, UpdateSourceTrigger=PropertyChanged}">
+ Margin="0,0,10,0" TextWrapping="NoWrap" Text="{Binding XMLFile.Source, Mode=OneWay}" IsReadOnly="True" PreviewDragOver="XMLFileBrowser_DragOver">
<TextBox.InputBindings>
<KeyBinding Command="{Binding XMLFile.SetXMLFileCommnd}" Key="Return" />
</TextBox.InputBindings>
diff --git a/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml.cs b/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml.cs
index 1b163bbdb75e0c37be2f08bb8981cfda72362152..1bd88e28ce91c334b2b599fc5a57a938976e9785 100644
--- a/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml.cs
+++ b/HashingTool/Views/UserControl/VectoXMLFileSelector.xaml.cs
@@ -63,5 +63,19 @@ namespace HashingTool.Views
dialog.ErrorCount = XMLFile.XMLValidationErrors.Count;
dialog.ShowDialog();
}
+
+ private void XMLFileBrowser_Drop(object sender, DragEventArgs e)
+ {
+ if (e.Data.GetDataPresent(DataFormats.FileDrop)) {
+ var files = (string[])e.Data.GetData(DataFormats.FileDrop);
+ XMLFile.SetXMLFileCommnd.Execute(files?[0]);
+ }
+ }
+
+ private void XMLFileBrowser_DragOver(object sender, DragEventArgs e)
+ {
+ if (e.Data.GetDataPresent(DataFormats.FileDrop))
+ e.Handled = true;
+ }
}
}
diff --git a/HashingTool/Views/VerifyComponentInputData.xaml b/HashingTool/Views/VerifyComponentInputData.xaml
index 6ab2c8aad7f85a370acd986df7930a59f5a0027f..0c82bf58d4ba2f56f10009b04fcedd43b0e08cbc 100644
--- a/HashingTool/Views/VerifyComponentInputData.xaml
+++ b/HashingTool/Views/VerifyComponentInputData.xaml
@@ -74,7 +74,7 @@
Margin="10,2" IsReadOnly="True" />
<Label Grid.Row="0" Grid.Column="2" Content="Date:" />
- <TextBox Grid.Row="0" Grid.Column="3" Text="{helper:CultureAwareBinding Path=Date, StringFormat='g'}" Margin="10,2" IsReadOnly="True" />
+ <TextBox Grid.Row="0" Grid.Column="3" Text="{helper:CultureAwareBinding Path=Date, StringFormat='g', Mode=OneWay}" Margin="10,2" IsReadOnly="True" />
<Label Grid.Row="1" Grid.Column="0" Content="Component:" />
<TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding Component}" Margin="10,2" IsReadOnly="True" />
@@ -90,7 +90,7 @@
Margin="10,2" IsReadOnly="True" />
<Label Grid.Row="4" Grid.Column="0" Content="Digest Value read:" Style="{StaticResource DigestValueLabelStyle}" />
- <TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding DigestValueRead}" Margin="10,2" IsReadOnly="True">
+ <TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding DigestValueRead, Mode=OneWay}" Margin="10,2" IsReadOnly="True">
<TextBox.Style>
<Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
<Style.Triggers>
@@ -107,7 +107,7 @@
<Label Grid.Row="5" Grid.Column="0" Content="Digest Value computed:"
Style="{StaticResource DigestValueLabelStyle}" />
- <TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding DigestValueComputed}" Margin="10,2" IsReadOnly="True">
+ <TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" Text="{Binding DigestValueComputed, Mode=OneWay}" Margin="10,2" IsReadOnly="True">
<TextBox.Style>
<Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
<Style.Triggers>
diff --git a/HashingTool/Views/VerifyJobInputData.xaml b/HashingTool/Views/VerifyJobInputData.xaml
index 0b81c59947a5dfe009f8383fe0c8b258dca736fe..2307c49202577a3bea109881876516567aab2810 100644
--- a/HashingTool/Views/VerifyJobInputData.xaml
+++ b/HashingTool/Views/VerifyJobInputData.xaml
@@ -79,7 +79,7 @@
<Label Grid.Row="3" Grid.Column="0" Content="Digest Value computed:"
Style="{StaticResource DigestValueLabelStyle}" />
- <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueComputed}" Margin="10,2"
+ <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueComputed, Mode=OneWay}" Margin="10,2"
IsReadOnly="True" Style="{StaticResource DigestValueTextboxStyle}" />
<ContentControl Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="0,10,0,0"
VerticalAlignment="Top" Width="50" Height="50">
diff --git a/HashingTool/Views/VerifyResults.xaml b/HashingTool/Views/VerifyResults.xaml
index 66b0852c3b7b287f131e69bd821bae7f90b6037e..63d94449a9295ccce9a1aa010a023dc172fe9b16 100644
--- a/HashingTool/Views/VerifyResults.xaml
+++ b/HashingTool/Views/VerifyResults.xaml
@@ -124,7 +124,7 @@
Margin="10,2" IsReadOnly="True" />
<Label Grid.Row="3" Grid.Column="0" Content="Digest Value computed:" Style="{StaticResource DigestValueLabelStyle}" />
- <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueComputed}"
+ <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueComputed, Mode=OneWay}"
Margin="10,2" IsReadOnly="True" Style="{StaticResource DigestValueTextboxStyle}" />
<!--<Expander Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Margin="4" Header="Components">-->
@@ -181,7 +181,7 @@
Margin="10,2" IsReadOnly="True" />
<Label Grid.Row="1" Grid.Column="1" Content="Digest Value:" />
- <TextBox Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="3" Text="{Binding DigestValueRead}"
+ <TextBox Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="3" Text="{Binding DigestValueRead, Mode=OneWay}"
Margin="10,2">
<TextBox.Style>
<Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
@@ -245,7 +245,7 @@
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Creation Date:" />
- <TextBox Grid.Row="0" Grid.Column="1" Text="{helper:CultureAwareBinding Path=Date, StringFormat='g'}"
+ <TextBox Grid.Row="0" Grid.Column="1" Text="{helper:CultureAwareBinding Path=Date, Mode=OneWay, StringFormat='g'}"
Margin="10,2" MinWidth="150" />
<Label Grid.Row="1" Grid.Column="0" Content="Canonicalization methods:" />
@@ -257,7 +257,7 @@
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding DigestMethod, Mode=OneWay}" Margin="10,2" IsReadOnly="True" />
<Label Grid.Row="3" Grid.Column="0" Content="Digest Value read:" Style="{StaticResource DigestValueLabelStyle}" />
- <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueRead}" Margin="10,2" IsReadOnly="True">
+ <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueRead, Mode=OneWay}" Margin="10,2" IsReadOnly="True">
<TextBox.Style>
<Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
<Style.Triggers>
@@ -274,7 +274,7 @@
<Label Grid.Row="4" Grid.Column="0" Content="Digest Value computed:"
Style="{StaticResource DigestValueLabelStyle}" />
- <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding DigestValueComputed}" Margin="10,2" IsReadOnly="True">
+ <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding DigestValueComputed, Mode=OneWay}" Margin="10,2" IsReadOnly="True">
<TextBox.Style>
<Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
<Style.Triggers>
@@ -429,7 +429,7 @@
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Creation Date:" />
- <TextBox Grid.Row="0" Grid.Column="1" Text="{helper:CultureAwareBinding Path=Date, StringFormat='g'}"
+ <TextBox Grid.Row="0" Grid.Column="1" Text="{helper:CultureAwareBinding Path=Date, Mode=OneWay, StringFormat='g'}"
Margin="10,2" MinWidth="150" />
<Label Grid.Row="1" Grid.Column="0" Content="Canonicalization methods:" />
@@ -441,7 +441,7 @@
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding DigestMethod, Mode=OneWay}" Margin="10,2" IsReadOnly="True" />
<Label Grid.Row="3" Grid.Column="0" Content="Digest Value read:" Style="{StaticResource DigestValueLabelStyle}" />
- <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueRead}" Margin="10,2" IsReadOnly="True">
+ <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding DigestValueRead, Mode=OneWay}" Margin="10,2" IsReadOnly="True">
<TextBox.Style>
<Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
<Style.Triggers>
@@ -458,7 +458,7 @@
<Label Grid.Row="4" Grid.Column="0" Content="Digest Value computed:"
Style="{StaticResource DigestValueLabelStyle}" />
- <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding DigestValueComputed}" Margin="10,2" IsReadOnly="True">
+ <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding DigestValueComputed, Mode=OneWay}" Margin="10,2" IsReadOnly="True">
<TextBox.Style>
<Style TargetType="TextBox" BasedOn="{StaticResource DigestValueTextboxStyle}">
<Style.Triggers>
diff --git a/Tools/HashingCmdStart/HashingCmdStart.csproj b/Tools/HashingCmdStart/HashingCmdStart.csproj
index 9fcebb397cf5049487e500b331ed850f47cbed4c..b8a4abbaa30bdefb1ae1d291ba4e4f0f27dfa9a8 100644
--- a/Tools/HashingCmdStart/HashingCmdStart.csproj
+++ b/Tools/HashingCmdStart/HashingCmdStart.csproj
@@ -8,4 +8,8 @@
<DefineConstants />
</PropertyGroup>
+ <ItemGroup>
+ <Compile Include="..\VECTOStart\StarterHelper.cs" Link="StarterHelper.cs" />
+ </ItemGroup>
+
</Project>
diff --git a/Tools/HashingCmdStart/Program.cs b/Tools/HashingCmdStart/Program.cs
index 4ee38c806d52ec7f2ee2e774945c926e400537ee..f3b287ab1d002769cb532880115205f80372126c 100644
--- a/Tools/HashingCmdStart/Program.cs
+++ b/Tools/HashingCmdStart/Program.cs
@@ -1,65 +1,7 @@
-using System;
-using Microsoft.Win32;
-using System.Diagnostics;
-using System.Reflection;
-using System.IO;
-
-namespace TUGraz.VECTO
+namespace TUGraz.VECTO
{
class Program
{
- static void Main()
- {
- var version = GetHighestNETVersion();
- Process.Start(new ProcessStartInfo($"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe") {
- WorkingDirectory = Directory.GetCurrentDirectory()
- });
- }
-
- private static string GetHighestNETVersion()
- {
- if (SupportsNet60()) {
- return "net60";
- }
-
- if (SupportsNet48()) {
- return "net48";
- }
-
- return "net45";
- }
-
- private static bool SupportsNet60()
- {
- try {
- var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
- CreateNoWindow = true,
- UseShellExecute = false,
- RedirectStandardError = true,
- RedirectStandardOutput = true
- });
-
- p.WaitForExit();
- var output = p.StandardOutput.ReadToEnd();
- return output.Contains("Microsoft.WindowsDesktop.App 6");
- } catch (Exception e) {
- Console.WriteLine(e);
- }
-
- return false;
- }
-
- private static bool SupportsNet48()
- {
- const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
- using (var ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey)) {
- if (ndpKey != null && ndpKey.GetValue("Release") != null) {
- var releaseKey = (int)ndpKey.GetValue("Release");
- return releaseKey >= 528040;
- }
-
- return false;
- }
- }
+ static void Main(string[] args) => StarterHelper.StartVECTO(args);
}
-}
+}
\ No newline at end of file
diff --git a/Tools/HashingToolStart/HashingToolStart.csproj b/Tools/HashingToolStart/HashingToolStart.csproj
index e3d1dcf88ad6968750da69b00fd4acc572fe495b..c1f363bb2227524a61d13f8ba908bdc184e2c5bf 100644
--- a/Tools/HashingToolStart/HashingToolStart.csproj
+++ b/Tools/HashingToolStart/HashingToolStart.csproj
@@ -8,4 +8,12 @@
<TargetFrameworks>net45</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
+
+ <ItemGroup>
+ <Compile Include="..\VECTOStart\StarterHelper.cs" Link="StarterHelper.cs" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Reference Include="System.Windows.Forms" />
+ </ItemGroup>
</Project>
diff --git a/Tools/HashingToolStart/Program.cs b/Tools/HashingToolStart/Program.cs
index c02231108231f8e676d4c49d64708861628ef3af..6d55a719f74068db46301e4485e52d527b6ce2ba 100644
--- a/Tools/HashingToolStart/Program.cs
+++ b/Tools/HashingToolStart/Program.cs
@@ -1,66 +1,19 @@
-using System;
-using Microsoft.Win32;
-using System.Diagnostics;
-using System.Reflection;
-using System.IO;
+using System.Windows.Forms;
+using System;
namespace TUGraz.VECTO
{
class Program
{
- static void Main()
- {
- var version = GetHighestNETVersion();
- Process.Start(new ProcessStartInfo($"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe") {
- WorkingDirectory = Directory.GetCurrentDirectory()
- });
- }
-
- private static string GetHighestNETVersion()
- {
- //todo mk2022-02-17 hashing tool currently only works under net45. this has to be fixed.
- //if (SupportsNet60()) {
- // return "net60";
- //}
-
- //if (SupportsNet48()) {
- // return "net48";
- //}
-
- return "net45";
- }
-
- private static bool SupportsNet60()
+ static void Main(string[] args)
{
try {
- var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
- CreateNoWindow = true,
- UseShellExecute = false,
- RedirectStandardError = true,
- RedirectStandardOutput = true
- });
-
- p.WaitForExit();
- var output = p.StandardOutput.ReadToEnd();
- return output.Contains("Microsoft.WindowsDesktop.App 6");
+ // mk20220707: hashing tool currently only works under net45, therefore we hardcoded the version
+ StarterHelper.StartVECTO(new[]{"net45"});
} catch (Exception e) {
- Console.WriteLine(e);
+ MessageBox.Show(e.Message);
}
-
- return false;
}
- private static bool SupportsNet48()
- {
- const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
- using (var ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey)) {
- if (ndpKey != null && ndpKey.GetValue("Release") != null) {
- var releaseKey = (int)ndpKey.GetValue("Release");
- return releaseKey >= 528040;
- }
-
- return false;
- }
- }
}
-}
+}
\ No newline at end of file
diff --git a/Tools/VECTOConsoleStart/Program.cs b/Tools/VECTOConsoleStart/Program.cs
index 1fd271eeacb671396da496e84940b00385d92c18..f5dbc4cdaa2e8621dcbd94670678b3b7cd11e6d2 100644
--- a/Tools/VECTOConsoleStart/Program.cs
+++ b/Tools/VECTOConsoleStart/Program.cs
@@ -1,78 +1,9 @@
-using System;
-using Microsoft.Win32;
-using System.Diagnostics;
-using System.Reflection;
-using System.IO;
-using System.Linq;
+using System.Linq;
using System.Text;
-
namespace TUGraz.VECTO
{
class Program
{
- private static int Main(string[] args)
- {
- var version = GetHighestNETVersion();
-
- var argsString = "";
- foreach (var arg in args) {
- argsString += $"\"{arg}\" ";
- }
-
- var process = Process.Start(new ProcessStartInfo($"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe")
- {
- WorkingDirectory = Directory.GetCurrentDirectory(),
- UseShellExecute = false,
- Arguments = argsString,
- });
- process?.WaitForExit();
- return process?.ExitCode ?? -1;
- }
-
- private static string GetHighestNETVersion()
- {
- if (SupportsNet60()) {
- return "net60";
- }
-
- if (SupportsNet48()) {
- return "net48";
- }
-
- return "net45";
- }
-
- private static bool SupportsNet60()
- {
- try {
- var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
- CreateNoWindow = true,
- UseShellExecute = false,
- RedirectStandardError = true,
- RedirectStandardOutput = true
- });
-
- p.WaitForExit();
- var output = p.StandardOutput.ReadToEnd();
- return output.Contains("Microsoft.WindowsDesktop.App 6");
- } catch (Exception e) {
- Console.WriteLine(e);
- }
-
- return false;
- }
-
- private static bool SupportsNet48()
- {
- const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
- using (var ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey)) {
- if (ndpKey != null && ndpKey.GetValue("Release") != null) {
- var releaseKey = (int)ndpKey.GetValue("Release");
- return releaseKey >= 528040;
- }
-
- return false;
- }
- }
+ static void Main(string[] args) => StarterHelper.StartVECTO(args);
}
}
diff --git a/Tools/VECTOConsoleStart/VECTOConsoleStart.csproj b/Tools/VECTOConsoleStart/VECTOConsoleStart.csproj
index 0fb874df0422f1f62e7efe4260761f8bcb872408..1956648c6f470b44fd78b2263704b158dd98b63a 100644
--- a/Tools/VECTOConsoleStart/VECTOConsoleStart.csproj
+++ b/Tools/VECTOConsoleStart/VECTOConsoleStart.csproj
@@ -11,4 +11,12 @@
<StartupObject></StartupObject>
</PropertyGroup>
+ <ItemGroup>
+ <Compile Include="..\VECTOStart\StarterHelper.cs" Link="StarterHelper.cs" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Reference Include="System.Windows.Forms" />
+ </ItemGroup>
+
</Project>
diff --git a/Tools/VECTOMultistageStart/Program.cs b/Tools/VECTOMultistageStart/Program.cs
index 2dce9c985988ae71a5b9ae7bff4d3f32ca46718a..aeb288b8560de2928c7339bc928501f4126b11b7 100644
--- a/Tools/VECTOMultistageStart/Program.cs
+++ b/Tools/VECTOMultistageStart/Program.cs
@@ -1,47 +1,18 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
+using System.Windows.Forms;
+using System;
namespace TUGraz.VECTO
{
class Program
{
- static void Main()
- {
- var version = GetHighestNETVersion();
- Process.Start(new ProcessStartInfo($"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe") {
- WorkingDirectory = Directory.GetCurrentDirectory()
- });
- }
-
- private static string GetHighestNETVersion()
- {
- if (SupportsNet60()) {
- return "net60";
- }
-
- return "net48";
- }
-
- private static bool SupportsNet60()
+ static void Main(string[] args)
{
try {
- var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
- CreateNoWindow = true,
- UseShellExecute = false,
- RedirectStandardError = true,
- RedirectStandardOutput = true
- });
-
- p.WaitForExit();
- var output = p.StandardOutput.ReadToEnd();
- return output.Contains("Microsoft.WindowsDesktop.App 6");
+ StarterHelper.StartVECTO(args, "net48", "net60");
} catch (Exception e) {
- Console.WriteLine(e);
+ MessageBox.Show(e.Message);
}
-
- return false;
}
+
}
}
diff --git a/Tools/VECTOMultistageStart/VECTOMultistage.csproj b/Tools/VECTOMultistageStart/VECTOMultistage.csproj
index a26f4f2676056bba314d251fd5e5f2ad42ea0717..eae5dedee8e400c496f878c7df4ada18d1606eee 100644
--- a/Tools/VECTOMultistageStart/VECTOMultistage.csproj
+++ b/Tools/VECTOMultistageStart/VECTOMultistage.csproj
@@ -10,4 +10,12 @@
<Configurations>Debug;Release;MockupDebug</Configurations>
</PropertyGroup>
+ <ItemGroup>
+ <Compile Include="..\VECTOStart\StarterHelper.cs" Link="StarterHelper.cs" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Reference Include="System.Windows.Forms" />
+ </ItemGroup>
+
</Project>
diff --git a/Tools/VECTOStart/Program.cs b/Tools/VECTOStart/Program.cs
index e5896e5d2f72524d42735eed5cff5d2af1143e1e..34b6e45df9c3dde2df7eafbbcce41beaf4fdd926 100644
--- a/Tools/VECTOStart/Program.cs
+++ b/Tools/VECTOStart/Program.cs
@@ -1,64 +1,16 @@
using System;
-using Microsoft.Win32;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
+using System.Windows.Forms;
namespace TUGraz.VECTO
{
class Program
{
- static void Main()
- {
- var version = GetHighestNETVersion();
- Process.Start(new ProcessStartInfo($"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe") {
- WorkingDirectory = Directory.GetCurrentDirectory()
- });
- }
-
- private static string GetHighestNETVersion()
- {
- if (SupportsNet60()) {
- return "net60";
- }
-
- if (SupportsNet48()) {
- return "net48";
- }
-
- return "net45";
- }
-
- private static bool SupportsNet60()
+ static void Main(string[] args)
{
try {
- var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
- CreateNoWindow = true,
- UseShellExecute = false,
- RedirectStandardError = true,
- RedirectStandardOutput = true
- });
-
- p.WaitForExit();
- var output = p.StandardOutput.ReadToEnd();
- return output.Contains("Microsoft.WindowsDesktop.App 6");
+ StarterHelper.StartVECTO(args);
} catch (Exception e) {
- Console.WriteLine(e);
- }
-
- return false;
- }
-
- private static bool SupportsNet48()
- {
- const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
- using (var ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey)) {
- if (ndpKey != null && ndpKey.GetValue("Release") != null) {
- var releaseKey = (int)ndpKey.GetValue("Release");
- return releaseKey >= 528040;
- }
-
- return false;
+ MessageBox.Show(e.Message);
}
}
}
diff --git a/Tools/VECTOStart/StarterHelper.cs b/Tools/VECTOStart/StarterHelper.cs
new file mode 100644
index 0000000000000000000000000000000000000000..40e4bab5374630491362afb3783fe97be601ce86
--- /dev/null
+++ b/Tools/VECTOStart/StarterHelper.cs
@@ -0,0 +1,92 @@
+using Microsoft.Win32;
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+
+namespace TUGraz.VECTO
+{
+ class StarterHelper
+ {
+ public static void StartVECTO(string[] args, params string[] validVersions)
+ {
+ var path = "No path found.";
+ string version = "No version found.";
+ if (validVersions is null || validVersions.Length == 0) {
+ validVersions = new[] { "net45", "net48", "net60" };
+ }
+ try {
+ if (args.Length > 0) {
+ version = args[0].ToLower();
+ } else {
+ version = GetHighestNETVersion();
+ }
+
+ path = $"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe";
+ Process.Start(new ProcessStartInfo(path) {
+ WorkingDirectory = Directory.GetCurrentDirectory()
+ });
+ ValidateVersion(version, validVersions);
+ } catch (Exception e) {
+ var message = $"Error during starting VECTO.\nDetected .NET version: {version}\nTried to open path: {path}\n{e.Message}";
+ File.AppendAllText("LOG.txt", $"{DateTime.Now} {message}\n");
+ Console.WriteLine(message);
+ throw new Exception(message);
+ }
+ }
+
+ private static void ValidateVersion(string version, params string[] validVersions)
+ {
+ if (!((IList)validVersions).Contains(version))
+ throw new Exception($"Invalid .NET Version supplied. Only the following values are valid: {string.Join(", ", validVersions)}");
+ }
+
+ private static string GetHighestNETVersion()
+ {
+ if (SupportsNet60()) {
+ return "net60";
+ }
+
+ if (SupportsNet48()) {
+ return "net48";
+ }
+
+ return "net45";
+ }
+
+ private static bool SupportsNet60()
+ {
+ try {
+ var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
+ CreateNoWindow = true,
+ UseShellExecute = false,
+ RedirectStandardError = true,
+ RedirectStandardOutput = true
+ });
+
+ p.WaitForExit();
+ var output = p.StandardOutput.ReadToEnd();
+ return output.Contains("Microsoft.WindowsDesktop.App 6");
+ } catch (Exception e) {
+ Console.WriteLine(e);
+ }
+
+ return false;
+ }
+
+ private static bool SupportsNet48()
+ {
+ const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
+ using (var ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey)) {
+ if (ndpKey != null && ndpKey.GetValue("Release") != null) {
+ var releaseKey = (int)ndpKey.GetValue("Release");
+ return releaseKey >= 528040;
+ }
+
+ return false;
+ }
+ }
+
+ }
+}
diff --git a/Tools/VECTOStart/VECTOStart.csproj b/Tools/VECTOStart/VECTOStart.csproj
index e9acb813b89388870fd164362beebd56aa59d7e7..332cda0617da374df2632598172affafcbe872de 100644
--- a/Tools/VECTOStart/VECTOStart.csproj
+++ b/Tools/VECTOStart/VECTOStart.csproj
@@ -10,4 +10,8 @@
<DefineConstants />
</PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System.Windows.Forms" />
+ </ItemGroup>
+
</Project>
diff --git a/VECTO/File Browser/FileBrowserModule.vb b/VECTO/File Browser/FileBrowserModule.vb
index 041359ac9c189bcfe48568f8286dd2b1bb334b99..a0115609f3767382cd5efeff7b9040e1e02ba4b6 100644
--- a/VECTO/File Browser/FileBrowserModule.vb
+++ b/VECTO/File Browser/FileBrowserModule.vb
@@ -69,4 +69,14 @@ Public Module FileBrowserModule
Public REESSFileBrowser As FileBrowser
public EmADCLossMapFileBrowser As FileBrowser
+ Public IEPCFileBrowser As FileBrowser
+ Public IEPCFLCFileBrowser As FileBrowser
+ Public IEPCDragFileBrowser As FileBrowser
+ Public IEPCPowerMapFileBrowser As FileBrowser
+
+ Public IHPCFileBrowser As FileBrowser
+ Public IHPCPowerMapFileBrowser As FileBrowser
+ Public IHPCFullLoadCurveFileBrowser As FileBrowser
+ public IHPCDragCurveFileBrowser As FileBrowser
+
End Module
diff --git a/VECTO/GUI/AboutBox.vb b/VECTO/GUI/AboutBox.vb
index c6b819ac8a9f344c92a4ae03cff6f8dc07c6ca1f..ec6c41301123c7e08075ee239d1826296705a321 100644
--- a/VECTO/GUI/AboutBox.vb
+++ b/VECTO/GUI/AboutBox.vb
@@ -15,7 +15,11 @@ Imports TUGraz.VectoCore.Utils
''' </summary>
Public Class AboutBox
Private Sub F10_AboutBox_Load(sender As Object, e As EventArgs) Handles MyBase.Load
- Text = "VECTO " & VECTOvers & " / VectoCore" & VectoSimulationCore.BranchSuffix & " " & COREvers
+#If NET47_OR_GREATER Or NET5_0_OR_GREATER Then
+ Text = "VECTO " & VECTOvers & " / VectoCore" & VectoSimulationCore.BranchSuffix & " " & COREvers & " / " & Runtime.InteropServices.RuntimeInformation.FrameworkDescription
+#Else
+ Text = "VECTO " & VECTOvers & " / VectoCore" & VectoSimulationCore.BranchSuffix & " " & COREvers & " / .NET Framework " & If(Environment.Version.Revision < 42000, "4.5", "4.6")
+#End If
End Sub
Private Sub LinkLabel1_LinkClicked_1(sender As Object, e As LinkLabelLinkClickedEventArgs) _
diff --git a/VECTO/GUI/BusAuxiliariesEngParametersForm.vb b/VECTO/GUI/BusAuxiliariesEngParametersForm.vb
index bfbd54f7b6a59325ead82d65c1a32a6f407e6b6c..48275186388b183d740b1ada1500e75b11ca63bf 100644
--- a/VECTO/GUI/BusAuxiliariesEngParametersForm.vb
+++ b/VECTO/GUI/BusAuxiliariesEngParametersForm.vb
@@ -2,6 +2,7 @@
Imports System.IO
Imports System.Linq
+Imports TUGraz.VECTO.Input_Files
Imports TUGraz.VectoCommon.InputData
Imports TUGraz.VectoCommon.Models
Imports TUGraz.VectoCommon.Utils
@@ -66,6 +67,7 @@ Public Class BusAuxiliariesEngParametersForm
select case JobType
case VectoSimulationJobType.BatteryElectricVehicle:
+ case VectoSimulationJobType.IEPC_E:
bgPneumaticSystem.Enabled = False
gbHVAC.Enabled = False
cbES_HEVREESS.Checked = True
@@ -168,7 +170,7 @@ Public Class BusAuxiliariesEngParametersForm
_busAuxParamsFile = ""
Text = "Bus Auxiliaries Parameters Editor"
LbStatus.Text = ""
-
+ pnSmartElectricParams.Enabled = false
_changed = False
End Sub
@@ -197,7 +199,7 @@ Public Class BusAuxiliariesEngParametersForm
tbCurrentDemandEngineOffDriving.Text = inputData.ElectricSystem.CurrentDemandEngineOffDriving.ToGUIFormat()
tbCurrentDemandEngineOffStandstill.Text = inputData.ElectricSystem.CurrentDemandEngineOffStandstill.ToGUIFormat()
tbDCDCEff.Text = inputData.ElectricSystem.DCDCConverterEfficiency.ToGUIFormat()
- if (JobType <> VectoSimulationJobType.BatteryElectricVehicle) Then
+ if (JobType <> VectoSimulationJobType.BatteryElectricVehicle AndAlso JobType <> VectoSimulationJobType.IEPC_E) Then
tbAlternatorEfficiency.Text = inputData.ElectricSystem.AlternatorEfficiency.ToGUIFormat()
cbAlternatorTechnology.SelectedValue = inputData.ElectricSystem.AlternatorType
tbMaxAlternatorPower.Text = inputData.ElectricSystem.MaxAlternatorPower.ToGUIFormat()
@@ -262,7 +264,12 @@ Public Class BusAuxiliariesEngParametersForm
busAuxParams.DCDCEfficiency = tbDCDCEff.Text.ToDouble(0)
busAuxParams.SupplyESFromHEVREESS = cbES_HEVREESS.Checked
- busAuxParams.PathCompressorMap = tbCompressorMap.Text
+ if (JobType = VectoSimulationJobType.IEPC_E OrElse JobType = VectoSimulationJobType.BatteryElectricVehicle) then
+ busAuxParams.CompressorMap = Nothing
+ Else
+ busAuxParams.CompressorMap = new SubPath()
+ busAuxParams.PathCompressorMap = tbCompressorMap.Text
+ End If
busAuxParams.AverageAirDemand = tbAverageAirDemand.Text.ToDouble(0)
busAuxParams.GearRatio = tbCompressorRatio.Text.ToDouble(0)
busAuxParams.SmartCompression = cbSmartCompressor.Checked
diff --git a/VECTO/GUI/ElectricMotorForm.Designer.vb b/VECTO/GUI/ElectricMotorForm.Designer.vb
index 25da7c409933e02fcf6596eb39fda7b973c73165..d7453bab608fabe7cdb62ae8f4d49dc0d6e24b5f 100644
--- a/VECTO/GUI/ElectricMotorForm.Designer.vb
+++ b/VECTO/GUI/ElectricMotorForm.Designer.vb
@@ -159,29 +159,26 @@ Partial Class ElectricMotorForm
'
'tbInertia
'
- Me.tbInertia.Location = New System.Drawing.Point(190, 8)
- Me.tbInertia.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbInertia.Location = New System.Drawing.Point(127, 5)
Me.tbInertia.Name = "tbInertia"
- Me.tbInertia.Size = New System.Drawing.Size(72, 26)
+ Me.tbInertia.Size = New System.Drawing.Size(49, 20)
Me.tbInertia.TabIndex = 3
'
'lblinertiaUnit
'
Me.lblinertiaUnit.AutoSize = true
- Me.lblinertiaUnit.Location = New System.Drawing.Point(273, 12)
- Me.lblinertiaUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblinertiaUnit.Location = New System.Drawing.Point(182, 8)
Me.lblinertiaUnit.Name = "lblinertiaUnit"
- Me.lblinertiaUnit.Size = New System.Drawing.Size(52, 20)
+ Me.lblinertiaUnit.Size = New System.Drawing.Size(36, 13)
Me.lblinertiaUnit.TabIndex = 24
Me.lblinertiaUnit.Text = "[kgm²]"
'
'lblInertia
'
Me.lblInertia.AutoSize = true
- Me.lblInertia.Location = New System.Drawing.Point(4, 11)
- Me.lblInertia.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblInertia.Location = New System.Drawing.Point(3, 7)
Me.lblInertia.Name = "lblInertia"
- Me.lblInertia.Size = New System.Drawing.Size(54, 20)
+ Me.lblInertia.Size = New System.Drawing.Size(36, 13)
Me.lblInertia.TabIndex = 0
Me.lblInertia.Text = "Inertia"
'
@@ -189,10 +186,9 @@ Partial Class ElectricMotorForm
'
Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(1281, 648)
- Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButCancel.Location = New System.Drawing.Point(854, 421)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(112, 35)
+ Me.ButCancel.Size = New System.Drawing.Size(75, 23)
Me.ButCancel.TabIndex = 13
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
@@ -200,10 +196,9 @@ Partial Class ElectricMotorForm
'ButOK
'
Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(1160, 648)
- Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButOK.Location = New System.Drawing.Point(773, 421)
Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(112, 35)
+ Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 12
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
@@ -215,8 +210,8 @@ Partial Class ElectricMotorForm
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0)
- Me.ToolStrip1.Size = New System.Drawing.Size(1412, 33)
+ Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
+ Me.ToolStrip1.Size = New System.Drawing.Size(941, 31)
Me.ToolStrip1.TabIndex = 30
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -226,7 +221,7 @@ Partial Class ElectricMotorForm
Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtNew.Name = "ToolStripBtNew"
- Me.ToolStripBtNew.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtNew.Text = "ToolStripButton1"
Me.ToolStripBtNew.ToolTipText = "New"
'
@@ -236,7 +231,7 @@ Partial Class ElectricMotorForm
Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
- Me.ToolStripBtOpen.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtOpen.Text = "ToolStripButton1"
Me.ToolStripBtOpen.ToolTipText = "Open..."
'
@@ -246,7 +241,7 @@ Partial Class ElectricMotorForm
Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSave.Name = "ToolStripBtSave"
- Me.ToolStripBtSave.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSave.Text = "ToolStripButton1"
Me.ToolStripBtSave.ToolTipText = "Save"
'
@@ -256,14 +251,14 @@ Partial Class ElectricMotorForm
Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
- Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 33)
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
'
'ToolStripBtSendTo
'
@@ -271,14 +266,14 @@ Partial Class ElectricMotorForm
Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
- Me.ToolStripBtSendTo.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSendTo.Text = "Send to Job Editor"
Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor"
'
'ToolStripSeparator1
'
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 33)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
'
'ToolStripButton1
'
@@ -286,17 +281,16 @@ Partial Class ElectricMotorForm
Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButton1.Name = "ToolStripButton1"
- Me.ToolStripButton1.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
Me.ToolStripButton1.Text = "Help"
'
'StatusStrip1
'
Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 688)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 446)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
- Me.StatusStrip1.Size = New System.Drawing.Size(1412, 32)
+ Me.StatusStrip1.Size = New System.Drawing.Size(941, 22)
Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 37
Me.StatusStrip1.Text = "StatusStrip1"
@@ -304,24 +298,22 @@ Partial Class ElectricMotorForm
'LbStatus
'
Me.LbStatus.Name = "LbStatus"
- Me.LbStatus.Size = New System.Drawing.Size(60, 25)
+ Me.LbStatus.Size = New System.Drawing.Size(39, 17)
Me.LbStatus.Text = "Status"
'
'tbMakeModel
'
- Me.tbMakeModel.Location = New System.Drawing.Point(164, 126)
- Me.tbMakeModel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMakeModel.Location = New System.Drawing.Point(109, 82)
Me.tbMakeModel.Name = "tbMakeModel"
- Me.tbMakeModel.Size = New System.Drawing.Size(553, 26)
+ Me.tbMakeModel.Size = New System.Drawing.Size(370, 20)
Me.tbMakeModel.TabIndex = 0
'
'lblMakeModel
'
Me.lblMakeModel.AutoSize = true
- Me.lblMakeModel.Location = New System.Drawing.Point(24, 131)
- Me.lblMakeModel.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMakeModel.Location = New System.Drawing.Point(16, 85)
Me.lblMakeModel.Name = "lblMakeModel"
- Me.lblMakeModel.Size = New System.Drawing.Size(126, 20)
+ Me.lblMakeModel.Size = New System.Drawing.Size(87, 13)
Me.lblMakeModel.TabIndex = 11
Me.lblMakeModel.Text = "Make and Model"
'
@@ -329,10 +321,9 @@ Partial Class ElectricMotorForm
'
Me.PictureBox1.BackColor = System.Drawing.Color.White
Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_ENG
- Me.PictureBox1.Location = New System.Drawing.Point(0, 43)
- Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(753, 62)
+ Me.PictureBox1.Size = New System.Drawing.Size(502, 40)
Me.PictureBox1.TabIndex = 39
Me.PictureBox1.TabStop = false
'
@@ -341,18 +332,18 @@ Partial Class ElectricMotorForm
Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
- Me.CmOpenFile.Size = New System.Drawing.Size(203, 68)
+ Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
'
'OpenWithToolStripMenuItem
'
Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
- Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.OpenWithToolStripMenuItem.Text = "Open with ..."
'
'ShowInFolderToolStripMenuItem
'
Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
- Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
'pnInertia
@@ -360,19 +351,17 @@ Partial Class ElectricMotorForm
Me.pnInertia.Controls.Add(Me.lblInertia)
Me.pnInertia.Controls.Add(Me.lblinertiaUnit)
Me.pnInertia.Controls.Add(Me.tbInertia)
- Me.pnInertia.Location = New System.Drawing.Point(18, 166)
- Me.pnInertia.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnInertia.Location = New System.Drawing.Point(12, 108)
Me.pnInertia.Name = "pnInertia"
- Me.pnInertia.Size = New System.Drawing.Size(332, 46)
+ Me.pnInertia.Size = New System.Drawing.Size(221, 30)
Me.pnInertia.TabIndex = 3
'
'btnEmMapOpenHi
'
Me.btnEmMapOpenHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnEmMapOpenHi.Location = New System.Drawing.Point(662, 134)
- Me.btnEmMapOpenHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnEmMapOpenHi.Location = New System.Drawing.Point(441, 87)
Me.btnEmMapOpenHi.Name = "btnEmMapOpenHi"
- Me.btnEmMapOpenHi.Size = New System.Drawing.Size(36, 37)
+ Me.btnEmMapOpenHi.Size = New System.Drawing.Size(24, 24)
Me.btnEmMapOpenHi.TabIndex = 42
Me.btnEmMapOpenHi.TabStop = false
Me.btnEmMapOpenHi.UseVisualStyleBackColor = true
@@ -380,10 +369,9 @@ Partial Class ElectricMotorForm
'btnBrowseEmMapHi
'
Me.btnBrowseEmMapHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseEmMapHi.Location = New System.Drawing.Point(628, 134)
- Me.btnBrowseEmMapHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseEmMapHi.Location = New System.Drawing.Point(419, 87)
Me.btnBrowseEmMapHi.Name = "btnBrowseEmMapHi"
- Me.btnBrowseEmMapHi.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseEmMapHi.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseEmMapHi.TabIndex = 41
Me.btnBrowseEmMapHi.TabStop = false
Me.btnBrowseEmMapHi.UseVisualStyleBackColor = true
@@ -391,28 +379,25 @@ Partial Class ElectricMotorForm
'lblPowerMapHi
'
Me.lblPowerMapHi.AutoSize = true
- Me.lblPowerMapHi.Location = New System.Drawing.Point(7, 114)
- Me.lblPowerMapHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblPowerMapHi.Location = New System.Drawing.Point(5, 74)
Me.lblPowerMapHi.Name = "lblPowerMapHi"
- Me.lblPowerMapHi.Size = New System.Drawing.Size(242, 20)
+ Me.lblPowerMapHi.Size = New System.Drawing.Size(163, 13)
Me.lblPowerMapHi.TabIndex = 43
Me.lblPowerMapHi.Text = "Electric Power Consumption Map"
'
'tbMapHi
'
- Me.tbMapHi.Location = New System.Drawing.Point(7, 139)
- Me.tbMapHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMapHi.Location = New System.Drawing.Point(5, 90)
Me.tbMapHi.Name = "tbMapHi"
- Me.tbMapHi.Size = New System.Drawing.Size(607, 26)
+ Me.tbMapHi.Size = New System.Drawing.Size(406, 20)
Me.tbMapHi.TabIndex = 40
'
'btnMaxTorqueCurveOpenHi
'
Me.btnMaxTorqueCurveOpenHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnMaxTorqueCurveOpenHi.Location = New System.Drawing.Point(662, 75)
- Me.btnMaxTorqueCurveOpenHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnMaxTorqueCurveOpenHi.Location = New System.Drawing.Point(441, 49)
Me.btnMaxTorqueCurveOpenHi.Name = "btnMaxTorqueCurveOpenHi"
- Me.btnMaxTorqueCurveOpenHi.Size = New System.Drawing.Size(36, 37)
+ Me.btnMaxTorqueCurveOpenHi.Size = New System.Drawing.Size(24, 24)
Me.btnMaxTorqueCurveOpenHi.TabIndex = 46
Me.btnMaxTorqueCurveOpenHi.TabStop = false
Me.btnMaxTorqueCurveOpenHi.UseVisualStyleBackColor = true
@@ -420,10 +405,9 @@ Partial Class ElectricMotorForm
'btnBrowseMaxTorqueHi
'
Me.btnBrowseMaxTorqueHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseMaxTorqueHi.Location = New System.Drawing.Point(628, 75)
- Me.btnBrowseMaxTorqueHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseMaxTorqueHi.Location = New System.Drawing.Point(419, 49)
Me.btnBrowseMaxTorqueHi.Name = "btnBrowseMaxTorqueHi"
- Me.btnBrowseMaxTorqueHi.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseMaxTorqueHi.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseMaxTorqueHi.TabIndex = 45
Me.btnBrowseMaxTorqueHi.TabStop = false
Me.btnBrowseMaxTorqueHi.UseVisualStyleBackColor = true
@@ -431,19 +415,17 @@ Partial Class ElectricMotorForm
'lblMaxTorqueHi
'
Me.lblMaxTorqueHi.AutoSize = true
- Me.lblMaxTorqueHi.Location = New System.Drawing.Point(7, 54)
- Me.lblMaxTorqueHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMaxTorqueHi.Location = New System.Drawing.Point(5, 35)
Me.lblMaxTorqueHi.Name = "lblMaxTorqueHi"
- Me.lblMaxTorqueHi.Size = New System.Drawing.Size(325, 20)
+ Me.lblMaxTorqueHi.Size = New System.Drawing.Size(222, 13)
Me.lblMaxTorqueHi.TabIndex = 47
Me.lblMaxTorqueHi.Text = "Max Drive and Max Generation Torque Curve"
'
'tbMaxTorqueHi
'
- Me.tbMaxTorqueHi.Location = New System.Drawing.Point(7, 78)
- Me.tbMaxTorqueHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMaxTorqueHi.Location = New System.Drawing.Point(5, 51)
Me.tbMaxTorqueHi.Name = "tbMaxTorqueHi"
- Me.tbMaxTorqueHi.Size = New System.Drawing.Size(607, 26)
+ Me.tbMaxTorqueHi.Size = New System.Drawing.Size(406, 20)
Me.tbMaxTorqueHi.TabIndex = 44
'
'lblTitle
@@ -451,10 +433,9 @@ Partial Class ElectricMotorForm
Me.lblTitle.AutoSize = true
Me.lblTitle.BackColor = System.Drawing.Color.White
Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.lblTitle.Location = New System.Drawing.Point(126, 52)
- Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblTitle.Location = New System.Drawing.Point(119, 34)
Me.lblTitle.Name = "lblTitle"
- Me.lblTitle.Size = New System.Drawing.Size(281, 40)
+ Me.lblTitle.Size = New System.Drawing.Size(190, 29)
Me.lblTitle.TabIndex = 48
Me.lblTitle.Text = "Electric Machine"
'
@@ -462,10 +443,9 @@ Partial Class ElectricMotorForm
'
Me.PicBox.BackColor = System.Drawing.Color.LightGray
Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PicBox.Location = New System.Drawing.Point(776, 43)
- Me.PicBox.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PicBox.Location = New System.Drawing.Point(517, 28)
Me.PicBox.Name = "PicBox"
- Me.PicBox.Size = New System.Drawing.Size(572, 408)
+ Me.PicBox.Size = New System.Drawing.Size(382, 266)
Me.PicBox.TabIndex = 49
Me.PicBox.TabStop = false
'
@@ -474,38 +454,34 @@ Partial Class ElectricMotorForm
Me.Panel1.Controls.Add(Me.lblContTq)
Me.Panel1.Controls.Add(Me.lblContTqUnit)
Me.Panel1.Controls.Add(Me.tbContTqLo)
- Me.Panel1.Location = New System.Drawing.Point(7, 184)
- Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel1.Location = New System.Drawing.Point(5, 120)
Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(332, 46)
+ Me.Panel1.Size = New System.Drawing.Size(221, 30)
Me.Panel1.TabIndex = 25
'
'lblContTq
'
Me.lblContTq.AutoSize = true
- Me.lblContTq.Location = New System.Drawing.Point(4, 11)
- Me.lblContTq.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblContTq.Location = New System.Drawing.Point(3, 7)
Me.lblContTq.Name = "lblContTq"
- Me.lblContTq.Size = New System.Drawing.Size(148, 20)
+ Me.lblContTq.Size = New System.Drawing.Size(100, 13)
Me.lblContTq.TabIndex = 0
Me.lblContTq.Text = "Continuous Torque:"
'
'lblContTqUnit
'
Me.lblContTqUnit.AutoSize = true
- Me.lblContTqUnit.Location = New System.Drawing.Point(273, 12)
- Me.lblContTqUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblContTqUnit.Location = New System.Drawing.Point(182, 8)
Me.lblContTqUnit.Name = "lblContTqUnit"
- Me.lblContTqUnit.Size = New System.Drawing.Size(41, 20)
+ Me.lblContTqUnit.Size = New System.Drawing.Size(29, 13)
Me.lblContTqUnit.TabIndex = 24
Me.lblContTqUnit.Text = "[Nm]"
'
'tbContTqLo
'
- Me.tbContTqLo.Location = New System.Drawing.Point(190, 8)
- Me.tbContTqLo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbContTqLo.Location = New System.Drawing.Point(127, 5)
Me.tbContTqLo.Name = "tbContTqLo"
- Me.tbContTqLo.Size = New System.Drawing.Size(72, 26)
+ Me.tbContTqLo.Size = New System.Drawing.Size(49, 20)
Me.tbContTqLo.TabIndex = 3
'
'Panel2
@@ -513,38 +489,34 @@ Partial Class ElectricMotorForm
Me.Panel2.Controls.Add(Me.lblOvlTime)
Me.Panel2.Controls.Add(Me.lblOvltimeUnit)
Me.Panel2.Controls.Add(Me.tbOvlTimeLo)
- Me.Panel2.Location = New System.Drawing.Point(7, 279)
- Me.Panel2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel2.Location = New System.Drawing.Point(5, 181)
Me.Panel2.Name = "Panel2"
- Me.Panel2.Size = New System.Drawing.Size(332, 46)
+ Me.Panel2.Size = New System.Drawing.Size(221, 30)
Me.Panel2.TabIndex = 25
'
'lblOvlTime
'
Me.lblOvlTime.AutoSize = true
- Me.lblOvlTime.Location = New System.Drawing.Point(4, 11)
- Me.lblOvlTime.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOvlTime.Location = New System.Drawing.Point(3, 7)
Me.lblOvlTime.Name = "lblOvlTime"
- Me.lblOvlTime.Size = New System.Drawing.Size(141, 20)
+ Me.lblOvlTime.Size = New System.Drawing.Size(96, 13)
Me.lblOvlTime.TabIndex = 0
Me.lblOvlTime.Text = "Overload Duration:"
'
'lblOvltimeUnit
'
Me.lblOvltimeUnit.AutoSize = true
- Me.lblOvltimeUnit.Location = New System.Drawing.Point(270, 11)
- Me.lblOvltimeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOvltimeUnit.Location = New System.Drawing.Point(180, 7)
Me.lblOvltimeUnit.Name = "lblOvltimeUnit"
- Me.lblOvltimeUnit.Size = New System.Drawing.Size(25, 20)
+ Me.lblOvltimeUnit.Size = New System.Drawing.Size(18, 13)
Me.lblOvltimeUnit.TabIndex = 24
Me.lblOvltimeUnit.Text = "[s]"
'
'tbOvlTimeLo
'
- Me.tbOvlTimeLo.Location = New System.Drawing.Point(190, 8)
- Me.tbOvlTimeLo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOvlTimeLo.Location = New System.Drawing.Point(127, 5)
Me.tbOvlTimeLo.Name = "tbOvlTimeLo"
- Me.tbOvlTimeLo.Size = New System.Drawing.Size(72, 26)
+ Me.tbOvlTimeLo.Size = New System.Drawing.Size(49, 20)
Me.tbOvlTimeLo.TabIndex = 3
'
'Panel3
@@ -552,38 +524,34 @@ Partial Class ElectricMotorForm
Me.Panel3.Controls.Add(Me.lblOvlRecovery)
Me.Panel3.Controls.Add(Me.lblOvlRecoveryFactorUnit)
Me.Panel3.Controls.Add(Me.tbOverloadRecoveryFactor)
- Me.Panel3.Location = New System.Drawing.Point(369, 166)
- Me.Panel3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel3.Location = New System.Drawing.Point(246, 108)
Me.Panel3.Name = "Panel3"
- Me.Panel3.Size = New System.Drawing.Size(392, 46)
+ Me.Panel3.Size = New System.Drawing.Size(261, 30)
Me.Panel3.TabIndex = 26
'
'lblOvlRecovery
'
Me.lblOvlRecovery.AutoSize = true
- Me.lblOvlRecovery.Location = New System.Drawing.Point(-3, 12)
- Me.lblOvlRecovery.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOvlRecovery.Location = New System.Drawing.Point(-2, 8)
Me.lblOvlRecovery.Name = "lblOvlRecovery"
- Me.lblOvlRecovery.Size = New System.Drawing.Size(257, 20)
+ Me.lblOvlRecovery.Size = New System.Drawing.Size(176, 13)
Me.lblOvlRecovery.TabIndex = 0
Me.lblOvlRecovery.Text = "Thermal Overload Recovery Factor:"
'
'lblOvlRecoveryFactorUnit
'
Me.lblOvlRecoveryFactorUnit.AutoSize = true
- Me.lblOvlRecoveryFactorUnit.Location = New System.Drawing.Point(345, 11)
- Me.lblOvlRecoveryFactorUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOvlRecoveryFactorUnit.Location = New System.Drawing.Point(230, 7)
Me.lblOvlRecoveryFactorUnit.Name = "lblOvlRecoveryFactorUnit"
- Me.lblOvlRecoveryFactorUnit.Size = New System.Drawing.Size(22, 20)
+ Me.lblOvlRecoveryFactorUnit.Size = New System.Drawing.Size(16, 13)
Me.lblOvlRecoveryFactorUnit.TabIndex = 24
Me.lblOvlRecoveryFactorUnit.Text = "[-]"
'
'tbOverloadRecoveryFactor
'
- Me.tbOverloadRecoveryFactor.Location = New System.Drawing.Point(266, 8)
- Me.tbOverloadRecoveryFactor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadRecoveryFactor.Location = New System.Drawing.Point(177, 5)
Me.tbOverloadRecoveryFactor.Name = "tbOverloadRecoveryFactor"
- Me.tbOverloadRecoveryFactor.Size = New System.Drawing.Size(72, 26)
+ Me.tbOverloadRecoveryFactor.Size = New System.Drawing.Size(49, 20)
Me.tbOverloadRecoveryFactor.TabIndex = 3
'
'Panel4
@@ -591,38 +559,34 @@ Partial Class ElectricMotorForm
Me.Panel4.Controls.Add(Me.lblRatedSpeed)
Me.Panel4.Controls.Add(Me.lblRatedSpeedUnit)
Me.Panel4.Controls.Add(Me.tbRatedSpeedLo)
- Me.Panel4.Location = New System.Drawing.Point(339, 184)
- Me.Panel4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel4.Location = New System.Drawing.Point(226, 120)
Me.Panel4.Name = "Panel4"
- Me.Panel4.Size = New System.Drawing.Size(392, 46)
+ Me.Panel4.Size = New System.Drawing.Size(261, 30)
Me.Panel4.TabIndex = 26
'
'lblRatedSpeed
'
Me.lblRatedSpeed.AutoSize = true
- Me.lblRatedSpeed.Location = New System.Drawing.Point(4, 11)
- Me.lblRatedSpeed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRatedSpeed.Location = New System.Drawing.Point(3, 7)
Me.lblRatedSpeed.Name = "lblRatedSpeed"
- Me.lblRatedSpeed.Size = New System.Drawing.Size(234, 20)
+ Me.lblRatedSpeed.Size = New System.Drawing.Size(158, 13)
Me.lblRatedSpeed.TabIndex = 0
Me.lblRatedSpeed.Text = "Test Speed Continuous Torque:"
'
'lblRatedSpeedUnit
'
Me.lblRatedSpeedUnit.AutoSize = true
- Me.lblRatedSpeedUnit.Location = New System.Drawing.Point(344, 11)
- Me.lblRatedSpeedUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRatedSpeedUnit.Location = New System.Drawing.Point(229, 7)
Me.lblRatedSpeedUnit.Name = "lblRatedSpeedUnit"
- Me.lblRatedSpeedUnit.Size = New System.Drawing.Size(44, 20)
+ Me.lblRatedSpeedUnit.Size = New System.Drawing.Size(30, 13)
Me.lblRatedSpeedUnit.TabIndex = 24
Me.lblRatedSpeedUnit.Text = "[rpm]"
'
'tbRatedSpeedLo
'
- Me.tbRatedSpeedLo.Location = New System.Drawing.Point(266, 8)
- Me.tbRatedSpeedLo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbRatedSpeedLo.Location = New System.Drawing.Point(177, 5)
Me.tbRatedSpeedLo.Name = "tbRatedSpeedLo"
- Me.tbRatedSpeedLo.Size = New System.Drawing.Size(72, 26)
+ Me.tbRatedSpeedLo.Size = New System.Drawing.Size(49, 20)
Me.tbRatedSpeedLo.TabIndex = 3
'
'pnOverloadTq
@@ -630,38 +594,34 @@ Partial Class ElectricMotorForm
Me.pnOverloadTq.Controls.Add(Me.lblOverloadTq)
Me.pnOverloadTq.Controls.Add(Me.lblOverloadTqUnit)
Me.pnOverloadTq.Controls.Add(Me.tbOverloadTqLo)
- Me.pnOverloadTq.Location = New System.Drawing.Point(7, 231)
- Me.pnOverloadTq.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnOverloadTq.Location = New System.Drawing.Point(5, 150)
Me.pnOverloadTq.Name = "pnOverloadTq"
- Me.pnOverloadTq.Size = New System.Drawing.Size(332, 46)
+ Me.pnOverloadTq.Size = New System.Drawing.Size(221, 30)
Me.pnOverloadTq.TabIndex = 26
'
'lblOverloadTq
'
Me.lblOverloadTq.AutoSize = true
- Me.lblOverloadTq.Location = New System.Drawing.Point(4, 11)
- Me.lblOverloadTq.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOverloadTq.Location = New System.Drawing.Point(3, 7)
Me.lblOverloadTq.Name = "lblOverloadTq"
- Me.lblOverloadTq.Size = New System.Drawing.Size(130, 20)
+ Me.lblOverloadTq.Size = New System.Drawing.Size(90, 13)
Me.lblOverloadTq.TabIndex = 0
Me.lblOverloadTq.Text = "Overload Torque:"
'
'lblOverloadTqUnit
'
Me.lblOverloadTqUnit.AutoSize = true
- Me.lblOverloadTqUnit.Location = New System.Drawing.Point(273, 12)
- Me.lblOverloadTqUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOverloadTqUnit.Location = New System.Drawing.Point(182, 8)
Me.lblOverloadTqUnit.Name = "lblOverloadTqUnit"
- Me.lblOverloadTqUnit.Size = New System.Drawing.Size(41, 20)
+ Me.lblOverloadTqUnit.Size = New System.Drawing.Size(29, 13)
Me.lblOverloadTqUnit.TabIndex = 24
Me.lblOverloadTqUnit.Text = "[Nm]"
'
'tbOverloadTqLo
'
- Me.tbOverloadTqLo.Location = New System.Drawing.Point(190, 8)
- Me.tbOverloadTqLo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadTqLo.Location = New System.Drawing.Point(127, 5)
Me.tbOverloadTqLo.Name = "tbOverloadTqLo"
- Me.tbOverloadTqLo.Size = New System.Drawing.Size(72, 26)
+ Me.tbOverloadTqLo.Size = New System.Drawing.Size(49, 20)
Me.tbOverloadTqLo.TabIndex = 3
'
'Panel6
@@ -669,131 +629,117 @@ Partial Class ElectricMotorForm
Me.Panel6.Controls.Add(Me.lblOverloadSpeed)
Me.Panel6.Controls.Add(Me.lblOverloadSpeedUnit)
Me.Panel6.Controls.Add(Me.tbOvlSpeedLo)
- Me.Panel6.Location = New System.Drawing.Point(339, 231)
- Me.Panel6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel6.Location = New System.Drawing.Point(226, 150)
Me.Panel6.Name = "Panel6"
- Me.Panel6.Size = New System.Drawing.Size(392, 46)
+ Me.Panel6.Size = New System.Drawing.Size(261, 30)
Me.Panel6.TabIndex = 27
'
'lblOverloadSpeed
'
Me.lblOverloadSpeed.AutoSize = true
- Me.lblOverloadSpeed.Location = New System.Drawing.Point(4, 11)
- Me.lblOverloadSpeed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOverloadSpeed.Location = New System.Drawing.Point(3, 7)
Me.lblOverloadSpeed.Name = "lblOverloadSpeed"
- Me.lblOverloadSpeed.Size = New System.Drawing.Size(216, 20)
+ Me.lblOverloadSpeed.Size = New System.Drawing.Size(148, 13)
Me.lblOverloadSpeed.TabIndex = 0
Me.lblOverloadSpeed.Text = "Test Speed Overload Torque:"
'
'lblOverloadSpeedUnit
'
Me.lblOverloadSpeedUnit.AutoSize = true
- Me.lblOverloadSpeedUnit.Location = New System.Drawing.Point(344, 11)
- Me.lblOverloadSpeedUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOverloadSpeedUnit.Location = New System.Drawing.Point(229, 7)
Me.lblOverloadSpeedUnit.Name = "lblOverloadSpeedUnit"
- Me.lblOverloadSpeedUnit.Size = New System.Drawing.Size(44, 20)
+ Me.lblOverloadSpeedUnit.Size = New System.Drawing.Size(30, 13)
Me.lblOverloadSpeedUnit.TabIndex = 24
Me.lblOverloadSpeedUnit.Text = "[rpm]"
'
'tbOvlSpeedLo
'
- Me.tbOvlSpeedLo.Location = New System.Drawing.Point(266, 8)
- Me.tbOvlSpeedLo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOvlSpeedLo.Location = New System.Drawing.Point(177, 5)
Me.tbOvlSpeedLo.Name = "tbOvlSpeedLo"
- Me.tbOvlSpeedLo.Size = New System.Drawing.Size(72, 26)
+ Me.tbOvlSpeedLo.Size = New System.Drawing.Size(49, 20)
Me.tbOvlSpeedLo.TabIndex = 3
'
'lblVoltageHi
'
Me.lblVoltageHi.AutoSize = true
- Me.lblVoltageHi.Location = New System.Drawing.Point(16, 15)
- Me.lblVoltageHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblVoltageHi.Location = New System.Drawing.Point(11, 10)
Me.lblVoltageHi.Name = "lblVoltageHi"
- Me.lblVoltageHi.Size = New System.Drawing.Size(64, 20)
+ Me.lblVoltageHi.Size = New System.Drawing.Size(43, 13)
Me.lblVoltageHi.TabIndex = 48
Me.lblVoltageHi.Text = "Voltage"
'
'lblVoltageHiUnit
'
Me.lblVoltageHiUnit.AutoSize = true
- Me.lblVoltageHiUnit.Location = New System.Drawing.Point(282, 15)
- Me.lblVoltageHiUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblVoltageHiUnit.Location = New System.Drawing.Point(188, 10)
Me.lblVoltageHiUnit.Name = "lblVoltageHiUnit"
- Me.lblVoltageHiUnit.Size = New System.Drawing.Size(28, 20)
+ Me.lblVoltageHiUnit.Size = New System.Drawing.Size(20, 13)
Me.lblVoltageHiUnit.TabIndex = 50
Me.lblVoltageHiUnit.Text = "[V]"
'
'tbVoltageHi
'
- Me.tbVoltageHi.Location = New System.Drawing.Point(202, 12)
- Me.tbVoltageHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbVoltageHi.Location = New System.Drawing.Point(135, 8)
Me.tbVoltageHi.Name = "tbVoltageHi"
- Me.tbVoltageHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbVoltageHi.Size = New System.Drawing.Size(49, 20)
Me.tbVoltageHi.TabIndex = 49
'
'lblVoltageLow
'
Me.lblVoltageLow.AutoSize = true
- Me.lblVoltageLow.Location = New System.Drawing.Point(16, 14)
- Me.lblVoltageLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblVoltageLow.Location = New System.Drawing.Point(11, 9)
Me.lblVoltageLow.Name = "lblVoltageLow"
- Me.lblVoltageLow.Size = New System.Drawing.Size(64, 20)
+ Me.lblVoltageLow.Size = New System.Drawing.Size(43, 13)
Me.lblVoltageLow.TabIndex = 48
Me.lblVoltageLow.Text = "Voltage"
'
'lblVoltageLowUnit
'
Me.lblVoltageLowUnit.AutoSize = true
- Me.lblVoltageLowUnit.Location = New System.Drawing.Point(282, 14)
- Me.lblVoltageLowUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblVoltageLowUnit.Location = New System.Drawing.Point(188, 9)
Me.lblVoltageLowUnit.Name = "lblVoltageLowUnit"
- Me.lblVoltageLowUnit.Size = New System.Drawing.Size(28, 20)
+ Me.lblVoltageLowUnit.Size = New System.Drawing.Size(20, 13)
Me.lblVoltageLowUnit.TabIndex = 50
Me.lblVoltageLowUnit.Text = "[V]"
'
'tbVoltageLow
'
- Me.tbVoltageLow.Location = New System.Drawing.Point(202, 11)
- Me.tbVoltageLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbVoltageLow.Location = New System.Drawing.Point(135, 7)
Me.tbVoltageLow.Name = "tbVoltageLow"
- Me.tbVoltageLow.Size = New System.Drawing.Size(72, 26)
+ Me.tbVoltageLow.Size = New System.Drawing.Size(49, 20)
Me.tbVoltageLow.TabIndex = 49
'
'lblMaxTorqueLow
'
Me.lblMaxTorqueLow.AutoSize = true
- Me.lblMaxTorqueLow.Location = New System.Drawing.Point(7, 53)
- Me.lblMaxTorqueLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMaxTorqueLow.Location = New System.Drawing.Point(5, 34)
Me.lblMaxTorqueLow.Name = "lblMaxTorqueLow"
- Me.lblMaxTorqueLow.Size = New System.Drawing.Size(325, 20)
+ Me.lblMaxTorqueLow.Size = New System.Drawing.Size(222, 13)
Me.lblMaxTorqueLow.TabIndex = 47
Me.lblMaxTorqueLow.Text = "Max Drive and Max Generation Torque Curve"
'
'tbDragTorque
'
- Me.tbDragTorque.Location = New System.Drawing.Point(26, 247)
- Me.tbDragTorque.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbDragTorque.Location = New System.Drawing.Point(17, 161)
Me.tbDragTorque.Name = "tbDragTorque"
- Me.tbDragTorque.Size = New System.Drawing.Size(607, 26)
+ Me.tbDragTorque.Size = New System.Drawing.Size(406, 20)
Me.tbDragTorque.TabIndex = 5
'
'lblDragTorque
'
Me.lblDragTorque.AutoSize = true
- Me.lblDragTorque.Location = New System.Drawing.Point(26, 223)
- Me.lblDragTorque.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblDragTorque.Location = New System.Drawing.Point(17, 145)
Me.lblDragTorque.Name = "lblDragTorque"
- Me.lblDragTorque.Size = New System.Drawing.Size(143, 20)
+ Me.lblDragTorque.Size = New System.Drawing.Size(98, 13)
Me.lblDragTorque.TabIndex = 38
Me.lblDragTorque.Text = "Drag Torque Curve"
'
'btnBrowseDragCurve
'
Me.btnBrowseDragCurve.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseDragCurve.Location = New System.Drawing.Point(647, 243)
- Me.btnBrowseDragCurve.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseDragCurve.Location = New System.Drawing.Point(431, 158)
Me.btnBrowseDragCurve.Name = "btnBrowseDragCurve"
- Me.btnBrowseDragCurve.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseDragCurve.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseDragCurve.TabIndex = 6
Me.btnBrowseDragCurve.TabStop = false
Me.btnBrowseDragCurve.UseVisualStyleBackColor = true
@@ -801,39 +747,35 @@ Partial Class ElectricMotorForm
'btnDragCurveOpen
'
Me.btnDragCurveOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnDragCurveOpen.Location = New System.Drawing.Point(681, 243)
- Me.btnDragCurveOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnDragCurveOpen.Location = New System.Drawing.Point(454, 158)
Me.btnDragCurveOpen.Name = "btnDragCurveOpen"
- Me.btnDragCurveOpen.Size = New System.Drawing.Size(36, 37)
+ Me.btnDragCurveOpen.Size = New System.Drawing.Size(24, 24)
Me.btnDragCurveOpen.TabIndex = 7
Me.btnDragCurveOpen.TabStop = false
Me.btnDragCurveOpen.UseVisualStyleBackColor = true
'
'tbMapLow
'
- Me.tbMapLow.Location = New System.Drawing.Point(7, 139)
- Me.tbMapLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMapLow.Location = New System.Drawing.Point(5, 90)
Me.tbMapLow.Name = "tbMapLow"
- Me.tbMapLow.Size = New System.Drawing.Size(607, 26)
+ Me.tbMapLow.Size = New System.Drawing.Size(406, 20)
Me.tbMapLow.TabIndex = 40
'
'lblPowerMapLow
'
Me.lblPowerMapLow.AutoSize = true
- Me.lblPowerMapLow.Location = New System.Drawing.Point(7, 114)
- Me.lblPowerMapLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblPowerMapLow.Location = New System.Drawing.Point(5, 74)
Me.lblPowerMapLow.Name = "lblPowerMapLow"
- Me.lblPowerMapLow.Size = New System.Drawing.Size(242, 20)
+ Me.lblPowerMapLow.Size = New System.Drawing.Size(163, 13)
Me.lblPowerMapLow.TabIndex = 43
Me.lblPowerMapLow.Text = "Electric Power Consumption Map"
'
'btnBrowseEmMapLow
'
Me.btnBrowseEmMapLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseEmMapLow.Location = New System.Drawing.Point(628, 134)
- Me.btnBrowseEmMapLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseEmMapLow.Location = New System.Drawing.Point(419, 87)
Me.btnBrowseEmMapLow.Name = "btnBrowseEmMapLow"
- Me.btnBrowseEmMapLow.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseEmMapLow.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseEmMapLow.TabIndex = 41
Me.btnBrowseEmMapLow.TabStop = false
Me.btnBrowseEmMapLow.UseVisualStyleBackColor = true
@@ -841,29 +783,26 @@ Partial Class ElectricMotorForm
'btnEmMapOpenLow
'
Me.btnEmMapOpenLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnEmMapOpenLow.Location = New System.Drawing.Point(662, 134)
- Me.btnEmMapOpenLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnEmMapOpenLow.Location = New System.Drawing.Point(441, 87)
Me.btnEmMapOpenLow.Name = "btnEmMapOpenLow"
- Me.btnEmMapOpenLow.Size = New System.Drawing.Size(36, 37)
+ Me.btnEmMapOpenLow.Size = New System.Drawing.Size(24, 24)
Me.btnEmMapOpenLow.TabIndex = 42
Me.btnEmMapOpenLow.TabStop = false
Me.btnEmMapOpenLow.UseVisualStyleBackColor = true
'
'tbMaxTorqueLow
'
- Me.tbMaxTorqueLow.Location = New System.Drawing.Point(7, 77)
- Me.tbMaxTorqueLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMaxTorqueLow.Location = New System.Drawing.Point(5, 50)
Me.tbMaxTorqueLow.Name = "tbMaxTorqueLow"
- Me.tbMaxTorqueLow.Size = New System.Drawing.Size(607, 26)
+ Me.tbMaxTorqueLow.Size = New System.Drawing.Size(406, 20)
Me.tbMaxTorqueLow.TabIndex = 44
'
'btnMaxTorqueCurveOpenLow
'
Me.btnMaxTorqueCurveOpenLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnMaxTorqueCurveOpenLow.Location = New System.Drawing.Point(662, 74)
- Me.btnMaxTorqueCurveOpenLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnMaxTorqueCurveOpenLow.Location = New System.Drawing.Point(441, 48)
Me.btnMaxTorqueCurveOpenLow.Name = "btnMaxTorqueCurveOpenLow"
- Me.btnMaxTorqueCurveOpenLow.Size = New System.Drawing.Size(36, 37)
+ Me.btnMaxTorqueCurveOpenLow.Size = New System.Drawing.Size(24, 24)
Me.btnMaxTorqueCurveOpenLow.TabIndex = 46
Me.btnMaxTorqueCurveOpenLow.TabStop = false
Me.btnMaxTorqueCurveOpenLow.UseVisualStyleBackColor = true
@@ -871,10 +810,9 @@ Partial Class ElectricMotorForm
'btnBrowseMaxTorqueLow
'
Me.btnBrowseMaxTorqueLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseMaxTorqueLow.Location = New System.Drawing.Point(628, 74)
- Me.btnBrowseMaxTorqueLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseMaxTorqueLow.Location = New System.Drawing.Point(419, 48)
Me.btnBrowseMaxTorqueLow.Name = "btnBrowseMaxTorqueLow"
- Me.btnBrowseMaxTorqueLow.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseMaxTorqueLow.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseMaxTorqueLow.TabIndex = 45
Me.btnBrowseMaxTorqueLow.TabStop = false
Me.btnBrowseMaxTorqueLow.UseVisualStyleBackColor = true
@@ -883,10 +821,11 @@ Partial Class ElectricMotorForm
'
Me.tcVoltageLevels.Controls.Add(Me.tpVoltageLow)
Me.tcVoltageLevels.Controls.Add(Me.tpVoltageHigh)
- Me.tcVoltageLevels.Location = New System.Drawing.Point(18, 291)
+ Me.tcVoltageLevels.Location = New System.Drawing.Point(12, 189)
+ Me.tcVoltageLevels.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
Me.tcVoltageLevels.Name = "tcVoltageLevels"
Me.tcVoltageLevels.SelectedIndex = 0
- Me.tcVoltageLevels.Size = New System.Drawing.Size(751, 379)
+ Me.tcVoltageLevels.Size = New System.Drawing.Size(501, 246)
Me.tcVoltageLevels.TabIndex = 52
'
'tpVoltageLow
@@ -907,10 +846,11 @@ Partial Class ElectricMotorForm
Me.tpVoltageLow.Controls.Add(Me.btnBrowseEmMapLow)
Me.tpVoltageLow.Controls.Add(Me.lblPowerMapLow)
Me.tpVoltageLow.Controls.Add(Me.tbMapLow)
- Me.tpVoltageLow.Location = New System.Drawing.Point(4, 29)
+ Me.tpVoltageLow.Location = New System.Drawing.Point(4, 22)
+ Me.tpVoltageLow.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
Me.tpVoltageLow.Name = "tpVoltageLow"
- Me.tpVoltageLow.Padding = New System.Windows.Forms.Padding(3)
- Me.tpVoltageLow.Size = New System.Drawing.Size(743, 346)
+ Me.tpVoltageLow.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.tpVoltageLow.Size = New System.Drawing.Size(493, 220)
Me.tpVoltageLow.TabIndex = 0
Me.tpVoltageLow.Text = "Voltage Level Low"
Me.tpVoltageLow.UseVisualStyleBackColor = true
@@ -933,10 +873,11 @@ Partial Class ElectricMotorForm
Me.tpVoltageHigh.Controls.Add(Me.btnBrowseEmMapHi)
Me.tpVoltageHigh.Controls.Add(Me.lblPowerMapHi)
Me.tpVoltageHigh.Controls.Add(Me.tbMapHi)
- Me.tpVoltageHigh.Location = New System.Drawing.Point(4, 29)
+ Me.tpVoltageHigh.Location = New System.Drawing.Point(4, 22)
+ Me.tpVoltageHigh.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
Me.tpVoltageHigh.Name = "tpVoltageHigh"
- Me.tpVoltageHigh.Padding = New System.Windows.Forms.Padding(3)
- Me.tpVoltageHigh.Size = New System.Drawing.Size(743, 346)
+ Me.tpVoltageHigh.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.tpVoltageHigh.Size = New System.Drawing.Size(493, 220)
Me.tpVoltageHigh.TabIndex = 1
Me.tpVoltageHigh.Text = "Voltage Level High"
Me.tpVoltageHigh.UseVisualStyleBackColor = true
@@ -946,38 +887,34 @@ Partial Class ElectricMotorForm
Me.Panel5.Controls.Add(Me.Label1)
Me.Panel5.Controls.Add(Me.Label2)
Me.Panel5.Controls.Add(Me.tbOvlSpeedHi)
- Me.Panel5.Location = New System.Drawing.Point(339, 231)
- Me.Panel5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel5.Location = New System.Drawing.Point(226, 150)
Me.Panel5.Name = "Panel5"
- Me.Panel5.Size = New System.Drawing.Size(392, 46)
+ Me.Panel5.Size = New System.Drawing.Size(261, 30)
Me.Panel5.TabIndex = 55
'
'Label1
'
Me.Label1.AutoSize = true
- Me.Label1.Location = New System.Drawing.Point(4, 11)
- Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label1.Location = New System.Drawing.Point(3, 7)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(216, 20)
+ Me.Label1.Size = New System.Drawing.Size(148, 13)
Me.Label1.TabIndex = 0
Me.Label1.Text = "Test Speed Overload Torque:"
'
'Label2
'
Me.Label2.AutoSize = true
- Me.Label2.Location = New System.Drawing.Point(344, 11)
- Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label2.Location = New System.Drawing.Point(229, 7)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(44, 20)
+ Me.Label2.Size = New System.Drawing.Size(30, 13)
Me.Label2.TabIndex = 24
Me.Label2.Text = "[rpm]"
'
'tbOvlSpeedHi
'
- Me.tbOvlSpeedHi.Location = New System.Drawing.Point(266, 8)
- Me.tbOvlSpeedHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOvlSpeedHi.Location = New System.Drawing.Point(177, 5)
Me.tbOvlSpeedHi.Name = "tbOvlSpeedHi"
- Me.tbOvlSpeedHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbOvlSpeedHi.Size = New System.Drawing.Size(49, 20)
Me.tbOvlSpeedHi.TabIndex = 3
'
'Panel7
@@ -985,38 +922,34 @@ Partial Class ElectricMotorForm
Me.Panel7.Controls.Add(Me.Label3)
Me.Panel7.Controls.Add(Me.Label4)
Me.Panel7.Controls.Add(Me.tbOverloadTqHi)
- Me.Panel7.Location = New System.Drawing.Point(7, 231)
- Me.Panel7.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel7.Location = New System.Drawing.Point(5, 150)
Me.Panel7.Name = "Panel7"
- Me.Panel7.Size = New System.Drawing.Size(332, 46)
+ Me.Panel7.Size = New System.Drawing.Size(221, 30)
Me.Panel7.TabIndex = 53
'
'Label3
'
Me.Label3.AutoSize = true
- Me.Label3.Location = New System.Drawing.Point(4, 11)
- Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label3.Location = New System.Drawing.Point(3, 7)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(130, 20)
+ Me.Label3.Size = New System.Drawing.Size(90, 13)
Me.Label3.TabIndex = 0
Me.Label3.Text = "Overload Torque:"
'
'Label4
'
Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(273, 12)
- Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label4.Location = New System.Drawing.Point(182, 8)
Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(41, 20)
+ Me.Label4.Size = New System.Drawing.Size(29, 13)
Me.Label4.TabIndex = 24
Me.Label4.Text = "[Nm]"
'
'tbOverloadTqHi
'
- Me.tbOverloadTqHi.Location = New System.Drawing.Point(190, 8)
- Me.tbOverloadTqHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadTqHi.Location = New System.Drawing.Point(127, 5)
Me.tbOverloadTqHi.Name = "tbOverloadTqHi"
- Me.tbOverloadTqHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbOverloadTqHi.Size = New System.Drawing.Size(49, 20)
Me.tbOverloadTqHi.TabIndex = 3
'
'Panel8
@@ -1024,38 +957,34 @@ Partial Class ElectricMotorForm
Me.Panel8.Controls.Add(Me.Label5)
Me.Panel8.Controls.Add(Me.Label6)
Me.Panel8.Controls.Add(Me.tbRatedSpeedHi)
- Me.Panel8.Location = New System.Drawing.Point(339, 184)
- Me.Panel8.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel8.Location = New System.Drawing.Point(226, 120)
Me.Panel8.Name = "Panel8"
- Me.Panel8.Size = New System.Drawing.Size(392, 46)
+ Me.Panel8.Size = New System.Drawing.Size(261, 30)
Me.Panel8.TabIndex = 54
'
'Label5
'
Me.Label5.AutoSize = true
- Me.Label5.Location = New System.Drawing.Point(4, 11)
- Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label5.Location = New System.Drawing.Point(3, 7)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(234, 20)
+ Me.Label5.Size = New System.Drawing.Size(158, 13)
Me.Label5.TabIndex = 0
Me.Label5.Text = "Test Speed Continuous Torque:"
'
'Label6
'
Me.Label6.AutoSize = true
- Me.Label6.Location = New System.Drawing.Point(344, 11)
- Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label6.Location = New System.Drawing.Point(229, 7)
Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(44, 20)
+ Me.Label6.Size = New System.Drawing.Size(30, 13)
Me.Label6.TabIndex = 24
Me.Label6.Text = "[rpm]"
'
'tbRatedSpeedHi
'
- Me.tbRatedSpeedHi.Location = New System.Drawing.Point(266, 8)
- Me.tbRatedSpeedHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbRatedSpeedHi.Location = New System.Drawing.Point(177, 5)
Me.tbRatedSpeedHi.Name = "tbRatedSpeedHi"
- Me.tbRatedSpeedHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbRatedSpeedHi.Size = New System.Drawing.Size(49, 20)
Me.tbRatedSpeedHi.TabIndex = 3
'
'Panel9
@@ -1063,38 +992,34 @@ Partial Class ElectricMotorForm
Me.Panel9.Controls.Add(Me.Label7)
Me.Panel9.Controls.Add(Me.Label8)
Me.Panel9.Controls.Add(Me.tbOvlTimeHi)
- Me.Panel9.Location = New System.Drawing.Point(7, 279)
- Me.Panel9.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel9.Location = New System.Drawing.Point(5, 181)
Me.Panel9.Name = "Panel9"
- Me.Panel9.Size = New System.Drawing.Size(332, 46)
+ Me.Panel9.Size = New System.Drawing.Size(221, 30)
Me.Panel9.TabIndex = 51
'
'Label7
'
Me.Label7.AutoSize = true
- Me.Label7.Location = New System.Drawing.Point(4, 11)
- Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label7.Location = New System.Drawing.Point(3, 7)
Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(141, 20)
+ Me.Label7.Size = New System.Drawing.Size(96, 13)
Me.Label7.TabIndex = 0
Me.Label7.Text = "Overload Duration:"
'
'Label8
'
Me.Label8.AutoSize = true
- Me.Label8.Location = New System.Drawing.Point(270, 11)
- Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label8.Location = New System.Drawing.Point(180, 7)
Me.Label8.Name = "Label8"
- Me.Label8.Size = New System.Drawing.Size(25, 20)
+ Me.Label8.Size = New System.Drawing.Size(18, 13)
Me.Label8.TabIndex = 24
Me.Label8.Text = "[s]"
'
'tbOvlTimeHi
'
- Me.tbOvlTimeHi.Location = New System.Drawing.Point(190, 8)
- Me.tbOvlTimeHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOvlTimeHi.Location = New System.Drawing.Point(127, 5)
Me.tbOvlTimeHi.Name = "tbOvlTimeHi"
- Me.tbOvlTimeHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbOvlTimeHi.Size = New System.Drawing.Size(49, 20)
Me.tbOvlTimeHi.TabIndex = 3
'
'Panel10
@@ -1102,47 +1027,43 @@ Partial Class ElectricMotorForm
Me.Panel10.Controls.Add(Me.Label9)
Me.Panel10.Controls.Add(Me.Label10)
Me.Panel10.Controls.Add(Me.tbContTqHi)
- Me.Panel10.Location = New System.Drawing.Point(7, 184)
- Me.Panel10.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel10.Location = New System.Drawing.Point(5, 120)
Me.Panel10.Name = "Panel10"
- Me.Panel10.Size = New System.Drawing.Size(332, 46)
+ Me.Panel10.Size = New System.Drawing.Size(221, 30)
Me.Panel10.TabIndex = 52
'
'Label9
'
Me.Label9.AutoSize = true
- Me.Label9.Location = New System.Drawing.Point(4, 11)
- Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label9.Location = New System.Drawing.Point(3, 7)
Me.Label9.Name = "Label9"
- Me.Label9.Size = New System.Drawing.Size(148, 20)
+ Me.Label9.Size = New System.Drawing.Size(100, 13)
Me.Label9.TabIndex = 0
Me.Label9.Text = "Continuous Torque:"
'
'Label10
'
Me.Label10.AutoSize = true
- Me.Label10.Location = New System.Drawing.Point(273, 12)
- Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label10.Location = New System.Drawing.Point(182, 8)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(41, 20)
+ Me.Label10.Size = New System.Drawing.Size(29, 13)
Me.Label10.TabIndex = 24
Me.Label10.Text = "[Nm]"
'
'tbContTqHi
'
- Me.tbContTqHi.Location = New System.Drawing.Point(190, 8)
- Me.tbContTqHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbContTqHi.Location = New System.Drawing.Point(127, 5)
Me.tbContTqHi.Name = "tbContTqHi"
- Me.tbContTqHi.Size = New System.Drawing.Size(72, 26)
+ Me.tbContTqHi.Size = New System.Drawing.Size(49, 20)
Me.tbContTqHi.TabIndex = 3
'
'ElectricMotorForm
'
Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(1412, 720)
+ Me.ClientSize = New System.Drawing.Size(941, 468)
Me.Controls.Add(Me.tcVoltageLevels)
Me.Controls.Add(Me.Panel3)
Me.Controls.Add(Me.PicBox)
@@ -1161,7 +1082,6 @@ Partial Class ElectricMotorForm
Me.Controls.Add(Me.btnBrowseDragCurve)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
- Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.MaximizeBox = false
Me.Name = "ElectricMotorForm"
Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
diff --git a/VECTO/GUI/ElectricMotorForm.vb b/VECTO/GUI/ElectricMotorForm.vb
index 409b1c430aa3006be4d98f3421ee14ff33812b55..702d9efabbd26e02377a1053014d5f9a50b1ed11 100644
--- a/VECTO/GUI/ElectricMotorForm.vb
+++ b/VECTO/GUI/ElectricMotorForm.vb
@@ -573,12 +573,17 @@ Public Class ElectricMotorForm
OpenFiles(FileRepl(tbDragTorque.Text, GetPath(_emFile)))
End If
End Sub
-
- Private Sub btnBrowseEmMapLow_Click(sender As Object, e As EventArgs) Handles btnBrowseEmMapLow.Click
+
+ Private Sub btnBrowseMaxTorqueLow_Click(sender As Object, e As EventArgs) Handles btnBrowseMaxTorqueLow.Click
If ElectricMachineMaxTorqueFileBrowser.OpenDialog(FileRepl(tbMaxTorqueLow.Text, GetPath(_emFile))) Then _
tbMaxTorqueLow.Text = GetFilenameWithoutDirectory(ElectricMachineMaxTorqueFileBrowser.Files(0), GetPath(_emFile))
End Sub
+ Private Sub btnBrowseEmMapLow_Click(sender As Object, e As EventArgs) Handles btnBrowseEmMapLow.Click
+ If ElectricMachineEfficiencyMapFileBrowser.OpenDialog(FileRepl(tbMapLow.Text, GetPath(_emFile))) Then _
+ tbMapLow.Text = GetFilenameWithoutDirectory(ElectricMachineEfficiencyMapFileBrowser.Files(0), GetPath(_emFile))
+ End Sub
+
Private Sub btnEmMapOpenLow_Click(sender As Object, e As EventArgs) Handles btnEmMapOpenLow.Click
Dim theFile As String
@@ -590,4 +595,16 @@ Public Class ElectricMotorForm
OpenFiles(FileRepl(tbMapLow.Text, GetPath(_emFile)))
End If
End Sub
+
+ Private Sub btnMaxTorqueCurveOpenLow_Click(sender As Object, e As EventArgs) Handles btnMaxTorqueCurveOpenLow.Click
+ Dim theFile As String
+
+ theFile = FileRepl(tbMaxTorqueLow.Text, GetPath(_emFile))
+
+ If theFile <> NoFile AndAlso File.Exists(theFile) Then
+ OpenFiles(FileRepl(tbMaxTorqueLow.Text, GetPath(_emFile)), theFile)
+ Else
+ OpenFiles(FileRepl(tbMaxTorqueLow.Text, GetPath(_emFile)))
+ End If
+ End Sub
End Class
diff --git a/VECTO/GUI/GearboxForm.vb b/VECTO/GUI/GearboxForm.vb
index 1b87e30a3823039e40dca7becd63815753017baf..17d975510c3e8ea4583c0ae6b5c1c3797f7e8c0d 100644
--- a/VECTO/GUI/GearboxForm.vb
+++ b/VECTO/GUI/GearboxForm.vb
@@ -89,7 +89,7 @@ Public Class GearboxForm
Else
CbGStype.DataSource = [Enum].GetValues(GetType(GearboxType)) _
.Cast(Of GearboxType)() _
- .Where(Function(type) type.ManualTransmission() OrElse type.AutomaticTransmission()) _
+ .Where(Function(type) type.ManualTransmission() OrElse type.AutomaticTransmission() OrElse type = GearboxType.IHPC OrElse type = GearboxType.IEPC) _
.Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
End If
DeclInit()
@@ -140,7 +140,7 @@ Public Class GearboxForm
Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click
If GearboxFileBrowser.OpenDialog(_gbxFile) Then
Try
- OpenGbx(GearboxFileBrowser.Files(0), VehicleCategory.RigidTruck)
+ OpenGbx(GearboxFileBrowser.Files(0), VehicleCategory.RigidTruck, VectoSimulationJobType.ConventionalVehicle)
Catch ex As Exception
MsgBox("Failed to open Gearbox File: " + ex.Message)
End Try
@@ -242,7 +242,7 @@ Public Class GearboxForm
End Sub
'Open file
- Public Sub OpenGbx(file As String, vehicleCategory As VehicleCategory)
+ Public Sub OpenGbx(file As String, vehicleCategory As VehicleCategory, vehicleJobType As VectoSimulationJobType)
If ChangeCheckCancel() Then Exit Sub
@@ -254,6 +254,7 @@ Public Class GearboxForm
Dim axlegear As IAxleGearInputData = vehicle.Components.AxleGearInputData
_vehicleCategory = vehicleCategory
+ _vehicleJobType = vehicleJobType
If Cfg.DeclMode <> gearbox.SavedInDeclarationMode Then
Select Case WrongMode()
@@ -512,7 +513,7 @@ Public Class GearboxForm
Change()
- Dim hasTorqueConverter = gStype.AutomaticTransmission() AndAlso gStype <> GearboxType.APTN
+ Dim hasTorqueConverter = gStype.AutomaticTransmission() AndAlso gStype <> GearboxType.APTN AndAlso gStype <> GearboxType.IHPC
'ChTCon.Enabled = (GStype.AutomaticTransmission())
gbTC.Enabled = hasTorqueConverter
pnTcEngineering.Enabled = Not Cfg.DeclMode AndAlso hasTorqueConverter
@@ -713,6 +714,7 @@ Public Class GearboxForm
Private _contextMenuFiles As String()
Private _vehicleCategory As VehicleCategory
+ private _vehicleJobType as VectoSimulationJobType
Private Sub OpenFiles(ParamArray files() As String)
@@ -1075,7 +1077,8 @@ Public Class GearboxForm
Dim tmpRunData as VectoRunData = New VectoRunData() With {
.GearboxData = New GearboxData() with {
.Type = CType(CbGStype.SelectedValue, GearboxType)
- }
+ },
+ .JobType = _vehicleJobType
}
Dim tmpStrategy as IShiftPolygonCalculator = PowertrainBuilder.GetShiftStrategy(new SimplePowertrainContainer(tmpRunData))
diff --git a/VECTO/GUI/HybridStrategyParamsForm.vb b/VECTO/GUI/HybridStrategyParamsForm.vb
index 84a77e72d1eb3cf6a7f46dff1d2a2213309c3524..471ac649dea59195b22e023b6eb866602f0df587 100644
--- a/VECTO/GUI/HybridStrategyParamsForm.vb
+++ b/VECTO/GUI/HybridStrategyParamsForm.vb
@@ -133,6 +133,7 @@ Public Class HybridStrategyParamsForm
pnCostFactorSoCExponent.Enabled = True
pnGenset.Enabled = False
Case VectoSimulationJobType.SerialHybridVehicle
+ case VectoSimulationJobType.IEPC_S
pnEquivFactor.Enabled = False
pnEquivFactorCharge.Enabled = False
pnMinSoC.Enabled = True
@@ -193,6 +194,7 @@ Public Class HybridStrategyParamsForm
tbCostFactorSoCExponent.Text = If(Double.IsNaN(strategyParams.CostFactorSOCExpponent), 5, strategyParams.CostFactorSOCExpponent).ToGUIFormat()
Case VectoSimulationJobType.SerialHybridVehicle
+ Case VectoSimulationJobType.IEPC_S
tbMinSoC.Text = (strategyParams.MinSoC * 100).ToGUIFormat()
tbTargetSoC.Text = (strategyParams.TargetSoC * 100).ToGUIFormat()
diff --git a/VECTO/GUI/IEPCForm.Designer.vb b/VECTO/GUI/IEPCForm.Designer.vb
new file mode 100644
index 0000000000000000000000000000000000000000..9c5b42f476ff730368793adb5d5860a18b5cf9d5
--- /dev/null
+++ b/VECTO/GUI/IEPCForm.Designer.vb
@@ -0,0 +1,1711 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class IEPCForm
+ Inherits System.Windows.Forms.Form
+
+ 'Form overrides dispose to clean up the component list.
+ <System.Diagnostics.DebuggerNonUserCode()>
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ Try
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ Finally
+ MyBase.Dispose(disposing)
+ End Try
+ End Sub
+
+ 'Required by the Windows Form Designer
+ Private components As System.ComponentModel.IContainer
+
+ 'NOTE: The following procedure is required by the Windows Form Designer
+ 'It can be modified using the Windows Form Designer.
+ 'Do not modify it using the code editor.
+ <System.Diagnostics.DebuggerStepThrough()>
+ Private Sub InitializeComponent()
+ Me.components = New System.ComponentModel.Container()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(IEPCForm))
+ Me.btFLCurveFile1 = New System.Windows.Forms.Button()
+ Me.tbThermalOverload = New System.Windows.Forms.TextBox()
+ Me.Label52 = New System.Windows.Forms.Label()
+ Me.Label48 = New System.Windows.Forms.Label()
+ Me.tbNumberOfDesignTypeWheelMotor = New System.Windows.Forms.TextBox()
+ Me.Label51 = New System.Windows.Forms.Label()
+ Me.tbInertia = New System.Windows.Forms.TextBox()
+ Me.Label49 = New System.Windows.Forms.Label()
+ Me.tbModel = New System.Windows.Forms.TextBox()
+ Me.tcVoltageLevels = New System.Windows.Forms.TabControl()
+ Me.tpFirstVoltageLevel = New System.Windows.Forms.TabPage()
+ Me.FlowLayoutPanel9 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.Label44 = New System.Windows.Forms.Label()
+ Me.tbFLCurve1 = New System.Windows.Forms.TextBox()
+ Me.btShowFLCurve1 = New System.Windows.Forms.Button()
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.Label11 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.Label13 = New System.Windows.Forms.Label()
+ Me.Label43 = New System.Windows.Forms.Label()
+ Me.Label37 = New System.Windows.Forms.Label()
+ Me.tbOverloadTime1 = New System.Windows.Forms.TextBox()
+ Me.tbVoltage1 = New System.Windows.Forms.TextBox()
+ Me.Label39 = New System.Windows.Forms.Label()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.tbContinousTorque1 = New System.Windows.Forms.TextBox()
+ Me.tbContinousTorqueSpeed1 = New System.Windows.Forms.TextBox()
+ Me.Label15 = New System.Windows.Forms.Label()
+ Me.Label42 = New System.Windows.Forms.Label()
+ Me.Label14 = New System.Windows.Forms.Label()
+ Me.tboverloadTorqueSpeed1 = New System.Windows.Forms.TextBox()
+ Me.Label41 = New System.Windows.Forms.Label()
+ Me.tbOverloadTorque1 = New System.Windows.Forms.TextBox()
+ Me.Label12 = New System.Windows.Forms.Label()
+ Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+ Me.TableLayoutPanel6 = New System.Windows.Forms.TableLayoutPanel()
+ Me.Label47 = New System.Windows.Forms.Label()
+ Me.lvPowerMap1 = New System.Windows.Forms.ListView()
+ Me.ColumnHeader13 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader14 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.tpVoltageLevel = New System.Windows.Forms.TabPage()
+ Me.GroupBox4 = New System.Windows.Forms.GroupBox()
+ Me.TableLayoutPanel2 = New System.Windows.Forms.TableLayoutPanel()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.lvPowerMap2 = New System.Windows.Forms.ListView()
+ Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.FlowLayoutPanel10 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.Label28 = New System.Windows.Forms.Label()
+ Me.tbFLCurve2 = New System.Windows.Forms.TextBox()
+ Me.btFLCurveFile2 = New System.Windows.Forms.Button()
+ Me.btShowFLCurve2 = New System.Windows.Forms.Button()
+ Me.TableLayoutPanel4 = New System.Windows.Forms.TableLayoutPanel()
+ Me.Label17 = New System.Windows.Forms.Label()
+ Me.Label18 = New System.Windows.Forms.Label()
+ Me.Label26 = New System.Windows.Forms.Label()
+ Me.Label19 = New System.Windows.Forms.Label()
+ Me.tbOverloadTime2 = New System.Windows.Forms.TextBox()
+ Me.Label24 = New System.Windows.Forms.Label()
+ Me.tbVoltage2 = New System.Windows.Forms.TextBox()
+ Me.Label20 = New System.Windows.Forms.Label()
+ Me.Label21 = New System.Windows.Forms.Label()
+ Me.tbContinousTorque2 = New System.Windows.Forms.TextBox()
+ Me.tbContinousTorqueSpeed2 = New System.Windows.Forms.TextBox()
+ Me.Label27 = New System.Windows.Forms.Label()
+ Me.Label23 = New System.Windows.Forms.Label()
+ Me.tbOverloadTorqueSpeed2 = New System.Windows.Forms.TextBox()
+ Me.Label25 = New System.Windows.Forms.Label()
+ Me.Label22 = New System.Windows.Forms.Label()
+ Me.tbOverloadTorque2 = New System.Windows.Forms.TextBox()
+ Me.Label16 = New System.Windows.Forms.Label()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.cbDesignTypeWheelMotor = New System.Windows.Forms.CheckBox()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.cbDifferentialIncluded = New System.Windows.Forms.CheckBox()
+ Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.TableLayoutPanel5 = New System.Windows.Forms.TableLayoutPanel()
+ Me.FlowLayoutPanel2 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.btAddGear = New System.Windows.Forms.Button()
+ Me.btRemoveGear = New System.Windows.Forms.Button()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.lvGear = New System.Windows.Forms.ListView()
+ Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+ Me.TableLayoutPanel3 = New System.Windows.Forms.TableLayoutPanel()
+ Me.lvDragCurve = New System.Windows.Forms.ListView()
+ Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.FlowLayoutPanel11 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.btAddDragCurve = New System.Windows.Forms.Button()
+ Me.btRemoveDragCurve = New System.Windows.Forms.Button()
+ Me.Label7 = New System.Windows.Forms.Label()
+ Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+ Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+ Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+ Me.lblTitle = New System.Windows.Forms.Label()
+ Me.ButCancel = New System.Windows.Forms.Button()
+ Me.ButOK = New System.Windows.Forms.Button()
+ Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.FlowLayoutPanel4 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.FlowLayoutPanel5 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.Label9 = New System.Windows.Forms.Label()
+ Me.FlowLayoutPanel6 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.lblinertiaUnit = New System.Windows.Forms.Label()
+ Me.FlowLayoutPanel7 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.FlowLayoutPanel8 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.Label10 = New System.Windows.Forms.Label()
+ Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+ Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
+ Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.tcVoltageLevels.SuspendLayout
+ Me.tpFirstVoltageLevel.SuspendLayout
+ Me.FlowLayoutPanel9.SuspendLayout
+ Me.TableLayoutPanel1.SuspendLayout
+ Me.GroupBox2.SuspendLayout
+ Me.TableLayoutPanel6.SuspendLayout
+ Me.tpVoltageLevel.SuspendLayout
+ Me.GroupBox4.SuspendLayout
+ Me.TableLayoutPanel2.SuspendLayout
+ Me.FlowLayoutPanel10.SuspendLayout
+ Me.TableLayoutPanel4.SuspendLayout
+ Me.GroupBox1.SuspendLayout
+ Me.TableLayoutPanel5.SuspendLayout
+ Me.FlowLayoutPanel2.SuspendLayout
+ Me.GroupBox3.SuspendLayout
+ Me.TableLayoutPanel3.SuspendLayout
+ Me.FlowLayoutPanel11.SuspendLayout
+ Me.ToolStrip1.SuspendLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.FlowLayoutPanel1.SuspendLayout
+ Me.FlowLayoutPanel4.SuspendLayout
+ Me.FlowLayoutPanel5.SuspendLayout
+ Me.FlowLayoutPanel6.SuspendLayout
+ Me.FlowLayoutPanel7.SuspendLayout
+ Me.FlowLayoutPanel8.SuspendLayout
+ Me.StatusStrip1.SuspendLayout
+ Me.CmOpenFile.SuspendLayout
+ Me.SuspendLayout
+ '
+ 'btFLCurveFile1
+ '
+ Me.btFLCurveFile1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btFLCurveFile1.Image = CType(resources.GetObject("btFLCurveFile1.Image"),System.Drawing.Image)
+ Me.btFLCurveFile1.Location = New System.Drawing.Point(630, 1)
+ Me.btFLCurveFile1.Margin = New System.Windows.Forms.Padding(0)
+ Me.btFLCurveFile1.Name = "btFLCurveFile1"
+ Me.btFLCurveFile1.Size = New System.Drawing.Size(36, 37)
+ Me.btFLCurveFile1.TabIndex = 15
+ Me.btFLCurveFile1.UseVisualStyleBackColor = true
+ '
+ 'tbThermalOverload
+ '
+ Me.tbThermalOverload.Anchor = System.Windows.Forms.AnchorStyles.Left
+ Me.tbThermalOverload.Location = New System.Drawing.Point(317, 5)
+ Me.tbThermalOverload.Margin = New System.Windows.Forms.Padding(45, 5, 4, 5)
+ Me.tbThermalOverload.Name = "tbThermalOverload"
+ Me.tbThermalOverload.Size = New System.Drawing.Size(82, 26)
+ Me.tbThermalOverload.TabIndex = 3
+ '
+ 'Label52
+ '
+ Me.Label52.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label52.AutoSize = true
+ Me.Label52.Location = New System.Drawing.Point(4, 8)
+ Me.Label52.Margin = New System.Windows.Forms.Padding(4, 0, 15, 0)
+ Me.Label52.Name = "Label52"
+ Me.Label52.Size = New System.Drawing.Size(253, 20)
+ Me.Label52.TabIndex = 50
+ Me.Label52.Text = "Thermal Overload Recovery Factor"
+ '
+ 'Label48
+ '
+ Me.Label48.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label48.AutoSize = true
+ Me.Label48.Location = New System.Drawing.Point(4, 8)
+ Me.Label48.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label48.Name = "Label48"
+ Me.Label48.Size = New System.Drawing.Size(304, 20)
+ Me.Label48.TabIndex = 48
+ Me.Label48.Text = "Nr of Design Type Wheel Motor Measured"
+ '
+ 'tbNumberOfDesignTypeWheelMotor
+ '
+ Me.tbNumberOfDesignTypeWheelMotor.Anchor = System.Windows.Forms.AnchorStyles.Left
+ Me.tbNumberOfDesignTypeWheelMotor.Enabled = false
+ Me.tbNumberOfDesignTypeWheelMotor.Location = New System.Drawing.Point(316, 5)
+ Me.tbNumberOfDesignTypeWheelMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbNumberOfDesignTypeWheelMotor.Name = "tbNumberOfDesignTypeWheelMotor"
+ Me.tbNumberOfDesignTypeWheelMotor.Size = New System.Drawing.Size(43, 26)
+ Me.tbNumberOfDesignTypeWheelMotor.TabIndex = 5
+ '
+ 'Label51
+ '
+ Me.Label51.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label51.AutoSize = true
+ Me.Label51.Location = New System.Drawing.Point(4, 8)
+ Me.Label51.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label51.Name = "Label51"
+ Me.Label51.Size = New System.Drawing.Size(54, 20)
+ Me.Label51.TabIndex = 45
+ Me.Label51.Text = "Inertia"
+ '
+ 'tbInertia
+ '
+ Me.tbInertia.Anchor = System.Windows.Forms.AnchorStyles.Left
+ Me.tbInertia.Location = New System.Drawing.Point(66, 5)
+ Me.tbInertia.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbInertia.Name = "tbInertia"
+ Me.tbInertia.Size = New System.Drawing.Size(84, 26)
+ Me.tbInertia.TabIndex = 2
+ '
+ 'Label49
+ '
+ Me.Label49.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label49.AutoSize = true
+ Me.Label49.Location = New System.Drawing.Point(4, 8)
+ Me.Label49.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label49.Name = "Label49"
+ Me.Label49.Size = New System.Drawing.Size(52, 20)
+ Me.Label49.TabIndex = 43
+ Me.Label49.Text = "Model"
+ '
+ 'tbModel
+ '
+ Me.tbModel.Anchor = System.Windows.Forms.AnchorStyles.Left
+ Me.tbModel.Location = New System.Drawing.Point(64, 5)
+ Me.tbModel.Margin = New System.Windows.Forms.Padding(4, 5, 0, 5)
+ Me.tbModel.Name = "tbModel"
+ Me.tbModel.Size = New System.Drawing.Size(289, 26)
+ Me.tbModel.TabIndex = 1
+ '
+ 'tcVoltageLevels
+ '
+ Me.tcVoltageLevels.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.tcVoltageLevels.Controls.Add(Me.tpFirstVoltageLevel)
+ Me.tcVoltageLevels.Controls.Add(Me.tpVoltageLevel)
+ Me.tcVoltageLevels.Location = New System.Drawing.Point(24, 318)
+ Me.tcVoltageLevels.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tcVoltageLevels.Name = "tcVoltageLevels"
+ Me.tcVoltageLevels.SelectedIndex = 0
+ Me.tcVoltageLevels.Size = New System.Drawing.Size(776, 495)
+ Me.tcVoltageLevels.TabIndex = 107
+ '
+ 'tpFirstVoltageLevel
+ '
+ Me.tpFirstVoltageLevel.Controls.Add(Me.FlowLayoutPanel9)
+ Me.tpFirstVoltageLevel.Controls.Add(Me.TableLayoutPanel1)
+ Me.tpFirstVoltageLevel.Controls.Add(Me.GroupBox2)
+ Me.tpFirstVoltageLevel.Location = New System.Drawing.Point(4, 29)
+ Me.tpFirstVoltageLevel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpFirstVoltageLevel.Name = "tpFirstVoltageLevel"
+ Me.tpFirstVoltageLevel.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpFirstVoltageLevel.Size = New System.Drawing.Size(768, 462)
+ Me.tpFirstVoltageLevel.TabIndex = 0
+ Me.tpFirstVoltageLevel.Text = "Voltage Level Low"
+ Me.tpFirstVoltageLevel.UseVisualStyleBackColor = true
+ '
+ 'FlowLayoutPanel9
+ '
+ Me.FlowLayoutPanel9.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.FlowLayoutPanel9.Controls.Add(Me.Label44)
+ Me.FlowLayoutPanel9.Controls.Add(Me.tbFLCurve1)
+ Me.FlowLayoutPanel9.Controls.Add(Me.btFLCurveFile1)
+ Me.FlowLayoutPanel9.Controls.Add(Me.btShowFLCurve1)
+ Me.FlowLayoutPanel9.Location = New System.Drawing.Point(9, 145)
+ Me.FlowLayoutPanel9.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel9.Name = "FlowLayoutPanel9"
+ Me.FlowLayoutPanel9.Size = New System.Drawing.Size(744, 40)
+ Me.FlowLayoutPanel9.TabIndex = 108
+ '
+ 'Label44
+ '
+ Me.Label44.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label44.AutoSize = true
+ Me.Label44.Location = New System.Drawing.Point(21, 9)
+ Me.Label44.Margin = New System.Windows.Forms.Padding(21, 0, 0, 0)
+ Me.Label44.Name = "Label44"
+ Me.Label44.Size = New System.Drawing.Size(182, 20)
+ Me.Label44.TabIndex = 59
+ Me.Label44.Text = "Full Load Curve (.viepcp)"
+ '
+ 'tbFLCurve1
+ '
+ Me.tbFLCurve1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbFLCurve1.Location = New System.Drawing.Point(207, 6)
+ Me.tbFLCurve1.Margin = New System.Windows.Forms.Padding(4, 5, 9, 5)
+ Me.tbFLCurve1.Name = "tbFLCurve1"
+ Me.tbFLCurve1.Size = New System.Drawing.Size(414, 26)
+ Me.tbFLCurve1.TabIndex = 14
+ '
+ 'btShowFLCurve1
+ '
+ Me.btShowFLCurve1.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.btShowFLCurve1.Location = New System.Drawing.Point(666, 2)
+ Me.btShowFLCurve1.Margin = New System.Windows.Forms.Padding(0, 2, 0, 0)
+ Me.btShowFLCurve1.Name = "btShowFLCurve1"
+ Me.btShowFLCurve1.Size = New System.Drawing.Size(36, 37)
+ Me.btShowFLCurve1.TabIndex = 85
+ Me.btShowFLCurve1.TabStop = false
+ Me.btShowFLCurve1.UseVisualStyleBackColor = true
+ '
+ 'TableLayoutPanel1
+ '
+ Me.TableLayoutPanel1.ColumnCount = 7
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 210!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 93!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 192!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 93!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 88!))
+ Me.TableLayoutPanel1.Controls.Add(Me.Label11, 2, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label4, 2, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label13, 5, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label43, 3, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label37, 0, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbOverloadTime1, 4, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbVoltage1, 1, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label39, 0, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label1, 0, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbContinousTorque1, 1, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbContinousTorqueSpeed1, 1, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label15, 2, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label42, 3, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label14, 5, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.tboverloadTorqueSpeed1, 4, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label41, 3, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbOverloadTorque1, 4, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label12, 5, 1)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(9, 11)
+ Me.TableLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+ Me.TableLayoutPanel1.RowCount = 3
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(744, 126)
+ Me.TableLayoutPanel1.TabIndex = 107
+ '
+ 'Label11
+ '
+ Me.Label11.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label11.AutoSize = true
+ Me.Label11.Location = New System.Drawing.Point(305, 53)
+ Me.Label11.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label11.Name = "Label11"
+ Me.Label11.Size = New System.Drawing.Size(41, 20)
+ Me.Label11.TabIndex = 63
+ Me.Label11.Text = "[Nm]"
+ '
+ 'Label4
+ '
+ Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label4.AutoSize = true
+ Me.Label4.Location = New System.Drawing.Point(311, 11)
+ Me.Label4.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(28, 20)
+ Me.Label4.TabIndex = 62
+ Me.Label4.Text = "[V]"
+ '
+ 'Label13
+ '
+ Me.Label13.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label13.AutoSize = true
+ Me.Label13.Location = New System.Drawing.Point(634, 11)
+ Me.Label13.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label13.Name = "Label13"
+ Me.Label13.Size = New System.Drawing.Size(42, 20)
+ Me.Label13.TabIndex = 65
+ Me.Label13.Text = "[sec]"
+ '
+ 'Label43
+ '
+ Me.Label43.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label43.AutoSize = true
+ Me.Label43.Location = New System.Drawing.Point(426, 11)
+ Me.Label43.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label43.Name = "Label43"
+ Me.Label43.Size = New System.Drawing.Size(110, 20)
+ Me.Label43.TabIndex = 11
+ Me.Label43.Text = "Overload Time"
+ '
+ 'Label37
+ '
+ Me.Label37.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label37.AutoSize = true
+ Me.Label37.Location = New System.Drawing.Point(142, 11)
+ Me.Label37.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label37.Name = "Label37"
+ Me.Label37.Size = New System.Drawing.Size(64, 20)
+ Me.Label37.TabIndex = 1
+ Me.Label37.Text = "Voltage"
+ '
+ 'tbOverloadTime1
+ '
+ Me.tbOverloadTime1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTime1.Location = New System.Drawing.Point(545, 8)
+ Me.tbOverloadTime1.Margin = New System.Windows.Forms.Padding(0)
+ Me.tbOverloadTime1.Name = "tbOverloadTime1"
+ Me.tbOverloadTime1.Size = New System.Drawing.Size(82, 26)
+ Me.tbOverloadTime1.TabIndex = 11
+ '
+ 'tbVoltage1
+ '
+ Me.tbVoltage1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbVoltage1.Location = New System.Drawing.Point(215, 8)
+ Me.tbVoltage1.Margin = New System.Windows.Forms.Padding(0)
+ Me.tbVoltage1.Name = "tbVoltage1"
+ Me.tbVoltage1.Size = New System.Drawing.Size(82, 26)
+ Me.tbVoltage1.TabIndex = 8
+ '
+ 'Label39
+ '
+ Me.Label39.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label39.AutoSize = true
+ Me.Label39.Location = New System.Drawing.Point(62, 53)
+ Me.Label39.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label39.Name = "Label39"
+ Me.Label39.Size = New System.Drawing.Size(144, 20)
+ Me.Label39.TabIndex = 3
+ Me.Label39.Text = "Continuous Torque"
+ '
+ 'Label1
+ '
+ Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label1.AutoSize = true
+ Me.Label1.Location = New System.Drawing.Point(11, 95)
+ Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(195, 20)
+ Me.Label1.TabIndex = 6
+ Me.Label1.Text = "Continuous Torque Speed"
+ '
+ 'tbContinousTorque1
+ '
+ Me.tbContinousTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinousTorque1.Location = New System.Drawing.Point(215, 50)
+ Me.tbContinousTorque1.Margin = New System.Windows.Forms.Padding(0)
+ Me.tbContinousTorque1.Name = "tbContinousTorque1"
+ Me.tbContinousTorque1.Size = New System.Drawing.Size(82, 26)
+ Me.tbContinousTorque1.TabIndex = 9
+ '
+ 'tbContinousTorqueSpeed1
+ '
+ Me.tbContinousTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinousTorqueSpeed1.Location = New System.Drawing.Point(215, 92)
+ Me.tbContinousTorqueSpeed1.Margin = New System.Windows.Forms.Padding(0)
+ Me.tbContinousTorqueSpeed1.Name = "tbContinousTorqueSpeed1"
+ Me.tbContinousTorqueSpeed1.Size = New System.Drawing.Size(82, 26)
+ Me.tbContinousTorqueSpeed1.TabIndex = 10
+ '
+ 'Label15
+ '
+ Me.Label15.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label15.AutoSize = true
+ Me.Label15.Location = New System.Drawing.Point(303, 95)
+ Me.Label15.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label15.Name = "Label15"
+ Me.Label15.Size = New System.Drawing.Size(44, 20)
+ Me.Label15.TabIndex = 67
+ Me.Label15.Text = "[rpm]"
+ '
+ 'Label42
+ '
+ Me.Label42.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label42.AutoSize = true
+ Me.Label42.Location = New System.Drawing.Point(359, 95)
+ Me.Label42.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label42.Name = "Label42"
+ Me.Label42.Size = New System.Drawing.Size(177, 20)
+ Me.Label42.TabIndex = 9
+ Me.Label42.Text = "Overload Torque Speed"
+ '
+ 'Label14
+ '
+ Me.Label14.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label14.AutoSize = true
+ Me.Label14.Location = New System.Drawing.Point(633, 95)
+ Me.Label14.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label14.Name = "Label14"
+ Me.Label14.Size = New System.Drawing.Size(44, 20)
+ Me.Label14.TabIndex = 66
+ Me.Label14.Text = "[rpm]"
+ '
+ 'tboverloadTorqueSpeed1
+ '
+ Me.tboverloadTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tboverloadTorqueSpeed1.Location = New System.Drawing.Point(545, 92)
+ Me.tboverloadTorqueSpeed1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tboverloadTorqueSpeed1.Name = "tboverloadTorqueSpeed1"
+ Me.tboverloadTorqueSpeed1.Size = New System.Drawing.Size(82, 26)
+ Me.tboverloadTorqueSpeed1.TabIndex = 13
+ '
+ 'Label41
+ '
+ Me.Label41.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label41.AutoSize = true
+ Me.Label41.Location = New System.Drawing.Point(410, 53)
+ Me.Label41.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label41.Name = "Label41"
+ Me.Label41.Size = New System.Drawing.Size(126, 20)
+ Me.Label41.TabIndex = 7
+ Me.Label41.Text = "Overload Torque"
+ '
+ 'tbOverloadTorque1
+ '
+ Me.tbOverloadTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTorque1.Location = New System.Drawing.Point(545, 50)
+ Me.tbOverloadTorque1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadTorque1.Name = "tbOverloadTorque1"
+ Me.tbOverloadTorque1.Size = New System.Drawing.Size(82, 26)
+ Me.tbOverloadTorque1.TabIndex = 12
+ '
+ 'Label12
+ '
+ Me.Label12.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label12.AutoSize = true
+ Me.Label12.Location = New System.Drawing.Point(635, 53)
+ Me.Label12.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label12.Name = "Label12"
+ Me.Label12.Size = New System.Drawing.Size(41, 20)
+ Me.Label12.TabIndex = 64
+ Me.Label12.Text = "[Nm]"
+ '
+ 'GroupBox2
+ '
+ Me.GroupBox2.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.GroupBox2.Controls.Add(Me.TableLayoutPanel6)
+ Me.GroupBox2.Location = New System.Drawing.Point(9, 194)
+ Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox2.Name = "GroupBox2"
+ Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox2.Size = New System.Drawing.Size(472, 249)
+ Me.GroupBox2.TabIndex = 60
+ Me.GroupBox2.TabStop = false
+ Me.GroupBox2.Text = "Power Map Per Gear"
+ '
+ 'TableLayoutPanel6
+ '
+ Me.TableLayoutPanel6.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel6.ColumnCount = 2
+ Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 194!))
+ Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 254!))
+ Me.TableLayoutPanel6.Controls.Add(Me.Label47, 1, 1)
+ Me.TableLayoutPanel6.Controls.Add(Me.lvPowerMap1, 0, 0)
+ Me.TableLayoutPanel6.Location = New System.Drawing.Point(9, 20)
+ Me.TableLayoutPanel6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TableLayoutPanel6.Name = "TableLayoutPanel6"
+ Me.TableLayoutPanel6.RowCount = 2
+ Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 88.81119!))
+ Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.18881!))
+ Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
+ Me.TableLayoutPanel6.Size = New System.Drawing.Size(447, 220)
+ Me.TableLayoutPanel6.TabIndex = 53
+ '
+ 'Label47
+ '
+ Me.Label47.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label47.AutoSize = true
+ Me.Label47.Location = New System.Drawing.Point(286, 195)
+ Me.Label47.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label47.Name = "Label47"
+ Me.Label47.Size = New System.Drawing.Size(158, 20)
+ Me.Label47.TabIndex = 6
+ Me.Label47.Text = "(Double-Click to Edit)"
+ '
+ 'lvPowerMap1
+ '
+ Me.lvPowerMap1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvPowerMap1.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader13, Me.ColumnHeader14})
+ Me.TableLayoutPanel6.SetColumnSpan(Me.lvPowerMap1, 2)
+ Me.lvPowerMap1.FullRowSelect = true
+ Me.lvPowerMap1.GridLines = true
+ Me.lvPowerMap1.HideSelection = false
+ Me.lvPowerMap1.Location = New System.Drawing.Point(4, 5)
+ Me.lvPowerMap1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.lvPowerMap1.MultiSelect = false
+ Me.lvPowerMap1.Name = "lvPowerMap1"
+ Me.lvPowerMap1.Size = New System.Drawing.Size(440, 185)
+ Me.lvPowerMap1.TabIndex = 108
+ Me.lvPowerMap1.TabStop = false
+ Me.lvPowerMap1.UseCompatibleStateImageBehavior = false
+ Me.lvPowerMap1.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader13
+ '
+ Me.ColumnHeader13.Text = "Gear #"
+ Me.ColumnHeader13.Width = 59
+ '
+ 'ColumnHeader14
+ '
+ Me.ColumnHeader14.Text = "Power Map Filename"
+ Me.ColumnHeader14.Width = 223
+ '
+ 'tpVoltageLevel
+ '
+ Me.tpVoltageLevel.Controls.Add(Me.GroupBox4)
+ Me.tpVoltageLevel.Controls.Add(Me.FlowLayoutPanel10)
+ Me.tpVoltageLevel.Controls.Add(Me.TableLayoutPanel4)
+ Me.tpVoltageLevel.Location = New System.Drawing.Point(4, 29)
+ Me.tpVoltageLevel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpVoltageLevel.Name = "tpVoltageLevel"
+ Me.tpVoltageLevel.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpVoltageLevel.Size = New System.Drawing.Size(768, 462)
+ Me.tpVoltageLevel.TabIndex = 1
+ Me.tpVoltageLevel.Text = "Voltage Level High"
+ Me.tpVoltageLevel.UseVisualStyleBackColor = true
+ '
+ 'GroupBox4
+ '
+ Me.GroupBox4.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.GroupBox4.Controls.Add(Me.TableLayoutPanel2)
+ Me.GroupBox4.Location = New System.Drawing.Point(9, 194)
+ Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox4.Name = "GroupBox4"
+ Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox4.Size = New System.Drawing.Size(472, 249)
+ Me.GroupBox4.TabIndex = 75
+ Me.GroupBox4.TabStop = false
+ Me.GroupBox4.Text = "Power Map Per Gear"
+ '
+ 'TableLayoutPanel2
+ '
+ Me.TableLayoutPanel2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel2.ColumnCount = 2
+ Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 194!))
+ Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 254!))
+ Me.TableLayoutPanel2.Controls.Add(Me.Label5, 1, 1)
+ Me.TableLayoutPanel2.Controls.Add(Me.lvPowerMap2, 0, 0)
+ Me.TableLayoutPanel2.Location = New System.Drawing.Point(9, 20)
+ Me.TableLayoutPanel2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TableLayoutPanel2.Name = "TableLayoutPanel2"
+ Me.TableLayoutPanel2.RowCount = 2
+ Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 88.81119!))
+ Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.18881!))
+ Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
+ Me.TableLayoutPanel2.Size = New System.Drawing.Size(447, 220)
+ Me.TableLayoutPanel2.TabIndex = 53
+ '
+ 'Label5
+ '
+ Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label5.AutoSize = true
+ Me.Label5.Location = New System.Drawing.Point(286, 195)
+ Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(158, 20)
+ Me.Label5.TabIndex = 6
+ Me.Label5.Text = "(Double-Click to Edit)"
+ '
+ 'lvPowerMap2
+ '
+ Me.lvPowerMap2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvPowerMap2.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader6, Me.ColumnHeader7})
+ Me.TableLayoutPanel2.SetColumnSpan(Me.lvPowerMap2, 2)
+ Me.lvPowerMap2.FullRowSelect = true
+ Me.lvPowerMap2.GridLines = true
+ Me.lvPowerMap2.HideSelection = false
+ Me.lvPowerMap2.Location = New System.Drawing.Point(4, 5)
+ Me.lvPowerMap2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.lvPowerMap2.MultiSelect = false
+ Me.lvPowerMap2.Name = "lvPowerMap2"
+ Me.lvPowerMap2.Size = New System.Drawing.Size(440, 185)
+ Me.lvPowerMap2.TabIndex = 109
+ Me.lvPowerMap2.TabStop = false
+ Me.lvPowerMap2.UseCompatibleStateImageBehavior = false
+ Me.lvPowerMap2.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader6
+ '
+ Me.ColumnHeader6.Text = "Gear #"
+ Me.ColumnHeader6.Width = 59
+ '
+ 'ColumnHeader7
+ '
+ Me.ColumnHeader7.Text = "Power Map Filename"
+ Me.ColumnHeader7.Width = 223
+ '
+ 'FlowLayoutPanel10
+ '
+ Me.FlowLayoutPanel10.Controls.Add(Me.Label28)
+ Me.FlowLayoutPanel10.Controls.Add(Me.tbFLCurve2)
+ Me.FlowLayoutPanel10.Controls.Add(Me.btFLCurveFile2)
+ Me.FlowLayoutPanel10.Controls.Add(Me.btShowFLCurve2)
+ Me.FlowLayoutPanel10.Location = New System.Drawing.Point(9, 145)
+ Me.FlowLayoutPanel10.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel10.Name = "FlowLayoutPanel10"
+ Me.FlowLayoutPanel10.Size = New System.Drawing.Size(744, 40)
+ Me.FlowLayoutPanel10.TabIndex = 110
+ '
+ 'Label28
+ '
+ Me.Label28.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label28.AutoSize = true
+ Me.Label28.Location = New System.Drawing.Point(21, 9)
+ Me.Label28.Margin = New System.Windows.Forms.Padding(21, 0, 0, 0)
+ Me.Label28.Name = "Label28"
+ Me.Label28.Size = New System.Drawing.Size(182, 20)
+ Me.Label28.TabIndex = 59
+ Me.Label28.Text = "Full Load Curve (.viepcp)"
+ '
+ 'tbFLCurve2
+ '
+ Me.tbFLCurve2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbFLCurve2.Location = New System.Drawing.Point(207, 6)
+ Me.tbFLCurve2.Margin = New System.Windows.Forms.Padding(4, 5, 9, 5)
+ Me.tbFLCurve2.Name = "tbFLCurve2"
+ Me.tbFLCurve2.Size = New System.Drawing.Size(414, 26)
+ Me.tbFLCurve2.TabIndex = 23
+ '
+ 'btFLCurveFile2
+ '
+ Me.btFLCurveFile2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btFLCurveFile2.Image = CType(resources.GetObject("btFLCurveFile2.Image"),System.Drawing.Image)
+ Me.btFLCurveFile2.Location = New System.Drawing.Point(630, 1)
+ Me.btFLCurveFile2.Margin = New System.Windows.Forms.Padding(0)
+ Me.btFLCurveFile2.Name = "btFLCurveFile2"
+ Me.btFLCurveFile2.Size = New System.Drawing.Size(36, 37)
+ Me.btFLCurveFile2.TabIndex = 24
+ Me.btFLCurveFile2.UseVisualStyleBackColor = true
+ '
+ 'btShowFLCurve2
+ '
+ Me.btShowFLCurve2.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.btShowFLCurve2.Location = New System.Drawing.Point(666, 2)
+ Me.btShowFLCurve2.Margin = New System.Windows.Forms.Padding(0, 2, 0, 0)
+ Me.btShowFLCurve2.Name = "btShowFLCurve2"
+ Me.btShowFLCurve2.Size = New System.Drawing.Size(36, 37)
+ Me.btShowFLCurve2.TabIndex = 85
+ Me.btShowFLCurve2.TabStop = false
+ Me.btShowFLCurve2.UseVisualStyleBackColor = true
+ '
+ 'TableLayoutPanel4
+ '
+ Me.TableLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel4.ColumnCount = 7
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 210!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 93!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 192!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 93!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 88!))
+ Me.TableLayoutPanel4.Controls.Add(Me.Label17, 2, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label18, 2, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label26, 5, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label19, 0, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbOverloadTime2, 4, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label24, 3, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbVoltage2, 1, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label20, 0, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label21, 0, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbContinousTorque2, 1, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbContinousTorqueSpeed2, 1, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label27, 2, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label23, 3, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbOverloadTorqueSpeed2, 4, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label25, 5, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label22, 3, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbOverloadTorque2, 4, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label16, 5, 1)
+ Me.TableLayoutPanel4.Location = New System.Drawing.Point(9, 11)
+ Me.TableLayoutPanel4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TableLayoutPanel4.Name = "TableLayoutPanel4"
+ Me.TableLayoutPanel4.RowCount = 3
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42!))
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42!))
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42!))
+ Me.TableLayoutPanel4.Size = New System.Drawing.Size(744, 126)
+ Me.TableLayoutPanel4.TabIndex = 109
+ '
+ 'Label17
+ '
+ Me.Label17.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label17.AutoSize = true
+ Me.Label17.Location = New System.Drawing.Point(305, 53)
+ Me.Label17.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label17.Name = "Label17"
+ Me.Label17.Size = New System.Drawing.Size(41, 20)
+ Me.Label17.TabIndex = 63
+ Me.Label17.Text = "[Nm]"
+ '
+ 'Label18
+ '
+ Me.Label18.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label18.AutoSize = true
+ Me.Label18.Location = New System.Drawing.Point(311, 11)
+ Me.Label18.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label18.Name = "Label18"
+ Me.Label18.Size = New System.Drawing.Size(28, 20)
+ Me.Label18.TabIndex = 62
+ Me.Label18.Text = "[V]"
+ '
+ 'Label26
+ '
+ Me.Label26.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label26.AutoSize = true
+ Me.Label26.Location = New System.Drawing.Point(634, 11)
+ Me.Label26.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label26.Name = "Label26"
+ Me.Label26.Size = New System.Drawing.Size(42, 20)
+ Me.Label26.TabIndex = 65
+ Me.Label26.Text = "[sec]"
+ '
+ 'Label19
+ '
+ Me.Label19.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label19.AutoSize = true
+ Me.Label19.Location = New System.Drawing.Point(142, 11)
+ Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label19.Name = "Label19"
+ Me.Label19.Size = New System.Drawing.Size(64, 20)
+ Me.Label19.TabIndex = 1
+ Me.Label19.Text = "Voltage"
+ '
+ 'tbOverloadTime2
+ '
+ Me.tbOverloadTime2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTime2.Location = New System.Drawing.Point(545, 8)
+ Me.tbOverloadTime2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadTime2.Name = "tbOverloadTime2"
+ Me.tbOverloadTime2.Size = New System.Drawing.Size(82, 26)
+ Me.tbOverloadTime2.TabIndex = 20
+ '
+ 'Label24
+ '
+ Me.Label24.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label24.AutoSize = true
+ Me.Label24.Location = New System.Drawing.Point(426, 11)
+ Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label24.Name = "Label24"
+ Me.Label24.Size = New System.Drawing.Size(110, 20)
+ Me.Label24.TabIndex = 11
+ Me.Label24.Text = "Overload Time"
+ '
+ 'tbVoltage2
+ '
+ Me.tbVoltage2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbVoltage2.Location = New System.Drawing.Point(215, 8)
+ Me.tbVoltage2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbVoltage2.Name = "tbVoltage2"
+ Me.tbVoltage2.Size = New System.Drawing.Size(82, 26)
+ Me.tbVoltage2.TabIndex = 17
+ '
+ 'Label20
+ '
+ Me.Label20.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label20.AutoSize = true
+ Me.Label20.Location = New System.Drawing.Point(62, 53)
+ Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label20.Name = "Label20"
+ Me.Label20.Size = New System.Drawing.Size(144, 20)
+ Me.Label20.TabIndex = 3
+ Me.Label20.Text = "Continuous Torque"
+ '
+ 'Label21
+ '
+ Me.Label21.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label21.AutoSize = true
+ Me.Label21.Location = New System.Drawing.Point(11, 95)
+ Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label21.Name = "Label21"
+ Me.Label21.Size = New System.Drawing.Size(195, 20)
+ Me.Label21.TabIndex = 6
+ Me.Label21.Text = "Continuous Torque Speed"
+ '
+ 'tbContinousTorque2
+ '
+ Me.tbContinousTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinousTorque2.Location = New System.Drawing.Point(215, 50)
+ Me.tbContinousTorque2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbContinousTorque2.Name = "tbContinousTorque2"
+ Me.tbContinousTorque2.Size = New System.Drawing.Size(82, 26)
+ Me.tbContinousTorque2.TabIndex = 18
+ '
+ 'tbContinousTorqueSpeed2
+ '
+ Me.tbContinousTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinousTorqueSpeed2.Location = New System.Drawing.Point(215, 92)
+ Me.tbContinousTorqueSpeed2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbContinousTorqueSpeed2.Name = "tbContinousTorqueSpeed2"
+ Me.tbContinousTorqueSpeed2.Size = New System.Drawing.Size(82, 26)
+ Me.tbContinousTorqueSpeed2.TabIndex = 19
+ '
+ 'Label27
+ '
+ Me.Label27.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label27.AutoSize = true
+ Me.Label27.Location = New System.Drawing.Point(303, 95)
+ Me.Label27.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label27.Name = "Label27"
+ Me.Label27.Size = New System.Drawing.Size(44, 20)
+ Me.Label27.TabIndex = 67
+ Me.Label27.Text = "[rpm]"
+ '
+ 'Label23
+ '
+ Me.Label23.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label23.AutoSize = true
+ Me.Label23.Location = New System.Drawing.Point(359, 95)
+ Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label23.Name = "Label23"
+ Me.Label23.Size = New System.Drawing.Size(177, 20)
+ Me.Label23.TabIndex = 9
+ Me.Label23.Text = "Overload Torque Speed"
+ '
+ 'tbOverloadTorqueSpeed2
+ '
+ Me.tbOverloadTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTorqueSpeed2.Location = New System.Drawing.Point(545, 92)
+ Me.tbOverloadTorqueSpeed2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadTorqueSpeed2.Name = "tbOverloadTorqueSpeed2"
+ Me.tbOverloadTorqueSpeed2.Size = New System.Drawing.Size(82, 26)
+ Me.tbOverloadTorqueSpeed2.TabIndex = 22
+ '
+ 'Label25
+ '
+ Me.Label25.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label25.AutoSize = true
+ Me.Label25.Location = New System.Drawing.Point(633, 95)
+ Me.Label25.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label25.Name = "Label25"
+ Me.Label25.Size = New System.Drawing.Size(44, 20)
+ Me.Label25.TabIndex = 66
+ Me.Label25.Text = "[rpm]"
+ '
+ 'Label22
+ '
+ Me.Label22.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label22.AutoSize = true
+ Me.Label22.Location = New System.Drawing.Point(410, 53)
+ Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label22.Name = "Label22"
+ Me.Label22.Size = New System.Drawing.Size(126, 20)
+ Me.Label22.TabIndex = 7
+ Me.Label22.Text = "Overload Torque"
+ '
+ 'tbOverloadTorque2
+ '
+ Me.tbOverloadTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTorque2.Location = New System.Drawing.Point(545, 50)
+ Me.tbOverloadTorque2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadTorque2.Name = "tbOverloadTorque2"
+ Me.tbOverloadTorque2.Size = New System.Drawing.Size(82, 26)
+ Me.tbOverloadTorque2.TabIndex = 21
+ '
+ 'Label16
+ '
+ Me.Label16.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label16.AutoSize = true
+ Me.Label16.Location = New System.Drawing.Point(635, 53)
+ Me.Label16.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label16.Name = "Label16"
+ Me.Label16.Size = New System.Drawing.Size(41, 20)
+ Me.Label16.TabIndex = 64
+ Me.Label16.Text = "[Nm]"
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = true
+ Me.Label3.Dock = System.Windows.Forms.DockStyle.Top
+ Me.Label3.Location = New System.Drawing.Point(4, 9)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(4, 9, 9, 9)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(191, 20)
+ Me.Label3.TabIndex = 54
+ Me.Label3.Text = "Design Type Wheel Motor"
+ '
+ 'cbDesignTypeWheelMotor
+ '
+ Me.cbDesignTypeWheelMotor.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.cbDesignTypeWheelMotor.AutoSize = true
+ Me.cbDesignTypeWheelMotor.Location = New System.Drawing.Point(274, 9)
+ Me.cbDesignTypeWheelMotor.Margin = New System.Windows.Forms.Padding(70, 9, 4, 9)
+ Me.cbDesignTypeWheelMotor.Name = "cbDesignTypeWheelMotor"
+ Me.cbDesignTypeWheelMotor.Size = New System.Drawing.Size(22, 21)
+ Me.cbDesignTypeWheelMotor.TabIndex = 4
+ Me.cbDesignTypeWheelMotor.UseVisualStyleBackColor = true
+ '
+ 'Label2
+ '
+ Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(4, 9)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(4, 9, 9, 9)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(151, 20)
+ Me.Label2.TabIndex = 53
+ Me.Label2.Text = "Differential Included"
+ '
+ 'cbDifferentialIncluded
+ '
+ Me.cbDifferentialIncluded.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.cbDifferentialIncluded.AutoSize = true
+ Me.cbDifferentialIncluded.Location = New System.Drawing.Point(284, 9)
+ Me.cbDifferentialIncluded.Margin = New System.Windows.Forms.Padding(120, 9, 4, 9)
+ Me.cbDifferentialIncluded.Name = "cbDifferentialIncluded"
+ Me.cbDifferentialIncluded.Size = New System.Drawing.Size(22, 21)
+ Me.cbDifferentialIncluded.TabIndex = 6
+ Me.cbDifferentialIncluded.UseVisualStyleBackColor = true
+ '
+ 'GroupBox1
+ '
+ Me.GroupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.GroupBox1.Controls.Add(Me.TableLayoutPanel5)
+ Me.GroupBox1.Location = New System.Drawing.Point(808, 289)
+ Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox1.Name = "GroupBox1"
+ Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox1.Size = New System.Drawing.Size(471, 277)
+ Me.GroupBox1.TabIndex = 61
+ Me.GroupBox1.TabStop = false
+ Me.GroupBox1.Text = "Gears"
+ '
+ 'TableLayoutPanel5
+ '
+ Me.TableLayoutPanel5.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel5.ColumnCount = 2
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 194!))
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 256!))
+ Me.TableLayoutPanel5.Controls.Add(Me.FlowLayoutPanel2, 0, 1)
+ Me.TableLayoutPanel5.Controls.Add(Me.Label6, 1, 1)
+ Me.TableLayoutPanel5.Controls.Add(Me.lvGear, 0, 0)
+ Me.TableLayoutPanel5.Location = New System.Drawing.Point(10, 25)
+ Me.TableLayoutPanel5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TableLayoutPanel5.Name = "TableLayoutPanel5"
+ Me.TableLayoutPanel5.RowCount = 2
+ Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
+ Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
+ Me.TableLayoutPanel5.Size = New System.Drawing.Size(450, 245)
+ Me.TableLayoutPanel5.TabIndex = 111
+ '
+ 'FlowLayoutPanel2
+ '
+ Me.FlowLayoutPanel2.Controls.Add(Me.btAddGear)
+ Me.FlowLayoutPanel2.Controls.Add(Me.btRemoveGear)
+ Me.FlowLayoutPanel2.Location = New System.Drawing.Point(4, 197)
+ Me.FlowLayoutPanel2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2"
+ Me.FlowLayoutPanel2.Size = New System.Drawing.Size(92, 43)
+ Me.FlowLayoutPanel2.TabIndex = 112
+ '
+ 'btAddGear
+ '
+ Me.btAddGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.btAddGear.Location = New System.Drawing.Point(4, 5)
+ Me.btAddGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btAddGear.Name = "btAddGear"
+ Me.btAddGear.Size = New System.Drawing.Size(36, 37)
+ Me.btAddGear.TabIndex = 25
+ Me.btAddGear.UseVisualStyleBackColor = true
+ '
+ 'btRemoveGear
+ '
+ Me.btRemoveGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.btRemoveGear.Location = New System.Drawing.Point(48, 5)
+ Me.btRemoveGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btRemoveGear.Name = "btRemoveGear"
+ Me.btRemoveGear.Size = New System.Drawing.Size(36, 37)
+ Me.btRemoveGear.TabIndex = 26
+ Me.btRemoveGear.UseVisualStyleBackColor = true
+ '
+ 'Label6
+ '
+ Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label6.AutoSize = true
+ Me.Label6.Location = New System.Drawing.Point(288, 192)
+ Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(158, 20)
+ Me.Label6.TabIndex = 6
+ Me.Label6.Text = "(Double-Click to Edit)"
+ '
+ 'lvGear
+ '
+ Me.lvGear.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvGear.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3})
+ Me.TableLayoutPanel5.SetColumnSpan(Me.lvGear, 2)
+ Me.lvGear.FullRowSelect = true
+ Me.lvGear.GridLines = true
+ Me.lvGear.HideSelection = false
+ Me.lvGear.Location = New System.Drawing.Point(4, 5)
+ Me.lvGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.lvGear.MultiSelect = false
+ Me.lvGear.Name = "lvGear"
+ Me.lvGear.Size = New System.Drawing.Size(442, 182)
+ Me.lvGear.TabIndex = 78
+ Me.lvGear.TabStop = false
+ Me.lvGear.UseCompatibleStateImageBehavior = false
+ Me.lvGear.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader1
+ '
+ Me.ColumnHeader1.Text = "Ratio"
+ Me.ColumnHeader1.Width = 45
+ '
+ 'ColumnHeader2
+ '
+ Me.ColumnHeader2.Text = "Max Out Shaft Torque"
+ Me.ColumnHeader2.Width = 120
+ '
+ 'ColumnHeader3
+ '
+ Me.ColumnHeader3.Text = "Max Out Shaft Speed"
+ Me.ColumnHeader3.Width = 120
+ '
+ 'GroupBox3
+ '
+ Me.GroupBox3.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.GroupBox3.Controls.Add(Me.TableLayoutPanel3)
+ Me.GroupBox3.Location = New System.Drawing.Point(808, 572)
+ Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox3.Name = "GroupBox3"
+ Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox3.Size = New System.Drawing.Size(471, 277)
+ Me.GroupBox3.TabIndex = 62
+ Me.GroupBox3.TabStop = false
+ Me.GroupBox3.Text = "Drag Curves"
+ '
+ 'TableLayoutPanel3
+ '
+ Me.TableLayoutPanel3.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel3.ColumnCount = 2
+ Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 194!))
+ Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 256!))
+ Me.TableLayoutPanel3.Controls.Add(Me.lvDragCurve, 0, 0)
+ Me.TableLayoutPanel3.Controls.Add(Me.FlowLayoutPanel11, 0, 1)
+ Me.TableLayoutPanel3.Controls.Add(Me.Label7, 1, 1)
+ Me.TableLayoutPanel3.Location = New System.Drawing.Point(10, 22)
+ Me.TableLayoutPanel3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TableLayoutPanel3.Name = "TableLayoutPanel3"
+ Me.TableLayoutPanel3.RowCount = 2
+ Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
+ Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
+ Me.TableLayoutPanel3.Size = New System.Drawing.Size(450, 245)
+ Me.TableLayoutPanel3.TabIndex = 113
+ '
+ 'lvDragCurve
+ '
+ Me.lvDragCurve.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvDragCurve.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5})
+ Me.TableLayoutPanel3.SetColumnSpan(Me.lvDragCurve, 2)
+ Me.lvDragCurve.FullRowSelect = true
+ Me.lvDragCurve.GridLines = true
+ Me.lvDragCurve.HideSelection = false
+ Me.lvDragCurve.Location = New System.Drawing.Point(4, 5)
+ Me.lvDragCurve.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.lvDragCurve.MultiSelect = false
+ Me.lvDragCurve.Name = "lvDragCurve"
+ Me.lvDragCurve.Size = New System.Drawing.Size(442, 182)
+ Me.lvDragCurve.TabIndex = 78
+ Me.lvDragCurve.TabStop = false
+ Me.lvDragCurve.UseCompatibleStateImageBehavior = false
+ Me.lvDragCurve.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader4
+ '
+ Me.ColumnHeader4.Text = "Gear #"
+ Me.ColumnHeader4.Width = 59
+ '
+ 'ColumnHeader5
+ '
+ Me.ColumnHeader5.Text = "Drag Curve Filename"
+ Me.ColumnHeader5.Width = 225
+ '
+ 'FlowLayoutPanel11
+ '
+ Me.FlowLayoutPanel11.Controls.Add(Me.btAddDragCurve)
+ Me.FlowLayoutPanel11.Controls.Add(Me.btRemoveDragCurve)
+ Me.FlowLayoutPanel11.Location = New System.Drawing.Point(4, 197)
+ Me.FlowLayoutPanel11.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel11.Name = "FlowLayoutPanel11"
+ Me.FlowLayoutPanel11.Size = New System.Drawing.Size(92, 43)
+ Me.FlowLayoutPanel11.TabIndex = 114
+ '
+ 'btAddDragCurve
+ '
+ Me.btAddDragCurve.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.btAddDragCurve.Location = New System.Drawing.Point(4, 5)
+ Me.btAddDragCurve.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btAddDragCurve.Name = "btAddDragCurve"
+ Me.btAddDragCurve.Size = New System.Drawing.Size(36, 37)
+ Me.btAddDragCurve.TabIndex = 27
+ Me.btAddDragCurve.UseVisualStyleBackColor = true
+ '
+ 'btRemoveDragCurve
+ '
+ Me.btRemoveDragCurve.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.btRemoveDragCurve.Location = New System.Drawing.Point(48, 5)
+ Me.btRemoveDragCurve.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btRemoveDragCurve.Name = "btRemoveDragCurve"
+ Me.btRemoveDragCurve.Size = New System.Drawing.Size(36, 37)
+ Me.btRemoveDragCurve.TabIndex = 28
+ Me.btRemoveDragCurve.UseVisualStyleBackColor = true
+ '
+ 'Label7
+ '
+ Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label7.AutoSize = true
+ Me.Label7.Location = New System.Drawing.Point(288, 192)
+ Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label7.Name = "Label7"
+ Me.Label7.Size = New System.Drawing.Size(158, 20)
+ Me.Label7.TabIndex = 6
+ Me.Label7.Text = "(Double-Click to Edit)"
+ '
+ 'ToolStrip1
+ '
+ Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+ Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
+ Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
+ Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+ Me.ToolStrip1.Name = "ToolStrip1"
+ Me.ToolStrip1.Size = New System.Drawing.Size(1296, 38)
+ Me.ToolStrip1.TabIndex = 63
+ Me.ToolStrip1.Text = "ToolStrip1"
+ '
+ 'ToolStripBtNew
+ '
+ Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
+ Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtNew.Name = "ToolStripBtNew"
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripBtNew.Text = "ToolStripButton1"
+ Me.ToolStripBtNew.ToolTipText = "New"
+ '
+ 'ToolStripBtOpen
+ '
+ Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripBtOpen.Text = "ToolStripButton1"
+ Me.ToolStripBtOpen.ToolTipText = "Open..."
+ '
+ 'ToolStripBtSave
+ '
+ Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
+ Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtSave.Name = "ToolStripBtSave"
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripBtSave.Text = "ToolStripButton1"
+ Me.ToolStripBtSave.ToolTipText = "Save"
+ '
+ 'ToolStripBtSaveAs
+ '
+ Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
+ Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
+ Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
+ '
+ 'ToolStripSeparator3
+ '
+ Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 33)
+ '
+ 'ToolStripBtSendTo
+ '
+ Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
+ Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripBtSendTo.Text = "Send to Vehicle Editor"
+ Me.ToolStripBtSendTo.ToolTipText = "Send to Vehicle Editor"
+ '
+ 'ToolStripSeparator1
+ '
+ Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 33)
+ '
+ 'ToolStripButton1
+ '
+ Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
+ Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripButton1.Name = "ToolStripButton1"
+ Me.ToolStripButton1.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripButton1.Text = "Help"
+ '
+ 'PictureBox1
+ '
+ Me.PictureBox1.BackColor = System.Drawing.Color.White
+ Me.PictureBox1.Dock = System.Windows.Forms.DockStyle.Top
+ Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 38)
+ Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PictureBox1.Name = "PictureBox1"
+ Me.PictureBox1.Size = New System.Drawing.Size(1296, 62)
+ Me.PictureBox1.TabIndex = 64
+ Me.PictureBox1.TabStop = false
+ '
+ 'lblTitle
+ '
+ Me.lblTitle.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.lblTitle.AutoSize = true
+ Me.lblTitle.BackColor = System.Drawing.Color.White
+ Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.lblTitle.Location = New System.Drawing.Point(171, 55)
+ Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblTitle.Name = "lblTitle"
+ Me.lblTitle.Size = New System.Drawing.Size(100, 40)
+ Me.lblTitle.TabIndex = 65
+ Me.lblTitle.Text = "IEPC"
+ '
+ 'ButCancel
+ '
+ Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.ButCancel.Location = New System.Drawing.Point(1167, 863)
+ Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButCancel.Name = "ButCancel"
+ Me.ButCancel.Size = New System.Drawing.Size(112, 35)
+ Me.ButCancel.TabIndex = 67
+ Me.ButCancel.Text = "Cancel"
+ Me.ButCancel.UseVisualStyleBackColor = true
+ '
+ 'ButOK
+ '
+ Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.ButOK.Location = New System.Drawing.Point(1046, 863)
+ Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButOK.Name = "ButOK"
+ Me.ButOK.Size = New System.Drawing.Size(112, 35)
+ Me.ButOK.TabIndex = 66
+ Me.ButOK.Text = "Save"
+ Me.ButOK.UseVisualStyleBackColor = true
+ '
+ 'FlowLayoutPanel1
+ '
+ Me.FlowLayoutPanel1.Controls.Add(Me.Label49)
+ Me.FlowLayoutPanel1.Controls.Add(Me.tbModel)
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(18, 118)
+ Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(363, 40)
+ Me.FlowLayoutPanel1.TabIndex = 101
+ '
+ 'FlowLayoutPanel4
+ '
+ Me.FlowLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.FlowLayoutPanel4.Controls.Add(Me.Label3)
+ Me.FlowLayoutPanel4.Controls.Add(Me.cbDesignTypeWheelMotor)
+ Me.FlowLayoutPanel4.Location = New System.Drawing.Point(18, 202)
+ Me.FlowLayoutPanel4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel4.Name = "FlowLayoutPanel4"
+ Me.FlowLayoutPanel4.Size = New System.Drawing.Size(315, 40)
+ Me.FlowLayoutPanel4.TabIndex = 104
+ '
+ 'FlowLayoutPanel5
+ '
+ Me.FlowLayoutPanel5.Controls.Add(Me.Label48)
+ Me.FlowLayoutPanel5.Controls.Add(Me.tbNumberOfDesignTypeWheelMotor)
+ Me.FlowLayoutPanel5.Controls.Add(Me.Label9)
+ Me.FlowLayoutPanel5.Location = New System.Drawing.Point(340, 202)
+ Me.FlowLayoutPanel5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel5.Name = "FlowLayoutPanel5"
+ Me.FlowLayoutPanel5.Size = New System.Drawing.Size(447, 40)
+ Me.FlowLayoutPanel5.TabIndex = 105
+ '
+ 'Label9
+ '
+ Me.Label9.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label9.AutoSize = true
+ Me.Label9.Location = New System.Drawing.Point(367, 8)
+ Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label9.Name = "Label9"
+ Me.Label9.Size = New System.Drawing.Size(22, 20)
+ Me.Label9.TabIndex = 66
+ Me.Label9.Text = "[-]"
+ '
+ 'FlowLayoutPanel6
+ '
+ Me.FlowLayoutPanel6.Controls.Add(Me.Label51)
+ Me.FlowLayoutPanel6.Controls.Add(Me.tbInertia)
+ Me.FlowLayoutPanel6.Controls.Add(Me.lblinertiaUnit)
+ Me.FlowLayoutPanel6.Location = New System.Drawing.Point(18, 160)
+ Me.FlowLayoutPanel6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel6.Name = "FlowLayoutPanel6"
+ Me.FlowLayoutPanel6.Size = New System.Drawing.Size(315, 40)
+ Me.FlowLayoutPanel6.TabIndex = 102
+ '
+ 'lblinertiaUnit
+ '
+ Me.lblinertiaUnit.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.lblinertiaUnit.AutoSize = true
+ Me.lblinertiaUnit.Location = New System.Drawing.Point(158, 8)
+ Me.lblinertiaUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblinertiaUnit.Name = "lblinertiaUnit"
+ Me.lblinertiaUnit.Size = New System.Drawing.Size(52, 20)
+ Me.lblinertiaUnit.TabIndex = 64
+ Me.lblinertiaUnit.Text = "[kgm²]"
+ '
+ 'FlowLayoutPanel7
+ '
+ Me.FlowLayoutPanel7.Controls.Add(Me.Label2)
+ Me.FlowLayoutPanel7.Controls.Add(Me.cbDifferentialIncluded)
+ Me.FlowLayoutPanel7.Location = New System.Drawing.Point(18, 243)
+ Me.FlowLayoutPanel7.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel7.Name = "FlowLayoutPanel7"
+ Me.FlowLayoutPanel7.Size = New System.Drawing.Size(315, 40)
+ Me.FlowLayoutPanel7.TabIndex = 106
+ '
+ 'FlowLayoutPanel8
+ '
+ Me.FlowLayoutPanel8.Controls.Add(Me.Label52)
+ Me.FlowLayoutPanel8.Controls.Add(Me.tbThermalOverload)
+ Me.FlowLayoutPanel8.Controls.Add(Me.Label10)
+ Me.FlowLayoutPanel8.Location = New System.Drawing.Point(340, 160)
+ Me.FlowLayoutPanel8.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel8.Name = "FlowLayoutPanel8"
+ Me.FlowLayoutPanel8.Size = New System.Drawing.Size(447, 40)
+ Me.FlowLayoutPanel8.TabIndex = 103
+ '
+ 'Label10
+ '
+ Me.Label10.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label10.AutoSize = true
+ Me.Label10.Location = New System.Drawing.Point(407, 8)
+ Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label10.Name = "Label10"
+ Me.Label10.Size = New System.Drawing.Size(22, 20)
+ Me.Label10.TabIndex = 67
+ Me.Label10.Text = "[-]"
+ '
+ 'StatusStrip1
+ '
+ Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
+ Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 905)
+ Me.StatusStrip1.Name = "StatusStrip1"
+ Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
+ Me.StatusStrip1.Size = New System.Drawing.Size(1296, 32)
+ Me.StatusStrip1.SizingGrip = false
+ Me.StatusStrip1.TabIndex = 74
+ Me.StatusStrip1.Text = "StatusStrip1"
+ '
+ 'LbStatus
+ '
+ Me.LbStatus.Name = "LbStatus"
+ Me.LbStatus.Size = New System.Drawing.Size(60, 25)
+ Me.LbStatus.Text = "Status"
+ '
+ 'CmOpenFile
+ '
+ Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
+ Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+ Me.CmOpenFile.Name = "CmOpenFile"
+ Me.CmOpenFile.Size = New System.Drawing.Size(203, 68)
+ '
+ 'OpenWithToolStripMenuItem
+ '
+ Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
+ Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+ '
+ 'ShowInFolderToolStripMenuItem
+ '
+ Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
+ Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+ '
+ 'IEPCForm
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(1296, 937)
+ Me.Controls.Add(Me.StatusStrip1)
+ Me.Controls.Add(Me.FlowLayoutPanel7)
+ Me.Controls.Add(Me.FlowLayoutPanel5)
+ Me.Controls.Add(Me.FlowLayoutPanel8)
+ Me.Controls.Add(Me.GroupBox3)
+ Me.Controls.Add(Me.FlowLayoutPanel6)
+ Me.Controls.Add(Me.FlowLayoutPanel4)
+ Me.Controls.Add(Me.FlowLayoutPanel1)
+ Me.Controls.Add(Me.ButCancel)
+ Me.Controls.Add(Me.ButOK)
+ Me.Controls.Add(Me.lblTitle)
+ Me.Controls.Add(Me.PictureBox1)
+ Me.Controls.Add(Me.ToolStrip1)
+ Me.Controls.Add(Me.GroupBox1)
+ Me.Controls.Add(Me.tcVoltageLevels)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+ Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.MaximizeBox = false
+ Me.Name = "IEPCForm"
+ Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "IEPC Editor"
+ Me.tcVoltageLevels.ResumeLayout(false)
+ Me.tpFirstVoltageLevel.ResumeLayout(false)
+ Me.FlowLayoutPanel9.ResumeLayout(false)
+ Me.FlowLayoutPanel9.PerformLayout
+ Me.TableLayoutPanel1.ResumeLayout(false)
+ Me.TableLayoutPanel1.PerformLayout
+ Me.GroupBox2.ResumeLayout(false)
+ Me.TableLayoutPanel6.ResumeLayout(false)
+ Me.TableLayoutPanel6.PerformLayout
+ Me.tpVoltageLevel.ResumeLayout(false)
+ Me.GroupBox4.ResumeLayout(false)
+ Me.TableLayoutPanel2.ResumeLayout(false)
+ Me.TableLayoutPanel2.PerformLayout
+ Me.FlowLayoutPanel10.ResumeLayout(false)
+ Me.FlowLayoutPanel10.PerformLayout
+ Me.TableLayoutPanel4.ResumeLayout(false)
+ Me.TableLayoutPanel4.PerformLayout
+ Me.GroupBox1.ResumeLayout(false)
+ Me.TableLayoutPanel5.ResumeLayout(false)
+ Me.TableLayoutPanel5.PerformLayout
+ Me.FlowLayoutPanel2.ResumeLayout(false)
+ Me.GroupBox3.ResumeLayout(false)
+ Me.TableLayoutPanel3.ResumeLayout(false)
+ Me.TableLayoutPanel3.PerformLayout
+ Me.FlowLayoutPanel11.ResumeLayout(false)
+ Me.ToolStrip1.ResumeLayout(false)
+ Me.ToolStrip1.PerformLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
+ Me.FlowLayoutPanel1.ResumeLayout(false)
+ Me.FlowLayoutPanel1.PerformLayout
+ Me.FlowLayoutPanel4.ResumeLayout(false)
+ Me.FlowLayoutPanel4.PerformLayout
+ Me.FlowLayoutPanel5.ResumeLayout(false)
+ Me.FlowLayoutPanel5.PerformLayout
+ Me.FlowLayoutPanel6.ResumeLayout(false)
+ Me.FlowLayoutPanel6.PerformLayout
+ Me.FlowLayoutPanel7.ResumeLayout(false)
+ Me.FlowLayoutPanel7.PerformLayout
+ Me.FlowLayoutPanel8.ResumeLayout(false)
+ Me.FlowLayoutPanel8.PerformLayout
+ Me.StatusStrip1.ResumeLayout(false)
+ Me.StatusStrip1.PerformLayout
+ Me.CmOpenFile.ResumeLayout(false)
+ Me.ResumeLayout(false)
+ Me.PerformLayout
+
+End Sub
+ Friend WithEvents btFLCurveFile1 As Button
+ Friend WithEvents tbThermalOverload As TextBox
+ Friend WithEvents Label52 As Label
+ Friend WithEvents Label48 As Label
+ Friend WithEvents tbNumberOfDesignTypeWheelMotor As TextBox
+ Friend WithEvents Label51 As Label
+ Friend WithEvents tbInertia As TextBox
+ Friend WithEvents Label49 As Label
+ Friend WithEvents tbModel As TextBox
+ Friend WithEvents tcVoltageLevels As TabControl
+ Friend WithEvents tpFirstVoltageLevel As TabPage
+ Friend WithEvents GroupBox2 As GroupBox
+ Friend WithEvents lvPowerMap1 As ListView
+ Friend WithEvents ColumnHeader13 As ColumnHeader
+ Friend WithEvents ColumnHeader14 As ColumnHeader
+ Friend WithEvents Label47 As Label
+ Friend WithEvents Label44 As Label
+ Friend WithEvents Label43 As Label
+ Friend WithEvents tbOverloadTime1 As TextBox
+ Friend WithEvents Label42 As Label
+ Friend WithEvents tboverloadTorqueSpeed1 As TextBox
+ Friend WithEvents Label41 As Label
+ Friend WithEvents tbOverloadTorque1 As TextBox
+ Friend WithEvents tbContinousTorqueSpeed1 As TextBox
+ Friend WithEvents Label39 As Label
+ Friend WithEvents tbContinousTorque1 As TextBox
+ Friend WithEvents Label37 As Label
+ Friend WithEvents tbVoltage1 As TextBox
+ Friend WithEvents tpVoltageLevel As TabPage
+ Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
+ Friend WithEvents Label1 As Label
+ Friend WithEvents Label2 As Label
+ Friend WithEvents cbDesignTypeWheelMotor As CheckBox
+ Friend WithEvents cbDifferentialIncluded As CheckBox
+ Friend WithEvents Label3 As Label
+ Friend WithEvents Label4 As Label
+ Friend WithEvents Label12 As Label
+ Friend WithEvents Label11 As Label
+ Friend WithEvents Label14 As Label
+ Friend WithEvents Label13 As Label
+ Friend WithEvents Label15 As Label
+ Friend WithEvents TableLayoutPanel4 As TableLayoutPanel
+ Friend WithEvents Label16 As Label
+ Friend WithEvents Label17 As Label
+ Friend WithEvents Label18 As Label
+ Friend WithEvents Label19 As Label
+ Friend WithEvents tbVoltage2 As TextBox
+ Friend WithEvents Label20 As Label
+ Friend WithEvents Label21 As Label
+ Friend WithEvents tbContinousTorque2 As TextBox
+ Friend WithEvents tbContinousTorqueSpeed2 As TextBox
+ Friend WithEvents tbOverloadTorque2 As TextBox
+ Friend WithEvents tbOverloadTorqueSpeed2 As TextBox
+ Friend WithEvents tbOverloadTime2 As TextBox
+ Friend WithEvents Label22 As Label
+ Friend WithEvents Label23 As Label
+ Friend WithEvents Label24 As Label
+ Friend WithEvents Label25 As Label
+ Friend WithEvents Label26 As Label
+ Friend WithEvents Label27 As Label
+ Friend WithEvents tbFLCurve2 As TextBox
+ Friend WithEvents btFLCurveFile2 As Button
+ Friend WithEvents Label28 As Label
+ Friend WithEvents TableLayoutPanel6 As TableLayoutPanel
+ Friend WithEvents tbFLCurve1 As TextBox
+ Friend WithEvents GroupBox1 As GroupBox
+ Friend WithEvents FlowLayoutPanel2 As FlowLayoutPanel
+ Friend WithEvents btAddGear As Button
+ Friend WithEvents btRemoveGear As Button
+ Friend WithEvents lvGear As ListView
+ Friend WithEvents ColumnHeader1 As ColumnHeader
+ Friend WithEvents ColumnHeader2 As ColumnHeader
+ Friend WithEvents ColumnHeader3 As ColumnHeader
+ Friend WithEvents GroupBox3 As GroupBox
+ Friend WithEvents btAddDragCurve As Button
+ Friend WithEvents btRemoveDragCurve As Button
+ Friend WithEvents ToolStrip1 As ToolStrip
+ Friend WithEvents ToolStripBtNew As ToolStripButton
+ Friend WithEvents ToolStripBtOpen As ToolStripButton
+ Friend WithEvents ToolStripBtSave As ToolStripButton
+ Friend WithEvents ToolStripBtSaveAs As ToolStripButton
+ Friend WithEvents ToolStripSeparator3 As ToolStripSeparator
+ Friend WithEvents ToolStripBtSendTo As ToolStripButton
+ Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
+ Friend WithEvents ToolStripButton1 As ToolStripButton
+ Friend WithEvents PictureBox1 As PictureBox
+ Friend WithEvents lblTitle As Label
+ Friend WithEvents ButCancel As Button
+ Friend WithEvents ButOK As Button
+ Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
+ Friend WithEvents FlowLayoutPanel4 As FlowLayoutPanel
+ Friend WithEvents FlowLayoutPanel5 As FlowLayoutPanel
+ Friend WithEvents FlowLayoutPanel6 As FlowLayoutPanel
+ Friend WithEvents FlowLayoutPanel7 As FlowLayoutPanel
+ Friend WithEvents FlowLayoutPanel8 As FlowLayoutPanel
+ Friend WithEvents FlowLayoutPanel9 As FlowLayoutPanel
+ Friend WithEvents lblinertiaUnit As Label
+ Friend WithEvents Label9 As Label
+ Friend WithEvents Label10 As Label
+ Friend WithEvents FlowLayoutPanel10 As FlowLayoutPanel
+ Friend WithEvents GroupBox4 As GroupBox
+ Friend WithEvents TableLayoutPanel2 As TableLayoutPanel
+ Friend WithEvents Label5 As Label
+ Friend WithEvents lvPowerMap2 As ListView
+ Friend WithEvents ColumnHeader6 As ColumnHeader
+ Friend WithEvents ColumnHeader7 As ColumnHeader
+ Friend WithEvents StatusStrip1 As StatusStrip
+ Friend WithEvents LbStatus As ToolStripStatusLabel
+ Friend WithEvents TableLayoutPanel5 As TableLayoutPanel
+ Friend WithEvents Label6 As Label
+ Friend WithEvents TableLayoutPanel3 As TableLayoutPanel
+ Friend WithEvents lvDragCurve As ListView
+ Friend WithEvents ColumnHeader4 As ColumnHeader
+ Friend WithEvents ColumnHeader5 As ColumnHeader
+ Friend WithEvents FlowLayoutPanel11 As FlowLayoutPanel
+ Friend WithEvents Label7 As Label
+ Friend WithEvents btShowFLCurve1 As Button
+ Friend WithEvents btShowFLCurve2 As Button
+ Friend WithEvents CmOpenFile As ContextMenuStrip
+ Friend WithEvents OpenWithToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents ShowInFolderToolStripMenuItem As ToolStripMenuItem
+End Class
diff --git a/VECTO/GUI/IEPCForm.resx b/VECTO/GUI/IEPCForm.resx
new file mode 100644
index 0000000000000000000000000000000000000000..50021e8dee392b488a1cf238c54469d8f1de2343
--- /dev/null
+++ b/VECTO/GUI/IEPCForm.resx
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btFLCurveFile1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
+ zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
+ 0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
+ c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
+ qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
+ GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
+ 1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
+ gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
+ TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
+ W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
+ MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
+ IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
+ eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="btFLCurveFile2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
+ zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
+ 0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
+ c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
+ qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
+ GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
+ 1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
+ gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
+ TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
+ W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
+ MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
+ IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
+ eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>231, 20</value>
+ </metadata>
+ <metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>462, 18</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>62</value>
+ </metadata>
+ <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP39/QLg6NsG/v7+AgAA
+ AAAAAAAAAAAAAAAAAAAAAAAA////////////////////////////////////////////////////////
+ /////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/v4B1uDQEIil
+ di319/MQ////AQAAAAAAAAAAAAAAAAAAAAD/////AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP8AAAD/AAAA/wAAAP//////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+
+ /gudtI5FRHEmhMbUvS7+/v4CAAAAAAAAAAAAAAAAAAAAAP////8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP8AAAD/AAAA/wAAAP8AAAD/AAAA//////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAD///8B7PDpJmOJS5s4aBnEjal8Wf39/A8AAAAAAAAAAAAAAAAAAAAA/////wAAAP8AAAD/AAAA/wAA
+ AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAP7+/ga3ya0+PGsexzdnGO9Vfjut4OfcLP///wIAAAAAAAAAAAAAAAD/////AAAA/wAA
+ AP8AAAD/AAAA////////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAD///8B+vv6Fn+ea3E2ZhfeN2cY/DhnGc+nvJpJ/v7+CQAAAAAAAAAAAAAAAP//
+ //8AAAD/AAAA/wAAAP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/+/gLU3s0vSHQstTZmF/Y2Zhf+NmYX6G2QV4zy9fAg////AQAA
+ AAAAAAAA/////wAAAP8AAAD/AAAA/wAAAP//////////////////////////////////////AAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+DJqyilI1ZhbTNmYW/TZmF/82Zhf5P20hwMDP
+ tzj+/v4EAAAAAAAAAAD/////AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA////
+ //8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wLr7+cpX4ZFpTVmFfA2ZhX/NmYW/zZm
+ Fv42ZhfZh6N0ZPz9/BL+/v4BAAAAAP////8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+B7TGqEI6ahnMNmcV/DZn
+ Ff82ZhX/NmYV/zVlF/RPeTOw2+TWLf7+/gIAAAAA/////wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP8AAAD/AAAA/wAAAP//////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wH4+vgZeppleTVm
+ FOE2ZxX+NmcV/zZnFf82ZhX/NmYV/TZmFtGhuJNO/v7+CgAAAAD/////AAAA/wAAAP8AAAD/AAAA////
+ //////////////////////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+As/b
+ yDBGcyi3NWYU9zVmFP82ZxX/NmcV/zZnFf82ZxX+NWYV7GeMT5fv8+0k////Af////8AAAD/AAAA/wAA
+ AP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAD+/v4Mlq+FVDRlE9Q1ZhT9NWYU/zVmFP82ZxX/NmcV/zZnFf82ZxX7PWwdxbzMsTz+/v4F/////wAA
+ AP8AAAD/AAAA/wAAAP///////////////////////////////////////////wAAAAAAAAAAAAAAAAAA
+ AAAAAAAA////Auju5Stbg0GqNWUU8jVmFP81ZhT/NWYU/zVmFP82ZxX/NmcV/zZnFf41ZhTdgqBubfv8
+ +hX/////AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP//////AAAAAAAA
+ AAAAAAAAAAAAAAAAAAD+/v4HscOlRThoGM41ZhT9NWYU/zVmFP81ZhT/NWYU/zVmFP82ZxX/NmcV/zVm
+ FPVLdy6z1+DQL/7+/v8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA////
+ //8AAAAAAAAAAAAAAAAAAAAA////Afj59xt2l2F+NGUT4zVmFP41ZhT/NWYU/zVmFP81ZhT/NWYU/zVm
+ FP82ZxX/NmcV/TVmFdOctI1R/v7+/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP8AAAD//////wAAAAAAAAAAAAAAAAAAAAD+/v4CzdnFMURxJbo1ZhT4NWYU/zVmFP81ZhT/NWYU/zVm
+ FP81ZhT/NWYU/zVmFP82ZxX/NWYU7mKISZ/8/Pv/////////////////////////////////////////
+ ////////////////////////AAAAAAAAAAAAAAAAAAAAAP7+/gyUroNUNGUT1DVmFP01ZhT/NWYU/zVm
+ FP81ZhT/NWYU/zVmFP81ZhT/NWYU/zVmFP82ZxX8O2obybfIq0L+/v4I/v7+Av39/QL9/v0C/f79Av3+
+ /QL9/v0C/f79Av3+/QL9/v0C/f79Av3+/QL9/v0C/f79AgAAAAD///8C5uziK1mBPqs0ZRPzNWYU/zVm
+ FP81ZhT/NWYU/zVmFP81ZhT/NWYU/zVmFP81ZhT/NWYU/zZnFf41ZhThepplhNTezUPZ4tM12eLTNdni
+ 0zXZ4tM12eLTNdni1DXZ4tQ12eLUNdrj1DXa49U12eLUNdrj1DXa49U1AAAAAP7+/givwqJGN2cWzjVm
+ FP01ZhT/NWYU/zVmFP81ZhT/NGYT/zVmFP41ZhT/NWYU/zVmFP81ZhT/NWYU/zZnFfg1ZhThRHImz0Rx
+ JspEcSfKRXEoykVyKMpFcinKRnMqykd0K8pIdCvKSXUsykt3LspIdCvKSXUsykt3Lsr//v8B9vj1HXSW
+ XoM0ZRPlNWYU/jVmFP81ZhT/NWYU/zVmFP82ZhX0U3w34DRlE/Q1ZhT/NWYU/zVmFP81ZhT/NWYU/zZn
+ Ff42ZxX9NmYV/TZmFv02Zhf9NmYX/TdnGP03Zxj9OWgZ/TppGv06ahv9PGwd/TppGv06ahv9PGwd/f7/
+ /gLK1sIyQnAkuzRlE/g1ZhT/NWYU/zVmFP81ZhT/NWYU+0dzKc2gt5GGP24g0zVmFP01ZhT/NWYU/zVm
+ FP81ZhT/NmcV/zZnFf82ZxX/NmYW/zZmF/82Zhf/N2cY/zdnGP84aBn/Omka/zpqG/87axz/Omka/zpq
+ G/87axz//f79DY+qflc0ZRPVNWYU/TVmFP81ZhT/NWYU/zVmFP41ZRTraY1RluLp3k1fhkWnNGUT8TVm
+ FP81ZhT/NWYU/zVmFP81ZhT/NmcV/zZnFf82ZhX/NmYW/zZmF/83Zxf/N2cY/zhoGf85aRr/Omob/ztr
+ HP85aRr/Omob/ztrHP/j6t8rVn88rDRlFPM1ZhT/NWYU/zVmFP81ZhT/NWYU/jRlE9KWr4VN/f39F5Cq
+ flU0ZRPVNWYU/jVmFP81ZhT/NWYU/zVmFP82ZxX/NmcV/zZmFf82Zhb/NmYX/zZmF/83Zxj/N2cY/zlp
+ Gv86ahv/O2sc/zlpGv86ahv/O2sc/6zAn0c3ZxbPNWYU/TVmFP81ZhT/NWYU/zVmFP81ZhT9PWwdycPS
+ ujb+/v4EwtC4Nz1sHco1ZhT9NWYU/zVmFP81ZhT/NWYU/zZnFf82ZxX/NmYV/zZmFv82Zhf/NmYX/zdn
+ GP83Zxj/OWka/zpqG/86ahv/OWka/zpqG/86ahv/cpRchjRlE+Y1ZhT+NWYU/zVmFP81ZhT/NWYU/zVm
+ FPZXgDyz6e7mLv///wPp7uYsWYE+rzVmFPQ1ZhT/NWYU/zVmFP81ZhT/NmcV/zZnFf82ZhT/NmYV/zZm
+ F/82Zhf/N2cX/zdnGP85aRr/Omob/zpqG/85aRr/Omob/zpqG/9BbyK6NGUU9jVmFP01ZhT9NWYU/TVm
+ FP01ZhT8NGUT3IGgbW78/PwW////Af39/RGJpXZiNGUT2DVmFPw1ZhT9NGUT/TVmFP02ZxX9NmcV/TZm
+ Ff02ZhX9NmYX/TZmF/03Zxf9N2cY/ThoGf06aRr9Omob/ThoGf06aRr9Omob/TZnFaE2ZxXINmcVyjZn
+ Fco2ZxXKNmcVyjZnFck4aBijr8KiNP7+/gUAAAAA/v7+A7rKrzA7ahuiNmcVyTZnFco2ZxXKN2cWyjdo
+ Fso3aBbKN2gWyjdnF8o3ZxjKOGcZyjhoGco5aBrKOmobyjtrHMo8ax3KOmobyjtrHMo8ax3KscSkKrHE
+ pDWxxKQ1scSkNbHEpDWxxKQ1scSkNbTGqCru8uwM///+AQAAAAAAAAAA8/bxC7bHqiqxxKQ1scSkNbHE
+ pDWxxKQ1scSlNbHEpTWxxKU1scSlNbHEpTWxxKU1scSmNbLEpjWyxaY1s8WnNbPFpzWyxaY1s8WnNbPF
+ pzX///8C////Av///wL///8C////Av///wL///8C////AgAAAAAAAAAAAAAAAAAAAAAAAAAA////Av//
+ /wL///8C////Av///wL///8C////Av///wL///8C////Av///wL///8C////Av///wL///8C////AgAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAA////////gAP//4AD/9+AA/+fgAP/j4AD/4+B//8HgAf/B4AH/geAB/4D
+ gAf+A4AH/AGB//wBgAP4AYAD+ACAA/gAgAPwAAAD8AB//+AAP//gAAAAwAAAAMAAAADAIAAAgHAAAIBw
+ AAAAcAAAAPgAAAD4AAD///////////////8=
+</value>
+ </data>
+</root>
\ No newline at end of file
diff --git a/VECTO/GUI/IEPCForm.vb b/VECTO/GUI/IEPCForm.vb
new file mode 100644
index 0000000000000000000000000000000000000000..813e992f2995855e3bf3d079c36c53e12e88a300
--- /dev/null
+++ b/VECTO/GUI/IEPCForm.vb
@@ -0,0 +1,835 @@
+Imports System.IO
+Imports TUGraz.VECTO.Input_Files
+Imports TUGraz.VectoCommon.InputData
+Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.InputData.FileIO.JSON
+
+Public Class IEPCForm
+
+ Public JobDir As String = ""
+ Private _iepcFilePath as String = ""
+ Private _powerMapDlg As IEPCInputDialog
+ Private _dragCurveDlg As IEPCInputDialog
+ Private _gearDlg As IEPCGearInputDialog
+ Private _flcFilePath1 as String
+ Private _flcFilePath2 as String
+ Private _changed as Boolean
+
+ Public AutoSendTo As action(of string, VehicleForm)
+
+ Private _contextMenuFiles As String()
+
+
+ Private Sub IEPCForm_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+ _powerMapDlg = New IEPCInputDialog(IEPCDialogType.PowerMapDialog)
+ _dragCurveDlg = New IEPCInputDialog(IEPCDialogType.DragCurveDialog)
+ _gearDlg = New IEPCGearInputDialog()
+ End Sub
+
+#Region "Set IEPC Data"
+
+ Public Sub ReadIEPCFile(file As String)
+ Dim inputData = JSONInputDataFactory.ReadIEPCEngineeringInputData(file, True)
+ _iepcFilePath = file
+ tbModel.Text = inputData.Model
+ tbInertia.Text = inputData.Inertia.ToGUIFormat()
+ cbDifferentialIncluded.Checked = inputData.DifferentialIncluded
+ cbDesignTypeWheelMotor.Checked = inputData.DesignTypeWheelMotor
+ tbNumberOfDesignTypeWheelMotor.Text = inputData.NrOfDesignTypeWheelMotorMeasured.Value.ToGUIFormat()
+ tbThermalOverload.Text = inputData.OverloadRecoveryFactor.ToGUIFormat()
+
+ Dim voltageLevel = inputData.VoltageLevels.First()
+ SetFirstVoltageLevel(voltageLevel)
+ voltageLevel = inputData.VoltageLevels.Last()
+ SetSecondaryVoltageLevel(voltageLevel)
+ SetGearEntries(inputData.Gears)
+ SetDragEntries(inputData.DragCurves)
+
+
+ LbStatus.Text = ""
+ _changed = False
+ End Sub
+
+ Private Sub SetFirstVoltageLevel(voltageLevel As IElectricMotorVoltageLevel)
+ tbVoltage1.Text = voltageLevel.VoltageLevel.ToGUIFormat()
+ tbContinousTorque1.Text = voltageLevel.ContinuousTorque.ToGUIFormat()
+ tbContinousTorqueSpeed1.Text = voltageLevel.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
+ tbOverloadTime1.Text = voltageLevel.OverloadTime.ToGUIFormat()
+ tbOverloadTorque1.Text = voltageLevel.OverloadTorque.ToGUIFormat()
+ tboverloadTorqueSpeed1.Text = voltageLevel.OverloadTestSpeed.AsRPM.ToGUIFormat()
+ tbFLCurve1.Text = GetRelativePath(voltageLevel.FullLoadCurve.Source, Path.GetDirectoryName(_iepcFilePath))
+ SetPowerMapEntries(_lvPowerMap1, voltageLevel.PowerMap)
+ End Sub
+
+ Private Sub SetSecondaryVoltageLevel(voltageLevel As IElectricMotorVoltageLevel)
+ tbVoltage2.Text = voltageLevel.VoltageLevel.ToGUIFormat()
+ tbContinousTorque2.Text = voltageLevel.ContinuousTorque.ToGUIFormat()
+ tbContinousTorqueSpeed2.Text = voltageLevel.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
+ tbOverloadTime2.Text = voltageLevel.OverloadTime.ToGUIFormat()
+ tbOverloadTorque2.Text = voltageLevel.OverloadTorque.ToGUIFormat()
+ tbOverloadTorqueSpeed2.Text = voltageLevel.OverloadTestSpeed.AsRPM.ToGUIFormat()
+ tbFLCurve2.Text = GetRelativePath(voltageLevel.FullLoadCurve.Source, Path.GetDirectoryName(_iepcFilePath))
+ SetPowerMapEntries(_lvPowerMap2, voltageLevel.PowerMap)
+ End Sub
+
+ Private Sub SetGearEntries(entries As IList(Of IGearEntry))
+ For Each entry As IGearEntry In entries
+ Dim listEntry = CreateListViewItem(entry.Ratio, entry.MaxOutputShaftTorque, entry.MaxOutputShaftSpeed)
+ _lvGear.Items.Add(listEntry)
+ Next
+ End Sub
+
+ Private Sub SetDragEntries(entries As IList(Of IDragCurve))
+ For Each entry As IDragCurve In entries
+ Dim listEntry = CreateListViewItem(entry.Gear.Value, entry.DragCurve.Source)
+ _lvDragCurve.Items.Add(listEntry)
+ Next
+ End Sub
+
+ Private Sub SetPowerMapEntries(powerMapListView As ListView, entries As IList(Of IElectricMotorPowerMap))
+ For Each entry As IElectricMotorPowerMap In entries
+ Dim listEntry = CreateListViewItem(entry.Gear, entry.PowerMap.Source)
+ powerMapListView.Items.Add(listEntry)
+ Next
+ End Sub
+
+ Private Function CreateListViewItem(axleNumber As Integer, filepath As String) As ListViewItem
+ Dim basePath As String = GetPath(_iepcFilePath)
+ Dim retVal As New ListViewItem
+ retVal.SubItems(0).Text = axleNumber.ToGUIFormat()
+ retVal.SubItems.Add(GetRelativePath(filepath, basePath))
+ 'retVal.SubItems.Add(filepath)
+ Return retVal
+ End Function
+
+ Private Function CreateListViewItem(ratio As Double, outputShaftTorque As NewtonMeter, outputShaftSpeed As PerSecond) As ListViewItem
+ Dim retVal As New ListViewItem
+ retVal.SubItems(0).Text = ratio.ToGUIFormat()
+ If Not outputShaftTorque = Nothing Then
+ retVal.SubItems.Add(outputShaftTorque.ToGUIFormat())
+ Else
+ retVal.SubItems.Add(String.Empty)
+ End If
+
+ If Not outputShaftSpeed = Nothing Then
+ retVal.SubItems.Add(outputShaftSpeed.ToGUIFormat())
+ Else
+ retVal.SubItems.Add(String.Empty)
+ End If
+
+ Return retVal
+ End Function
+
+ Private Function CreateListViewItem(ratio As Double, outputShaftTorque As Double?, outputShaftSpeed As Double?) As ListViewItem
+
+ Dim retVal As New ListViewItem
+ retVal.SubItems(0).Text = ratio.ToGUIFormat()
+
+ If outputShaftTorque.HasValue Then
+ retVal.SubItems.Add(outputShaftTorque.Value.ToGUIFormat())
+ Else
+ retVal.SubItems.Add(String.Empty)
+ End If
+ If outputShaftSpeed.HasValue Then
+ retVal.SubItems.Add(outputShaftSpeed.Value.ToGUIFormat())
+ Else
+ retVal.SubItems.Add(String.Empty)
+ End If
+ Return retVal
+
+ End Function
+
+#End Region
+
+ Private Sub btAddDragCurve_Click(sender As Object, e As EventArgs) Handles btAddDragCurve.Click
+ AddListViewItem(_dragCurveDlg, _lvDragCurve)
+ End Sub
+
+ Private Sub AddListViewItem(dialog As IEPCInputDialog, listView As ListView)
+ dialog.Clear()
+ If dialog.ShowDialog() = DialogResult.OK Then
+ Dim gear = Convert.ToInt32(dialog.tbGear.Text)
+ Dim filePath = dialog.tbInputFile.Text
+ listView.Items.Add(CreateListViewItem(gear, filePath))
+ Change()
+ End If
+ End Sub
+
+ Private Sub btRemoveDragCurve_Click(sender As Object, e As EventArgs) Handles btRemoveDragCurve.Click
+ RemoveListEntry(_lvDragCurve)
+ End Sub
+
+ Private Sub btRemoveGear_Click(sender As Object, e As EventArgs) Handles btRemoveGear.Click
+ RemoveListEntry(_lvGear)
+ RemoveListEntry(_lvPowerMap1)
+ RemoveListEntry(_lvPowerMap2)
+ End Sub
+
+ Private Sub RemoveListEntry(listView As ListView)
+ If listView.Items.Count = 0 Then
+ Exit Sub
+ Else
+ listView.Items(listView.Items.Count - 1).Remove()
+ Change()
+ End If
+ End Sub
+
+ Private Sub btAddGear_Click(sender As Object, e As EventArgs) Handles btAddGear.Click
+ _gearDlg.Clear()
+
+ If _gearDlg.ShowDialog() = DialogResult.OK Then
+ Dim ratio = Convert.ToDouble(_gearDlg.tbRatio.Text)
+ Dim outputShaftTorque As Double?
+ Dim outputShaftSpeed As Double?
+ If _gearDlg.tbMaxOutShaftTorque.Text.Length > 0 Then
+ outputShaftTorque = _gearDlg.tbMaxOutShaftTorque.Text.ToDouble(0)
+ End If
+ If _gearDlg.tbMaxOutShaftSpeed.Text.Length > 0 Then
+ outputShaftSpeed = _gearDlg.tbMaxOutShaftSpeed.Text.ToDouble(0)
+ End If
+
+ Dim entry = CreateListViewItem(ratio, outputShaftTorque, outputShaftSpeed)
+ _lvGear.Items.Add(entry)
+ AddPowerMapEntry(lvPowerMap1, _lvGear.Items.Count)
+ AddPowerMapEntry(lvPowerMap2, _lvGear.Items.Count)
+
+ Change()
+ End If
+ End Sub
+
+ Private Sub AddPowerMapEntry(powerMapListView As ListView, gearIndex As Integer)
+ Dim retVal As New ListViewItem
+ retVal.SubItems(0).Text = gearIndex.ToString()
+ retVal.SubItems.Add(String.Empty)
+ powerMapListView.Items.Add(retVal)
+ End Sub
+
+ Private Sub lvGear_DoubleClick(sender As Object, e As EventArgs) Handles lvGear.DoubleClick
+
+ If lvGear.SelectedItems.Count = 0 Then Exit Sub
+
+ Dim entry As ListViewItem = lvGear.SelectedItems(0)
+
+ _gearDlg.tbRatio.Text = entry.SubItems(0).Text
+ _gearDlg.tbMaxOutShaftTorque.Text = entry.SubItems(1).Text
+ _gearDlg.tbMaxOutShaftSpeed.Text = entry.SubItems(2).Text
+ _gearDlg.tbRatio.Focus()
+
+ If _gearDlg.ShowDialog() = DialogResult.OK Then
+ entry.SubItems(0).Text = _gearDlg.tbRatio.Text
+ entry.SubItems(1).Text = _gearDlg.tbMaxOutShaftTorque.Text
+ entry.SubItems(2).Text = _gearDlg.tbMaxOutShaftSpeed.Text
+ Change()
+ End If
+
+ End Sub
+
+ Private Sub lvDragCurve_DoubleClick(sender As Object, e As EventArgs) Handles lvDragCurve.DoubleClick
+ EditEntry(_dragCurveDlg, lvDragCurve)
+ End Sub
+
+ Private Sub lvPowerMap1_DoubleClick(sender As Object, e As EventArgs) Handles lvPowerMap1.DoubleClick
+ _powerMapDlg.tbGear.Enabled = False
+ EditEntry(_powerMapDlg, lvPowerMap1)
+ End Sub
+
+ Private Sub lvPowerMap2_DoubleClick(sender As Object, e As EventArgs) Handles lvPowerMap2.DoubleClick
+ _powerMapDlg.tbGear.Enabled = False
+ EditEntry(_powerMapDlg, lvPowerMap2)
+ End Sub
+
+ Private Sub EditEntry(dialog As IEPCInputDialog, listView As ListView)
+
+ If listView.SelectedItems.Count = 0 Then Exit Sub
+ dialog.Clear()
+
+ Dim entry As ListViewItem = listView.SelectedItems(0)
+ dialog.tbGear.Text = entry.SubItems(0).Text
+ dialog.tbInputFile.Text = entry.SubItems(1).Text
+ dialog.tbGear.Focus()
+ dialog.IEPCPath = GetPath(_iepcFilePath)
+
+ If dialog.ShowDialog() = DialogResult.OK Then
+ entry.SubItems(0).Text = dialog.tbGear.Text
+ entry.SubItems(1).Text = dialog.tbInputFile.Text
+ End If
+
+ End Sub
+
+ Private Sub btFLCurveFile1_Click(sender As Object, e As EventArgs) Handles btFLCurveFile1.Click
+ If IEPCFLCFileBrowser.OpenDialog(FileRepl(tbFLCurve1.Text, GetPath(_iepcFilePath))) Then
+ tbFLCurve1.Text = GetFilenameWithoutDirectory(IEPCFLCFileBrowser.Files(0), GetPath(_iepcFilePath))
+ End If
+ End Sub
+
+ Private Sub btFLCurveFile2_Click(sender As Object, e As EventArgs) Handles btFLCurveFile2.Click
+ If IEPCFLCFileBrowser.OpenDialog(FileRepl(tbFLCurve2.Text, GetPath(_iepcFilePath))) Then
+ tbFLCurve2.Text = GetFilenameWithoutDirectory(IEPCFLCFileBrowser.Files(0), GetPath(_iepcFilePath))
+ End If
+ End Sub
+
+ Private Sub ToolStripBtNew_Click(sender As Object, e As EventArgs) Handles ToolStripBtNew.Click
+ NewIEPC()
+ End Sub
+
+ Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click
+ If IEPCFileBrowser.OpenDialog(_iepcFilePath) Then
+ Try
+ ReadIEPCFile(IEPCFileBrowser.Files(0))
+ Catch ex As Exception
+ MsgBox(ex.Message, MsgBoxStyle.OkOnly, $"Error loading IEPC(.{IEPCFileBrowser.Extensions}) File")
+ End Try
+ End If
+ End Sub
+
+ #Region "Toolbar"
+
+ Public Sub NewIEPC()
+ tbModel.Text = ""
+ tbInertia.Text = ""
+ cbDifferentialIncluded.Checked = False
+ cbDesignTypeWheelMotor.Checked = False
+ tbNumberOfDesignTypeWheelMotor.Text = ""
+ tbThermalOverload.Text = ""
+
+ tbVoltage1.Text = ""
+ tbContinousTorque1.Text = ""
+ tbContinousTorqueSpeed1.Text = ""
+ tbOverloadTime1.Text = ""
+ tbOverloadTorque1.Text = ""
+ tboverloadTorqueSpeed1.Text = ""
+ tbFLCurve1.Text = ""
+ _flcFilePath1 = ""
+ RemoveAllListViewItems(lvPowerMap1)
+
+ tbVoltage2.Text = ""
+ tbContinousTorque2.Text = ""
+ tbContinousTorqueSpeed2.Text = ""
+ tbOverloadTime2.Text = ""
+ tbOverloadTorque2.Text = ""
+ tboverloadTorqueSpeed2.Text = ""
+ tbFLCurve2.Text = ""
+ _flcFilePath2 = ""
+ RemoveAllListViewItems(lvPowerMap2)
+
+ RemoveAllListViewItems(lvDragCurve)
+ RemoveAllListViewItems(lvGear)
+ LbStatus.Text = ""
+
+ _changed = False
+ End Sub
+
+ Private Sub RemoveAllListViewItems(listView As ListView)
+ If listView.Items.Count = 0 Then
+ Exit Sub
+ Else
+ For Each listItem As ListViewItem In listView.Items
+ listItem.Remove()
+ Next
+ End If
+ End Sub
+
+ Private Sub ToolStripBtSave_Click(sender As Object, e As EventArgs) Handles ToolStripBtSave.Click
+ SaveOrSaveAs(False)
+ End Sub
+
+ Private Sub ToolStripBtSaveAs_Click(sender As Object, e As EventArgs) Handles ToolStripBtSaveAs.Click
+ SaveOrSaveAs(True)
+ End Sub
+
+ Private Sub ToolStripBtSendTo_Click(sender As Object, e As EventArgs) Handles ToolStripBtSendTo.Click
+ If ChangeCheckCancel() Then Exit Sub
+
+ If _iepcFilePath = "" Then
+ If MsgBox("Save file now?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+ If Not SaveOrSaveAs(True) Then Exit Sub
+ Else
+ Exit Sub
+ End If
+ End If
+
+ If Not VectoJobForm.Visible Then
+ JobDir = ""
+ VectoJobForm.Show()
+ VectoJobForm.VectoNew()
+ Else
+ VectoJobForm.WindowState = FormWindowState.Normal
+ End If
+
+ VehicleForm.tbIEPCFilePath.Text = GetFilenameWithoutDirectory(_iepcFilePath, JobDir)
+ End Sub
+
+ Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+ If File.Exists(Path.Combine(MyAppPath, "User Manual\help.html")) Then
+ Dim defaultBrowserPath As String = BrowserUtils.GetDefaultBrowserPath()
+ Process.Start(defaultBrowserPath,
+ $"""file://{Path.Combine(MyAppPath, "User Manual\help.html#iepc-editor")}""")
+ Else
+ MsgBox("User Manual not found!", MsgBoxStyle.Critical)
+ End If
+ End Sub
+
+ #End Region
+
+ #Region "Save Methods"
+
+ Private Function ChangeCheckCancel() As Boolean
+ If _changed Then
+ Select Case MsgBox("Save changes ?", MsgBoxStyle.YesNoCancel)
+ Case MsgBoxResult.Yes
+ Return Not SaveOrSaveAs(False)
+ Case MsgBoxResult.Cancel
+ Return True
+ Case Else
+ _changed = False
+ Return False
+ End Select
+ Else
+ Return False
+ End If
+ End Function
+
+ Private Function SaveOrSaveAs(ByVal saveAs As Boolean) As Boolean
+ If ValidateData() = False Then _
+ Return False
+
+ If _iepcFilePath = "" Or saveAs Then
+ If IEPCFileBrowser.SaveDialog(_iepcFilePath) Then
+ _iepcFilePath = IEPCFileBrowser.Files(0)
+ Else
+ Return False
+ End If
+ End If
+ Return SaveIEPCToFile(_iepcFilePath)
+ End Function
+
+ Private Function SaveIEPCToFile(ByVal file As String) As Boolean
+ Dim iepc = New IEPCInputData(file)
+
+ iepc.SetCommonEntries(tbModel.Text, tbInertia.Text, cbDesignTypeWheelMotor.Checked,
+ tbNumberOfDesignTypeWheelMotor.Text, cbDifferentialIncluded.Checked,
+ tbThermalOverload.Text)
+
+ iepc.SetVoltageLevelEntries(tbVoltage1.Text, tbContinousTorque1.Text, tbContinousTorqueSpeed1.Text,
+ tbOverloadTime1.Text, tbOverloadTorque1.Text, tboverloadTorqueSpeed1.Text,
+ tbFLCurve1.Text, lvPowerMap1)
+
+ iepc.SetVoltageLevelEntries(tbVoltage2.Text, tbContinousTorque2.Text, tbContinousTorqueSpeed2.Text,
+ tbOverloadTime2.Text, tbOverloadTorque2.Text, tboverloadTorqueSpeed2.Text,
+ tbFLCurve2.Text, lvPowerMap2)
+
+ iepc.SetGearsEntries(lvGear)
+ iepc.SetDragCurveEntries(lvDragCurve)
+
+
+ If Not iepc.SaveFile Then
+ MsgBox("Cannot save to " & file, MsgBoxStyle.Critical)
+ Return False
+ End If
+
+ If not AutoSendTo is nothing Then
+ If VehicleForm.Visible Then
+ AutoSendTo(file, VehicleForm)
+ End If
+ End If
+
+ _changed = False
+ LbStatus.Text = ""
+
+ Return True
+ End Function
+
+
+ #End Region
+
+
+
+ Private Sub ButOK_Click(sender As Object, e As EventArgs) Handles ButOK.Click
+ If SaveOrSaveAs(False) Then Close()
+ End Sub
+
+ Private Sub ButCancel_Click(sender As Object, e As EventArgs) Handles ButCancel.Click
+ Close()
+ End Sub
+
+
+#Region "Validate Input"
+
+ Private Function ValidateData() As Boolean
+
+ If ValidateModel() = False Then Return False
+ If ValidateInertia() = False Then Return False
+ If ValidateNrDesignTypeWheelMotorMeasured() = False Then Return False
+ If ValidateOverloadRecoveryFactor() = False Then Return False
+
+ If ValidateVoltage(tbVoltage1) = False Then Return False
+ If ValidateContinuousTorque(tbContinousTorque1) = False Then Return False
+ If ValidateContinuousTorqueSpeed(tbContinousTorqueSpeed1) = False Then Return False
+ If ValidateOverloadTime(tbOverloadTime1) = False Then Return False
+ If ValidateOverloadTorque(tbOverloadTorque1) = False Then Return False
+ If ValidateOverloadTorqueSpeed(tboverloadTorqueSpeed1) = False Then Return False
+
+ If ValidateVoltage(tbVoltage2) = False Then Return False
+ If ValidateContinuousTorque(tbContinousTorque2) = False Then Return False
+ If ValidateContinuousTorqueSpeed(tbContinousTorqueSpeed2) = False Then Return False
+ If ValidateOverloadTime(tbOverloadTime2) = False Then Return False
+ If ValidateOverloadTorque(tbOverloadTorque2) = False Then Return False
+ If ValidateOverloadTorqueSpeed(tboverloadTorqueSpeed2) = False Then Return False
+
+ If ValidateAmountOfEntries() = False Then Return False
+ If ValidateFullLoadCurve1() = False Then Return False
+ If ValidateFullLoadCurve2() = False Then Return False
+
+ If ValidatePowerMapEntries(_lvPowerMap1) = False Then Return False
+ If ValidatePowerMapEntries(_lvPowerMap2) = False Then Return False
+
+ Return True
+ End Function
+
+ Private Function ValidateModel() As Boolean
+ If String.IsNullOrEmpty(tbModel.Text) Then
+ ShowErrorMessageBox("Model", tbModel)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateInertia() As Boolean
+ If Not ValidDoubleValue(tbInertia.Text) Then
+ ShowErrorMessageBox("Inertia", tbInertia)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateNrDesignTypeWheelMotorMeasured() As Boolean
+ If Not cbDesignTypeWheelMotor.Checked AND Not ValidDoubleValue(tbNumberOfDesignTypeWheelMotor.Text) Then
+ ShowErrorMessageBox("Nr of Design Type Wheel Motor Measured", tbNumberOfDesignTypeWheelMotor)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateOverloadRecoveryFactor() As Boolean
+ If Not ValidDoubleValue(tbThermalOverload.Text) Then
+ ShowErrorMessageBox("Thermal Overload Recovery Factor", tbThermalOverload)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateVoltage(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Voltage", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateContinuousTorque(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Continuous Torque", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateContinuousTorqueSpeed(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Continuous Torque", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateOverloadTime(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Overload Time", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateOverloadTorque(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Overload Torque", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateOverloadTorqueSpeed(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Overload Torque Speed", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateAmountOfEntries() As Boolean
+ If _lvGear.Items.Count = 0 Then
+ ShowErrorMessageBox("Invalid input no Gear given")
+ Return False
+ End If
+
+ If Not _lvPowerMap1.Items.Count = _lvGear.Items.Count Then
+ ShowErrorMessageBox("Invalid number of Power Map entries at Voltage Level Low")
+ Return False
+ End If
+
+ If Not _lvPowerMap2.Items.Count = _lvGear.Items.Count Then
+ ShowErrorMessageBox("Invalid number of Power Map entries at Voltage Level High")
+ Return False
+ End If
+
+ If _lvDragCurve.Items.Count = 0
+ ShowErrorMessageBox("Invalid input no Drag Curve given")
+ Return False
+ End If
+
+ If Not _lvDragCurve.Items.Count = _lvGear.Items.Count And _lvDragCurve.Items.Count > 1
+ ShowErrorMessageBox("Invalid numbers of Drag Curves given")
+ Return False
+ End If
+
+ Return True
+ End Function
+
+ Private Function ValidateFullLoadCurve1() As Boolean
+ dim tmp = new SubPath()
+ tmp.Init(GetPath(_iepcFilePath), tbFLCurve1.Text)
+ If Not File.Exists(tmp.FullPath) Then
+ ShowErrorMessageBox("No valid file path given", tbFLCurve1, False)
+ Return False
+ End If
+
+ Dim fileExtension = new FileInfo(tbFLCurve1.Text).Extension
+ If Not $".{IEPCFLCFileBrowser.Extensions.First()}" = fileExtension Then
+ ShowErrorMessageBox($"The selected Full Load Curve file(.{IEPCFLCFileBrowser.Extensions.First()}) has the wrong extension",
+ tbFLCurve1, False)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateFullLoadCurve2() As Boolean
+ dim tmp = new SubPath()
+ tmp.Init(GetPath(_iepcFilePath), tbFLCurve2.Text)
+ If Not File.Exists(tmp.FullPath) Then
+ ShowErrorMessageBox("Invalid input no valid file path given", tbFLCurve2, False)
+ Return False
+ End If
+
+ Dim fileExtension = new FileInfo(tbFLCurve2.Text).Extension
+ If Not $".{IEPCFLCFileBrowser.Extensions.First()}" = fileExtension Then
+ ShowErrorMessageBox($"The selected Full Load Curve file(.{IEPCFLCFileBrowser.Extensions.First()}) has the wrong file extension",
+ tbFLCurve2, False)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidatePowerMapEntries(powerMap as ListView) As Boolean
+
+ For Each entry As ListViewItem In powerMap.Items
+ If entry.SubItems.Count = 1 Then
+ ShowErrorMessageBox("Invalid input missing Power Map files")
+ Return False
+ End If
+
+ If entry.SubItems.Count = 2 Then
+ If String.IsNullOrEmpty(entry.SubItems(1).Text)
+ ShowErrorMessageBox($"Missing Power Map file entry at Gear {entry.SubItems(0).Text}")
+ Return False
+ End If
+
+ Dim fileExtension = new FileInfo(entry.SubItems(1).Text).Extension
+ If Not $".{IEPCPowerMapFileBrowser.Extensions.First()}" = fileExtension
+ ShowErrorMessageBox($"The selected Power Map file(.{IEPCPowerMapFileBrowser.Extensions.First()}) has the wrong file extension")
+ Return False
+ End If
+ End If
+ Next
+ Return True
+
+ End Function
+
+ Private Sub ShowErrorMessageBox(message As string, textbox As TextBox, Optional defaultMessage As Boolean = True)
+ If Not message = Nothing And defaultMessage Then
+ MsgBox($"Invalid input for {message}")
+ textbox.Focus()
+ Return
+ Else
+ MsgBox($"{message}")
+ textbox.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub ShowErrorMessageBox(message As string)
+ If Not message = Nothing Then
+ MsgBox($"{message}")
+ Return
+ End If
+ End Sub
+
+ Private Function ValidDoubleValue(value As string) As Boolean
+ If String.IsNullOrEmpty(value)
+ Return false
+ End If
+ Return IsNumeric(value)
+ End Function
+
+#End Region
+
+#Region "Track changes"
+
+ Private Sub Change()
+ If Not _changed Then
+ LbStatus.Text = "Unsaved changes in current file"
+ _changed = True
+ End If
+ End Sub
+
+ Private Sub tbModel_TextChanged(sender As Object, e As EventArgs) Handles tbModel.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbInertia_TextChanged(sender As Object, e As EventArgs) Handles tbInertia.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbThermalOverload_TextChanged(sender As Object, e As EventArgs) Handles tbThermalOverload.TextChanged
+ Change()
+ End Sub
+
+ Private Sub cbDifferentialIncluded_CheckedChanged(sender As Object, e As EventArgs) Handles cbDifferentialIncluded.CheckedChanged
+ Change()
+ End Sub
+
+ Private Sub cbDesignTypeWheelMotor_CheckedChanged(sender As Object, e As EventArgs) Handles cbDesignTypeWheelMotor.CheckedChanged
+ tbNumberOfDesignTypeWheelMotor.Enabled = cbDesignTypeWheelMotor.Checked
+ cbDifferentialIncluded.Enabled = Not cbDesignTypeWheelMotor.Checked
+ if (cbDesignTypeWheelMotor.Checked) then
+ cbDifferentialIncluded.Checked = False
+ end if
+ If tbNumberOfDesignTypeWheelMotor.Enabled = False Then _
+ tbNumberOfDesignTypeWheelMotor.Text = "0"
+ Change()
+ End Sub
+
+ Private Sub tbNumberOfDesignTypeWheelMotor_TextChanged(sender As Object, e As EventArgs) Handles tbNumberOfDesignTypeWheelMotor.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbVoltage1_TextChanged(sender As Object, e As EventArgs) Handles tbVoltage1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinousTorque1_TextChanged(sender As Object, e As EventArgs) Handles tbContinousTorque1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinousTorqueSpeed1_TextChanged(sender As Object, e As EventArgs) Handles tbContinousTorqueSpeed1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTime1_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTime1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTorque1_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTorque1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tboverloadTorqueSpeed1_TextChanged(sender As Object, e As EventArgs) Handles tboverloadTorqueSpeed1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbFLCurve1_TextChanged(sender As Object, e As EventArgs) Handles tbFLCurve1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbVoltage2_TextChanged(sender As Object, e As EventArgs) Handles tbVoltage2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinousTorque2_TextChanged(sender As Object, e As EventArgs) Handles tbContinousTorque2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinousTorqueSpeed2_TextChanged(sender As Object, e As EventArgs) Handles tbContinousTorqueSpeed2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTime2_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTime2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTorque2_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTorque2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTorqueSpeed2_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTorqueSpeed2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbFLCurve2_TextChanged(sender As Object, e As EventArgs) Handles tbFLCurve2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub IEPCForm_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
+ If e.CloseReason <> CloseReason.ApplicationExitCall And e.CloseReason <> CloseReason.WindowsShutDown Then
+ e.Cancel = ChangeCheckCancel()
+ End If
+ End Sub
+
+
+
+#End Region
+
+ Private Sub btShowFLCurve1_Click(sender As Object, e As EventArgs) Handles btShowFLCurve1.Click
+ Dim theFile = FileRepl(tbFLCurve1.Text, GetPath(_iepcFilePath))
+
+ If theFile <> NoFile AndAlso File.Exists(theFile) Then
+ OpenFiles(theFile)
+ End If
+ End Sub
+
+ Private Sub btShowFLCurve2_Click(sender As Object, e As EventArgs) Handles btShowFLCurve2.Click
+ Dim theFile = FileRepl(tbFLCurve2.Text, GetPath(_iepcFilePath))
+
+ If theFile <> NoFile AndAlso File.Exists(theFile) Then
+ OpenFiles(theFile)
+ End If
+ End Sub
+
+ Private Sub OpenFiles(ParamArray files() As String)
+
+ If files.Length = 0 Then Exit Sub
+
+ _contextMenuFiles = files
+
+ OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
+
+ CmOpenFile.Show(Cursor.Position)
+ End Sub
+
+ Private Sub OpenWithToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OpenWithToolStripMenuItem.Click
+ If Not FileOpenAlt(_contextMenuFiles(0)) Then MsgBox("Failed to open file!")
+ End Sub
+
+ Private Sub ShowInFolderToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ShowInFolderToolStripMenuItem.Click
+
+ If File.Exists(_contextMenuFiles(0)) Then
+ Try
+ Process.Start("explorer", "/select,""" & _contextMenuFiles(0) & "")
+ Catch ex As Exception
+ MsgBox("Failed to open file!")
+ End Try
+ Else
+ MsgBox("File not found!")
+ End If
+ End Sub
+
+End Class
\ No newline at end of file
diff --git a/VECTO/GUI/IEPCGearInputDialog.Designer.vb b/VECTO/GUI/IEPCGearInputDialog.Designer.vb
new file mode 100644
index 0000000000000000000000000000000000000000..53ad8c37ea0649a6ab4bdea20ef6e68f930652e6
--- /dev/null
+++ b/VECTO/GUI/IEPCGearInputDialog.Designer.vb
@@ -0,0 +1,227 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class IEPCGearInputDialog
+ Inherits System.Windows.Forms.Form
+
+ 'Form overrides dispose to clean up the component list.
+ <System.Diagnostics.DebuggerNonUserCode()> _
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ Try
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ Finally
+ MyBase.Dispose(disposing)
+ End Try
+ End Sub
+
+ 'Required by the Windows Form Designer
+ Private components As System.ComponentModel.IContainer
+
+ 'NOTE: The following procedure is required by the Windows Form Designer
+ 'It can be modified using the Windows Form Designer.
+ 'Do not modify it using the code editor.
+ <System.Diagnostics.DebuggerStepThrough()> _
+ Private Sub InitializeComponent()
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.tbRatio = New System.Windows.Forms.TextBox()
+ Me.tbMaxOutShaftTorque = New System.Windows.Forms.TextBox()
+ Me.tbMaxOutShaftSpeed = New System.Windows.Forms.TextBox()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.TableLayoutPanel5 = New System.Windows.Forms.TableLayoutPanel()
+ Me.btnOk = New System.Windows.Forms.Button()
+ Me.btnCancel = New System.Windows.Forms.Button()
+ Me.TableLayoutPanel1.SuspendLayout
+ Me.TableLayoutPanel5.SuspendLayout
+ Me.SuspendLayout
+ '
+ 'TableLayoutPanel1
+ '
+ Me.TableLayoutPanel1.ColumnCount = 6
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 25!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 120!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 38!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 25!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20!))
+ Me.TableLayoutPanel1.Controls.Add(Me.Label5, 3, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label4, 3, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label6, 3, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbRatio, 2, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbMaxOutShaftTorque, 2, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbMaxOutShaftSpeed, 2, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label3, 1, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label1, 1, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label2, 1, 2)
+ Me.TableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(0, 0)
+ Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+ Me.TableLayoutPanel1.RowCount = 3
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(295, 91)
+ Me.TableLayoutPanel1.TabIndex = 0
+ '
+ 'Label5
+ '
+ Me.Label5.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label5.AutoSize = true
+ Me.Label5.Location = New System.Drawing.Point(241, 8)
+ Me.Label5.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(16, 13)
+ Me.Label5.TabIndex = 64
+ Me.Label5.Text = "[-]"
+ '
+ 'Label4
+ '
+ Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label4.AutoSize = true
+ Me.Label4.Location = New System.Drawing.Point(234, 38)
+ Me.Label4.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(29, 13)
+ Me.Label4.TabIndex = 64
+ Me.Label4.Text = "[Nm]"
+ '
+ 'Label6
+ '
+ Me.Label6.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label6.AutoSize = true
+ Me.Label6.Location = New System.Drawing.Point(234, 69)
+ Me.Label6.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(30, 13)
+ Me.Label6.TabIndex = 65
+ Me.Label6.Text = "[rpm]"
+ '
+ 'tbRatio
+ '
+ Me.tbRatio.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbRatio.Location = New System.Drawing.Point(149, 5)
+ Me.tbRatio.Name = "tbRatio"
+ Me.tbRatio.Size = New System.Drawing.Size(77, 20)
+ Me.tbRatio.TabIndex = 1
+ '
+ 'tbMaxOutShaftTorque
+ '
+ Me.tbMaxOutShaftTorque.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbMaxOutShaftTorque.Location = New System.Drawing.Point(149, 35)
+ Me.tbMaxOutShaftTorque.Name = "tbMaxOutShaftTorque"
+ Me.tbMaxOutShaftTorque.Size = New System.Drawing.Size(77, 20)
+ Me.tbMaxOutShaftTorque.TabIndex = 2
+ '
+ 'tbMaxOutShaftSpeed
+ '
+ Me.tbMaxOutShaftSpeed.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbMaxOutShaftSpeed.Location = New System.Drawing.Point(149, 65)
+ Me.tbMaxOutShaftSpeed.Name = "tbMaxOutShaftSpeed"
+ Me.tbMaxOutShaftSpeed.Size = New System.Drawing.Size(77, 20)
+ Me.tbMaxOutShaftSpeed.TabIndex = 3
+ '
+ 'Label3
+ '
+ Me.Label3.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(113, 8)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(32, 13)
+ Me.Label3.TabIndex = 9
+ Me.Label3.Text = "Ratio"
+ '
+ 'Label1
+ '
+ Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label1.AutoSize = true
+ Me.Label1.Location = New System.Drawing.Point(41, 38)
+ Me.Label1.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(104, 13)
+ Me.Label1.TabIndex = 9
+ Me.Label1.Text = "Max out shaft torque"
+ '
+ 'Label2
+ '
+ Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(42, 69)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(103, 13)
+ Me.Label2.TabIndex = 9
+ Me.Label2.Text = "Max out shaft speed"
+ '
+ 'TableLayoutPanel5
+ '
+ Me.TableLayoutPanel5.ColumnCount = 2
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel5.Controls.Add(Me.btnOk, 0, 0)
+ Me.TableLayoutPanel5.Controls.Add(Me.btnCancel, 1, 0)
+ Me.TableLayoutPanel5.Location = New System.Drawing.Point(147, 106)
+ Me.TableLayoutPanel5.Name = "TableLayoutPanel5"
+ Me.TableLayoutPanel5.RowCount = 1
+ Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel5.Size = New System.Drawing.Size(148, 29)
+ Me.TableLayoutPanel5.TabIndex = 5
+ '
+ 'btnOk
+ '
+ Me.btnOk.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btnOk.Location = New System.Drawing.Point(3, 3)
+ Me.btnOk.Name = "btnOk"
+ Me.btnOk.Size = New System.Drawing.Size(67, 23)
+ Me.btnOk.TabIndex = 4
+ Me.btnOk.Text = "OK"
+ '
+ 'btnCancel
+ '
+ Me.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.btnCancel.Location = New System.Drawing.Point(77, 3)
+ Me.btnCancel.Name = "btnCancel"
+ Me.btnCancel.Size = New System.Drawing.Size(67, 23)
+ Me.btnCancel.TabIndex = 5
+ Me.btnCancel.Text = "Cancel"
+ '
+ 'IEPCGearInputDialog
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(295, 140)
+ Me.Controls.Add(Me.TableLayoutPanel5)
+ Me.Controls.Add(Me.TableLayoutPanel1)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+ Me.MaximizeBox = false
+ Me.MinimizeBox = false
+ Me.Name = "IEPCGearInputDialog"
+ Me.ShowInTaskbar = false
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "Gear"
+ Me.TableLayoutPanel1.ResumeLayout(false)
+ Me.TableLayoutPanel1.PerformLayout
+ Me.TableLayoutPanel5.ResumeLayout(false)
+ Me.ResumeLayout(false)
+
+End Sub
+
+ Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
+ Friend WithEvents Label1 As Label
+ Friend WithEvents tbMaxOutShaftTorque As TextBox
+ Friend WithEvents Label2 As Label
+ Friend WithEvents tbMaxOutShaftSpeed As TextBox
+ Friend WithEvents Label3 As Label
+ Friend WithEvents tbRatio As TextBox
+ Friend WithEvents Label4 As Label
+ Friend WithEvents Label6 As Label
+ Friend WithEvents Label5 As Label
+ Friend WithEvents TableLayoutPanel5 As TableLayoutPanel
+ Friend WithEvents btnOk As Button
+ Friend WithEvents btnCancel As Button
+End Class
diff --git a/VECTO/GUI/IEPCGearInputDialog.resx b/VECTO/GUI/IEPCGearInputDialog.resx
new file mode 100644
index 0000000000000000000000000000000000000000..1af7de150c99c12dd67a509fe57c10d63e4eeb04
--- /dev/null
+++ b/VECTO/GUI/IEPCGearInputDialog.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/VECTO/GUI/IEPCGearInputDialog.vb b/VECTO/GUI/IEPCGearInputDialog.vb
new file mode 100644
index 0000000000000000000000000000000000000000..1587dcce4d3ec9f5f4de0ad99d8c4d3ea002b32c
--- /dev/null
+++ b/VECTO/GUI/IEPCGearInputDialog.vb
@@ -0,0 +1,42 @@
+Public Class IEPCGearInputDialog
+ Public Sub Clear()
+ _tbRatio.Text = ""
+ _tbMaxOutShaftSpeed.Text = ""
+ _tbMaxOutShaftTorque.Text = ""
+ _tbRatio.Focus()
+ End Sub
+
+ Private Sub btnOk_Click(sender As Object, e As EventArgs) Handles btnOk.Click
+ If Not IsNumeric(_tbRatio.Text) Then
+ MsgBox("Invalid input for Ratio")
+ _tbRatio.Focus()
+ Return
+ End If
+
+ If tbMaxOutShaftTorque.Text.Length > 0 And Not IsNumeric(_tbMaxOutShaftTorque.Text) Then
+ MsgBox("Invalid input for Max Out Shaft Torque")
+ _tbMaxOutShaftTorque.Focus()
+ Return
+ End If
+
+ If _tbMaxOutShaftSpeed.Text.Length > 0 And Not IsNumeric(_tbMaxOutShaftSpeed.Text) Then
+ MsgBox("Invalid input for Max Out Shaft Speed")
+ _tbMaxOutShaftSpeed.Focus()
+ Return
+ End If
+
+ DialogResult = DialogResult.OK
+ Close()
+ End Sub
+
+ Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click
+ DialogResult = DialogResult.Cancel
+ Close()
+ Clear()
+ End Sub
+
+ Private Sub IEPCGearInputDialog_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+ Show()
+ _tbRatio.Focus()
+ End Sub
+End Class
\ No newline at end of file
diff --git a/VECTO/GUI/IEPCInputDialog.Designer.vb b/VECTO/GUI/IEPCInputDialog.Designer.vb
new file mode 100644
index 0000000000000000000000000000000000000000..c1055049930ca4010fcb59fa4ec0714715d27a1b
--- /dev/null
+++ b/VECTO/GUI/IEPCInputDialog.Designer.vb
@@ -0,0 +1,185 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class IEPCInputDialog
+ Inherits System.Windows.Forms.Form
+
+ 'Form overrides dispose to clean up the component list.
+ <System.Diagnostics.DebuggerNonUserCode()>
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ Try
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ Finally
+ MyBase.Dispose(disposing)
+ End Try
+ End Sub
+
+ 'Required by the Windows Form Designer
+ Private components As System.ComponentModel.IContainer
+
+ 'NOTE: The following procedure is required by the Windows Form Designer
+ 'It can be modified using the Windows Form Designer.
+ 'Do not modify it using the code editor.
+ <System.Diagnostics.DebuggerStepThrough()>
+ Private Sub InitializeComponent()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(IEPCInputDialog))
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.btnOk = New System.Windows.Forms.Button()
+ Me.btnCancel = New System.Windows.Forms.Button()
+ Me.TableLayoutPanel5 = New System.Windows.Forms.TableLayoutPanel()
+ Me.btAddFilePath = New System.Windows.Forms.Button()
+ Me.tbInputFile = New System.Windows.Forms.TextBox()
+ Me.TableLayoutPanel4 = New System.Windows.Forms.TableLayoutPanel()
+ Me.tbGear = New System.Windows.Forms.TextBox()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.TableLayoutPanel1.SuspendLayout
+ Me.TableLayoutPanel5.SuspendLayout
+ Me.TableLayoutPanel4.SuspendLayout
+ Me.FlowLayoutPanel1.SuspendLayout
+ Me.SuspendLayout
+ '
+ 'TableLayoutPanel1
+ '
+ Me.TableLayoutPanel1.ColumnCount = 2
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.Controls.Add(Me.btnOk, 0, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.btnCancel, 1, 0)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(353, 45)
+ Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+ Me.TableLayoutPanel1.RowCount = 1
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(148, 29)
+ Me.TableLayoutPanel1.TabIndex = 105
+ '
+ 'btnOk
+ '
+ Me.btnOk.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btnOk.Location = New System.Drawing.Point(3, 3)
+ Me.btnOk.Name = "btnOk"
+ Me.btnOk.Size = New System.Drawing.Size(67, 23)
+ Me.btnOk.TabIndex = 16
+ Me.btnOk.Text = "OK"
+ '
+ 'btnCancel
+ '
+ Me.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.btnCancel.Location = New System.Drawing.Point(77, 3)
+ Me.btnCancel.Name = "btnCancel"
+ Me.btnCancel.Size = New System.Drawing.Size(67, 23)
+ Me.btnCancel.TabIndex = 17
+ Me.btnCancel.Text = "Cancel"
+ '
+ 'TableLayoutPanel5
+ '
+ Me.TableLayoutPanel5.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel5.ColumnCount = 2
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 316!))
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40!))
+ Me.TableLayoutPanel5.Controls.Add(Me.btAddFilePath, 1, 0)
+ Me.TableLayoutPanel5.Controls.Add(Me.tbInputFile, 0, 0)
+ Me.TableLayoutPanel5.Location = New System.Drawing.Point(140, 3)
+ Me.TableLayoutPanel5.Name = "TableLayoutPanel5"
+ Me.TableLayoutPanel5.RowCount = 1
+ Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100!))
+ Me.TableLayoutPanel5.Size = New System.Drawing.Size(356, 39)
+ Me.TableLayoutPanel5.TabIndex = 103
+ '
+ 'btAddFilePath
+ '
+ Me.btAddFilePath.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btAddFilePath.Image = CType(resources.GetObject("btAddFilePath.Image"),System.Drawing.Image)
+ Me.btAddFilePath.Location = New System.Drawing.Point(324, 6)
+ Me.btAddFilePath.Name = "btAddFilePath"
+ Me.btAddFilePath.Size = New System.Drawing.Size(24, 26)
+ Me.btAddFilePath.TabIndex = 12
+ Me.btAddFilePath.UseVisualStyleBackColor = true
+ '
+ 'tbInputFile
+ '
+ Me.tbInputFile.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.tbInputFile.Location = New System.Drawing.Point(3, 9)
+ Me.tbInputFile.Name = "tbInputFile"
+ Me.tbInputFile.Size = New System.Drawing.Size(310, 20)
+ Me.tbInputFile.TabIndex = 11
+ '
+ 'TableLayoutPanel4
+ '
+ Me.TableLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel4.ColumnCount = 2
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.8!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 67.2!))
+ Me.TableLayoutPanel4.Controls.Add(Me.tbGear, 1, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label3, 0, 0)
+ Me.TableLayoutPanel4.Location = New System.Drawing.Point(6, 8)
+ Me.TableLayoutPanel4.Margin = New System.Windows.Forms.Padding(6, 3, 3, 3)
+ Me.TableLayoutPanel4.Name = "TableLayoutPanel4"
+ Me.TableLayoutPanel4.RowCount = 1
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel4.Size = New System.Drawing.Size(128, 28)
+ Me.TableLayoutPanel4.TabIndex = 100
+ '
+ 'tbGear
+ '
+ Me.tbGear.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbGear.Location = New System.Drawing.Point(46, 4)
+ Me.tbGear.Name = "tbGear"
+ Me.tbGear.Size = New System.Drawing.Size(77, 20)
+ Me.tbGear.TabIndex = 10
+ '
+ 'Label3
+ '
+ Me.Label3.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(5, 7)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(30, 13)
+ Me.Label3.TabIndex = 9
+ Me.Label3.Text = "Gear"
+ '
+ 'FlowLayoutPanel1
+ '
+ Me.FlowLayoutPanel1.Controls.Add(Me.TableLayoutPanel4)
+ Me.FlowLayoutPanel1.Controls.Add(Me.TableLayoutPanel5)
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(0, 0)
+ Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(501, 45)
+ Me.FlowLayoutPanel1.TabIndex = 102
+ '
+ 'IEPCInputDialog
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(503, 78)
+ Me.Controls.Add(Me.FlowLayoutPanel1)
+ Me.Controls.Add(Me.TableLayoutPanel1)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+ Me.MaximizeBox = false
+ Me.MinimizeBox = false
+ Me.Name = "IEPCInputDialog"
+ Me.ShowInTaskbar = false
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "Gear"
+ Me.TableLayoutPanel1.ResumeLayout(false)
+ Me.TableLayoutPanel5.ResumeLayout(false)
+ Me.TableLayoutPanel5.PerformLayout
+ Me.TableLayoutPanel4.ResumeLayout(false)
+ Me.TableLayoutPanel4.PerformLayout
+ Me.FlowLayoutPanel1.ResumeLayout(false)
+ Me.ResumeLayout(false)
+
+End Sub
+
+ Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
+ Friend WithEvents btnOk As Button
+ Friend WithEvents btnCancel As Button
+ Friend WithEvents TableLayoutPanel4 As TableLayoutPanel
+ Friend WithEvents Label3 As Label
+ Friend WithEvents TableLayoutPanel5 As TableLayoutPanel
+ Friend WithEvents tbInputFile As TextBox
+ Friend WithEvents btAddFilePath As Button
+ Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
+ Friend WithEvents tbGear As TextBox
+End Class
diff --git a/VECTO/GUI/IEPCInputDialog.resx b/VECTO/GUI/IEPCInputDialog.resx
new file mode 100644
index 0000000000000000000000000000000000000000..d7df802e6a121253252b1d61a2a6a094ca6be3eb
--- /dev/null
+++ b/VECTO/GUI/IEPCInputDialog.resx
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btAddFilePath.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
+ zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
+ 0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
+ c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
+ qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
+ GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
+ 1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
+ gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
+ TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
+ W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
+ MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
+ IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
+ eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
+</value>
+ </data>
+</root>
\ No newline at end of file
diff --git a/VECTO/GUI/IEPCInputDialog.vb b/VECTO/GUI/IEPCInputDialog.vb
new file mode 100644
index 0000000000000000000000000000000000000000..6999080fa543cdb91b8322ef79368cf19f6c11fb
--- /dev/null
+++ b/VECTO/GUI/IEPCInputDialog.vb
@@ -0,0 +1,119 @@
+Imports System.IO
+Imports TUGraz.VECTO.Input_Files
+
+Public Enum IEPCDialogType
+ DragCurveDialog
+ PowerMapDialog
+End Enum
+
+Public Class IEPCInputDialog
+
+ Private ReadOnly _dialogType As IEPCDialogType
+ Private _dragCurveFilePath As String
+ Private _powerMapFilePath As String
+ Public IEPCPath As String
+
+ Public Sub New(dialogType As IEPCDialogType)
+
+ ' This call is required by the designer.
+ InitializeComponent()
+
+ ' Add any initialization after the InitializeComponent() call.
+ SetDialogTitle(dialogType)
+ _dialogType = dialogType
+
+ End Sub
+
+ Public Sub Clear()
+ _tbGear.Text = ""
+ _tbInputFile.Text = ""
+ _tbGear.Focus()
+ End Sub
+
+
+#Region "Button Handling"
+
+ Private Sub btnOk_Click(sender As Object, e As EventArgs) Handles btnOk.Click
+ Dim gear As Integer
+ If Not Integer.TryParse(tbGear.Text, gear) Then
+ MsgBox("Invalid input for Gear")
+ _tbGear.Focus()
+ Return
+ End If
+
+ If gear < 0 Then
+ MsgBox("Invalid input for Gear")
+ _tbGear.Focus()
+ Return
+ End If
+
+ If tbInputFile.Text.Length = 0 Then
+ MsgBox("Invalid input no file path given")
+ _tbGear.Focus()
+ Return
+ End If
+
+ Dim tmp As SubPath = New SubPath()
+ tmp.Init(IEPCPath, tbInputFile.Text)
+ If Not File.Exists(tmp.FullPath) Then
+ MsgBox("Invalid input no valid file path given")
+ _tbInputFile.Focus()
+ Return
+ End If
+
+ Dim fileExtension = new FileInfo(tbInputFile.Text).Extension
+ Select Case _dialogType
+ Case IEPCDialogType.DragCurveDialog
+ If Not $".{IEPCDragFileBrowser.Extensions.First()}"= fileExtension Then
+ MsgBox($"The Selected Drag Curve file(.{IEPCDragFileBrowser.Extensions.First()}) has the wrong file extension")
+ Return
+ End If
+ Case IEPCDialogType.PowerMapDialog
+ If Not $".{IEPCPowerMapFileBrowser.Extensions.First()}" = fileExtension Then
+ MsgBox($"The Selected Power Map file(.{IEPCPowerMapFileBrowser.Extensions.First()}) has the wrong file extension")
+ Return
+ End If
+ End Select
+
+ DialogResult = DialogResult.OK
+ Close()
+ End Sub
+
+ Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click
+ DialogResult = DialogResult.Cancel
+ Close()
+ Clear()
+ End Sub
+
+ Private Sub btAddFilePath_Click(sender As Object, e As EventArgs) Handles btAddFilePath.Click
+ Select Case _dialogType
+ Case IEPCDialogType.DragCurveDialog
+ SelectInputFileDialog(IEPCDragFileBrowser, _dragCurveFilePath)
+ Case IEPCDialogType.PowerMapDialog
+ SelectInputFileDialog(IEPCPowerMapFileBrowser, _powerMapFilePath)
+ End Select
+ End Sub
+
+#End Region
+
+ Private Sub SelectInputFileDialog(fileBrowser As FileBrowser, filePath As String )
+ If fileBrowser.OpenDialog(FileRepl(tbInputFile.Text, IEPCPath)) Then
+ tbInputFile.Text = GetFilenameWithoutDirectory(fileBrowser.Files(0), IEPCPath)
+ End If
+ End Sub
+
+ Private Sub SetDialogTitle(dialogType As IEPCDialogType)
+ Select Case dialogType
+ Case IEPCDialogType.DragCurveDialog
+ Text = "Drag Curve"
+ Case IEPCDialogType.PowerMapDialog
+ Text = "Power Map"
+ End Select
+ End Sub
+
+ Private Sub IEPCInputDialog_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+ Show()
+ _tbGear.Focus()
+ End Sub
+
+End Class
\ No newline at end of file
diff --git a/VECTO/GUI/IHPCForm.Designer.vb b/VECTO/GUI/IHPCForm.Designer.vb
new file mode 100644
index 0000000000000000000000000000000000000000..dae432d61737b4d5b2c35ab8cf61c6173b2ab474
--- /dev/null
+++ b/VECTO/GUI/IHPCForm.Designer.vb
@@ -0,0 +1,1394 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class IHPCForm
+ Inherits System.Windows.Forms.Form
+
+ 'Form overrides dispose to clean up the component list.
+ <System.Diagnostics.DebuggerNonUserCode()> _
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ Try
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ Finally
+ MyBase.Dispose(disposing)
+ End Try
+ End Sub
+
+ 'Required by the Windows Form Designer
+ Private components As System.ComponentModel.IContainer
+
+ 'NOTE: The following procedure is required by the Windows Form Designer
+ 'It can be modified using the Windows Form Designer.
+ 'Do not modify it using the code editor.
+ <System.Diagnostics.DebuggerStepThrough()> _
+ Private Sub InitializeComponent()
+ Me.components = New System.ComponentModel.Container()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(IHPCForm))
+ Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.Label49 = New System.Windows.Forms.Label()
+ Me.tbModel = New System.Windows.Forms.TextBox()
+ Me.FlowLayoutPanel6 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.Label51 = New System.Windows.Forms.Label()
+ Me.tbInertia = New System.Windows.Forms.TextBox()
+ Me.lblinertiaUnit = New System.Windows.Forms.Label()
+ Me.FlowLayoutPanel8 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.Label52 = New System.Windows.Forms.Label()
+ Me.tbThermalOverload = New System.Windows.Forms.TextBox()
+ Me.Label10 = New System.Windows.Forms.Label()
+ Me.FlowLayoutPanel2 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.tbDragCurve = New System.Windows.Forms.TextBox()
+ Me.btDragCurve = New System.Windows.Forms.Button()
+ Me.btDragCurveOpen = New System.Windows.Forms.Button()
+ Me.tcVoltageLevels = New System.Windows.Forms.TabControl()
+ Me.tpFirstVoltageLevel = New System.Windows.Forms.TabPage()
+ Me.lvPowerMap = New System.Windows.Forms.GroupBox()
+ Me.TableLayoutPanel3 = New System.Windows.Forms.TableLayoutPanel()
+ Me.lvPowerMap1 = New System.Windows.Forms.ListView()
+ Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.FlowLayoutPanel11 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.btAddPowerMap1 = New System.Windows.Forms.Button()
+ Me.btRemovePowerMap1 = New System.Windows.Forms.Button()
+ Me.Label7 = New System.Windows.Forms.Label()
+ Me.FlowLayoutPanel3 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.tbFLCurve1 = New System.Windows.Forms.TextBox()
+ Me.btFLCurveFile1 = New System.Windows.Forms.Button()
+ Me.btFLCurve1 = New System.Windows.Forms.Button()
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.Label11 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.Label13 = New System.Windows.Forms.Label()
+ Me.Label43 = New System.Windows.Forms.Label()
+ Me.Label37 = New System.Windows.Forms.Label()
+ Me.tbOverloadTime1 = New System.Windows.Forms.TextBox()
+ Me.tbVoltage1 = New System.Windows.Forms.TextBox()
+ Me.Label39 = New System.Windows.Forms.Label()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.tbContinuousTorque1 = New System.Windows.Forms.TextBox()
+ Me.tbContinuousTorqueSpeed1 = New System.Windows.Forms.TextBox()
+ Me.Label15 = New System.Windows.Forms.Label()
+ Me.Label42 = New System.Windows.Forms.Label()
+ Me.Label14 = New System.Windows.Forms.Label()
+ Me.tbOverloadTorqueSpeed1 = New System.Windows.Forms.TextBox()
+ Me.Label41 = New System.Windows.Forms.Label()
+ Me.tbOverloadTorque1 = New System.Windows.Forms.TextBox()
+ Me.Label12 = New System.Windows.Forms.Label()
+ Me.tpVoltageLevel = New System.Windows.Forms.TabPage()
+ Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.TableLayoutPanel2 = New System.Windows.Forms.TableLayoutPanel()
+ Me.lvPowerMap2 = New System.Windows.Forms.ListView()
+ Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.FlowLayoutPanel4 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.btAddPowerMap2 = New System.Windows.Forms.Button()
+ Me.btRemovePowerMap2 = New System.Windows.Forms.Button()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.FlowLayoutPanel10 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.Label28 = New System.Windows.Forms.Label()
+ Me.tbFLCurve2 = New System.Windows.Forms.TextBox()
+ Me.btFLCurveFile2 = New System.Windows.Forms.Button()
+ Me.btFLCurve2 = New System.Windows.Forms.Button()
+ Me.TableLayoutPanel4 = New System.Windows.Forms.TableLayoutPanel()
+ Me.Label17 = New System.Windows.Forms.Label()
+ Me.Label18 = New System.Windows.Forms.Label()
+ Me.Label26 = New System.Windows.Forms.Label()
+ Me.Label19 = New System.Windows.Forms.Label()
+ Me.tbOverloadTime2 = New System.Windows.Forms.TextBox()
+ Me.Label24 = New System.Windows.Forms.Label()
+ Me.tbVoltage2 = New System.Windows.Forms.TextBox()
+ Me.Label20 = New System.Windows.Forms.Label()
+ Me.Label21 = New System.Windows.Forms.Label()
+ Me.tbContinuousTorque2 = New System.Windows.Forms.TextBox()
+ Me.tbContinuousTorqueSpeed2 = New System.Windows.Forms.TextBox()
+ Me.Label27 = New System.Windows.Forms.Label()
+ Me.Label23 = New System.Windows.Forms.Label()
+ Me.tbOverloadTorqueSpeed2 = New System.Windows.Forms.TextBox()
+ Me.Label25 = New System.Windows.Forms.Label()
+ Me.Label22 = New System.Windows.Forms.Label()
+ Me.tbOverloadTorque2 = New System.Windows.Forms.TextBox()
+ Me.Label16 = New System.Windows.Forms.Label()
+ Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+ Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+ Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+ Me.lblTitle = New System.Windows.Forms.Label()
+ Me.btCancel = New System.Windows.Forms.Button()
+ Me.btSave = New System.Windows.Forms.Button()
+ Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+ Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
+ Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.FlowLayoutPanel1.SuspendLayout
+ Me.FlowLayoutPanel6.SuspendLayout
+ Me.FlowLayoutPanel8.SuspendLayout
+ Me.FlowLayoutPanel2.SuspendLayout
+ Me.tcVoltageLevels.SuspendLayout
+ Me.tpFirstVoltageLevel.SuspendLayout
+ Me.lvPowerMap.SuspendLayout
+ Me.TableLayoutPanel3.SuspendLayout
+ Me.FlowLayoutPanel11.SuspendLayout
+ Me.FlowLayoutPanel3.SuspendLayout
+ Me.TableLayoutPanel1.SuspendLayout
+ Me.tpVoltageLevel.SuspendLayout
+ Me.GroupBox1.SuspendLayout
+ Me.TableLayoutPanel2.SuspendLayout
+ Me.FlowLayoutPanel4.SuspendLayout
+ Me.FlowLayoutPanel10.SuspendLayout
+ Me.TableLayoutPanel4.SuspendLayout
+ Me.ToolStrip1.SuspendLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.StatusStrip1.SuspendLayout
+ Me.CmOpenFile.SuspendLayout
+ Me.SuspendLayout
+ '
+ 'FlowLayoutPanel1
+ '
+ Me.FlowLayoutPanel1.Controls.Add(Me.Label49)
+ Me.FlowLayoutPanel1.Controls.Add(Me.tbModel)
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(12, 77)
+ Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(242, 26)
+ Me.FlowLayoutPanel1.TabIndex = 100
+ '
+ 'Label49
+ '
+ Me.Label49.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label49.AutoSize = true
+ Me.Label49.Location = New System.Drawing.Point(3, 6)
+ Me.Label49.Name = "Label49"
+ Me.Label49.Size = New System.Drawing.Size(36, 13)
+ Me.Label49.TabIndex = 43
+ Me.Label49.Text = "Model"
+ '
+ 'tbModel
+ '
+ Me.tbModel.Anchor = System.Windows.Forms.AnchorStyles.Left
+ Me.tbModel.Location = New System.Drawing.Point(45, 3)
+ Me.tbModel.Margin = New System.Windows.Forms.Padding(3, 3, 0, 3)
+ Me.tbModel.Name = "tbModel"
+ Me.tbModel.Size = New System.Drawing.Size(194, 20)
+ Me.tbModel.TabIndex = 0
+ '
+ 'FlowLayoutPanel6
+ '
+ Me.FlowLayoutPanel6.Controls.Add(Me.Label51)
+ Me.FlowLayoutPanel6.Controls.Add(Me.tbInertia)
+ Me.FlowLayoutPanel6.Controls.Add(Me.lblinertiaUnit)
+ Me.FlowLayoutPanel6.Location = New System.Drawing.Point(12, 106)
+ Me.FlowLayoutPanel6.Name = "FlowLayoutPanel6"
+ Me.FlowLayoutPanel6.Size = New System.Drawing.Size(147, 26)
+ Me.FlowLayoutPanel6.TabIndex = 101
+ '
+ 'Label51
+ '
+ Me.Label51.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label51.AutoSize = true
+ Me.Label51.Location = New System.Drawing.Point(3, 6)
+ Me.Label51.Name = "Label51"
+ Me.Label51.Size = New System.Drawing.Size(36, 13)
+ Me.Label51.TabIndex = 45
+ Me.Label51.Text = "Inertia"
+ '
+ 'tbInertia
+ '
+ Me.tbInertia.Anchor = System.Windows.Forms.AnchorStyles.Left
+ Me.tbInertia.Location = New System.Drawing.Point(45, 3)
+ Me.tbInertia.Name = "tbInertia"
+ Me.tbInertia.Size = New System.Drawing.Size(57, 20)
+ Me.tbInertia.TabIndex = 1
+ '
+ 'lblinertiaUnit
+ '
+ Me.lblinertiaUnit.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.lblinertiaUnit.AutoSize = true
+ Me.lblinertiaUnit.Location = New System.Drawing.Point(108, 6)
+ Me.lblinertiaUnit.Name = "lblinertiaUnit"
+ Me.lblinertiaUnit.Size = New System.Drawing.Size(36, 13)
+ Me.lblinertiaUnit.TabIndex = 64
+ Me.lblinertiaUnit.Text = "[kgm²]"
+ '
+ 'FlowLayoutPanel8
+ '
+ Me.FlowLayoutPanel8.Controls.Add(Me.Label52)
+ Me.FlowLayoutPanel8.Controls.Add(Me.tbThermalOverload)
+ Me.FlowLayoutPanel8.Controls.Add(Me.Label10)
+ Me.FlowLayoutPanel8.Location = New System.Drawing.Point(162, 106)
+ Me.FlowLayoutPanel8.Name = "FlowLayoutPanel8"
+ Me.FlowLayoutPanel8.Size = New System.Drawing.Size(305, 26)
+ Me.FlowLayoutPanel8.TabIndex = 102
+ '
+ 'Label52
+ '
+ Me.Label52.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label52.AutoSize = true
+ Me.Label52.Location = New System.Drawing.Point(3, 6)
+ Me.Label52.Margin = New System.Windows.Forms.Padding(3, 0, 0, 0)
+ Me.Label52.Name = "Label52"
+ Me.Label52.Size = New System.Drawing.Size(173, 13)
+ Me.Label52.TabIndex = 50
+ Me.Label52.Text = "Thermal Overload Recovery Factor"
+ '
+ 'tbThermalOverload
+ '
+ Me.tbThermalOverload.Anchor = System.Windows.Forms.AnchorStyles.Left
+ Me.tbThermalOverload.Location = New System.Drawing.Point(181, 3)
+ Me.tbThermalOverload.Margin = New System.Windows.Forms.Padding(5, 3, 3, 3)
+ Me.tbThermalOverload.Name = "tbThermalOverload"
+ Me.tbThermalOverload.Size = New System.Drawing.Size(56, 20)
+ Me.tbThermalOverload.TabIndex = 2
+ '
+ 'Label10
+ '
+ Me.Label10.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label10.AutoSize = true
+ Me.Label10.Location = New System.Drawing.Point(242, 6)
+ Me.Label10.Margin = New System.Windows.Forms.Padding(2, 0, 3, 0)
+ Me.Label10.Name = "Label10"
+ Me.Label10.Size = New System.Drawing.Size(16, 13)
+ Me.Label10.TabIndex = 67
+ Me.Label10.Text = "[-]"
+ '
+ 'FlowLayoutPanel2
+ '
+ Me.FlowLayoutPanel2.Controls.Add(Me.Label1)
+ Me.FlowLayoutPanel2.Controls.Add(Me.tbDragCurve)
+ Me.FlowLayoutPanel2.Controls.Add(Me.btDragCurve)
+ Me.FlowLayoutPanel2.Controls.Add(Me.btDragCurveOpen)
+ Me.FlowLayoutPanel2.Location = New System.Drawing.Point(12, 135)
+ Me.FlowLayoutPanel2.Margin = New System.Windows.Forms.Padding(0)
+ Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2"
+ Me.FlowLayoutPanel2.Size = New System.Drawing.Size(469, 26)
+ Me.FlowLayoutPanel2.TabIndex = 103
+ '
+ 'Label1
+ '
+ Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label1.AutoSize = true
+ Me.Label1.Location = New System.Drawing.Point(3, 6)
+ Me.Label1.Margin = New System.Windows.Forms.Padding(3, 0, 6, 0)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(99, 13)
+ Me.Label1.TabIndex = 59
+ Me.Label1.Text = "Drag Curve (.vemd)"
+ '
+ 'tbDragCurve
+ '
+ Me.tbDragCurve.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbDragCurve.Location = New System.Drawing.Point(111, 3)
+ Me.tbDragCurve.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
+ Me.tbDragCurve.Name = "tbDragCurve"
+ Me.tbDragCurve.Size = New System.Drawing.Size(277, 20)
+ Me.tbDragCurve.TabIndex = 3
+ '
+ 'btDragCurve
+ '
+ Me.btDragCurve.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btDragCurve.Image = CType(resources.GetObject("btDragCurve.Image"),System.Drawing.Image)
+ Me.btDragCurve.Location = New System.Drawing.Point(394, 1)
+ Me.btDragCurve.Margin = New System.Windows.Forms.Padding(0)
+ Me.btDragCurve.Name = "btDragCurve"
+ Me.btDragCurve.Size = New System.Drawing.Size(24, 24)
+ Me.btDragCurve.TabIndex = 4
+ Me.btDragCurve.UseVisualStyleBackColor = true
+ '
+ 'btDragCurveOpen
+ '
+ Me.btDragCurveOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.btDragCurveOpen.Location = New System.Drawing.Point(418, 1)
+ Me.btDragCurveOpen.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
+ Me.btDragCurveOpen.Name = "btDragCurveOpen"
+ Me.btDragCurveOpen.Size = New System.Drawing.Size(24, 24)
+ Me.btDragCurveOpen.TabIndex = 84
+ Me.btDragCurveOpen.TabStop = false
+ Me.btDragCurveOpen.UseVisualStyleBackColor = true
+ '
+ 'tcVoltageLevels
+ '
+ Me.tcVoltageLevels.Controls.Add(Me.tpFirstVoltageLevel)
+ Me.tcVoltageLevels.Controls.Add(Me.tpVoltageLevel)
+ Me.tcVoltageLevels.Location = New System.Drawing.Point(12, 175)
+ Me.tcVoltageLevels.Margin = New System.Windows.Forms.Padding(0)
+ Me.tcVoltageLevels.Name = "tcVoltageLevels"
+ Me.tcVoltageLevels.SelectedIndex = 0
+ Me.tcVoltageLevels.Size = New System.Drawing.Size(517, 339)
+ Me.tcVoltageLevels.TabIndex = 104
+ '
+ 'tpFirstVoltageLevel
+ '
+ Me.tpFirstVoltageLevel.Controls.Add(Me.lvPowerMap)
+ Me.tpFirstVoltageLevel.Controls.Add(Me.FlowLayoutPanel3)
+ Me.tpFirstVoltageLevel.Controls.Add(Me.TableLayoutPanel1)
+ Me.tpFirstVoltageLevel.Location = New System.Drawing.Point(4, 22)
+ Me.tpFirstVoltageLevel.Name = "tpFirstVoltageLevel"
+ Me.tpFirstVoltageLevel.Padding = New System.Windows.Forms.Padding(3)
+ Me.tpFirstVoltageLevel.Size = New System.Drawing.Size(509, 313)
+ Me.tpFirstVoltageLevel.TabIndex = 0
+ Me.tpFirstVoltageLevel.Text = "Voltage Level Low"
+ Me.tpFirstVoltageLevel.UseVisualStyleBackColor = true
+ '
+ 'lvPowerMap
+ '
+ Me.lvPowerMap.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.lvPowerMap.Controls.Add(Me.TableLayoutPanel3)
+ Me.lvPowerMap.Location = New System.Drawing.Point(6, 126)
+ Me.lvPowerMap.Name = "lvPowerMap"
+ Me.lvPowerMap.Size = New System.Drawing.Size(500, 180)
+ Me.lvPowerMap.TabIndex = 107
+ Me.lvPowerMap.TabStop = false
+ Me.lvPowerMap.Text = "Power Map Per Gear"
+ '
+ 'TableLayoutPanel3
+ '
+ Me.TableLayoutPanel3.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel3.ColumnCount = 2
+ Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129!))
+ Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 359!))
+ Me.TableLayoutPanel3.Controls.Add(Me.lvPowerMap1, 0, 0)
+ Me.TableLayoutPanel3.Controls.Add(Me.FlowLayoutPanel11, 0, 1)
+ Me.TableLayoutPanel3.Controls.Add(Me.Label7, 1, 1)
+ Me.TableLayoutPanel3.Location = New System.Drawing.Point(6, 14)
+ Me.TableLayoutPanel3.Name = "TableLayoutPanel3"
+ Me.TableLayoutPanel3.RowCount = 2
+ Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
+ Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
+ Me.TableLayoutPanel3.Size = New System.Drawing.Size(488, 159)
+ Me.TableLayoutPanel3.TabIndex = 108
+ '
+ 'lvPowerMap1
+ '
+ Me.lvPowerMap1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvPowerMap1.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5})
+ Me.TableLayoutPanel3.SetColumnSpan(Me.lvPowerMap1, 2)
+ Me.lvPowerMap1.FullRowSelect = true
+ Me.lvPowerMap1.GridLines = true
+ Me.lvPowerMap1.HideSelection = false
+ Me.lvPowerMap1.Location = New System.Drawing.Point(3, 3)
+ Me.lvPowerMap1.MultiSelect = false
+ Me.lvPowerMap1.Name = "lvPowerMap1"
+ Me.lvPowerMap1.Size = New System.Drawing.Size(482, 119)
+ Me.lvPowerMap1.TabIndex = 77
+ Me.lvPowerMap1.TabStop = false
+ Me.lvPowerMap1.UseCompatibleStateImageBehavior = false
+ Me.lvPowerMap1.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader4
+ '
+ Me.ColumnHeader4.Text = "Gear #"
+ Me.ColumnHeader4.Width = 59
+ '
+ 'ColumnHeader5
+ '
+ Me.ColumnHeader5.Text = "Power Map File Name"
+ Me.ColumnHeader5.Width = 390
+ '
+ 'FlowLayoutPanel11
+ '
+ Me.FlowLayoutPanel11.Controls.Add(Me.btAddPowerMap1)
+ Me.FlowLayoutPanel11.Controls.Add(Me.btRemovePowerMap1)
+ Me.FlowLayoutPanel11.Location = New System.Drawing.Point(3, 128)
+ Me.FlowLayoutPanel11.Name = "FlowLayoutPanel11"
+ Me.FlowLayoutPanel11.Size = New System.Drawing.Size(61, 28)
+ Me.FlowLayoutPanel11.TabIndex = 109
+ '
+ 'btAddPowerMap1
+ '
+ Me.btAddPowerMap1.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.btAddPowerMap1.Location = New System.Drawing.Point(3, 3)
+ Me.btAddPowerMap1.Name = "btAddPowerMap1"
+ Me.btAddPowerMap1.Size = New System.Drawing.Size(24, 24)
+ Me.btAddPowerMap1.TabIndex = 38
+ Me.btAddPowerMap1.UseVisualStyleBackColor = true
+ '
+ 'btRemovePowerMap1
+ '
+ Me.btRemovePowerMap1.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.btRemovePowerMap1.Location = New System.Drawing.Point(33, 3)
+ Me.btRemovePowerMap1.Name = "btRemovePowerMap1"
+ Me.btRemovePowerMap1.Size = New System.Drawing.Size(24, 24)
+ Me.btRemovePowerMap1.TabIndex = 39
+ Me.btRemovePowerMap1.UseVisualStyleBackColor = true
+ '
+ 'Label7
+ '
+ Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label7.AutoSize = true
+ Me.Label7.Location = New System.Drawing.Point(379, 125)
+ Me.Label7.Name = "Label7"
+ Me.Label7.Size = New System.Drawing.Size(106, 13)
+ Me.Label7.TabIndex = 6
+ Me.Label7.Text = "(Double-Click to Edit)"
+ '
+ 'FlowLayoutPanel3
+ '
+ Me.FlowLayoutPanel3.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.FlowLayoutPanel3.Controls.Add(Me.Label2)
+ Me.FlowLayoutPanel3.Controls.Add(Me.tbFLCurve1)
+ Me.FlowLayoutPanel3.Controls.Add(Me.btFLCurveFile1)
+ Me.FlowLayoutPanel3.Controls.Add(Me.btFLCurve1)
+ Me.FlowLayoutPanel3.Location = New System.Drawing.Point(6, 94)
+ Me.FlowLayoutPanel3.Name = "FlowLayoutPanel3"
+ Me.FlowLayoutPanel3.Size = New System.Drawing.Size(496, 26)
+ Me.FlowLayoutPanel3.TabIndex = 106
+ '
+ 'Label2
+ '
+ Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(6, 6)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(6, 0, 9, 0)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(125, 13)
+ Me.Label2.TabIndex = 59
+ Me.Label2.Text = "Full Load Curve (.viepcp)"
+ '
+ 'tbFLCurve1
+ '
+ Me.tbFLCurve1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbFLCurve1.Location = New System.Drawing.Point(143, 3)
+ Me.tbFLCurve1.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
+ Me.tbFLCurve1.Name = "tbFLCurve1"
+ Me.tbFLCurve1.Size = New System.Drawing.Size(277, 20)
+ Me.tbFLCurve1.TabIndex = 36
+ '
+ 'btFLCurveFile1
+ '
+ Me.btFLCurveFile1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btFLCurveFile1.Image = CType(resources.GetObject("btFLCurveFile1.Image"),System.Drawing.Image)
+ Me.btFLCurveFile1.Location = New System.Drawing.Point(426, 1)
+ Me.btFLCurveFile1.Margin = New System.Windows.Forms.Padding(0)
+ Me.btFLCurveFile1.Name = "btFLCurveFile1"
+ Me.btFLCurveFile1.Size = New System.Drawing.Size(24, 24)
+ Me.btFLCurveFile1.TabIndex = 37
+ Me.btFLCurveFile1.UseVisualStyleBackColor = true
+ '
+ 'btFLCurve1
+ '
+ Me.btFLCurve1.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.btFLCurve1.Location = New System.Drawing.Point(450, 1)
+ Me.btFLCurve1.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
+ Me.btFLCurve1.Name = "btFLCurve1"
+ Me.btFLCurve1.Size = New System.Drawing.Size(24, 24)
+ Me.btFLCurve1.TabIndex = 85
+ Me.btFLCurve1.TabStop = false
+ Me.btFLCurve1.UseVisualStyleBackColor = true
+ '
+ 'TableLayoutPanel1
+ '
+ Me.TableLayoutPanel1.ColumnCount = 7
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 140!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 128!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 59!))
+ Me.TableLayoutPanel1.Controls.Add(Me.Label11, 2, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label4, 2, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label13, 5, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label43, 3, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label37, 0, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbOverloadTime1, 4, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbVoltage1, 1, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label39, 0, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label3, 0, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbContinuousTorque1, 1, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbContinuousTorqueSpeed1, 1, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label15, 2, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label42, 3, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label14, 5, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbOverloadTorqueSpeed1, 4, 2)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label41, 3, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.tbOverloadTorque1, 4, 1)
+ Me.TableLayoutPanel1.Controls.Add(Me.Label12, 5, 1)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(6, 7)
+ Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+ Me.TableLayoutPanel1.RowCount = 3
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(496, 82)
+ Me.TableLayoutPanel1.TabIndex = 105
+ '
+ 'Label11
+ '
+ Me.Label11.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label11.AutoSize = true
+ Me.Label11.Location = New System.Drawing.Point(202, 34)
+ Me.Label11.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label11.Name = "Label11"
+ Me.Label11.Size = New System.Drawing.Size(29, 13)
+ Me.Label11.TabIndex = 63
+ Me.Label11.Text = "[Nm]"
+ '
+ 'Label4
+ '
+ Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label4.AutoSize = true
+ Me.Label4.Location = New System.Drawing.Point(207, 7)
+ Me.Label4.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(20, 13)
+ Me.Label4.TabIndex = 62
+ Me.Label4.Text = "[V]"
+ '
+ 'Label13
+ '
+ Me.Label13.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label13.AutoSize = true
+ Me.Label13.Location = New System.Drawing.Point(422, 7)
+ Me.Label13.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label13.Name = "Label13"
+ Me.Label13.Size = New System.Drawing.Size(30, 13)
+ Me.Label13.TabIndex = 65
+ Me.Label13.Text = "[sec]"
+ '
+ 'Label43
+ '
+ Me.Label43.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label43.AutoSize = true
+ Me.Label43.Location = New System.Drawing.Point(281, 7)
+ Me.Label43.Name = "Label43"
+ Me.Label43.Size = New System.Drawing.Size(76, 13)
+ Me.Label43.TabIndex = 11
+ Me.Label43.Text = "Overload Time"
+ '
+ 'Label37
+ '
+ Me.Label37.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label37.AutoSize = true
+ Me.Label37.Location = New System.Drawing.Point(94, 7)
+ Me.Label37.Name = "Label37"
+ Me.Label37.Size = New System.Drawing.Size(43, 13)
+ Me.Label37.TabIndex = 1
+ Me.Label37.Text = "Voltage"
+ '
+ 'tbOverloadTime1
+ '
+ Me.tbOverloadTime1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTime1.Location = New System.Drawing.Point(363, 3)
+ Me.tbOverloadTime1.Margin = New System.Windows.Forms.Padding(0)
+ Me.tbOverloadTime1.Name = "tbOverloadTime1"
+ Me.tbOverloadTime1.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTime1.TabIndex = 33
+ '
+ 'tbVoltage1
+ '
+ Me.tbVoltage1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbVoltage1.Location = New System.Drawing.Point(143, 3)
+ Me.tbVoltage1.Margin = New System.Windows.Forms.Padding(0)
+ Me.tbVoltage1.Name = "tbVoltage1"
+ Me.tbVoltage1.Size = New System.Drawing.Size(56, 20)
+ Me.tbVoltage1.TabIndex = 30
+ '
+ 'Label39
+ '
+ Me.Label39.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label39.AutoSize = true
+ Me.Label39.Location = New System.Drawing.Point(40, 34)
+ Me.Label39.Name = "Label39"
+ Me.Label39.Size = New System.Drawing.Size(97, 13)
+ Me.Label39.TabIndex = 3
+ Me.Label39.Text = "Continuous Torque"
+ '
+ 'Label3
+ '
+ Me.Label3.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(6, 61)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(131, 13)
+ Me.Label3.TabIndex = 6
+ Me.Label3.Text = "Continuous Torque Speed"
+ '
+ 'tbContinuousTorque1
+ '
+ Me.tbContinuousTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinuousTorque1.Location = New System.Drawing.Point(143, 30)
+ Me.tbContinuousTorque1.Margin = New System.Windows.Forms.Padding(0)
+ Me.tbContinuousTorque1.Name = "tbContinuousTorque1"
+ Me.tbContinuousTorque1.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinuousTorque1.TabIndex = 31
+ '
+ 'tbContinuousTorqueSpeed1
+ '
+ Me.tbContinuousTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinuousTorqueSpeed1.Location = New System.Drawing.Point(143, 58)
+ Me.tbContinuousTorqueSpeed1.Margin = New System.Windows.Forms.Padding(0)
+ Me.tbContinuousTorqueSpeed1.Name = "tbContinuousTorqueSpeed1"
+ Me.tbContinuousTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinuousTorqueSpeed1.TabIndex = 32
+ '
+ 'Label15
+ '
+ Me.Label15.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label15.AutoSize = true
+ Me.Label15.Location = New System.Drawing.Point(202, 61)
+ Me.Label15.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label15.Name = "Label15"
+ Me.Label15.Size = New System.Drawing.Size(30, 13)
+ Me.Label15.TabIndex = 67
+ Me.Label15.Text = "[rpm]"
+ '
+ 'Label42
+ '
+ Me.Label42.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label42.AutoSize = true
+ Me.Label42.Location = New System.Drawing.Point(236, 61)
+ Me.Label42.Name = "Label42"
+ Me.Label42.Size = New System.Drawing.Size(121, 13)
+ Me.Label42.TabIndex = 9
+ Me.Label42.Text = "Overload Torque Speed"
+ '
+ 'Label14
+ '
+ Me.Label14.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label14.AutoSize = true
+ Me.Label14.Location = New System.Drawing.Point(422, 61)
+ Me.Label14.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label14.Name = "Label14"
+ Me.Label14.Size = New System.Drawing.Size(30, 13)
+ Me.Label14.TabIndex = 66
+ Me.Label14.Text = "[rpm]"
+ '
+ 'tbOverloadTorqueSpeed1
+ '
+ Me.tbOverloadTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTorqueSpeed1.Location = New System.Drawing.Point(363, 58)
+ Me.tbOverloadTorqueSpeed1.Name = "tbOverloadTorqueSpeed1"
+ Me.tbOverloadTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTorqueSpeed1.TabIndex = 35
+ '
+ 'Label41
+ '
+ Me.Label41.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label41.AutoSize = true
+ Me.Label41.Location = New System.Drawing.Point(270, 34)
+ Me.Label41.Name = "Label41"
+ Me.Label41.Size = New System.Drawing.Size(87, 13)
+ Me.Label41.TabIndex = 7
+ Me.Label41.Text = "Overload Torque"
+ '
+ 'tbOverloadTorque1
+ '
+ Me.tbOverloadTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTorque1.Location = New System.Drawing.Point(363, 30)
+ Me.tbOverloadTorque1.Name = "tbOverloadTorque1"
+ Me.tbOverloadTorque1.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTorque1.TabIndex = 34
+ '
+ 'Label12
+ '
+ Me.Label12.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label12.AutoSize = true
+ Me.Label12.Location = New System.Drawing.Point(422, 34)
+ Me.Label12.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label12.Name = "Label12"
+ Me.Label12.Size = New System.Drawing.Size(29, 13)
+ Me.Label12.TabIndex = 64
+ Me.Label12.Text = "[Nm]"
+ '
+ 'tpVoltageLevel
+ '
+ Me.tpVoltageLevel.Controls.Add(Me.GroupBox1)
+ Me.tpVoltageLevel.Controls.Add(Me.FlowLayoutPanel10)
+ Me.tpVoltageLevel.Controls.Add(Me.TableLayoutPanel4)
+ Me.tpVoltageLevel.Location = New System.Drawing.Point(4, 22)
+ Me.tpVoltageLevel.Name = "tpVoltageLevel"
+ Me.tpVoltageLevel.Padding = New System.Windows.Forms.Padding(3)
+ Me.tpVoltageLevel.Size = New System.Drawing.Size(509, 313)
+ Me.tpVoltageLevel.TabIndex = 1
+ Me.tpVoltageLevel.Text = "Voltage Level High"
+ Me.tpVoltageLevel.UseVisualStyleBackColor = true
+ '
+ 'GroupBox1
+ '
+ Me.GroupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.GroupBox1.Controls.Add(Me.TableLayoutPanel2)
+ Me.GroupBox1.Location = New System.Drawing.Point(6, 126)
+ Me.GroupBox1.Name = "GroupBox1"
+ Me.GroupBox1.Size = New System.Drawing.Size(496, 180)
+ Me.GroupBox1.TabIndex = 122
+ Me.GroupBox1.TabStop = false
+ Me.GroupBox1.Text = "Power Map Per Gear"
+ '
+ 'TableLayoutPanel2
+ '
+ Me.TableLayoutPanel2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel2.ColumnCount = 2
+ Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129!))
+ Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 359!))
+ Me.TableLayoutPanel2.Controls.Add(Me.lvPowerMap2, 0, 0)
+ Me.TableLayoutPanel2.Controls.Add(Me.FlowLayoutPanel4, 0, 1)
+ Me.TableLayoutPanel2.Controls.Add(Me.Label5, 1, 1)
+ Me.TableLayoutPanel2.Location = New System.Drawing.Point(6, 14)
+ Me.TableLayoutPanel2.Name = "TableLayoutPanel2"
+ Me.TableLayoutPanel2.RowCount = 2
+ Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
+ Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
+ Me.TableLayoutPanel2.Size = New System.Drawing.Size(488, 159)
+ Me.TableLayoutPanel2.TabIndex = 123
+ '
+ 'lvPowerMap2
+ '
+ Me.lvPowerMap2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvPowerMap2.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2})
+ Me.TableLayoutPanel2.SetColumnSpan(Me.lvPowerMap2, 2)
+ Me.lvPowerMap2.FullRowSelect = true
+ Me.lvPowerMap2.GridLines = true
+ Me.lvPowerMap2.HideSelection = false
+ Me.lvPowerMap2.Location = New System.Drawing.Point(3, 3)
+ Me.lvPowerMap2.MultiSelect = false
+ Me.lvPowerMap2.Name = "lvPowerMap2"
+ Me.lvPowerMap2.Size = New System.Drawing.Size(482, 119)
+ Me.lvPowerMap2.TabIndex = 77
+ Me.lvPowerMap2.TabStop = false
+ Me.lvPowerMap2.UseCompatibleStateImageBehavior = false
+ Me.lvPowerMap2.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader1
+ '
+ Me.ColumnHeader1.Text = "Gear #"
+ Me.ColumnHeader1.Width = 59
+ '
+ 'ColumnHeader2
+ '
+ Me.ColumnHeader2.Text = "Power Map File Name"
+ Me.ColumnHeader2.Width = 390
+ '
+ 'FlowLayoutPanel4
+ '
+ Me.FlowLayoutPanel4.Controls.Add(Me.btAddPowerMap2)
+ Me.FlowLayoutPanel4.Controls.Add(Me.btRemovePowerMap2)
+ Me.FlowLayoutPanel4.Location = New System.Drawing.Point(3, 128)
+ Me.FlowLayoutPanel4.Name = "FlowLayoutPanel4"
+ Me.FlowLayoutPanel4.Size = New System.Drawing.Size(61, 28)
+ Me.FlowLayoutPanel4.TabIndex = 124
+ '
+ 'btAddPowerMap2
+ '
+ Me.btAddPowerMap2.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.btAddPowerMap2.Location = New System.Drawing.Point(3, 3)
+ Me.btAddPowerMap2.Name = "btAddPowerMap2"
+ Me.btAddPowerMap2.Size = New System.Drawing.Size(24, 24)
+ Me.btAddPowerMap2.TabIndex = 48
+ Me.btAddPowerMap2.UseVisualStyleBackColor = true
+ '
+ 'btRemovePowerMap2
+ '
+ Me.btRemovePowerMap2.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.btRemovePowerMap2.Location = New System.Drawing.Point(33, 3)
+ Me.btRemovePowerMap2.Name = "btRemovePowerMap2"
+ Me.btRemovePowerMap2.Size = New System.Drawing.Size(24, 24)
+ Me.btRemovePowerMap2.TabIndex = 49
+ Me.btRemovePowerMap2.UseVisualStyleBackColor = true
+ '
+ 'Label5
+ '
+ Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label5.AutoSize = true
+ Me.Label5.Location = New System.Drawing.Point(379, 125)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(106, 13)
+ Me.Label5.TabIndex = 6
+ Me.Label5.Text = "(Double-Click to Edit)"
+ '
+ 'FlowLayoutPanel10
+ '
+ Me.FlowLayoutPanel10.Controls.Add(Me.Label28)
+ Me.FlowLayoutPanel10.Controls.Add(Me.tbFLCurve2)
+ Me.FlowLayoutPanel10.Controls.Add(Me.btFLCurveFile2)
+ Me.FlowLayoutPanel10.Controls.Add(Me.btFLCurve2)
+ Me.FlowLayoutPanel10.Location = New System.Drawing.Point(6, 94)
+ Me.FlowLayoutPanel10.Name = "FlowLayoutPanel10"
+ Me.FlowLayoutPanel10.Size = New System.Drawing.Size(496, 26)
+ Me.FlowLayoutPanel10.TabIndex = 121
+ '
+ 'Label28
+ '
+ Me.Label28.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label28.AutoSize = true
+ Me.Label28.Location = New System.Drawing.Point(6, 6)
+ Me.Label28.Margin = New System.Windows.Forms.Padding(6, 0, 9, 0)
+ Me.Label28.Name = "Label28"
+ Me.Label28.Size = New System.Drawing.Size(125, 13)
+ Me.Label28.TabIndex = 59
+ Me.Label28.Text = "Full Load Curve (.viepcp)"
+ '
+ 'tbFLCurve2
+ '
+ Me.tbFLCurve2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbFLCurve2.Location = New System.Drawing.Point(143, 3)
+ Me.tbFLCurve2.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
+ Me.tbFLCurve2.Name = "tbFLCurve2"
+ Me.tbFLCurve2.Size = New System.Drawing.Size(277, 20)
+ Me.tbFLCurve2.TabIndex = 46
+ '
+ 'btFLCurveFile2
+ '
+ Me.btFLCurveFile2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btFLCurveFile2.Image = CType(resources.GetObject("btFLCurveFile2.Image"),System.Drawing.Image)
+ Me.btFLCurveFile2.Location = New System.Drawing.Point(426, 1)
+ Me.btFLCurveFile2.Margin = New System.Windows.Forms.Padding(0)
+ Me.btFLCurveFile2.Name = "btFLCurveFile2"
+ Me.btFLCurveFile2.Size = New System.Drawing.Size(24, 24)
+ Me.btFLCurveFile2.TabIndex = 47
+ Me.btFLCurveFile2.UseVisualStyleBackColor = true
+ '
+ 'btFLCurve2
+ '
+ Me.btFLCurve2.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.btFLCurve2.Location = New System.Drawing.Point(450, 1)
+ Me.btFLCurve2.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
+ Me.btFLCurve2.Name = "btFLCurve2"
+ Me.btFLCurve2.Size = New System.Drawing.Size(24, 24)
+ Me.btFLCurve2.TabIndex = 86
+ Me.btFLCurve2.TabStop = false
+ Me.btFLCurve2.UseVisualStyleBackColor = true
+ '
+ 'TableLayoutPanel4
+ '
+ Me.TableLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel4.ColumnCount = 7
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 140!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 128!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 59!))
+ Me.TableLayoutPanel4.Controls.Add(Me.Label17, 2, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label18, 2, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label26, 5, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label19, 0, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbOverloadTime2, 4, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label24, 3, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbVoltage2, 1, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label20, 0, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label21, 0, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbContinuousTorque2, 1, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbContinuousTorqueSpeed2, 1, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label27, 2, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label23, 3, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbOverloadTorqueSpeed2, 4, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label25, 5, 2)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label22, 3, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.tbOverloadTorque2, 4, 1)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label16, 5, 1)
+ Me.TableLayoutPanel4.Location = New System.Drawing.Point(6, 7)
+ Me.TableLayoutPanel4.Name = "TableLayoutPanel4"
+ Me.TableLayoutPanel4.RowCount = 3
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+ Me.TableLayoutPanel4.Size = New System.Drawing.Size(496, 82)
+ Me.TableLayoutPanel4.TabIndex = 120
+ '
+ 'Label17
+ '
+ Me.Label17.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label17.AutoSize = true
+ Me.Label17.Location = New System.Drawing.Point(202, 34)
+ Me.Label17.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label17.Name = "Label17"
+ Me.Label17.Size = New System.Drawing.Size(29, 13)
+ Me.Label17.TabIndex = 63
+ Me.Label17.Text = "[Nm]"
+ '
+ 'Label18
+ '
+ Me.Label18.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label18.AutoSize = true
+ Me.Label18.Location = New System.Drawing.Point(207, 7)
+ Me.Label18.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label18.Name = "Label18"
+ Me.Label18.Size = New System.Drawing.Size(20, 13)
+ Me.Label18.TabIndex = 62
+ Me.Label18.Text = "[V]"
+ '
+ 'Label26
+ '
+ Me.Label26.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label26.AutoSize = true
+ Me.Label26.Location = New System.Drawing.Point(422, 7)
+ Me.Label26.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label26.Name = "Label26"
+ Me.Label26.Size = New System.Drawing.Size(30, 13)
+ Me.Label26.TabIndex = 65
+ Me.Label26.Text = "[sec]"
+ '
+ 'Label19
+ '
+ Me.Label19.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label19.AutoSize = true
+ Me.Label19.Location = New System.Drawing.Point(94, 7)
+ Me.Label19.Name = "Label19"
+ Me.Label19.Size = New System.Drawing.Size(43, 13)
+ Me.Label19.TabIndex = 1
+ Me.Label19.Text = "Voltage"
+ '
+ 'tbOverloadTime2
+ '
+ Me.tbOverloadTime2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTime2.Location = New System.Drawing.Point(363, 3)
+ Me.tbOverloadTime2.Name = "tbOverloadTime2"
+ Me.tbOverloadTime2.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTime2.TabIndex = 43
+ '
+ 'Label24
+ '
+ Me.Label24.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label24.AutoSize = true
+ Me.Label24.Location = New System.Drawing.Point(281, 7)
+ Me.Label24.Name = "Label24"
+ Me.Label24.Size = New System.Drawing.Size(76, 13)
+ Me.Label24.TabIndex = 11
+ Me.Label24.Text = "Overload Time"
+ '
+ 'tbVoltage2
+ '
+ Me.tbVoltage2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbVoltage2.Location = New System.Drawing.Point(143, 3)
+ Me.tbVoltage2.Name = "tbVoltage2"
+ Me.tbVoltage2.Size = New System.Drawing.Size(56, 20)
+ Me.tbVoltage2.TabIndex = 40
+ '
+ 'Label20
+ '
+ Me.Label20.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label20.AutoSize = true
+ Me.Label20.Location = New System.Drawing.Point(40, 34)
+ Me.Label20.Name = "Label20"
+ Me.Label20.Size = New System.Drawing.Size(97, 13)
+ Me.Label20.TabIndex = 3
+ Me.Label20.Text = "Continuous Torque"
+ '
+ 'Label21
+ '
+ Me.Label21.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label21.AutoSize = true
+ Me.Label21.Location = New System.Drawing.Point(6, 61)
+ Me.Label21.Name = "Label21"
+ Me.Label21.Size = New System.Drawing.Size(131, 13)
+ Me.Label21.TabIndex = 6
+ Me.Label21.Text = "Continuous Torque Speed"
+ '
+ 'tbContinuousTorque2
+ '
+ Me.tbContinuousTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinuousTorque2.Location = New System.Drawing.Point(143, 30)
+ Me.tbContinuousTorque2.Name = "tbContinuousTorque2"
+ Me.tbContinuousTorque2.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinuousTorque2.TabIndex = 41
+ '
+ 'tbContinuousTorqueSpeed2
+ '
+ Me.tbContinuousTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbContinuousTorqueSpeed2.Location = New System.Drawing.Point(143, 58)
+ Me.tbContinuousTorqueSpeed2.Name = "tbContinuousTorqueSpeed2"
+ Me.tbContinuousTorqueSpeed2.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinuousTorqueSpeed2.TabIndex = 42
+ '
+ 'Label27
+ '
+ Me.Label27.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label27.AutoSize = true
+ Me.Label27.Location = New System.Drawing.Point(202, 61)
+ Me.Label27.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label27.Name = "Label27"
+ Me.Label27.Size = New System.Drawing.Size(30, 13)
+ Me.Label27.TabIndex = 67
+ Me.Label27.Text = "[rpm]"
+ '
+ 'Label23
+ '
+ Me.Label23.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label23.AutoSize = true
+ Me.Label23.Location = New System.Drawing.Point(236, 61)
+ Me.Label23.Name = "Label23"
+ Me.Label23.Size = New System.Drawing.Size(121, 13)
+ Me.Label23.TabIndex = 9
+ Me.Label23.Text = "Overload Torque Speed"
+ '
+ 'tbOverloadTorqueSpeed2
+ '
+ Me.tbOverloadTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTorqueSpeed2.Location = New System.Drawing.Point(363, 58)
+ Me.tbOverloadTorqueSpeed2.Name = "tbOverloadTorqueSpeed2"
+ Me.tbOverloadTorqueSpeed2.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTorqueSpeed2.TabIndex = 45
+ '
+ 'Label25
+ '
+ Me.Label25.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label25.AutoSize = true
+ Me.Label25.Location = New System.Drawing.Point(422, 61)
+ Me.Label25.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label25.Name = "Label25"
+ Me.Label25.Size = New System.Drawing.Size(30, 13)
+ Me.Label25.TabIndex = 66
+ Me.Label25.Text = "[rpm]"
+ '
+ 'Label22
+ '
+ Me.Label22.Anchor = System.Windows.Forms.AnchorStyles.Right
+ Me.Label22.AutoSize = true
+ Me.Label22.Location = New System.Drawing.Point(270, 34)
+ Me.Label22.Name = "Label22"
+ Me.Label22.Size = New System.Drawing.Size(87, 13)
+ Me.Label22.TabIndex = 7
+ Me.Label22.Text = "Overload Torque"
+ '
+ 'tbOverloadTorque2
+ '
+ Me.tbOverloadTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbOverloadTorque2.Location = New System.Drawing.Point(363, 30)
+ Me.tbOverloadTorque2.Name = "tbOverloadTorque2"
+ Me.tbOverloadTorque2.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTorque2.TabIndex = 44
+ '
+ 'Label16
+ '
+ Me.Label16.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label16.AutoSize = true
+ Me.Label16.Location = New System.Drawing.Point(422, 34)
+ Me.Label16.Margin = New System.Windows.Forms.Padding(0)
+ Me.Label16.Name = "Label16"
+ Me.Label16.Size = New System.Drawing.Size(29, 13)
+ Me.Label16.TabIndex = 64
+ Me.Label16.Text = "[Nm]"
+ '
+ 'ToolStrip1
+ '
+ Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+ Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
+ Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
+ Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+ Me.ToolStrip1.Name = "ToolStrip1"
+ Me.ToolStrip1.Size = New System.Drawing.Size(541, 31)
+ Me.ToolStrip1.TabIndex = 78
+ Me.ToolStrip1.Text = "ToolStrip1"
+ '
+ 'ToolStripBtNew
+ '
+ Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
+ Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtNew.Name = "ToolStripBtNew"
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtNew.Text = "ToolStripButton1"
+ Me.ToolStripBtNew.ToolTipText = "New"
+ '
+ 'ToolStripBtOpen
+ '
+ Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtOpen.Text = "ToolStripButton1"
+ Me.ToolStripBtOpen.ToolTipText = "Open..."
+ '
+ 'ToolStripBtSave
+ '
+ Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
+ Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtSave.Name = "ToolStripBtSave"
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSave.Text = "ToolStripButton1"
+ Me.ToolStripBtSave.ToolTipText = "Save"
+ '
+ 'ToolStripBtSaveAs
+ '
+ Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
+ Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
+ Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
+ '
+ 'ToolStripSeparator3
+ '
+ Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
+ '
+ 'ToolStripBtSendTo
+ '
+ Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
+ Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSendTo.Text = "Send to Vehicle Editor"
+ Me.ToolStripBtSendTo.ToolTipText = "Send to Vehicle Editor"
+ '
+ 'ToolStripSeparator1
+ '
+ Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
+ '
+ 'ToolStripButton1
+ '
+ Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
+ Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripButton1.Name = "ToolStripButton1"
+ Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton1.Text = "Help"
+ '
+ 'PictureBox1
+ '
+ Me.PictureBox1.BackColor = System.Drawing.Color.White
+ Me.PictureBox1.Dock = System.Windows.Forms.DockStyle.Top
+ Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 31)
+ Me.PictureBox1.Name = "PictureBox1"
+ Me.PictureBox1.Size = New System.Drawing.Size(541, 40)
+ Me.PictureBox1.TabIndex = 79
+ Me.PictureBox1.TabStop = false
+ '
+ 'lblTitle
+ '
+ Me.lblTitle.AutoSize = true
+ Me.lblTitle.BackColor = System.Drawing.Color.White
+ Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.lblTitle.Location = New System.Drawing.Point(108, 37)
+ Me.lblTitle.Name = "lblTitle"
+ Me.lblTitle.Size = New System.Drawing.Size(69, 29)
+ Me.lblTitle.TabIndex = 80
+ Me.lblTitle.Text = "IHPC"
+ '
+ 'btCancel
+ '
+ Me.btCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.btCancel.Location = New System.Drawing.Point(454, 520)
+ Me.btCancel.Name = "btCancel"
+ Me.btCancel.Size = New System.Drawing.Size(75, 23)
+ Me.btCancel.TabIndex = 51
+ Me.btCancel.Text = "Cancel"
+ Me.btCancel.UseVisualStyleBackColor = true
+ '
+ 'btSave
+ '
+ Me.btSave.Location = New System.Drawing.Point(373, 520)
+ Me.btSave.Name = "btSave"
+ Me.btSave.Size = New System.Drawing.Size(75, 23)
+ Me.btSave.TabIndex = 50
+ Me.btSave.Text = "Save"
+ Me.btSave.UseVisualStyleBackColor = true
+ '
+ 'StatusStrip1
+ '
+ Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
+ Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 555)
+ Me.StatusStrip1.Name = "StatusStrip1"
+ Me.StatusStrip1.Size = New System.Drawing.Size(541, 22)
+ Me.StatusStrip1.SizingGrip = false
+ Me.StatusStrip1.TabIndex = 83
+ Me.StatusStrip1.Text = "StatusStrip1"
+ '
+ 'LbStatus
+ '
+ Me.LbStatus.Name = "LbStatus"
+ Me.LbStatus.Size = New System.Drawing.Size(39, 17)
+ Me.LbStatus.Text = "Status"
+ '
+ 'CmOpenFile
+ '
+ Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
+ Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+ Me.CmOpenFile.Name = "CmOpenFile"
+ Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
+ '
+ 'OpenWithToolStripMenuItem
+ '
+ Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+ '
+ 'ShowInFolderToolStripMenuItem
+ '
+ Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+ '
+ 'IHPCForm
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(541, 577)
+ Me.Controls.Add(Me.StatusStrip1)
+ Me.Controls.Add(Me.btCancel)
+ Me.Controls.Add(Me.btSave)
+ Me.Controls.Add(Me.lblTitle)
+ Me.Controls.Add(Me.PictureBox1)
+ Me.Controls.Add(Me.ToolStrip1)
+ Me.Controls.Add(Me.tcVoltageLevels)
+ Me.Controls.Add(Me.FlowLayoutPanel8)
+ Me.Controls.Add(Me.FlowLayoutPanel6)
+ Me.Controls.Add(Me.FlowLayoutPanel2)
+ Me.Controls.Add(Me.FlowLayoutPanel1)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+ Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.MaximizeBox = false
+ Me.Name = "IHPCForm"
+ Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "IHPC"
+ Me.FlowLayoutPanel1.ResumeLayout(false)
+ Me.FlowLayoutPanel1.PerformLayout
+ Me.FlowLayoutPanel6.ResumeLayout(false)
+ Me.FlowLayoutPanel6.PerformLayout
+ Me.FlowLayoutPanel8.ResumeLayout(false)
+ Me.FlowLayoutPanel8.PerformLayout
+ Me.FlowLayoutPanel2.ResumeLayout(false)
+ Me.FlowLayoutPanel2.PerformLayout
+ Me.tcVoltageLevels.ResumeLayout(false)
+ Me.tpFirstVoltageLevel.ResumeLayout(false)
+ Me.lvPowerMap.ResumeLayout(false)
+ Me.TableLayoutPanel3.ResumeLayout(false)
+ Me.TableLayoutPanel3.PerformLayout
+ Me.FlowLayoutPanel11.ResumeLayout(false)
+ Me.FlowLayoutPanel3.ResumeLayout(false)
+ Me.FlowLayoutPanel3.PerformLayout
+ Me.TableLayoutPanel1.ResumeLayout(false)
+ Me.TableLayoutPanel1.PerformLayout
+ Me.tpVoltageLevel.ResumeLayout(false)
+ Me.GroupBox1.ResumeLayout(false)
+ Me.TableLayoutPanel2.ResumeLayout(false)
+ Me.TableLayoutPanel2.PerformLayout
+ Me.FlowLayoutPanel4.ResumeLayout(false)
+ Me.FlowLayoutPanel10.ResumeLayout(false)
+ Me.FlowLayoutPanel10.PerformLayout
+ Me.TableLayoutPanel4.ResumeLayout(false)
+ Me.TableLayoutPanel4.PerformLayout
+ Me.ToolStrip1.ResumeLayout(false)
+ Me.ToolStrip1.PerformLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
+ Me.StatusStrip1.ResumeLayout(false)
+ Me.StatusStrip1.PerformLayout
+ Me.CmOpenFile.ResumeLayout(false)
+ Me.ResumeLayout(false)
+ Me.PerformLayout
+
+End Sub
+
+ Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
+ Friend WithEvents Label49 As Label
+ Friend WithEvents tbModel As TextBox
+ Friend WithEvents FlowLayoutPanel6 As FlowLayoutPanel
+ Friend WithEvents Label51 As Label
+ Friend WithEvents tbInertia As TextBox
+ Friend WithEvents lblinertiaUnit As Label
+ Friend WithEvents FlowLayoutPanel8 As FlowLayoutPanel
+ Friend WithEvents Label52 As Label
+ Friend WithEvents tbThermalOverload As TextBox
+ Friend WithEvents Label10 As Label
+ Friend WithEvents FlowLayoutPanel2 As FlowLayoutPanel
+ Friend WithEvents Label1 As Label
+ Friend WithEvents tbDragCurve As TextBox
+ Friend WithEvents btDragCurve As Button
+ Friend WithEvents tcVoltageLevels As TabControl
+ Friend WithEvents tpFirstVoltageLevel As TabPage
+ Friend WithEvents FlowLayoutPanel3 As FlowLayoutPanel
+ Friend WithEvents Label2 As Label
+ Friend WithEvents tbFLCurve1 As TextBox
+ Friend WithEvents btFLCurveFile1 As Button
+ Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
+ Friend WithEvents Label11 As Label
+ Friend WithEvents Label4 As Label
+ Friend WithEvents Label13 As Label
+ Friend WithEvents Label43 As Label
+ Friend WithEvents Label37 As Label
+ Friend WithEvents tbOverloadTime1 As TextBox
+ Friend WithEvents tbVoltage1 As TextBox
+ Friend WithEvents Label39 As Label
+ Friend WithEvents Label3 As Label
+ Friend WithEvents tbContinuousTorque1 As TextBox
+ Friend WithEvents tbContinuousTorqueSpeed1 As TextBox
+ Friend WithEvents Label15 As Label
+ Friend WithEvents Label42 As Label
+ Friend WithEvents Label14 As Label
+ Friend WithEvents tbOverloadTorqueSpeed1 As TextBox
+ Friend WithEvents Label41 As Label
+ Friend WithEvents tbOverloadTorque1 As TextBox
+ Friend WithEvents Label12 As Label
+ Friend WithEvents tpVoltageLevel As TabPage
+ Friend WithEvents FlowLayoutPanel10 As FlowLayoutPanel
+ Friend WithEvents Label28 As Label
+ Friend WithEvents tbFLCurve2 As TextBox
+ Friend WithEvents btFLCurveFile2 As Button
+ Friend WithEvents TableLayoutPanel4 As TableLayoutPanel
+ Friend WithEvents Label17 As Label
+ Friend WithEvents Label18 As Label
+ Friend WithEvents Label26 As Label
+ Friend WithEvents Label19 As Label
+ Friend WithEvents tbOverloadTime2 As TextBox
+ Friend WithEvents Label24 As Label
+ Friend WithEvents tbVoltage2 As TextBox
+ Friend WithEvents Label20 As Label
+ Friend WithEvents Label21 As Label
+ Friend WithEvents tbContinuousTorque2 As TextBox
+ Friend WithEvents tbContinuousTorqueSpeed2 As TextBox
+ Friend WithEvents Label27 As Label
+ Friend WithEvents Label23 As Label
+ Friend WithEvents tbOverloadTorqueSpeed2 As TextBox
+ Friend WithEvents Label25 As Label
+ Friend WithEvents Label22 As Label
+ Friend WithEvents tbOverloadTorque2 As TextBox
+ Friend WithEvents Label16 As Label
+ Friend WithEvents ToolStrip1 As ToolStrip
+ Friend WithEvents ToolStripBtNew As ToolStripButton
+ Friend WithEvents ToolStripBtOpen As ToolStripButton
+ Friend WithEvents ToolStripBtSave As ToolStripButton
+ Friend WithEvents ToolStripBtSaveAs As ToolStripButton
+ Friend WithEvents ToolStripSeparator3 As ToolStripSeparator
+ Friend WithEvents ToolStripBtSendTo As ToolStripButton
+ Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
+ Friend WithEvents ToolStripButton1 As ToolStripButton
+ Friend WithEvents PictureBox1 As PictureBox
+ Friend WithEvents lblTitle As Label
+ Friend WithEvents lvPowerMap As GroupBox
+ Friend WithEvents TableLayoutPanel3 As TableLayoutPanel
+ Friend WithEvents lvPowerMap1 As ListView
+ Friend WithEvents ColumnHeader4 As ColumnHeader
+ Friend WithEvents ColumnHeader5 As ColumnHeader
+ Friend WithEvents FlowLayoutPanel11 As FlowLayoutPanel
+ Friend WithEvents btAddPowerMap1 As Button
+ Friend WithEvents btRemovePowerMap1 As Button
+ Friend WithEvents Label7 As Label
+ Friend WithEvents GroupBox1 As GroupBox
+ Friend WithEvents TableLayoutPanel2 As TableLayoutPanel
+ Friend WithEvents lvPowerMap2 As ListView
+ Friend WithEvents ColumnHeader1 As ColumnHeader
+ Friend WithEvents ColumnHeader2 As ColumnHeader
+ Friend WithEvents FlowLayoutPanel4 As FlowLayoutPanel
+ Friend WithEvents btAddPowerMap2 As Button
+ Friend WithEvents btRemovePowerMap2 As Button
+ Friend WithEvents Label5 As Label
+ Friend WithEvents btCancel As Button
+ Friend WithEvents btSave As Button
+ Friend WithEvents StatusStrip1 As StatusStrip
+ Friend WithEvents LbStatus As ToolStripStatusLabel
+ Friend WithEvents btDragCurveOpen As Button
+ Friend WithEvents btFLCurve1 As Button
+ Friend WithEvents CmOpenFile As ContextMenuStrip
+ Friend WithEvents OpenWithToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents ShowInFolderToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents btFLCurve2 As Button
+End Class
diff --git a/VECTO/GUI/IHPCForm.resx b/VECTO/GUI/IHPCForm.resx
new file mode 100644
index 0000000000000000000000000000000000000000..6beee2d38eb9de43c25eb98c893c851e7afdc849
--- /dev/null
+++ b/VECTO/GUI/IHPCForm.resx
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btDragCurve.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
+ zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
+ 0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
+ c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
+ qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
+ GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
+ 1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
+ gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
+ TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
+ W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
+ MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
+ IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
+ eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="btFLCurveFile1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
+ zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
+ 0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
+ c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
+ qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
+ GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
+ 1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
+ gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
+ TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
+ W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
+ MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
+ IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
+ eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="btFLCurveFile2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
+ zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
+ 0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
+ c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
+ qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
+ GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
+ 1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
+ gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
+ TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
+ W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
+ MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
+ IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
+ eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>142, 15</value>
+ </metadata>
+ <metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>344, 18</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>52</value>
+ </metadata>
+ <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP39/QLg6NsG/v7+AgAA
+ AAAAAAAAAAAAAAAAAAAAAAAA////////////////////////////////////////////////////////
+ /////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/v4B1uDQEIil
+ di319/MQ////AQAAAAAAAAAAAAAAAAAAAAD/////AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP8AAAD/AAAA/wAAAP//////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+
+ /gudtI5FRHEmhMbUvS7+/v4CAAAAAAAAAAAAAAAAAAAAAP////8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP8AAAD/AAAA/wAAAP8AAAD/AAAA//////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAD///8B7PDpJmOJS5s4aBnEjal8Wf39/A8AAAAAAAAAAAAAAAAAAAAA/////wAAAP8AAAD/AAAA/wAA
+ AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAP7+/ga3ya0+PGsexzdnGO9Vfjut4OfcLP///wIAAAAAAAAAAAAAAAD/////AAAA/wAA
+ AP8AAAD/AAAA////////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAD///8B+vv6Fn+ea3E2ZhfeN2cY/DhnGc+nvJpJ/v7+CQAAAAAAAAAAAAAAAP//
+ //8AAAD/AAAA/wAAAP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/+/gLU3s0vSHQstTZmF/Y2Zhf+NmYX6G2QV4zy9fAg////AQAA
+ AAAAAAAA/////wAAAP8AAAD/AAAA/wAAAP//////////////////////////////////////AAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+DJqyilI1ZhbTNmYW/TZmF/82Zhf5P20hwMDP
+ tzj+/v4EAAAAAAAAAAD/////AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA////
+ //8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wLr7+cpX4ZFpTVmFfA2ZhX/NmYW/zZm
+ Fv42ZhfZh6N0ZPz9/BL+/v4BAAAAAP////8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+B7TGqEI6ahnMNmcV/DZn
+ Ff82ZhX/NmYV/zVlF/RPeTOw2+TWLf7+/gIAAAAA/////wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP8AAAD/AAAA/wAAAP//////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wH4+vgZeppleTVm
+ FOE2ZxX+NmcV/zZnFf82ZhX/NmYV/TZmFtGhuJNO/v7+CgAAAAD/////AAAA/wAAAP8AAAD/AAAA////
+ //////////////////////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+As/b
+ yDBGcyi3NWYU9zVmFP82ZxX/NmcV/zZnFf82ZxX+NWYV7GeMT5fv8+0k////Af////8AAAD/AAAA/wAA
+ AP8AAAD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAD+/v4Mlq+FVDRlE9Q1ZhT9NWYU/zVmFP82ZxX/NmcV/zZnFf82ZxX7PWwdxbzMsTz+/v4F/////wAA
+ AP8AAAD/AAAA/wAAAP///////////////////////////////////////////wAAAAAAAAAAAAAAAAAA
+ AAAAAAAA////Auju5Stbg0GqNWUU8jVmFP81ZhT/NWYU/zVmFP82ZxX/NmcV/zZnFf41ZhTdgqBubfv8
+ +hX/////AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP//////AAAAAAAA
+ AAAAAAAAAAAAAAAAAAD+/v4HscOlRThoGM41ZhT9NWYU/zVmFP81ZhT/NWYU/zVmFP82ZxX/NmcV/zVm
+ FPVLdy6z1+DQL/7+/v8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA////
+ //8AAAAAAAAAAAAAAAAAAAAA////Afj59xt2l2F+NGUT4zVmFP41ZhT/NWYU/zVmFP81ZhT/NWYU/zVm
+ FP82ZxX/NmcV/TVmFdOctI1R/v7+/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP8AAAD//////wAAAAAAAAAAAAAAAAAAAAD+/v4CzdnFMURxJbo1ZhT4NWYU/zVmFP81ZhT/NWYU/zVm
+ FP81ZhT/NWYU/zVmFP82ZxX/NWYU7mKISZ/8/Pv/////////////////////////////////////////
+ ////////////////////////AAAAAAAAAAAAAAAAAAAAAP7+/gyUroNUNGUT1DVmFP01ZhT/NWYU/zVm
+ FP81ZhT/NWYU/zVmFP81ZhT/NWYU/zVmFP82ZxX8O2obybfIq0L+/v4I/v7+Av39/QL9/v0C/f79Av3+
+ /QL9/v0C/f79Av3+/QL9/v0C/f79Av3+/QL9/v0C/f79AgAAAAD///8C5uziK1mBPqs0ZRPzNWYU/zVm
+ FP81ZhT/NWYU/zVmFP81ZhT/NWYU/zVmFP81ZhT/NWYU/zZnFf41ZhThepplhNTezUPZ4tM12eLTNdni
+ 0zXZ4tM12eLTNdni1DXZ4tQ12eLUNdrj1DXa49U12eLUNdrj1DXa49U1AAAAAP7+/givwqJGN2cWzjVm
+ FP01ZhT/NWYU/zVmFP81ZhT/NGYT/zVmFP41ZhT/NWYU/zVmFP81ZhT/NWYU/zZnFfg1ZhThRHImz0Rx
+ JspEcSfKRXEoykVyKMpFcinKRnMqykd0K8pIdCvKSXUsykt3LspIdCvKSXUsykt3Lsr//v8B9vj1HXSW
+ XoM0ZRPlNWYU/jVmFP81ZhT/NWYU/zVmFP82ZhX0U3w34DRlE/Q1ZhT/NWYU/zVmFP81ZhT/NWYU/zZn
+ Ff42ZxX9NmYV/TZmFv02Zhf9NmYX/TdnGP03Zxj9OWgZ/TppGv06ahv9PGwd/TppGv06ahv9PGwd/f7/
+ /gLK1sIyQnAkuzRlE/g1ZhT/NWYU/zVmFP81ZhT/NWYU+0dzKc2gt5GGP24g0zVmFP01ZhT/NWYU/zVm
+ FP81ZhT/NmcV/zZnFf82ZxX/NmYW/zZmF/82Zhf/N2cY/zdnGP84aBn/Omka/zpqG/87axz/Omka/zpq
+ G/87axz//f79DY+qflc0ZRPVNWYU/TVmFP81ZhT/NWYU/zVmFP41ZRTraY1RluLp3k1fhkWnNGUT8TVm
+ FP81ZhT/NWYU/zVmFP81ZhT/NmcV/zZnFf82ZhX/NmYW/zZmF/83Zxf/N2cY/zhoGf85aRr/Omob/ztr
+ HP85aRr/Omob/ztrHP/j6t8rVn88rDRlFPM1ZhT/NWYU/zVmFP81ZhT/NWYU/jRlE9KWr4VN/f39F5Cq
+ flU0ZRPVNWYU/jVmFP81ZhT/NWYU/zVmFP82ZxX/NmcV/zZmFf82Zhb/NmYX/zZmF/83Zxj/N2cY/zlp
+ Gv86ahv/O2sc/zlpGv86ahv/O2sc/6zAn0c3ZxbPNWYU/TVmFP81ZhT/NWYU/zVmFP81ZhT9PWwdycPS
+ ujb+/v4EwtC4Nz1sHco1ZhT9NWYU/zVmFP81ZhT/NWYU/zZnFf82ZxX/NmYV/zZmFv82Zhf/NmYX/zdn
+ GP83Zxj/OWka/zpqG/86ahv/OWka/zpqG/86ahv/cpRchjRlE+Y1ZhT+NWYU/zVmFP81ZhT/NWYU/zVm
+ FPZXgDyz6e7mLv///wPp7uYsWYE+rzVmFPQ1ZhT/NWYU/zVmFP81ZhT/NmcV/zZnFf82ZhT/NmYV/zZm
+ F/82Zhf/N2cX/zdnGP85aRr/Omob/zpqG/85aRr/Omob/zpqG/9BbyK6NGUU9jVmFP01ZhT9NWYU/TVm
+ FP01ZhT8NGUT3IGgbW78/PwW////Af39/RGJpXZiNGUT2DVmFPw1ZhT9NGUT/TVmFP02ZxX9NmcV/TZm
+ Ff02ZhX9NmYX/TZmF/03Zxf9N2cY/ThoGf06aRr9Omob/ThoGf06aRr9Omob/TZnFaE2ZxXINmcVyjZn
+ Fco2ZxXKNmcVyjZnFck4aBijr8KiNP7+/gUAAAAA/v7+A7rKrzA7ahuiNmcVyTZnFco2ZxXKN2cWyjdo
+ Fso3aBbKN2gWyjdnF8o3ZxjKOGcZyjhoGco5aBrKOmobyjtrHMo8ax3KOmobyjtrHMo8ax3KscSkKrHE
+ pDWxxKQ1scSkNbHEpDWxxKQ1scSkNbTGqCru8uwM///+AQAAAAAAAAAA8/bxC7bHqiqxxKQ1scSkNbHE
+ pDWxxKQ1scSlNbHEpTWxxKU1scSlNbHEpTWxxKU1scSmNbLEpjWyxaY1s8WnNbPFpzWyxaY1s8WnNbPF
+ pzX///8C////Av///wL///8C////Av///wL///8C////AgAAAAAAAAAAAAAAAAAAAAAAAAAA////Av//
+ /wL///8C////Av///wL///8C////Av///wL///8C////Av///wL///8C////Av///wL///8C////AgAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAA////////gAP//4AD/9+AA/+fgAP/j4AD/4+B//8HgAf/B4AH/geAB/4D
+ gAf+A4AH/AGB//wBgAP4AYAD+ACAA/gAgAPwAAAD8AB//+AAP//gAAAAwAAAAMAAAADAIAAAgHAAAIBw
+ AAAAcAAAAPgAAAD4AAD///////////////8=
+</value>
+ </data>
+</root>
\ No newline at end of file
diff --git a/VECTO/GUI/IHPCForm.vb b/VECTO/GUI/IHPCForm.vb
new file mode 100644
index 0000000000000000000000000000000000000000..d9d8ccc1e855018384985bd4741b50b9ed7bdad5
--- /dev/null
+++ b/VECTO/GUI/IHPCForm.vb
@@ -0,0 +1,644 @@
+Imports System.IO
+Imports TUGraz.VECTO.Input_Files
+Imports TUGraz.VectoCommon.InputData
+Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.InputData.FileIO.JSON
+
+Public Class IHPCForm
+
+ Public JobDir As String = ""
+ Private _ihpcFilePath as String = ""
+ Private _changed as Boolean
+ Private _dragCurveFilePath as String
+ Private _flCurveFilePath1 as String
+ Private _flCurveFilePath2 as String
+
+ Private _contextMenuFiles As String()
+
+ Public AutoSendTo As action(of string, VehicleForm)
+
+#Region "Set JSON Data"
+
+ Public Sub ReadIHPCFile(file As String)
+ Dim ihpcData = JSONInputDataFactory.ReadIHPCEngineeringInputData(file, True)
+ _ihpcFilePath = file
+ tbModel.Text = ihpcData.Model
+ tbInertia.Text = ihpcData.Inertia.ToGUIFormat()
+ tbThermalOverload.Text = ihpcData.OverloadRecoveryFactor.ToGUIFormat()
+ tbDragCurve.Text = GetRelativePath(ihpcData.DragCurve.Source, Path.GetDirectoryName(_ihpcFilePath))
+
+ SetVoltageLevelLow(ihpcData.VoltageLevels.First())
+ SetVoltageLevelHigh(ihpcData.VoltageLevels.Last())
+
+ LbStatus.Text = ""
+ _changed = False
+ End Sub
+
+ Private Sub SetVoltageLevelLow(voltageLevel as IElectricMotorVoltageLevel)
+
+ tbVoltage1.Text = voltageLevel.VoltageLevel.ToGUIFormat()
+ tbContinuousTorque1.Text = voltageLevel.ContinuousTorque.ToGUIFormat()
+ tbContinuousTorqueSpeed1.Text = voltageLevel.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
+ tbOverloadTime1.Text = voltageLevel.OverloadTime.ToGUIFormat()
+ tbOverloadTorque1.Text = voltageLevel.OverloadTorque.ToGUIFormat()
+ tbOverloadTorqueSpeed1.Text = voltageLevel.OverloadTestSpeed.AsRPM.ToGUIFormat()
+ tbFLCurve1.Text = GetRelativePath(voltageLevel.FullLoadCurve.Source, path.GetDirectoryName(_ihpcFilePath))
+ SetPowerMapEntries(_lvPowerMap1, voltageLevel.PowerMap)
+
+ End Sub
+
+ Private Sub SetVoltageLevelHigh(voltageLevel as IElectricMotorVoltageLevel)
+
+ tbVoltage2.Text = voltageLevel.VoltageLevel.ToGUIFormat()
+ tbContinuousTorque2.Text = voltageLevel.ContinuousTorque.ToGUIFormat()
+ tbContinuousTorqueSpeed2.Text = voltageLevel.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
+ tbOverloadTime2.Text = voltageLevel.OverloadTime.ToGUIFormat()
+ tbOverloadTorque2.Text = voltageLevel.OverloadTorque.ToGUIFormat()
+ tbOverloadTorqueSpeed2.Text = voltageLevel.OverloadTestSpeed.AsRPM.ToGUIFormat()
+ tbFLCurve2.Text = GetRelativePath(voltageLevel.FullLoadCurve.Source, Path.GetDirectoryName(_ihpcFilePath))
+ SetPowerMapEntries(_lvPowerMap2, voltageLevel.PowerMap)
+
+ End Sub
+
+ Private Sub SetPowerMapEntries(powerMapListView As ListView, entries As IList(Of IElectricMotorPowerMap))
+ For Each entry As IElectricMotorPowerMap In entries.OrderBy(Function(x) x.Gear)
+ Dim listEntry = CreateListViewItem(entry.Gear, entry.PowerMap.Source)
+ powerMapListView.Items.Add(listEntry)
+ Next
+ End Sub
+
+ Private Function CreateListViewItem(axleNumber As Integer, filepath As String) As ListViewItem
+ Dim retVal As New ListViewItem
+ retVal.SubItems(0).Text = axleNumber.ToGUIFormat()
+ retVal.SubItems.Add(GetRelativePath(filepath, GetPath(_ihpcFilePath)))
+ Return retVal
+ End Function
+
+#End Region
+
+ Public Sub ClearIHPC()
+
+ tbModel.Text = ""
+ tbInertia.Text = ""
+ tbThermalOverload.Text = ""
+ tbDragCurve.Text = ""
+
+ tbVoltage1.Text = ""
+ tbContinuousTorque1.Text = ""
+ tbContinuousTorqueSpeed1.Text = ""
+ tbOverloadTime1.Text = ""
+ tbOverloadTorque1.Text = ""
+ tbOverloadTorqueSpeed1.Text = ""
+ tbFLCurve1.Text = ""
+ RemoveAllListViewItems(_lvPowerMap1)
+
+ tbVoltage2.Text = ""
+ tbContinuousTorque2.Text = ""
+ tbContinuousTorqueSpeed2.Text = ""
+ tbOverloadTime2.Text = ""
+ tbOverloadTorque2.Text = ""
+ tbOverloadTorqueSpeed2.Text = ""
+ tbFLCurve2.Text = ""
+ RemoveAllListViewItems(_lvPowerMap2)
+
+ LbStatus.Text = ""
+ _changed = False
+
+ End Sub
+
+ Private Sub RemoveAllListViewItems(listView As ListView)
+ If listView.Items.Count = 0 Then
+ Exit Sub
+ Else
+ For Each listItem As ListViewItem In listView.Items
+ listItem.Remove()
+ Next
+ End If
+ End Sub
+
+#Region "Events"
+
+ Private Sub btDragCurve_Click(sender As Object, e As EventArgs) Handles btDragCurve.Click
+ If IHPCDragCurveFileBrowser.OpenDialog(FileRepl(tbDragCurve.Text, GetPath(_ihpcFilePath)))
+ _tbDragCurve.Text = GetFilenameWithoutDirectory(IHPCDragCurveFileBrowser.Files(0), GetPath(_ihpcFilePath))
+ End If
+ End Sub
+
+ Private Sub btFLCurveFile1_Click(sender As Object, e As EventArgs) Handles btFLCurveFile1.Click
+ If IHPCFullLoadCurveFileBrowser.OpenDialog(FileRepl(tbFLCurve1.Text, GetPath(_ihpcFilePath)))
+ _tbFLCurve1.Text = GetFilenameWithoutDirectory(IHPCFullLoadCurveFileBrowser.Files(0), GetPath(_ihpcFilePath))
+ End If
+ End Sub
+
+ Private Sub btFLCurveFile2_Click(sender As Object, e As EventArgs) Handles btFLCurveFile2.Click
+ If IHPCFullLoadCurveFileBrowser.OpenDialog(FileRepl(tbFLCurve2.Text, GetPath(_ihpcFilePath)))
+ _tbFLCurve2.Text = GetFilenameWithoutDirectory(IHPCFullLoadCurveFileBrowser.Files(0), GetPath(_ihpcFilePath))
+ End If
+ End Sub
+
+ Private Sub btAddPowerMap1_Click(sender As Object, e As EventArgs) Handles btAddPowerMap1.Click
+ AddListViewItem(lvPowerMap1)
+ End Sub
+
+ Private Sub btAddPowerMap2_Click(sender As Object, e As EventArgs) Handles btAddPowerMap2.Click
+ AddListViewItem(lvPowerMap2)
+ End Sub
+
+ Private Sub AddListViewItem(listView As ListView)
+ IHPCPowerMapInputDialog.Clear()
+ dim gear = listView.Items.Count + 1
+ IHPCPowerMapInputDialog.tbGear.Text = gear.ToString()
+
+ If IHPCPowerMapInputDialog.ShowDialog() = DialogResult.OK Then
+ Dim filePath = IHPCPowerMapInputDialog.tbInputFile.Text
+ listView.Items.Add(CreateListViewItem(gear, filePath))
+ if (listView.Equals(lvPowerMap1)) Then
+ lvPowerMap2.Items.Add(CreateListViewItem(gear, ""))
+ End If
+ if (listView.Equals(_lvPowerMap2)) Then
+ lvPowerMap1.Items.Add(CreateListViewItem(gear, ""))
+ End If
+ Change()
+ End If
+ End Sub
+
+ Private Sub btRemovePowerMap1_Click(sender As Object, e As EventArgs) Handles btRemovePowerMap1.Click
+ RemoveListEntry(lvPowerMap1)
+ RemoveListEntry(lvPowerMap2)
+ End Sub
+
+ Private Sub btRemovePowerMap2_Click(sender As Object, e As EventArgs) Handles btRemovePowerMap2.Click
+ RemoveListEntry(lvPowerMap2)
+ RemoveListEntry(lvPowerMap1)
+ End Sub
+
+ Private Sub RemoveListEntry(listView As ListView)
+ If listView.Items.Count = 0 Then
+ Exit Sub
+ Else
+ listView.Items(listView.Items.Count - 1).Remove()
+ Change()
+ End If
+ End Sub
+
+ Private Sub lvPowerMap1_DoubleClick(sender As Object, e As EventArgs) Handles lvPowerMap1.DoubleClick
+ EditEntry(lvPowerMap1)
+ End Sub
+
+ Private Sub lvPowerMap2_DoubleClick(sender As Object, e As EventArgs) Handles lvPowerMap2.DoubleClick
+ EditEntry(lvPowerMap2)
+ End Sub
+
+ Private Sub EditEntry( listView As ListView)
+ If listView.SelectedItems.Count = 0 Then Exit Sub
+ Dim entry As ListViewItem = listView.SelectedItems(0)
+
+ IHPCPowerMapInputDialog.tbGear.Text = entry.SubItems(0).Text
+ IHPCPowerMapInputDialog.tbInputFile.Text = entry.SubItems(1).Text
+ IHPCPowerMapInputDialog.tbGear.Focus()
+ IHPCPowerMapInputDialog.IHPCPath = GetPath(_ihpcFilePath)
+
+ If IHPCPowerMapInputDialog.ShowDialog() = DialogResult.OK Then
+ entry.SubItems(0).Text = IHPCPowerMapInputDialog.tbGear.Text
+ entry.SubItems(1).Text = IHPCPowerMapInputDialog.tbInputFile.Text
+ End If
+
+ End Sub
+
+ Private Sub btSave_Click(sender As Object, e As EventArgs) Handles btSave.Click
+ If SaveOrSaveAs(False) Then Close()
+ End Sub
+
+ Private Sub btCancel_Click(sender As Object, e As EventArgs) Handles btCancel.Click
+ Close()
+ End Sub
+
+ Private Sub ToolStripBtNew_Click(sender As Object, e As EventArgs) Handles ToolStripBtNew.Click
+ ClearIHPC()
+ End Sub
+
+ Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click
+ If IHPCFileBrowser.OpenDialog(_ihpcFilePath) Then
+ Try
+ ReadIHPCFile(IHPCFileBrowser.Files(0))
+ Catch ex As Exception
+ MsgBox(ex.Message, MsgBoxStyle.OkOnly, $"Error loading IHPC(.{IHPCFileBrowser.Extensions}) File")
+ End Try
+ End If
+ End Sub
+ Private Sub ToolStripBtSave_Click(sender As Object, e As EventArgs) Handles ToolStripBtSave.Click
+ SaveOrSaveAs(False)
+ End Sub
+
+ Private Sub ToolStripBtSaveAs_Click(sender As Object, e As EventArgs) Handles ToolStripBtSaveAs.Click
+ SaveOrSaveAs(True)
+ End Sub
+ Private Sub ToolStripBtSendTo_Click(sender As Object, e As EventArgs) Handles ToolStripBtSendTo.Click
+ If ChangeCheckCancel() Then Exit Sub
+
+ If _ihpcFilePath= "" Then
+ If MsgBox("Save file now?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+ If Not SaveOrSaveAs(True) Then Exit Sub
+ Else
+ Exit Sub
+ End If
+ End If
+
+ If Not VectoJobForm.Visible Then
+ JobDir = ""
+ VectoJobForm.Show()
+ VectoJobForm.VectoNew()
+ Else
+ VectoJobForm.WindowState = FormWindowState.Normal
+ End If
+
+ VehicleForm.tbIHPCFilePath.Text = GetFilenameWithoutDirectory(_ihpcFilePath, JobDir)
+ End Sub
+
+
+ Private Function ChangeCheckCancel() As Boolean
+ If _changed Then
+ Select Case MsgBox("Save changes ?", MsgBoxStyle.YesNoCancel)
+ Case MsgBoxResult.Yes
+ Return Not SaveOrSaveAs(False)
+ Case MsgBoxResult.Cancel
+ Return True
+ Case Else
+ _changed = False
+ Return False
+ End Select
+ Else
+ Return False
+ End If
+ End Function
+
+
+ Private Function SaveOrSaveAs(ByVal saveAs As Boolean) As Boolean
+ If ValidateData() = False Then _
+ Return False
+
+ If _ihpcFilePath = "" Or saveAs Then
+ If IHPCFileBrowser.SaveDialog(_ihpcFilePath) Then
+ _ihpcFilePath = IHPCFileBrowser.Files(0)
+ Else
+ Return False
+ End If
+ End If
+ Return SaveIHPCToFile(_ihpcFilePath)
+ End Function
+
+ Private Function SaveIHPCToFile(ByVal ihpcFilePath As String) As Boolean
+ Dim ihpcInputData = New IHPCInputData(ihpcFilePath)
+
+ ihpcInputData.SetCommonEntries(tbModel.Text, tbInertia.Text, tbDragCurve.Text, tbThermalOverload.Text)
+ ihpcInputData.SetVoltageLevelEntries(tbVoltage1.Text, tbContinuousTorque1.Text, tbContinuousTorqueSpeed1.Text,
+ tbOverloadTime1.Text, tbOverloadTorque1.Text, tbOverloadTorqueSpeed1.Text,
+ tbFLCurve1.Text, lvPowerMap1)
+ ihpcInputData.SetVoltageLevelEntries(tbVoltage2.Text, tbContinuousTorque2.Text, tbContinuousTorqueSpeed2.Text,
+ tbOverloadTime2.Text, tbOverloadTorque2.Text, tbOverloadTorqueSpeed2.Text,
+ tbFLCurve2.Text, lvPowerMap2)
+
+
+ If Not ihpcInputData.SaveFile() Then
+ MsgBox("Cannot save to " & ihpcFilePath, MsgBoxStyle.Critical)
+ Return False
+ End If
+
+ If not AutoSendTo is nothing Then
+ If VehicleForm.Visible Then
+ AutoSendTo(ihpcFilePath, VehicleForm)
+ End If
+ End If
+
+ _changed = False
+ LbStatus.Text = ""
+
+ Return True
+ End Function
+
+
+#End Region
+
+#Region "Validation"
+
+ Private Function ValidateData() As Boolean
+
+ If ValidateModel() = False Then Return False
+ If ValidateInertia() = False Then Return False
+ If ValidateThermalOverloadFactor() = False Then Return False
+ If ValidateDragCurve() = False Then Return False
+
+ If ValidateVoltage(tbVoltage1) = False Then Return False
+ If ValidateContinuousTorque(tbContinuousTorque1) = False Then Return False
+ If ValidateContinuousTorqueSpeed(tbContinuousTorqueSpeed1) = False Then Return False
+ If ValidateOverloadTime(tbOverloadTime1) = False Then Return False
+ If ValidateOverloadTorque(tbOverloadTime1) = False Then Return False
+ If ValidateOverloadTorqueSpeed(tbOverloadTorqueSpeed1) = False Then Return False
+ If ValidateFullLoadCurve(tbFLCurve1) = False Then Return False
+ If ValidatePowerMapEntry(lvPowerMap1) = False Then Return False
+
+ If ValidateVoltage(tbVoltage2) = False Then Return False
+ If ValidateContinuousTorque(tbContinuousTorque2) = False Then Return False
+ If ValidateContinuousTorqueSpeed(tbContinuousTorqueSpeed2) = False Then Return False
+ If ValidateOverloadTime(tbOverloadTime2) = False Then Return False
+ If ValidateOverloadTorque(tbOverloadTime2) = False Then Return False
+ If ValidateOverloadTorqueSpeed(tbOverloadTorqueSpeed2) = False Then Return False
+ If ValidateFullLoadCurve(tbFLCurve2) = False Then Return False
+ If ValidatePowerMapEntry(lvPowerMap2) = False Then Return False
+
+ Return True
+ End Function
+
+ Private Function ValidateModel() As Boolean
+ If String.IsNullOrEmpty(tbModel.Text) Then
+ ShowErrorMessageBox("Model", tbModel)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateInertia() As Boolean
+ If Not ValidDoubleValue(tbInertia.Text) Then
+ ShowErrorMessageBox("Inertia", tbInertia)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateThermalOverloadFactor() As Boolean
+ If Not ValidDoubleValue(tbThermalOverload.Text) Then
+ ShowErrorMessageBox("Thermal Overload Recovery Factor", tbThermalOverload)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateDragCurve() As Boolean
+ dim tmp = new SubPath()
+ tmp.Init(GetPath(_ihpcFilePath), tbDragCurve.Text)
+ If Not File.Exists(tmp.FullPath) Then
+ ShowErrorMessageBox("No valid Drag Curve file path given", tbDragCurve, False)
+ Return False
+ End If
+
+ Dim fileExtension = new FileInfo(tbDragCurve.Text).Extension
+ If Not $".{IHPCDragCurveFileBrowser.Extensions.First()}" = fileExtension Then
+ ShowErrorMessageBox($"The selected Drag Curve file(.{IHPCDragCurveFileBrowser.Extensions.First()}) has the wrong extension",
+ tbDragCurve, False)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateVoltage(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Voltage", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateContinuousTorque(tb As TextBox) as Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Continuous Torque", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateContinuousTorqueSpeed(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Continuous Torque Speed", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateOverloadTime(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Overload Time", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateOverloadTorque(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Overload Torque", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateOverloadTorqueSpeed(tb As TextBox) As Boolean
+ If Not ValidDoubleValue(tb.Text) Then
+ ShowErrorMessageBox("Overload Torque Speed", tb)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidateFullLoadCurve(tb As TextBox) As Boolean
+ dim tmp = new SubPath()
+ tmp.Init(GetPath(_ihpcFilePath), tb.Text)
+ If Not File.Exists(tmp.FullPath) Then
+ ShowErrorMessageBox("No valid Full Load Curve file path given", tb, False)
+ Return False
+ End If
+
+ Dim fileExtension = new FileInfo(tb.Text).Extension
+ If Not $".{IHPCFullLoadCurveFileBrowser.Extensions.First()}" = fileExtension Then
+ ShowErrorMessageBox($"The selected Full Load file(.{IHPCFullLoadCurveFileBrowser.Extensions.First()}) has the wrong extension",
+ tb, False)
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidatePowerMapEntry(tb As ListView) As Boolean
+ If tb.Items.Count = 0 Then
+ ShowErrorMessageBox("Invalid input missing Power Map files")
+ Return False
+ End If
+ Return True
+ End Function
+
+ Private Function ValidDoubleValue(value As string) As Boolean
+ If String.IsNullOrEmpty(value)
+ Return false
+ End If
+ Return IsNumeric(value)
+ End Function
+
+
+ Private Sub ShowErrorMessageBox(message As string, textbox As TextBox, Optional defaultMessage As Boolean = True)
+ If Not message = Nothing And defaultMessage Then
+ MsgBox($"Invalid input for {message}")
+ textbox.Focus()
+ Return
+ Else
+ MsgBox($"{message}")
+ textbox.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub ShowErrorMessageBox(message As string)
+ If Not message = Nothing Then
+ MsgBox($"{message}")
+ Return
+ End If
+ End Sub
+
+#End Region
+
+#Region "Track Changes"
+
+ Private Sub Change()
+ If Not _changed Then
+ LbStatus.Text = "Unsaved changes in current file"
+ _changed = True
+ End If
+ End Sub
+
+ Private Sub tbModel_TextChanged(sender As Object, e As EventArgs) Handles tbModel.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbInertia_TextChanged(sender As Object, e As EventArgs) Handles tbInertia.TextChanged
+ Change()
+ End Sub
+ Private Sub tbThermalOverload_TextChanged(sender As Object, e As EventArgs) Handles tbThermalOverload.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbDragCurve_TextChanged(sender As Object, e As EventArgs) Handles tbDragCurve.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbVoltage1_TextChanged(sender As Object, e As EventArgs) Handles tbVoltage1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinuousTorque1_TextChanged(sender As Object, e As EventArgs) Handles tbContinuousTorque1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinuousTorqueSpeed1_TextChanged(sender As Object, e As EventArgs) Handles tbContinuousTorqueSpeed1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTime1_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTime1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTorque1_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTorque1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTorqueSpeed1_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTorqueSpeed1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbFLCurve1_TextChanged(sender As Object, e As EventArgs) Handles tbFLCurve1.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbVoltage2_TextChanged(sender As Object, e As EventArgs) Handles tbVoltage2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinuousTorque2_TextChanged(sender As Object, e As EventArgs) Handles tbContinuousTorque2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbContinuousTorqueSpeed2_TextChanged(sender As Object, e As EventArgs) Handles tbContinuousTorqueSpeed2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbFLCurve2_TextChanged(sender As Object, e As EventArgs) Handles tbFLCurve2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTime2_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTime2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTorque2_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTorque2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub tbOverloadTorqueSpeed2_TextChanged(sender As Object, e As EventArgs) Handles tbOverloadTorqueSpeed2.TextChanged
+ Change()
+ End Sub
+
+ Private Sub IHPCForm_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
+ If e.CloseReason <> CloseReason.ApplicationExitCall And e.CloseReason <> CloseReason.WindowsShutDown Then
+ e.Cancel = ChangeCheckCancel()
+ End If
+ End Sub
+
+ Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+ If File.Exists(Path.Combine(MyAppPath, "User Manual\help.html")) Then
+ Dim defaultBrowserPath As String = BrowserUtils.GetDefaultBrowserPath()
+ Process.Start(defaultBrowserPath,
+ $"""file://{Path.Combine(MyAppPath, "User Manual\help.html#ihpc-editor")}""")
+ Else
+ MsgBox("User Manual not found!", MsgBoxStyle.Critical)
+ End If
+ End Sub
+ Private Sub btDragCurveOpen_Click(sender As Object, e As EventArgs) Handles btDragCurveOpen.Click
+ Dim theFile = FileRepl(tbDragCurve.Text, GetPath(_ihpcFilePath))
+
+ If theFile <> NoFile AndAlso File.Exists(theFile) Then
+ OpenFiles(theFile)
+ End If
+ End Sub
+
+ Private Sub btFLCurve1_Click(sender As Object, e As EventArgs) Handles btFLCurve1.Click
+ Dim theFile = FileRepl(tbFLCurve1.Text, GetPath(_ihpcFilePath))
+
+ If theFile <> NoFile AndAlso File.Exists(theFile) Then
+ OpenFiles(theFile)
+ End If
+ End Sub
+
+ Private Sub btFLCurve2_Click(sender As Object, e As EventArgs) Handles btFLCurve2.Click
+ Dim theFile = FileRepl(tbFLCurve1.Text, GetPath(_ihpcFilePath))
+
+ If theFile <> NoFile AndAlso File.Exists(theFile) Then
+ OpenFiles(theFile)
+ End If
+ End Sub
+
+
+ Private Sub OpenFiles(ParamArray files() As String)
+
+ If files.Length = 0 Then Exit Sub
+
+ _contextMenuFiles = files
+
+ OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
+
+ CmOpenFile.Show(Windows.Forms.Cursor.Position)
+ End Sub
+
+ Private Sub OpenWithToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OpenWithToolStripMenuItem.Click
+ If Not FileOpenAlt(_contextMenuFiles(0)) Then MsgBox("Failed to open file!")
+ End Sub
+
+ Private Sub ShowInFolderToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ShowInFolderToolStripMenuItem.Click
+
+ If File.Exists(_contextMenuFiles(0)) Then
+ Try
+ Process.Start("explorer", "/select,""" & _contextMenuFiles(0) & "")
+ Catch ex As Exception
+ MsgBox("Failed to open file!")
+ End Try
+ Else
+ MsgBox("File not found!")
+ End If
+ End Sub
+
+#End Region
+End Class
\ No newline at end of file
diff --git a/VECTO/GUI/IHPCPowerMapInputDialog.Designer.vb b/VECTO/GUI/IHPCPowerMapInputDialog.Designer.vb
new file mode 100644
index 0000000000000000000000000000000000000000..64304f84cbcbed7b42256b3d59dbe18f8644ddb6
--- /dev/null
+++ b/VECTO/GUI/IHPCPowerMapInputDialog.Designer.vb
@@ -0,0 +1,197 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class IHPCPowerMapInputDialog
+ Inherits System.Windows.Forms.Form
+
+ 'Form overrides dispose to clean up the component list.
+ <System.Diagnostics.DebuggerNonUserCode()> _
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ Try
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ Finally
+ MyBase.Dispose(disposing)
+ End Try
+ End Sub
+
+ 'Required by the Windows Form Designer
+ Private components As System.ComponentModel.IContainer
+
+ 'NOTE: The following procedure is required by the Windows Form Designer
+ 'It can be modified using the Windows Form Designer.
+ 'Do not modify it using the code editor.
+ <System.Diagnostics.DebuggerStepThrough()> _
+ Private Sub InitializeComponent()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(IHPCPowerMapInputDialog))
+ Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.TableLayoutPanel4 = New System.Windows.Forms.TableLayoutPanel()
+ Me.tbGear = New System.Windows.Forms.TextBox()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.TableLayoutPanel5 = New System.Windows.Forms.TableLayoutPanel()
+ Me.btAddFilePath = New System.Windows.Forms.Button()
+ Me.tbInputFile = New System.Windows.Forms.TextBox()
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.btAddInput = New System.Windows.Forms.Button()
+ Me.btCancel = New System.Windows.Forms.Button()
+ Me.FlowLayoutPanel1.SuspendLayout
+ Me.TableLayoutPanel4.SuspendLayout
+ Me.TableLayoutPanel5.SuspendLayout
+ Me.TableLayoutPanel1.SuspendLayout
+ Me.SuspendLayout
+ '
+ 'FlowLayoutPanel1
+ '
+ Me.FlowLayoutPanel1.Controls.Add(Me.TableLayoutPanel4)
+ Me.FlowLayoutPanel1.Controls.Add(Me.TableLayoutPanel5)
+ Me.FlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(0, 0)
+ Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(762, 69)
+ Me.FlowLayoutPanel1.TabIndex = 11
+ '
+ 'TableLayoutPanel4
+ '
+ Me.TableLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel4.ColumnCount = 2
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.8!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 67.2!))
+ Me.TableLayoutPanel4.Controls.Add(Me.tbGear, 1, 0)
+ Me.TableLayoutPanel4.Controls.Add(Me.Label3, 0, 0)
+ Me.TableLayoutPanel4.Location = New System.Drawing.Point(9, 13)
+ Me.TableLayoutPanel4.Margin = New System.Windows.Forms.Padding(9, 5, 4, 5)
+ Me.TableLayoutPanel4.Name = "TableLayoutPanel4"
+ Me.TableLayoutPanel4.RowCount = 1
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel4.Size = New System.Drawing.Size(192, 43)
+ Me.TableLayoutPanel4.TabIndex = 10
+ '
+ 'tbGear
+ '
+ Me.tbGear.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbGear.Location = New System.Drawing.Point(70, 8)
+ Me.tbGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbGear.Name = "tbGear"
+ Me.tbGear.ReadOnly = true
+ Me.tbGear.Size = New System.Drawing.Size(114, 26)
+ Me.tbGear.TabIndex = 1
+ '
+ 'Label3
+ '
+ Me.Label3.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(8, 11)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(45, 20)
+ Me.Label3.TabIndex = 9
+ Me.Label3.Text = "Gear"
+ '
+ 'TableLayoutPanel5
+ '
+ Me.TableLayoutPanel5.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.TableLayoutPanel5.ColumnCount = 2
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 474!))
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 60!))
+ Me.TableLayoutPanel5.Controls.Add(Me.btAddFilePath, 1, 0)
+ Me.TableLayoutPanel5.Controls.Add(Me.tbInputFile, 0, 0)
+ Me.TableLayoutPanel5.Location = New System.Drawing.Point(209, 5)
+ Me.TableLayoutPanel5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TableLayoutPanel5.Name = "TableLayoutPanel5"
+ Me.TableLayoutPanel5.RowCount = 1
+ Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100!))
+ Me.TableLayoutPanel5.Size = New System.Drawing.Size(534, 60)
+ Me.TableLayoutPanel5.TabIndex = 11
+ '
+ 'btAddFilePath
+ '
+ Me.btAddFilePath.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btAddFilePath.Image = CType(resources.GetObject("btAddFilePath.Image"),System.Drawing.Image)
+ Me.btAddFilePath.Location = New System.Drawing.Point(486, 10)
+ Me.btAddFilePath.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btAddFilePath.Name = "btAddFilePath"
+ Me.btAddFilePath.Size = New System.Drawing.Size(36, 40)
+ Me.btAddFilePath.TabIndex = 13
+ Me.btAddFilePath.UseVisualStyleBackColor = true
+ '
+ 'tbInputFile
+ '
+ Me.tbInputFile.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.tbInputFile.Location = New System.Drawing.Point(4, 17)
+ Me.tbInputFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbInputFile.Name = "tbInputFile"
+ Me.tbInputFile.Size = New System.Drawing.Size(466, 26)
+ Me.tbInputFile.TabIndex = 12
+ '
+ 'TableLayoutPanel1
+ '
+ Me.TableLayoutPanel1.ColumnCount = 2
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.Controls.Add(Me.btAddInput, 0, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.btCancel, 1, 0)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(522, 78)
+ Me.TableLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+ Me.TableLayoutPanel1.RowCount = 1
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(222, 45)
+ Me.TableLayoutPanel1.TabIndex = 12
+ '
+ 'btAddInput
+ '
+ Me.btAddInput.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btAddInput.Location = New System.Drawing.Point(5, 5)
+ Me.btAddInput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btAddInput.Name = "btAddInput"
+ Me.btAddInput.Size = New System.Drawing.Size(100, 35)
+ Me.btAddInput.TabIndex = 14
+ Me.btAddInput.Text = "OK"
+ '
+ 'btCancel
+ '
+ Me.btCancel.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.btCancel.Location = New System.Drawing.Point(116, 5)
+ Me.btCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btCancel.Name = "btCancel"
+ Me.btCancel.Size = New System.Drawing.Size(100, 35)
+ Me.btCancel.TabIndex = 15
+ Me.btCancel.Text = "Cancel"
+ '
+ 'IHPCPowerMapInputDialog
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(762, 131)
+ Me.Controls.Add(Me.TableLayoutPanel1)
+ Me.Controls.Add(Me.FlowLayoutPanel1)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+ Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.MaximizeBox = false
+ Me.MinimizeBox = false
+ Me.Name = "IHPCPowerMapInputDialog"
+ Me.ShowInTaskbar = false
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "Power Map"
+ Me.FlowLayoutPanel1.ResumeLayout(false)
+ Me.TableLayoutPanel4.ResumeLayout(false)
+ Me.TableLayoutPanel4.PerformLayout
+ Me.TableLayoutPanel5.ResumeLayout(false)
+ Me.TableLayoutPanel5.PerformLayout
+ Me.TableLayoutPanel1.ResumeLayout(false)
+ Me.ResumeLayout(false)
+
+End Sub
+
+ Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
+ Friend WithEvents TableLayoutPanel4 As TableLayoutPanel
+ Friend WithEvents tbGear As TextBox
+ Friend WithEvents Label3 As Label
+ Friend WithEvents TableLayoutPanel5 As TableLayoutPanel
+ Friend WithEvents btAddFilePath As Button
+ Friend WithEvents tbInputFile As TextBox
+ Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
+ Friend WithEvents btAddInput As Button
+ Friend WithEvents btCancel As Button
+End Class
diff --git a/VECTO/GUI/IHPCPowerMapInputDialog.resx b/VECTO/GUI/IHPCPowerMapInputDialog.resx
new file mode 100644
index 0000000000000000000000000000000000000000..d7df802e6a121253252b1d61a2a6a094ca6be3eb
--- /dev/null
+++ b/VECTO/GUI/IHPCPowerMapInputDialog.resx
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btAddFilePath.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
+ zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
+ 0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
+ c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
+ qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
+ GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
+ 1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
+ gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
+ TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
+ W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
+ MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
+ IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
+ eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
+</value>
+ </data>
+</root>
\ No newline at end of file
diff --git a/VECTO/GUI/IHPCPowerMapInputDialog.vb b/VECTO/GUI/IHPCPowerMapInputDialog.vb
new file mode 100644
index 0000000000000000000000000000000000000000..5dcd9d6958fa61d15a51893a55a7910619f31b46
--- /dev/null
+++ b/VECTO/GUI/IHPCPowerMapInputDialog.vb
@@ -0,0 +1,76 @@
+Imports System.IO
+Imports TUGraz.VECTO.Input_Files
+
+Public Class IHPCPowerMapInputDialog
+
+ Private _inputFilePath As String
+ Public IHPCPath As String
+
+ public Sub Clear()
+ _tbGear.Text = ""
+ _tbInputFile.Text = ""
+ _tbGear.Focus()
+ End Sub
+
+
+
+#Region "Events"
+
+ Private Sub btAddInput_Click(sender As Object, e As EventArgs) Handles btAddInput.Click
+ Dim gear As Integer
+ If Not Integer.TryParse(tbGear.Text, gear) Then
+ MsgBox("Invalid input for Gear")
+ _tbGear.Focus()
+ Return
+ End If
+
+ If gear < 0 Then
+ MsgBox("Invalid input for Gear")
+ _tbGear.Focus()
+ Return
+ End If
+
+ If tbInputFile.Text.Length = 0 Then
+ MsgBox("Invalid input no file path given")
+ _tbGear.Focus()
+ Return
+ End If
+
+ Dim tmp As SubPath = New SubPath()
+ tmp.Init(IHPCPath, tbInputFile.Text)
+ If Not File.Exists(tmp.FullPath) Then
+ MsgBox("Invalid input no valid file path given")
+ _tbInputFile.Focus()
+ Return
+ End If
+
+ Dim fileExtension = new FileInfo(tbInputFile.Text).Extension
+ If Not $".{IHPCPowerMapFileBrowser.Extensions.First()}" = fileExtension Then
+ MsgBox($"The selected Power Map file(.{IHPCPowerMapFileBrowser.Extensions.First()}) has the wrong file extension")
+ Return
+ End If
+
+ DialogResult = DialogResult.OK
+ Close()
+ End Sub
+
+ Private Sub btCancel_Click(sender As Object, e As EventArgs) Handles btCancel.Click
+ DialogResult = DialogResult.Cancel
+ Close()
+ Clear()
+ End Sub
+
+ Private Sub btAddFilePath_Click(sender As Object, e As EventArgs) Handles btAddFilePath.Click
+ If IHPCPowerMapFileBrowser.OpenDialog(FileRepl(tbInputFile.Text, IHPCPath))
+ tbInputFile.Text = GetFilenameWithoutDirectory(IHPCPowerMapFileBrowser.Files(0),IHPCPath)
+ End If
+ End Sub
+
+ Private Sub IHPCPowerMapInputDialog_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+ Show()
+ _tbGear.Focus()
+ End Sub
+
+#End Region
+
+End Class
\ No newline at end of file
diff --git a/VECTO/GUI/MainForm.Designer.vb b/VECTO/GUI/MainForm.Designer.vb
index 95deee0c5617c4d7bafb41a4e44d4fedebc0526b..af84f17fa96ca94f3c02e83fcbc5fba09272c236 100644
--- a/VECTO/GUI/MainForm.Designer.vb
+++ b/VECTO/GUI/MainForm.Designer.vb
@@ -96,8 +96,12 @@ Partial Class MainForm
Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
Me.ToolStripDrDnBtTools = New System.Windows.Forms.ToolStripDropDownButton()
Me.GENEditorToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+ Me.JobEditorSerialHybridVehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.JobEditorParallelHybridVehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.JobEditorBatteryElectricVehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.JobEditorIEPC_E_VehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.JobEditorIEPC_S_VehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.JobEditorIHPCVehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.JobEditorEngineOnlyModeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.EPTPJobEditorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.VEHEditorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -120,7 +124,6 @@ Partial Class MainForm
Me.OpenInGraphWindowToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
- Me.JobEditorSerialHybridVehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.StatusBAR.SuspendLayout
Me.TabControl1.SuspendLayout
Me.TabPageGEN.SuspendLayout
@@ -145,16 +148,17 @@ Partial Class MainForm
'
Me.StatusBAR.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusBAR.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLbStatus, Me.ToolStripProgBarJob, Me.ToolStripProgBarOverall})
- Me.StatusBAR.Location = New System.Drawing.Point(0, 648)
+ Me.StatusBAR.Location = New System.Drawing.Point(0, 1009)
Me.StatusBAR.Name = "StatusBAR"
- Me.StatusBAR.Size = New System.Drawing.Size(1045, 22)
+ Me.StatusBAR.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
+ Me.StatusBAR.Size = New System.Drawing.Size(1568, 22)
Me.StatusBAR.TabIndex = 7
Me.StatusBAR.Text = "StatusBAR"
'
'ToolStripLbStatus
'
Me.ToolStripLbStatus.Name = "ToolStripLbStatus"
- Me.ToolStripLbStatus.Size = New System.Drawing.Size(1030, 17)
+ Me.ToolStripLbStatus.Size = New System.Drawing.Size(1545, 17)
Me.ToolStripLbStatus.Spring = true
Me.ToolStripLbStatus.Text = "Status Text"
Me.ToolStripLbStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -164,7 +168,7 @@ Partial Class MainForm
Me.ToolStripProgBarJob.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
Me.ToolStripProgBarJob.AutoSize = false
Me.ToolStripProgBarJob.Name = "ToolStripProgBarJob"
- Me.ToolStripProgBarJob.Size = New System.Drawing.Size(100, 16)
+ Me.ToolStripProgBarJob.Size = New System.Drawing.Size(150, 25)
Me.ToolStripProgBarJob.Style = System.Windows.Forms.ProgressBarStyle.Continuous
Me.ToolStripProgBarJob.ToolTipText = "overall progress"
Me.ToolStripProgBarJob.Visible = false
@@ -174,7 +178,7 @@ Partial Class MainForm
Me.ToolStripProgBarOverall.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
Me.ToolStripProgBarOverall.AutoSize = false
Me.ToolStripProgBarOverall.Name = "ToolStripProgBarOverall"
- Me.ToolStripProgBarOverall.Size = New System.Drawing.Size(100, 16)
+ Me.ToolStripProgBarOverall.Size = New System.Drawing.Size(150, 25)
Me.ToolStripProgBarOverall.Style = System.Windows.Forms.ProgressBarStyle.Continuous
Me.ToolStripProgBarOverall.ToolTipText = "job progress"
Me.ToolStripProgBarOverall.Visible = false
@@ -184,12 +188,12 @@ Partial Class MainForm
Me.TabControl1.Controls.Add(Me.TabPageGEN)
Me.TabControl1.Controls.Add(Me.TabPgOptions)
Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill
- Me.TabControl1.Location = New System.Drawing.Point(3, 3)
+ Me.TabControl1.Location = New System.Drawing.Point(4, 5)
Me.TabControl1.Margin = New System.Windows.Forms.Padding(0)
Me.TabControl1.Name = "TabControl1"
Me.TabControl1.Padding = New System.Drawing.Point(0, 0)
Me.TabControl1.SelectedIndex = 0
- Me.TabControl1.Size = New System.Drawing.Size(1042, 327)
+ Me.TabControl1.Size = New System.Drawing.Size(1564, 502)
Me.TabControl1.TabIndex = 10
'
'TabPageGEN
@@ -206,10 +210,10 @@ Partial Class MainForm
Me.TabPageGEN.Controls.Add(Me.LvGEN)
Me.TabPageGEN.Controls.Add(Me.ButtonGENremove)
Me.TabPageGEN.Controls.Add(Me.ButtonGENadd)
- Me.TabPageGEN.Location = New System.Drawing.Point(4, 22)
+ Me.TabPageGEN.Location = New System.Drawing.Point(4, 29)
Me.TabPageGEN.Margin = New System.Windows.Forms.Padding(0)
Me.TabPageGEN.Name = "TabPageGEN"
- Me.TabPageGEN.Size = New System.Drawing.Size(1034, 301)
+ Me.TabPageGEN.Size = New System.Drawing.Size(1556, 469)
Me.TabPageGEN.TabIndex = 0
Me.TabPageGEN.Text = "Job Files"
Me.TabPageGEN.UseVisualStyleBackColor = true
@@ -217,9 +221,10 @@ Partial Class MainForm
'btnImportXML
'
Me.btnImportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.btnImportXML.Location = New System.Drawing.Point(460, 263)
+ Me.btnImportXML.Location = New System.Drawing.Point(690, 393)
+ Me.btnImportXML.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnImportXML.Name = "btnImportXML"
- Me.btnImportXML.Size = New System.Drawing.Size(115, 30)
+ Me.btnImportXML.Size = New System.Drawing.Size(172, 46)
Me.btnImportXML.TabIndex = 23
Me.btnImportXML.Text = "Import from XML"
Me.btnImportXML.UseVisualStyleBackColor = true
@@ -229,9 +234,10 @@ Partial Class MainForm
'
Me.btnExportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.btnExportXML.Enabled = false
- Me.btnExportXML.Location = New System.Drawing.Point(344, 263)
+ Me.btnExportXML.Location = New System.Drawing.Point(516, 393)
+ Me.btnExportXML.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnExportXML.Name = "btnExportXML"
- Me.btnExportXML.Size = New System.Drawing.Size(115, 30)
+ Me.btnExportXML.Size = New System.Drawing.Size(172, 46)
Me.btnExportXML.TabIndex = 22
Me.btnExportXML.Text = "Export as XML"
Me.btnExportXML.UseVisualStyleBackColor = true
@@ -240,7 +246,8 @@ Partial Class MainForm
'
Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.Label6.AutoSize = true
- Me.Label6.Location = New System.Drawing.Point(814, 264)
+ Me.Label6.Location = New System.Drawing.Point(1222, 394)
+ Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label6.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(217, 13)
Me.Label6.TabIndex = 21
@@ -251,9 +258,10 @@ Partial Class MainForm
Me.btStartV3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
Me.btStartV3.Image = Global.TUGraz.VECTO.My.Resources.Resources.Play_icon
Me.btStartV3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btStartV3.Location = New System.Drawing.Point(3, 56)
+ Me.btStartV3.Location = New System.Drawing.Point(4, 86)
+ Me.btStartV3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btStartV3.Name = "btStartV3"
- Me.btStartV3.Size = New System.Drawing.Size(108, 50)
+ Me.btStartV3.Size = New System.Drawing.Size(162, 77)
Me.btStartV3.TabIndex = 20
Me.btStartV3.Text = "START"
Me.btStartV3.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
@@ -264,7 +272,8 @@ Partial Class MainForm
'
Me.LbDecl.AutoSize = true
Me.LbDecl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.LbDecl.Location = New System.Drawing.Point(5, 109)
+ Me.LbDecl.Location = New System.Drawing.Point(8, 168)
+ Me.LbDecl.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.LbDecl.Name = "LbDecl"
Me.LbDecl.Size = New System.Drawing.Size(107, 13)
Me.LbDecl.TabIndex = 19
@@ -274,9 +283,10 @@ Partial Class MainForm
'PictureBox1
'
Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"),System.Drawing.Image)
- Me.PictureBox1.Location = New System.Drawing.Point(3, 3)
+ Me.PictureBox1.Location = New System.Drawing.Point(4, 5)
+ Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(108, 47)
+ Me.PictureBox1.Size = New System.Drawing.Size(162, 72)
Me.PictureBox1.TabIndex = 18
Me.PictureBox1.TabStop = false
'
@@ -284,9 +294,10 @@ Partial Class MainForm
'
Me.BtGENdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.BtGENdown.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_arrow_down_icon
- Me.BtGENdown.Location = New System.Drawing.Point(307, 263)
+ Me.BtGENdown.Location = New System.Drawing.Point(460, 393)
+ Me.BtGENdown.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.BtGENdown.Name = "BtGENdown"
- Me.BtGENdown.Size = New System.Drawing.Size(30, 30)
+ Me.BtGENdown.Size = New System.Drawing.Size(45, 46)
Me.BtGENdown.TabIndex = 6
Me.ToolTip1.SetToolTip(Me.BtGENdown, "Move job down one row")
Me.BtGENdown.UseVisualStyleBackColor = true
@@ -295,9 +306,10 @@ Partial Class MainForm
'
Me.BtGENup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.BtGENup.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_arrow_up_icon
- Me.BtGENup.Location = New System.Drawing.Point(276, 263)
+ Me.BtGENup.Location = New System.Drawing.Point(414, 393)
+ Me.BtGENup.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.BtGENup.Name = "BtGENup"
- Me.BtGENup.Size = New System.Drawing.Size(30, 30)
+ Me.BtGENup.Size = New System.Drawing.Size(45, 46)
Me.BtGENup.TabIndex = 4
Me.ToolTip1.SetToolTip(Me.BtGENup, "Move job up one row")
Me.BtGENup.UseVisualStyleBackColor = true
@@ -306,7 +318,8 @@ Partial Class MainForm
'
Me.ChBoxAllGEN.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.ChBoxAllGEN.AutoSize = true
- Me.ChBoxAllGEN.Location = New System.Drawing.Point(195, 270)
+ Me.ChBoxAllGEN.Location = New System.Drawing.Point(292, 413)
+ Me.ChBoxAllGEN.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ChBoxAllGEN.Name = "ChBoxAllGEN"
Me.ChBoxAllGEN.Size = New System.Drawing.Size(70, 17)
Me.ChBoxAllGEN.TabIndex = 16
@@ -327,9 +340,10 @@ Partial Class MainForm
Me.LvGEN.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable
Me.LvGEN.HideSelection = false
Me.LvGEN.LabelEdit = true
- Me.LvGEN.Location = New System.Drawing.Point(114, 3)
+ Me.LvGEN.Location = New System.Drawing.Point(171, 5)
+ Me.LvGEN.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.LvGEN.Name = "LvGEN"
- Me.LvGEN.Size = New System.Drawing.Size(917, 259)
+ Me.LvGEN.Size = New System.Drawing.Size(1375, 385)
Me.LvGEN.TabIndex = 14
Me.LvGEN.UseCompatibleStateImageBehavior = false
Me.LvGEN.View = System.Windows.Forms.View.Details
@@ -349,9 +363,10 @@ Partial Class MainForm
Me.ButtonGENremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.ButtonGENremove.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
Me.ButtonGENremove.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.ButtonGENremove.Location = New System.Drawing.Point(147, 263)
+ Me.ButtonGENremove.Location = New System.Drawing.Point(220, 393)
+ Me.ButtonGENremove.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ButtonGENremove.Name = "ButtonGENremove"
- Me.ButtonGENremove.Size = New System.Drawing.Size(33, 30)
+ Me.ButtonGENremove.Size = New System.Drawing.Size(50, 46)
Me.ButtonGENremove.TabIndex = 2
Me.ToolTip1.SetToolTip(Me.ButtonGENremove, "Remove selected entries")
Me.ButtonGENremove.UseVisualStyleBackColor = true
@@ -361,9 +376,10 @@ Partial Class MainForm
Me.ButtonGENadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.ButtonGENadd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
Me.ButtonGENadd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.ButtonGENadd.Location = New System.Drawing.Point(113, 263)
+ Me.ButtonGENadd.Location = New System.Drawing.Point(170, 393)
+ Me.ButtonGENadd.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ButtonGENadd.Name = "ButtonGENadd"
- Me.ButtonGENadd.Size = New System.Drawing.Size(33, 30)
+ Me.ButtonGENadd.Size = New System.Drawing.Size(50, 46)
Me.ButtonGENadd.TabIndex = 1
Me.ToolTip1.SetToolTip(Me.ButtonGENadd, "Add Job File")
Me.ButtonGENadd.UseVisualStyleBackColor = true
@@ -371,10 +387,11 @@ Partial Class MainForm
'TabPgOptions
'
Me.TabPgOptions.Controls.Add(Me.PanelOptAllg)
- Me.TabPgOptions.Location = New System.Drawing.Point(4, 22)
+ Me.TabPgOptions.Location = New System.Drawing.Point(4, 29)
+ Me.TabPgOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TabPgOptions.Name = "TabPgOptions"
- Me.TabPgOptions.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
- Me.TabPgOptions.Size = New System.Drawing.Size(1035, 302)
+ Me.TabPgOptions.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TabPgOptions.Size = New System.Drawing.Size(1556, 469)
Me.TabPgOptions.TabIndex = 2
Me.TabPgOptions.Text = "Options"
Me.TabPgOptions.UseVisualStyleBackColor = true
@@ -386,9 +403,10 @@ Partial Class MainForm
Me.PanelOptAllg.Controls.Add(Me.GroupBox3)
Me.PanelOptAllg.Controls.Add(Me.GroupBox2)
Me.PanelOptAllg.Controls.Add(Me.GroupBox1)
- Me.PanelOptAllg.Location = New System.Drawing.Point(6, 6)
+ Me.PanelOptAllg.Location = New System.Drawing.Point(9, 9)
+ Me.PanelOptAllg.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.PanelOptAllg.Name = "PanelOptAllg"
- Me.PanelOptAllg.Size = New System.Drawing.Size(1022, 290)
+ Me.PanelOptAllg.Size = New System.Drawing.Size(1533, 446)
Me.PanelOptAllg.TabIndex = 0
'
'GroupBox5
@@ -398,19 +416,23 @@ Partial Class MainForm
Me.GroupBox5.Controls.Add(Me.tbMinSpeedLAC)
Me.GroupBox5.Controls.Add(Me.Label3)
Me.GroupBox5.Controls.Add(Me.Label2)
- Me.GroupBox5.Location = New System.Drawing.Point(183, 57)
+ Me.GroupBox5.Location = New System.Drawing.Point(274, 88)
+ Me.GroupBox5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.GroupBox5.Name = "GroupBox5"
- Me.GroupBox5.Size = New System.Drawing.Size(260, 100)
+ Me.GroupBox5.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox5.Size = New System.Drawing.Size(390, 154)
Me.GroupBox5.TabIndex = 20
Me.GroupBox5.TabStop = false
Me.GroupBox5.Text = "Look-Ahead Coasting Override"
+ Me.GroupBox5.Visible = false
'
'Label5
'
Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.Label5.Location = New System.Drawing.Point(7, 48)
+ Me.Label5.Location = New System.Drawing.Point(10, 74)
+ Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(247, 36)
+ Me.Label5.Size = New System.Drawing.Size(370, 55)
Me.Label5.TabIndex = 4
Me.Label5.Text = "Overrides Look-Ahead Coasting in declaration mode. Leave empty to use default beh"& _
"aviour."
@@ -418,22 +440,25 @@ Partial Class MainForm
'Label4
'
Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(10, 44)
+ Me.Label4.Location = New System.Drawing.Point(15, 68)
+ Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(0, 13)
Me.Label4.TabIndex = 3
'
'tbMinSpeedLAC
'
- Me.tbMinSpeedLAC.Location = New System.Drawing.Point(96, 17)
+ Me.tbMinSpeedLAC.Location = New System.Drawing.Point(144, 26)
+ Me.tbMinSpeedLAC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbMinSpeedLAC.Name = "tbMinSpeedLAC"
- Me.tbMinSpeedLAC.Size = New System.Drawing.Size(56, 20)
+ Me.tbMinSpeedLAC.Size = New System.Drawing.Size(82, 20)
Me.tbMinSpeedLAC.TabIndex = 2
'
'Label3
'
Me.Label3.AutoSize = true
- Me.Label3.Location = New System.Drawing.Point(158, 20)
+ Me.Label3.Location = New System.Drawing.Point(237, 31)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(38, 13)
Me.Label3.TabIndex = 1
@@ -442,7 +467,8 @@ Partial Class MainForm
'Label2
'
Me.Label2.AutoSize = true
- Me.Label2.Location = New System.Drawing.Point(7, 19)
+ Me.Label2.Location = New System.Drawing.Point(10, 29)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(61, 13)
Me.Label2.TabIndex = 1
@@ -452,9 +478,11 @@ Partial Class MainForm
'
Me.GroupBox4.Controls.Add(Me.BtTCfileBrowse)
Me.GroupBox4.Controls.Add(Me.tbOutputFolder)
- Me.GroupBox4.Location = New System.Drawing.Point(183, 4)
+ Me.GroupBox4.Location = New System.Drawing.Point(274, 6)
+ Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.GroupBox4.Name = "GroupBox4"
- Me.GroupBox4.Size = New System.Drawing.Size(260, 46)
+ Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox4.Size = New System.Drawing.Size(390, 71)
Me.GroupBox4.TabIndex = 19
Me.GroupBox4.TabStop = false
Me.GroupBox4.Text = "Output Directory"
@@ -462,18 +490,20 @@ Partial Class MainForm
'BtTCfileBrowse
'
Me.BtTCfileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtTCfileBrowse.Location = New System.Drawing.Point(227, 14)
+ Me.BtTCfileBrowse.Location = New System.Drawing.Point(340, 22)
+ Me.BtTCfileBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.BtTCfileBrowse.Name = "BtTCfileBrowse"
- Me.BtTCfileBrowse.Size = New System.Drawing.Size(24, 24)
+ Me.BtTCfileBrowse.Size = New System.Drawing.Size(36, 37)
Me.BtTCfileBrowse.TabIndex = 27
Me.BtTCfileBrowse.TabStop = false
Me.BtTCfileBrowse.UseVisualStyleBackColor = true
'
'tbOutputFolder
'
- Me.tbOutputFolder.Location = New System.Drawing.Point(6, 17)
+ Me.tbOutputFolder.Location = New System.Drawing.Point(9, 26)
+ Me.tbOutputFolder.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbOutputFolder.Name = "tbOutputFolder"
- Me.tbOutputFolder.Size = New System.Drawing.Size(215, 20)
+ Me.tbOutputFolder.Size = New System.Drawing.Size(320, 20)
Me.tbOutputFolder.TabIndex = 0
'
'GroupBox3
@@ -481,9 +511,11 @@ Partial Class MainForm
Me.GroupBox3.Controls.Add(Me.cbSaveVectoRunData)
Me.GroupBox3.Controls.Add(Me.cbActVmod)
Me.GroupBox3.Controls.Add(Me.cbValidateRunData)
- Me.GroupBox3.Location = New System.Drawing.Point(3, 177)
+ Me.GroupBox3.Location = New System.Drawing.Point(4, 272)
+ Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Size = New System.Drawing.Size(173, 110)
+ Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox3.Size = New System.Drawing.Size(260, 169)
Me.GroupBox3.TabIndex = 18
Me.GroupBox3.TabStop = false
Me.GroupBox3.Text = "Misc"
@@ -491,7 +523,8 @@ Partial Class MainForm
'cbSaveVectoRunData
'
Me.cbSaveVectoRunData.AutoSize = true
- Me.cbSaveVectoRunData.Location = New System.Drawing.Point(7, 86)
+ Me.cbSaveVectoRunData.Location = New System.Drawing.Point(10, 132)
+ Me.cbSaveVectoRunData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.cbSaveVectoRunData.Name = "cbSaveVectoRunData"
Me.cbSaveVectoRunData.Size = New System.Drawing.Size(166, 17)
Me.cbSaveVectoRunData.TabIndex = 19
@@ -500,9 +533,10 @@ Partial Class MainForm
'
'cbActVmod
'
- Me.cbActVmod.Location = New System.Drawing.Point(6, 34)
+ Me.cbActVmod.Location = New System.Drawing.Point(9, 52)
+ Me.cbActVmod.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.cbActVmod.Name = "cbActVmod"
- Me.cbActVmod.Size = New System.Drawing.Size(167, 52)
+ Me.cbActVmod.Size = New System.Drawing.Size(250, 80)
Me.cbActVmod.TabIndex = 18
Me.cbActVmod.Text = "Output values in vmod at beginning and end of simulation interval (EXPERT!)"
Me.cbActVmod.UseVisualStyleBackColor = true
@@ -512,7 +546,8 @@ Partial Class MainForm
Me.cbValidateRunData.AutoSize = true
Me.cbValidateRunData.Checked = true
Me.cbValidateRunData.CheckState = System.Windows.Forms.CheckState.Checked
- Me.cbValidateRunData.Location = New System.Drawing.Point(6, 19)
+ Me.cbValidateRunData.Location = New System.Drawing.Point(9, 29)
+ Me.cbValidateRunData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.cbValidateRunData.Name = "cbValidateRunData"
Me.cbValidateRunData.Size = New System.Drawing.Size(90, 17)
Me.cbValidateRunData.TabIndex = 17
@@ -523,9 +558,11 @@ Partial Class MainForm
'
Me.GroupBox2.Controls.Add(Me.ChBoxModOut)
Me.GroupBox2.Controls.Add(Me.ChBoxMod1Hz)
- Me.GroupBox2.Location = New System.Drawing.Point(3, 82)
+ Me.GroupBox2.Location = New System.Drawing.Point(4, 126)
+ Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.GroupBox2.Name = "GroupBox2"
- Me.GroupBox2.Size = New System.Drawing.Size(173, 89)
+ Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox2.Size = New System.Drawing.Size(260, 137)
Me.GroupBox2.TabIndex = 16
Me.GroupBox2.TabStop = false
Me.GroupBox2.Text = "Output"
@@ -535,7 +572,8 @@ Partial Class MainForm
Me.ChBoxModOut.AutoSize = true
Me.ChBoxModOut.Checked = true
Me.ChBoxModOut.CheckState = System.Windows.Forms.CheckState.Checked
- Me.ChBoxModOut.Location = New System.Drawing.Point(6, 19)
+ Me.ChBoxModOut.Location = New System.Drawing.Point(9, 29)
+ Me.ChBoxModOut.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ChBoxModOut.Name = "ChBoxModOut"
Me.ChBoxModOut.Size = New System.Drawing.Size(115, 17)
Me.ChBoxModOut.TabIndex = 0
@@ -545,7 +583,8 @@ Partial Class MainForm
'ChBoxMod1Hz
'
Me.ChBoxMod1Hz.AutoSize = true
- Me.ChBoxMod1Hz.Location = New System.Drawing.Point(6, 42)
+ Me.ChBoxMod1Hz.Location = New System.Drawing.Point(9, 65)
+ Me.ChBoxMod1Hz.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ChBoxMod1Hz.Name = "ChBoxMod1Hz"
Me.ChBoxMod1Hz.Size = New System.Drawing.Size(121, 17)
Me.ChBoxMod1Hz.TabIndex = 16
@@ -556,9 +595,11 @@ Partial Class MainForm
'
Me.GroupBox1.Controls.Add(Me.RbDev)
Me.GroupBox1.Controls.Add(Me.RbDecl)
- Me.GroupBox1.Location = New System.Drawing.Point(3, 3)
+ Me.GroupBox1.Location = New System.Drawing.Point(4, 5)
+ Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(173, 72)
+ Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox1.Size = New System.Drawing.Size(260, 111)
Me.GroupBox1.TabIndex = 15
Me.GroupBox1.TabStop = false
Me.GroupBox1.Text = "Mode"
@@ -567,7 +608,8 @@ Partial Class MainForm
'
Me.RbDev.AutoSize = true
Me.RbDev.Checked = true
- Me.RbDev.Location = New System.Drawing.Point(6, 42)
+ Me.RbDev.Location = New System.Drawing.Point(9, 65)
+ Me.RbDev.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.RbDev.Name = "RbDev"
Me.RbDev.Size = New System.Drawing.Size(111, 17)
Me.RbDev.TabIndex = 1
@@ -578,7 +620,8 @@ Partial Class MainForm
'RbDecl
'
Me.RbDecl.AutoSize = true
- Me.RbDecl.Location = New System.Drawing.Point(6, 19)
+ Me.RbDecl.Location = New System.Drawing.Point(9, 29)
+ Me.RbDecl.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.RbDecl.Name = "RbDecl"
Me.RbDecl.Size = New System.Drawing.Size(109, 17)
Me.RbDecl.TabIndex = 0
@@ -639,7 +682,7 @@ Partial Class MainForm
Me.LvMsg.Location = New System.Drawing.Point(0, 0)
Me.LvMsg.Margin = New System.Windows.Forms.Padding(0)
Me.LvMsg.Name = "LvMsg"
- Me.LvMsg.Size = New System.Drawing.Size(1045, 282)
+ Me.LvMsg.Size = New System.Drawing.Size(1568, 435)
Me.LvMsg.TabIndex = 0
Me.LvMsg.UseCompatibleStateImageBehavior = false
Me.LvMsg.View = System.Windows.Forms.View.Details
@@ -664,7 +707,7 @@ Partial Class MainForm
Me.SplitContainer1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.SplitContainer1.Location = New System.Drawing.Point(0, 27)
+ Me.SplitContainer1.Location = New System.Drawing.Point(0, 42)
Me.SplitContainer1.Margin = New System.Windows.Forms.Padding(0)
Me.SplitContainer1.Name = "SplitContainer1"
Me.SplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal
@@ -672,13 +715,14 @@ Partial Class MainForm
'SplitContainer1.Panel1
'
Me.SplitContainer1.Panel1.Controls.Add(Me.TabControl1)
- Me.SplitContainer1.Panel1.Padding = New System.Windows.Forms.Padding(3, 3, 0, 2)
+ Me.SplitContainer1.Panel1.Padding = New System.Windows.Forms.Padding(4, 5, 0, 3)
'
'SplitContainer1.Panel2
'
Me.SplitContainer1.Panel2.Controls.Add(Me.LvMsg)
- Me.SplitContainer1.Size = New System.Drawing.Size(1045, 618)
- Me.SplitContainer1.SplitterDistance = 332
+ Me.SplitContainer1.Size = New System.Drawing.Size(1568, 951)
+ Me.SplitContainer1.SplitterDistance = 510
+ Me.SplitContainer1.SplitterWidth = 6
Me.SplitContainer1.TabIndex = 12
'
'ToolStrip1
@@ -689,7 +733,8 @@ Partial Class MainForm
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripSeparator2, Me.ToolStripDrDnBtTools, Me.ToolStripDrDnBtInfo})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New System.Drawing.Size(1045, 31)
+ Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1568, 31)
Me.ToolStrip1.TabIndex = 11
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -720,7 +765,7 @@ Partial Class MainForm
'
'ToolStripDrDnBtTools
'
- Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GENEditorToolStripMenuItem1, Me.JobEditorSerialHybridVehicleToolStripMenuItem, Me.JobEditorParallelHybridVehicleToolStripMenuItem, Me.JobEditorBatteryElectricVehicleToolStripMenuItem, Me.JobEditorEngineOnlyModeToolStripMenuItem, Me.EPTPJobEditorToolStripMenuItem, Me.VEHEditorToolStripMenuItem, Me.EngineEditorToolStripMenuItem, Me.GearboxEditorToolStripMenuItem, Me.GraphToolStripMenuItem, Me.ToolStripSeparator6, Me.OpenLogToolStripMenuItem, Me.SettingsToolStripMenuItem})
+ Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GENEditorToolStripMenuItem1, Me.JobEditorSerialHybridVehicleToolStripMenuItem, Me.JobEditorParallelHybridVehicleToolStripMenuItem, Me.JobEditorBatteryElectricVehicleToolStripMenuItem, Me.JobEditorIEPC_E_VehicleToolStripMenuItem, Me.JobEditorIEPC_S_VehicleToolStripMenuItem, Me.JobEditorIHPCVehicleToolStripMenuItem, Me.JobEditorEngineOnlyModeToolStripMenuItem, Me.EPTPJobEditorToolStripMenuItem, Me.VEHEditorToolStripMenuItem, Me.EngineEditorToolStripMenuItem, Me.GearboxEditorToolStripMenuItem, Me.GraphToolStripMenuItem, Me.ToolStripSeparator6, Me.OpenLogToolStripMenuItem, Me.SettingsToolStripMenuItem})
Me.ToolStripDrDnBtTools.Image = Global.TUGraz.VECTO.My.Resources.Resources.Misc_Tools_icon
Me.ToolStripDrDnBtTools.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripDrDnBtTools.Name = "ToolStripDrDnBtTools"
@@ -731,80 +776,108 @@ Partial Class MainForm
'
Me.GENEditorToolStripMenuItem1.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.GENEditorToolStripMenuItem1.Name = "GENEditorToolStripMenuItem1"
- Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(262, 30)
+ Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(263, 30)
Me.GENEditorToolStripMenuItem1.Text = "Job Editor - Conventional Vehicle"
'
+ 'JobEditorSerialHybridVehicleToolStripMenuItem
+ '
+ Me.JobEditorSerialHybridVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
+ Me.JobEditorSerialHybridVehicleToolStripMenuItem.Name = "JobEditorSerialHybridVehicleToolStripMenuItem"
+ Me.JobEditorSerialHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.JobEditorSerialHybridVehicleToolStripMenuItem.Text = "Job Editor - Serial Hybrid Vehicle"
+ '
'JobEditorParallelHybridVehicleToolStripMenuItem
'
Me.JobEditorParallelHybridVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorParallelHybridVehicleToolStripMenuItem.Name = "JobEditorParallelHybridVehicleToolStripMenuItem"
- Me.JobEditorParallelHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.JobEditorParallelHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
Me.JobEditorParallelHybridVehicleToolStripMenuItem.Text = "Job Editor - Parallel Hybrid Vehicle"
'
'JobEditorBatteryElectricVehicleToolStripMenuItem
'
Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Name = "JobEditorBatteryElectricVehicleToolStripMenuItem"
- Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
- Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Text = "JobEditor - Battery Electric Vehicle"
+ Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Text = "Job Editor - Battery Electric Vehicle"
+ '
+ 'JobEditorIEPC_E_VehicleToolStripMenuItem
+ '
+ Me.JobEditorIEPC_E_VehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
+ Me.JobEditorIEPC_E_VehicleToolStripMenuItem.Name = "JobEditorIEPC_E_VehicleToolStripMenuItem"
+ Me.JobEditorIEPC_E_VehicleToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.JobEditorIEPC_E_VehicleToolStripMenuItem.Text = "Job Editor - IEPC-E Vehicle"
+ '
+ 'JobEditorIEPC_S_VehicleToolStripMenuItem
+ '
+ Me.JobEditorIEPC_S_VehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
+ Me.JobEditorIEPC_S_VehicleToolStripMenuItem.Name = "JobEditorIEPC_S_VehicleToolStripMenuItem"
+ Me.JobEditorIEPC_S_VehicleToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.JobEditorIEPC_S_VehicleToolStripMenuItem.Text = "Job Editor - IEPC-S Vehicle"
+ '
+ 'JobEditorIHPCVehicleToolStripMenuItem
+ '
+ Me.JobEditorIHPCVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
+ Me.JobEditorIHPCVehicleToolStripMenuItem.Name = "JobEditorIHPCVehicleToolStripMenuItem"
+ Me.JobEditorIHPCVehicleToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.JobEditorIHPCVehicleToolStripMenuItem.Text = "Job Editor - IHPC Vehicle"
'
'JobEditorEngineOnlyModeToolStripMenuItem
'
Me.JobEditorEngineOnlyModeToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorEngineOnlyModeToolStripMenuItem.Name = "JobEditorEngineOnlyModeToolStripMenuItem"
- Me.JobEditorEngineOnlyModeToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.JobEditorEngineOnlyModeToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
Me.JobEditorEngineOnlyModeToolStripMenuItem.Text = "Job Editor - Engine Only Mode"
'
'EPTPJobEditorToolStripMenuItem
'
Me.EPTPJobEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.EPTPJobEditorToolStripMenuItem.Name = "EPTPJobEditorToolStripMenuItem"
- Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
Me.EPTPJobEditorToolStripMenuItem.Text = "VTP Job Editor"
'
'VEHEditorToolStripMenuItem
'
Me.VEHEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VEH
Me.VEHEditorToolStripMenuItem.Name = "VEHEditorToolStripMenuItem"
- Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
Me.VEHEditorToolStripMenuItem.Text = "Vehicle Editor"
'
'EngineEditorToolStripMenuItem
'
Me.EngineEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_ENG
Me.EngineEditorToolStripMenuItem.Name = "EngineEditorToolStripMenuItem"
- Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
Me.EngineEditorToolStripMenuItem.Text = "Engine Editor"
'
'GearboxEditorToolStripMenuItem
'
Me.GearboxEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_GBX
Me.GearboxEditorToolStripMenuItem.Name = "GearboxEditorToolStripMenuItem"
- Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
Me.GearboxEditorToolStripMenuItem.Text = "Gearbox Editor"
'
'GraphToolStripMenuItem
'
Me.GraphToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_Graph
Me.GraphToolStripMenuItem.Name = "GraphToolStripMenuItem"
- Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
Me.GraphToolStripMenuItem.Text = "Graph"
'
'ToolStripSeparator6
'
Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
- Me.ToolStripSeparator6.Size = New System.Drawing.Size(259, 6)
+ Me.ToolStripSeparator6.Size = New System.Drawing.Size(260, 6)
'
'OpenLogToolStripMenuItem
'
Me.OpenLogToolStripMenuItem.Name = "OpenLogToolStripMenuItem"
- Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
Me.OpenLogToolStripMenuItem.Text = "Open Log"
'
'SettingsToolStripMenuItem
'
Me.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"
- Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
Me.SettingsToolStripMenuItem.Text = "Settings"
'
'ToolStripDrDnBtInfo
@@ -882,24 +955,18 @@ Partial Class MainForm
Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
- 'JobEditorSerialHybridVehicleToolStripMenuItem
- '
- Me.JobEditorSerialHybridVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
- Me.JobEditorSerialHybridVehicleToolStripMenuItem.Name = "JobEditorSerialHybridVehicleToolStripMenuItem"
- Me.JobEditorSerialHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
- Me.JobEditorSerialHybridVehicleToolStripMenuItem.Text = "Job Editor - Serial Hybrid Vehicle"
- '
'MainForm
'
Me.AcceptButton = Me.btStartV3
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(1045, 670)
+ Me.ClientSize = New System.Drawing.Size(1568, 1031)
Me.Controls.Add(Me.ToolStrip1)
Me.Controls.Add(Me.SplitContainer1)
Me.Controls.Add(Me.StatusBAR)
Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
- Me.MinimumSize = New System.Drawing.Size(785, 485)
+ Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.MinimumSize = New System.Drawing.Size(1170, 725)
Me.Name = "MainForm"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
@@ -1029,4 +1096,8 @@ End Sub
Friend WithEvents JobEditorBatteryElectricVehicleToolStripMenuItem As ToolStripMenuItem
Friend WithEvents JobEditorEngineOnlyModeToolStripMenuItem As ToolStripMenuItem
Friend WithEvents JobEditorSerialHybridVehicleToolStripMenuItem As ToolStripMenuItem
+
+ Friend WithEvents JobEditorIEPC_E_VehicleToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents JobEditorIEPC_S_VehicleToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents JobEditorIHPCVehicleToolStripMenuItem As ToolStripMenuItem
End Class
diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb
index 839b11eb02c9ef50e57a44ee2b30c8e497451058..6f5f7d9025879cfa7bc64f9579c810ad14dd3121 100644
--- a/VECTO/GUI/MainForm.vb
+++ b/VECTO/GUI/MainForm.vb
@@ -29,16 +29,14 @@
' Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
'
-Imports System.Collections.Generic
+Imports System.Collections.Concurrent
Imports System.ComponentModel
Imports System.IO
-Imports System.Linq
Imports TUGraz.VectoCore.Models.Simulation.Impl
Imports TUGraz.VectoCore.InputData.FileIO.JSON
Imports System.Text
Imports System.Threading
Imports System.Xml
-Imports System.Xml.Linq
Imports Microsoft.VisualBasic.FileIO
Imports Ninject
Imports TUGraz.VectoCommon.Exceptions
@@ -50,7 +48,6 @@ Imports TUGraz.VectoCore
Imports TUGraz.VectoCore.InputData.FileIO.XML
Imports TUGraz.VectoCore.Models.Simulation
Imports TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory
-Imports TUGraz.VectoCore.Models.SimulationComponent.Data
Imports TUGraz.VectoCore.OutputData
Imports TUGraz.VectoCore.OutputData.FileIO
Imports TUGraz.VectoCore.Utils
@@ -138,6 +135,10 @@ Public Class MainForm
TorqueConverterShiftPolygonFileBrowser = New FileBrowser("vgbs")
CrossWindCorrectionFileBrowser = New FileBrowser("vcdx")
ElectricMotorFileBrowser = New FileBrowser("vem")
+ IEPCFileBrowser = New FileBrowser("viepc")
+ IEPCFLCFileBrowser = New FileBrowser("viepcp")
+ IEPCDragFileBrowser = new FileBrowser("viepcd")
+ IEPCPowerMapFileBrowser = New FileBrowser("viepco")
REESSFileBrowser = New FileBrowser("vreess")
EmADCLossMapFileBrowser = New FileBrowser("vtlm")
DriverDecisionFactorVelocityDropFileBrowser = New FileBrowser("DfVelocityDrop")
@@ -157,6 +158,10 @@ Public Class MainForm
PropulsionTorqueLimitFileBrowser = New FileBrowser("vtqp")
ModalResultsFileBrowser = New FileBrowser("vmod")
+ IHPCFileBrowser = new FileBrowser("vem")
+ IHPCPowerMapFileBrowser = new FileBrowser("vemo")
+ IHPCFullLoadCurveFileBrowser = new FileBrowser("vemp")
+ IHPCDragCurveFileBrowser = new FileBrowser("vemd")
'-------------------------------------------------------
TextFileBrowser.Extensions = New String() {"txt"}
@@ -198,6 +203,16 @@ Public Class MainForm
PropulsionTorqueLimitFileBrowser.Extensions = New String() {"vtqp"}
ModalResultsFileBrowser.Extensions = New String() {"vmod"}
+
+ IHPCFileBrowser.Extensions = New String(){"vem"}
+ IHPCPowerMapFileBrowser.Extensions = New String(){"vemo"}
+ IHPCFullLoadCurveFileBrowser.Extensions = New String(){"vemp"}
+ IHPCDragCurveFileBrowser.Extensions = New String(){"vemd"}
+
+ IEPCFileBrowser.Extensions = New String () {"viepc"}
+ IEPCFLCFileBrowser.Extensions = New String() {"viepcp"}
+ IEPCDragFileBrowser.Extensions = New String() {"viepcd"}
+ IEPCPowerMapFileBrowser.Extensions = New String() {"viepco"}
End Sub
Private Sub FB_Close()
@@ -256,6 +271,10 @@ Public Class MainForm
_genCheckAllLock = False
_genChecked = 0
+ Dim logMessageTimer As New Windows.Forms.Timer(components)
+ logMessageTimer.Interval = 100
+ AddHandler logMessageTimer.Tick, AddressOf TimerLogMessages_Tick
+ logMessageTimer.Start()
'Load Tabs properly (otherwise problem with ListViews)
For x = 0 To TabControl1.TabCount - 1
@@ -391,7 +410,7 @@ Public Class MainForm
GearboxForm.BringToFront()
End If
Try
- GearboxForm.OpenGbx(file, VehicleCategory.RigidTruck)
+ GearboxForm.OpenGbx(file, VehicleCategory.RigidTruck, VectoSimulationJobType.ConventionalVehicle)
Catch ex As Exception
MsgBox("Failed to open Gearbox File: " + ex.Message)
End Try
@@ -1042,11 +1061,11 @@ lbFound:
' TODO MQ-20200525: Remove the following loop in production (or after evaluation of LAC!!
If not string.IsNullOrWhiteSpace(tbMinSpeedLAC.Text) then
- for Each run as JobContainer.RunEntry In jobContainer.Runs
- dim tmpDriver as DriverData = CType(run.Run, VectoRun).GetContainer().RunData.DriverData
- tmpDriver.LookAheadCoasting.Enabled = True
- tmpDriver.LookAheadCoasting.MinSpeed = tbMinSpeedLAC.Text.ToDouble().KMPHtoMeterPerSecond()
- Next
+ 'for Each run as JobContainer.RunEntry In jobContainer.Runs
+ ' dim tmpDriver as DriverData = CType(run.Run, VectoRun).GetContainer().RunData.DriverData
+ ' tmpDriver.LookAheadCoasting.Enabled = True
+ ' tmpDriver.LookAheadCoasting.MinSpeed = tbMinSpeedLAC.Text.ToDouble().KMPHtoMeterPerSecond()
+ 'Next
end if
@@ -1516,9 +1535,7 @@ lbFound:
lv0.SubItems.Add(Now.ToString("HH:mm:ss.ff"))
lv0.SubItems.Add(source)
- If LvMsg.Items.Count > 9999 Then LvMsg.Items.RemoveAt(0)
-
- LogFile.WriteToLog(id, msg & vbTab & source)
+ Task.Run(Sub() LogFile.WriteToLog(id, msg & vbTab & source))
Select Case id
@@ -1547,10 +1564,26 @@ lbFound:
lv0.Tag = link
End If
+ _logItemQueue.Enqueue(lv0)
+ End Sub
+
+ Private ReadOnly _logItemQueue As New ConcurrentQueue(Of ListViewItem)
+
+ Private Sub TimerLogMessages_Tick(sender As Object, e As EventArgs)
+ If Not _logItemQueue.IsEmpty Then
- LvMsg.Items.Add(lv0)
+ LvMsg.BeginUpdate()
+ Dim item As ListViewItem = Nothing
+ While _logItemQueue.TryDequeue(item)
+ LvMsg.Items.Add(item)
+ If LvMsg.Items.Count > 9999 Then
+ LvMsg.Items.RemoveAt(0)
+ End If
+ End While
- lv0.EnsureVisible()
+ LvMsg.Items(LvMsg.Items.Count - 1).EnsureVisible()
+ LvMsg.EndUpdate()
+ End If
End Sub
@@ -2184,4 +2217,15 @@ lbFound:
Private Sub JobEditorSerialHybridVehicleToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles JobEditorSerialHybridVehicleToolStripMenuItem.Click
OpenVECTOeditor("<New>", VectoSimulationJobType.SerialHybridVehicle)
End Sub
+ Private Sub JobEditorIEPC_E_VehicleToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles JobEditorIEPC_E_VehicleToolStripMenuItem.Click
+ OpenVECTOeditor("<New>", VectoSimulationJobType.IEPC_E)
+ End Sub
+
+ Private Sub JobEditorIHPCVehicleToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles JobEditorIHPCVehicleToolStripMenuItem.Click
+ OpenVECTOeditor("<New>", VectoSimulationJobType.IHPC)
+ End Sub
+
+ Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles JobEditorIEPC_S_VehicleToolStripMenuItem.Click
+ OpenVECTOeditor("<New>", VectoSimulationJobType.IEPC_S)
+ End Sub
End Class
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index 50b382bc2aec489410654f71bd0162de543fa4d7..daf588d1b81f9e27f5bb07e6b4197e090e6fb343 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -115,6 +115,18 @@ Public Class VectoJobForm
GrAuxMech.Enabled = True
Case VectoSimulationJobType.EngineOnlySimulation
lblTitle.Text = prefix + "Engine Only"
+ Case VectoSimulationJobType.IEPC_E
+ lblTitle.Text = prefix + "IEPC-E Vehicle"
+ gbElectricAux.Enabled = True
+ GrAuxMech.Enabled = False
+ case VectoSimulationJobType.IEPC_S
+ lblTitle.Text = prefix + "IEPC-S Vehicle"
+ gbElectricAux.Enabled = True
+ GrAuxMech.Enabled = False
+ Case VectoSimulationJobType.IHPC
+ lblTitle.Text = prefix + "IHPC Vehicle"
+ gbElectricAux.Enabled = True
+ GrAuxMech.Enabled = False
End Select
End Sub
@@ -318,19 +330,22 @@ Public Class VectoJobForm
GearboxForm.BringToFront()
End If
Dim vehicleType As VehicleCategory
+ Dim jobType as VectoSimulationJobType
Try
If Not Trim(f) = "" Then
- Dim vehInput As IVehicleDeclarationInputData =
+ Dim vehInput As IVehicleEngineeringInputData =
CType(JSONInputDataFactory.ReadComponentData(FileRepl(TbVEH.Text, GetPath(VectoFile))),
IEngineeringInputDataProvider).JobInputData.Vehicle
vehicleType = vehInput.VehicleCategory
+ jobType = vehInput.VehicleType
End If
Catch ex As Exception
vehicleType = VehicleCategory.RigidTruck
+ jobType = VectoSimulationJobType.ConventionalVehicle
End Try
Try
- If Not Trim(f) = "" Then GearboxForm.OpenGbx(f, vehicleType)
+ If Not Trim(f) = "" Then GearboxForm.OpenGbx(f, vehicleType, jobType)
Catch ex As Exception
MsgBox("Failed to open Gearbox File: " + ex.Message)
End Try
@@ -464,12 +479,12 @@ Public Class VectoJobForm
UpdateEnabledControls()
'Files -----------------------------
TbVEH.Text = GetRelativePath(inputData.JobInputData.Vehicle.DataSource.SourceFile, _basePath)
- If (JobType <> VectoSimulationJobType.BatteryElectricVehicle) Then
+ If (JobType <> VectoSimulationJobType.BatteryElectricVehicle AndAlso JobType <> VectoSimulationJobType.IEPC_E) Then
TbENG.Text = GetRelativePath(inputData.JobInputData.Vehicle.Components.EngineInputData.DataSource.SourceFile, _basePath)
Else
TbENG.Text = ""
End If
- If (JobType <> VectoSimulationJobType.BatteryElectricVehicle AndAlso inputData.JobInputData.Vehicle.Components.GearboxInputData IsNot Nothing) Then
+ If (inputData.JobInputData.Vehicle.Components.GearboxInputData IsNot Nothing) Then
TbGBX.Text = GetRelativePath(inputData.JobInputData.Vehicle.Components.GearboxInputData.DataSource.SourceFile, _basePath)
Else
TbGBX.Text = ""
@@ -479,7 +494,7 @@ Public Class VectoJobForm
Else
TbShiftStrategyParams.Text = GetRelativePath(inputData.DriverInputData.GearshiftInputData.Source, _basePath)
End If
- If (JobType = VectoSimulationJobType.ParallelHybridVehicle OrElse JobType = VectoSimulationJobType.SerialHybridVehicle) Then
+ If (JobType = VectoSimulationJobType.ParallelHybridVehicle OrElse JobType = VectoSimulationJobType.SerialHybridVehicle OrElse JobType = VectoSimulationJobType.IEPC_S OrElse JobType = VectoSimulationJobType.IHPC) Then
tbHybridStrategyParams.Text = GetRelativePath(inputData.JobInputData.HybridStrategyParameters.Source, _basePath)
End If
@@ -526,7 +541,11 @@ Public Class VectoJobForm
Dim sb As ICycleData
For Each sb In vectoJob.Cycles
Dim lv0 As ListViewItem = New ListViewItem
- lv0.Text = GetRelativePath(sb.CycleData.Source, Path.GetDirectoryName(Path.GetFullPath(file))) 'sb.Name
+ if (sb.CycleData.SourceType = DataSourceType.Embedded) Then
+ lv0.Text = sb.Name
+ else
+ lv0.Text = GetRelativePath(sb.CycleData.Source, Path.GetDirectoryName(Path.GetFullPath(file))) 'sb.Name
+ End If
LvCycles.Items.Add(lv0)
Next
Catch ex As Exception
@@ -1046,6 +1065,26 @@ Public Class VectoJobForm
GrAuxMech.Enabled = False
pnShiftParams.Enabled = True
gbEngineStopStart.Visible = False
+ Case VectoSimulationJobType.IHPC
+ pnEngine.Enabled = True
+ pnGearbox.Enabled = True
+ GrAuxMech.Enabled = True
+ pnShiftParams.Enabled = True
+ gbEngineStopStart.Visible = False
+ pnHybridStrategy.Enabled = true
+ Case VectoSimulationJobType.IEPC_E
+ pnEngine.Enabled = False
+ pnGearbox.Enabled = True
+ GrAuxMech.Enabled = False
+ pnShiftParams.Enabled = True
+ gbEngineStopStart.Visible = False
+ Case VectoSimulationJobType.IEPC_S
+ pnEngine.Enabled = True
+ pnGearbox.Enabled = True
+ GrAuxMech.Enabled = False
+ pnShiftParams.Enabled = True
+ gbEngineStopStart.Visible = False
+ pnHybridStrategy.Enabled = true
End Select
End Sub
@@ -1151,7 +1190,11 @@ Public Class VectoJobForm
If gearbox Is Nothing Then Return
- TbGbxTxt.Text = $"{gearbox.Gears.Count}-Speed {gearbox.Type.ShortName()} {gearbox.Model}"
+ if (JobType = VectoSimulationJobType.IEPC_E OrElse JobType = VectoSimulationJobType.IEPC_S) Then
+ TbGbxTxt.Text = $"IEPC {gearbox.Model}"
+ else
+ TbGbxTxt.Text = $"{gearbox.Gears.Count}-Speed {gearbox.Type.ShortName()} {gearbox.Model}"
+ End If
If Cfg.DeclMode Then
For i = 1 To gearbox.Gears.Count
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index d36b5f0f8799864a3b650c19a79575f4e6a8a629..57014cc2535049434105d389039072b15149aabd 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -32,2249 +32,2614 @@ Partial Class VehicleForm
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Me.components = New System.ComponentModel.Container()
- Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(VehicleForm))
- Me.Label1 = New System.Windows.Forms.Label()
- Me.TbMass = New System.Windows.Forms.TextBox()
- Me.Label2 = New System.Windows.Forms.Label()
- Me.TbLoad = New System.Windows.Forms.TextBox()
- Me.Label3 = New System.Windows.Forms.Label()
- Me.TBcdA = New System.Windows.Forms.TextBox()
- Me.Label13 = New System.Windows.Forms.Label()
- Me.TBrdyn = New System.Windows.Forms.TextBox()
- Me.ButOK = New System.Windows.Forms.Button()
- Me.ButCancel = New System.Windows.Forms.Button()
- Me.Label14 = New System.Windows.Forms.Label()
- Me.Label31 = New System.Windows.Forms.Label()
- Me.Label35 = New System.Windows.Forms.Label()
- Me.CbCdMode = New System.Windows.Forms.ComboBox()
- Me.TbCdFile = New System.Windows.Forms.TextBox()
- Me.BtCdFileBrowse = New System.Windows.Forms.Button()
- Me.GroupBox6 = New System.Windows.Forms.GroupBox()
- Me.BtCdFileOpen = New System.Windows.Forms.Button()
- Me.LbCdMode = New System.Windows.Forms.Label()
- Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
- Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
- Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
- Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
- Me.gbRetarderLosses = New System.Windows.Forms.GroupBox()
- Me.PnRt = New System.Windows.Forms.Panel()
- Me.Label15 = New System.Windows.Forms.Label()
- Me.BtRtBrowse = New System.Windows.Forms.Button()
- Me.TbRtPath = New System.Windows.Forms.TextBox()
- Me.Label45 = New System.Windows.Forms.Label()
- Me.LbRtRatio = New System.Windows.Forms.Label()
- Me.TbRtRatio = New System.Windows.Forms.TextBox()
- Me.CbRtType = New System.Windows.Forms.ComboBox()
- Me.Label46 = New System.Windows.Forms.Label()
- Me.Label50 = New System.Windows.Forms.Label()
- Me.TbMassExtra = New System.Windows.Forms.TextBox()
- Me.GroupBox8 = New System.Windows.Forms.GroupBox()
- Me.Label6 = New System.Windows.Forms.Label()
- Me.ButAxlRem = New System.Windows.Forms.Button()
- Me.LvRRC = New System.Windows.Forms.ListView()
- Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader8 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader9 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader10 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ButAxlAdd = New System.Windows.Forms.Button()
- Me.PnWheelDiam = New System.Windows.Forms.Panel()
- Me.CbAxleConfig = New System.Windows.Forms.ComboBox()
- Me.CbCat = New System.Windows.Forms.ComboBox()
- Me.Label5 = New System.Windows.Forms.Label()
- Me.Label9 = New System.Windows.Forms.Label()
- Me.TbMassMass = New System.Windows.Forms.TextBox()
- Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
- Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
- Me.TbHDVclass = New System.Windows.Forms.TextBox()
- Me.GroupBox1 = New System.Windows.Forms.GroupBox()
- Me.PnLoad = New System.Windows.Forms.Panel()
- Me.GrAirRes = New System.Windows.Forms.GroupBox()
- Me.PnCdATrTr = New System.Windows.Forms.Panel()
- Me.tbVehicleHeight = New System.Windows.Forms.TextBox()
- Me.Label11 = New System.Windows.Forms.Label()
- Me.Label20 = New System.Windows.Forms.Label()
- Me.Label38 = New System.Windows.Forms.Label()
- Me.PictureBox1 = New System.Windows.Forms.PictureBox()
- Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
- Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.GroupBox3 = New System.Windows.Forms.GroupBox()
- Me.gbAngledrive = New System.Windows.Forms.GroupBox()
- Me.pnAngledriveFields = New System.Windows.Forms.Panel()
- Me.Label4 = New System.Windows.Forms.Label()
- Me.Label10 = New System.Windows.Forms.Label()
- Me.tbAngledriveRatio = New System.Windows.Forms.TextBox()
- Me.btAngledriveLossMapBrowse = New System.Windows.Forms.Button()
- Me.tbAngledriveLossMapPath = New System.Windows.Forms.TextBox()
- Me.Label12 = New System.Windows.Forms.Label()
- Me.cbAngledriveType = New System.Windows.Forms.ComboBox()
- Me.PicVehicle = New System.Windows.Forms.PictureBox()
- Me.Label8 = New System.Windows.Forms.Label()
- Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
- Me.cbPTOType = New System.Windows.Forms.ComboBox()
- Me.tbPTOCycle = New System.Windows.Forms.TextBox()
- Me.tbPTOLossMap = New System.Windows.Forms.TextBox()
- Me.tbPTODrive = New System.Windows.Forms.TextBox()
- Me.tcVehicleComponents = New System.Windows.Forms.TabControl()
- Me.tpGeneral = New System.Windows.Forms.TabPage()
- Me.tpPowertrain = New System.Windows.Forms.TabPage()
- Me.gbVehicleIdlingSpeed = New System.Windows.Forms.GroupBox()
- Me.Panel1 = New System.Windows.Forms.Panel()
- Me.tbVehIdlingSpeed = New System.Windows.Forms.TextBox()
- Me.Label18 = New System.Windows.Forms.Label()
- Me.Label19 = New System.Windows.Forms.Label()
- Me.gbTankSystem = New System.Windows.Forms.GroupBox()
- Me.cbTankSystem = New System.Windows.Forms.ComboBox()
- Me.Label23 = New System.Windows.Forms.Label()
- Me.tpElectricComponents = New System.Windows.Forms.TabPage()
- Me.gbBattery = New System.Windows.Forms.GroupBox()
- Me.lvREESSPacks = New System.Windows.Forms.ListView()
- Me.chReessPackPack = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.chReessPackCount = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.chReessPackStringId = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.btnAddReessPack = New System.Windows.Forms.Button()
- Me.lblEditReessPack = New System.Windows.Forms.Label()
- Me.btnRemoveReessPack = New System.Windows.Forms.Button()
- Me.lblInitialSoCUnit = New System.Windows.Forms.Label()
- Me.tbInitialSoC = New System.Windows.Forms.TextBox()
- Me.lblInitialSoC = New System.Windows.Forms.Label()
- Me.gpElectricMotor = New System.Windows.Forms.GroupBox()
- Me.Label33 = New System.Windows.Forms.Label()
- Me.Label32 = New System.Windows.Forms.Label()
- Me.gbRatiosPerGear = New System.Windows.Forms.GroupBox()
- Me.lvRatioPerGear = New System.Windows.Forms.ListView()
- Me.ColumnHeader11 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader12 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.btnAddEMRatio = New System.Windows.Forms.Button()
- Me.Label29 = New System.Windows.Forms.Label()
- Me.btnRemoveEMRatio = New System.Windows.Forms.Button()
- Me.btnEmADCLossMap = New System.Windows.Forms.Button()
- Me.tbEmADCLossMap = New System.Windows.Forms.TextBox()
- Me.lblEmADCLossmap = New System.Windows.Forms.Label()
- Me.tbRatioEm = New System.Windows.Forms.TextBox()
- Me.lblRatioEm = New System.Windows.Forms.Label()
- Me.tbEmCount = New System.Windows.Forms.TextBox()
- Me.cbEmPos = New System.Windows.Forms.ComboBox()
- Me.lblEmCount = New System.Windows.Forms.Label()
- Me.lblEmPosition = New System.Windows.Forms.Label()
- Me.pnElectricMotor = New System.Windows.Forms.Panel()
- Me.btnOpenElectricMotor = New System.Windows.Forms.Button()
- Me.btnBrowseElectricMotor = New System.Windows.Forms.Button()
- Me.tbElectricMotor = New System.Windows.Forms.TextBox()
- Me.tpGensetComponents = New System.Windows.Forms.TabPage()
- Me.Label30 = New System.Windows.Forms.Label()
- Me.gbGenSet = New System.Windows.Forms.GroupBox()
- Me.Label36 = New System.Windows.Forms.Label()
- Me.Label34 = New System.Windows.Forms.Label()
- Me.btnGenSetLossMap = New System.Windows.Forms.Button()
- Me.tbGenSetADC = New System.Windows.Forms.TextBox()
- Me.lblGenSetADC = New System.Windows.Forms.Label()
- Me.tbGenSetRatio = New System.Windows.Forms.TextBox()
- Me.lblGenSetRatio = New System.Windows.Forms.Label()
- Me.tbGenSetCount = New System.Windows.Forms.TextBox()
- Me.lblGenSetCount = New System.Windows.Forms.Label()
- Me.pnGenSetEM = New System.Windows.Forms.Panel()
- Me.btnOpenGenSetEM = New System.Windows.Forms.Button()
- Me.btnBrowseGenSetEM = New System.Windows.Forms.Button()
- Me.tbGenSetEM = New System.Windows.Forms.TextBox()
- Me.tpTorqueLimits = New System.Windows.Forms.TabPage()
- Me.gbPropulsionTorque = New System.Windows.Forms.GroupBox()
- Me.btnPropulsionTorqueLimit = New System.Windows.Forms.Button()
- Me.tbPropulsionTorqueLimit = New System.Windows.Forms.TextBox()
- Me.gbEMTorqueLimits = New System.Windows.Forms.GroupBox()
- Me.btnEmTorqueLimits = New System.Windows.Forms.Button()
- Me.tbEmTorqueLimits = New System.Windows.Forms.TextBox()
- Me.bgVehicleTorqueLimits = New System.Windows.Forms.GroupBox()
- Me.lvTorqueLimits = New System.Windows.Forms.ListView()
- Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.btAddMaxTorqueEntry = New System.Windows.Forms.Button()
- Me.Label17 = New System.Windows.Forms.Label()
- Me.btDelMaxTorqueEntry = New System.Windows.Forms.Button()
- Me.tpADAS = New System.Windows.Forms.TabPage()
- Me.gbADAS = New System.Windows.Forms.GroupBox()
- Me.pnEcoRoll = New System.Windows.Forms.Panel()
- Me.cbEcoRoll = New System.Windows.Forms.ComboBox()
- Me.Label22 = New System.Windows.Forms.Label()
- Me.cbAtEcoRollReleaseLockupClutch = New System.Windows.Forms.CheckBox()
- Me.cbPcc = New System.Windows.Forms.ComboBox()
- Me.cbEngineStopStart = New System.Windows.Forms.CheckBox()
- Me.lblPCC = New System.Windows.Forms.Label()
- Me.tpRoadSweeper = New System.Windows.Forms.TabPage()
- Me.pnPTO = New System.Windows.Forms.Panel()
- Me.gbPTODrive = New System.Windows.Forms.GroupBox()
- Me.Label27 = New System.Windows.Forms.Label()
- Me.tbPtoGear = New System.Windows.Forms.TextBox()
- Me.Label26 = New System.Windows.Forms.Label()
- Me.tbPtoEngineSpeed = New System.Windows.Forms.TextBox()
- Me.Label25 = New System.Windows.Forms.Label()
- Me.Label24 = New System.Windows.Forms.Label()
- Me.btPTOCycleDrive = New System.Windows.Forms.Button()
- Me.Label28 = New System.Windows.Forms.Label()
- Me.btPTOCycle = New System.Windows.Forms.Button()
- Me.Label16 = New System.Windows.Forms.Label()
- Me.btPTOLossMapBrowse = New System.Windows.Forms.Button()
- Me.Label7 = New System.Windows.Forms.Label()
- Me.gbPTO = New System.Windows.Forms.GroupBox()
- Me.cbLegislativeClass = New System.Windows.Forms.ComboBox()
- Me.Label21 = New System.Windows.Forms.Label()
- Me.lblTitle = New System.Windows.Forms.Label()
- Me.GroupBox6.SuspendLayout()
- Me.ToolStrip1.SuspendLayout()
- Me.gbRetarderLosses.SuspendLayout()
- Me.PnRt.SuspendLayout()
- Me.GroupBox8.SuspendLayout()
- Me.PnWheelDiam.SuspendLayout()
- Me.StatusStrip1.SuspendLayout()
- Me.GroupBox1.SuspendLayout()
- Me.PnLoad.SuspendLayout()
- Me.GrAirRes.SuspendLayout()
- Me.PnCdATrTr.SuspendLayout()
- CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.CmOpenFile.SuspendLayout()
- Me.GroupBox3.SuspendLayout()
- Me.gbAngledrive.SuspendLayout()
- Me.pnAngledriveFields.SuspendLayout()
- CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.tcVehicleComponents.SuspendLayout()
- Me.tpGeneral.SuspendLayout()
- Me.tpPowertrain.SuspendLayout()
- Me.gbVehicleIdlingSpeed.SuspendLayout()
- Me.Panel1.SuspendLayout()
- Me.gbTankSystem.SuspendLayout()
- Me.tpElectricComponents.SuspendLayout()
- Me.gbBattery.SuspendLayout()
- Me.gpElectricMotor.SuspendLayout()
- Me.gbRatiosPerGear.SuspendLayout()
- Me.pnElectricMotor.SuspendLayout()
- Me.tpGensetComponents.SuspendLayout()
- Me.gbGenSet.SuspendLayout()
- Me.pnGenSetEM.SuspendLayout()
- Me.tpTorqueLimits.SuspendLayout()
- Me.gbPropulsionTorque.SuspendLayout()
- Me.gbEMTorqueLimits.SuspendLayout()
- Me.bgVehicleTorqueLimits.SuspendLayout()
- Me.tpADAS.SuspendLayout()
- Me.gbADAS.SuspendLayout()
- Me.pnEcoRoll.SuspendLayout()
- Me.tpRoadSweeper.SuspendLayout()
- Me.pnPTO.SuspendLayout()
- Me.gbPTODrive.SuspendLayout()
- Me.gbPTO.SuspendLayout()
- Me.SuspendLayout()
- '
- 'Label1
- '
- Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(6, 22)
- Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(177, 13)
- Me.Label1.TabIndex = 0
- Me.Label1.Text = "Corrected Actual Curb Mass Vehicle"
- '
- 'TbMass
- '
- Me.TbMass.Location = New System.Drawing.Point(188, 19)
- Me.TbMass.Name = "TbMass"
- Me.TbMass.Size = New System.Drawing.Size(57, 20)
- Me.TbMass.TabIndex = 0
- '
- 'Label2
- '
- Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(128, 31)
- Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(45, 13)
- Me.Label2.TabIndex = 2
- Me.Label2.Text = "Loading"
- '
- 'TbLoad
- '
- Me.TbLoad.Location = New System.Drawing.Point(182, 28)
- Me.TbLoad.Name = "TbLoad"
- Me.TbLoad.Size = New System.Drawing.Size(57, 20)
- Me.TbLoad.TabIndex = 1
- '
- 'Label3
- '
- Me.Label3.AutoSize = True
- Me.Label3.Location = New System.Drawing.Point(10, 6)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(38, 13)
- Me.Label3.TabIndex = 8
- Me.Label3.Text = "Cd x A"
- '
- 'TBcdA
- '
- Me.TBcdA.Location = New System.Drawing.Point(54, 3)
- Me.TBcdA.Name = "TBcdA"
- Me.TBcdA.Size = New System.Drawing.Size(57, 20)
- Me.TBcdA.TabIndex = 0
- '
- 'Label13
- '
- Me.Label13.AutoSize = True
- Me.Label13.Location = New System.Drawing.Point(136, 6)
- Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(40, 13)
- Me.Label13.TabIndex = 6
- Me.Label13.Text = "Radius"
- '
- 'TBrdyn
- '
- Me.TBrdyn.Location = New System.Drawing.Point(185, 3)
- Me.TBrdyn.Name = "TBrdyn"
- Me.TBrdyn.Size = New System.Drawing.Size(57, 20)
- Me.TBrdyn.TabIndex = 0
- '
- 'ButOK
- '
- Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(498, 577)
- Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(75, 23)
- Me.ButOK.TabIndex = 6
- Me.ButOK.Text = "Save"
- Me.ButOK.UseVisualStyleBackColor = True
- '
- 'ButCancel
- '
- Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(579, 577)
- Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(75, 23)
- Me.ButCancel.TabIndex = 7
- Me.ButCancel.Text = "Cancel"
- Me.ButCancel.UseVisualStyleBackColor = True
- '
- 'Label14
- '
- Me.Label14.AutoSize = True
- Me.Label14.Location = New System.Drawing.Point(247, 22)
- Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(25, 13)
- Me.Label14.TabIndex = 24
- Me.Label14.Text = "[kg]"
- '
- 'Label31
- '
- Me.Label31.AutoSize = True
- Me.Label31.Location = New System.Drawing.Point(241, 31)
- Me.Label31.Name = "Label31"
- Me.Label31.Size = New System.Drawing.Size(25, 13)
- Me.Label31.TabIndex = 24
- Me.Label31.Text = "[kg]"
- '
- 'Label35
- '
- Me.Label35.AutoSize = True
- Me.Label35.Location = New System.Drawing.Point(244, 6)
- Me.Label35.Name = "Label35"
- Me.Label35.Size = New System.Drawing.Size(29, 13)
- Me.Label35.TabIndex = 24
- Me.Label35.Text = "[mm]"
- '
- 'CbCdMode
- '
- Me.CbCdMode.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.CbCdMode.DisplayMember = "Value"
- Me.CbCdMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.CbCdMode.FormattingEnabled = True
- Me.CbCdMode.Items.AddRange(New Object() {"No Correction", "Speed dependent (User-defined)", "Speed dependent (Declaration Mode)", "Vair & Beta Input"})
- Me.CbCdMode.Location = New System.Drawing.Point(6, 19)
- Me.CbCdMode.Name = "CbCdMode"
- Me.CbCdMode.Size = New System.Drawing.Size(333, 21)
- Me.CbCdMode.TabIndex = 0
- Me.CbCdMode.ValueMember = "Key"
- '
- 'TbCdFile
- '
- Me.TbCdFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbCdFile.Enabled = False
- Me.TbCdFile.Location = New System.Drawing.Point(9, 65)
- Me.TbCdFile.Name = "TbCdFile"
- Me.TbCdFile.Size = New System.Drawing.Size(276, 20)
- Me.TbCdFile.TabIndex = 1
- '
- 'BtCdFileBrowse
- '
- Me.BtCdFileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.BtCdFileBrowse.Enabled = False
- Me.BtCdFileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtCdFileBrowse.Location = New System.Drawing.Point(291, 62)
- Me.BtCdFileBrowse.Name = "BtCdFileBrowse"
- Me.BtCdFileBrowse.Size = New System.Drawing.Size(24, 24)
- Me.BtCdFileBrowse.TabIndex = 2
- Me.BtCdFileBrowse.UseVisualStyleBackColor = True
- '
- 'GroupBox6
- '
- Me.GroupBox6.Controls.Add(Me.BtCdFileOpen)
- Me.GroupBox6.Controls.Add(Me.LbCdMode)
- Me.GroupBox6.Controls.Add(Me.CbCdMode)
- Me.GroupBox6.Controls.Add(Me.BtCdFileBrowse)
- Me.GroupBox6.Controls.Add(Me.TbCdFile)
- Me.GroupBox6.Location = New System.Drawing.Point(293, 84)
- Me.GroupBox6.Name = "GroupBox6"
- Me.GroupBox6.Size = New System.Drawing.Size(346, 96)
- Me.GroupBox6.TabIndex = 3
- Me.GroupBox6.TabStop = False
- Me.GroupBox6.Text = "Cross Wind Correction"
- '
- 'BtCdFileOpen
- '
- Me.BtCdFileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.BtCdFileOpen.Enabled = False
- Me.BtCdFileOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.BtCdFileOpen.Location = New System.Drawing.Point(315, 62)
- Me.BtCdFileOpen.Name = "BtCdFileOpen"
- Me.BtCdFileOpen.Size = New System.Drawing.Size(24, 24)
- Me.BtCdFileOpen.TabIndex = 3
- Me.BtCdFileOpen.UseVisualStyleBackColor = True
- '
- 'LbCdMode
- '
- Me.LbCdMode.AutoSize = True
- Me.LbCdMode.Location = New System.Drawing.Point(6, 47)
- Me.LbCdMode.Name = "LbCdMode"
- Me.LbCdMode.Size = New System.Drawing.Size(59, 13)
- Me.LbCdMode.TabIndex = 28
- Me.LbCdMode.Text = "LbCdMode"
- Me.LbCdMode.TextAlign = System.Drawing.ContentAlignment.TopRight
- '
- 'ToolStrip1
- '
- Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
- Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
- Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
- Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
- Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
- Me.ToolStrip1.Size = New System.Drawing.Size(666, 31)
- Me.ToolStrip1.TabIndex = 29
- Me.ToolStrip1.Text = "ToolStrip1"
- '
- 'ToolStripBtNew
- '
- Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
- Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripBtNew.Name = "ToolStripBtNew"
- Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
- Me.ToolStripBtNew.Text = "ToolStripButton1"
- Me.ToolStripBtNew.ToolTipText = "New"
- '
- 'ToolStripBtOpen
- '
- Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
- Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
- Me.ToolStripBtOpen.Text = "ToolStripButton1"
- Me.ToolStripBtOpen.ToolTipText = "Open..."
- '
- 'ToolStripBtSave
- '
- Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
- Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripBtSave.Name = "ToolStripBtSave"
- Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
- Me.ToolStripBtSave.Text = "ToolStripButton1"
- Me.ToolStripBtSave.ToolTipText = "Save"
- '
- 'ToolStripBtSaveAs
- '
- Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
- Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
- Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
- Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
- Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
- '
- 'ToolStripSeparator3
- '
- Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
- '
- 'ToolStripBtSendTo
- '
- Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
- Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
- Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
- Me.ToolStripBtSendTo.Text = "Send to Job Editor"
- Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor"
- '
- 'ToolStripSeparator1
- '
- Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
- '
- 'ToolStripButton1
- '
- Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
- Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripButton1.Name = "ToolStripButton1"
- Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
- Me.ToolStripButton1.Text = "Help"
- '
- 'gbRetarderLosses
- '
- Me.gbRetarderLosses.Controls.Add(Me.PnRt)
- Me.gbRetarderLosses.Controls.Add(Me.CbRtType)
- Me.gbRetarderLosses.Location = New System.Drawing.Point(6, 76)
- Me.gbRetarderLosses.Name = "gbRetarderLosses"
- Me.gbRetarderLosses.Size = New System.Drawing.Size(310, 111)
- Me.gbRetarderLosses.TabIndex = 1
- Me.gbRetarderLosses.TabStop = False
- Me.gbRetarderLosses.Text = "Retarder Losses"
- '
- 'PnRt
- '
- Me.PnRt.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.PnRt.Controls.Add(Me.Label15)
- Me.PnRt.Controls.Add(Me.BtRtBrowse)
- Me.PnRt.Controls.Add(Me.TbRtPath)
- Me.PnRt.Controls.Add(Me.Label45)
- Me.PnRt.Controls.Add(Me.LbRtRatio)
- Me.PnRt.Controls.Add(Me.TbRtRatio)
- Me.PnRt.Location = New System.Drawing.Point(3, 42)
- Me.PnRt.Name = "PnRt"
- Me.PnRt.Size = New System.Drawing.Size(299, 63)
- Me.PnRt.TabIndex = 1
- '
- 'Label15
- '
- Me.Label15.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label15.Location = New System.Drawing.Point(2, 23)
- Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(232, 16)
- Me.Label15.TabIndex = 15
- Me.Label15.Text = "Retarder Loss Map"
- Me.Label15.TextAlign = System.Drawing.ContentAlignment.BottomLeft
- '
- 'BtRtBrowse
- '
- Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.BtRtBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtRtBrowse.Location = New System.Drawing.Point(272, 37)
- Me.BtRtBrowse.Name = "BtRtBrowse"
- Me.BtRtBrowse.Size = New System.Drawing.Size(24, 24)
- Me.BtRtBrowse.TabIndex = 2
- Me.BtRtBrowse.UseVisualStyleBackColor = True
- '
- 'TbRtPath
- '
- Me.TbRtPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbRtPath.Location = New System.Drawing.Point(3, 39)
- Me.TbRtPath.Name = "TbRtPath"
- Me.TbRtPath.Size = New System.Drawing.Size(269, 20)
- Me.TbRtPath.TabIndex = 1
- '
- 'Label45
- '
- Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label45.AutoSize = True
- Me.Label45.Location = New System.Drawing.Point(263, 5)
- Me.Label45.Name = "Label45"
- Me.Label45.Size = New System.Drawing.Size(16, 13)
- Me.Label45.TabIndex = 10
- Me.Label45.Text = "[-]"
- '
- 'LbRtRatio
- '
- Me.LbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.LbRtRatio.Location = New System.Drawing.Point(35, 5)
- Me.LbRtRatio.Name = "LbRtRatio"
- Me.LbRtRatio.Size = New System.Drawing.Size(167, 17)
- Me.LbRtRatio.TabIndex = 1
- Me.LbRtRatio.Text = "Ratio"
- Me.LbRtRatio.TextAlign = System.Drawing.ContentAlignment.TopRight
- '
- 'TbRtRatio
- '
- Me.TbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbRtRatio.Location = New System.Drawing.Point(205, 3)
- Me.TbRtRatio.Name = "TbRtRatio"
- Me.TbRtRatio.Size = New System.Drawing.Size(56, 20)
- Me.TbRtRatio.TabIndex = 0
- '
- 'CbRtType
- '
- Me.CbRtType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.CbRtType.DisplayMember = "Value"
- Me.CbRtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.CbRtType.Items.AddRange(New Object() {"Included in Transmission Loss Maps", "Primary Retarder", "Secondary Retarder"})
- Me.CbRtType.Location = New System.Drawing.Point(6, 19)
- Me.CbRtType.Name = "CbRtType"
- Me.CbRtType.Size = New System.Drawing.Size(297, 21)
- Me.CbRtType.TabIndex = 0
- Me.CbRtType.ValueMember = "Key"
- '
- 'Label46
- '
- Me.Label46.AutoSize = True
- Me.Label46.Location = New System.Drawing.Point(32, 5)
- Me.Label46.Name = "Label46"
- Me.Label46.Size = New System.Drawing.Size(145, 13)
- Me.Label46.TabIndex = 31
- Me.Label46.Text = "Curb Mass Extra Trailer/Body"
- '
- 'Label50
- '
- Me.Label50.AutoSize = True
- Me.Label50.Location = New System.Drawing.Point(241, 5)
- Me.Label50.Name = "Label50"
- Me.Label50.Size = New System.Drawing.Size(25, 13)
- Me.Label50.TabIndex = 24
- Me.Label50.Text = "[kg]"
- '
- 'TbMassExtra
- '
- Me.TbMassExtra.Location = New System.Drawing.Point(182, 2)
- Me.TbMassExtra.Name = "TbMassExtra"
- Me.TbMassExtra.Size = New System.Drawing.Size(57, 20)
- Me.TbMassExtra.TabIndex = 0
- '
- 'GroupBox8
- '
- Me.GroupBox8.Controls.Add(Me.Label6)
- Me.GroupBox8.Controls.Add(Me.ButAxlRem)
- Me.GroupBox8.Controls.Add(Me.LvRRC)
- Me.GroupBox8.Controls.Add(Me.ButAxlAdd)
- Me.GroupBox8.Location = New System.Drawing.Point(6, 186)
- Me.GroupBox8.Name = "GroupBox8"
- Me.GroupBox8.Size = New System.Drawing.Size(633, 182)
- Me.GroupBox8.TabIndex = 4
- Me.GroupBox8.TabStop = False
- Me.GroupBox8.Text = "Axles / Wheels"
- '
- 'Label6
- '
- Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label6.AutoSize = True
- Me.Label6.Location = New System.Drawing.Point(525, 152)
- Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(106, 13)
- Me.Label6.TabIndex = 3
- Me.Label6.Text = "(Double-Click to Edit)"
- '
- 'ButAxlRem
- '
- Me.ButAxlRem.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.ButAxlRem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.ButAxlRem.Location = New System.Drawing.Point(29, 151)
- Me.ButAxlRem.Name = "ButAxlRem"
- Me.ButAxlRem.Size = New System.Drawing.Size(24, 24)
- Me.ButAxlRem.TabIndex = 2
- Me.ButAxlRem.UseVisualStyleBackColor = True
- '
- 'LvRRC
- '
- Me.LvRRC.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.LvRRC.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader7, Me.ColumnHeader8, Me.ColumnHeader2, Me.ColumnHeader9, Me.ColumnHeader1, Me.ColumnHeader3, Me.ColumnHeader4, Me.ColumnHeader10})
- Me.LvRRC.FullRowSelect = True
- Me.LvRRC.GridLines = True
- Me.LvRRC.HideSelection = False
- Me.LvRRC.Location = New System.Drawing.Point(6, 19)
- Me.LvRRC.MultiSelect = False
- Me.LvRRC.Name = "LvRRC"
- Me.LvRRC.Size = New System.Drawing.Size(621, 131)
- Me.LvRRC.TabIndex = 0
- Me.LvRRC.TabStop = False
- Me.LvRRC.UseCompatibleStateImageBehavior = False
- Me.LvRRC.View = System.Windows.Forms.View.Details
- '
- 'ColumnHeader7
- '
- Me.ColumnHeader7.Text = "#"
- Me.ColumnHeader7.Width = 22
- '
- 'ColumnHeader8
- '
- Me.ColumnHeader8.Text = "Rel. load"
- Me.ColumnHeader8.Width = 62
- '
- 'ColumnHeader2
- '
- Me.ColumnHeader2.Text = "Twin T."
- Me.ColumnHeader2.Width = 51
- '
- 'ColumnHeader9
- '
- Me.ColumnHeader9.Text = "RRC"
- Me.ColumnHeader9.Width = 59
- '
- 'ColumnHeader1
- '
- Me.ColumnHeader1.Text = "Fz ISO"
- Me.ColumnHeader1.Width = 55
- '
- 'ColumnHeader3
- '
- Me.ColumnHeader3.Text = "Wheels"
- Me.ColumnHeader3.Width = 100
- '
- 'ColumnHeader4
- '
- Me.ColumnHeader4.Text = "Inertia"
- '
- 'ColumnHeader10
- '
- Me.ColumnHeader10.Text = "Axle Type"
- Me.ColumnHeader10.Width = 130
- '
- 'ButAxlAdd
- '
- Me.ButAxlAdd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.ButAxlAdd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.ButAxlAdd.Location = New System.Drawing.Point(5, 151)
- Me.ButAxlAdd.Name = "ButAxlAdd"
- Me.ButAxlAdd.Size = New System.Drawing.Size(24, 24)
- Me.ButAxlAdd.TabIndex = 1
- Me.ButAxlAdd.UseVisualStyleBackColor = True
- '
- 'PnWheelDiam
- '
- Me.PnWheelDiam.Controls.Add(Me.Label13)
- Me.PnWheelDiam.Controls.Add(Me.TBrdyn)
- Me.PnWheelDiam.Controls.Add(Me.Label35)
- Me.PnWheelDiam.Dock = System.Windows.Forms.DockStyle.Fill
- Me.PnWheelDiam.Location = New System.Drawing.Point(3, 16)
- Me.PnWheelDiam.Name = "PnWheelDiam"
- Me.PnWheelDiam.Size = New System.Drawing.Size(272, 31)
- Me.PnWheelDiam.TabIndex = 0
- '
- 'CbAxleConfig
- '
- Me.CbAxleConfig.DisplayMember = "Value"
- Me.CbAxleConfig.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.CbAxleConfig.FormattingEnabled = True
- Me.CbAxleConfig.Items.AddRange(New Object() {"-", "4x2", "4x4", "6x2", "6x4", "6x6", "8x2", "8x4", "8x6", "8x8"})
- Me.CbAxleConfig.Location = New System.Drawing.Point(153, 80)
- Me.CbAxleConfig.Name = "CbAxleConfig"
- Me.CbAxleConfig.Size = New System.Drawing.Size(60, 21)
- Me.CbAxleConfig.TabIndex = 1
- Me.CbAxleConfig.ValueMember = "Key"
- '
- 'CbCat
- '
- Me.CbCat.DisplayMember = "Value"
- Me.CbCat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.CbCat.FormattingEnabled = True
- Me.CbCat.Items.AddRange(New Object() {"-", "Rigid Truck", "Tractor", "City Bus", "Interurban Bus", "Coach"})
- Me.CbCat.Location = New System.Drawing.Point(12, 80)
- Me.CbCat.Name = "CbCat"
- Me.CbCat.Size = New System.Drawing.Size(135, 21)
- Me.CbCat.TabIndex = 0
- Me.CbCat.ValueMember = "Key"
- '
- 'Label5
- '
- Me.Label5.AutoSize = True
- Me.Label5.Location = New System.Drawing.Point(31, 108)
- Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(116, 13)
- Me.Label5.TabIndex = 2
- Me.Label5.Text = "Technically Permissible"
- '
- 'Label9
- '
- Me.Label9.AutoSize = True
- Me.Label9.Location = New System.Drawing.Point(197, 114)
- Me.Label9.Name = "Label9"
- Me.Label9.Size = New System.Drawing.Size(16, 13)
- Me.Label9.TabIndex = 3
- Me.Label9.Text = "[t]"
- Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
- '
- 'TbMassMass
- '
- Me.TbMassMass.Location = New System.Drawing.Point(153, 111)
- Me.TbMassMass.Name = "TbMassMass"
- Me.TbMassMass.Size = New System.Drawing.Size(42, 20)
- Me.TbMassMass.TabIndex = 2
- '
- 'StatusStrip1
- '
- Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
- Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 603)
- Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(666, 22)
- Me.StatusStrip1.SizingGrip = False
- Me.StatusStrip1.TabIndex = 36
- Me.StatusStrip1.Text = "StatusStrip1"
- '
- 'LbStatus
- '
- Me.LbStatus.Name = "LbStatus"
- Me.LbStatus.Size = New System.Drawing.Size(39, 17)
- Me.LbStatus.Text = "Status"
- '
- 'TbHDVclass
- '
- Me.TbHDVclass.Location = New System.Drawing.Point(153, 141)
- Me.TbHDVclass.Name = "TbHDVclass"
- Me.TbHDVclass.ReadOnly = True
- Me.TbHDVclass.Size = New System.Drawing.Size(42, 20)
- Me.TbHDVclass.TabIndex = 3
- Me.TbHDVclass.TabStop = False
- Me.TbHDVclass.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
- '
- 'GroupBox1
- '
- Me.GroupBox1.Controls.Add(Me.PnLoad)
- Me.GroupBox1.Controls.Add(Me.TbMass)
- Me.GroupBox1.Controls.Add(Me.Label1)
- Me.GroupBox1.Controls.Add(Me.Label14)
- Me.GroupBox1.Location = New System.Drawing.Point(6, 6)
- Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(278, 118)
- Me.GroupBox1.TabIndex = 0
- Me.GroupBox1.TabStop = False
- Me.GroupBox1.Text = "Masses / Loading"
- '
- 'PnLoad
- '
- Me.PnLoad.Controls.Add(Me.Label2)
- Me.PnLoad.Controls.Add(Me.Label31)
- Me.PnLoad.Controls.Add(Me.TbLoad)
- Me.PnLoad.Controls.Add(Me.TbMassExtra)
- Me.PnLoad.Controls.Add(Me.Label50)
- Me.PnLoad.Controls.Add(Me.Label46)
- Me.PnLoad.Location = New System.Drawing.Point(6, 43)
- Me.PnLoad.Name = "PnLoad"
- Me.PnLoad.Size = New System.Drawing.Size(269, 58)
- Me.PnLoad.TabIndex = 1
- '
- 'GrAirRes
- '
- Me.GrAirRes.Controls.Add(Me.PnCdATrTr)
- Me.GrAirRes.Location = New System.Drawing.Point(290, 6)
- Me.GrAirRes.Name = "GrAirRes"
- Me.GrAirRes.Size = New System.Drawing.Size(349, 72)
- Me.GrAirRes.TabIndex = 2
- Me.GrAirRes.TabStop = False
- Me.GrAirRes.Text = "Air Resistance"
- '
- 'PnCdATrTr
- '
- Me.PnCdATrTr.Controls.Add(Me.tbVehicleHeight)
- Me.PnCdATrTr.Controls.Add(Me.Label11)
- Me.PnCdATrTr.Controls.Add(Me.Label20)
- Me.PnCdATrTr.Controls.Add(Me.TBcdA)
- Me.PnCdATrTr.Controls.Add(Me.Label38)
- Me.PnCdATrTr.Controls.Add(Me.Label3)
- Me.PnCdATrTr.Dock = System.Windows.Forms.DockStyle.Fill
- Me.PnCdATrTr.Location = New System.Drawing.Point(3, 16)
- Me.PnCdATrTr.Name = "PnCdATrTr"
- Me.PnCdATrTr.Size = New System.Drawing.Size(343, 53)
- Me.PnCdATrTr.TabIndex = 0
- '
- 'tbVehicleHeight
- '
- Me.tbVehicleHeight.Location = New System.Drawing.Point(54, 29)
- Me.tbVehicleHeight.Name = "tbVehicleHeight"
- Me.tbVehicleHeight.Size = New System.Drawing.Size(57, 20)
- Me.tbVehicleHeight.TabIndex = 1
- '
- 'Label11
- '
- Me.Label11.AutoSize = True
- Me.Label11.Location = New System.Drawing.Point(117, 32)
- Me.Label11.Name = "Label11"
- Me.Label11.Size = New System.Drawing.Size(21, 13)
- Me.Label11.TabIndex = 27
- Me.Label11.Text = "[m]"
- '
- 'Label20
- '
- Me.Label20.AutoSize = True
- Me.Label20.Location = New System.Drawing.Point(10, 32)
- Me.Label20.Name = "Label20"
- Me.Label20.Size = New System.Drawing.Size(38, 13)
- Me.Label20.TabIndex = 26
- Me.Label20.Text = "Height"
- '
- 'Label38
- '
- Me.Label38.AutoSize = True
- Me.Label38.Location = New System.Drawing.Point(117, 6)
- Me.Label38.Name = "Label38"
- Me.Label38.Size = New System.Drawing.Size(24, 13)
- Me.Label38.TabIndex = 24
- Me.Label38.Text = "[m²]"
- '
- 'PictureBox1
- '
- Me.PictureBox1.BackColor = System.Drawing.Color.White
- Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
- Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
- Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(666, 40)
- Me.PictureBox1.TabIndex = 37
- Me.PictureBox1.TabStop = False
- '
- 'CmOpenFile
- '
- Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
- Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
- Me.CmOpenFile.Name = "CmOpenFile"
- Me.CmOpenFile.ShowImageMargin = False
- Me.CmOpenFile.Size = New System.Drawing.Size(128, 48)
- '
- 'OpenWithToolStripMenuItem
- '
- Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
- Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
- Me.OpenWithToolStripMenuItem.Text = "Open with ..."
- '
- 'ShowInFolderToolStripMenuItem
- '
- Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
- Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
- Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
- '
- 'GroupBox3
- '
- Me.GroupBox3.Controls.Add(Me.PnWheelDiam)
- Me.GroupBox3.Location = New System.Drawing.Point(6, 130)
- Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Size = New System.Drawing.Size(278, 50)
- Me.GroupBox3.TabIndex = 1
- Me.GroupBox3.TabStop = False
- Me.GroupBox3.Text = "Dynamic Tyre Radius"
- '
- 'gbAngledrive
- '
- Me.gbAngledrive.Controls.Add(Me.pnAngledriveFields)
- Me.gbAngledrive.Controls.Add(Me.cbAngledriveType)
- Me.gbAngledrive.Location = New System.Drawing.Point(329, 76)
- Me.gbAngledrive.Name = "gbAngledrive"
- Me.gbAngledrive.Size = New System.Drawing.Size(313, 111)
- Me.gbAngledrive.TabIndex = 3
- Me.gbAngledrive.TabStop = False
- Me.gbAngledrive.Text = "Angledrive"
- '
- 'pnAngledriveFields
- '
- Me.pnAngledriveFields.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.pnAngledriveFields.Controls.Add(Me.Label4)
- Me.pnAngledriveFields.Controls.Add(Me.Label10)
- Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveRatio)
- Me.pnAngledriveFields.Controls.Add(Me.btAngledriveLossMapBrowse)
- Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveLossMapPath)
- Me.pnAngledriveFields.Controls.Add(Me.Label12)
- Me.pnAngledriveFields.Location = New System.Drawing.Point(3, 42)
- Me.pnAngledriveFields.Name = "pnAngledriveFields"
- Me.pnAngledriveFields.Size = New System.Drawing.Size(303, 63)
- Me.pnAngledriveFields.TabIndex = 1
- '
- 'Label4
- '
- Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(277, 6)
- Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(16, 13)
- Me.Label4.TabIndex = 16
- Me.Label4.Text = "[-]"
- '
- 'Label10
- '
- Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label10.Location = New System.Drawing.Point(170, 6)
- Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(44, 18)
- Me.Label10.TabIndex = 15
- Me.Label10.Text = "Ratio"
- Me.Label10.TextAlign = System.Drawing.ContentAlignment.TopRight
- '
- 'tbAngledriveRatio
- '
- Me.tbAngledriveRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbAngledriveRatio.Location = New System.Drawing.Point(219, 4)
- Me.tbAngledriveRatio.Name = "tbAngledriveRatio"
- Me.tbAngledriveRatio.Size = New System.Drawing.Size(56, 20)
- Me.tbAngledriveRatio.TabIndex = 0
- '
- 'btAngledriveLossMapBrowse
- '
- Me.btAngledriveLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.btAngledriveLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(276, 39)
- Me.btAngledriveLossMapBrowse.Name = "btAngledriveLossMapBrowse"
- Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(24, 24)
- Me.btAngledriveLossMapBrowse.TabIndex = 2
- Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = True
- '
- 'tbAngledriveLossMapPath
- '
- Me.tbAngledriveLossMapPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(3, 41)
- Me.tbAngledriveLossMapPath.Name = "tbAngledriveLossMapPath"
- Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(273, 20)
- Me.tbAngledriveLossMapPath.TabIndex = 1
- '
- 'Label12
- '
- Me.Label12.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label12.Location = New System.Drawing.Point(0, 24)
- Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(294, 16)
- Me.Label12.TabIndex = 17
- Me.Label12.Text = "Transmission Loss Map or Efficiency Value [0..1]"
- Me.Label12.TextAlign = System.Drawing.ContentAlignment.BottomLeft
- '
- 'cbAngledriveType
- '
- Me.cbAngledriveType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.cbAngledriveType.DisplayMember = "Value"
- Me.cbAngledriveType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbAngledriveType.Location = New System.Drawing.Point(6, 19)
- Me.cbAngledriveType.Name = "cbAngledriveType"
- Me.cbAngledriveType.Size = New System.Drawing.Size(297, 21)
- Me.cbAngledriveType.TabIndex = 0
- Me.cbAngledriveType.ValueMember = "Key"
- '
- 'PicVehicle
- '
- Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
- Me.PicVehicle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PicVehicle.Location = New System.Drawing.Point(281, 70)
- Me.PicVehicle.Name = "PicVehicle"
- Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
- Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
- Me.PicVehicle.TabIndex = 39
- Me.PicVehicle.TabStop = False
- '
- 'Label8
- '
- Me.Label8.AutoSize = True
- Me.Label8.Location = New System.Drawing.Point(85, 144)
- Me.Label8.Name = "Label8"
- Me.Label8.Size = New System.Drawing.Size(62, 13)
- Me.Label8.TabIndex = 10
- Me.Label8.Text = "HDV Group"
- '
- 'cbPTOType
- '
- Me.cbPTOType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.cbPTOType.DisplayMember = "Value"
- Me.cbPTOType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbPTOType.Location = New System.Drawing.Point(6, 24)
- Me.cbPTOType.Name = "cbPTOType"
- Me.cbPTOType.Size = New System.Drawing.Size(619, 21)
- Me.cbPTOType.TabIndex = 0
- Me.ToolTip1.SetToolTip(Me.cbPTOType, "Transmission type to the PTO consumer")
- Me.cbPTOType.ValueMember = "Key"
- '
- 'tbPTOCycle
- '
- Me.tbPTOCycle.Location = New System.Drawing.Point(6, 71)
- Me.tbPTOCycle.Name = "tbPTOCycle"
- Me.tbPTOCycle.Size = New System.Drawing.Size(430, 20)
- Me.tbPTOCycle.TabIndex = 2
- Me.ToolTip1.SetToolTip(Me.tbPTOCycle, "PTO Consumer Loss Map")
- '
- 'tbPTOLossMap
- '
- Me.tbPTOLossMap.Location = New System.Drawing.Point(6, 24)
- Me.tbPTOLossMap.Name = "tbPTOLossMap"
- Me.tbPTOLossMap.Size = New System.Drawing.Size(430, 20)
- Me.tbPTOLossMap.TabIndex = 0
- Me.ToolTip1.SetToolTip(Me.tbPTOLossMap, "PTO Consumer Loss Map")
- '
- 'tbPTODrive
- '
- Me.tbPTODrive.Location = New System.Drawing.Point(6, 183)
- Me.tbPTODrive.Name = "tbPTODrive"
- Me.tbPTODrive.Size = New System.Drawing.Size(430, 20)
- Me.tbPTODrive.TabIndex = 5
- Me.ToolTip1.SetToolTip(Me.tbPTODrive, "PTO Consumer Loss Map")
- '
- 'tcVehicleComponents
- '
- Me.tcVehicleComponents.Controls.Add(Me.tpGeneral)
- Me.tcVehicleComponents.Controls.Add(Me.tpPowertrain)
- Me.tcVehicleComponents.Controls.Add(Me.tpElectricComponents)
- Me.tcVehicleComponents.Controls.Add(Me.tpGensetComponents)
- Me.tcVehicleComponents.Controls.Add(Me.tpTorqueLimits)
- Me.tcVehicleComponents.Controls.Add(Me.tpADAS)
- Me.tcVehicleComponents.Controls.Add(Me.tpRoadSweeper)
- Me.tcVehicleComponents.Location = New System.Drawing.Point(5, 173)
- Me.tcVehicleComponents.Name = "tcVehicleComponents"
- Me.tcVehicleComponents.SelectedIndex = 0
- Me.tcVehicleComponents.Size = New System.Drawing.Size(656, 400)
- Me.tcVehicleComponents.TabIndex = 5
- '
- 'tpGeneral
- '
- Me.tpGeneral.Controls.Add(Me.GroupBox1)
- Me.tpGeneral.Controls.Add(Me.GroupBox3)
- Me.tpGeneral.Controls.Add(Me.GroupBox6)
- Me.tpGeneral.Controls.Add(Me.GroupBox8)
- Me.tpGeneral.Controls.Add(Me.GrAirRes)
- Me.tpGeneral.Location = New System.Drawing.Point(4, 22)
- Me.tpGeneral.Name = "tpGeneral"
- Me.tpGeneral.Padding = New System.Windows.Forms.Padding(3)
- Me.tpGeneral.Size = New System.Drawing.Size(648, 374)
- Me.tpGeneral.TabIndex = 0
- Me.tpGeneral.Text = "General"
- Me.tpGeneral.UseVisualStyleBackColor = True
- '
- 'tpPowertrain
- '
- Me.tpPowertrain.Controls.Add(Me.gbVehicleIdlingSpeed)
- Me.tpPowertrain.Controls.Add(Me.gbTankSystem)
- Me.tpPowertrain.Controls.Add(Me.gbRetarderLosses)
- Me.tpPowertrain.Controls.Add(Me.gbAngledrive)
- Me.tpPowertrain.Location = New System.Drawing.Point(4, 22)
- Me.tpPowertrain.Name = "tpPowertrain"
- Me.tpPowertrain.Padding = New System.Windows.Forms.Padding(3)
- Me.tpPowertrain.Size = New System.Drawing.Size(648, 374)
- Me.tpPowertrain.TabIndex = 1
- Me.tpPowertrain.Text = "Powertrain"
- Me.tpPowertrain.UseVisualStyleBackColor = True
- '
- 'gbVehicleIdlingSpeed
- '
- Me.gbVehicleIdlingSpeed.Controls.Add(Me.Panel1)
- Me.gbVehicleIdlingSpeed.Location = New System.Drawing.Point(6, 6)
- Me.gbVehicleIdlingSpeed.Name = "gbVehicleIdlingSpeed"
- Me.gbVehicleIdlingSpeed.Size = New System.Drawing.Size(310, 63)
- Me.gbVehicleIdlingSpeed.TabIndex = 0
- Me.gbVehicleIdlingSpeed.TabStop = False
- Me.gbVehicleIdlingSpeed.Text = "Vehicle Idling Speed"
- '
- 'Panel1
- '
- Me.Panel1.Controls.Add(Me.tbVehIdlingSpeed)
- Me.Panel1.Controls.Add(Me.Label18)
- Me.Panel1.Controls.Add(Me.Label19)
- Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
- Me.Panel1.Location = New System.Drawing.Point(3, 16)
- Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(304, 44)
- Me.Panel1.TabIndex = 0
- '
- 'tbVehIdlingSpeed
- '
- Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(205, 4)
- Me.tbVehIdlingSpeed.Name = "tbVehIdlingSpeed"
- Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(56, 20)
- Me.tbVehIdlingSpeed.TabIndex = 0
- '
- 'Label18
- '
- Me.Label18.AutoSize = True
- Me.Label18.Location = New System.Drawing.Point(264, 7)
- Me.Label18.Name = "Label18"
- Me.Label18.Size = New System.Drawing.Size(30, 13)
- Me.Label18.TabIndex = 24
- Me.Label18.Text = "[rpm]"
- '
- 'Label19
- '
- Me.Label19.AutoSize = True
- Me.Label19.Location = New System.Drawing.Point(104, 7)
- Me.Label19.Name = "Label19"
- Me.Label19.Size = New System.Drawing.Size(94, 13)
- Me.Label19.TabIndex = 8
- Me.Label19.Text = "Engine Idle Speed"
- '
- 'gbTankSystem
- '
- Me.gbTankSystem.Controls.Add(Me.cbTankSystem)
- Me.gbTankSystem.Controls.Add(Me.Label23)
- Me.gbTankSystem.Location = New System.Drawing.Point(329, 6)
- Me.gbTankSystem.Name = "gbTankSystem"
- Me.gbTankSystem.Size = New System.Drawing.Size(310, 63)
- Me.gbTankSystem.TabIndex = 2
- Me.gbTankSystem.TabStop = False
- Me.gbTankSystem.Text = "Tank System"
- '
- 'cbTankSystem
- '
- Me.cbTankSystem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.cbTankSystem.DisplayMember = "Value"
- Me.cbTankSystem.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbTankSystem.Location = New System.Drawing.Point(6, 19)
- Me.cbTankSystem.Name = "cbTankSystem"
- Me.cbTankSystem.Size = New System.Drawing.Size(297, 21)
- Me.cbTankSystem.TabIndex = 1
- Me.cbTankSystem.ValueMember = "Key"
- '
- 'Label23
- '
- Me.Label23.AutoSize = True
- Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label23.Location = New System.Drawing.Point(3, 43)
- Me.Label23.Name = "Label23"
- Me.Label23.Size = New System.Drawing.Size(187, 13)
- Me.Label23.TabIndex = 0
- Me.Label23.Text = "Only applicable for NG engines!"
- '
- 'tpElectricComponents
- '
- Me.tpElectricComponents.Controls.Add(Me.gbBattery)
- Me.tpElectricComponents.Controls.Add(Me.gpElectricMotor)
- Me.tpElectricComponents.Location = New System.Drawing.Point(4, 22)
- Me.tpElectricComponents.Name = "tpElectricComponents"
- Me.tpElectricComponents.Padding = New System.Windows.Forms.Padding(3)
- Me.tpElectricComponents.Size = New System.Drawing.Size(648, 374)
- Me.tpElectricComponents.TabIndex = 4
- Me.tpElectricComponents.Text = "Electric Powertrain Components"
- Me.tpElectricComponents.UseVisualStyleBackColor = True
- '
- 'gbBattery
- '
- Me.gbBattery.Controls.Add(Me.lvREESSPacks)
- Me.gbBattery.Controls.Add(Me.btnAddReessPack)
- Me.gbBattery.Controls.Add(Me.lblEditReessPack)
- Me.gbBattery.Controls.Add(Me.btnRemoveReessPack)
- Me.gbBattery.Controls.Add(Me.lblInitialSoCUnit)
- Me.gbBattery.Controls.Add(Me.tbInitialSoC)
- Me.gbBattery.Controls.Add(Me.lblInitialSoC)
- Me.gbBattery.Location = New System.Drawing.Point(6, 175)
- Me.gbBattery.Name = "gbBattery"
- Me.gbBattery.Size = New System.Drawing.Size(633, 187)
- Me.gbBattery.TabIndex = 2
- Me.gbBattery.TabStop = False
- Me.gbBattery.Text = "Electric Energy Storage system"
- '
- 'lvREESSPacks
- '
- Me.lvREESSPacks.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.lvREESSPacks.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.chReessPackPack, Me.chReessPackCount, Me.chReessPackStringId})
- Me.lvREESSPacks.FullRowSelect = True
- Me.lvREESSPacks.GridLines = True
- Me.lvREESSPacks.HideSelection = False
- Me.lvREESSPacks.Location = New System.Drawing.Point(6, 45)
- Me.lvREESSPacks.MultiSelect = False
- Me.lvREESSPacks.Name = "lvREESSPacks"
- Me.lvREESSPacks.Size = New System.Drawing.Size(553, 102)
- Me.lvREESSPacks.TabIndex = 31
- Me.lvREESSPacks.TabStop = False
- Me.lvREESSPacks.UseCompatibleStateImageBehavior = False
- Me.lvREESSPacks.View = System.Windows.Forms.View.Details
- '
- 'chReessPackPack
- '
- Me.chReessPackPack.Text = "REESS Pack"
- Me.chReessPackPack.Width = 350
- '
- 'chReessPackCount
- '
- Me.chReessPackCount.Text = "Count"
- Me.chReessPackCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
- '
- 'chReessPackStringId
- '
- Me.chReessPackStringId.Text = "Stream #"
- Me.chReessPackStringId.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
- '
- 'btnAddReessPack
- '
- Me.btnAddReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btnAddReessPack.Location = New System.Drawing.Point(6, 153)
- Me.btnAddReessPack.Name = "btnAddReessPack"
- Me.btnAddReessPack.Size = New System.Drawing.Size(24, 24)
- Me.btnAddReessPack.TabIndex = 1
- Me.btnAddReessPack.UseVisualStyleBackColor = True
- '
- 'lblEditReessPack
- '
- Me.lblEditReessPack.AutoSize = True
- Me.lblEditReessPack.Location = New System.Drawing.Point(452, 148)
- Me.lblEditReessPack.Name = "lblEditReessPack"
- Me.lblEditReessPack.Size = New System.Drawing.Size(106, 13)
- Me.lblEditReessPack.TabIndex = 30
- Me.lblEditReessPack.Text = "(Double-Click to Edit)"
- '
- 'btnRemoveReessPack
- '
- Me.btnRemoveReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btnRemoveReessPack.Location = New System.Drawing.Point(33, 153)
- Me.btnRemoveReessPack.Name = "btnRemoveReessPack"
- Me.btnRemoveReessPack.Size = New System.Drawing.Size(24, 24)
- Me.btnRemoveReessPack.TabIndex = 2
- Me.btnRemoveReessPack.UseVisualStyleBackColor = True
- '
- 'lblInitialSoCUnit
- '
- Me.lblInitialSoCUnit.AutoSize = True
- Me.lblInitialSoCUnit.Location = New System.Drawing.Point(265, 21)
- Me.lblInitialSoCUnit.Name = "lblInitialSoCUnit"
- Me.lblInitialSoCUnit.Size = New System.Drawing.Size(21, 13)
- Me.lblInitialSoCUnit.TabIndex = 27
- Me.lblInitialSoCUnit.Text = "[%]"
- '
- 'tbInitialSoC
- '
- Me.tbInitialSoC.Location = New System.Drawing.Point(204, 19)
- Me.tbInitialSoC.Name = "tbInitialSoC"
- Me.tbInitialSoC.Size = New System.Drawing.Size(59, 20)
- Me.tbInitialSoC.TabIndex = 0
- '
- 'lblInitialSoC
- '
- Me.lblInitialSoC.AutoSize = True
- Me.lblInitialSoC.Location = New System.Drawing.Point(7, 22)
- Me.lblInitialSoC.Name = "lblInitialSoC"
- Me.lblInitialSoC.RightToLeft = System.Windows.Forms.RightToLeft.Yes
- Me.lblInitialSoC.Size = New System.Drawing.Size(54, 13)
- Me.lblInitialSoC.TabIndex = 25
- Me.lblInitialSoC.Text = "Initial SoC"
- '
- 'gpElectricMotor
- '
- Me.gpElectricMotor.Controls.Add(Me.Label33)
- Me.gpElectricMotor.Controls.Add(Me.Label32)
- Me.gpElectricMotor.Controls.Add(Me.gbRatiosPerGear)
- Me.gpElectricMotor.Controls.Add(Me.btnEmADCLossMap)
- Me.gpElectricMotor.Controls.Add(Me.tbEmADCLossMap)
- Me.gpElectricMotor.Controls.Add(Me.lblEmADCLossmap)
- Me.gpElectricMotor.Controls.Add(Me.tbRatioEm)
- Me.gpElectricMotor.Controls.Add(Me.lblRatioEm)
- Me.gpElectricMotor.Controls.Add(Me.tbEmCount)
- Me.gpElectricMotor.Controls.Add(Me.cbEmPos)
- Me.gpElectricMotor.Controls.Add(Me.lblEmCount)
- Me.gpElectricMotor.Controls.Add(Me.lblEmPosition)
- Me.gpElectricMotor.Controls.Add(Me.pnElectricMotor)
- Me.gpElectricMotor.Location = New System.Drawing.Point(6, 6)
- Me.gpElectricMotor.Name = "gpElectricMotor"
- Me.gpElectricMotor.Size = New System.Drawing.Size(633, 163)
- Me.gpElectricMotor.TabIndex = 0
- Me.gpElectricMotor.TabStop = False
- Me.gpElectricMotor.Text = "Electric Machine"
- '
- 'Label33
- '
- Me.Label33.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label33.AutoSize = True
- Me.Label33.Location = New System.Drawing.Point(203, 108)
- Me.Label33.Name = "Label33"
- Me.Label33.Size = New System.Drawing.Size(16, 13)
- Me.Label33.TabIndex = 27
- Me.Label33.Text = "[-]"
- '
- 'Label32
- '
- Me.Label32.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label32.AutoSize = True
- Me.Label32.Location = New System.Drawing.Point(203, 82)
- Me.Label32.Name = "Label32"
- Me.Label32.Size = New System.Drawing.Size(16, 13)
- Me.Label32.TabIndex = 26
- Me.Label32.Text = "[-]"
- '
- 'gbRatiosPerGear
- '
- Me.gbRatiosPerGear.Controls.Add(Me.lvRatioPerGear)
- Me.gbRatiosPerGear.Controls.Add(Me.btnAddEMRatio)
- Me.gbRatiosPerGear.Controls.Add(Me.Label29)
- Me.gbRatiosPerGear.Controls.Add(Me.btnRemoveEMRatio)
- Me.gbRatiosPerGear.Location = New System.Drawing.Point(444, 12)
- Me.gbRatiosPerGear.Name = "gbRatiosPerGear"
- Me.gbRatiosPerGear.Size = New System.Drawing.Size(181, 145)
- Me.gbRatiosPerGear.TabIndex = 1
- Me.gbRatiosPerGear.TabStop = False
- Me.gbRatiosPerGear.Text = "Transmission Ratio per Gear"
- '
- 'lvRatioPerGear
- '
- Me.lvRatioPerGear.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.lvRatioPerGear.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader11, Me.ColumnHeader12})
- Me.lvRatioPerGear.FullRowSelect = True
- Me.lvRatioPerGear.GridLines = True
- Me.lvRatioPerGear.HideSelection = False
- Me.lvRatioPerGear.Location = New System.Drawing.Point(6, 16)
- Me.lvRatioPerGear.MultiSelect = False
- Me.lvRatioPerGear.Name = "lvRatioPerGear"
- Me.lvRatioPerGear.Size = New System.Drawing.Size(169, 94)
- Me.lvRatioPerGear.TabIndex = 7
- Me.lvRatioPerGear.TabStop = False
- Me.lvRatioPerGear.UseCompatibleStateImageBehavior = False
- Me.lvRatioPerGear.View = System.Windows.Forms.View.Details
- '
- 'ColumnHeader11
- '
- Me.ColumnHeader11.Text = "Gear #"
- Me.ColumnHeader11.Width = 59
- '
- 'ColumnHeader12
- '
- Me.ColumnHeader12.Text = "Ratio"
- Me.ColumnHeader12.Width = 172
- '
- 'btnAddEMRatio
- '
- Me.btnAddEMRatio.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btnAddEMRatio.Location = New System.Drawing.Point(6, 116)
- Me.btnAddEMRatio.Name = "btnAddEMRatio"
- Me.btnAddEMRatio.Size = New System.Drawing.Size(24, 24)
- Me.btnAddEMRatio.TabIndex = 4
- Me.btnAddEMRatio.UseVisualStyleBackColor = True
- '
- 'Label29
- '
- Me.Label29.AutoSize = True
- Me.Label29.Location = New System.Drawing.Point(71, 111)
- Me.Label29.Name = "Label29"
- Me.Label29.Size = New System.Drawing.Size(106, 13)
- Me.Label29.TabIndex = 6
- Me.Label29.Text = "(Double-Click to Edit)"
- '
- 'btnRemoveEMRatio
- '
- Me.btnRemoveEMRatio.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btnRemoveEMRatio.Location = New System.Drawing.Point(33, 116)
- Me.btnRemoveEMRatio.Name = "btnRemoveEMRatio"
- Me.btnRemoveEMRatio.Size = New System.Drawing.Size(24, 24)
- Me.btnRemoveEMRatio.TabIndex = 5
- Me.btnRemoveEMRatio.UseVisualStyleBackColor = True
- '
- 'btnEmADCLossMap
- '
- Me.btnEmADCLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.btnEmADCLossMap.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnEmADCLossMap.Location = New System.Drawing.Point(346, 129)
- Me.btnEmADCLossMap.Name = "btnEmADCLossMap"
- Me.btnEmADCLossMap.Size = New System.Drawing.Size(24, 24)
- Me.btnEmADCLossMap.TabIndex = 5
- Me.btnEmADCLossMap.UseVisualStyleBackColor = True
- '
- 'tbEmADCLossMap
- '
- Me.tbEmADCLossMap.Location = New System.Drawing.Point(110, 131)
- Me.tbEmADCLossMap.Name = "tbEmADCLossMap"
- Me.tbEmADCLossMap.Size = New System.Drawing.Size(234, 20)
- Me.tbEmADCLossMap.TabIndex = 4
- '
- 'lblEmADCLossmap
- '
- Me.lblEmADCLossmap.AutoSize = True
- Me.lblEmADCLossmap.Location = New System.Drawing.Point(7, 134)
- Me.lblEmADCLossmap.Name = "lblEmADCLossmap"
- Me.lblEmADCLossmap.Size = New System.Drawing.Size(100, 13)
- Me.lblEmADCLossmap.TabIndex = 25
- Me.lblEmADCLossmap.Text = "Loss Map EM ADC:"
- '
- 'tbRatioEm
- '
- Me.tbRatioEm.Location = New System.Drawing.Point(110, 105)
- Me.tbRatioEm.Name = "tbRatioEm"
- Me.tbRatioEm.Size = New System.Drawing.Size(91, 20)
- Me.tbRatioEm.TabIndex = 3
- '
- 'lblRatioEm
- '
- Me.lblRatioEm.AutoSize = True
- Me.lblRatioEm.Location = New System.Drawing.Point(7, 108)
- Me.lblRatioEm.Name = "lblRatioEm"
- Me.lblRatioEm.Size = New System.Drawing.Size(79, 13)
- Me.lblRatioEm.TabIndex = 23
- Me.lblRatioEm.Text = "Ratio EM ADC:"
- '
- 'tbEmCount
- '
- Me.tbEmCount.Location = New System.Drawing.Point(110, 79)
- Me.tbEmCount.Name = "tbEmCount"
- Me.tbEmCount.Size = New System.Drawing.Size(91, 20)
- Me.tbEmCount.TabIndex = 2
- '
- 'cbEmPos
- '
- Me.cbEmPos.DisplayMember = "Value"
- Me.cbEmPos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbEmPos.FormattingEnabled = True
- Me.cbEmPos.Location = New System.Drawing.Point(110, 52)
- Me.cbEmPos.Name = "cbEmPos"
- Me.cbEmPos.Size = New System.Drawing.Size(153, 21)
- Me.cbEmPos.TabIndex = 1
- Me.cbEmPos.ValueMember = "Key"
- '
- 'lblEmCount
- '
- Me.lblEmCount.AutoSize = True
- Me.lblEmCount.Location = New System.Drawing.Point(7, 82)
- Me.lblEmCount.Name = "lblEmCount"
- Me.lblEmCount.Size = New System.Drawing.Size(83, 13)
- Me.lblEmCount.TabIndex = 20
- Me.lblEmCount.Text = "Number of EMs:"
- '
- 'lblEmPosition
- '
- Me.lblEmPosition.AutoSize = True
- Me.lblEmPosition.Location = New System.Drawing.Point(7, 56)
- Me.lblEmPosition.Name = "lblEmPosition"
- Me.lblEmPosition.Size = New System.Drawing.Size(47, 13)
- Me.lblEmPosition.TabIndex = 19
- Me.lblEmPosition.Text = "Position:"
- '
- 'pnElectricMotor
- '
- Me.pnElectricMotor.Controls.Add(Me.btnOpenElectricMotor)
- Me.pnElectricMotor.Controls.Add(Me.btnBrowseElectricMotor)
- Me.pnElectricMotor.Controls.Add(Me.tbElectricMotor)
- Me.pnElectricMotor.Location = New System.Drawing.Point(6, 19)
- Me.pnElectricMotor.Name = "pnElectricMotor"
- Me.pnElectricMotor.Size = New System.Drawing.Size(432, 27)
- Me.pnElectricMotor.TabIndex = 0
- '
- 'btnOpenElectricMotor
- '
- Me.btnOpenElectricMotor.Location = New System.Drawing.Point(4, 3)
- Me.btnOpenElectricMotor.Name = "btnOpenElectricMotor"
- Me.btnOpenElectricMotor.Size = New System.Drawing.Size(94, 21)
- Me.btnOpenElectricMotor.TabIndex = 0
- Me.btnOpenElectricMotor.Text = "Electric Machine"
- Me.btnOpenElectricMotor.UseVisualStyleBackColor = True
- '
- 'btnBrowseElectricMotor
- '
- Me.btnBrowseElectricMotor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.btnBrowseElectricMotor.Image = CType(resources.GetObject("btnBrowseElectricMotor.Image"), System.Drawing.Image)
- Me.btnBrowseElectricMotor.Location = New System.Drawing.Point(406, 2)
- Me.btnBrowseElectricMotor.Name = "btnBrowseElectricMotor"
- Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(24, 24)
- Me.btnBrowseElectricMotor.TabIndex = 2
- Me.btnBrowseElectricMotor.UseVisualStyleBackColor = True
- '
- 'tbElectricMotor
- '
- Me.tbElectricMotor.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbElectricMotor.Location = New System.Drawing.Point(104, 4)
- Me.tbElectricMotor.Name = "tbElectricMotor"
- Me.tbElectricMotor.Size = New System.Drawing.Size(300, 20)
- Me.tbElectricMotor.TabIndex = 1
- '
- 'tpGensetComponents
- '
- Me.tpGensetComponents.Controls.Add(Me.Label30)
- Me.tpGensetComponents.Controls.Add(Me.gbGenSet)
- Me.tpGensetComponents.Location = New System.Drawing.Point(4, 22)
- Me.tpGensetComponents.Margin = New System.Windows.Forms.Padding(2)
- Me.tpGensetComponents.Name = "tpGensetComponents"
- Me.tpGensetComponents.Size = New System.Drawing.Size(648, 374)
- Me.tpGensetComponents.TabIndex = 5
- Me.tpGensetComponents.Text = "GenSet Components"
- Me.tpGensetComponents.UseVisualStyleBackColor = True
- '
- 'Label30
- '
- Me.Label30.AutoSize = True
- Me.Label30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label30.Location = New System.Drawing.Point(13, 153)
- Me.Label30.Name = "Label30"
- Me.Label30.Size = New System.Drawing.Size(429, 13)
- Me.Label30.TabIndex = 21
- Me.Label30.Text = "Note: The internal combustion engine of the GenSet is configured in the Job-Edito" &
- "r dialog."
- '
- 'gbGenSet
- '
- Me.gbGenSet.Controls.Add(Me.Label36)
- Me.gbGenSet.Controls.Add(Me.Label34)
- Me.gbGenSet.Controls.Add(Me.btnGenSetLossMap)
- Me.gbGenSet.Controls.Add(Me.tbGenSetADC)
- Me.gbGenSet.Controls.Add(Me.lblGenSetADC)
- Me.gbGenSet.Controls.Add(Me.tbGenSetRatio)
- Me.gbGenSet.Controls.Add(Me.lblGenSetRatio)
- Me.gbGenSet.Controls.Add(Me.tbGenSetCount)
- Me.gbGenSet.Controls.Add(Me.lblGenSetCount)
- Me.gbGenSet.Controls.Add(Me.pnGenSetEM)
- Me.gbGenSet.Location = New System.Drawing.Point(6, 6)
- Me.gbGenSet.Name = "gbGenSet"
- Me.gbGenSet.Size = New System.Drawing.Size(633, 135)
- Me.gbGenSet.TabIndex = 1
- Me.gbGenSet.TabStop = False
- Me.gbGenSet.Text = "Electric Machine"
- '
- 'Label36
- '
- Me.Label36.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label36.AutoSize = True
- Me.Label36.Location = New System.Drawing.Point(203, 83)
- Me.Label36.Name = "Label36"
- Me.Label36.Size = New System.Drawing.Size(16, 13)
- Me.Label36.TabIndex = 28
- Me.Label36.Text = "[-]"
- '
- 'Label34
- '
- Me.Label34.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label34.AutoSize = True
- Me.Label34.Location = New System.Drawing.Point(203, 57)
- Me.Label34.Name = "Label34"
- Me.Label34.Size = New System.Drawing.Size(16, 13)
- Me.Label34.TabIndex = 27
- Me.Label34.Text = "[-]"
- '
- 'btnGenSetLossMap
- '
- Me.btnGenSetLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.btnGenSetLossMap.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnGenSetLossMap.Location = New System.Drawing.Point(412, 105)
- Me.btnGenSetLossMap.Name = "btnGenSetLossMap"
- Me.btnGenSetLossMap.Size = New System.Drawing.Size(24, 24)
- Me.btnGenSetLossMap.TabIndex = 5
- Me.btnGenSetLossMap.UseVisualStyleBackColor = True
- '
- 'tbGenSetADC
- '
- Me.tbGenSetADC.Location = New System.Drawing.Point(110, 107)
- Me.tbGenSetADC.Name = "tbGenSetADC"
- Me.tbGenSetADC.Size = New System.Drawing.Size(301, 20)
- Me.tbGenSetADC.TabIndex = 4
- '
- 'lblGenSetADC
- '
- Me.lblGenSetADC.AutoSize = True
- Me.lblGenSetADC.Location = New System.Drawing.Point(7, 110)
- Me.lblGenSetADC.Name = "lblGenSetADC"
- Me.lblGenSetADC.Size = New System.Drawing.Size(100, 13)
- Me.lblGenSetADC.TabIndex = 25
- Me.lblGenSetADC.Text = "Loss Map EM ADC:"
- '
- 'tbGenSetRatio
- '
- Me.tbGenSetRatio.Location = New System.Drawing.Point(110, 81)
- Me.tbGenSetRatio.Name = "tbGenSetRatio"
- Me.tbGenSetRatio.Size = New System.Drawing.Size(91, 20)
- Me.tbGenSetRatio.TabIndex = 3
- '
- 'lblGenSetRatio
- '
- Me.lblGenSetRatio.AutoSize = True
- Me.lblGenSetRatio.Location = New System.Drawing.Point(7, 84)
- Me.lblGenSetRatio.Name = "lblGenSetRatio"
- Me.lblGenSetRatio.Size = New System.Drawing.Size(79, 13)
- Me.lblGenSetRatio.TabIndex = 23
- Me.lblGenSetRatio.Text = "Ratio EM ADC:"
- '
- 'tbGenSetCount
- '
- Me.tbGenSetCount.Location = New System.Drawing.Point(110, 55)
- Me.tbGenSetCount.Name = "tbGenSetCount"
- Me.tbGenSetCount.Size = New System.Drawing.Size(91, 20)
- Me.tbGenSetCount.TabIndex = 2
- '
- 'lblGenSetCount
- '
- Me.lblGenSetCount.AutoSize = True
- Me.lblGenSetCount.Location = New System.Drawing.Point(7, 58)
- Me.lblGenSetCount.Name = "lblGenSetCount"
- Me.lblGenSetCount.Size = New System.Drawing.Size(83, 13)
- Me.lblGenSetCount.TabIndex = 20
- Me.lblGenSetCount.Text = "Number of EMs:"
- '
- 'pnGenSetEM
- '
- Me.pnGenSetEM.Controls.Add(Me.btnOpenGenSetEM)
- Me.pnGenSetEM.Controls.Add(Me.btnBrowseGenSetEM)
- Me.pnGenSetEM.Controls.Add(Me.tbGenSetEM)
- Me.pnGenSetEM.Location = New System.Drawing.Point(6, 19)
- Me.pnGenSetEM.Name = "pnGenSetEM"
- Me.pnGenSetEM.Size = New System.Drawing.Size(432, 27)
- Me.pnGenSetEM.TabIndex = 0
- '
- 'btnOpenGenSetEM
- '
- Me.btnOpenGenSetEM.Location = New System.Drawing.Point(4, 3)
- Me.btnOpenGenSetEM.Name = "btnOpenGenSetEM"
- Me.btnOpenGenSetEM.Size = New System.Drawing.Size(94, 21)
- Me.btnOpenGenSetEM.TabIndex = 0
- Me.btnOpenGenSetEM.Text = "Electric Machine"
- Me.btnOpenGenSetEM.UseVisualStyleBackColor = True
- '
- 'btnBrowseGenSetEM
- '
- Me.btnBrowseGenSetEM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.btnBrowseGenSetEM.Image = CType(resources.GetObject("btnBrowseGenSetEM.Image"), System.Drawing.Image)
- Me.btnBrowseGenSetEM.Location = New System.Drawing.Point(406, 2)
- Me.btnBrowseGenSetEM.Name = "btnBrowseGenSetEM"
- Me.btnBrowseGenSetEM.Size = New System.Drawing.Size(24, 24)
- Me.btnBrowseGenSetEM.TabIndex = 2
- Me.btnBrowseGenSetEM.UseVisualStyleBackColor = True
- '
- 'tbGenSetEM
- '
- Me.tbGenSetEM.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbGenSetEM.Location = New System.Drawing.Point(104, 4)
- Me.tbGenSetEM.Name = "tbGenSetEM"
- Me.tbGenSetEM.Size = New System.Drawing.Size(301, 20)
- Me.tbGenSetEM.TabIndex = 1
- '
- 'tpTorqueLimits
- '
- Me.tpTorqueLimits.Controls.Add(Me.gbPropulsionTorque)
- Me.tpTorqueLimits.Controls.Add(Me.gbEMTorqueLimits)
- Me.tpTorqueLimits.Controls.Add(Me.bgVehicleTorqueLimits)
- Me.tpTorqueLimits.Location = New System.Drawing.Point(4, 22)
- Me.tpTorqueLimits.Name = "tpTorqueLimits"
- Me.tpTorqueLimits.Size = New System.Drawing.Size(648, 374)
- Me.tpTorqueLimits.TabIndex = 2
- Me.tpTorqueLimits.Text = "Torque Limits"
- Me.tpTorqueLimits.UseVisualStyleBackColor = True
- '
- 'gbPropulsionTorque
- '
- Me.gbPropulsionTorque.Controls.Add(Me.btnPropulsionTorqueLimit)
- Me.gbPropulsionTorque.Controls.Add(Me.tbPropulsionTorqueLimit)
- Me.gbPropulsionTorque.Location = New System.Drawing.Point(233, 64)
- Me.gbPropulsionTorque.Name = "gbPropulsionTorque"
- Me.gbPropulsionTorque.Size = New System.Drawing.Size(403, 52)
- Me.gbPropulsionTorque.TabIndex = 2
- Me.gbPropulsionTorque.TabStop = False
- Me.gbPropulsionTorque.Text = "Propulsion Torque Limit"
- '
- 'btnPropulsionTorqueLimit
- '
- Me.btnPropulsionTorqueLimit.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.btnPropulsionTorqueLimit.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnPropulsionTorqueLimit.Location = New System.Drawing.Point(373, 18)
- Me.btnPropulsionTorqueLimit.Name = "btnPropulsionTorqueLimit"
- Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(24, 24)
- Me.btnPropulsionTorqueLimit.TabIndex = 1
- Me.btnPropulsionTorqueLimit.UseVisualStyleBackColor = True
- '
- 'tbPropulsionTorqueLimit
- '
- Me.tbPropulsionTorqueLimit.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbPropulsionTorqueLimit.Location = New System.Drawing.Point(6, 20)
- Me.tbPropulsionTorqueLimit.Name = "tbPropulsionTorqueLimit"
- Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(365, 20)
- Me.tbPropulsionTorqueLimit.TabIndex = 0
- '
- 'gbEMTorqueLimits
- '
- Me.gbEMTorqueLimits.Controls.Add(Me.btnEmTorqueLimits)
- Me.gbEMTorqueLimits.Controls.Add(Me.tbEmTorqueLimits)
- Me.gbEMTorqueLimits.Location = New System.Drawing.Point(233, 6)
- Me.gbEMTorqueLimits.Name = "gbEMTorqueLimits"
- Me.gbEMTorqueLimits.Size = New System.Drawing.Size(403, 52)
- Me.gbEMTorqueLimits.TabIndex = 1
- Me.gbEMTorqueLimits.TabStop = False
- Me.gbEMTorqueLimits.Text = "Electric Machine Torque Limits"
- '
- 'btnEmTorqueLimits
- '
- Me.btnEmTorqueLimits.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.btnEmTorqueLimits.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnEmTorqueLimits.Location = New System.Drawing.Point(373, 17)
- Me.btnEmTorqueLimits.Name = "btnEmTorqueLimits"
- Me.btnEmTorqueLimits.Size = New System.Drawing.Size(24, 24)
- Me.btnEmTorqueLimits.TabIndex = 1
- Me.btnEmTorqueLimits.UseVisualStyleBackColor = True
- '
- 'tbEmTorqueLimits
- '
- Me.tbEmTorqueLimits.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbEmTorqueLimits.Location = New System.Drawing.Point(6, 19)
- Me.tbEmTorqueLimits.Name = "tbEmTorqueLimits"
- Me.tbEmTorqueLimits.Size = New System.Drawing.Size(365, 20)
- Me.tbEmTorqueLimits.TabIndex = 0
- '
- 'bgVehicleTorqueLimits
- '
- Me.bgVehicleTorqueLimits.Controls.Add(Me.lvTorqueLimits)
- Me.bgVehicleTorqueLimits.Controls.Add(Me.btAddMaxTorqueEntry)
- Me.bgVehicleTorqueLimits.Controls.Add(Me.Label17)
- Me.bgVehicleTorqueLimits.Controls.Add(Me.btDelMaxTorqueEntry)
- Me.bgVehicleTorqueLimits.Location = New System.Drawing.Point(6, 6)
- Me.bgVehicleTorqueLimits.Name = "bgVehicleTorqueLimits"
- Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(221, 227)
- Me.bgVehicleTorqueLimits.TabIndex = 0
- Me.bgVehicleTorqueLimits.TabStop = False
- Me.bgVehicleTorqueLimits.Text = "ICE Torque Limits"
- '
- 'lvTorqueLimits
- '
- Me.lvTorqueLimits.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.lvTorqueLimits.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader5, Me.ColumnHeader6})
- Me.lvTorqueLimits.FullRowSelect = True
- Me.lvTorqueLimits.GridLines = True
- Me.lvTorqueLimits.HideSelection = False
- Me.lvTorqueLimits.Location = New System.Drawing.Point(6, 19)
- Me.lvTorqueLimits.MultiSelect = False
- Me.lvTorqueLimits.Name = "lvTorqueLimits"
- Me.lvTorqueLimits.Size = New System.Drawing.Size(209, 169)
- Me.lvTorqueLimits.TabIndex = 7
- Me.lvTorqueLimits.TabStop = False
- Me.lvTorqueLimits.UseCompatibleStateImageBehavior = False
- Me.lvTorqueLimits.View = System.Windows.Forms.View.Details
- '
- 'ColumnHeader5
- '
- Me.ColumnHeader5.Text = "Gear #"
- Me.ColumnHeader5.Width = 71
- '
- 'ColumnHeader6
- '
- Me.ColumnHeader6.Text = "Max. Torque"
- Me.ColumnHeader6.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
- Me.ColumnHeader6.Width = 133
- '
- 'btAddMaxTorqueEntry
- '
- Me.btAddMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.btAddMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(6, 193)
- Me.btAddMaxTorqueEntry.Name = "btAddMaxTorqueEntry"
- Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
- Me.btAddMaxTorqueEntry.TabIndex = 4
- Me.btAddMaxTorqueEntry.UseVisualStyleBackColor = True
- '
- 'Label17
- '
- Me.Label17.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label17.AutoSize = True
- Me.Label17.Location = New System.Drawing.Point(112, 190)
- Me.Label17.Name = "Label17"
- Me.Label17.Size = New System.Drawing.Size(106, 13)
- Me.Label17.TabIndex = 6
- Me.Label17.Text = "(Double-Click to Edit)"
- Me.Label17.TextAlign = System.Drawing.ContentAlignment.TopRight
- '
- 'btDelMaxTorqueEntry
- '
- Me.btDelMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.btDelMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(30, 193)
- Me.btDelMaxTorqueEntry.Name = "btDelMaxTorqueEntry"
- Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
- Me.btDelMaxTorqueEntry.TabIndex = 5
- Me.btDelMaxTorqueEntry.UseVisualStyleBackColor = True
- '
- 'tpADAS
- '
- Me.tpADAS.Controls.Add(Me.gbADAS)
- Me.tpADAS.Location = New System.Drawing.Point(4, 22)
- Me.tpADAS.Name = "tpADAS"
- Me.tpADAS.Padding = New System.Windows.Forms.Padding(3)
- Me.tpADAS.Size = New System.Drawing.Size(648, 374)
- Me.tpADAS.TabIndex = 3
- Me.tpADAS.Text = "ADAS"
- Me.tpADAS.UseVisualStyleBackColor = True
- '
- 'gbADAS
- '
- Me.gbADAS.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.gbADAS.Controls.Add(Me.pnEcoRoll)
- Me.gbADAS.Controls.Add(Me.cbAtEcoRollReleaseLockupClutch)
- Me.gbADAS.Controls.Add(Me.cbPcc)
- Me.gbADAS.Controls.Add(Me.cbEngineStopStart)
- Me.gbADAS.Controls.Add(Me.lblPCC)
- Me.gbADAS.Location = New System.Drawing.Point(6, 6)
- Me.gbADAS.Name = "gbADAS"
- Me.gbADAS.Size = New System.Drawing.Size(636, 161)
- Me.gbADAS.TabIndex = 0
- Me.gbADAS.TabStop = False
- Me.gbADAS.Text = "ADAS Options"
- '
- 'pnEcoRoll
- '
- Me.pnEcoRoll.Controls.Add(Me.cbEcoRoll)
- Me.pnEcoRoll.Controls.Add(Me.Label22)
- Me.pnEcoRoll.Location = New System.Drawing.Point(0, 44)
- Me.pnEcoRoll.Name = "pnEcoRoll"
- Me.pnEcoRoll.Size = New System.Drawing.Size(300, 46)
- Me.pnEcoRoll.TabIndex = 7
- '
- 'cbEcoRoll
- '
- Me.cbEcoRoll.DisplayMember = "Value"
- Me.cbEcoRoll.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbEcoRoll.FormattingEnabled = True
- Me.cbEcoRoll.Location = New System.Drawing.Point(10, 20)
- Me.cbEcoRoll.Name = "cbEcoRoll"
- Me.cbEcoRoll.Size = New System.Drawing.Size(266, 21)
- Me.cbEcoRoll.TabIndex = 1
- Me.cbEcoRoll.ValueMember = "Key"
- '
- 'Label22
- '
- Me.Label22.AutoSize = True
- Me.Label22.Location = New System.Drawing.Point(7, 5)
- Me.Label22.Name = "Label22"
- Me.Label22.Size = New System.Drawing.Size(50, 13)
- Me.Label22.TabIndex = 6
- Me.Label22.Text = "Eco-Roll:"
- '
- 'cbAtEcoRollReleaseLockupClutch
- '
- Me.cbAtEcoRollReleaseLockupClutch.AutoSize = True
- Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(238, 21)
- Me.cbAtEcoRollReleaseLockupClutch.Name = "cbAtEcoRollReleaseLockupClutch"
- Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(243, 17)
- Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 3
- Me.cbAtEcoRollReleaseLockupClutch.Text = "AT Gearbox: Eco-Roll Release Lockup Clutch"
- Me.cbAtEcoRollReleaseLockupClutch.UseVisualStyleBackColor = True
- '
- 'cbPcc
- '
- Me.cbPcc.DisplayMember = "Value"
- Me.cbPcc.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbPcc.FormattingEnabled = True
- Me.cbPcc.Location = New System.Drawing.Point(10, 124)
- Me.cbPcc.Name = "cbPcc"
- Me.cbPcc.Size = New System.Drawing.Size(266, 21)
- Me.cbPcc.TabIndex = 2
- Me.cbPcc.ValueMember = "Key"
- '
- 'cbEngineStopStart
- '
- Me.cbEngineStopStart.AutoSize = True
- Me.cbEngineStopStart.Location = New System.Drawing.Point(10, 21)
- Me.cbEngineStopStart.Name = "cbEngineStopStart"
- Me.cbEngineStopStart.Size = New System.Drawing.Size(203, 17)
- Me.cbEngineStopStart.TabIndex = 0
- Me.cbEngineStopStart.Text = "Engine Stop/Start during vehicle stop"
- Me.cbEngineStopStart.UseVisualStyleBackColor = True
- '
- 'lblPCC
- '
- Me.lblPCC.AutoSize = True
- Me.lblPCC.Location = New System.Drawing.Point(7, 108)
- Me.lblPCC.Name = "lblPCC"
- Me.lblPCC.Size = New System.Drawing.Size(125, 13)
- Me.lblPCC.TabIndex = 3
- Me.lblPCC.Text = "Predictive Cruise Control:"
- '
- 'tpRoadSweeper
- '
- Me.tpRoadSweeper.Controls.Add(Me.pnPTO)
- Me.tpRoadSweeper.Controls.Add(Me.gbPTO)
- Me.tpRoadSweeper.Location = New System.Drawing.Point(4, 22)
- Me.tpRoadSweeper.Name = "tpRoadSweeper"
- Me.tpRoadSweeper.Size = New System.Drawing.Size(648, 374)
- Me.tpRoadSweeper.TabIndex = 4
- Me.tpRoadSweeper.Text = "PTO"
- Me.tpRoadSweeper.UseVisualStyleBackColor = True
- '
- 'pnPTO
- '
- Me.pnPTO.Controls.Add(Me.gbPTODrive)
- Me.pnPTO.Controls.Add(Me.btPTOCycleDrive)
- Me.pnPTO.Controls.Add(Me.Label28)
- Me.pnPTO.Controls.Add(Me.tbPTODrive)
- Me.pnPTO.Controls.Add(Me.btPTOCycle)
- Me.pnPTO.Controls.Add(Me.Label16)
- Me.pnPTO.Controls.Add(Me.tbPTOCycle)
- Me.pnPTO.Controls.Add(Me.btPTOLossMapBrowse)
- Me.pnPTO.Controls.Add(Me.Label7)
- Me.pnPTO.Controls.Add(Me.tbPTOLossMap)
- Me.pnPTO.Location = New System.Drawing.Point(6, 73)
- Me.pnPTO.Name = "pnPTO"
- Me.pnPTO.Size = New System.Drawing.Size(633, 211)
- Me.pnPTO.TabIndex = 1
- '
- 'gbPTODrive
- '
- Me.gbPTODrive.Controls.Add(Me.Label27)
- Me.gbPTODrive.Controls.Add(Me.tbPtoGear)
- Me.gbPTODrive.Controls.Add(Me.Label26)
- Me.gbPTODrive.Controls.Add(Me.tbPtoEngineSpeed)
- Me.gbPTODrive.Controls.Add(Me.Label25)
- Me.gbPTODrive.Controls.Add(Me.Label24)
- Me.gbPTODrive.Location = New System.Drawing.Point(0, 99)
- Me.gbPTODrive.Name = "gbPTODrive"
- Me.gbPTODrive.Size = New System.Drawing.Size(633, 55)
- Me.gbPTODrive.TabIndex = 4
- Me.gbPTODrive.TabStop = False
- Me.gbPTODrive.Text = "Working operation settings (PTO mode 2)"
- '
- 'Label27
- '
- Me.Label27.AutoSize = True
- Me.Label27.Location = New System.Drawing.Point(446, 24)
- Me.Label27.Name = "Label27"
- Me.Label27.Size = New System.Drawing.Size(20, 13)
- Me.Label27.TabIndex = 6
- Me.Label27.Text = "[#]"
- Me.Label27.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
- '
- 'tbPtoGear
- '
- Me.tbPtoGear.Location = New System.Drawing.Point(371, 21)
- Me.tbPtoGear.Name = "tbPtoGear"
- Me.tbPtoGear.Size = New System.Drawing.Size(70, 20)
- Me.tbPtoGear.TabIndex = 1
- '
- 'Label26
- '
- Me.Label26.AutoSize = True
- Me.Label26.Location = New System.Drawing.Point(189, 24)
- Me.Label26.Name = "Label26"
- Me.Label26.Size = New System.Drawing.Size(30, 13)
- Me.Label26.TabIndex = 4
- Me.Label26.Text = "[rpm]"
- Me.Label26.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
- '
- 'tbPtoEngineSpeed
- '
- Me.tbPtoEngineSpeed.Location = New System.Drawing.Point(113, 21)
- Me.tbPtoEngineSpeed.Name = "tbPtoEngineSpeed"
- Me.tbPtoEngineSpeed.Size = New System.Drawing.Size(70, 20)
- Me.tbPtoEngineSpeed.TabIndex = 0
- '
- 'Label25
- '
- Me.Label25.AutoSize = True
- Me.Label25.Location = New System.Drawing.Point(297, 24)
- Me.Label25.Name = "Label25"
- Me.Label25.Size = New System.Drawing.Size(68, 13)
- Me.Label25.TabIndex = 1
- Me.Label25.Text = "Gear number"
- '
- 'Label24
- '
- Me.Label24.AutoSize = True
- Me.Label24.Location = New System.Drawing.Point(7, 24)
- Me.Label24.Name = "Label24"
- Me.Label24.Size = New System.Drawing.Size(97, 13)
- Me.Label24.TabIndex = 0
- Me.Label24.Text = "Min. Engine Speed"
- '
- 'btPTOCycleDrive
- '
- Me.btPTOCycleDrive.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btPTOCycleDrive.Location = New System.Drawing.Point(438, 181)
- Me.btPTOCycleDrive.Name = "btPTOCycleDrive"
- Me.btPTOCycleDrive.Size = New System.Drawing.Size(24, 24)
- Me.btPTOCycleDrive.TabIndex = 6
- Me.btPTOCycleDrive.UseVisualStyleBackColor = True
- '
- 'Label28
- '
- Me.Label28.Location = New System.Drawing.Point(3, 164)
- Me.Label28.Name = "Label28"
- Me.Label28.Size = New System.Drawing.Size(266, 16)
- Me.Label28.TabIndex = 21
- Me.Label28.Text = "PTO Cycle during driving (PTO mode 3) (.vptor)"
- Me.Label28.TextAlign = System.Drawing.ContentAlignment.BottomLeft
- '
- 'btPTOCycle
- '
- Me.btPTOCycle.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btPTOCycle.Location = New System.Drawing.Point(438, 69)
- Me.btPTOCycle.Name = "btPTOCycle"
- Me.btPTOCycle.Size = New System.Drawing.Size(24, 24)
- Me.btPTOCycle.TabIndex = 3
- Me.btPTOCycle.UseVisualStyleBackColor = True
- '
- 'Label16
- '
- Me.Label16.Location = New System.Drawing.Point(3, 52)
- Me.Label16.Name = "Label16"
- Me.Label16.Size = New System.Drawing.Size(266, 16)
- Me.Label16.TabIndex = 18
- Me.Label16.Text = "PTO Cycle during standstill (PTO mode 1) (.vptoc)"
- Me.Label16.TextAlign = System.Drawing.ContentAlignment.BottomLeft
- '
- 'btPTOLossMapBrowse
- '
- Me.btPTOLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(438, 22)
- Me.btPTOLossMapBrowse.Name = "btPTOLossMapBrowse"
- Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(24, 24)
- Me.btPTOLossMapBrowse.TabIndex = 1
- Me.btPTOLossMapBrowse.UseVisualStyleBackColor = True
- '
- 'Label7
- '
- Me.Label7.Location = New System.Drawing.Point(3, 5)
- Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(201, 16)
- Me.Label7.TabIndex = 15
- Me.Label7.Text = "PTO Consumer Loss Map (.vptoi)"
- Me.Label7.TextAlign = System.Drawing.ContentAlignment.BottomLeft
- '
- 'gbPTO
- '
- Me.gbPTO.Controls.Add(Me.cbPTOType)
- Me.gbPTO.Location = New System.Drawing.Point(6, 6)
- Me.gbPTO.Name = "gbPTO"
- Me.gbPTO.Size = New System.Drawing.Size(633, 61)
- Me.gbPTO.TabIndex = 0
- Me.gbPTO.TabStop = False
- Me.gbPTO.Text = "PTO Design Variant"
- '
- 'cbLegislativeClass
- '
- Me.cbLegislativeClass.DisplayMember = "Value"
- Me.cbLegislativeClass.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbLegislativeClass.FormattingEnabled = True
- Me.cbLegislativeClass.Location = New System.Drawing.Point(220, 140)
- Me.cbLegislativeClass.Name = "cbLegislativeClass"
- Me.cbLegislativeClass.Size = New System.Drawing.Size(52, 21)
- Me.cbLegislativeClass.TabIndex = 4
- Me.cbLegislativeClass.ValueMember = "Key"
- '
- 'Label21
- '
- Me.Label21.AutoSize = True
- Me.Label21.Location = New System.Drawing.Point(32, 123)
- Me.Label21.Name = "Label21"
- Me.Label21.Size = New System.Drawing.Size(112, 13)
- Me.Label21.TabIndex = 42
- Me.Label21.Text = "Maximum Laden Mass"
- '
- 'lblTitle
- '
- Me.lblTitle.AutoSize = True
- Me.lblTitle.BackColor = System.Drawing.Color.White
- Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.lblTitle.Location = New System.Drawing.Point(117, 34)
- Me.lblTitle.Name = "lblTitle"
- Me.lblTitle.Size = New System.Drawing.Size(166, 29)
- Me.lblTitle.TabIndex = 43
- Me.lblTitle.Text = "Vehicle TITLE"
- '
- 'VehicleForm
- '
- Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(666, 625)
- Me.Controls.Add(Me.lblTitle)
- Me.Controls.Add(Me.Label21)
- Me.Controls.Add(Me.cbLegislativeClass)
- Me.Controls.Add(Me.tcVehicleComponents)
- Me.Controls.Add(Me.ButCancel)
- Me.Controls.Add(Me.ButOK)
- Me.Controls.Add(Me.Label8)
- Me.Controls.Add(Me.TbHDVclass)
- Me.Controls.Add(Me.PicVehicle)
- Me.Controls.Add(Me.PictureBox1)
- Me.Controls.Add(Me.Label9)
- Me.Controls.Add(Me.StatusStrip1)
- Me.Controls.Add(Me.CbAxleConfig)
- Me.Controls.Add(Me.TbMassMass)
- Me.Controls.Add(Me.CbCat)
- Me.Controls.Add(Me.Label5)
- Me.Controls.Add(Me.ToolStrip1)
- Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
- Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
- Me.MaximizeBox = False
- Me.Name = "VehicleForm"
- Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
- Me.Text = "F05_VEH"
- Me.GroupBox6.ResumeLayout(False)
- Me.GroupBox6.PerformLayout()
- Me.ToolStrip1.ResumeLayout(False)
- Me.ToolStrip1.PerformLayout()
- Me.gbRetarderLosses.ResumeLayout(False)
- Me.PnRt.ResumeLayout(False)
- Me.PnRt.PerformLayout()
- Me.GroupBox8.ResumeLayout(False)
- Me.GroupBox8.PerformLayout()
- Me.PnWheelDiam.ResumeLayout(False)
- Me.PnWheelDiam.PerformLayout()
- Me.StatusStrip1.ResumeLayout(False)
- Me.StatusStrip1.PerformLayout()
- Me.GroupBox1.ResumeLayout(False)
- Me.GroupBox1.PerformLayout()
- Me.PnLoad.ResumeLayout(False)
- Me.PnLoad.PerformLayout()
- Me.GrAirRes.ResumeLayout(False)
- Me.PnCdATrTr.ResumeLayout(False)
- Me.PnCdATrTr.PerformLayout()
- CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
- Me.CmOpenFile.ResumeLayout(False)
- Me.GroupBox3.ResumeLayout(False)
- Me.gbAngledrive.ResumeLayout(False)
- Me.pnAngledriveFields.ResumeLayout(False)
- Me.pnAngledriveFields.PerformLayout()
- CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
- Me.tcVehicleComponents.ResumeLayout(False)
- Me.tpGeneral.ResumeLayout(False)
- Me.tpPowertrain.ResumeLayout(False)
- Me.gbVehicleIdlingSpeed.ResumeLayout(False)
- Me.Panel1.ResumeLayout(False)
- Me.Panel1.PerformLayout()
- Me.gbTankSystem.ResumeLayout(False)
- Me.gbTankSystem.PerformLayout()
- Me.tpElectricComponents.ResumeLayout(False)
- Me.gbBattery.ResumeLayout(False)
- Me.gbBattery.PerformLayout()
- Me.gpElectricMotor.ResumeLayout(False)
- Me.gpElectricMotor.PerformLayout()
- Me.gbRatiosPerGear.ResumeLayout(False)
- Me.gbRatiosPerGear.PerformLayout()
- Me.pnElectricMotor.ResumeLayout(False)
- Me.pnElectricMotor.PerformLayout()
- Me.tpGensetComponents.ResumeLayout(False)
- Me.tpGensetComponents.PerformLayout()
- Me.gbGenSet.ResumeLayout(False)
- Me.gbGenSet.PerformLayout()
- Me.pnGenSetEM.ResumeLayout(False)
- Me.pnGenSetEM.PerformLayout()
- Me.tpTorqueLimits.ResumeLayout(False)
- Me.gbPropulsionTorque.ResumeLayout(False)
- Me.gbPropulsionTorque.PerformLayout()
- Me.gbEMTorqueLimits.ResumeLayout(False)
- Me.gbEMTorqueLimits.PerformLayout()
- Me.bgVehicleTorqueLimits.ResumeLayout(False)
- Me.bgVehicleTorqueLimits.PerformLayout()
- Me.tpADAS.ResumeLayout(False)
- Me.gbADAS.ResumeLayout(False)
- Me.gbADAS.PerformLayout()
- Me.pnEcoRoll.ResumeLayout(False)
- Me.pnEcoRoll.PerformLayout()
- Me.tpRoadSweeper.ResumeLayout(False)
- Me.pnPTO.ResumeLayout(False)
- Me.pnPTO.PerformLayout()
- Me.gbPTODrive.ResumeLayout(False)
- Me.gbPTODrive.PerformLayout()
- Me.gbPTO.ResumeLayout(False)
- Me.ResumeLayout(False)
- Me.PerformLayout
+ Me.components = New System.ComponentModel.Container()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(VehicleForm))
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.TbMass = New System.Windows.Forms.TextBox()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.TbLoad = New System.Windows.Forms.TextBox()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.TBcdA = New System.Windows.Forms.TextBox()
+ Me.Label13 = New System.Windows.Forms.Label()
+ Me.TBrdyn = New System.Windows.Forms.TextBox()
+ Me.ButOK = New System.Windows.Forms.Button()
+ Me.ButCancel = New System.Windows.Forms.Button()
+ Me.Label14 = New System.Windows.Forms.Label()
+ Me.Label31 = New System.Windows.Forms.Label()
+ Me.Label35 = New System.Windows.Forms.Label()
+ Me.CbCdMode = New System.Windows.Forms.ComboBox()
+ Me.TbCdFile = New System.Windows.Forms.TextBox()
+ Me.BtCdFileBrowse = New System.Windows.Forms.Button()
+ Me.GroupBox6 = New System.Windows.Forms.GroupBox()
+ Me.BtCdFileOpen = New System.Windows.Forms.Button()
+ Me.LbCdMode = New System.Windows.Forms.Label()
+ Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+ Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+ Me.gbRetarderLosses = New System.Windows.Forms.GroupBox()
+ Me.PnRt = New System.Windows.Forms.Panel()
+ Me.Label15 = New System.Windows.Forms.Label()
+ Me.BtRtBrowse = New System.Windows.Forms.Button()
+ Me.TbRtPath = New System.Windows.Forms.TextBox()
+ Me.Label45 = New System.Windows.Forms.Label()
+ Me.LbRtRatio = New System.Windows.Forms.Label()
+ Me.TbRtRatio = New System.Windows.Forms.TextBox()
+ Me.CbRtType = New System.Windows.Forms.ComboBox()
+ Me.Label46 = New System.Windows.Forms.Label()
+ Me.Label50 = New System.Windows.Forms.Label()
+ Me.TbMassExtra = New System.Windows.Forms.TextBox()
+ Me.GroupBox8 = New System.Windows.Forms.GroupBox()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.ButAxlRem = New System.Windows.Forms.Button()
+ Me.LvRRC = New System.Windows.Forms.ListView()
+ Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader8 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader9 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader10 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ButAxlAdd = New System.Windows.Forms.Button()
+ Me.PnWheelDiam = New System.Windows.Forms.Panel()
+ Me.CbAxleConfig = New System.Windows.Forms.ComboBox()
+ Me.CbCat = New System.Windows.Forms.ComboBox()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.Label9 = New System.Windows.Forms.Label()
+ Me.TbMassMass = New System.Windows.Forms.TextBox()
+ Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+ Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
+ Me.TbHDVclass = New System.Windows.Forms.TextBox()
+ Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.PnLoad = New System.Windows.Forms.Panel()
+ Me.GrAirRes = New System.Windows.Forms.GroupBox()
+ Me.PnCdATrTr = New System.Windows.Forms.Panel()
+ Me.tbVehicleHeight = New System.Windows.Forms.TextBox()
+ Me.Label11 = New System.Windows.Forms.Label()
+ Me.Label20 = New System.Windows.Forms.Label()
+ Me.Label38 = New System.Windows.Forms.Label()
+ Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+ Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+ Me.gbAngledrive = New System.Windows.Forms.GroupBox()
+ Me.pnAngledriveFields = New System.Windows.Forms.Panel()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.Label10 = New System.Windows.Forms.Label()
+ Me.tbAngledriveRatio = New System.Windows.Forms.TextBox()
+ Me.btAngledriveLossMapBrowse = New System.Windows.Forms.Button()
+ Me.tbAngledriveLossMapPath = New System.Windows.Forms.TextBox()
+ Me.Label12 = New System.Windows.Forms.Label()
+ Me.cbAngledriveType = New System.Windows.Forms.ComboBox()
+ Me.PicVehicle = New System.Windows.Forms.PictureBox()
+ Me.Label8 = New System.Windows.Forms.Label()
+ Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+ Me.cbPTOType = New System.Windows.Forms.ComboBox()
+ Me.tbPTOCycle = New System.Windows.Forms.TextBox()
+ Me.tbPTOLossMap = New System.Windows.Forms.TextBox()
+ Me.tbPTODrive = New System.Windows.Forms.TextBox()
+ Me.tcVehicleComponents = New System.Windows.Forms.TabControl()
+ Me.tpGeneral = New System.Windows.Forms.TabPage()
+ Me.tpPowertrain = New System.Windows.Forms.TabPage()
+ Me.gbVehicleIdlingSpeed = New System.Windows.Forms.GroupBox()
+ Me.Panel1 = New System.Windows.Forms.Panel()
+ Me.tbVehIdlingSpeed = New System.Windows.Forms.TextBox()
+ Me.Label18 = New System.Windows.Forms.Label()
+ Me.Label19 = New System.Windows.Forms.Label()
+ Me.gbTankSystem = New System.Windows.Forms.GroupBox()
+ Me.cbTankSystem = New System.Windows.Forms.ComboBox()
+ Me.Label23 = New System.Windows.Forms.Label()
+ Me.tpElectricMachine = New System.Windows.Forms.TabPage()
+ Me.gpElectricMotor = New System.Windows.Forms.GroupBox()
+ Me.Label33 = New System.Windows.Forms.Label()
+ Me.Label32 = New System.Windows.Forms.Label()
+ Me.gbRatiosPerGear = New System.Windows.Forms.GroupBox()
+ Me.lvRatioPerGear = New System.Windows.Forms.ListView()
+ Me.ColumnHeader11 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader12 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.btnAddEMRatio = New System.Windows.Forms.Button()
+ Me.Label29 = New System.Windows.Forms.Label()
+ Me.btnRemoveEMRatio = New System.Windows.Forms.Button()
+ Me.btnEmADCLossMap = New System.Windows.Forms.Button()
+ Me.tbEmADCLossMap = New System.Windows.Forms.TextBox()
+ Me.lblEmADCLossmap = New System.Windows.Forms.Label()
+ Me.tbRatioEm = New System.Windows.Forms.TextBox()
+ Me.lblRatioEm = New System.Windows.Forms.Label()
+ Me.tbEmCount = New System.Windows.Forms.TextBox()
+ Me.cbEmPos = New System.Windows.Forms.ComboBox()
+ Me.lblEmCount = New System.Windows.Forms.Label()
+ Me.lblEmPosition = New System.Windows.Forms.Label()
+ Me.pnElectricMotor = New System.Windows.Forms.Panel()
+ Me.btnOpenElectricMotor = New System.Windows.Forms.Button()
+ Me.btnBrowseElectricMotor = New System.Windows.Forms.Button()
+ Me.tbElectricMotor = New System.Windows.Forms.TextBox()
+ Me.tpIEPC = New System.Windows.Forms.TabPage()
+ Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.btnIEPC = New System.Windows.Forms.Button()
+ Me.tbIEPCFilePath = New System.Windows.Forms.TextBox()
+ Me.btIEPCFilePath = New System.Windows.Forms.Button()
+ Me.tbIHPC = New System.Windows.Forms.TabPage()
+ Me.FlowLayoutPanel2 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.btIHPC = New System.Windows.Forms.Button()
+ Me.tbIHPCFilePath = New System.Windows.Forms.TextBox()
+ Me.btIHPCFile = New System.Windows.Forms.Button()
+ Me.tpReess = New System.Windows.Forms.TabPage()
+ Me.gbBattery = New System.Windows.Forms.GroupBox()
+ Me.lvREESSPacks = New System.Windows.Forms.ListView()
+ Me.chReessPackPack = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.chReessPackCount = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.chReessPackStringId = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.btnAddReessPack = New System.Windows.Forms.Button()
+ Me.lblEditReessPack = New System.Windows.Forms.Label()
+ Me.btnRemoveReessPack = New System.Windows.Forms.Button()
+ Me.lblInitialSoCUnit = New System.Windows.Forms.Label()
+ Me.tbInitialSoC = New System.Windows.Forms.TextBox()
+ Me.lblInitialSoC = New System.Windows.Forms.Label()
+ Me.tpGensetComponents = New System.Windows.Forms.TabPage()
+ Me.Label30 = New System.Windows.Forms.Label()
+ Me.gbGenSet = New System.Windows.Forms.GroupBox()
+ Me.Label36 = New System.Windows.Forms.Label()
+ Me.Label34 = New System.Windows.Forms.Label()
+ Me.btnGenSetLossMap = New System.Windows.Forms.Button()
+ Me.tbGenSetADC = New System.Windows.Forms.TextBox()
+ Me.lblGenSetADC = New System.Windows.Forms.Label()
+ Me.tbGenSetRatio = New System.Windows.Forms.TextBox()
+ Me.lblGenSetRatio = New System.Windows.Forms.Label()
+ Me.tbGenSetCount = New System.Windows.Forms.TextBox()
+ Me.lblGenSetCount = New System.Windows.Forms.Label()
+ Me.pnGenSetEM = New System.Windows.Forms.Panel()
+ Me.btnOpenGenSetEM = New System.Windows.Forms.Button()
+ Me.btnBrowseGenSetEM = New System.Windows.Forms.Button()
+ Me.tbGenSetEM = New System.Windows.Forms.TextBox()
+ Me.tpTorqueLimits = New System.Windows.Forms.TabPage()
+ Me.gbPropulsionTorque = New System.Windows.Forms.GroupBox()
+ Me.btnPropulsionTorqueLimit = New System.Windows.Forms.Button()
+ Me.tbPropulsionTorqueLimit = New System.Windows.Forms.TextBox()
+ Me.gbEMTorqueLimits = New System.Windows.Forms.GroupBox()
+ Me.btnEmTorqueLimits = New System.Windows.Forms.Button()
+ Me.tbEmTorqueLimits = New System.Windows.Forms.TextBox()
+ Me.bgVehicleTorqueLimits = New System.Windows.Forms.GroupBox()
+ Me.lvTorqueLimits = New System.Windows.Forms.ListView()
+ Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.btAddMaxTorqueEntry = New System.Windows.Forms.Button()
+ Me.Label17 = New System.Windows.Forms.Label()
+ Me.btDelMaxTorqueEntry = New System.Windows.Forms.Button()
+ Me.tpADAS = New System.Windows.Forms.TabPage()
+ Me.gbADAS = New System.Windows.Forms.GroupBox()
+ Me.pnEcoRoll = New System.Windows.Forms.Panel()
+ Me.cbEcoRoll = New System.Windows.Forms.ComboBox()
+ Me.Label22 = New System.Windows.Forms.Label()
+ Me.cbAtEcoRollReleaseLockupClutch = New System.Windows.Forms.CheckBox()
+ Me.cbPcc = New System.Windows.Forms.ComboBox()
+ Me.cbEngineStopStart = New System.Windows.Forms.CheckBox()
+ Me.lblPCC = New System.Windows.Forms.Label()
+ Me.tpRoadSweeper = New System.Windows.Forms.TabPage()
+ Me.pnPTO = New System.Windows.Forms.Panel()
+ Me.gbPTODrive = New System.Windows.Forms.GroupBox()
+ Me.Label27 = New System.Windows.Forms.Label()
+ Me.tbPtoGear = New System.Windows.Forms.TextBox()
+ Me.Label26 = New System.Windows.Forms.Label()
+ Me.tbPtoEngineSpeed = New System.Windows.Forms.TextBox()
+ Me.Label25 = New System.Windows.Forms.Label()
+ Me.Label24 = New System.Windows.Forms.Label()
+ Me.btPTOCycleDrive = New System.Windows.Forms.Button()
+ Me.Label28 = New System.Windows.Forms.Label()
+ Me.btPTOCycle = New System.Windows.Forms.Button()
+ Me.Label16 = New System.Windows.Forms.Label()
+ Me.btPTOLossMapBrowse = New System.Windows.Forms.Button()
+ Me.Label7 = New System.Windows.Forms.Label()
+ Me.gbPTO = New System.Windows.Forms.GroupBox()
+ Me.cbLegislativeClass = New System.Windows.Forms.ComboBox()
+ Me.Label21 = New System.Windows.Forms.Label()
+ Me.lblTitle = New System.Windows.Forms.Label()
+ Me.pnPtoMode3 = New System.Windows.Forms.Panel()
+ Me.pnPtoMode1 = New System.Windows.Forms.Panel()
+ Me.lblNotePtoPEV_HEVS = New System.Windows.Forms.Label()
+ Me.GroupBox6.SuspendLayout
+ Me.ToolStrip1.SuspendLayout
+ Me.gbRetarderLosses.SuspendLayout
+ Me.PnRt.SuspendLayout
+ Me.GroupBox8.SuspendLayout
+ Me.PnWheelDiam.SuspendLayout
+ Me.StatusStrip1.SuspendLayout
+ Me.GroupBox1.SuspendLayout
+ Me.PnLoad.SuspendLayout
+ Me.GrAirRes.SuspendLayout
+ Me.PnCdATrTr.SuspendLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.CmOpenFile.SuspendLayout
+ Me.GroupBox3.SuspendLayout
+ Me.gbAngledrive.SuspendLayout
+ Me.pnAngledriveFields.SuspendLayout
+ CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.tcVehicleComponents.SuspendLayout
+ Me.tpGeneral.SuspendLayout
+ Me.tpPowertrain.SuspendLayout
+ Me.gbVehicleIdlingSpeed.SuspendLayout
+ Me.Panel1.SuspendLayout
+ Me.gbTankSystem.SuspendLayout
+ Me.tpElectricMachine.SuspendLayout
+ Me.gpElectricMotor.SuspendLayout
+ Me.gbRatiosPerGear.SuspendLayout
+ Me.pnElectricMotor.SuspendLayout
+ Me.tpIEPC.SuspendLayout
+ Me.FlowLayoutPanel1.SuspendLayout
+ Me.tbIHPC.SuspendLayout
+ Me.FlowLayoutPanel2.SuspendLayout
+ Me.tpReess.SuspendLayout
+ Me.gbBattery.SuspendLayout
+ Me.tpGensetComponents.SuspendLayout
+ Me.gbGenSet.SuspendLayout
+ Me.pnGenSetEM.SuspendLayout
+ Me.tpTorqueLimits.SuspendLayout
+ Me.gbPropulsionTorque.SuspendLayout
+ Me.gbEMTorqueLimits.SuspendLayout
+ Me.bgVehicleTorqueLimits.SuspendLayout
+ Me.tpADAS.SuspendLayout
+ Me.gbADAS.SuspendLayout
+ Me.pnEcoRoll.SuspendLayout
+ Me.tpRoadSweeper.SuspendLayout
+ Me.pnPTO.SuspendLayout
+ Me.gbPTODrive.SuspendLayout
+ Me.gbPTO.SuspendLayout
+ Me.pnPtoMode3.SuspendLayout
+ Me.pnPtoMode1.SuspendLayout
+ Me.SuspendLayout
+ '
+ 'Label1
+ '
+ Me.Label1.AutoSize = true
+ Me.Label1.Location = New System.Drawing.Point(9, 34)
+ Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(177, 13)
+ Me.Label1.TabIndex = 0
+ Me.Label1.Text = "Corrected Actual Curb Mass Vehicle"
+ '
+ 'TbMass
+ '
+ Me.TbMass.Location = New System.Drawing.Point(282, 29)
+ Me.TbMass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbMass.Name = "TbMass"
+ Me.TbMass.Size = New System.Drawing.Size(84, 20)
+ Me.TbMass.TabIndex = 0
+ '
+ 'Label2
+ '
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(192, 48)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(45, 13)
+ Me.Label2.TabIndex = 2
+ Me.Label2.Text = "Loading"
+ '
+ 'TbLoad
+ '
+ Me.TbLoad.Location = New System.Drawing.Point(273, 43)
+ Me.TbLoad.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbLoad.Name = "TbLoad"
+ Me.TbLoad.Size = New System.Drawing.Size(84, 20)
+ Me.TbLoad.TabIndex = 1
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(15, 9)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(38, 13)
+ Me.Label3.TabIndex = 8
+ Me.Label3.Text = "Cd x A"
+ '
+ 'TBcdA
+ '
+ Me.TBcdA.Location = New System.Drawing.Point(81, 5)
+ Me.TBcdA.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TBcdA.Name = "TBcdA"
+ Me.TBcdA.Size = New System.Drawing.Size(84, 20)
+ Me.TBcdA.TabIndex = 0
+ '
+ 'Label13
+ '
+ Me.Label13.AutoSize = true
+ Me.Label13.Location = New System.Drawing.Point(204, 9)
+ Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label13.Name = "Label13"
+ Me.Label13.Size = New System.Drawing.Size(40, 13)
+ Me.Label13.TabIndex = 6
+ Me.Label13.Text = "Radius"
+ '
+ 'TBrdyn
+ '
+ Me.TBrdyn.Location = New System.Drawing.Point(278, 5)
+ Me.TBrdyn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TBrdyn.Name = "TBrdyn"
+ Me.TBrdyn.Size = New System.Drawing.Size(84, 20)
+ Me.TBrdyn.TabIndex = 0
+ '
+ 'ButOK
+ '
+ Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.ButOK.Location = New System.Drawing.Point(747, 888)
+ Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButOK.Name = "ButOK"
+ Me.ButOK.Size = New System.Drawing.Size(112, 35)
+ Me.ButOK.TabIndex = 6
+ Me.ButOK.Text = "Save"
+ Me.ButOK.UseVisualStyleBackColor = true
+ '
+ 'ButCancel
+ '
+ Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.ButCancel.Location = New System.Drawing.Point(868, 888)
+ Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButCancel.Name = "ButCancel"
+ Me.ButCancel.Size = New System.Drawing.Size(112, 35)
+ Me.ButCancel.TabIndex = 7
+ Me.ButCancel.Text = "Cancel"
+ Me.ButCancel.UseVisualStyleBackColor = true
+ '
+ 'Label14
+ '
+ Me.Label14.AutoSize = true
+ Me.Label14.Location = New System.Drawing.Point(370, 34)
+ Me.Label14.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label14.Name = "Label14"
+ Me.Label14.Size = New System.Drawing.Size(25, 13)
+ Me.Label14.TabIndex = 24
+ Me.Label14.Text = "[kg]"
+ '
+ 'Label31
+ '
+ Me.Label31.AutoSize = true
+ Me.Label31.Location = New System.Drawing.Point(362, 48)
+ Me.Label31.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label31.Name = "Label31"
+ Me.Label31.Size = New System.Drawing.Size(25, 13)
+ Me.Label31.TabIndex = 24
+ Me.Label31.Text = "[kg]"
+ '
+ 'Label35
+ '
+ Me.Label35.AutoSize = true
+ Me.Label35.Location = New System.Drawing.Point(366, 9)
+ Me.Label35.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label35.Name = "Label35"
+ Me.Label35.Size = New System.Drawing.Size(29, 13)
+ Me.Label35.TabIndex = 24
+ Me.Label35.Text = "[mm]"
+ '
+ 'CbCdMode
+ '
+ Me.CbCdMode.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.CbCdMode.DisplayMember = "Value"
+ Me.CbCdMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.CbCdMode.FormattingEnabled = true
+ Me.CbCdMode.Items.AddRange(New Object() {"No Correction", "Speed dependent (User-defined)", "Speed dependent (Declaration Mode)", "Vair & Beta Input"})
+ Me.CbCdMode.Location = New System.Drawing.Point(9, 29)
+ Me.CbCdMode.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbCdMode.Name = "CbCdMode"
+ Me.CbCdMode.Size = New System.Drawing.Size(498, 28)
+ Me.CbCdMode.TabIndex = 0
+ Me.CbCdMode.ValueMember = "Key"
+ '
+ 'TbCdFile
+ '
+ Me.TbCdFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TbCdFile.Enabled = false
+ Me.TbCdFile.Location = New System.Drawing.Point(14, 100)
+ Me.TbCdFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbCdFile.Name = "TbCdFile"
+ Me.TbCdFile.Size = New System.Drawing.Size(412, 20)
+ Me.TbCdFile.TabIndex = 1
+ '
+ 'BtCdFileBrowse
+ '
+ Me.BtCdFileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.BtCdFileBrowse.Enabled = false
+ Me.BtCdFileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.BtCdFileBrowse.Location = New System.Drawing.Point(436, 95)
+ Me.BtCdFileBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtCdFileBrowse.Name = "BtCdFileBrowse"
+ Me.BtCdFileBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.BtCdFileBrowse.TabIndex = 2
+ Me.BtCdFileBrowse.UseVisualStyleBackColor = true
+ '
+ 'GroupBox6
+ '
+ Me.GroupBox6.Controls.Add(Me.BtCdFileOpen)
+ Me.GroupBox6.Controls.Add(Me.LbCdMode)
+ Me.GroupBox6.Controls.Add(Me.CbCdMode)
+ Me.GroupBox6.Controls.Add(Me.BtCdFileBrowse)
+ Me.GroupBox6.Controls.Add(Me.TbCdFile)
+ Me.GroupBox6.Location = New System.Drawing.Point(440, 129)
+ Me.GroupBox6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox6.Name = "GroupBox6"
+ Me.GroupBox6.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox6.Size = New System.Drawing.Size(519, 148)
+ Me.GroupBox6.TabIndex = 3
+ Me.GroupBox6.TabStop = false
+ Me.GroupBox6.Text = "Cross Wind Correction"
+ '
+ 'BtCdFileOpen
+ '
+ Me.BtCdFileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.BtCdFileOpen.Enabled = false
+ Me.BtCdFileOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.BtCdFileOpen.Location = New System.Drawing.Point(472, 95)
+ Me.BtCdFileOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtCdFileOpen.Name = "BtCdFileOpen"
+ Me.BtCdFileOpen.Size = New System.Drawing.Size(36, 37)
+ Me.BtCdFileOpen.TabIndex = 3
+ Me.BtCdFileOpen.UseVisualStyleBackColor = true
+ '
+ 'LbCdMode
+ '
+ Me.LbCdMode.AutoSize = true
+ Me.LbCdMode.Location = New System.Drawing.Point(9, 72)
+ Me.LbCdMode.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.LbCdMode.Name = "LbCdMode"
+ Me.LbCdMode.Size = New System.Drawing.Size(59, 13)
+ Me.LbCdMode.TabIndex = 28
+ Me.LbCdMode.Text = "LbCdMode"
+ Me.LbCdMode.TextAlign = System.Drawing.ContentAlignment.TopRight
+ '
+ 'ToolStrip1
+ '
+ Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+ Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
+ Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
+ Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+ Me.ToolStrip1.Name = "ToolStrip1"
+ Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0)
+ Me.ToolStrip1.Size = New System.Drawing.Size(999, 31)
+ Me.ToolStrip1.TabIndex = 29
+ Me.ToolStrip1.Text = "ToolStrip1"
+ '
+ 'ToolStripBtNew
+ '
+ Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
+ Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtNew.Name = "ToolStripBtNew"
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtNew.Text = "ToolStripButton1"
+ Me.ToolStripBtNew.ToolTipText = "New"
+ '
+ 'ToolStripBtOpen
+ '
+ Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtOpen.Text = "ToolStripButton1"
+ Me.ToolStripBtOpen.ToolTipText = "Open..."
+ '
+ 'ToolStripBtSave
+ '
+ Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
+ Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtSave.Name = "ToolStripBtSave"
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSave.Text = "ToolStripButton1"
+ Me.ToolStripBtSave.ToolTipText = "Save"
+ '
+ 'ToolStripBtSaveAs
+ '
+ Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
+ Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
+ Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
+ '
+ 'ToolStripSeparator3
+ '
+ Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
+ '
+ 'ToolStripBtSendTo
+ '
+ Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
+ Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSendTo.Text = "Send to Job Editor"
+ Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor"
+ '
+ 'ToolStripSeparator1
+ '
+ Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
+ '
+ 'ToolStripButton1
+ '
+ Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
+ Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripButton1.Name = "ToolStripButton1"
+ Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton1.Text = "Help"
+ '
+ 'gbRetarderLosses
+ '
+ Me.gbRetarderLosses.Controls.Add(Me.PnRt)
+ Me.gbRetarderLosses.Controls.Add(Me.CbRtType)
+ Me.gbRetarderLosses.Location = New System.Drawing.Point(9, 117)
+ Me.gbRetarderLosses.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbRetarderLosses.Name = "gbRetarderLosses"
+ Me.gbRetarderLosses.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbRetarderLosses.Size = New System.Drawing.Size(465, 171)
+ Me.gbRetarderLosses.TabIndex = 1
+ Me.gbRetarderLosses.TabStop = false
+ Me.gbRetarderLosses.Text = "Retarder Losses"
+ '
+ 'PnRt
+ '
+ Me.PnRt.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.PnRt.Controls.Add(Me.Label15)
+ Me.PnRt.Controls.Add(Me.BtRtBrowse)
+ Me.PnRt.Controls.Add(Me.TbRtPath)
+ Me.PnRt.Controls.Add(Me.Label45)
+ Me.PnRt.Controls.Add(Me.LbRtRatio)
+ Me.PnRt.Controls.Add(Me.TbRtRatio)
+ Me.PnRt.Location = New System.Drawing.Point(4, 65)
+ Me.PnRt.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnRt.Name = "PnRt"
+ Me.PnRt.Size = New System.Drawing.Size(448, 97)
+ Me.PnRt.TabIndex = 1
+ '
+ 'Label15
+ '
+ Me.Label15.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label15.Location = New System.Drawing.Point(3, 35)
+ Me.Label15.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label15.Name = "Label15"
+ Me.Label15.Size = New System.Drawing.Size(348, 25)
+ Me.Label15.TabIndex = 15
+ Me.Label15.Text = "Retarder Loss Map"
+ Me.Label15.TextAlign = System.Drawing.ContentAlignment.BottomLeft
+ '
+ 'BtRtBrowse
+ '
+ Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.BtRtBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.BtRtBrowse.Location = New System.Drawing.Point(408, 57)
+ Me.BtRtBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtRtBrowse.Name = "BtRtBrowse"
+ Me.BtRtBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.BtRtBrowse.TabIndex = 2
+ Me.BtRtBrowse.UseVisualStyleBackColor = true
+ '
+ 'TbRtPath
+ '
+ Me.TbRtPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TbRtPath.Location = New System.Drawing.Point(4, 60)
+ Me.TbRtPath.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbRtPath.Name = "TbRtPath"
+ Me.TbRtPath.Size = New System.Drawing.Size(402, 20)
+ Me.TbRtPath.TabIndex = 1
+ '
+ 'Label45
+ '
+ Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label45.AutoSize = true
+ Me.Label45.Location = New System.Drawing.Point(394, 8)
+ Me.Label45.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label45.Name = "Label45"
+ Me.Label45.Size = New System.Drawing.Size(16, 13)
+ Me.Label45.TabIndex = 10
+ Me.Label45.Text = "[-]"
+ '
+ 'LbRtRatio
+ '
+ Me.LbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.LbRtRatio.Location = New System.Drawing.Point(52, 8)
+ Me.LbRtRatio.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.LbRtRatio.Name = "LbRtRatio"
+ Me.LbRtRatio.Size = New System.Drawing.Size(250, 26)
+ Me.LbRtRatio.TabIndex = 1
+ Me.LbRtRatio.Text = "Ratio"
+ Me.LbRtRatio.TextAlign = System.Drawing.ContentAlignment.TopRight
+ '
+ 'TbRtRatio
+ '
+ Me.TbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TbRtRatio.Location = New System.Drawing.Point(308, 5)
+ Me.TbRtRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbRtRatio.Name = "TbRtRatio"
+ Me.TbRtRatio.Size = New System.Drawing.Size(82, 20)
+ Me.TbRtRatio.TabIndex = 0
+ '
+ 'CbRtType
+ '
+ Me.CbRtType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.CbRtType.DisplayMember = "Value"
+ Me.CbRtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.CbRtType.Items.AddRange(New Object() {"Included in Transmission Loss Maps", "Primary Retarder", "Secondary Retarder"})
+ Me.CbRtType.Location = New System.Drawing.Point(9, 29)
+ Me.CbRtType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbRtType.Name = "CbRtType"
+ Me.CbRtType.Size = New System.Drawing.Size(444, 28)
+ Me.CbRtType.TabIndex = 0
+ Me.CbRtType.ValueMember = "Key"
+ '
+ 'Label46
+ '
+ Me.Label46.AutoSize = true
+ Me.Label46.Location = New System.Drawing.Point(48, 8)
+ Me.Label46.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label46.Name = "Label46"
+ Me.Label46.Size = New System.Drawing.Size(145, 13)
+ Me.Label46.TabIndex = 31
+ Me.Label46.Text = "Curb Mass Extra Trailer/Body"
+ '
+ 'Label50
+ '
+ Me.Label50.AutoSize = true
+ Me.Label50.Location = New System.Drawing.Point(362, 8)
+ Me.Label50.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label50.Name = "Label50"
+ Me.Label50.Size = New System.Drawing.Size(25, 13)
+ Me.Label50.TabIndex = 24
+ Me.Label50.Text = "[kg]"
+ '
+ 'TbMassExtra
+ '
+ Me.TbMassExtra.Location = New System.Drawing.Point(273, 3)
+ Me.TbMassExtra.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbMassExtra.Name = "TbMassExtra"
+ Me.TbMassExtra.Size = New System.Drawing.Size(84, 20)
+ Me.TbMassExtra.TabIndex = 0
+ '
+ 'GroupBox8
+ '
+ Me.GroupBox8.Controls.Add(Me.Label6)
+ Me.GroupBox8.Controls.Add(Me.ButAxlRem)
+ Me.GroupBox8.Controls.Add(Me.LvRRC)
+ Me.GroupBox8.Controls.Add(Me.ButAxlAdd)
+ Me.GroupBox8.Location = New System.Drawing.Point(9, 286)
+ Me.GroupBox8.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox8.Name = "GroupBox8"
+ Me.GroupBox8.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox8.Size = New System.Drawing.Size(950, 280)
+ Me.GroupBox8.TabIndex = 4
+ Me.GroupBox8.TabStop = false
+ Me.GroupBox8.Text = "Axles / Wheels"
+ '
+ 'Label6
+ '
+ Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label6.AutoSize = true
+ Me.Label6.Location = New System.Drawing.Point(788, 234)
+ Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(106, 13)
+ Me.Label6.TabIndex = 3
+ Me.Label6.Text = "(Double-Click to Edit)"
+ '
+ 'ButAxlRem
+ '
+ Me.ButAxlRem.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ Me.ButAxlRem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.ButAxlRem.Location = New System.Drawing.Point(44, 232)
+ Me.ButAxlRem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButAxlRem.Name = "ButAxlRem"
+ Me.ButAxlRem.Size = New System.Drawing.Size(36, 37)
+ Me.ButAxlRem.TabIndex = 2
+ Me.ButAxlRem.UseVisualStyleBackColor = true
+ '
+ 'LvRRC
+ '
+ Me.LvRRC.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.LvRRC.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader7, Me.ColumnHeader8, Me.ColumnHeader2, Me.ColumnHeader9, Me.ColumnHeader1, Me.ColumnHeader3, Me.ColumnHeader4, Me.ColumnHeader10})
+ Me.LvRRC.FullRowSelect = true
+ Me.LvRRC.GridLines = true
+ Me.LvRRC.HideSelection = false
+ Me.LvRRC.Location = New System.Drawing.Point(9, 29)
+ Me.LvRRC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.LvRRC.MultiSelect = false
+ Me.LvRRC.Name = "LvRRC"
+ Me.LvRRC.Size = New System.Drawing.Size(930, 199)
+ Me.LvRRC.TabIndex = 0
+ Me.LvRRC.TabStop = false
+ Me.LvRRC.UseCompatibleStateImageBehavior = false
+ Me.LvRRC.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader7
+ '
+ Me.ColumnHeader7.Text = "#"
+ Me.ColumnHeader7.Width = 22
+ '
+ 'ColumnHeader8
+ '
+ Me.ColumnHeader8.Text = "Rel. load"
+ Me.ColumnHeader8.Width = 62
+ '
+ 'ColumnHeader2
+ '
+ Me.ColumnHeader2.Text = "Twin T."
+ Me.ColumnHeader2.Width = 51
+ '
+ 'ColumnHeader9
+ '
+ Me.ColumnHeader9.Text = "RRC"
+ Me.ColumnHeader9.Width = 59
+ '
+ 'ColumnHeader1
+ '
+ Me.ColumnHeader1.Text = "Fz ISO"
+ Me.ColumnHeader1.Width = 55
+ '
+ 'ColumnHeader3
+ '
+ Me.ColumnHeader3.Text = "Wheels"
+ Me.ColumnHeader3.Width = 100
+ '
+ 'ColumnHeader4
+ '
+ Me.ColumnHeader4.Text = "Inertia"
+ '
+ 'ColumnHeader10
+ '
+ Me.ColumnHeader10.Text = "Axle Type"
+ Me.ColumnHeader10.Width = 130
+ '
+ 'ButAxlAdd
+ '
+ Me.ButAxlAdd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ Me.ButAxlAdd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.ButAxlAdd.Location = New System.Drawing.Point(8, 232)
+ Me.ButAxlAdd.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButAxlAdd.Name = "ButAxlAdd"
+ Me.ButAxlAdd.Size = New System.Drawing.Size(36, 37)
+ Me.ButAxlAdd.TabIndex = 1
+ Me.ButAxlAdd.UseVisualStyleBackColor = true
+ '
+ 'PnWheelDiam
+ '
+ Me.PnWheelDiam.Controls.Add(Me.Label13)
+ Me.PnWheelDiam.Controls.Add(Me.TBrdyn)
+ Me.PnWheelDiam.Controls.Add(Me.Label35)
+ Me.PnWheelDiam.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.PnWheelDiam.Location = New System.Drawing.Point(4, 18)
+ Me.PnWheelDiam.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnWheelDiam.Name = "PnWheelDiam"
+ Me.PnWheelDiam.Size = New System.Drawing.Size(409, 54)
+ Me.PnWheelDiam.TabIndex = 0
+ '
+ 'CbAxleConfig
+ '
+ Me.CbAxleConfig.DisplayMember = "Value"
+ Me.CbAxleConfig.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.CbAxleConfig.FormattingEnabled = true
+ Me.CbAxleConfig.Items.AddRange(New Object() {"-", "4x2", "4x4", "6x2", "6x4", "6x6", "8x2", "8x4", "8x6", "8x8"})
+ Me.CbAxleConfig.Location = New System.Drawing.Point(230, 123)
+ Me.CbAxleConfig.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbAxleConfig.Name = "CbAxleConfig"
+ Me.CbAxleConfig.Size = New System.Drawing.Size(88, 28)
+ Me.CbAxleConfig.TabIndex = 1
+ Me.CbAxleConfig.ValueMember = "Key"
+ '
+ 'CbCat
+ '
+ Me.CbCat.DisplayMember = "Value"
+ Me.CbCat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.CbCat.FormattingEnabled = true
+ Me.CbCat.Items.AddRange(New Object() {"-", "Rigid Truck", "Tractor", "City Bus", "Interurban Bus", "Coach"})
+ Me.CbCat.Location = New System.Drawing.Point(18, 123)
+ Me.CbCat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbCat.Name = "CbCat"
+ Me.CbCat.Size = New System.Drawing.Size(200, 28)
+ Me.CbCat.TabIndex = 0
+ Me.CbCat.ValueMember = "Key"
+ '
+ 'Label5
+ '
+ Me.Label5.AutoSize = true
+ Me.Label5.Location = New System.Drawing.Point(46, 166)
+ Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(116, 13)
+ Me.Label5.TabIndex = 2
+ Me.Label5.Text = "Technically Permissible"
+ '
+ 'Label9
+ '
+ Me.Label9.AutoSize = true
+ Me.Label9.Location = New System.Drawing.Point(296, 175)
+ Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label9.Name = "Label9"
+ Me.Label9.Size = New System.Drawing.Size(16, 13)
+ Me.Label9.TabIndex = 3
+ Me.Label9.Text = "[t]"
+ Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+ '
+ 'TbMassMass
+ '
+ Me.TbMassMass.Location = New System.Drawing.Point(230, 171)
+ Me.TbMassMass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbMassMass.Name = "TbMassMass"
+ Me.TbMassMass.Size = New System.Drawing.Size(61, 20)
+ Me.TbMassMass.TabIndex = 2
+ '
+ 'StatusStrip1
+ '
+ Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
+ Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 940)
+ Me.StatusStrip1.Name = "StatusStrip1"
+ Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
+ Me.StatusStrip1.Size = New System.Drawing.Size(999, 22)
+ Me.StatusStrip1.SizingGrip = false
+ Me.StatusStrip1.TabIndex = 36
+ Me.StatusStrip1.Text = "StatusStrip1"
+ '
+ 'LbStatus
+ '
+ Me.LbStatus.Name = "LbStatus"
+ Me.LbStatus.Size = New System.Drawing.Size(39, 17)
+ Me.LbStatus.Text = "Status"
+ '
+ 'TbHDVclass
+ '
+ Me.TbHDVclass.Location = New System.Drawing.Point(230, 217)
+ Me.TbHDVclass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbHDVclass.Name = "TbHDVclass"
+ Me.TbHDVclass.ReadOnly = true
+ Me.TbHDVclass.Size = New System.Drawing.Size(61, 20)
+ Me.TbHDVclass.TabIndex = 3
+ Me.TbHDVclass.TabStop = false
+ Me.TbHDVclass.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ '
+ 'GroupBox1
+ '
+ Me.GroupBox1.Controls.Add(Me.PnLoad)
+ Me.GroupBox1.Controls.Add(Me.TbMass)
+ Me.GroupBox1.Controls.Add(Me.Label1)
+ Me.GroupBox1.Controls.Add(Me.Label14)
+ Me.GroupBox1.Location = New System.Drawing.Point(9, 9)
+ Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox1.Name = "GroupBox1"
+ Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox1.Size = New System.Drawing.Size(417, 182)
+ Me.GroupBox1.TabIndex = 0
+ Me.GroupBox1.TabStop = false
+ Me.GroupBox1.Text = "Masses / Loading"
+ '
+ 'PnLoad
+ '
+ Me.PnLoad.Controls.Add(Me.Label2)
+ Me.PnLoad.Controls.Add(Me.Label31)
+ Me.PnLoad.Controls.Add(Me.TbLoad)
+ Me.PnLoad.Controls.Add(Me.TbMassExtra)
+ Me.PnLoad.Controls.Add(Me.Label50)
+ Me.PnLoad.Controls.Add(Me.Label46)
+ Me.PnLoad.Location = New System.Drawing.Point(9, 66)
+ Me.PnLoad.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnLoad.Name = "PnLoad"
+ Me.PnLoad.Size = New System.Drawing.Size(404, 89)
+ Me.PnLoad.TabIndex = 1
+ '
+ 'GrAirRes
+ '
+ Me.GrAirRes.Controls.Add(Me.PnCdATrTr)
+ Me.GrAirRes.Location = New System.Drawing.Point(435, 9)
+ Me.GrAirRes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GrAirRes.Name = "GrAirRes"
+ Me.GrAirRes.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GrAirRes.Size = New System.Drawing.Size(524, 111)
+ Me.GrAirRes.TabIndex = 2
+ Me.GrAirRes.TabStop = false
+ Me.GrAirRes.Text = "Air Resistance"
+ '
+ 'PnCdATrTr
+ '
+ Me.PnCdATrTr.Controls.Add(Me.tbVehicleHeight)
+ Me.PnCdATrTr.Controls.Add(Me.Label11)
+ Me.PnCdATrTr.Controls.Add(Me.Label20)
+ Me.PnCdATrTr.Controls.Add(Me.TBcdA)
+ Me.PnCdATrTr.Controls.Add(Me.Label38)
+ Me.PnCdATrTr.Controls.Add(Me.Label3)
+ Me.PnCdATrTr.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.PnCdATrTr.Location = New System.Drawing.Point(4, 18)
+ Me.PnCdATrTr.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnCdATrTr.Name = "PnCdATrTr"
+ Me.PnCdATrTr.Size = New System.Drawing.Size(516, 88)
+ Me.PnCdATrTr.TabIndex = 0
+ '
+ 'tbVehicleHeight
+ '
+ Me.tbVehicleHeight.Location = New System.Drawing.Point(81, 45)
+ Me.tbVehicleHeight.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbVehicleHeight.Name = "tbVehicleHeight"
+ Me.tbVehicleHeight.Size = New System.Drawing.Size(84, 20)
+ Me.tbVehicleHeight.TabIndex = 1
+ '
+ 'Label11
+ '
+ Me.Label11.AutoSize = true
+ Me.Label11.Location = New System.Drawing.Point(176, 49)
+ Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label11.Name = "Label11"
+ Me.Label11.Size = New System.Drawing.Size(21, 13)
+ Me.Label11.TabIndex = 27
+ Me.Label11.Text = "[m]"
+ '
+ 'Label20
+ '
+ Me.Label20.AutoSize = true
+ Me.Label20.Location = New System.Drawing.Point(15, 49)
+ Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label20.Name = "Label20"
+ Me.Label20.Size = New System.Drawing.Size(38, 13)
+ Me.Label20.TabIndex = 26
+ Me.Label20.Text = "Height"
+ '
+ 'Label38
+ '
+ Me.Label38.AutoSize = true
+ Me.Label38.Location = New System.Drawing.Point(176, 9)
+ Me.Label38.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label38.Name = "Label38"
+ Me.Label38.Size = New System.Drawing.Size(24, 13)
+ Me.Label38.TabIndex = 24
+ Me.Label38.Text = "[m²]"
+ '
+ 'PictureBox1
+ '
+ Me.PictureBox1.BackColor = System.Drawing.Color.White
+ Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 43)
+ Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PictureBox1.Name = "PictureBox1"
+ Me.PictureBox1.Size = New System.Drawing.Size(999, 62)
+ Me.PictureBox1.TabIndex = 37
+ Me.PictureBox1.TabStop = false
+ '
+ 'CmOpenFile
+ '
+ Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
+ Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+ Me.CmOpenFile.Name = "CmOpenFile"
+ Me.CmOpenFile.ShowImageMargin = false
+ Me.CmOpenFile.Size = New System.Drawing.Size(128, 48)
+ '
+ 'OpenWithToolStripMenuItem
+ '
+ Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
+ Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+ '
+ 'ShowInFolderToolStripMenuItem
+ '
+ Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
+ Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+ '
+ 'GroupBox3
+ '
+ Me.GroupBox3.Controls.Add(Me.PnWheelDiam)
+ Me.GroupBox3.Location = New System.Drawing.Point(9, 200)
+ Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox3.Name = "GroupBox3"
+ Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox3.Size = New System.Drawing.Size(417, 77)
+ Me.GroupBox3.TabIndex = 1
+ Me.GroupBox3.TabStop = false
+ Me.GroupBox3.Text = "Dynamic Tyre Radius"
+ '
+ 'gbAngledrive
+ '
+ Me.gbAngledrive.Controls.Add(Me.pnAngledriveFields)
+ Me.gbAngledrive.Controls.Add(Me.cbAngledriveType)
+ Me.gbAngledrive.Location = New System.Drawing.Point(494, 117)
+ Me.gbAngledrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbAngledrive.Name = "gbAngledrive"
+ Me.gbAngledrive.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbAngledrive.Size = New System.Drawing.Size(470, 171)
+ Me.gbAngledrive.TabIndex = 3
+ Me.gbAngledrive.TabStop = false
+ Me.gbAngledrive.Text = "Angledrive"
+ '
+ 'pnAngledriveFields
+ '
+ Me.pnAngledriveFields.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.pnAngledriveFields.Controls.Add(Me.Label4)
+ Me.pnAngledriveFields.Controls.Add(Me.Label10)
+ Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveRatio)
+ Me.pnAngledriveFields.Controls.Add(Me.btAngledriveLossMapBrowse)
+ Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveLossMapPath)
+ Me.pnAngledriveFields.Controls.Add(Me.Label12)
+ Me.pnAngledriveFields.Location = New System.Drawing.Point(4, 65)
+ Me.pnAngledriveFields.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnAngledriveFields.Name = "pnAngledriveFields"
+ Me.pnAngledriveFields.Size = New System.Drawing.Size(454, 97)
+ Me.pnAngledriveFields.TabIndex = 1
+ '
+ 'Label4
+ '
+ Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label4.AutoSize = true
+ Me.Label4.Location = New System.Drawing.Point(416, 9)
+ Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(16, 13)
+ Me.Label4.TabIndex = 16
+ Me.Label4.Text = "[-]"
+ '
+ 'Label10
+ '
+ Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label10.Location = New System.Drawing.Point(255, 9)
+ Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label10.Name = "Label10"
+ Me.Label10.Size = New System.Drawing.Size(66, 28)
+ Me.Label10.TabIndex = 15
+ Me.Label10.Text = "Ratio"
+ Me.Label10.TextAlign = System.Drawing.ContentAlignment.TopRight
+ '
+ 'tbAngledriveRatio
+ '
+ Me.tbAngledriveRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.tbAngledriveRatio.Location = New System.Drawing.Point(328, 6)
+ Me.tbAngledriveRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbAngledriveRatio.Name = "tbAngledriveRatio"
+ Me.tbAngledriveRatio.Size = New System.Drawing.Size(82, 20)
+ Me.tbAngledriveRatio.TabIndex = 0
+ '
+ 'btAngledriveLossMapBrowse
+ '
+ Me.btAngledriveLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.btAngledriveLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(414, 60)
+ Me.btAngledriveLossMapBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btAngledriveLossMapBrowse.Name = "btAngledriveLossMapBrowse"
+ Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.btAngledriveLossMapBrowse.TabIndex = 2
+ Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = true
+ '
+ 'tbAngledriveLossMapPath
+ '
+ Me.tbAngledriveLossMapPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(4, 63)
+ Me.tbAngledriveLossMapPath.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbAngledriveLossMapPath.Name = "tbAngledriveLossMapPath"
+ Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(408, 20)
+ Me.tbAngledriveLossMapPath.TabIndex = 1
+ '
+ 'Label12
+ '
+ Me.Label12.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label12.Location = New System.Drawing.Point(0, 37)
+ Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label12.Name = "Label12"
+ Me.Label12.Size = New System.Drawing.Size(441, 25)
+ Me.Label12.TabIndex = 17
+ Me.Label12.Text = "Transmission Loss Map or Efficiency Value [0..1]"
+ Me.Label12.TextAlign = System.Drawing.ContentAlignment.BottomLeft
+ '
+ 'cbAngledriveType
+ '
+ Me.cbAngledriveType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.cbAngledriveType.DisplayMember = "Value"
+ Me.cbAngledriveType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.cbAngledriveType.Location = New System.Drawing.Point(9, 29)
+ Me.cbAngledriveType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbAngledriveType.Name = "cbAngledriveType"
+ Me.cbAngledriveType.Size = New System.Drawing.Size(444, 28)
+ Me.cbAngledriveType.TabIndex = 0
+ Me.cbAngledriveType.ValueMember = "Key"
+ '
+ 'PicVehicle
+ '
+ Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
+ Me.PicVehicle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.PicVehicle.Location = New System.Drawing.Point(422, 108)
+ Me.PicVehicle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PicVehicle.Name = "PicVehicle"
+ Me.PicVehicle.Size = New System.Drawing.Size(449, 134)
+ Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
+ Me.PicVehicle.TabIndex = 39
+ Me.PicVehicle.TabStop = false
+ '
+ 'Label8
+ '
+ Me.Label8.AutoSize = true
+ Me.Label8.Location = New System.Drawing.Point(128, 222)
+ Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label8.Name = "Label8"
+ Me.Label8.Size = New System.Drawing.Size(62, 13)
+ Me.Label8.TabIndex = 10
+ Me.Label8.Text = "HDV Group"
+ '
+ 'cbPTOType
+ '
+ Me.cbPTOType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.cbPTOType.DisplayMember = "Value"
+ Me.cbPTOType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.cbPTOType.Location = New System.Drawing.Point(9, 37)
+ Me.cbPTOType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbPTOType.Name = "cbPTOType"
+ Me.cbPTOType.Size = New System.Drawing.Size(926, 28)
+ Me.cbPTOType.TabIndex = 0
+ Me.ToolTip1.SetToolTip(Me.cbPTOType, "Transmission type to the PTO consumer")
+ Me.cbPTOType.ValueMember = "Key"
+ '
+ 'tbPTOCycle
+ '
+ Me.tbPTOCycle.Location = New System.Drawing.Point(9, 35)
+ Me.tbPTOCycle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPTOCycle.Name = "tbPTOCycle"
+ Me.tbPTOCycle.Size = New System.Drawing.Size(643, 20)
+ Me.tbPTOCycle.TabIndex = 2
+ Me.ToolTip1.SetToolTip(Me.tbPTOCycle, "PTO Consumer Loss Map")
+ '
+ 'tbPTOLossMap
+ '
+ Me.tbPTOLossMap.Location = New System.Drawing.Point(9, 37)
+ Me.tbPTOLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPTOLossMap.Name = "tbPTOLossMap"
+ Me.tbPTOLossMap.Size = New System.Drawing.Size(643, 20)
+ Me.tbPTOLossMap.TabIndex = 0
+ Me.ToolTip1.SetToolTip(Me.tbPTOLossMap, "PTO Consumer Loss Map")
+ '
+ 'tbPTODrive
+ '
+ Me.tbPTODrive.Location = New System.Drawing.Point(4, 32)
+ Me.tbPTODrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPTODrive.Name = "tbPTODrive"
+ Me.tbPTODrive.Size = New System.Drawing.Size(643, 20)
+ Me.tbPTODrive.TabIndex = 5
+ Me.ToolTip1.SetToolTip(Me.tbPTODrive, "PTO Consumer Loss Map")
+ '
+ 'tcVehicleComponents
+ '
+ Me.tcVehicleComponents.Controls.Add(Me.tpGeneral)
+ Me.tcVehicleComponents.Controls.Add(Me.tpPowertrain)
+ Me.tcVehicleComponents.Controls.Add(Me.tpElectricMachine)
+ Me.tcVehicleComponents.Controls.Add(Me.tpIEPC)
+ Me.tcVehicleComponents.Controls.Add(Me.tbIHPC)
+ Me.tcVehicleComponents.Controls.Add(Me.tpReess)
+ Me.tcVehicleComponents.Controls.Add(Me.tpGensetComponents)
+ Me.tcVehicleComponents.Controls.Add(Me.tpTorqueLimits)
+ Me.tcVehicleComponents.Controls.Add(Me.tpADAS)
+ Me.tcVehicleComponents.Controls.Add(Me.tpRoadSweeper)
+ Me.tcVehicleComponents.Location = New System.Drawing.Point(8, 266)
+ Me.tcVehicleComponents.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tcVehicleComponents.Name = "tcVehicleComponents"
+ Me.tcVehicleComponents.SelectedIndex = 0
+ Me.tcVehicleComponents.Size = New System.Drawing.Size(984, 615)
+ Me.tcVehicleComponents.TabIndex = 5
+ '
+ 'tpGeneral
+ '
+ Me.tpGeneral.Controls.Add(Me.GroupBox1)
+ Me.tpGeneral.Controls.Add(Me.GroupBox3)
+ Me.tpGeneral.Controls.Add(Me.GroupBox6)
+ Me.tpGeneral.Controls.Add(Me.GroupBox8)
+ Me.tpGeneral.Controls.Add(Me.GrAirRes)
+ Me.tpGeneral.Location = New System.Drawing.Point(4, 29)
+ Me.tpGeneral.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpGeneral.Name = "tpGeneral"
+ Me.tpGeneral.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpGeneral.Size = New System.Drawing.Size(976, 582)
+ Me.tpGeneral.TabIndex = 0
+ Me.tpGeneral.Text = "General"
+ Me.tpGeneral.UseVisualStyleBackColor = true
+ '
+ 'tpPowertrain
+ '
+ Me.tpPowertrain.Controls.Add(Me.gbVehicleIdlingSpeed)
+ Me.tpPowertrain.Controls.Add(Me.gbTankSystem)
+ Me.tpPowertrain.Controls.Add(Me.gbRetarderLosses)
+ Me.tpPowertrain.Controls.Add(Me.gbAngledrive)
+ Me.tpPowertrain.Location = New System.Drawing.Point(4, 29)
+ Me.tpPowertrain.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpPowertrain.Name = "tpPowertrain"
+ Me.tpPowertrain.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpPowertrain.Size = New System.Drawing.Size(976, 582)
+ Me.tpPowertrain.TabIndex = 1
+ Me.tpPowertrain.Text = "Powertrain"
+ Me.tpPowertrain.UseVisualStyleBackColor = true
+ '
+ 'gbVehicleIdlingSpeed
+ '
+ Me.gbVehicleIdlingSpeed.Controls.Add(Me.Panel1)
+ Me.gbVehicleIdlingSpeed.Location = New System.Drawing.Point(9, 9)
+ Me.gbVehicleIdlingSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbVehicleIdlingSpeed.Name = "gbVehicleIdlingSpeed"
+ Me.gbVehicleIdlingSpeed.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbVehicleIdlingSpeed.Size = New System.Drawing.Size(465, 97)
+ Me.gbVehicleIdlingSpeed.TabIndex = 0
+ Me.gbVehicleIdlingSpeed.TabStop = false
+ Me.gbVehicleIdlingSpeed.Text = "Vehicle Idling Speed"
+ '
+ 'Panel1
+ '
+ Me.Panel1.Controls.Add(Me.tbVehIdlingSpeed)
+ Me.Panel1.Controls.Add(Me.Label18)
+ Me.Panel1.Controls.Add(Me.Label19)
+ Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.Panel1.Location = New System.Drawing.Point(4, 18)
+ Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel1.Name = "Panel1"
+ Me.Panel1.Size = New System.Drawing.Size(457, 74)
+ Me.Panel1.TabIndex = 0
+ '
+ 'tbVehIdlingSpeed
+ '
+ Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(308, 6)
+ Me.tbVehIdlingSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbVehIdlingSpeed.Name = "tbVehIdlingSpeed"
+ Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(82, 20)
+ Me.tbVehIdlingSpeed.TabIndex = 0
+ '
+ 'Label18
+ '
+ Me.Label18.AutoSize = true
+ Me.Label18.Location = New System.Drawing.Point(396, 11)
+ Me.Label18.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label18.Name = "Label18"
+ Me.Label18.Size = New System.Drawing.Size(30, 13)
+ Me.Label18.TabIndex = 24
+ Me.Label18.Text = "[rpm]"
+ '
+ 'Label19
+ '
+ Me.Label19.AutoSize = true
+ Me.Label19.Location = New System.Drawing.Point(156, 11)
+ Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label19.Name = "Label19"
+ Me.Label19.Size = New System.Drawing.Size(94, 13)
+ Me.Label19.TabIndex = 8
+ Me.Label19.Text = "Engine Idle Speed"
+ '
+ 'gbTankSystem
+ '
+ Me.gbTankSystem.Controls.Add(Me.cbTankSystem)
+ Me.gbTankSystem.Controls.Add(Me.Label23)
+ Me.gbTankSystem.Location = New System.Drawing.Point(494, 9)
+ Me.gbTankSystem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbTankSystem.Name = "gbTankSystem"
+ Me.gbTankSystem.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbTankSystem.Size = New System.Drawing.Size(465, 97)
+ Me.gbTankSystem.TabIndex = 2
+ Me.gbTankSystem.TabStop = false
+ Me.gbTankSystem.Text = "Tank System"
+ '
+ 'cbTankSystem
+ '
+ Me.cbTankSystem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.cbTankSystem.DisplayMember = "Value"
+ Me.cbTankSystem.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.cbTankSystem.Location = New System.Drawing.Point(9, 29)
+ Me.cbTankSystem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbTankSystem.Name = "cbTankSystem"
+ Me.cbTankSystem.Size = New System.Drawing.Size(444, 28)
+ Me.cbTankSystem.TabIndex = 1
+ Me.cbTankSystem.ValueMember = "Key"
+ '
+ 'Label23
+ '
+ Me.Label23.AutoSize = true
+ Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.Label23.Location = New System.Drawing.Point(4, 66)
+ Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label23.Name = "Label23"
+ Me.Label23.Size = New System.Drawing.Size(187, 13)
+ Me.Label23.TabIndex = 0
+ Me.Label23.Text = "Only applicable for NG engines!"
+ '
+ 'tpElectricMachine
+ '
+ Me.tpElectricMachine.Controls.Add(Me.gpElectricMotor)
+ Me.tpElectricMachine.Location = New System.Drawing.Point(4, 29)
+ Me.tpElectricMachine.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpElectricMachine.Name = "tpElectricMachine"
+ Me.tpElectricMachine.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpElectricMachine.Size = New System.Drawing.Size(976, 582)
+ Me.tpElectricMachine.TabIndex = 6
+ Me.tpElectricMachine.Text = "Electric Machine"
+ Me.tpElectricMachine.UseVisualStyleBackColor = true
+ '
+ 'gpElectricMotor
+ '
+ Me.gpElectricMotor.Controls.Add(Me.Label33)
+ Me.gpElectricMotor.Controls.Add(Me.Label32)
+ Me.gpElectricMotor.Controls.Add(Me.gbRatiosPerGear)
+ Me.gpElectricMotor.Controls.Add(Me.btnEmADCLossMap)
+ Me.gpElectricMotor.Controls.Add(Me.tbEmADCLossMap)
+ Me.gpElectricMotor.Controls.Add(Me.lblEmADCLossmap)
+ Me.gpElectricMotor.Controls.Add(Me.tbRatioEm)
+ Me.gpElectricMotor.Controls.Add(Me.lblRatioEm)
+ Me.gpElectricMotor.Controls.Add(Me.tbEmCount)
+ Me.gpElectricMotor.Controls.Add(Me.cbEmPos)
+ Me.gpElectricMotor.Controls.Add(Me.lblEmCount)
+ Me.gpElectricMotor.Controls.Add(Me.lblEmPosition)
+ Me.gpElectricMotor.Controls.Add(Me.pnElectricMotor)
+ Me.gpElectricMotor.Location = New System.Drawing.Point(9, 9)
+ Me.gpElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gpElectricMotor.Name = "gpElectricMotor"
+ Me.gpElectricMotor.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gpElectricMotor.Size = New System.Drawing.Size(950, 251)
+ Me.gpElectricMotor.TabIndex = 1
+ Me.gpElectricMotor.TabStop = false
+ Me.gpElectricMotor.Text = "Electric Machine"
+ '
+ 'Label33
+ '
+ Me.Label33.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label33.AutoSize = true
+ Me.Label33.Location = New System.Drawing.Point(304, 166)
+ Me.Label33.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label33.Name = "Label33"
+ Me.Label33.Size = New System.Drawing.Size(16, 13)
+ Me.Label33.TabIndex = 27
+ Me.Label33.Text = "[-]"
+ '
+ 'Label32
+ '
+ Me.Label32.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label32.AutoSize = true
+ Me.Label32.Location = New System.Drawing.Point(304, 126)
+ Me.Label32.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label32.Name = "Label32"
+ Me.Label32.Size = New System.Drawing.Size(16, 13)
+ Me.Label32.TabIndex = 26
+ Me.Label32.Text = "[-]"
+ '
+ 'gbRatiosPerGear
+ '
+ Me.gbRatiosPerGear.Controls.Add(Me.lvRatioPerGear)
+ Me.gbRatiosPerGear.Controls.Add(Me.btnAddEMRatio)
+ Me.gbRatiosPerGear.Controls.Add(Me.Label29)
+ Me.gbRatiosPerGear.Controls.Add(Me.btnRemoveEMRatio)
+ Me.gbRatiosPerGear.Location = New System.Drawing.Point(666, 18)
+ Me.gbRatiosPerGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbRatiosPerGear.Name = "gbRatiosPerGear"
+ Me.gbRatiosPerGear.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbRatiosPerGear.Size = New System.Drawing.Size(272, 223)
+ Me.gbRatiosPerGear.TabIndex = 1
+ Me.gbRatiosPerGear.TabStop = false
+ Me.gbRatiosPerGear.Text = "Transmission Ratio per Gear"
+ '
+ 'lvRatioPerGear
+ '
+ Me.lvRatioPerGear.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvRatioPerGear.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader11, Me.ColumnHeader12})
+ Me.lvRatioPerGear.FullRowSelect = true
+ Me.lvRatioPerGear.GridLines = true
+ Me.lvRatioPerGear.HideSelection = false
+ Me.lvRatioPerGear.Location = New System.Drawing.Point(9, 25)
+ Me.lvRatioPerGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.lvRatioPerGear.MultiSelect = false
+ Me.lvRatioPerGear.Name = "lvRatioPerGear"
+ Me.lvRatioPerGear.Size = New System.Drawing.Size(252, 142)
+ Me.lvRatioPerGear.TabIndex = 7
+ Me.lvRatioPerGear.TabStop = false
+ Me.lvRatioPerGear.UseCompatibleStateImageBehavior = false
+ Me.lvRatioPerGear.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader11
+ '
+ Me.ColumnHeader11.Text = "Gear #"
+ Me.ColumnHeader11.Width = 59
+ '
+ 'ColumnHeader12
+ '
+ Me.ColumnHeader12.Text = "Ratio"
+ Me.ColumnHeader12.Width = 172
+ '
+ 'btnAddEMRatio
+ '
+ Me.btnAddEMRatio.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.btnAddEMRatio.Location = New System.Drawing.Point(9, 178)
+ Me.btnAddEMRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnAddEMRatio.Name = "btnAddEMRatio"
+ Me.btnAddEMRatio.Size = New System.Drawing.Size(36, 37)
+ Me.btnAddEMRatio.TabIndex = 4
+ Me.btnAddEMRatio.UseVisualStyleBackColor = true
+ '
+ 'Label29
+ '
+ Me.Label29.AutoSize = true
+ Me.Label29.Location = New System.Drawing.Point(106, 171)
+ Me.Label29.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label29.Name = "Label29"
+ Me.Label29.Size = New System.Drawing.Size(106, 13)
+ Me.Label29.TabIndex = 6
+ Me.Label29.Text = "(Double-Click to Edit)"
+ '
+ 'btnRemoveEMRatio
+ '
+ Me.btnRemoveEMRatio.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.btnRemoveEMRatio.Location = New System.Drawing.Point(50, 178)
+ Me.btnRemoveEMRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnRemoveEMRatio.Name = "btnRemoveEMRatio"
+ Me.btnRemoveEMRatio.Size = New System.Drawing.Size(36, 37)
+ Me.btnRemoveEMRatio.TabIndex = 5
+ Me.btnRemoveEMRatio.UseVisualStyleBackColor = true
+ '
+ 'btnEmADCLossMap
+ '
+ Me.btnEmADCLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ Me.btnEmADCLossMap.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btnEmADCLossMap.Location = New System.Drawing.Point(519, 198)
+ Me.btnEmADCLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnEmADCLossMap.Name = "btnEmADCLossMap"
+ Me.btnEmADCLossMap.Size = New System.Drawing.Size(36, 37)
+ Me.btnEmADCLossMap.TabIndex = 5
+ Me.btnEmADCLossMap.UseVisualStyleBackColor = true
+ '
+ 'tbEmADCLossMap
+ '
+ Me.tbEmADCLossMap.Location = New System.Drawing.Point(165, 202)
+ Me.tbEmADCLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbEmADCLossMap.Name = "tbEmADCLossMap"
+ Me.tbEmADCLossMap.Size = New System.Drawing.Size(349, 20)
+ Me.tbEmADCLossMap.TabIndex = 4
+ '
+ 'lblEmADCLossmap
+ '
+ Me.lblEmADCLossmap.AutoSize = true
+ Me.lblEmADCLossmap.Location = New System.Drawing.Point(10, 206)
+ Me.lblEmADCLossmap.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEmADCLossmap.Name = "lblEmADCLossmap"
+ Me.lblEmADCLossmap.Size = New System.Drawing.Size(100, 13)
+ Me.lblEmADCLossmap.TabIndex = 25
+ Me.lblEmADCLossmap.Text = "Loss Map EM ADC:"
+ '
+ 'tbRatioEm
+ '
+ Me.tbRatioEm.Location = New System.Drawing.Point(165, 162)
+ Me.tbRatioEm.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbRatioEm.Name = "tbRatioEm"
+ Me.tbRatioEm.Size = New System.Drawing.Size(134, 20)
+ Me.tbRatioEm.TabIndex = 3
+ '
+ 'lblRatioEm
+ '
+ Me.lblRatioEm.AutoSize = true
+ Me.lblRatioEm.Location = New System.Drawing.Point(10, 166)
+ Me.lblRatioEm.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRatioEm.Name = "lblRatioEm"
+ Me.lblRatioEm.Size = New System.Drawing.Size(79, 13)
+ Me.lblRatioEm.TabIndex = 23
+ Me.lblRatioEm.Text = "Ratio EM ADC:"
+ '
+ 'tbEmCount
+ '
+ Me.tbEmCount.Location = New System.Drawing.Point(165, 122)
+ Me.tbEmCount.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbEmCount.Name = "tbEmCount"
+ Me.tbEmCount.Size = New System.Drawing.Size(134, 20)
+ Me.tbEmCount.TabIndex = 2
+ '
+ 'cbEmPos
+ '
+ Me.cbEmPos.DisplayMember = "Value"
+ Me.cbEmPos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.cbEmPos.FormattingEnabled = true
+ Me.cbEmPos.Location = New System.Drawing.Point(165, 80)
+ Me.cbEmPos.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbEmPos.Name = "cbEmPos"
+ Me.cbEmPos.Size = New System.Drawing.Size(228, 28)
+ Me.cbEmPos.TabIndex = 1
+ Me.cbEmPos.ValueMember = "Key"
+ '
+ 'lblEmCount
+ '
+ Me.lblEmCount.AutoSize = true
+ Me.lblEmCount.Location = New System.Drawing.Point(10, 126)
+ Me.lblEmCount.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEmCount.Name = "lblEmCount"
+ Me.lblEmCount.Size = New System.Drawing.Size(83, 13)
+ Me.lblEmCount.TabIndex = 20
+ Me.lblEmCount.Text = "Number of EMs:"
+ '
+ 'lblEmPosition
+ '
+ Me.lblEmPosition.AutoSize = true
+ Me.lblEmPosition.Location = New System.Drawing.Point(10, 86)
+ Me.lblEmPosition.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEmPosition.Name = "lblEmPosition"
+ Me.lblEmPosition.Size = New System.Drawing.Size(47, 13)
+ Me.lblEmPosition.TabIndex = 19
+ Me.lblEmPosition.Text = "Position:"
+ '
+ 'pnElectricMotor
+ '
+ Me.pnElectricMotor.Controls.Add(Me.btnOpenElectricMotor)
+ Me.pnElectricMotor.Controls.Add(Me.btnBrowseElectricMotor)
+ Me.pnElectricMotor.Controls.Add(Me.tbElectricMotor)
+ Me.pnElectricMotor.Location = New System.Drawing.Point(9, 29)
+ Me.pnElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnElectricMotor.Name = "pnElectricMotor"
+ Me.pnElectricMotor.Size = New System.Drawing.Size(648, 42)
+ Me.pnElectricMotor.TabIndex = 0
+ '
+ 'btnOpenElectricMotor
+ '
+ Me.btnOpenElectricMotor.Location = New System.Drawing.Point(6, 5)
+ Me.btnOpenElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnOpenElectricMotor.Name = "btnOpenElectricMotor"
+ Me.btnOpenElectricMotor.Size = New System.Drawing.Size(141, 32)
+ Me.btnOpenElectricMotor.TabIndex = 0
+ Me.btnOpenElectricMotor.Text = "Electric Machine"
+ Me.btnOpenElectricMotor.UseVisualStyleBackColor = true
+ '
+ 'btnBrowseElectricMotor
+ '
+ Me.btnBrowseElectricMotor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.btnBrowseElectricMotor.Image = CType(resources.GetObject("btnBrowseElectricMotor.Image"),System.Drawing.Image)
+ Me.btnBrowseElectricMotor.Location = New System.Drawing.Point(609, 3)
+ Me.btnBrowseElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseElectricMotor.Name = "btnBrowseElectricMotor"
+ Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseElectricMotor.TabIndex = 2
+ Me.btnBrowseElectricMotor.UseVisualStyleBackColor = true
+ '
+ 'tbElectricMotor
+ '
+ Me.tbElectricMotor.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.tbElectricMotor.Location = New System.Drawing.Point(156, 6)
+ Me.tbElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbElectricMotor.Name = "tbElectricMotor"
+ Me.tbElectricMotor.Size = New System.Drawing.Size(448, 20)
+ Me.tbElectricMotor.TabIndex = 1
+ '
+ 'tpIEPC
+ '
+ Me.tpIEPC.Controls.Add(Me.FlowLayoutPanel1)
+ Me.tpIEPC.Location = New System.Drawing.Point(4, 29)
+ Me.tpIEPC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpIEPC.Name = "tpIEPC"
+ Me.tpIEPC.Size = New System.Drawing.Size(976, 582)
+ Me.tpIEPC.TabIndex = 8
+ Me.tpIEPC.Text = "IEPC"
+ Me.tpIEPC.UseVisualStyleBackColor = true
+ '
+ 'FlowLayoutPanel1
+ '
+ Me.FlowLayoutPanel1.Controls.Add(Me.btnIEPC)
+ Me.FlowLayoutPanel1.Controls.Add(Me.tbIEPCFilePath)
+ Me.FlowLayoutPanel1.Controls.Add(Me.btIEPCFilePath)
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(38, 29)
+ Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(645, 42)
+ Me.FlowLayoutPanel1.TabIndex = 61
+ '
+ 'btnIEPC
+ '
+ Me.btnIEPC.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btnIEPC.Location = New System.Drawing.Point(2, 4)
+ Me.btnIEPC.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.btnIEPC.Name = "btnIEPC"
+ Me.btnIEPC.Size = New System.Drawing.Size(141, 32)
+ Me.btnIEPC.TabIndex = 27
+ Me.btnIEPC.Text = "IEPC"
+ Me.btnIEPC.UseVisualStyleBackColor = true
+ '
+ 'tbIEPCFilePath
+ '
+ Me.tbIEPCFilePath.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbIEPCFilePath.Location = New System.Drawing.Point(147, 10)
+ Me.tbIEPCFilePath.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.tbIEPCFilePath.Name = "tbIEPCFilePath"
+ Me.tbIEPCFilePath.Size = New System.Drawing.Size(448, 20)
+ Me.tbIEPCFilePath.TabIndex = 28
+ '
+ 'btIEPCFilePath
+ '
+ Me.btIEPCFilePath.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btIEPCFilePath.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btIEPCFilePath.Location = New System.Drawing.Point(599, 2)
+ Me.btIEPCFilePath.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.btIEPCFilePath.Name = "btIEPCFilePath"
+ Me.btIEPCFilePath.Size = New System.Drawing.Size(36, 37)
+ Me.btIEPCFilePath.TabIndex = 58
+ Me.btIEPCFilePath.UseVisualStyleBackColor = true
+ '
+ 'tbIHPC
+ '
+ Me.tbIHPC.Controls.Add(Me.FlowLayoutPanel2)
+ Me.tbIHPC.Location = New System.Drawing.Point(4, 29)
+ Me.tbIHPC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbIHPC.Name = "tbIHPC"
+ Me.tbIHPC.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbIHPC.Size = New System.Drawing.Size(976, 582)
+ Me.tbIHPC.TabIndex = 9
+ Me.tbIHPC.Text = "IHPC"
+ Me.tbIHPC.UseVisualStyleBackColor = true
+ '
+ 'FlowLayoutPanel2
+ '
+ Me.FlowLayoutPanel2.Controls.Add(Me.btIHPC)
+ Me.FlowLayoutPanel2.Controls.Add(Me.tbIHPCFilePath)
+ Me.FlowLayoutPanel2.Controls.Add(Me.btIHPCFile)
+ Me.FlowLayoutPanel2.Location = New System.Drawing.Point(38, 29)
+ Me.FlowLayoutPanel2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2"
+ Me.FlowLayoutPanel2.Size = New System.Drawing.Size(640, 42)
+ Me.FlowLayoutPanel2.TabIndex = 3
+ '
+ 'btIHPC
+ '
+ Me.btIHPC.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btIHPC.Location = New System.Drawing.Point(2, 4)
+ Me.btIHPC.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.btIHPC.Name = "btIHPC"
+ Me.btIHPC.Size = New System.Drawing.Size(141, 32)
+ Me.btIHPC.TabIndex = 0
+ Me.btIHPC.Text = "IHPC"
+ Me.btIHPC.UseVisualStyleBackColor = true
+ '
+ 'tbIHPCFilePath
+ '
+ Me.tbIHPCFilePath.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.tbIHPCFilePath.Location = New System.Drawing.Point(147, 10)
+ Me.tbIHPCFilePath.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.tbIHPCFilePath.Name = "tbIHPCFilePath"
+ Me.tbIHPCFilePath.Size = New System.Drawing.Size(448, 20)
+ Me.tbIHPCFilePath.TabIndex = 1
+ '
+ 'btIHPCFile
+ '
+ Me.btIHPCFile.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.btIHPCFile.Image = CType(resources.GetObject("btIHPCFile.Image"),System.Drawing.Image)
+ Me.btIHPCFile.Location = New System.Drawing.Point(599, 2)
+ Me.btIHPCFile.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.btIHPCFile.Name = "btIHPCFile"
+ Me.btIHPCFile.Size = New System.Drawing.Size(36, 37)
+ Me.btIHPCFile.TabIndex = 2
+ Me.btIHPCFile.UseVisualStyleBackColor = true
+ '
+ 'tpReess
+ '
+ Me.tpReess.Controls.Add(Me.gbBattery)
+ Me.tpReess.Location = New System.Drawing.Point(4, 29)
+ Me.tpReess.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpReess.Name = "tpReess"
+ Me.tpReess.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpReess.Size = New System.Drawing.Size(976, 582)
+ Me.tpReess.TabIndex = 7
+ Me.tpReess.Text = "REESS"
+ Me.tpReess.UseVisualStyleBackColor = true
+ '
+ 'gbBattery
+ '
+ Me.gbBattery.Controls.Add(Me.lvREESSPacks)
+ Me.gbBattery.Controls.Add(Me.btnAddReessPack)
+ Me.gbBattery.Controls.Add(Me.lblEditReessPack)
+ Me.gbBattery.Controls.Add(Me.btnRemoveReessPack)
+ Me.gbBattery.Controls.Add(Me.lblInitialSoCUnit)
+ Me.gbBattery.Controls.Add(Me.tbInitialSoC)
+ Me.gbBattery.Controls.Add(Me.lblInitialSoC)
+ Me.gbBattery.Location = New System.Drawing.Point(9, 9)
+ Me.gbBattery.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbBattery.Name = "gbBattery"
+ Me.gbBattery.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbBattery.Size = New System.Drawing.Size(950, 288)
+ Me.gbBattery.TabIndex = 3
+ Me.gbBattery.TabStop = false
+ Me.gbBattery.Text = "Electric Energy Storage system"
+ '
+ 'lvREESSPacks
+ '
+ Me.lvREESSPacks.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvREESSPacks.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.chReessPackPack, Me.chReessPackCount, Me.chReessPackStringId})
+ Me.lvREESSPacks.FullRowSelect = true
+ Me.lvREESSPacks.GridLines = true
+ Me.lvREESSPacks.HideSelection = false
+ Me.lvREESSPacks.Location = New System.Drawing.Point(9, 69)
+ Me.lvREESSPacks.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.lvREESSPacks.MultiSelect = false
+ Me.lvREESSPacks.Name = "lvREESSPacks"
+ Me.lvREESSPacks.Size = New System.Drawing.Size(828, 155)
+ Me.lvREESSPacks.TabIndex = 31
+ Me.lvREESSPacks.TabStop = false
+ Me.lvREESSPacks.UseCompatibleStateImageBehavior = false
+ Me.lvREESSPacks.View = System.Windows.Forms.View.Details
+ '
+ 'chReessPackPack
+ '
+ Me.chReessPackPack.Text = "REESS Pack"
+ Me.chReessPackPack.Width = 350
+ '
+ 'chReessPackCount
+ '
+ Me.chReessPackCount.Text = "Count"
+ Me.chReessPackCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ '
+ 'chReessPackStringId
+ '
+ Me.chReessPackStringId.Text = "Stream #"
+ Me.chReessPackStringId.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ '
+ 'btnAddReessPack
+ '
+ Me.btnAddReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.btnAddReessPack.Location = New System.Drawing.Point(9, 235)
+ Me.btnAddReessPack.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnAddReessPack.Name = "btnAddReessPack"
+ Me.btnAddReessPack.Size = New System.Drawing.Size(36, 37)
+ Me.btnAddReessPack.TabIndex = 1
+ Me.btnAddReessPack.UseVisualStyleBackColor = true
+ '
+ 'lblEditReessPack
+ '
+ Me.lblEditReessPack.AutoSize = true
+ Me.lblEditReessPack.Location = New System.Drawing.Point(678, 228)
+ Me.lblEditReessPack.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEditReessPack.Name = "lblEditReessPack"
+ Me.lblEditReessPack.Size = New System.Drawing.Size(106, 13)
+ Me.lblEditReessPack.TabIndex = 30
+ Me.lblEditReessPack.Text = "(Double-Click to Edit)"
+ '
+ 'btnRemoveReessPack
+ '
+ Me.btnRemoveReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.btnRemoveReessPack.Location = New System.Drawing.Point(50, 235)
+ Me.btnRemoveReessPack.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnRemoveReessPack.Name = "btnRemoveReessPack"
+ Me.btnRemoveReessPack.Size = New System.Drawing.Size(36, 37)
+ Me.btnRemoveReessPack.TabIndex = 2
+ Me.btnRemoveReessPack.UseVisualStyleBackColor = true
+ '
+ 'lblInitialSoCUnit
+ '
+ Me.lblInitialSoCUnit.AutoSize = true
+ Me.lblInitialSoCUnit.Location = New System.Drawing.Point(398, 32)
+ Me.lblInitialSoCUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblInitialSoCUnit.Name = "lblInitialSoCUnit"
+ Me.lblInitialSoCUnit.Size = New System.Drawing.Size(21, 13)
+ Me.lblInitialSoCUnit.TabIndex = 27
+ Me.lblInitialSoCUnit.Text = "[%]"
+ '
+ 'tbInitialSoC
+ '
+ Me.tbInitialSoC.Location = New System.Drawing.Point(306, 29)
+ Me.tbInitialSoC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbInitialSoC.Name = "tbInitialSoC"
+ Me.tbInitialSoC.Size = New System.Drawing.Size(86, 20)
+ Me.tbInitialSoC.TabIndex = 0
+ '
+ 'lblInitialSoC
+ '
+ Me.lblInitialSoC.AutoSize = true
+ Me.lblInitialSoC.Location = New System.Drawing.Point(10, 34)
+ Me.lblInitialSoC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblInitialSoC.Name = "lblInitialSoC"
+ Me.lblInitialSoC.RightToLeft = System.Windows.Forms.RightToLeft.Yes
+ Me.lblInitialSoC.Size = New System.Drawing.Size(54, 13)
+ Me.lblInitialSoC.TabIndex = 25
+ Me.lblInitialSoC.Text = "Initial SoC"
+ '
+ 'tpGensetComponents
+ '
+ Me.tpGensetComponents.Controls.Add(Me.Label30)
+ Me.tpGensetComponents.Controls.Add(Me.gbGenSet)
+ Me.tpGensetComponents.Location = New System.Drawing.Point(4, 29)
+ Me.tpGensetComponents.Name = "tpGensetComponents"
+ Me.tpGensetComponents.Size = New System.Drawing.Size(976, 582)
+ Me.tpGensetComponents.TabIndex = 5
+ Me.tpGensetComponents.Text = "GenSet Components"
+ Me.tpGensetComponents.UseVisualStyleBackColor = true
+ '
+ 'Label30
+ '
+ Me.Label30.AutoSize = true
+ Me.Label30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.Label30.Location = New System.Drawing.Point(20, 235)
+ Me.Label30.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label30.Name = "Label30"
+ Me.Label30.Size = New System.Drawing.Size(429, 13)
+ Me.Label30.TabIndex = 21
+ Me.Label30.Text = "Note: The internal combustion engine of the GenSet is configured in the Job-Edito"& _
+ "r dialog."
+ '
+ 'gbGenSet
+ '
+ Me.gbGenSet.Controls.Add(Me.Label36)
+ Me.gbGenSet.Controls.Add(Me.Label34)
+ Me.gbGenSet.Controls.Add(Me.btnGenSetLossMap)
+ Me.gbGenSet.Controls.Add(Me.tbGenSetADC)
+ Me.gbGenSet.Controls.Add(Me.lblGenSetADC)
+ Me.gbGenSet.Controls.Add(Me.tbGenSetRatio)
+ Me.gbGenSet.Controls.Add(Me.lblGenSetRatio)
+ Me.gbGenSet.Controls.Add(Me.tbGenSetCount)
+ Me.gbGenSet.Controls.Add(Me.lblGenSetCount)
+ Me.gbGenSet.Controls.Add(Me.pnGenSetEM)
+ Me.gbGenSet.Location = New System.Drawing.Point(9, 9)
+ Me.gbGenSet.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbGenSet.Name = "gbGenSet"
+ Me.gbGenSet.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbGenSet.Size = New System.Drawing.Size(950, 208)
+ Me.gbGenSet.TabIndex = 1
+ Me.gbGenSet.TabStop = false
+ Me.gbGenSet.Text = "Electric Machine"
+ '
+ 'Label36
+ '
+ Me.Label36.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label36.AutoSize = true
+ Me.Label36.Location = New System.Drawing.Point(304, 128)
+ Me.Label36.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label36.Name = "Label36"
+ Me.Label36.Size = New System.Drawing.Size(16, 13)
+ Me.Label36.TabIndex = 28
+ Me.Label36.Text = "[-]"
+ '
+ 'Label34
+ '
+ Me.Label34.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label34.AutoSize = true
+ Me.Label34.Location = New System.Drawing.Point(304, 88)
+ Me.Label34.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label34.Name = "Label34"
+ Me.Label34.Size = New System.Drawing.Size(16, 13)
+ Me.Label34.TabIndex = 27
+ Me.Label34.Text = "[-]"
+ '
+ 'btnGenSetLossMap
+ '
+ Me.btnGenSetLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ Me.btnGenSetLossMap.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btnGenSetLossMap.Location = New System.Drawing.Point(618, 162)
+ Me.btnGenSetLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnGenSetLossMap.Name = "btnGenSetLossMap"
+ Me.btnGenSetLossMap.Size = New System.Drawing.Size(36, 37)
+ Me.btnGenSetLossMap.TabIndex = 5
+ Me.btnGenSetLossMap.UseVisualStyleBackColor = true
+ '
+ 'tbGenSetADC
+ '
+ Me.tbGenSetADC.Location = New System.Drawing.Point(165, 165)
+ Me.tbGenSetADC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbGenSetADC.Name = "tbGenSetADC"
+ Me.tbGenSetADC.Size = New System.Drawing.Size(450, 20)
+ Me.tbGenSetADC.TabIndex = 4
+ '
+ 'lblGenSetADC
+ '
+ Me.lblGenSetADC.AutoSize = true
+ Me.lblGenSetADC.Location = New System.Drawing.Point(10, 169)
+ Me.lblGenSetADC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblGenSetADC.Name = "lblGenSetADC"
+ Me.lblGenSetADC.Size = New System.Drawing.Size(100, 13)
+ Me.lblGenSetADC.TabIndex = 25
+ Me.lblGenSetADC.Text = "Loss Map EM ADC:"
+ '
+ 'tbGenSetRatio
+ '
+ Me.tbGenSetRatio.Location = New System.Drawing.Point(165, 125)
+ Me.tbGenSetRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbGenSetRatio.Name = "tbGenSetRatio"
+ Me.tbGenSetRatio.Size = New System.Drawing.Size(134, 20)
+ Me.tbGenSetRatio.TabIndex = 3
+ '
+ 'lblGenSetRatio
+ '
+ Me.lblGenSetRatio.AutoSize = true
+ Me.lblGenSetRatio.Location = New System.Drawing.Point(10, 129)
+ Me.lblGenSetRatio.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblGenSetRatio.Name = "lblGenSetRatio"
+ Me.lblGenSetRatio.Size = New System.Drawing.Size(79, 13)
+ Me.lblGenSetRatio.TabIndex = 23
+ Me.lblGenSetRatio.Text = "Ratio EM ADC:"
+ '
+ 'tbGenSetCount
+ '
+ Me.tbGenSetCount.Location = New System.Drawing.Point(165, 85)
+ Me.tbGenSetCount.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbGenSetCount.Name = "tbGenSetCount"
+ Me.tbGenSetCount.Size = New System.Drawing.Size(134, 20)
+ Me.tbGenSetCount.TabIndex = 2
+ '
+ 'lblGenSetCount
+ '
+ Me.lblGenSetCount.AutoSize = true
+ Me.lblGenSetCount.Location = New System.Drawing.Point(10, 89)
+ Me.lblGenSetCount.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblGenSetCount.Name = "lblGenSetCount"
+ Me.lblGenSetCount.Size = New System.Drawing.Size(83, 13)
+ Me.lblGenSetCount.TabIndex = 20
+ Me.lblGenSetCount.Text = "Number of EMs:"
+ '
+ 'pnGenSetEM
+ '
+ Me.pnGenSetEM.Controls.Add(Me.btnOpenGenSetEM)
+ Me.pnGenSetEM.Controls.Add(Me.btnBrowseGenSetEM)
+ Me.pnGenSetEM.Controls.Add(Me.tbGenSetEM)
+ Me.pnGenSetEM.Location = New System.Drawing.Point(9, 29)
+ Me.pnGenSetEM.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnGenSetEM.Name = "pnGenSetEM"
+ Me.pnGenSetEM.Size = New System.Drawing.Size(648, 42)
+ Me.pnGenSetEM.TabIndex = 0
+ '
+ 'btnOpenGenSetEM
+ '
+ Me.btnOpenGenSetEM.Location = New System.Drawing.Point(6, 5)
+ Me.btnOpenGenSetEM.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnOpenGenSetEM.Name = "btnOpenGenSetEM"
+ Me.btnOpenGenSetEM.Size = New System.Drawing.Size(141, 32)
+ Me.btnOpenGenSetEM.TabIndex = 0
+ Me.btnOpenGenSetEM.Text = "Electric Machine"
+ Me.btnOpenGenSetEM.UseVisualStyleBackColor = true
+ '
+ 'btnBrowseGenSetEM
+ '
+ Me.btnBrowseGenSetEM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.btnBrowseGenSetEM.Image = CType(resources.GetObject("btnBrowseGenSetEM.Image"),System.Drawing.Image)
+ Me.btnBrowseGenSetEM.Location = New System.Drawing.Point(609, 3)
+ Me.btnBrowseGenSetEM.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseGenSetEM.Name = "btnBrowseGenSetEM"
+ Me.btnBrowseGenSetEM.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseGenSetEM.TabIndex = 2
+ Me.btnBrowseGenSetEM.UseVisualStyleBackColor = true
+ '
+ 'tbGenSetEM
+ '
+ Me.tbGenSetEM.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.tbGenSetEM.Location = New System.Drawing.Point(156, 6)
+ Me.tbGenSetEM.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbGenSetEM.Name = "tbGenSetEM"
+ Me.tbGenSetEM.Size = New System.Drawing.Size(450, 20)
+ Me.tbGenSetEM.TabIndex = 1
+ '
+ 'tpTorqueLimits
+ '
+ Me.tpTorqueLimits.Controls.Add(Me.gbPropulsionTorque)
+ Me.tpTorqueLimits.Controls.Add(Me.gbEMTorqueLimits)
+ Me.tpTorqueLimits.Controls.Add(Me.bgVehicleTorqueLimits)
+ Me.tpTorqueLimits.Location = New System.Drawing.Point(4, 29)
+ Me.tpTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpTorqueLimits.Name = "tpTorqueLimits"
+ Me.tpTorqueLimits.Size = New System.Drawing.Size(976, 582)
+ Me.tpTorqueLimits.TabIndex = 2
+ Me.tpTorqueLimits.Text = "Torque Limits"
+ Me.tpTorqueLimits.UseVisualStyleBackColor = true
+ '
+ 'gbPropulsionTorque
+ '
+ Me.gbPropulsionTorque.Controls.Add(Me.btnPropulsionTorqueLimit)
+ Me.gbPropulsionTorque.Controls.Add(Me.tbPropulsionTorqueLimit)
+ Me.gbPropulsionTorque.Location = New System.Drawing.Point(350, 98)
+ Me.gbPropulsionTorque.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbPropulsionTorque.Name = "gbPropulsionTorque"
+ Me.gbPropulsionTorque.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbPropulsionTorque.Size = New System.Drawing.Size(604, 80)
+ Me.gbPropulsionTorque.TabIndex = 2
+ Me.gbPropulsionTorque.TabStop = false
+ Me.gbPropulsionTorque.Text = "Boosting Torque Limits"
+ '
+ 'btnPropulsionTorqueLimit
+ '
+ Me.btnPropulsionTorqueLimit.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.btnPropulsionTorqueLimit.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btnPropulsionTorqueLimit.Location = New System.Drawing.Point(560, 28)
+ Me.btnPropulsionTorqueLimit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnPropulsionTorqueLimit.Name = "btnPropulsionTorqueLimit"
+ Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(36, 37)
+ Me.btnPropulsionTorqueLimit.TabIndex = 1
+ Me.btnPropulsionTorqueLimit.UseVisualStyleBackColor = true
+ '
+ 'tbPropulsionTorqueLimit
+ '
+ Me.tbPropulsionTorqueLimit.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.tbPropulsionTorqueLimit.Location = New System.Drawing.Point(9, 31)
+ Me.tbPropulsionTorqueLimit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPropulsionTorqueLimit.Name = "tbPropulsionTorqueLimit"
+ Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(546, 20)
+ Me.tbPropulsionTorqueLimit.TabIndex = 0
+ '
+ 'gbEMTorqueLimits
+ '
+ Me.gbEMTorqueLimits.Controls.Add(Me.btnEmTorqueLimits)
+ Me.gbEMTorqueLimits.Controls.Add(Me.tbEmTorqueLimits)
+ Me.gbEMTorqueLimits.Location = New System.Drawing.Point(350, 9)
+ Me.gbEMTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbEMTorqueLimits.Name = "gbEMTorqueLimits"
+ Me.gbEMTorqueLimits.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbEMTorqueLimits.Size = New System.Drawing.Size(604, 80)
+ Me.gbEMTorqueLimits.TabIndex = 1
+ Me.gbEMTorqueLimits.TabStop = false
+ Me.gbEMTorqueLimits.Text = "Electric Machine Torque Limits"
+ '
+ 'btnEmTorqueLimits
+ '
+ Me.btnEmTorqueLimits.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.btnEmTorqueLimits.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btnEmTorqueLimits.Location = New System.Drawing.Point(560, 26)
+ Me.btnEmTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnEmTorqueLimits.Name = "btnEmTorqueLimits"
+ Me.btnEmTorqueLimits.Size = New System.Drawing.Size(36, 37)
+ Me.btnEmTorqueLimits.TabIndex = 1
+ Me.btnEmTorqueLimits.UseVisualStyleBackColor = true
+ '
+ 'tbEmTorqueLimits
+ '
+ Me.tbEmTorqueLimits.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.tbEmTorqueLimits.Location = New System.Drawing.Point(9, 29)
+ Me.tbEmTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbEmTorqueLimits.Name = "tbEmTorqueLimits"
+ Me.tbEmTorqueLimits.Size = New System.Drawing.Size(546, 20)
+ Me.tbEmTorqueLimits.TabIndex = 0
+ '
+ 'bgVehicleTorqueLimits
+ '
+ Me.bgVehicleTorqueLimits.Controls.Add(Me.lvTorqueLimits)
+ Me.bgVehicleTorqueLimits.Controls.Add(Me.btAddMaxTorqueEntry)
+ Me.bgVehicleTorqueLimits.Controls.Add(Me.Label17)
+ Me.bgVehicleTorqueLimits.Controls.Add(Me.btDelMaxTorqueEntry)
+ Me.bgVehicleTorqueLimits.Location = New System.Drawing.Point(9, 9)
+ Me.bgVehicleTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.bgVehicleTorqueLimits.Name = "bgVehicleTorqueLimits"
+ Me.bgVehicleTorqueLimits.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(332, 349)
+ Me.bgVehicleTorqueLimits.TabIndex = 0
+ Me.bgVehicleTorqueLimits.TabStop = false
+ Me.bgVehicleTorqueLimits.Text = "ICE Torque Limits"
+ '
+ 'lvTorqueLimits
+ '
+ Me.lvTorqueLimits.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvTorqueLimits.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader5, Me.ColumnHeader6})
+ Me.lvTorqueLimits.FullRowSelect = true
+ Me.lvTorqueLimits.GridLines = true
+ Me.lvTorqueLimits.HideSelection = false
+ Me.lvTorqueLimits.Location = New System.Drawing.Point(9, 29)
+ Me.lvTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.lvTorqueLimits.MultiSelect = false
+ Me.lvTorqueLimits.Name = "lvTorqueLimits"
+ Me.lvTorqueLimits.Size = New System.Drawing.Size(312, 258)
+ Me.lvTorqueLimits.TabIndex = 7
+ Me.lvTorqueLimits.TabStop = false
+ Me.lvTorqueLimits.UseCompatibleStateImageBehavior = false
+ Me.lvTorqueLimits.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader5
+ '
+ Me.ColumnHeader5.Text = "Gear #"
+ Me.ColumnHeader5.Width = 71
+ '
+ 'ColumnHeader6
+ '
+ Me.ColumnHeader6.Text = "Max. Torque"
+ Me.ColumnHeader6.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+ Me.ColumnHeader6.Width = 133
+ '
+ 'btAddMaxTorqueEntry
+ '
+ Me.btAddMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ Me.btAddMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(9, 297)
+ Me.btAddMaxTorqueEntry.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btAddMaxTorqueEntry.Name = "btAddMaxTorqueEntry"
+ Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(36, 37)
+ Me.btAddMaxTorqueEntry.TabIndex = 4
+ Me.btAddMaxTorqueEntry.UseVisualStyleBackColor = true
+ '
+ 'Label17
+ '
+ Me.Label17.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label17.AutoSize = true
+ Me.Label17.Location = New System.Drawing.Point(168, 292)
+ Me.Label17.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label17.Name = "Label17"
+ Me.Label17.Size = New System.Drawing.Size(106, 13)
+ Me.Label17.TabIndex = 6
+ Me.Label17.Text = "(Double-Click to Edit)"
+ Me.Label17.TextAlign = System.Drawing.ContentAlignment.TopRight
+ '
+ 'btDelMaxTorqueEntry
+ '
+ Me.btDelMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ Me.btDelMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(45, 297)
+ Me.btDelMaxTorqueEntry.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btDelMaxTorqueEntry.Name = "btDelMaxTorqueEntry"
+ Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(36, 37)
+ Me.btDelMaxTorqueEntry.TabIndex = 5
+ Me.btDelMaxTorqueEntry.UseVisualStyleBackColor = true
+ '
+ 'tpADAS
+ '
+ Me.tpADAS.Controls.Add(Me.gbADAS)
+ Me.tpADAS.Location = New System.Drawing.Point(4, 29)
+ Me.tpADAS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpADAS.Name = "tpADAS"
+ Me.tpADAS.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpADAS.Size = New System.Drawing.Size(976, 582)
+ Me.tpADAS.TabIndex = 3
+ Me.tpADAS.Text = "ADAS"
+ Me.tpADAS.UseVisualStyleBackColor = true
+ '
+ 'gbADAS
+ '
+ Me.gbADAS.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.gbADAS.Controls.Add(Me.pnEcoRoll)
+ Me.gbADAS.Controls.Add(Me.cbAtEcoRollReleaseLockupClutch)
+ Me.gbADAS.Controls.Add(Me.cbPcc)
+ Me.gbADAS.Controls.Add(Me.cbEngineStopStart)
+ Me.gbADAS.Controls.Add(Me.lblPCC)
+ Me.gbADAS.Location = New System.Drawing.Point(9, 9)
+ Me.gbADAS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbADAS.Name = "gbADAS"
+ Me.gbADAS.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbADAS.Size = New System.Drawing.Size(954, 248)
+ Me.gbADAS.TabIndex = 0
+ Me.gbADAS.TabStop = false
+ Me.gbADAS.Text = "ADAS Options"
+ '
+ 'pnEcoRoll
+ '
+ Me.pnEcoRoll.Controls.Add(Me.cbEcoRoll)
+ Me.pnEcoRoll.Controls.Add(Me.Label22)
+ Me.pnEcoRoll.Location = New System.Drawing.Point(0, 68)
+ Me.pnEcoRoll.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnEcoRoll.Name = "pnEcoRoll"
+ Me.pnEcoRoll.Size = New System.Drawing.Size(450, 71)
+ Me.pnEcoRoll.TabIndex = 7
+ '
+ 'cbEcoRoll
+ '
+ Me.cbEcoRoll.DisplayMember = "Value"
+ Me.cbEcoRoll.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.cbEcoRoll.FormattingEnabled = true
+ Me.cbEcoRoll.Location = New System.Drawing.Point(15, 31)
+ Me.cbEcoRoll.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbEcoRoll.Name = "cbEcoRoll"
+ Me.cbEcoRoll.Size = New System.Drawing.Size(397, 28)
+ Me.cbEcoRoll.TabIndex = 1
+ Me.cbEcoRoll.ValueMember = "Key"
+ '
+ 'Label22
+ '
+ Me.Label22.AutoSize = true
+ Me.Label22.Location = New System.Drawing.Point(10, 8)
+ Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label22.Name = "Label22"
+ Me.Label22.Size = New System.Drawing.Size(50, 13)
+ Me.Label22.TabIndex = 6
+ Me.Label22.Text = "Eco-Roll:"
+ '
+ 'cbAtEcoRollReleaseLockupClutch
+ '
+ Me.cbAtEcoRollReleaseLockupClutch.AutoSize = true
+ Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(357, 32)
+ Me.cbAtEcoRollReleaseLockupClutch.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbAtEcoRollReleaseLockupClutch.Name = "cbAtEcoRollReleaseLockupClutch"
+ Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(243, 17)
+ Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 3
+ Me.cbAtEcoRollReleaseLockupClutch.Text = "AT Gearbox: Eco-Roll Release Lockup Clutch"
+ Me.cbAtEcoRollReleaseLockupClutch.UseVisualStyleBackColor = true
+ '
+ 'cbPcc
+ '
+ Me.cbPcc.DisplayMember = "Value"
+ Me.cbPcc.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.cbPcc.FormattingEnabled = true
+ Me.cbPcc.Location = New System.Drawing.Point(15, 191)
+ Me.cbPcc.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbPcc.Name = "cbPcc"
+ Me.cbPcc.Size = New System.Drawing.Size(397, 28)
+ Me.cbPcc.TabIndex = 2
+ Me.cbPcc.ValueMember = "Key"
+ '
+ 'cbEngineStopStart
+ '
+ Me.cbEngineStopStart.AutoSize = true
+ Me.cbEngineStopStart.Location = New System.Drawing.Point(15, 32)
+ Me.cbEngineStopStart.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbEngineStopStart.Name = "cbEngineStopStart"
+ Me.cbEngineStopStart.Size = New System.Drawing.Size(203, 17)
+ Me.cbEngineStopStart.TabIndex = 0
+ Me.cbEngineStopStart.Text = "Engine Stop/Start during vehicle stop"
+ Me.cbEngineStopStart.UseVisualStyleBackColor = true
+ '
+ 'lblPCC
+ '
+ Me.lblPCC.AutoSize = true
+ Me.lblPCC.Location = New System.Drawing.Point(10, 166)
+ Me.lblPCC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblPCC.Name = "lblPCC"
+ Me.lblPCC.Size = New System.Drawing.Size(125, 13)
+ Me.lblPCC.TabIndex = 3
+ Me.lblPCC.Text = "Predictive Cruise Control:"
+ '
+ 'tpRoadSweeper
+ '
+ Me.tpRoadSweeper.Controls.Add(Me.lblNotePtoPEV_HEVS)
+ Me.tpRoadSweeper.Controls.Add(Me.pnPTO)
+ Me.tpRoadSweeper.Controls.Add(Me.gbPTO)
+ Me.tpRoadSweeper.Location = New System.Drawing.Point(4, 29)
+ Me.tpRoadSweeper.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpRoadSweeper.Name = "tpRoadSweeper"
+ Me.tpRoadSweeper.Size = New System.Drawing.Size(976, 582)
+ Me.tpRoadSweeper.TabIndex = 4
+ Me.tpRoadSweeper.Text = "PTO"
+ Me.tpRoadSweeper.UseVisualStyleBackColor = true
+ '
+ 'pnPTO
+ '
+ Me.pnPTO.Controls.Add(Me.pnPtoMode1)
+ Me.pnPTO.Controls.Add(Me.pnPtoMode3)
+ Me.pnPTO.Controls.Add(Me.gbPTODrive)
+ Me.pnPTO.Controls.Add(Me.btPTOLossMapBrowse)
+ Me.pnPTO.Controls.Add(Me.Label7)
+ Me.pnPTO.Controls.Add(Me.tbPTOLossMap)
+ Me.pnPTO.Location = New System.Drawing.Point(9, 112)
+ Me.pnPTO.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnPTO.Name = "pnPTO"
+ Me.pnPTO.Size = New System.Drawing.Size(950, 325)
+ Me.pnPTO.TabIndex = 1
+ '
+ 'gbPTODrive
+ '
+ Me.gbPTODrive.Controls.Add(Me.Label27)
+ Me.gbPTODrive.Controls.Add(Me.tbPtoGear)
+ Me.gbPTODrive.Controls.Add(Me.Label26)
+ Me.gbPTODrive.Controls.Add(Me.tbPtoEngineSpeed)
+ Me.gbPTODrive.Controls.Add(Me.Label25)
+ Me.gbPTODrive.Controls.Add(Me.Label24)
+ Me.gbPTODrive.Location = New System.Drawing.Point(0, 153)
+ Me.gbPTODrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbPTODrive.Name = "gbPTODrive"
+ Me.gbPTODrive.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbPTODrive.Size = New System.Drawing.Size(950, 85)
+ Me.gbPTODrive.TabIndex = 4
+ Me.gbPTODrive.TabStop = false
+ Me.gbPTODrive.Text = "Working operation settings (PTO mode 2)"
+ '
+ 'Label27
+ '
+ Me.Label27.AutoSize = true
+ Me.Label27.Location = New System.Drawing.Point(669, 37)
+ Me.Label27.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label27.Name = "Label27"
+ Me.Label27.Size = New System.Drawing.Size(20, 13)
+ Me.Label27.TabIndex = 6
+ Me.Label27.Text = "[#]"
+ Me.Label27.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+ '
+ 'tbPtoGear
+ '
+ Me.tbPtoGear.Location = New System.Drawing.Point(556, 32)
+ Me.tbPtoGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPtoGear.Name = "tbPtoGear"
+ Me.tbPtoGear.Size = New System.Drawing.Size(103, 20)
+ Me.tbPtoGear.TabIndex = 1
+ '
+ 'Label26
+ '
+ Me.Label26.AutoSize = true
+ Me.Label26.Location = New System.Drawing.Point(284, 37)
+ Me.Label26.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label26.Name = "Label26"
+ Me.Label26.Size = New System.Drawing.Size(30, 13)
+ Me.Label26.TabIndex = 4
+ Me.Label26.Text = "[rpm]"
+ Me.Label26.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+ '
+ 'tbPtoEngineSpeed
+ '
+ Me.tbPtoEngineSpeed.Location = New System.Drawing.Point(170, 32)
+ Me.tbPtoEngineSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPtoEngineSpeed.Name = "tbPtoEngineSpeed"
+ Me.tbPtoEngineSpeed.Size = New System.Drawing.Size(103, 20)
+ Me.tbPtoEngineSpeed.TabIndex = 0
+ '
+ 'Label25
+ '
+ Me.Label25.AutoSize = true
+ Me.Label25.Location = New System.Drawing.Point(446, 37)
+ Me.Label25.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label25.Name = "Label25"
+ Me.Label25.Size = New System.Drawing.Size(68, 13)
+ Me.Label25.TabIndex = 1
+ Me.Label25.Text = "Gear number"
+ '
+ 'Label24
+ '
+ Me.Label24.AutoSize = true
+ Me.Label24.Location = New System.Drawing.Point(10, 37)
+ Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label24.Name = "Label24"
+ Me.Label24.Size = New System.Drawing.Size(97, 13)
+ Me.Label24.TabIndex = 0
+ Me.Label24.Text = "Min. Engine Speed"
+ '
+ 'btPTOCycleDrive
+ '
+ Me.btPTOCycleDrive.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btPTOCycleDrive.Location = New System.Drawing.Point(652, 28)
+ Me.btPTOCycleDrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btPTOCycleDrive.Name = "btPTOCycleDrive"
+ Me.btPTOCycleDrive.Size = New System.Drawing.Size(36, 37)
+ Me.btPTOCycleDrive.TabIndex = 6
+ Me.btPTOCycleDrive.UseVisualStyleBackColor = true
+ '
+ 'Label28
+ '
+ Me.Label28.Location = New System.Drawing.Point(-1, 2)
+ Me.Label28.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label28.Name = "Label28"
+ Me.Label28.Size = New System.Drawing.Size(399, 25)
+ Me.Label28.TabIndex = 21
+ Me.Label28.Text = "PTO Cycle during driving (PTO mode 3) (.vptor)"
+ Me.Label28.TextAlign = System.Drawing.ContentAlignment.BottomLeft
+ '
+ 'btPTOCycle
+ '
+ Me.btPTOCycle.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btPTOCycle.Location = New System.Drawing.Point(657, 32)
+ Me.btPTOCycle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btPTOCycle.Name = "btPTOCycle"
+ Me.btPTOCycle.Size = New System.Drawing.Size(36, 37)
+ Me.btPTOCycle.TabIndex = 3
+ Me.btPTOCycle.UseVisualStyleBackColor = true
+ '
+ 'Label16
+ '
+ Me.Label16.Location = New System.Drawing.Point(4, 6)
+ Me.Label16.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label16.Name = "Label16"
+ Me.Label16.Size = New System.Drawing.Size(399, 25)
+ Me.Label16.TabIndex = 18
+ Me.Label16.Text = "PTO Cycle during standstill (PTO mode 1) (.vptoc)"
+ Me.Label16.TextAlign = System.Drawing.ContentAlignment.BottomLeft
+ '
+ 'btPTOLossMapBrowse
+ '
+ Me.btPTOLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(657, 34)
+ Me.btPTOLossMapBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btPTOLossMapBrowse.Name = "btPTOLossMapBrowse"
+ Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.btPTOLossMapBrowse.TabIndex = 1
+ Me.btPTOLossMapBrowse.UseVisualStyleBackColor = true
+ '
+ 'Label7
+ '
+ Me.Label7.Location = New System.Drawing.Point(4, 8)
+ Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label7.Name = "Label7"
+ Me.Label7.Size = New System.Drawing.Size(302, 25)
+ Me.Label7.TabIndex = 15
+ Me.Label7.Text = "PTO Consumer Loss Map (.vptoi)"
+ Me.Label7.TextAlign = System.Drawing.ContentAlignment.BottomLeft
+ '
+ 'gbPTO
+ '
+ Me.gbPTO.Controls.Add(Me.cbPTOType)
+ Me.gbPTO.Location = New System.Drawing.Point(9, 9)
+ Me.gbPTO.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbPTO.Name = "gbPTO"
+ Me.gbPTO.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbPTO.Size = New System.Drawing.Size(950, 94)
+ Me.gbPTO.TabIndex = 0
+ Me.gbPTO.TabStop = false
+ Me.gbPTO.Text = "PTO Design Variant"
+ '
+ 'cbLegislativeClass
+ '
+ Me.cbLegislativeClass.DisplayMember = "Value"
+ Me.cbLegislativeClass.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.cbLegislativeClass.FormattingEnabled = true
+ Me.cbLegislativeClass.Location = New System.Drawing.Point(330, 215)
+ Me.cbLegislativeClass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbLegislativeClass.Name = "cbLegislativeClass"
+ Me.cbLegislativeClass.Size = New System.Drawing.Size(76, 28)
+ Me.cbLegislativeClass.TabIndex = 4
+ Me.cbLegislativeClass.ValueMember = "Key"
+ '
+ 'Label21
+ '
+ Me.Label21.AutoSize = true
+ Me.Label21.Location = New System.Drawing.Point(48, 189)
+ Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label21.Name = "Label21"
+ Me.Label21.Size = New System.Drawing.Size(112, 13)
+ Me.Label21.TabIndex = 42
+ Me.Label21.Text = "Maximum Laden Mass"
+ '
+ 'lblTitle
+ '
+ Me.lblTitle.AutoSize = true
+ Me.lblTitle.BackColor = System.Drawing.Color.White
+ Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.lblTitle.Location = New System.Drawing.Point(176, 52)
+ Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblTitle.Name = "lblTitle"
+ Me.lblTitle.Size = New System.Drawing.Size(166, 29)
+ Me.lblTitle.TabIndex = 43
+ Me.lblTitle.Text = "Vehicle TITLE"
+ '
+ 'pnPtoMode3
+ '
+ Me.pnPtoMode3.Controls.Add(Me.tbPTODrive)
+ Me.pnPtoMode3.Controls.Add(Me.btPTOCycleDrive)
+ Me.pnPtoMode3.Controls.Add(Me.Label28)
+ Me.pnPtoMode3.Location = New System.Drawing.Point(3, 243)
+ Me.pnPtoMode3.Name = "pnPtoMode3"
+ Me.pnPtoMode3.Size = New System.Drawing.Size(698, 79)
+ Me.pnPtoMode3.TabIndex = 2
+ '
+ 'pnPtoMode1
+ '
+ Me.pnPtoMode1.Controls.Add(Me.Label16)
+ Me.pnPtoMode1.Controls.Add(Me.tbPTOCycle)
+ Me.pnPtoMode1.Controls.Add(Me.btPTOCycle)
+ Me.pnPtoMode1.Location = New System.Drawing.Point(3, 73)
+ Me.pnPtoMode1.Name = "pnPtoMode1"
+ Me.pnPtoMode1.Size = New System.Drawing.Size(699, 74)
+ Me.pnPtoMode1.TabIndex = 2
+ '
+ 'lblNotePtoPEV_HEVS
+ '
+ Me.lblNotePtoPEV_HEVS.AutoSize = true
+ Me.lblNotePtoPEV_HEVS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.lblNotePtoPEV_HEVS.Location = New System.Drawing.Point(15, 451)
+ Me.lblNotePtoPEV_HEVS.Name = "lblNotePtoPEV_HEVS"
+ Me.lblNotePtoPEV_HEVS.Size = New System.Drawing.Size(333, 13)
+ Me.lblNotePtoPEV_HEVS.TabIndex = 2
+ Me.lblNotePtoPEV_HEVS.Text = "Note: PTO losses are only considered for vehicles of type E2 and S2!"
+ '
+ 'VehicleForm
+ '
+ Me.AcceptButton = Me.ButOK
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.CancelButton = Me.ButCancel
+ Me.ClientSize = New System.Drawing.Size(999, 962)
+ Me.Controls.Add(Me.lblTitle)
+ Me.Controls.Add(Me.Label21)
+ Me.Controls.Add(Me.cbLegislativeClass)
+ Me.Controls.Add(Me.tcVehicleComponents)
+ Me.Controls.Add(Me.ButCancel)
+ Me.Controls.Add(Me.ButOK)
+ Me.Controls.Add(Me.Label8)
+ Me.Controls.Add(Me.TbHDVclass)
+ Me.Controls.Add(Me.PicVehicle)
+ Me.Controls.Add(Me.PictureBox1)
+ Me.Controls.Add(Me.Label9)
+ Me.Controls.Add(Me.StatusStrip1)
+ Me.Controls.Add(Me.CbAxleConfig)
+ Me.Controls.Add(Me.TbMassMass)
+ Me.Controls.Add(Me.CbCat)
+ Me.Controls.Add(Me.Label5)
+ Me.Controls.Add(Me.ToolStrip1)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+ Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.MaximizeBox = false
+ Me.Name = "VehicleForm"
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "F05_VEH"
+ Me.GroupBox6.ResumeLayout(false)
+ Me.GroupBox6.PerformLayout
+ Me.ToolStrip1.ResumeLayout(false)
+ Me.ToolStrip1.PerformLayout
+ Me.gbRetarderLosses.ResumeLayout(false)
+ Me.PnRt.ResumeLayout(false)
+ Me.PnRt.PerformLayout
+ Me.GroupBox8.ResumeLayout(false)
+ Me.GroupBox8.PerformLayout
+ Me.PnWheelDiam.ResumeLayout(false)
+ Me.PnWheelDiam.PerformLayout
+ Me.StatusStrip1.ResumeLayout(false)
+ Me.StatusStrip1.PerformLayout
+ Me.GroupBox1.ResumeLayout(false)
+ Me.GroupBox1.PerformLayout
+ Me.PnLoad.ResumeLayout(false)
+ Me.PnLoad.PerformLayout
+ Me.GrAirRes.ResumeLayout(false)
+ Me.PnCdATrTr.ResumeLayout(false)
+ Me.PnCdATrTr.PerformLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
+ Me.CmOpenFile.ResumeLayout(false)
+ Me.GroupBox3.ResumeLayout(false)
+ Me.gbAngledrive.ResumeLayout(false)
+ Me.pnAngledriveFields.ResumeLayout(false)
+ Me.pnAngledriveFields.PerformLayout
+ CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).EndInit
+ Me.tcVehicleComponents.ResumeLayout(false)
+ Me.tpGeneral.ResumeLayout(false)
+ Me.tpPowertrain.ResumeLayout(false)
+ Me.gbVehicleIdlingSpeed.ResumeLayout(false)
+ Me.Panel1.ResumeLayout(false)
+ Me.Panel1.PerformLayout
+ Me.gbTankSystem.ResumeLayout(false)
+ Me.gbTankSystem.PerformLayout
+ Me.tpElectricMachine.ResumeLayout(false)
+ Me.gpElectricMotor.ResumeLayout(false)
+ Me.gpElectricMotor.PerformLayout
+ Me.gbRatiosPerGear.ResumeLayout(false)
+ Me.gbRatiosPerGear.PerformLayout
+ Me.pnElectricMotor.ResumeLayout(false)
+ Me.pnElectricMotor.PerformLayout
+ Me.tpIEPC.ResumeLayout(false)
+ Me.FlowLayoutPanel1.ResumeLayout(false)
+ Me.FlowLayoutPanel1.PerformLayout
+ Me.tbIHPC.ResumeLayout(false)
+ Me.FlowLayoutPanel2.ResumeLayout(false)
+ Me.FlowLayoutPanel2.PerformLayout
+ Me.tpReess.ResumeLayout(false)
+ Me.gbBattery.ResumeLayout(false)
+ Me.gbBattery.PerformLayout
+ Me.tpGensetComponents.ResumeLayout(false)
+ Me.tpGensetComponents.PerformLayout
+ Me.gbGenSet.ResumeLayout(false)
+ Me.gbGenSet.PerformLayout
+ Me.pnGenSetEM.ResumeLayout(false)
+ Me.pnGenSetEM.PerformLayout
+ Me.tpTorqueLimits.ResumeLayout(false)
+ Me.gbPropulsionTorque.ResumeLayout(false)
+ Me.gbPropulsionTorque.PerformLayout
+ Me.gbEMTorqueLimits.ResumeLayout(false)
+ Me.gbEMTorqueLimits.PerformLayout
+ Me.bgVehicleTorqueLimits.ResumeLayout(false)
+ Me.bgVehicleTorqueLimits.PerformLayout
+ Me.tpADAS.ResumeLayout(false)
+ Me.gbADAS.ResumeLayout(false)
+ Me.gbADAS.PerformLayout
+ Me.pnEcoRoll.ResumeLayout(false)
+ Me.pnEcoRoll.PerformLayout
+ Me.tpRoadSweeper.ResumeLayout(false)
+ Me.tpRoadSweeper.PerformLayout
+ Me.pnPTO.ResumeLayout(false)
+ Me.pnPTO.PerformLayout
+ Me.gbPTODrive.ResumeLayout(false)
+ Me.gbPTODrive.PerformLayout
+ Me.gbPTO.ResumeLayout(false)
+ Me.pnPtoMode3.ResumeLayout(false)
+ Me.pnPtoMode3.PerformLayout
+ Me.pnPtoMode1.ResumeLayout(false)
+ Me.pnPtoMode1.PerformLayout
+ Me.ResumeLayout(false)
+ Me.PerformLayout
End Sub
Friend WithEvents Label1 As System.Windows.Forms.Label
@@ -2402,30 +2767,12 @@ End Sub
Friend WithEvents cbTankSystem As ComboBox
Friend WithEvents Label23 As Label
Friend WithEvents cbAtEcoRollReleaseLockupClutch As CheckBox
- Friend WithEvents tpElectricComponents As TabPage
- Friend WithEvents gpElectricMotor As GroupBox
- Friend WithEvents gbBattery As GroupBox
- Friend WithEvents tbEmADCLossMap As TextBox
- Friend WithEvents lblEmADCLossmap As Label
- Friend WithEvents tbRatioEm As TextBox
- Friend WithEvents lblRatioEm As Label
- Friend WithEvents tbEmCount As TextBox
- Friend WithEvents cbEmPos As ComboBox
- Friend WithEvents lblEmCount As Label
- Friend WithEvents lblEmPosition As Label
- Friend WithEvents pnElectricMotor As Panel
- Friend WithEvents btnOpenElectricMotor As Button
- Friend WithEvents btnBrowseElectricMotor As Button
- Friend WithEvents tbElectricMotor As TextBox
Friend WithEvents lblTitle As Label
Friend WithEvents gbVehicleIdlingSpeed As GroupBox
Friend WithEvents Panel1 As Panel
Friend WithEvents tbVehIdlingSpeed As TextBox
Friend WithEvents Label18 As Label
Friend WithEvents Label19 As Label
- Friend WithEvents lblInitialSoCUnit As Label
- Friend WithEvents tbInitialSoC As TextBox
- Friend WithEvents lblInitialSoC As Label
Friend WithEvents gbEMTorqueLimits As GroupBox
Friend WithEvents btnEmTorqueLimits As Button
Friend WithEvents tbEmTorqueLimits As TextBox
@@ -2433,7 +2780,6 @@ End Sub
Friend WithEvents gbPropulsionTorque As GroupBox
Friend WithEvents btnPropulsionTorqueLimit As Button
Friend WithEvents tbPropulsionTorqueLimit As TextBox
- Friend WithEvents btnEmADCLossMap As Button
'=======
Friend WithEvents tpRoadSweeper As TabPage
Friend WithEvents gbPTODrive As GroupBox
@@ -2455,20 +2801,6 @@ End Sub
Friend WithEvents btPTOCycleDrive As Button
Friend WithEvents Label28 As Label
Friend WithEvents tbPTODrive As TextBox
- Friend WithEvents gbRatiosPerGear As GroupBox
- Friend WithEvents lvRatioPerGear As ListView
- Friend WithEvents ColumnHeader11 As ColumnHeader
- Friend WithEvents ColumnHeader12 As ColumnHeader
- Friend WithEvents btnAddEMRatio As Button
- Friend WithEvents Label29 As Label
- Friend WithEvents btnRemoveEMRatio As Button
- Friend WithEvents lvREESSPacks As ListView
- Friend WithEvents chReessPackPack As ColumnHeader
- Friend WithEvents chReessPackCount As ColumnHeader
- Friend WithEvents chReessPackStringId As ColumnHeader
- Friend WithEvents btnAddReessPack As Button
- Friend WithEvents lblEditReessPack As Label
- Friend WithEvents btnRemoveReessPack As Button
Friend WithEvents tpGensetComponents As TabPage
Friend WithEvents gbGenSet As GroupBox
Friend WithEvents btnGenSetLossMap As Button
@@ -2483,10 +2815,57 @@ End Sub
Friend WithEvents btnBrowseGenSetEM As Button
Friend WithEvents tbGenSetEM As TextBox
Friend WithEvents Label30 As Label
- Friend WithEvents Label33 As Label
- Friend WithEvents Label32 As Label
Friend WithEvents Label36 As Label
Friend WithEvents Label34 As Label
Friend WithEvents pnEcoRoll As Panel
- '>>>>>>> VECTO_CERT/master
+ Friend WithEvents tpElectricMachine As TabPage
+ Friend WithEvents tpReess As TabPage
+ Friend WithEvents gpElectricMotor As GroupBox
+ Friend WithEvents Label33 As Label
+ Friend WithEvents Label32 As Label
+ Friend WithEvents gbRatiosPerGear As GroupBox
+ Friend WithEvents lvRatioPerGear As ListView
+ Friend WithEvents ColumnHeader11 As ColumnHeader
+ Friend WithEvents ColumnHeader12 As ColumnHeader
+ Friend WithEvents btnAddEMRatio As Button
+ Friend WithEvents Label29 As Label
+ Friend WithEvents btnRemoveEMRatio As Button
+ Friend WithEvents btnEmADCLossMap As Button
+ Friend WithEvents tbEmADCLossMap As TextBox
+ Friend WithEvents lblEmADCLossmap As Label
+ Friend WithEvents tbRatioEm As TextBox
+ Friend WithEvents lblRatioEm As Label
+ Friend WithEvents tbEmCount As TextBox
+ Friend WithEvents cbEmPos As ComboBox
+ Friend WithEvents lblEmCount As Label
+ Friend WithEvents lblEmPosition As Label
+ Friend WithEvents pnElectricMotor As Panel
+ Friend WithEvents btnOpenElectricMotor As Button
+ Friend WithEvents btnBrowseElectricMotor As Button
+ Friend WithEvents tbElectricMotor As TextBox
+ Friend WithEvents gbBattery As GroupBox
+ Friend WithEvents lvREESSPacks As ListView
+ Friend WithEvents chReessPackPack As ColumnHeader
+ Friend WithEvents chReessPackCount As ColumnHeader
+ Friend WithEvents chReessPackStringId As ColumnHeader
+ Friend WithEvents btnAddReessPack As Button
+ Friend WithEvents lblEditReessPack As Label
+ Friend WithEvents btnRemoveReessPack As Button
+ Friend WithEvents lblInitialSoCUnit As Label
+ Friend WithEvents tbInitialSoC As TextBox
+ Friend WithEvents lblInitialSoC As Label
+ Friend WithEvents tpIEPC As TabPage
+ Friend WithEvents btIEPCFilePath As Button
+ Friend WithEvents btnIEPC As Button
+ Friend WithEvents tbIEPCFilePath As TextBox
+ Friend WithEvents tbIHPC As TabPage
+ Friend WithEvents btIHPC As Button
+ Friend WithEvents btIHPCFile As Button
+ Friend WithEvents tbIHPCFilePath As TextBox
+ Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
+ Friend WithEvents FlowLayoutPanel2 As FlowLayoutPanel
+ Friend WithEvents pnPtoMode1 As Panel
+ Friend WithEvents pnPtoMode3 As Panel
+ Friend WithEvents lblNotePtoPEV_HEVS As Label
+ '>>>>>>> VECTO_CERT/master
End Class
diff --git a/VECTO/GUI/VehicleForm.resx b/VECTO/GUI/VehicleForm.resx
index 29854c5744c9c53e592da2016f17bc434e366b68..72954ee2478b5b39e958cec2a52b2dbce32ac23e 100644
--- a/VECTO/GUI/VehicleForm.resx
+++ b/VECTO/GUI/VehicleForm.resx
@@ -146,6 +146,24 @@
MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="btIHPCFile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
+ zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
+ 0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
+ c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
+ qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
+ GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
+ 1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
+ gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
+ TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
+ W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
+ MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
+ IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
+ eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
</value>
</data>
<data name="btnBrowseGenSetEM.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -167,7 +185,7 @@
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>77</value>
+ <value>46</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index 7c4c7ad338e6175635a6b9cd82cae975d4974562..fc51649d2aa1b1c5aece60321d5e6f710153e924 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -449,13 +449,14 @@ Public Class VehicleForm
tbAngledriveLossMapPath.Text =
If(angledrive.LossMap Is Nothing, "", GetRelativePath(angledrive.LossMap.Source, basePath))
- If (vehicle.VehicleType = VectoSimulationJobType.BatteryElectricVehicle OrElse vehicle.VehicleType = VectoSimulationJobType.ParallelHybridVehicle OrElse vehicle.VehicleType = VectoSimulationJobType.SerialHybridVehicle) Then
+ If (vehicle.VehicleType <> VectoSimulationJobType.ConventionalVehicle AndAlso vehicle.VehicleType <> VectoSimulationJobType.EngineOnlySimulation) Then
lvREESSPacks.Items.Clear()
For Each entry As IElectricStorageEngineeringInputData In vehicle.Components.ElectricStorage.ElectricStorageElements.OrderBy(Function(x) x.StringId)
lvREESSPacks.Items.Add(CreateREESSPackListViewItem(GetRelativePath(entry.REESSPack.DataSource.SourceFile, basePath), entry.Count, entry.StringId))
Next
tbInitialSoC.Text = (vehicle.InitialSOC * 100).ToGUIFormat()
+ if (vehicle.VehicleType = VectoSimulationJobType.ParallelHybridVehicle OrElse vehicle.VehicleType = VectoSimulationJobType.BatteryElectricVehicle OrElse vehicle.VehicleType = VectoSimulationJobType.SerialHybridVehicle) then
Dim em As ElectricMachineEntry(Of IElectricMotorEngineeringInputData) = vehicle.Components.ElectricMachines.Entries.First(Function(x) x.Position <> PowertrainPosition.GEN)
tbElectricMotor.Text = GetRelativePath(em.ElectricMachine.DataSource.SourceFile, basePath)
tbEmCount.Text = em.Count.ToGUIFormat()
@@ -473,10 +474,19 @@ Public Class VehicleForm
gear += 1
Next
End If
+ end If
+ if vehicle.VehicleType = VectoSimulationJobType.IEPC_E OrElse vehicle.VehicleType = VectoSimulationJobType.IEPC_S Then
+ Dim iepc = vehicle.Components.IEPCEngineeringInputData
+ tbIEPCFilePath.Text = GetRelativePath(iepc.DataSource.SourceFile, basePath)
+ End If
+ if vehicle.VehicleType = VectoSimulationJobType.IHPC Then
+ Dim ihpc = vehicle.Components.ElectricMachines.Entries.First(Function(x) x.Position = PowertrainPosition.IHPC)
+ tbIHPCFilePath.Text = GetRelativePath(ihpc.ElectricMachine.DataSource.SourceFile, basePath)
+ End If
End If
- If (vehicle.VehicleType = VectoSimulationJobType.SerialHybridVehicle) Then
+ If (vehicle.VehicleType = VectoSimulationJobType.SerialHybridVehicle OrElse vehicle.VehicleType = VectoSimulationJobType.IEPC_S) Then
Dim gen As ElectricMachineEntry(Of IElectricMotorEngineeringInputData) = vehicle.Components.ElectricMachines.Entries.First(Function(x) x.Position = PowertrainPosition.GEN)
tbGenSetEM.Text = GetRelativePath(gen.ElectricMachine.DataSource.SourceFile, basePath)
tbGenSetCount.Text = gen.Count.ToGUIFormat()
@@ -485,7 +495,7 @@ Public Class VehicleForm
tbGenSetRatio.Text = gen.RatioADC.ToGUIFormat()
End If
- If (vehicle.VehicleType = VectoSimulationJobType.ParallelHybridVehicle) Then
+ If (vehicle.VehicleType = VectoSimulationJobType.ParallelHybridVehicle OrElse vehicle.VehicleType = VectoSimulationJobType.IHPC) Then
'tbMaxDrivetrainPwr.Text = vehicle.MaxDrivetrainPower.ConvertToKiloWatt().Value.ToXMLFormat(2)
'ToDo ElectricMotorTorqueLimits changed
'tbEmTorqueLimits.Text = if (Not vehicle.ElectricMotorTorqueLimits Is Nothing, GetRelativePath(vehicle.ElectricMotorTorqueLimits.Source, basePath), "")
@@ -521,20 +531,26 @@ Public Class VehicleForm
Private Sub UpdateForm(vehType As VectoSimulationJobType)
VehicleType = vehType
- If Not tcVehicleComponents.TabPages.Contains(tpElectricComponents) Then
- tcVehicleComponents.TabPages.Insert(2, tpElectricComponents)
- tpElectricComponents.BindingContext = BindingContext
+ If Not tcVehicleComponents.TabPages.Contains(tpElectricMachine) Then
+ tcVehicleComponents.TabPages.Insert(2, tpElectricMachine)
+ tpElectricMachine.BindingContext = BindingContext
+ End If
+
+ If Not tcVehicleComponents.TabPages.Contains(tpReess) Then
+ tcVehicleComponents.TabPages.Insert(3, tpReess)
+ tpReess.BindingContext = BindingContext
End If
+
If Not tcVehicleComponents.TabPages.Contains(tpGensetComponents) Then
- tcVehicleComponents.TabPages.Insert(3, tpGensetComponents)
+ tcVehicleComponents.TabPages.Insert(4, tpGensetComponents)
tpGensetComponents.BindingContext = BindingContext
End If
If Not tcVehicleComponents.TabPages.Contains(tpTorqueLimits) Then
- tcVehicleComponents.TabPages.Insert(4, tpTorqueLimits)
+ tcVehicleComponents.TabPages.Insert(5, tpTorqueLimits)
tpTorqueLimits.BindingContext = BindingContext
End If
-
+ lblNotePtoPEV_HEVS.Visible = False
Select Case vehType
Case VectoSimulationJobType.ConventionalVehicle
lblTitle.Text = "Conventional Vehicle"
@@ -546,7 +562,8 @@ Public Class VehicleForm
gbAngledrive.Enabled = True
'Electric Powertrain Components -------------------------------------------
- tcVehicleComponents.TabPages.Remove(tpElectricComponents)
+ tcVehicleComponents.TabPages.Remove(tpElectricMachine)
+ tcVehicleComponents.TabPages.Remove(tpReess)
'GenSet Components --------------------------------------------------------
tcVehicleComponents.TabPages.Remove(tpGensetComponents)
@@ -559,6 +576,12 @@ Public Class VehicleForm
cbAtEcoRollReleaseLockupClutch.Visible = True
pnEcoRoll.Visible = True
+ 'IEPC
+ tcVehicleComponents.TabPages.Remove(tpIEPC)
+
+ 'IHPC
+ tcVehicleComponents.TabPages.Remove(tbIHPC)
+
Case VectoSimulationJobType.ParallelHybridVehicle
lblTitle.Text = "Parallel Hybrid Vehicle"
@@ -584,6 +607,12 @@ Public Class VehicleForm
pnEcoRoll.Visible = False
cbEcoRoll.SelectedIndex = 0
+ 'IEPC
+ tcVehicleComponents.TabPages.Remove(tpIEPC)
+
+ 'IHPC
+ tcVehicleComponents.TabPages.Remove(tbIHPC)
+
Case VectoSimulationJobType.SerialHybridVehicle
lblTitle.Text = "Serial Hybrid Vehicle"
@@ -610,6 +639,17 @@ Public Class VehicleForm
pnEcoRoll.Visible = False
cbEcoRoll.SelectedIndex = 0
+ 'IEPC
+ tcVehicleComponents.TabPages.Remove(tpIEPC)
+
+ 'IHPC
+ tcVehicleComponents.TabPages.Remove(tbIHPC)
+
+ 'PTO
+ gbPTODrive.Enabled = False
+ pnPtoMode1.Enabled = false
+ pnPtoMode3.Enabled = False
+ lblNotePtoPEV_HEVS.Visible = True
Case VectoSimulationJobType.BatteryElectricVehicle
lblTitle.Text = "Battery Electric Vehicle"
@@ -636,13 +676,83 @@ Public Class VehicleForm
pnEcoRoll.Visible = False
cbEcoRoll.SelectedIndex = 0
+ 'IEPC
+ tcVehicleComponents.TabPages.Remove(tpIEPC)
+
+ 'IHPC
+ tcVehicleComponents.TabPages.Remove(tbIHPC)
+
+ 'PTO
+ gbPTODrive.Enabled = False
+ pnPtoMode1.Enabled = false
+ pnPtoMode3.Enabled = False
+ lblNotePtoPEV_HEVS.Visible = true
+ Case VectoSimulationJobType.IEPC_E
+ lblTitle.Text = "IEPC-E Vehicle"
+
+ tcVehicleComponents.TabPages.Remove(tpElectricMachine)
+ tcVehicleComponents.TabPages.Remove(tpGensetComponents)
+ tcVehicleComponents.TabPages.Remove(tbIHPC)
+
+ 'Torque Limits ------------------------------------------------------------
+ gbEMTorqueLimits.Enabled = False
+ tcVehicleComponents.TabPages.Remove(tpTorqueLimits)
+
+ 'ADAS ---------------------------------------------------------------------
+ cbEngineStopStart.Visible = False
+ cbAtEcoRollReleaseLockupClutch.Visible = False
+ pnEcoRoll.Visible = False
+ cbEcoRoll.SelectedIndex = 0
+
+ 'PTO
+ gbPTO.Enabled = False
+ pnPTO.Enabled = false
+ Case VectoSimulationJobType.IEPC_S
+ lblTitle.Text = "IEPC-S Vehicle"
+ tcVehicleComponents.TabPages.Remove(tpElectricMachine)
+ tcVehicleComponents.TabPages.Remove(tbIHPC)
+
+ 'Torque Limits ------------------------------------------------------------
+ gbEMTorqueLimits.Enabled = False
+ tcVehicleComponents.TabPages.Remove(tpTorqueLimits)
+
+ 'ADAS ---------------------------------------------------------------------
+ cbEngineStopStart.Visible = False
+ cbAtEcoRollReleaseLockupClutch.Visible = False
+ pnEcoRoll.Visible = False
+ cbEcoRoll.SelectedIndex = 0
+
+ 'PTO
+ gbPTO.Enabled = False
+ pnPTO.Enabled = false
+
+ Case VectoSimulationJobType.IHPC
+ lblTitle.Text = "IHPC Vehicle"
+
+ tcVehicleComponents.TabPages.Remove(tpElectricMachine)
+ tcVehicleComponents.TabPages.Remove(tpGensetComponents)
+ tcVehicleComponents.TabPages.Remove(tpIEPC)
+
+ gbEMTorqueLimits.Enabled = False
+ gbPropulsionTorque.Enabled = True
+
+ 'PTO
+ gbPTO.Enabled = False
+ pnPTO.Enabled = false
+
Case Else
- If Not tcVehicleComponents.TabPages.Contains(tpElectricComponents) Then
- tcVehicleComponents.TabPages.Insert(2, tpElectricComponents)
- tpElectricComponents.BindingContext = BindingContext
+ If Not tcVehicleComponents.TabPages.Contains(tpElectricMachine) Then
+ tcVehicleComponents.TabPages.Insert(2, tpElectricMachine)
+ tpElectricMachine.BindingContext = BindingContext
End If
+
+ If Not tcVehicleComponents.TabPages.Contains(tpReess) Then
+ tcVehicleComponents.TabPages.Insert(3, tpReess)
+ tpReess.BindingContext = BindingContext
+ End If
+
If Not tcVehicleComponents.TabPages.Contains(tpGensetComponents) Then
- tcVehicleComponents.TabPages.Insert(3, tpGensetComponents)
+ tcVehicleComponents.TabPages.Insert(4, tpGensetComponents)
tpGensetComponents.BindingContext = BindingContext
End If
pnEcoRoll.Visible = True
@@ -716,7 +826,8 @@ Public Class VehicleForm
veh.RetarderRatio = TbRtRatio.Text.ToDouble(0)
veh.RetarderLossMapFile.Init(GetPath(file), TbRtPath.Text)
- If (VehicleType = VectoSimulationJobType.ConventionalVehicle OrElse VehicleType = VectoSimulationJobType.ParallelHybridVehicle OrElse VehicleType = VectoSimulationJobType.SerialHybridVehicle) Then
+ If (VehicleType = VectoSimulationJobType.ConventionalVehicle OrElse VehicleType = VectoSimulationJobType.ParallelHybridVehicle _
+ OrElse VehicleType = VectoSimulationJobType.SerialHybridVehicle OrElse VehicleType = VectoSimulationJobType.IHPC) Then
veh.VehicleidlingSpeed = _tbVehIdlingSpeed.Text.ToDouble(0).RPMtoRad()
veh.AngledriveType = CType(cbAngledriveType.SelectedValue, AngledriveType)
@@ -738,36 +849,65 @@ Public Class VehicleForm
veh.VehicleTankSystem = CType(If(cbTankSystem.SelectedIndex > 0, cbTankSystem.SelectedValue, Nothing), TankSystem?)
End If
- If (VehicleType = VectoSimulationJobType.ParallelHybridVehicle OrElse VehicleType = VectoSimulationJobType.BatteryElectricVehicle OrElse VehicleType = VectoSimulationJobType.SerialHybridVehicle) Then
+ if (VehicleType = VectoSimulationJobType.BatteryElectricVehicle) Then
+ veh.PtoType = CType(cbPTOType.SelectedValue, String)
+ veh.PtoLossMap.Init(GetPath(file), tbPTOLossMap.Text)
+ End If
+
+ 'If (VehicleType = VectoSimulationJobType.ParallelHybridVehicle OrElse VehicleType = VectoSimulationJobType.BatteryElectricVehicle OrElse VehicleType = VectoSimulationJobType.SerialHybridVehicle) Then
+ If (VehicleType <> VectoSimulationJobType.ConventionalVehicle andalso VehicleType <> VectoSimulationJobType.EngineOnlySimulation)
For Each reess As ListViewItem In lvREESSPacks.Items
veh.ReessPacks.Add(Tuple.Create(reess.SubItems(REESPackTbl.ReessFile).Text, reess.SubItems(REESPackTbl.Count).Text.ToInt(), reess.SubItems(REESPackTbl.StringId).Text.ToInt()))
Next
veh.InitialSOC = tbInitialSoC.Text.ToDouble(80) / 100.0
- If tbElectricMotor.Text = "" Then
- MsgBox("Electric Motor File is required.")
- tcVehicleComponents.SelectedTab = tpElectricComponents
- tbElectricMotor.Focus()
- Return False
- End If
- veh.ElectricMotorFile.Init(GetPath(file), tbElectricMotor.Text)
- veh.ElectricMotorPosition = CType(cbEmPos.SelectedValue, PowertrainPosition)
- veh.ElectricMotorCount = tbEmCount.Text.ToInt(1)
- veh.ElectricMotorRatio = tbRatioEm.Text.ToDouble(1)
- 'veh.ElectricMotorMechEff = tbEmADCLossMap.Text.ToDouble()
- If tbEmADCLossMap.Text = "" Then
- MsgBox("Loss Map EM ADC is required.")
- tcVehicleComponents.SelectedTab = tpElectricComponents
- tbEmADCLossMap.Focus()
- Return False
- End If
- veh.ElectricMotorMechLossMap.Init(GetPath(file), tbEmADCLossMap.Text)
- If (veh.ElectricMotorPosition = PowertrainPosition.HybridP2_5) Then
- veh.ElectricMotorPerGearRatios = lvRatioPerGear.Items.Cast(Of ListViewItem).Select(Function(item) item.SubItems(RatiosPerGearTbl.Ratio).Text.ToDouble(0)).ToArray()
+
+
+ If (VehicleType = VectoSimulationJobType.ParallelHybridVehicle OrElse
+ VehicleType = VectoSimulationJobType.BatteryElectricVehicle OrElse
+ VehicleType = VectoSimulationJobType.SerialHybridVehicle) Then
+
+ If tbElectricMotor.Text = "" Then
+ MsgBox("Electric Motor File is required.")
+ tcVehicleComponents.SelectedTab = tpElectricMachine
+ tbElectricMotor.Focus()
+ Return False
+ End If
+ veh.ElectricMotorFile.Init(GetPath(file), tbElectricMotor.Text)
+ veh.ElectricMotorPosition = CType(cbEmPos.SelectedValue, PowertrainPosition)
+ veh.ElectricMotorCount = tbEmCount.Text.ToInt(1)
+ veh.ElectricMotorRatio = tbRatioEm.Text.ToDouble(1)
+ 'veh.ElectricMotorMechEff = tbEmADCLossMap.Text.ToDouble()
+ If tbEmADCLossMap.Text = "" Then
+ MsgBox("Loss Map EM ADC is required.")
+ tcVehicleComponents.SelectedTab = tpElectricMachine
+ tbEmADCLossMap.Focus()
+ Return False
+ End If
+
+ veh.ElectricMotorMechLossMap.Init(GetPath(file), tbEmADCLossMap.Text)
+ If (veh.ElectricMotorPosition = PowertrainPosition.HybridP2_5) Then
+ veh.ElectricMotorPerGearRatios = lvRatioPerGear.Items.Cast(Of ListViewItem).Select(Function(item) item.SubItems(RatiosPerGearTbl.Ratio).Text.ToDouble(0)).ToArray()
+ End If
+
+ end if
+ if (VehicleType = VectoSimulationJobType.IEPC_S OrElse VehicleType = VectoSimulationJobType.IEPC_E) Then
+ veh.IEPCFile.Init(GetPath(file), tbIEPCFilePath.Text)
End If
+ if (VehicleType = VectoSimulationJobType.IHPC) Then
+ If (tbIHPCFilePath.Text = "") Then
+ MsgBox("IHPC File is required.")
+ tcVehicleComponents.SelectedTab = tbIHPC
+ tbIHPCFilePath.Focus()
+ End If
+ veh.ElectricMotorFile.Init(GetPath(file), tbIHPCFilePath.Text)
+ veh.ElectricMotorPosition = PowertrainPosition.IHPC
+ veh.ElectricMotorCount = 1
+ veh.ElectricMotorRatio = 1
+ End If
End If
- If (VehicleType = VectoSimulationJobType.SerialHybridVehicle) Then
+ If (VehicleType = VectoSimulationJobType.SerialHybridVehicle OrElse VehicleType = VectoSimulationJobType.IEPC_S) Then
If tbGenSetEM.Text = "" Then
MsgBox("Generator File is required.")
tcVehicleComponents.SelectedTab = tpGensetComponents
@@ -788,11 +928,12 @@ Public Class VehicleForm
veh.GenSetMechLossMap.Init(GetPath(file), tbGenSetADC.Text)
End If
+
If (VehicleType = VectoSimulationJobType.ParallelHybridVehicle) AndAlso Not String.IsNullOrWhiteSpace(tbEmTorqueLimits.Text) Then
veh.EmTorqueLimitsFile.Init(GetPath(file), tbEmTorqueLimits.Text)
End If
- If (VehicleType = VectoSimulationJobType.ParallelHybridVehicle AndAlso Not String.IsNullOrEmpty(tbPropulsionTorqueLimit.Text)) Then
+ If ((VehicleType = VectoSimulationJobType.ParallelHybridVehicle OrElse VehicleType = VectoSimulationJobType.IHPC) AndAlso Not String.IsNullOrEmpty(tbPropulsionTorqueLimit.Text)) Then
veh.PropulsionTorqueFile.Init(GetPath(file), tbPropulsionTorqueLimit.Text)
End If
@@ -1233,7 +1374,6 @@ Public Class VehicleForm
If ElectricMotorFileBrowser.OpenDialog(FileRepl(tbElectricMotor.Text, GetPath(_vehFile))) Then
tbElectricMotor.Text = GetFilenameWithoutDirectory(ElectricMotorFileBrowser.Files(0), GetPath(_vehFile))
End If
-
End Sub
@@ -1466,5 +1606,84 @@ Public Class VehicleForm
Private Sub cbEngineStopStart_CheckedChanged(sender As Object, e As EventArgs) Handles cbEngineStopStart.CheckedChanged
Change()
End Sub
-End Class
+ Private Sub btIEPCFilePath_Click(sender As Object, e As EventArgs) Handles btIEPCFilePath.Click
+ If IEPCFileBrowser.OpenDialog(FileRepl(tbIEPCFilePath.Text, GetPath(_vehFile))) Then
+ tbIEPCFilePath.Text = GetFilenameWithoutDirectory(IEPCFileBrowser.Files(0), GetPath(_vehFile))
+ End If
+ End Sub
+
+ Private Sub btnIEPC_Click(sender As Object, e As EventArgs) Handles btnIEPC.Click
+ Dim f = FileRepl(tbIEPCFilePath.Text, GetPath(_vehFile))
+
+ IEPCForm.JobDir = GetPath(_vehFile)
+ IEPCForm.AutoSendTo = Sub(file, vehicleForm)
+ If UCase(FileRepl(vehicleForm.tbIEPCFilePath.Text, JobDir)) <> UCase(file) Then _
+ vehicleForm.tbIEPCFilePath.Text = GetFilenameWithoutDirectory(file, JobDir)
+ VectoJobForm.UpdatePic()
+ End Sub
+
+ If Not Trim(f) = "" Then
+ If Not File.Exists(f) Then
+ MsgBox("File not found!")
+ Exit Sub
+ End If
+ End If
+
+ If Not IEPCForm.Visible Then
+ IEPCForm.NewIEPC()
+ IEPCForm.Show()
+ Else
+ If IEPCForm.WindowState = FormWindowState.Minimized Then IEPCForm.WindowState = FormWindowState.Normal
+ IEPCForm.BringToFront()
+ End If
+
+ If Not Trim(f) = "" Then
+ Try
+ IEPCForm.ReadIEPCFile(f)
+ Catch ex As Exception
+ MsgBox(ex.Message, MsgBoxStyle.OkOnly, "Error loading IEPC File")
+ End Try
+ End If
+ End Sub
+
+ Private Sub btIHPCFile_Click(sender As Object, e As EventArgs) Handles btIHPCFile.Click
+ If IHPCFileBrowser.OpenDialog(FileRepl(tbIHPCFilePath.Text, GetPath(_vehFile))) Then
+ tbIHPCFilePath.Text = GetFilenameWithoutDirectory(IHPCFileBrowser.Files(0), GetPath(_vehFile))
+ End If
+ End Sub
+
+ Private Sub btIHPC_Click(sender As Object, e As EventArgs) Handles btIHPC.Click
+ Dim f = FileRepl(tbIHPCFilePath.Text, GetPath(_vehFile))
+
+ IHPCForm.JobDir = GetPath(_vehFile)
+ IHPCForm.AutoSendTo = Sub(file, vehicleForm)
+ If UCase(FileRepl(vehicleForm.tbIHPCFilePath.Text, JobDir)) <> UCase(file) Then _
+ vehicleForm.tbIHPCFilePath.Text = GetFilenameWithoutDirectory(file, JobDir)
+ VectoJobForm.UpdatePic()
+ End Sub
+
+ If Not Trim(f) = "" Then
+ If Not File.Exists(f) Then
+ MsgBox("File not found!")
+ Exit Sub
+ End If
+ End If
+
+ If Not IHPCForm.Visible Then
+ IHPCForm.ClearIHPC()
+ IHPCForm.Show()
+ Else
+ If IHPCForm.WindowState = FormWindowState.Minimized Then IHPCForm.WindowState = FormWindowState.Normal
+ IHPCForm.BringToFront()
+ End If
+
+ If Not Trim(f) = "" Then
+ Try
+ IHPCForm.ReadIHPCFile(f)
+ Catch ex As Exception
+ MsgBox(ex.Message, MsgBoxStyle.OkOnly, "Error loading IHPC File")
+ End Try
+ End If
+ End Sub
+End Class
\ No newline at end of file
diff --git a/VECTO/GUI/XMLImportJobDialog.vb b/VECTO/GUI/XMLImportJobDialog.vb
index d462a579bde57f6623279b9fab1c509caee61582..9afc8e727a07b7f5cbfec479b2754284c04863e6 100644
--- a/VECTO/GUI/XMLImportJobDialog.vb
+++ b/VECTO/GUI/XMLImportJobDialog.vb
@@ -1,27 +1,27 @@
-Imports System.IO
-
-Public Class XMLImportJobDialog
- Private Sub btnBrowseJob_Click(sender As Object, e As EventArgs) Handles btnBrowseJob.Click
- Dim dialog As OpenFileDialog = New OpenFileDialog()
- If (dialog.ShowDialog() = DialogResult.OK) Then
- tbJobFile.Text = Path.GetFullPath(dialog.FileName)
- End If
- End Sub
-
- Private Sub btnBrowseOutput_Click(sender As Object, e As EventArgs) Handles btnBrowseOutput.Click
+Imports System.IO
+
+Public Class XMLImportJobDialog
+ Private Sub btnBrowseJob_Click(sender As Object, e As EventArgs) Handles btnBrowseJob.Click
+ Dim dialog As OpenFileDialog = New OpenFileDialog()
+ If (dialog.ShowDialog() = DialogResult.OK) Then
+ tbJobFile.Text = Path.GetFullPath(dialog.FileName)
+ End If
+ End Sub
+
+ Private Sub btnBrowseOutput_Click(sender As Object, e As EventArgs) Handles btnBrowseOutput.Click
If Not FolderFileBrowser.OpenDialog("") Then
Exit Sub
- End If
+ End If
Dim filePath As String = FolderFileBrowser.Files(0)
tbDestination.Text = Path.GetFullPath(filePath)
- End Sub
-
- Private Sub btnClose_Click(sender As Object, e As EventArgs) Handles btnClose.Click
- Close()
- End Sub
-
- Private Sub btnImport_Click(sender As Object, e As EventArgs) Handles btnImport.Click
- ' TODO!
- End Sub
+ End Sub
+
+ Private Sub btnClose_Click(sender As Object, e As EventArgs) Handles btnClose.Click
+ Close()
+ End Sub
+
+ Private Sub btnImport_Click(sender As Object, e As EventArgs) Handles btnImport.Click
+ ' TODO!
+ End Sub
End Class
\ No newline at end of file
diff --git a/VECTO/Input Files/BusParamsEngineering.vb b/VECTO/Input Files/BusParamsEngineering.vb
index cb53823f079791f699238a4485630da2d6c706c5..45884dff8b73f51f2555dadf93cebbe8c33ebdb0 100644
--- a/VECTO/Input Files/BusParamsEngineering.vb
+++ b/VECTO/Input Files/BusParamsEngineering.vb
@@ -72,7 +72,7 @@ Public Class BusAuxEngineeringParams
writer.SaveBusAuxEngineeringParameters(Me, _filePath, Cfg.DeclMode)
Catch ex As Exception
- MsgBox("Failed to write Strategy Parameters file: " + ex.Message)
+ MsgBox("Failed to write auxiliary parameters file: " + ex.Message)
Return False
End Try
Return True
@@ -131,7 +131,7 @@ Public Class BusAuxEngineeringParams
Public ReadOnly Property PS_CompressorMap As TableData Implements IBusAuxPneumaticSystemEngineeringData.CompressorMap
get
- if JobType =VectoSimulationJobType.BatteryElectricVehicle then
+ if JobType =VectoSimulationJobType.BatteryElectricVehicle OrElse JobType = VectoSimulationJobType.IEPC_E then
return Nothing
End If
if Not file.Exists(CompressorMap.FullPath) Then
diff --git a/VECTO/Input Files/ElectricMachine.vb b/VECTO/Input Files/ElectricMachine.vb
index 4671c0d8960ca6f9a44448cdb3fd73ac6d2adfa0..14bf115c329bb1356f8793dc277fd458ab91bb43 100644
--- a/VECTO/Input Files/ElectricMachine.vb
+++ b/VECTO/Input Files/ElectricMachine.vb
@@ -97,7 +97,7 @@ Public Class ElectricMachine
writer.SaveElectricMotor(Me, _filePath, Cfg.DeclMode)
Catch ex As Exception
- MsgBox("Faled to write Engine file: " + ex.Message)
+ MsgBox("Failed to write Engine file: " + ex.Message)
Return False
End Try
Return True
diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb
index fb0e8864ecd00c6573b6a3c67c481a754b879ec2..6d00b176028bf9b51d6ad63e735f555d84a3c949 100644
--- a/VECTO/Input Files/Engine.vb
+++ b/VECTO/Input Files/Engine.vb
@@ -713,7 +713,8 @@ Public Class DummyVehicle
Public ReadOnly Property ElectricStorage As IElectricStorageSystemDeclarationInputData Implements IVehicleComponentsDeclaration.ElectricStorage
Public ReadOnly Property IVehicleComponentsEngineering_ElectricMachines As IElectricMachinesEngineeringInputData Implements IVehicleComponentsEngineering.ElectricMachines
Public ReadOnly Property ElectricMachines As IElectricMachinesDeclarationInputData Implements IVehicleComponentsDeclaration.ElectricMachines
- Public ReadOnly Property IEPC As IIEPCDeclarationInputData Implements IVehicleComponentsDeclaration.IEPC
+ Public ReadOnly Property IEPCEngineeringInputData As IIEPCEngineeringInputData Implements IVehicleComponentsEngineering.IEPCEngineeringInputData
+ Public ReadOnly Property IEPC As IIEPCDeclarationInputData Implements IVehicleComponentsDeclaration.IEPC
End Class
diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb
index f52b5689717ac4c26c609ec9cb4ea0d267e93a65..a28e7c3000fce595f2c6d489d3a4fdc565dfeeac 100644
--- a/VECTO/Input Files/Gearbox.vb
+++ b/VECTO/Input Files/Gearbox.vb
@@ -923,6 +923,7 @@ Public Class MockEngineeringVehicle
Public Property AxleWheels As IAxlesEngineeringInputData Implements IVehicleComponentsEngineering.AxleWheels
Public ReadOnly Property ElectricStorage As IElectricStorageSystemEngineeringInputData Implements IVehicleComponentsEngineering.ElectricStorage
Public ReadOnly Property ElectricMachines As IElectricMachinesEngineeringInputData Implements IVehicleComponentsEngineering.ElectricMachines
+ Public ReadOnly Property IEPCEngineeringInputData As IIEPCEngineeringInputData Implements IVehicleComponentsEngineering.IEPCEngineeringInputData
End Class
Public Class MockJobInputData
diff --git a/VECTO/Input Files/IEPCInputData.vb b/VECTO/Input Files/IEPCInputData.vb
new file mode 100644
index 0000000000000000000000000000000000000000..f135608ae98f1fbae5d1f149be32e5799baca9e1
--- /dev/null
+++ b/VECTO/Input Files/IEPCInputData.vb
@@ -0,0 +1,258 @@
+Imports System.IO
+Imports TUGraz.VECTO.Input_Files
+Imports TUGraz.VectoCommon.Exceptions
+Imports TUGraz.VectoCommon.InputData
+Imports TUGraz.VectoCommon.Models
+Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.InputData.FileIO.JSON
+Imports TUGraz.VectoCore.InputData.Impl
+Imports TUGraz.VectoCore.Utils
+
+Public Class IEPCInputData
+ Implements IIEPCEngineeringInputData
+
+ Private _model As String
+ Private _inertia As KilogramSquareMeter
+ Private _wheelMotorMeasured As Boolean
+ Private _nrDesignTypeWheelMotor As Integer?
+ Private _differentialIncluded As Boolean
+ Private _overloadRecoverFactor As Double
+ Private _gears As IList(Of IGearEntry)
+ Private _voltageLevels As IList(Of IElectricMotorVoltageLevel)
+ Private _dragCurves As IList(Of IDragCurve)
+ private _filePath As String
+
+
+ public Sub New(file As String)
+ _voltageLevels = New List(Of IElectricMotorVoltageLevel)
+ _filePath = file
+ End Sub
+
+ Public Function SaveFile As Boolean
+ Try
+ Dim writer = New JSONFileWriter()
+ writer.SaveIEPC(Me, _filePath, Cfg.DeclMode)
+ Catch ex As Exception
+ MsgBox("Failed to write IEPC file: " + ex.Message)
+ Return False
+ End Try
+
+ Return True
+ End Function
+
+ Public Sub SetCommonEntries(model As String, inertia As String, designTypeWheelMotorMeasured As Boolean,
+ nrOfDesignTypeWheelMotorMeasured As string, differentialIncluded as Boolean,
+ thermalOverloadRecoverFactor As String)
+
+ _model = model
+ _inertia = inertia.ToDouble().SI(Of KilogramSquareMeter)
+ _wheelMotorMeasured = designTypeWheelMotorMeasured
+ _nrDesignTypeWheelMotor = nrOfDesignTypeWheelMotorMeasured.ToInt(Nothing)
+ _differentialIncluded = differentialIncluded
+ _overloadRecoverFactor = thermalOverloadRecoverFactor.ToDouble()
+
+ End Sub
+
+ Public Sub SetVoltageLevelEntries(voltage As String, continuousTorque As String, continuousTorqueSpeed As String,
+ overloadTime As String, overloadTorque As String, overloadTorqueSpeed As String,
+ fullLoadCurve As string, powerMap As ListView)
+
+ Dim level = New ElectricMotorVoltageLevel()
+ level.VoltageLevel = voltage.ToDouble().SI(Of Volt)
+ level.ContinuousTorque = continuousTorque.ToDouble().SI(Of NewtonMeter)
+ level.ContinuousTorqueSpeed = continuousTorqueSpeed.ToDouble().RPMtoRad()
+ level.OverloadTime = overloadTime.ToDouble().SI(Of Second)
+ level.OverloadTorque = overloadTorque.ToDouble().SI(Of NewtonMeter)
+ level.OverloadTestSpeed = overloadTorqueSpeed.ToDouble().RPMtoRad()
+ Dim tmp as SubPath = new SubPath()
+ tmp.Init(GetPath(_filePath), fullLoadCurve)
+ If Not File.Exists(tmp.FullPath) Then
+ Throw New VectoException("Full-Load Curve is missing or invalid")
+ Else
+ level.FullLoadCurve = VectoCSVFile.Read(tmp.FullPath)
+ End If
+ level.PowerMap = GetPowerMap(powerMap)
+
+ _voltageLevels.Add(level)
+ End Sub
+
+ Private Function GetPowerMap(powerMap As ListView) As IList(of IElectricMotorPowerMap)
+ Dim powerMaps = new List(Of IElectricMotorPowerMap)
+
+ For Each entry As ListViewItem In powerMap.Items
+ Dim currentEntry = New JSONElectricMotorPowerMap
+ currentEntry.Gear = entry.SubItems(0).Text.ToInt()
+ Dim tmp as SubPath = new SubPath()
+ tmp.Init(GetPath(_filePath), entry.SubItems(1).Text)
+ If Not File.Exists(tmp.FullPath) Then
+ Throw New VectoException("Power Map is missing or invalid")
+ Else
+ currentEntry.PowerMap = VectoCSVFile.Read(tmp.FullPath)
+ End If
+ powerMaps.Add(currentEntry)
+ Next
+
+ Return powerMaps
+ End Function
+
+ Public Sub SetGearsEntries(gearsListView As ListView)
+ _gears = New List(Of IGearEntry)
+
+ Dim gearNumber = 1
+ For Each entry As ListViewItem In gearsListView.Items
+
+ Dim currentEntry = new GearEntry
+ currentEntry.GearNumber = gearNumber
+ gearNumber += 1
+
+ currentEntry.Ratio = entry.SubItems(0).Text.ToDouble()
+ If Not entry.SubItems(1).Text = Nothing Then _
+ currentEntry.MaxOutputShaftTorque = entry.SubItems(1).Text.ToDouble().SI(Of NewtonMeter)
+ If Not entry.SubItems(2).Text = Nothing Then _
+ currentEntry.MaxOutputShaftSpeed = entry.SubItems(2).Text.ToDouble().RPMtoRad()
+
+ _gears.Add(currentEntry)
+ Next
+ End Sub
+
+ Public Sub SetDragCurveEntries(dragCurveListView As ListView)
+ _dragCurves = New List(Of IDragCurve)
+
+ For Each entry As ListViewItem In dragCurveListView.Items
+ Dim currentEntry = New DragCurveEntry
+ currentEntry.Gear = entry.SubItems(0).Text.ToInt()
+ Dim tmp as SubPath = new SubPath()
+ tmp.Init(GetPath(_filePath), entry.SubItems(1).Text)
+ If Not File.Exists(tmp.FullPath) Then
+ Throw New VectoException("Drag Curve is missing or invalid")
+ Else
+ currentEntry.DragCurve = VectoCSVFile.Read(tmp.FullPath)
+ End If
+ _dragCurves.Add(currentEntry)
+ Next
+ End Sub
+
+ Public ReadOnly Property DataSource As DataSource Implements IComponentInputData.DataSource
+ Get
+ Dim retVal = New DataSource()
+ retVal.SourceType = DataSourceType.JSONFile
+ retVal.SourceFile = _filePath
+ Return retVal
+ End Get
+ End Property
+
+ Public ReadOnly Property SavedInDeclarationMode As Boolean Implements IComponentInputData.SavedInDeclarationMode
+ Get
+ Return Cfg.DeclMode
+ End Get
+ End Property
+
+ Public ReadOnly Property Manufacturer As String Implements IComponentInputData.Manufacturer
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property Model As String Implements IComponentInputData.Model
+ Get
+ Return _model
+ End Get
+ End Property
+
+ Public ReadOnly Property [Date] As Date Implements IComponentInputData.[Date]
+ Get
+ Return Now.ToUniversalTime()
+ End Get
+ End Property
+
+ Public ReadOnly Property AppVersion As String Implements IComponentInputData.AppVersion
+ Get
+ Return "VECTO-GUI"
+ End Get
+ End Property
+
+ Public ReadOnly Property CertificationMethod As CertificationMethod Implements IComponentInputData.CertificationMethod
+ Get
+ Return CertificationMethod.NotCertified
+ End Get
+ End Property
+
+ Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber
+ Get
+ Return VectoCore.Configuration.Constants.NOT_AVAILABLE
+ End Get
+ End Property
+
+ Public ReadOnly Property DigestValue As DigestData Implements IComponentInputData.DigestValue
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property ElectricMachineType As ElectricMachineType Implements IIEPCDeclarationInputData.ElectricMachineType
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property R85RatedPower As Watt Implements IIEPCDeclarationInputData.R85RatedPower
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property Inertia As KilogramSquareMeter Implements IIEPCDeclarationInputData.Inertia
+ Get
+ Return _inertia
+ End Get
+ End Property
+
+ Public ReadOnly Property DifferentialIncluded As Boolean Implements IIEPCDeclarationInputData.DifferentialIncluded
+ Get
+ Return _differentialIncluded
+ End Get
+ End Property
+
+ Public ReadOnly Property DesignTypeWheelMotor As Boolean Implements IIEPCDeclarationInputData.DesignTypeWheelMotor
+ Get
+ Return _wheelMotorMeasured
+ End Get
+ End Property
+
+ Public ReadOnly Property NrOfDesignTypeWheelMotorMeasured As Integer? Implements IIEPCDeclarationInputData.NrOfDesignTypeWheelMotorMeasured
+ Get
+ Return _nrDesignTypeWheelMotor
+ End Get
+ End Property
+
+ Public ReadOnly Property Gears As IList(Of IGearEntry) Implements IIEPCDeclarationInputData.Gears
+ Get
+ Return _gears
+ End Get
+ End Property
+
+ Public ReadOnly Property VoltageLevels As IList(Of IElectricMotorVoltageLevel) Implements IIEPCDeclarationInputData.VoltageLevels
+ Get
+ Return _voltageLevels
+ End Get
+ End Property
+
+ Public ReadOnly Property DragCurves As IList(Of IDragCurve) Implements IIEPCDeclarationInputData.DragCurves
+ Get
+ Return _dragCurves
+ End Get
+ End Property
+
+ Public ReadOnly Property Conditioning As TableData Implements IIEPCDeclarationInputData.Conditioning
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property OverloadRecoveryFactor As Double Implements IIEPCEngineeringInputData.OverloadRecoveryFactor
+ Get
+ Return _overloadRecoverFactor
+ End Get
+ End Property
+
+End Class
diff --git a/VECTO/Input Files/IHPCInputData.vb b/VECTO/Input Files/IHPCInputData.vb
new file mode 100644
index 0000000000000000000000000000000000000000..69f24a0f6175b4c3854aaecff61c52406f5adbb2
--- /dev/null
+++ b/VECTO/Input Files/IHPCInputData.vb
@@ -0,0 +1,200 @@
+Imports System.IO
+Imports TUGraz.VECTO.Input_Files
+Imports TUGraz.VectoCommon.Exceptions
+Imports TUGraz.VectoCommon.InputData
+Imports TUGraz.VectoCommon.Models
+Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.InputData.FileIO.JSON
+Imports TUGraz.VectoCore.InputData.Impl
+Imports TUGraz.VectoCore.Utils
+
+Public Class IHPCInputData
+ Implements IElectricMotorEngineeringInputData
+
+ Private _model As String
+ Private _inertia As KilogramSquareMeter
+ Private _voltageLevels As IList(Of IElectricMotorVoltageLevel)
+ Private _dragCurve As TableData
+ Private _overloadRecoveryFactor As Double
+ private _filePath As String
+
+ Public Sub New (file As String)
+ _voltageLevels = New List(Of IElectricMotorVoltageLevel)()
+ _filePath = file
+ End Sub
+
+ Public Function SaveFile() As Boolean
+ Try
+ Dim writer = New JSONFileWriter()
+ writer.SaveIHPC(Me, _filePath, Cfg.DeclMode)
+ Catch ex As Exception
+ MsgBox("Failed to write IHPC file: " + ex.Message)
+ Return False
+ End Try
+ Return True
+ End Function
+
+
+ Public Sub SetCommonEntries(model As String, inertia As String, dragCurveFilePath As string,
+ thermalOverloadRecoverFactor As String )
+ _model = model
+ _inertia = inertia.ToDouble().SI(Of KilogramSquareMeter)
+ Dim tmp as SubPath = new SubPath()
+ tmp.Init(GetPath(_filePath), dragCurveFilePath)
+ If Not File.Exists(tmp.FullPath) Then
+ Throw New VectoException("Drag Curve is missing or invalid")
+ Else
+ _dragCurve = VectoCSVFile.Read(tmp.FullPath)
+ End If
+
+ _overloadRecoveryFactor = thermalOverloadRecoverFactor.ToDouble()
+ End Sub
+
+ Public Sub SetVoltageLevelEntries(voltage As String, continuousTorque As String, continuousTorqueSpeed As String,
+ overloadTime As String, overloadTorque As String, overloadTorqueSpeed As String,
+ fullLoadCurve As string, powerMap As ListView)
+
+
+ Dim level = New ElectricMotorVoltageLevel()
+ level.VoltageLevel = voltage.ToDouble().SI(Of Volt)
+ level.ContinuousTorque = continuousTorque.ToDouble().SI(Of NewtonMeter)
+ level.ContinuousTorqueSpeed = continuousTorqueSpeed.ToDouble().RPMtoRad()
+ level.OverloadTime = overloadTime.ToDouble().SI(Of Second)
+ level.OverloadTorque = overloadTorque.ToDouble().SI(Of NewtonMeter)
+ level.OverloadTestSpeed = overloadTorqueSpeed.ToDouble().RPMtoRad()
+ Dim tmp as SubPath = new SubPath()
+ tmp.Init(GetPath(_filePath), fullLoadCurve)
+ If Not File.Exists(tmp.FullPath) Then
+ Throw New VectoException("Full-Load Curve is missing or invalid")
+ Else
+ level.FullLoadCurve = VectoCSVFile.Read(tmp.FullPath)
+ End If
+ level.PowerMap = GetPowerMap(powerMap)
+
+ _voltageLevels.Add(level)
+
+ End Sub
+
+ Private Function GetPowerMap(powerMap As ListView) As IList(of IElectricMotorPowerMap)
+ Dim powerMaps = new List(Of IElectricMotorPowerMap)
+
+ For Each entry As ListViewItem In powerMap.Items
+ Dim currentEntry = New JSONElectricMotorPowerMap
+ currentEntry.Gear = entry.SubItems(0).Text.ToInt()
+ Dim tmp as SubPath = new SubPath()
+ tmp.Init(GetPath(_filePath), entry.SubItems(1).Text)
+ If Not File.Exists(tmp.FullPath) Then
+ Throw New VectoException("Power Map is missing or invalid")
+ Else
+ currentEntry.PowerMap = VectoCSVFile.Read(tmp.FullPath)
+ End If
+ powerMaps.Add(currentEntry)
+ Next
+
+ Return powerMaps
+ End Function
+
+
+ Public ReadOnly Property DataSource As DataSource Implements IComponentInputData.DataSource
+ Get
+ Dim retVal = New DataSource()
+ retVal.SourceType = DataSourceType.JSONFile
+ retVal.SourceFile = _filePath
+ Return retVal
+ End Get
+ End Property
+
+ Public ReadOnly Property SavedInDeclarationMode As Boolean Implements IComponentInputData.SavedInDeclarationMode
+ Get
+ Return Cfg.DeclMode
+ End Get
+ End Property
+
+ Public ReadOnly Property Manufacturer As String Implements IComponentInputData.Manufacturer
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property Model As String Implements IComponentInputData.Model
+ Get
+ Return _model
+ End Get
+ End Property
+
+ Public ReadOnly Property [Date] As Date Implements IComponentInputData.[Date]
+ Get
+ Return Now.ToUniversalTime()
+ End Get
+ End Property
+
+ Public ReadOnly Property AppVersion As String Implements IComponentInputData.AppVersion
+ Get
+ Return "VECTO-GUI"
+ End Get
+ End Property
+
+ Public ReadOnly Property CertificationMethod As CertificationMethod Implements IComponentInputData.CertificationMethod
+ Get
+ Return CertificationMethod.NotCertified
+ End Get
+ End Property
+
+ Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber
+ Get
+ Return VectoCore.Configuration.Constants.NOT_AVAILABLE
+ End Get
+ End Property
+
+ Public ReadOnly Property DigestValue As DigestData Implements IComponentInputData.DigestValue
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property ElectricMachineType As ElectricMachineType Implements IElectricMotorDeclarationInputData.ElectricMachineType
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property R85RatedPower As Watt Implements IElectricMotorDeclarationInputData.R85RatedPower
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property Inertia As KilogramSquareMeter Implements IElectricMotorDeclarationInputData.Inertia
+ Get
+ Return _inertia
+ End Get
+ End Property
+
+ Public ReadOnly Property DcDcConverterIncluded As Boolean Implements IElectricMotorDeclarationInputData.DcDcConverterIncluded
+
+ Public ReadOnly Property IHPCType As String Implements IElectricMotorDeclarationInputData.IHPCType
+
+ Public ReadOnly Property VoltageLevels As IList(Of IElectricMotorVoltageLevel) Implements IElectricMotorDeclarationInputData.VoltageLevels
+ Get
+ Return _voltageLevels
+ End Get
+ End Property
+
+ Public ReadOnly Property DragCurve As TableData Implements IElectricMotorDeclarationInputData.DragCurve
+ Get
+ Return _dragCurve
+ End Get
+ End Property
+
+ Public ReadOnly Property Conditioning As TableData Implements IElectricMotorDeclarationInputData.Conditioning
+ Get
+ Return Nothing
+ End Get
+ End Property
+
+ Public ReadOnly Property OverloadRecoveryFactor As Double Implements IElectricMotorEngineeringInputData.OverloadRecoveryFactor
+ Get
+ Return _overloadRecoveryFactor
+ End Get
+ End Property
+End Class
diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb
index 43fb7e27f3961baac537c54eb6804d690bd769ae..8b54f3b75254e75eebc6cab25acb4abd6b251ae6 100644
--- a/VECTO/Input Files/VectoJob.vb
+++ b/VECTO/Input Files/VectoJob.vb
@@ -132,8 +132,15 @@ Public Class VectoJob
End Sub
Public Function SaveFile() As Boolean
+ dim emPos As PowertrainPosition? = Nothing
+ if (IEngineeringJobInputData_Vehicle?.VehicleType <> VectoSimulationJobType.ConventionalVehicle) then
+ if (IEngineeringJobInputData_Vehicle.VehicleType <> VectoSimulationJobType.IEPC_E) Then
+ emPos = IEngineeringJobInputData_Vehicle?.Components.ElectricMachines?.Entries.FirstOrDefault()?.Position
+ End If
+ end if
+
Dim validationResults As IList(Of ValidationResult) =
- Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering), JobType, IEngineeringJobInputData_Vehicle?.Components.ElectricMachines?.Entries.FirstOrDefault()?.Position, Nothing, False)
+ Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering), JobType, emPos, Nothing, False)
If validationResults.Count > 0 Then
Dim messages As IEnumerable(Of String) =
@@ -521,7 +528,7 @@ Public Class VectoJob
If vectoJob.JobType.IsOneOf(VectoSimulationJobType.BatteryElectricVehicle, VectoSimulationJobType.ParallelHybridVehicle, VectoSimulationJobType.SerialHybridVehicle) _
AndAlso (vehicleInputData.Components.ElectricMachines Is Nothing OrElse vehicleInputData.Components.ElectricMachines.Entries.Count = 0) Then _
result.Add(New ValidationResult("Electric machine is missing in vehicle"))
- If Not vectoJob.JobType = VectoSimulationJobType.BatteryElectricVehicle AndAlso engineInputData Is Nothing Then _
+ If Not (vectoJob.JobType = VectoSimulationJobType.BatteryElectricVehicle OrElse vectoJob.JobType = VectoSimulationJobType.IEPC_E) AndAlso engineInputData Is Nothing Then _
result.Add(New ValidationResult("Engine File is missing or invalid"))
If (vectoJob.JobType = VectoSimulationJobType.ConventionalVehicle OrElse vectoJob.JobType = VectoSimulationJobType.ParallelHybridVehicle) _
AndAlso gearboxInputData Is Nothing Then _
@@ -557,7 +564,7 @@ Public Class VectoJob
If vehicleInputData.SavedInDeclarationMode Then
result.Add(New ValidationResult("Vehicle File is not in Engineering Mode"))
End If
- If Not vectoJob.JobType = VectoSimulationJobType.BatteryElectricVehicle AndAlso engineInputData.SavedInDeclarationMode Then
+ If Not (vectoJob.JobType = VectoSimulationJobType.BatteryElectricVehicle OrElse vectoJob.JobType = VectoSimulationJobType.IEPC_E) AndAlso engineInputData.SavedInDeclarationMode Then
result.Add(New ValidationResult("Engine File is not in Engineering Mode"))
End If
If Not vectoJob.JobType = VectoSimulationJobType.BatteryElectricVehicle _
@@ -578,8 +585,13 @@ Public Class VectoJob
End If
End If
-
- result = jobData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering), vehicleInputData.VehicleType, vehicleInputData.Components.ElectricMachines?.Entries.FirstOrDefault()?.Position, If(jobData.GearboxData?.Type, GearboxType.NoGearbox), False)
+ dim emPos As PowertrainPosition? = Nothing
+ if (vehicleInputData?.VehicleType <> VectoSimulationJobType.ConventionalVehicle) then
+ if (vehicleInputData.VehicleType <> VectoSimulationJobType.IEPC_E) Then
+ emPos = vehicleInputData?.Components.ElectricMachines?.Entries.FirstOrDefault()?.Position
+ End If
+ end if
+ result = jobData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering), vehicleInputData.VehicleType, empos, If(jobData.GearboxData?.Type, GearboxType.NoGearbox), False)
If result.Any() Then
Return _
New ValidationResult("Vecto Job Configuration is invalid. ", result.Select(Function(r) r.ErrorMessage).ToList())
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 15ab9c9dd9163ab45858031c4fe57946645215d0..64e65684f25f2bd39834d0a54af04c44d627b3ba 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -47,8 +47,8 @@ Public Class Vehicle
<ValidateObject> Public RetarderType As RetarderType
Public RetarderRatio As Double = 0
Public ReadOnly RetarderLossMapFile As SubPath
- Public ReadOnly EmTorqueLimitsFile As SubPath
- public ReadOnly PropulsionTorqueFile as SubPath
+ Public ReadOnly EmTorqueLimitsFile As SubPath
+ public ReadOnly PropulsionTorqueFile as SubPath
Public DynamicTyreRadius As Double
Public ReadOnly Axles As List(Of AxleInputData)
@@ -67,7 +67,7 @@ Public Class Vehicle
Public PtoType As String
Public ReadOnly PtoLossMap As SubPath
Public ReadOnly PtoCycleStandstill As SubPath
- Public ReadOnly PtoCycleDriving As SubPath
+ Public ReadOnly PtoCycleDriving As SubPath
Public torqueLimitsList As List(Of ITorqueLimitInputData)
Public VehicleidlingSpeed As PerSecond
Public legClass As LegislativeClass
@@ -80,26 +80,27 @@ Public Class Vehicle
Public VehicleTankSystem As TankSystem?
Public ReadOnly ElectricMotorFile As SubPath
- Public ReadOnly GenSetEMFile As SubPath
+ Public ReadOnly GenSetEMFile As SubPath
public ReadOnly ReessPacks As List(Of Tuple(Of String, Integer, Integer))
- Public ElectricMotorPosition As PowertrainPosition
+ Public ElectricMotorPosition As PowertrainPosition
Public ElectricMotorCount As Integer
Public ElectricMotorRatio As Double
- 'Public ElectricMotorMechEff As Double
- Public ElectricMotorMechLossMap As SubPath
- Public GenSetMechLossMap As SubPath
+ 'Public ElectricMotorMechEff As Double
+ Public ElectricMotorMechLossMap As SubPath
+ Public GenSetMechLossMap As SubPath
- Public GenSetPosition As PowertrainPosition
- Public GenSetCount As Integer
- Public GenSetRatio As Double
- 'Public ElectricMotorMechEff As Double
- Public GenSetLossMap As SubPath
+ Public GenSetPosition As PowertrainPosition
+ Public GenSetCount As Integer
+ Public GenSetRatio As Double
+ 'Public ElectricMotorMechEff As Double
+ Public GenSetLossMap As SubPath
- public GearDuringPTODrive As UInteger?
- Public EngineSpeedDuringPTODrive As PerSecond
- Public ElectricMotorPerGearRatios As Double()
+ public GearDuringPTODrive As UInteger?
+ Public EngineSpeedDuringPTODrive As PerSecond
+ Public ElectricMotorPerGearRatios As Double()
+ Public IEPCFile As SubPath
Public Sub New()
_path = ""
@@ -108,15 +109,16 @@ Public Class Vehicle
RetarderLossMapFile = New SubPath
AngledriveLossMapFile = New SubPath()
- EmTorqueLimitsFile = new SubPath()
- PropulsionTorqueFile = New SubPath()
+ EmTorqueLimitsFile = new SubPath()
+ PropulsionTorqueFile = New SubPath()
+ IEPCFile = new SubPath()
Axles = New List(Of AxleInputData)
torqueLimitsList = New List(Of ITorqueLimitInputData)
ReessPacks = new List(Of Tuple(Of String,Integer,Integer))
- PtoLossMap = New SubPath()
+ PtoLossMap = New SubPath()
PtoCycleStandstill = New SubPath()
- PtoCycleDriving = new SubPath()
+ PtoCycleDriving = new SubPath()
ElectricMotorFile = New SubPath()
ElectricMotorMechLossMap = new SubPath()
GenSetEMFile = new SubPath()
@@ -226,7 +228,7 @@ Public Class Vehicle
RetarderLossMapFile.Clear()
AngledriveLossMapFile.Clear()
EmTorqueLimitsFile.Clear()
- PropulsionTorqueFile.Clear()
+ PropulsionTorqueFile.Clear()
AngledriveType = AngledriveType.None
AngledriveLossMapFile.Clear()
@@ -235,7 +237,7 @@ Public Class Vehicle
PtoType = PTOTransmission.NoPTO
PtoLossMap.Clear()
PtoCycleStandstill.Clear()
- PtoCycleDriving.Clear()
+ PtoCycleDriving.Clear()
Axles.Clear()
VehicleCategory = VehicleCategory.RigidTruck
@@ -437,8 +439,9 @@ Public Class Vehicle
Public ReadOnly Property TransferredAirDragArea As SquareMeter Implements IAirdragDeclarationInputData.TransferredAirDragArea
Public ReadOnly Property AirDragArea_0 As SquareMeter Implements IAirdragDeclarationInputData.AirDragArea_0
+ Public ReadOnly Property IAirdragDeclarationInputData_XMLSource As XmlNode Implements IAirdragDeclarationInputData.XMLSource
- Public ReadOnly Property IVehicleEngineeringInputData_Axles As IList(Of IAxleEngineeringInputData) _
+ Public ReadOnly Property IVehicleEngineeringInputData_Axles As IList(Of IAxleEngineeringInputData) _
Implements IAxlesEngineeringInputData.AxlesEngineering
Get
Return Axles.Cast(Of IAxleEngineeringInputData)().ToList()
@@ -787,7 +790,17 @@ Public Class Vehicle
End Get
End Property
+ Public ReadOnly Property IEPCEngineeringInputData As IIEPCEngineeringInputData Implements IVehicleComponentsEngineering.IEPCEngineeringInputData
+ get
+ Return new IEPCWrapper(me)
+ End Get
+ End Property
+
Public ReadOnly Property IEPC As IIEPCDeclarationInputData Implements IVehicleComponentsDeclaration.IEPC
+ get
+ return IEPCEngineeringInputData
+ End Get
+ End Property
Public ReadOnly Property BusAuxiliaries As IBusAuxiliariesDeclarationData Implements IVehicleComponentsDeclaration.BusAuxiliaries
@@ -823,21 +836,21 @@ Public Class Vehicle
End Get
End Property
- Public ReadOnly Property PTO_DriveGear As GearshiftPosition Implements IVehicleEngineeringInputData.PTO_DriveGear
- get
- return If(gearDuringPTODrive.HasValue, new GearshiftPosition(GearDuringPTODrive.Value), Nothing)
- End Get
+ Public ReadOnly Property PTO_DriveGear As GearshiftPosition Implements IVehicleEngineeringInputData.PTO_DriveGear
+ get
+ return If(gearDuringPTODrive.HasValue, new GearshiftPosition(GearDuringPTODrive.Value), Nothing)
+ End Get
end Property
- Public Property InitialSOC As Double Implements IVehicleEngineeringInputData.InitialSOC
- Public Property VehicleType As VectoSimulationJobType Implements IVehicleEngineeringInputData.VehicleType
+ Public Property InitialSOC As Double Implements IVehicleEngineeringInputData.InitialSOC
+ Public Property VehicleType As VectoSimulationJobType Implements IVehicleEngineeringInputData.VehicleType
- Public ReadOnly Property PTO_DriveEngineSpeed As PerSecond Implements IVehicleEngineeringInputData.PTO_DriveEngineSpeed
- get
- Return EngineSpeedDuringPTODrive
- End Get
- End Property
+ Public ReadOnly Property PTO_DriveEngineSpeed As PerSecond Implements IVehicleEngineeringInputData.PTO_DriveEngineSpeed
+ get
+ Return EngineSpeedDuringPTODrive
+ End Get
+ End Property
Public ReadOnly Property ZeroEmissionVehicle As Boolean Implements IVehicleDeclarationInputData.ZeroEmissionVehicle
Get
@@ -869,9 +882,9 @@ end Property
End Get
End Property
- Public ReadOnly Property ExemptedTechnology As String Implements IVehicleDeclarationInputData.ExemptedTechnology
+ Public ReadOnly Property ExemptedTechnology As String Implements IVehicleDeclarationInputData.ExemptedTechnology
- Public ReadOnly Property RegisteredClass As RegistrationClass? Implements IVehicleDeclarationInputData.RegisteredClass
+ Public ReadOnly Property RegisteredClass As RegistrationClass? Implements IVehicleDeclarationInputData.RegisteredClass
Public ReadOnly Property NumberPassengerSeatsUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengerSeatsUpperDeck
Public ReadOnly Property NumberPassengerSeatsLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengerSeatsLowerDeck
Public ReadOnly Property NumberPassengersStandingLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengersStandingLowerDeck
@@ -913,12 +926,12 @@ end Property
End Get
End Property
- Public ReadOnly Property NumSteeredAxles As Integer? Implements IAxlesDeclarationInputData.NumSteeredAxles
+ Public ReadOnly Property NumSteeredAxles As Integer? Implements IAxlesDeclarationInputData.NumSteeredAxles
get
return nothing
End Get
- End Property
- Public ReadOnly Property XMLSource As XmlNode Implements IAdvancedDriverAssistantSystemDeclarationInputData.XMLSource
+ End Property
+ Public ReadOnly Property XMLSource As XmlNode Implements IAdvancedDriverAssistantSystemDeclarationInputData.XMLSource
Public ReadOnly Property VehicleTypeApprovalNumber As String Implements IVehicleDeclarationInputData.VehicleTypeApprovalNumber
Public ReadOnly Property ArchitectureID As ArchitectureID Implements IVehicleDeclarationInputData.ArchitectureID
Public ReadOnly Property OvcHev As Boolean Implements IVehicleDeclarationInputData.OvcHev
@@ -943,42 +956,80 @@ end Property
Public ReadOnly Property IAxlesDeclarationInputData_XMLSource As XmlNode Implements IAxlesDeclarationInputData.XMLSource
End Class
+Public Class IEPCWrapper
+ Implements IIEPCEngineeringInputData
+
+ Private _vehicle As Vehicle
+
+ Public Sub New(vehicle As Vehicle)
+ _vehicle = vehicle
+ End Sub
+
+ Public ReadOnly Property DataSource As DataSource Implements IComponentInputData.DataSource
+ get
+ Dim retVal As DataSource = New DataSource()
+ retVal.SourceType = DataSourceType.JSONFile
+ retVal.SourceFile = _vehicle.IEPCFile.FullPath
+ Return retVal
+ End Get
+ End Property
+ Public ReadOnly Property SavedInDeclarationMode As Boolean Implements IComponentInputData.SavedInDeclarationMode
+ Public ReadOnly Property Manufacturer As String Implements IComponentInputData.Manufacturer
+ Public ReadOnly Property Model As String Implements IComponentInputData.Model
+ Public ReadOnly Property [Date] As Date Implements IComponentInputData.[Date]
+ Public ReadOnly Property AppVersion As String Implements IComponentInputData.AppVersion
+ Public ReadOnly Property CertificationMethod As CertificationMethod Implements IComponentInputData.CertificationMethod
+ Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber
+ Public ReadOnly Property DigestValue As DigestData Implements IComponentInputData.DigestValue
+ Public ReadOnly Property ElectricMachineType As ElectricMachineType Implements IIEPCDeclarationInputData.ElectricMachineType
+ Public ReadOnly Property R85RatedPower As Watt Implements IIEPCDeclarationInputData.R85RatedPower
+ Public ReadOnly Property Inertia As KilogramSquareMeter Implements IIEPCDeclarationInputData.Inertia
+ Public ReadOnly Property DifferentialIncluded As Boolean Implements IIEPCDeclarationInputData.DifferentialIncluded
+ Public ReadOnly Property DesignTypeWheelMotor As Boolean Implements IIEPCDeclarationInputData.DesignTypeWheelMotor
+ Public ReadOnly Property NrOfDesignTypeWheelMotorMeasured As Integer? Implements IIEPCDeclarationInputData.NrOfDesignTypeWheelMotorMeasured
+ Public ReadOnly Property Gears As IList(Of IGearEntry) Implements IIEPCDeclarationInputData.Gears
+ Public ReadOnly Property VoltageLevels As IList(Of IElectricMotorVoltageLevel) Implements IIEPCDeclarationInputData.VoltageLevels
+ Public ReadOnly Property DragCurves As IList(Of IDragCurve) Implements IIEPCDeclarationInputData.DragCurves
+ Public ReadOnly Property Conditioning As TableData Implements IIEPCDeclarationInputData.Conditioning
+ Public ReadOnly Property OverloadRecoveryFactor As Double Implements IIEPCEngineeringInputData.OverloadRecoveryFactor
+End Class
+
Public Class ElectricStorageSystemWrapper
- Implements IElectricStorageSystemEngineeringInputData
+ Implements IElectricStorageSystemEngineeringInputData
- Private _vehicle As Vehicle
+ Private _vehicle As Vehicle
- Public Sub New(vehicle As Vehicle)
- _vehicle = vehicle
- End Sub
+ Public Sub New(vehicle As Vehicle)
+ _vehicle = vehicle
+ End Sub
- Public ReadOnly Property ElectricStorageElements As IList(Of IElectricStorageDeclarationInputData) Implements IElectricStorageSystemDeclarationInputData.ElectricStorageElements
+ Public ReadOnly Property ElectricStorageElements As IList(Of IElectricStorageDeclarationInputData) Implements IElectricStorageSystemDeclarationInputData.ElectricStorageElements
get
return _vehicle.ReessPacks.Select(Function(x) new ElectricStorageWrapper(x, GetPath(_vehicle.FilePath))).Cast(of IElectricStorageDeclarationInputData) .toList()
End Get
- End Property
- Public ReadOnly Property IElectricStorageSystemEngineeringInputData_ElectricStorageElements As IList(Of IElectricStorageEngineeringInputData) Implements IElectricStorageSystemEngineeringInputData.ElectricStorageElements
+ End Property
+ Public ReadOnly Property IElectricStorageSystemEngineeringInputData_ElectricStorageElements As IList(Of IElectricStorageEngineeringInputData) Implements IElectricStorageSystemEngineeringInputData.ElectricStorageElements
get
- return _vehicle.ReessPacks.Select(Function(x) new ElectricStorageWrapper(x, GetPath(_vehicle.FilePath))).cast(of IElectricStorageEngineeringInputData).toList()
+ return _vehicle.ReessPacks.Select(Function(x) new ElectricStorageWrapper(x, GetPath(_vehicle.FilePath))).cast(of IElectricStorageEngineeringInputData).toList()
End Get
- End Property
+ End Property
End Class
Public Class ElectricStorageWrapper
Implements IElectricStorageEngineeringInputData, IBatteryPackEngineeringInputData
- Public Property BatteryFile As SubPath
+ Public Property BatteryFile As SubPath
- Public Sub New(veh As Tuple(Of String,Integer,Integer), filePath As String)
+ Public Sub New(veh As Tuple(Of String,Integer,Integer), filePath As String)
count = veh.Item2
StringId = veh.Item3
- BatteryFile = New SubPath
- BatteryFile.Init(filePath, veh.Item1)
+ BatteryFile = New SubPath
+ BatteryFile.Init(filePath, veh.Item1)
End Sub
- Public ReadOnly Property REESSPack As IREESSPackInputData Implements IElectricStorageEngineeringInputData.REESSPack
+ Public ReadOnly Property REESSPack As IREESSPackInputData Implements IElectricStorageEngineeringInputData.REESSPack
Get
Return Me
End Get
@@ -987,9 +1038,9 @@ Public Class ElectricStorageWrapper
Public ReadOnly Property Count As Integer Implements IElectricStorageEngineeringInputData.Count
- Public ReadOnly Property StringId As Integer Implements IElectricStorageDeclarationInputData.StringId
+ Public ReadOnly Property StringId As Integer Implements IElectricStorageDeclarationInputData.StringId
- Public ReadOnly Property DataSource As DataSource Implements IComponentInputData.DataSource
+ Public ReadOnly Property DataSource As DataSource Implements IComponentInputData.DataSource
Get
Dim retVal As DataSource = New DataSource()
retVal.SourceType = DataSourceType.JSONFile
@@ -1030,50 +1081,63 @@ Public Class ElectricMachinesWrapper
Public ReadOnly Property Entries As IList(Of ElectricMachineEntry(Of IElectricMotorDeclarationInputData)) Implements IElectricMachinesDeclarationInputData.Entries
Get
- Dim retval As IList(Of ElectricMachineEntry(Of IElectricMotorDeclarationInputData)) = New List(Of ElectricMachineEntry(Of IElectricMotorDeclarationInputData))(New ElectricMachineEntry(Of IElectricMotorDeclarationInputData)() {
- New ElectricMachineEntry(Of IElectricMotorDeclarationInputData) With {
+ Dim retval As IList(Of ElectricMachineEntry(Of IElectricMotorDeclarationInputData)) = New List(Of ElectricMachineEntry(Of IElectricMotorDeclarationInputData))
+ If (Vehicle.VehicleType = VectoSimulationJobType.BatteryElectricVehicle OrElse
+ Vehicle.VehicleType = VectoSimulationJobType.ParallelHybridVehicle OrElse
+ Vehicle.VehicleType = VectoSimulationJobType.SerialHybridVehicle OrElse
+ Vehicle.VehicleType = VectoSimulationJobType.IHPC) Then
+
+ retval.Add(New ElectricMachineEntry(Of IElectricMotorDeclarationInputData) With {
.ElectricMachine = new ElectricMachineWrapper(Vehicle.ElectricMotorFile),
- .MechanicalTransmissionEfficiency = If(IsNumeric(Vehicle.ElectricMotorMechLossMap.OriginalPath), Vehicle.ElectricMotorMechLossMap.OriginalPath.ToDouble(), double.NaN),
- .MechanicalTransmissionLossMap = If(IsNumeric(Vehicle.ElectricMotorMechLossMap.OriginalPath), Nothing, VectoCSVFile.Read(Vehicle.ElectricMotorMechLossMap.FullPath)),
- .Position = Vehicle.ElectricMotorPosition,
- .RatioADC = Vehicle.ElectricMotorRatio,
- .RatioPerGear = vehicle.ElectricMotorPerGearRatios,
- .Count = Vehicle.ElectricMotorCount}})
-
- if (Vehicle.VehicleType = VectoSimulationJobType.SerialHybridVehicle) Then
+ .MechanicalTransmissionEfficiency = If(IsNumeric(Vehicle.ElectricMotorMechLossMap.OriginalPath), Vehicle.ElectricMotorMechLossMap.OriginalPath.ToDouble(), double.NaN),
+ .MechanicalTransmissionLossMap = If(IsNumeric(Vehicle.ElectricMotorMechLossMap.OriginalPath), Nothing, VectoCSVFile.Read(Vehicle.ElectricMotorMechLossMap.FullPath)),
+ .Position = Vehicle.ElectricMotorPosition,
+ .RatioADC = Vehicle.ElectricMotorRatio,
+ .RatioPerGear = vehicle.ElectricMotorPerGearRatios,
+ .Count = Vehicle.ElectricMotorCount})
+ End If
+
+ if (Vehicle.VehicleType = VectoSimulationJobType.SerialHybridVehicle OrElse Vehicle.VehicleType = VectoSimulationJobType.IEPC_S) Then
retval.Add(New ElectricMachineEntry(Of IElectricMotorDeclarationInputData) With {
- .ElectricMachine = new ElectricMachineWrapper(Vehicle.GenSetEMFile),
- .MechanicalTransmissionEfficiency = If(IsNumeric(Vehicle.GenSetMechLossMap.OriginalPath), Vehicle.GenSetMechLossMap.OriginalPath.ToDouble(), double.NaN),
- .MechanicalTransmissionLossMap = If(IsNumeric(Vehicle.GenSetMechLossMap.OriginalPath), Nothing,VectoCSVFile.Read(Vehicle.GenSetMechLossMap.FullPath)),
- .Position = PowertrainPosition.GEN,
- .RatioADC = Vehicle.GenSetRatio,
- .Count = Vehicle.GenSetCount})
+ .ElectricMachine = new ElectricMachineWrapper(Vehicle.GenSetEMFile),
+ .MechanicalTransmissionEfficiency = If(IsNumeric(Vehicle.GenSetMechLossMap.OriginalPath), Vehicle.GenSetMechLossMap.OriginalPath.ToDouble(), double.NaN),
+ .MechanicalTransmissionLossMap = If(IsNumeric(Vehicle.GenSetMechLossMap.OriginalPath), Nothing,VectoCSVFile.Read(Vehicle.GenSetMechLossMap.FullPath)),
+ .Position = PowertrainPosition.GEN,
+ .RatioADC = Vehicle.GenSetRatio,
+ .Count = Vehicle.GenSetCount})
End If
Return retval
End Get
End Property
Public ReadOnly Property IElectricMachinesEngineeringInputData_Entries As IList(Of ElectricMachineEntry(Of IElectricMotorEngineeringInputData)) Implements IElectricMachinesEngineeringInputData.Entries
Get
- Dim retval As IList(Of ElectricMachineEntry(Of IElectricMotorEngineeringInputData)) = New List(Of ElectricMachineEntry(Of IElectricMotorEngineeringInputData))(New ElectricMachineEntry(Of IElectricMotorEngineeringInputData)() {
- New ElectricMachineEntry(Of IElectricMotorEngineeringInputData)() With {
+ Dim retval As IList(Of ElectricMachineEntry(Of IElectricMotorEngineeringInputData)) = New List(Of ElectricMachineEntry(Of IElectricMotorEngineeringInputData))
+
+ If (Vehicle.VehicleType = VectoSimulationJobType.BatteryElectricVehicle OrElse
+ Vehicle.VehicleType = VectoSimulationJobType.ParallelHybridVehicle OrElse
+ Vehicle.VehicleType = VectoSimulationJobType.SerialHybridVehicle OrElse
+ Vehicle.VehicleType = VectoSimulationJobType.IHPC) Then
+
+ retval.Add(New ElectricMachineEntry(Of IElectricMotorEngineeringInputData) With {
.ElectricMachine = new ElectricMachineWrapper(Vehicle.ElectricMotorFile),
- .MechanicalTransmissionEfficiency = If(IsNumeric(Vehicle.ElectricMotorMechLossMap.OriginalPath), Vehicle.ElectricMotorMechLossMap.OriginalPath.ToDouble(), double.NaN),
- .MechanicalTransmissionLossMap = If(IsNumeric(Vehicle.ElectricMotorMechLossMap.OriginalPath), Nothing, VectoCSVFile.Read(Vehicle.ElectricMotorMechLossMap.FullPath)),
- .Position = Vehicle.ElectricMotorPosition,
- .RatioADC = Vehicle.ElectricMotorRatio,
- .RatioPerGear = Vehicle.ElectricMotorPerGearRatios,
- .Count = Vehicle.ElectricMotorCount}})
-
- if (Vehicle.VehicleType = VectoSimulationJobType.SerialHybridVehicle) Then
- retval.Add(New ElectricMachineEntry(Of IElectricMotorEngineeringInputData) With {
- .ElectricMachine = new ElectricMachineWrapper(Vehicle.GenSetEMFile),
- .MechanicalTransmissionEfficiency = If(IsNumeric(Vehicle.GenSetMechLossMap.OriginalPath), Vehicle.GenSetMechLossMap.OriginalPath.ToDouble(), double.NaN),
- .MechanicalTransmissionLossMap = If(IsNumeric(Vehicle.GenSetMechLossMap.OriginalPath), Nothing,VectoCSVFile.Read(Vehicle.GenSetMechLossMap.FullPath)),
- .Position = PowertrainPosition.GEN,
- .RatioADC = Vehicle.GenSetRatio,
- .Count = Vehicle.GenSetCount})
- End If
- Return retval
+ .MechanicalTransmissionEfficiency = If(IsNumeric(Vehicle.ElectricMotorMechLossMap.OriginalPath), Vehicle.ElectricMotorMechLossMap.OriginalPath.ToDouble(), double.NaN),
+ .MechanicalTransmissionLossMap = If(IsNumeric(Vehicle.ElectricMotorMechLossMap.OriginalPath) OrElse String.IsNullOrWhiteSpace(Vehicle.ElectricMotorMechLossMap.OriginalPath), Nothing, VectoCSVFile.Read(Vehicle.ElectricMotorMechLossMap.FullPath)),
+ .Position = Vehicle.ElectricMotorPosition,
+ .RatioADC = Vehicle.ElectricMotorRatio,
+ .RatioPerGear = Vehicle.ElectricMotorPerGearRatios,
+ .Count = Vehicle.ElectricMotorCount})
+ End If
+
+ if (Vehicle.VehicleType = VectoSimulationJobType.SerialHybridVehicle OrElse Vehicle.VehicleType = VectoSimulationJobType.IEPC_S) Then
+ retval.Add(New ElectricMachineEntry(Of IElectricMotorEngineeringInputData) With {
+ .ElectricMachine = new ElectricMachineWrapper(Vehicle.GenSetEMFile),
+ .MechanicalTransmissionEfficiency = If(IsNumeric(Vehicle.GenSetMechLossMap.OriginalPath), Vehicle.GenSetMechLossMap.OriginalPath.ToDouble(), double.NaN),
+ .MechanicalTransmissionLossMap = If(IsNumeric(Vehicle.GenSetMechLossMap.OriginalPath), Nothing,VectoCSVFile.Read(Vehicle.GenSetMechLossMap.FullPath)),
+ .Position = PowertrainPosition.GEN,
+ .RatioADC = Vehicle.GenSetRatio,
+ .Count = Vehicle.GenSetCount})
+ End If
+ Return retval
End Get
End Property
@@ -1081,36 +1145,36 @@ Public Class ElectricMachinesWrapper
End Class
Public Class ElectricMachineWrapper
- Implements IElectricMotorEngineeringInputData
+ Implements IElectricMotorEngineeringInputData
- Private EMFile As SubPath
+ Private EMFile As SubPath
- Public Sub New(em As SubPath)
+ Public Sub New(em As SubPath)
EMFile = em
- End Sub
-
- Public ReadOnly Property DataSource As DataSource Implements IComponentInputData.DataSource
- Get
- Return New DataSource() With {
- .SourceFile = EMFile.FullPath}
- End Get
- End Property
- Public ReadOnly Property SavedInDeclarationMode As Boolean Implements IComponentInputData.SavedInDeclarationMode
- Public ReadOnly Property Manufacturer As String Implements IComponentInputData.Manufacturer
- Public ReadOnly Property Model As String Implements IComponentInputData.Model
- Public ReadOnly Property [Date] As Date Implements IComponentInputData.[Date]
- Public ReadOnly Property AppVersion As String Implements IComponentInputData.AppVersion
- Public ReadOnly Property CertificationMethod As CertificationMethod Implements IComponentInputData.CertificationMethod
- Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber
- Public ReadOnly Property DigestValue As DigestData Implements IComponentInputData.DigestValue
-
- Public ReadOnly Property VoltageLevels As IList(Of IElectricMotorVoltageLevel) Implements IElectricMotorDeclarationInputData.VoltageLevels
- Public ReadOnly Property ElectricMachineType As ElectricMachineType Implements IElectricMotorDeclarationInputData.ElectricMachineType
- Public ReadOnly Property R85RatedPower As Watt Implements IElectricMotorDeclarationInputData.R85RatedPower
- Public ReadOnly Property Inertia As KilogramSquareMeter Implements IElectricMotorDeclarationInputData.Inertia
- Public ReadOnly Property DcDcConverterIncluded As Boolean Implements IElectricMotorDeclarationInputData.DcDcConverterIncluded
- Public ReadOnly Property IHPCType As String Implements IElectricMotorDeclarationInputData.IHPCType
- Public ReadOnly Property DragCurve As TableData Implements IElectricMotorDeclarationInputData.DragCurve
- Public ReadOnly Property Conditioning As TableData Implements IElectricMotorDeclarationInputData.Conditioning
- Public ReadOnly Property OverloadRecoveryFactor As Double Implements IElectricMotorEngineeringInputData.OverloadRecoveryFactor
+ End Sub
+
+ Public ReadOnly Property DataSource As DataSource Implements IComponentInputData.DataSource
+ Get
+ Return New DataSource() With {
+ .SourceFile = EMFile.FullPath}
+ End Get
+ End Property
+ Public ReadOnly Property SavedInDeclarationMode As Boolean Implements IComponentInputData.SavedInDeclarationMode
+ Public ReadOnly Property Manufacturer As String Implements IComponentInputData.Manufacturer
+ Public ReadOnly Property Model As String Implements IComponentInputData.Model
+ Public ReadOnly Property [Date] As Date Implements IComponentInputData.[Date]
+ Public ReadOnly Property AppVersion As String Implements IComponentInputData.AppVersion
+ Public ReadOnly Property CertificationMethod As CertificationMethod Implements IComponentInputData.CertificationMethod
+ Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber
+ Public ReadOnly Property DigestValue As DigestData Implements IComponentInputData.DigestValue
+
+ Public ReadOnly Property VoltageLevels As IList(Of IElectricMotorVoltageLevel) Implements IElectricMotorDeclarationInputData.VoltageLevels
+ Public ReadOnly Property ElectricMachineType As ElectricMachineType Implements IElectricMotorDeclarationInputData.ElectricMachineType
+ Public ReadOnly Property R85RatedPower As Watt Implements IElectricMotorDeclarationInputData.R85RatedPower
+ Public ReadOnly Property Inertia As KilogramSquareMeter Implements IElectricMotorDeclarationInputData.Inertia
+ Public ReadOnly Property DcDcConverterIncluded As Boolean Implements IElectricMotorDeclarationInputData.DcDcConverterIncluded
+ Public ReadOnly Property IHPCType As String Implements IElectricMotorDeclarationInputData.IHPCType
+ Public ReadOnly Property DragCurve As TableData Implements IElectricMotorDeclarationInputData.DragCurve
+ Public ReadOnly Property Conditioning As TableData Implements IElectricMotorDeclarationInputData.Conditioning
+ Public ReadOnly Property OverloadRecoveryFactor As Double Implements IElectricMotorEngineeringInputData.OverloadRecoveryFactor
End Class
\ No newline at end of file
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 2cd9e5dd95e017288e988ad9b2fd1272f5d8a2c0..6bd526dd7fc91907657ecf8cea0abc5da978912a 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <OutputType>WinExe</OutputType>
- <StartupObject>Sub Main</StartupObject>
- <RootNamespace>TUGraz.VECTO</RootNamespace>
- <AssemblyName>VECTO</AssemblyName>
- <ApplicationIcon>Resources\Icon2.ico</ApplicationIcon>
- <OptionStrict>On</OptionStrict>
- <UseWindowsForms>true</UseWindowsForms>
- <MyType>WindowsForms</MyType>
+ <OutputType>WinExe</OutputType>
+ <StartupObject>Sub Main</StartupObject>
+ <RootNamespace>TUGraz.VECTO</RootNamespace>
+ <AssemblyName>VECTO</AssemblyName>
+ <ApplicationIcon>Resources\Icon2.ico</ApplicationIcon>
+ <OptionStrict>On</OptionStrict>
+ <UseWindowsForms>true</UseWindowsForms>
+ <MyType>WindowsForms</MyType>
<TargetFrameworks>net6.0-windows</TargetFrameworks>
- <TargetFrameworks Condition="'$(Configuration)' == 'Release'">net45;net48;net6.0-windows</TargetFrameworks>
- <TargetFrameworks Condition="'$(Configuration)' == 'Deploy'">net45;net48;net6.0-windows</TargetFrameworks>
+ <TargetFrameworks Condition="'$(Configuration)' == 'Release'">net45;net48;net6.0-windows</TargetFrameworks>
+ <TargetFrameworks Condition="'$(Configuration)' == 'Deploy'">net45;net48;net6.0-windows</TargetFrameworks>
<TargetFrameworks Condition="'$(Configuration)' == 'MockupDeploy'">net45;net48;net6.0-windows</TargetFrameworks>
- <DefineTrace>false</DefineTrace>
- <DefineConstants />
+ <DefineTrace>false</DefineTrace>
+ <DefineConstants />
<Configurations>Debug;Release;MockupDebug;MockupRelease</Configurations>
</PropertyGroup>
<!--Final Define Constants https://developercommunity.visualstudio.com/t/vbprojuser-defineconstants-dont-affect/865956-->
@@ -21,32 +21,40 @@
<FinalDefineConstants>$(FinalDefineConstants),MOCKUP</FinalDefineConstants>
<DefineConstants>$(DefineConstants),MOCKUP</DefineConstants>
</PropertyGroup>
+ <ItemGroup>
+ <None Remove="nlog.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="nlog.config">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
<ItemGroup>
- <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
- <PackageReference Include="NLog" Version="4.7.13" />
+ <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+ <PackageReference Include="NLog" Version="4.7.13" />
<PackageReference Include="Ninject" Version="3.3.6">
- <PrivateAssets>all</PrivateAssets>
- </PackageReference>
+ <PrivateAssets>all</PrivateAssets>
+ </PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
- <Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System.Windows.Forms.DataVisualization" />
+ <Reference Include="System.ComponentModel.DataAnnotations" />
+ <Reference Include="System.Windows.Forms.DataVisualization" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
- <Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System.Windows.Forms.DataVisualization" />
+ <Reference Include="System.ComponentModel.DataAnnotations" />
+ <Reference Include="System.Windows.Forms.DataVisualization" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
- <PackageReference Include="System.Data.SqlClient">
- <Version>4.8.3</Version>
- </PackageReference>
- <PackageReference Include="System.Windows.Forms.DataVisualization">
- <Version>1.0.0-prerelease.20110.1</Version>
- </PackageReference>
+ <PackageReference Include="System.Data.SqlClient">
+ <Version>4.8.3</Version>
+ </PackageReference>
+ <PackageReference Include="System.Windows.Forms.DataVisualization">
+ <Version>1.0.0-prerelease.20110.1</Version>
+ </PackageReference>
</ItemGroup>
<Choose>
@@ -63,60 +71,60 @@
</Choose>
<ItemGroup>
- <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj" />
- <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
+ <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj" />
+ <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
</ItemGroup>
<ItemGroup>
- <Import Include="Microsoft.VisualBasic" />
- <Import Include="System" />
- <Import Include="System.Collections" />
- <Import Include="System.Data" />
- <Import Include="System.Drawing" />
- <Import Include="System.Diagnostics" />
- <Import Include="System.Windows.Forms" />
+ <Import Include="Microsoft.VisualBasic" />
+ <Import Include="System" />
+ <Import Include="System.Collections" />
+ <Import Include="System.Data" />
+ <Import Include="System.Drawing" />
+ <Import Include="System.Diagnostics" />
+ <Import Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
- <Compile Update="My Project\Application.Designer.vb">
- <DesignTime>True</DesignTime>
- <AutoGen>True</AutoGen>
- <DependentUpon>Application.myapp</DependentUpon>
- </Compile>
- <Compile Update="My Project\Resources.Designer.vb">
- <DesignTime>True</DesignTime>
- <AutoGen>True</AutoGen>
- <DependentUpon>Resources.resx</DependentUpon>
- </Compile>
- <EmbeddedResource Update="My Project\Resources.resx">
- <CustomToolNamespace>My.Resources</CustomToolNamespace>
- <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.vb</LastGenOutput>
- </EmbeddedResource>
- <Compile Update="My Project\Settings.Designer.vb">
- <DesignTimeSharedInput>True</DesignTimeSharedInput>
- <AutoGen>True</AutoGen>
- <DependentUpon>Settings.settings</DependentUpon>
- </Compile>
- <None Update="My Project\Application.myapp">
- <Generator>MyApplicationCodeGenerator</Generator>
- <LastGenOutput>Application.Designer.vb</LastGenOutput>
- </None>
- <None Update="My Project\Settings.settings">
- <CustomToolNamespace>My</CustomToolNamespace>
- <Generator>SettingsSingleFileGenerator</Generator>
- <LastGenOutput>Settings.Designer.vb</LastGenOutput>
- </None>
+ <Compile Update="My Project\Application.Designer.vb">
+ <DesignTime>True</DesignTime>
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Application.myapp</DependentUpon>
+ </Compile>
+ <Compile Update="My Project\Resources.Designer.vb">
+ <DesignTime>True</DesignTime>
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <EmbeddedResource Update="My Project\Resources.resx">
+ <CustomToolNamespace>My.Resources</CustomToolNamespace>
+ <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+ </EmbeddedResource>
+ <Compile Update="My Project\Settings.Designer.vb">
+ <DesignTimeSharedInput>True</DesignTimeSharedInput>
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Settings.settings</DependentUpon>
+ </Compile>
+ <None Update="My Project\Application.myapp">
+ <Generator>MyApplicationCodeGenerator</Generator>
+ <LastGenOutput>Application.Designer.vb</LastGenOutput>
+ </None>
+ <None Update="My Project\Settings.settings">
+ <CustomToolNamespace>My</CustomToolNamespace>
+ <Generator>SettingsSingleFileGenerator</Generator>
+ <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+ </None>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Update="Resources\4x2r.png" />
- <EmbeddedResource Update="Resources\4x2rt.png" />
- <EmbeddedResource Update="Resources\4x2tt.png" />
- <EmbeddedResource Update="Resources\6x2r.png" />
- <EmbeddedResource Update="Resources\6x2rt.png" />
- <EmbeddedResource Update="Resources\6x2tt.png" />
- <EmbeddedResource Update="Resources\Undef.png" />
+ <EmbeddedResource Update="Resources\4x2r.png" />
+ <EmbeddedResource Update="Resources\4x2rt.png" />
+ <EmbeddedResource Update="Resources\4x2tt.png" />
+ <EmbeddedResource Update="Resources\6x2r.png" />
+ <EmbeddedResource Update="Resources\6x2rt.png" />
+ <EmbeddedResource Update="Resources\6x2tt.png" />
+ <EmbeddedResource Update="Resources\Undef.png" />
</ItemGroup>
diff --git a/VECTO/app.config b/VECTO/app.config
deleted file mode 100644
index 49b939ba25f80d51440ce081d6cee91c67bf198b..0000000000000000000000000000000000000000
--- a/VECTO/app.config
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <configSections>
- <section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog" />
- </configSections>
- <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd" autoReload="false" throwExceptions="false" internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
- <targets async="true">
- <target xsi:type="Console" name="ConsoleLogger" error="true" />
- <target name="GUILogger" xsi:type="MethodCall" className="TUGraz.VECTO.MainForm, VECTO" methodName="LogMethod">
- <parameter layout="${level}" />
- <parameter layout="${message}" />
- </target>
- <target xsi:type="File" name="LogFile" fileName="${basedir}/logs/log.txt" layout="${longdate} [${processid}:${threadid}@${machinename}] ${callsite:skipFrames=1} ${level:uppercase=true}: ${message} ${exception:format=tostring}" keepFileOpen="false" archiveFileName="${basedir}/logs/archive{#}.txt" maxArchiveFiles="1" archiveAboveSize="10000000" />
- </targets>
- <rules>
- <logger name="TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory" minlevel="Info" writeTo="LogFile" />
- <logger name="*" minlevel="Warn" writeTo="LogFile" />
- <logger name="*" minlevel="Warn" writeTo="GUILogger" />
- </rules>
- </nlog>
- <system.diagnostics>
- <sources>
- <source name="DefaultSource" switchName="DefaultSwitch">
- <listeners>
- <add name="FileLog" />
- </listeners>
- </source>
- </sources>
- <switches>
- <add name="DefaultSwitch" value="Information" />
- </switches>
- <sharedListeners>
- <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter" />
- </sharedListeners>
- </system.diagnostics>
-</configuration>
\ No newline at end of file
diff --git a/VECTO/nlog.config b/VECTO/nlog.config
new file mode 100644
index 0000000000000000000000000000000000000000..550e301d5814b8552ec48d779b4cb520ab24ad70
--- /dev/null
+++ b/VECTO/nlog.config
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd" autoReload="false" throwExceptions="false" internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
+ <targets async="true">
+ <target xsi:type="Console" name="ConsoleLogger" error="true" />
+ <target name="GUILogger" xsi:type="MethodCall" className="TUGraz.VECTO.MainForm, VECTO" methodName="LogMethod">
+ <parameter layout="${level}" />
+ <parameter layout="${message}" />
+ </target>
+ <target xsi:type="File" name="LogFile" fileName="${basedir}/logs/log.txt" layout="${longdate} [${processid}:${threadid}@${machinename}] ${callsite:skipFrames=1} ${level:uppercase=true}: ${message} ${exception:format=tostring}" keepFileOpen="false" archiveFileName="${basedir}/logs/archive{#}.txt" maxArchiveFiles="1" archiveAboveSize="10000000" />
+ </targets>
+ <rules>
+ <logger name="TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory" minlevel="Info" writeTo="LogFile" />
+ <logger name="*" minlevel="Warn" writeTo="LogFile" />
+ <logger name="*" minlevel="Warn" writeTo="GUILogger" />
+ </rules>
+</nlog>
\ No newline at end of file
diff --git a/VECTO3GUI2020/Helper/Converter/EnumConverter.cs b/VECTO3GUI2020/Helper/Converter/EnumConverter.cs
index 12dffc1f3c7d409f7f595d909feacf1f81361475..55f045ea57d1a8b72a43bd5cd7c8ff39faa06545 100644
--- a/VECTO3GUI2020/Helper/Converter/EnumConverter.cs
+++ b/VECTO3GUI2020/Helper/Converter/EnumConverter.cs
@@ -22,7 +22,7 @@ namespace VECTO3GUI2020.Helper.Converter
var attributes =
valueType.GetField(value.ToString())?.GetCustomAttributes( typeof(GuiLabelAttribute),false);
- if (!(attributes?.First() is GuiLabelAttribute attribute)) {
+ if (!(attributes?.FirstOrDefault() is GuiLabelAttribute attribute)) {
return value;
} else {
return attribute.Label;
diff --git a/VECTO3GUI2020/Ninject/MultiStageViewModelFactory.cs b/VECTO3GUI2020/Ninject/MultiStageViewModelFactory.cs
index e62c06a5ebf839b3b8b31c2cbd98f09f9e2c1887..5f2bc79206ae6517b0fede51ce06d44229bf42c1 100644
--- a/VECTO3GUI2020/Ninject/MultiStageViewModelFactory.cs
+++ b/VECTO3GUI2020/Ninject/MultiStageViewModelFactory.cs
@@ -37,7 +37,7 @@ namespace VECTO3GUI2020.Ninject
return _multiStageVmFactoryDefaultInstanceProvider.GetNewMultistageJobViewModel();
}
- public IMultiStageJobViewModel GetMultiStageJobViewModel(IMultistageBusInputDataProvider inputData)
+ public IMultiStageJobViewModel GetMultiStageJobViewModel(IMultistepBusInputDataProvider inputData)
{
return _multiStageVmFactoryDefaultInstanceProvider.GetMultiStageJobViewModel(inputData);
}
diff --git a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLBusAuxiliariesWriter.cs b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLBusAuxiliariesWriter.cs
index c82eeb18ee0659e36ad6c2d32647a6af35b0a092..d26aba13d57821cf8ebdb23559612c6f983273ab 100644
--- a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLBusAuxiliariesWriter.cs
+++ b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLBusAuxiliariesWriter.cs
@@ -64,7 +64,7 @@ namespace VECTO3GUI2020.Util.XML.Implementation.ComponentWriter
public override void Initialize()
{
- _defaultNamespace = XMLNamespaces.v2_10_2;
+ _defaultNamespace = XMLNamespaces.V24;
_xElement = new XElement(_defaultNamespace + XMLNames.Component_Auxiliaries);
}
@@ -127,7 +127,7 @@ namespace VECTO3GUI2020.Util.XML.Implementation.ComponentWriter
{
var dataElement = new XElement(_defaultNamespace + XMLNames.ComponentDataWrapper,
- new XAttribute("xmlns" , XMLNamespaces.v2_10_2),
+ new XAttribute("xmlns" , XMLNamespaces.V24),
new XAttribute(XMLNamespaces.Xsi + XMLNames.Attr_Type, "AUX_Conventional_CompletedBusType"));
if (_inputData.ElectricConsumers != null) {
diff --git a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
index 43fd5a161c5a9799b7a36a305ea0eb4b3db62720..d81f3a11e18dace97d64808396d94ff9e4287074 100644
--- a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
+++ b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
@@ -221,7 +221,7 @@ namespace VECTO3GUI2020.Util.XML.Implementation.ComponentWriter
protected override void Initialize()
{
- _defaultNamespace = XMLNamespaces.v2_10_2;
+ _defaultNamespace = XMLNamespaces.V24;
_Xelement = new XElement(XMLNamespaces.V20 + XMLNames.Component_Vehicle,
new XAttribute("xmlns", _defaultNamespace));
diff --git a/VECTO3GUI2020/Util/XML/XMLNamespaces.cs b/VECTO3GUI2020/Util/XML/XMLNamespaces.cs
index c0053b0d80b7d34c33c4a9dbcc7b337cacb49431..181aae8ba618131948b40b488ae1eda0fc85db39 100644
--- a/VECTO3GUI2020/Util/XML/XMLNamespaces.cs
+++ b/VECTO3GUI2020/Util/XML/XMLNamespaces.cs
@@ -9,14 +9,15 @@ namespace VECTO3GUI2020.Util.XML
public static XNamespace Xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
public static XNamespace Tns = "urn:tugraz:ivt:VectoAPI:DeclarationInput";
public static XNamespace Tns_v20 = Tns.NamespaceName + ":v2.0";
- public static XNamespace V26 = DeclarationDefinition + ":DEV:v2.6";
+ //public static XNamespace V26 = DeclarationDefinition + ":DEV:v2.6";
public static XNamespace V21 = DeclarationDefinition + ":v2.1";
- public static XNamespace V23 = DeclarationDefinition + ":DEV:v2.3";
+ public static XNamespace V23 = DeclarationDefinition + ":v2.3";
+ public static XNamespace V24 = DeclarationDefinition + ":v2.4";
public static XNamespace V20 = DeclarationDefinition + ":v2.0";
public static XNamespace V10 = DeclarationDefinition + ":v1.0";
- public static XNamespace V28 = DeclarationDefinition + ":DEV:v2.8";
- public static XNamespace v2_10_1 = DeclarationDefinition + ":DEV:v2.10.1";
- public static XNamespace v2_10_2 = DeclarationDefinition + ":DEV:v2.10.2";
+ //public static XNamespace V28 = DeclarationDefinition + ":DEV:v2.8";
+ //public static XNamespace v2_10_1 = DeclarationDefinition + ":DEV:v2.10.1";
+ //public static XNamespace v2_10_2 = DeclarationDefinition + ":DEV:v2.10.2";
public static XNamespace Di = "http://www.w3.org/2000/09/xmldsig#";
@@ -33,11 +34,9 @@ namespace VECTO3GUI2020.Util.XML
{ V20, "v2.0"},
{ V21, "v2.1"},
{ V23, "v2.3"},
- { V26, "v2.6"},
+ { V24, "v2.4"},
+ //{ V26, "v2.6"},
{ Di, "di"},
- { V28, "v2.8"},
- {v2_10_2, "v2.10.2"},
- {v2_10_1, "v2.10.1"}
};
public static string GetPrefix(XNamespace xNamespace)
diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj
index b523e4d257e31df28f70238e64d410a4c01dfa74..08d0db1538198c971ab86f06cb248334911b3c30 100644
--- a/VECTO3GUI2020/VECTO3GUI2020.csproj
+++ b/VECTO3GUI2020/VECTO3GUI2020.csproj
@@ -10,7 +10,7 @@
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
- <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
+ <TargetFrameworks>net6.0-windows</TargetFrameworks>
<DefineConstants />
<Configurations>Debug;Release;MockupDebug;MockupRelease</Configurations>
</PropertyGroup>
diff --git a/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
index 9a0ff1f658a87c85f29b4978059368189004bfd6..dc2588672303f90648884390115496406cbac799 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
@@ -284,7 +284,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation
var documentType = XMLHelper.GetDocumentType(xElement?.DocumentElement?.LocalName);
if (documentType == XmlDocumentType.MultistepOutputData)
{
- var inputDataProvider = _inputDataReader.Create(fileName) as IMultistageBusInputDataProvider;
+ var inputDataProvider = _inputDataReader.Create(fileName) as IMultistepBusInputDataProvider;
return Task.FromResult(_multiStageViewModelFactory.GetMultiStageJobViewModel(inputDataProvider) as IDocumentViewModel);
}
else if (documentType == XmlDocumentType.DeclarationJobData)
@@ -495,7 +495,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation
} else if (XMLNames.VectoOutputMultistep.Equals(rootNode,
StringComparison.InvariantCultureIgnoreCase)) {
using (var reader = XmlReader.Create(fullFileName)) {
- input = new XMLDeclarationVIFInputData(xmlReader.Create(fullFileName) as IMultistageBusInputDataProvider, null);
+ input = new XMLDeclarationVIFInputData(xmlReader.Create(fullFileName) as IMultistepBusInputDataProvider, null);
FileWriter = new FileOutputVIFWriter(fullFileName,
(jobEntry as MultiStageJobViewModel_v0_1).ManufacturingStages?.Count ?? 0);
}
@@ -518,7 +518,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation
}
var fileWriter = new FileOutputWriter(GetOutputDirectory(fullFileName));
- var runsFactory = _simFactoryFactory.Factory(mode, input, fileWriter, null, null, true);
+ var runsFactory = _simFactoryFactory.Factory(mode, input, fileWriter, null, null);
//var runsFactory = SimulatorFactory.CreateSimulatorFactory(mode, input, fileWriter);
runsFactory.WriteModalResults = Settings.Default.WriteModalResults;
runsFactory.ModalResults1Hz = Settings.Default.ModalResults1Hz;
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAirdragViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAirdragViewModel.cs
index 4811f904c9caae3c645ddd41de77239b8ac7e455..2f35a076f48168456ecb17a21432480b103abc58 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAirdragViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAirdragViewModel.cs
@@ -262,5 +262,6 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public SquareMeter TransferredAirDragArea => _airdragViewModel.TransferredAirDragArea;
public SquareMeter AirDragArea_0 => _airdragViewModel.AirDragArea_0;
+ public XmlNode XMLSource { get; }
}
}
\ No newline at end of file
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
index 9f5bacb56441b167e426742442b8c22618ec0129..250aff162fa57b7b9c5786b0ea6c1b47a7306bb2 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
@@ -31,7 +31,7 @@ using XmlDocumentType = TUGraz.VectoCore.Utils.XmlDocumentType;
namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
{
- public interface IMultiStageJobViewModel : IDeclarationMultistageJobInputData, IMultistageVIFInputData, IMultistageBusInputDataProvider, IJobViewModel, IEditViewModel
+ public interface IMultiStageJobViewModel : IDeclarationMultistageJobInputData, IMultistageVIFInputData, IMultistepBusInputDataProvider, IJobViewModel, IEditViewModel
{
IManufacturingStageViewModel ManufacturingStageViewModel { get; }
bool Exempted { get; }
@@ -66,7 +66,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
set => SetProperty(ref _manufacturingStageViewModel, value);
}
- public MultiStageJobViewModel_v0_1(IMultistageBusInputDataProvider inputData,
+ public MultiStageJobViewModel_v0_1(IMultistepBusInputDataProvider inputData,
IMultiStageViewModelFactory vmFactory,
IMultistageDependencies multistageDependencies,
IXMLInputDataReader inputDataReader,
@@ -203,7 +203,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
var inputData = new XMLDeclarationVIFInputData(vifData.MultistageJobInputData, vifData.VehicleInputData);
- var factory = _simFactoryFactory.Factory(ExecutionMode.Declaration, inputData, writer, null, null, false);
+ var factory = _simFactoryFactory.Factory(ExecutionMode.Declaration, inputData, writer, null, null);
//var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer);
FileHelper.CreateDirectory(outputFile);
@@ -311,7 +311,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
private readonly Lazy<IDialogHelper> _dialogHelper;
private readonly IMultistageDependencies _multistageDependencies;
private readonly DataSource _dataSource;
- private readonly IMultistageBusInputDataProvider _inputData;
+ private readonly IMultistepBusInputDataProvider _inputData;
private bool _selected;
private readonly bool _exempted;
private readonly IJobListViewModel _jobListViewModel;
@@ -363,7 +363,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public IVehicleDeclarationInputData VehicleInputData => _manufacturingStageViewModel.Vehicle;
- public IMultistageBusInputDataProvider MultistageJobInputData => this;
+ public IMultistepBusInputDataProvider MultistageJobInputData => this;
#endregion
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/NewMultiStageJobViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/NewMultiStageJobViewModel.cs
index b3bfb612b3134a43abc35ce54a3040a5330b73e0..6f7ae23bba1e830f892026f95f273a9a4117621c 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/NewMultiStageJobViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/NewMultiStageJobViewModel.cs
@@ -80,10 +80,10 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
{
return;
}
- IMultistageBusInputDataProvider inputDataProvider = null;
+ IMultistepBusInputDataProvider inputDataProvider = null;
try
{
- inputDataProvider = _inputDataReader.Create(fileName) as IMultistageBusInputDataProvider;
+ inputDataProvider = _inputDataReader.Create(fileName) as IMultistepBusInputDataProvider;
}
catch (Exception e)
{
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs
index 137647f0f4dd5a22a42c6fe95f3b6a44ba9ab15d..e1f80be5859f8fdff52d05419450357c00ebbbf7 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs
@@ -9,6 +9,7 @@ using System.Xml.Linq;
using Microsoft.Toolkit.Mvvm.Input;
using Ninject;
using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCore.InputData.FileIO.XML;
using TUGraz.VectoCore.Utils;
using VECTO3GUI2020.Helper;
@@ -183,8 +184,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
var xElement = vehicleWriter.GetElement();
- var xDoc = xElement.CreateWrapperDocument(XMLNamespaces.v2_10_2);
- Debug.WriteLine(xElement.CreateWrapperDocument(XMLNamespaces.v2_10_2).ToString());
+ var xDoc = xElement.CreateWrapperDocument(XMLNamespaces.V24);
+ Debug.WriteLine(xElement.CreateWrapperDocument(XMLNamespaces.V24).ToString());
var valid = false;
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultiStageViewModelFactory.cs b/VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultiStageViewModelFactory.cs
index 33cad2ad89c2b53d96dc056a0e7dad2cd348717b..cc48e57667c98b9967de9e5c78e3e4843781fc5b 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultiStageViewModelFactory.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultiStageViewModelFactory.cs
@@ -43,7 +43,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Interfaces
IDocumentViewModel GetStageInputViewModel(bool exemptedVehicle);
IViewModelBase GetNewMultistageJobViewModel();
- IMultiStageJobViewModel GetMultiStageJobViewModel(IMultistageBusInputDataProvider inputData);
+ IMultiStageJobViewModel GetMultiStageJobViewModel(IMultistepBusInputDataProvider inputData);
IVehicleViewModel GetInterimStageVehicleViewModel();
diff --git a/Vecto3GUI2020Test/ViewModelTests/ExemptedTests.cs b/Vecto3GUI2020Test/ViewModelTests/ExemptedTests.cs
index 9cf11d8a5ce7b1c78f7bb2b29ce035c9733b078c..6eb5103bdf51a8728ac17f4c40f1ed8250a8cce6 100644
--- a/Vecto3GUI2020Test/ViewModelTests/ExemptedTests.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/ExemptedTests.cs
@@ -146,7 +146,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
Assert.AreEqual(2, jobListVm.Jobs.Count);
Assert.AreEqual(result, jobListVm.Jobs[1].DataSource.SourceFile);
- var inputDataProvider = _testHelper.GetInputDataProvider(result) as IMultistageBusInputDataProvider;
+ var inputDataProvider = _testHelper.GetInputDataProvider(result) as IMultistepBusInputDataProvider;
Assert.NotNull(inputDataProvider);
//Check added Manufacturing Stage
diff --git a/VectoCommon/VectoCommon/Hashing/VectoComponents.cs b/VectoCommon/VectoCommon/Hashing/VectoComponents.cs
index b97727778b32ecf03505bd77a671827ecd9b4e65..abc1aff1bff0d2c00922031823c6e5201b15d235 100644
--- a/VectoCommon/VectoCommon/Hashing/VectoComponents.cs
+++ b/VectoCommon/VectoCommon/Hashing/VectoComponents.cs
@@ -45,9 +45,10 @@ namespace TUGraz.VectoCommon.Hashing
Airdrag,
Tyre,
Vehicle,
- VectoOutput,
+ VectoManufacturerReport,
VectoCustomerInformation,
VectoPrimaryVehicleInformation,
+ VectoInterimVehicleInformation,
VectoManufacturingStep,
BatterySystem,
CapacitorSystem,
@@ -81,7 +82,7 @@ namespace TUGraz.VectoCommon.Hashing
return XMLNames.AxleWheels_Axles_Axle_Tyre;
case VectoComponents.Vehicle:
return XMLNames.Component_Vehicle;
- case VectoComponents.VectoOutput:
+ case VectoComponents.VectoManufacturerReport:
return "VectoOutput";
case VectoComponents.VectoCustomerInformation:
return "VectoCustomerInformation";
@@ -127,12 +128,14 @@ namespace TUGraz.VectoCommon.Hashing
return "AD-";
case VectoComponents.Tyre:
return "TYRE-";
- case VectoComponents.VectoOutput:
- return "RESULT-";
+ case VectoComponents.VectoManufacturerReport:
+ return "MRF-";
case VectoComponents.VectoCustomerInformation:
- return "COC-";
+ return "CIF-";
case VectoComponents.VectoPrimaryVehicleInformation:
- return "PIF-";
+ return "VIF_P-";
+ case VectoComponents.VectoInterimVehicleInformation:
+ return "VIF_I-";
case VectoComponents.Vehicle:
return "VEH-";
case VectoComponents.VectoManufacturingStep:
@@ -160,7 +163,7 @@ namespace TUGraz.VectoCommon.Hashing
{
switch (component) {
case VectoComponents.VectoCustomerInformation:
- case VectoComponents.VectoOutput:
+ case VectoComponents.VectoManufacturerReport:
case VectoComponents.VectoPrimaryVehicleInformation:
case VectoComponents.VectoManufacturingStep:
return true;
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 022b8d05700a90e499d944baad3e623f5c9331a1..44075f8968e8be775fd651352b21af050d0b6794 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -402,6 +402,9 @@ namespace TUGraz.VectoCommon.InputData
SquareMeter TransferredAirDragArea { get; } // P246
SquareMeter AirDragArea_0 { get; } // P245
+
+ XmlNode XMLSource { get; }
+
}
public interface IRetarderInputData : IComponentInputData
@@ -911,14 +914,6 @@ namespace TUGraz.VectoCommon.InputData
TableData MaxCurrentMap { get; }
}
- public static class BatteryHelper
- {
- public static AmpereSecond TotalUsableCapacityInSimulation(this IBatteryPackDeclarationInputData batteryData)
- {
- return batteryData.Capacity;
- }
- }
-
public interface ISuperCapDeclarationInputData : IREESSPackInputData
{
Farad Capacity { get; }
@@ -1091,7 +1086,7 @@ namespace TUGraz.VectoCommon.InputData
Kilogram TotalVehicleMass { get; }
Kilogram Payload { get; }
double PassengerCount { get; }
- string FuelMode { get; }
+ //string FuelMode { get; }
}
diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
index cf22747ae4f9c6c49c51144aab4d1303f6de176f..b12f1342cf53d306f9708d67b8904231ce8ed4be 100644
--- a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
@@ -59,6 +59,9 @@ namespace TUGraz.VectoCommon.InputData
SerialHybridVehicle,
BatteryElectricVehicle,
EngineOnlySimulation,
+ IEPC_E,
+ IEPC_S,
+ IHPC
}
public interface IHybridStrategyParameters
@@ -161,6 +164,8 @@ namespace TUGraz.VectoCommon.InputData
IElectricStorageSystemEngineeringInputData ElectricStorage { get; }
IElectricMachinesEngineeringInputData ElectricMachines { get; }
+
+ IIEPCEngineeringInputData IEPCEngineeringInputData { get; }
}
public interface IAxlesEngineeringInputData
@@ -484,6 +489,12 @@ namespace TUGraz.VectoCommon.InputData
new IList<ElectricMachineEntry<IElectricMotorEngineeringInputData>> Entries { get; }
}
+
+ public interface IIEPCEngineeringInputData : IIEPCDeclarationInputData
+ {
+ double OverloadRecoveryFactor { get; }
+ }
+
public interface IElectricStorageEngineeringInputData : IElectricStorageDeclarationInputData
{
diff --git a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
index e22dcc4707a8abb1b4b75140946d9b213d832b25..96a6089f3b762cabfed412fcba165038f3cc98cc 100644
--- a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
+++ b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
@@ -89,7 +89,7 @@ namespace TUGraz.VectoCommon.InputData
- public interface IMultistageBusInputDataProvider : IDeclarationInputDataProvider
+ public interface IMultistepBusInputDataProvider : IDeclarationInputDataProvider
{
new IDeclarationMultistageJobInputData JobInputData { get; }
}
@@ -124,7 +124,7 @@ namespace TUGraz.VectoCommon.InputData
public interface IMultistageVIFInputData : IInputDataProvider
{
IVehicleDeclarationInputData VehicleInputData { get; }
- IMultistageBusInputDataProvider MultistageJobInputData { get; }
+ IMultistepBusInputDataProvider MultistageJobInputData { get; }
}
}
diff --git a/VectoCommon/VectoCommon/Models/AxleConfiguration.cs b/VectoCommon/VectoCommon/Models/AxleConfiguration.cs
index 4de78fb9e5c0fc74022b08068081c649fd80653b..fb5868430d7314ed29c02530a03ee33a53bf51e8 100644
--- a/VectoCommon/VectoCommon/Models/AxleConfiguration.cs
+++ b/VectoCommon/VectoCommon/Models/AxleConfiguration.cs
@@ -31,6 +31,7 @@
using System;
using System.Diagnostics.CodeAnalysis;
+using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCommon.Models
@@ -73,6 +74,20 @@ namespace TUGraz.VectoCommon.Models
throw new ArgumentOutOfRangeException("self", self, null);
}
}
+
+ public static string ToXMLFormat(this AxleType self)
+ {
+ switch (self) {
+ case AxleType.VehicleDriven:
+ return "VehicleDriven";
+ case AxleType.VehicleNonDriven:
+ return "VehicleNonDriven";
+ case AxleType.Trailer:
+ return "Trailer";
+ default:
+ throw new ArgumentOutOfRangeException(nameof(self), self, null);
+ }
+ }
}
public static class AxleConfigurationHelper
diff --git a/VectoCommon/VectoCommon/Models/GearboxType.cs b/VectoCommon/VectoCommon/Models/GearboxType.cs
index d5c29e4951b12de86a2cc8e7beee76c12eb8a026..dd7b6a8524f5e4e6df4531c04e49292e26dbd829 100644
--- a/VectoCommon/VectoCommon/Models/GearboxType.cs
+++ b/VectoCommon/VectoCommon/Models/GearboxType.cs
@@ -42,6 +42,8 @@ namespace TUGraz.VectoCommon.Models
ATSerial, // Automatic Transmission
ATPowerSplit,
APTN, // Automatic Power Transmission - No Torque Converter
+ IHPC, // Integrated Hybrid Powertrain Component - Transmission part
+ IEPC, // not a real gearbox type, only used for GUI and validation
DrivingCycle,
NoGearbox
}
@@ -56,6 +58,8 @@ namespace TUGraz.VectoCommon.Models
case GearboxType.ATSerial: return "Automatic Transmission - Serial (AT-S)"; //todo mk20211210 shouldn't we call it APT-S?
case GearboxType.ATPowerSplit: return "Automatic Transmission - PowerSplit (AT-P)";//todo mk20211210 shouldn't we call it APT-P?
case GearboxType.APTN: return "Automatic Transmission - No Torque Converter (APT-N)";
+ case GearboxType.IHPC: return "IHPC Transmission";
+ case GearboxType.IEPC: return "IEPC Transmission - dummy entry";
case GearboxType.DrivingCycle: return "Gear from Driving Cycle";
default: throw new ArgumentOutOfRangeException("GearboxType", type, null);
}
@@ -66,7 +70,7 @@ namespace TUGraz.VectoCommon.Models
[DebuggerStepThrough]
public static bool AutomaticTransmission(this GearboxType type) =>
- type == GearboxType.ATPowerSplit || type == GearboxType.ATSerial || type == GearboxType.APTN;
+ type == GearboxType.ATPowerSplit || type == GearboxType.ATSerial || type == GearboxType.APTN || type == GearboxType.IHPC;
[DebuggerStepThrough]
public static bool ManualTransmission(this GearboxType type) =>
@@ -90,6 +94,7 @@ namespace TUGraz.VectoCommon.Models
case GearboxType.ATSerial: return "APT-S";
case GearboxType.ATPowerSplit: return "APT-P";
case GearboxType.APTN: return "APT-N";
+ case GearboxType.IHPC: return "IHPC Type 1";
default: throw new ArgumentOutOfRangeException("GearboxType", type, null);
}
}
diff --git a/VectoCommon/VectoCommon/Models/PowertrainPosition.cs b/VectoCommon/VectoCommon/Models/PowertrainPosition.cs
index 8d49ab81e57d9c3d779149ef4ad6079e148017b3..14e902d6fdd8d86bec173eb323edb11bad15d25f 100644
--- a/VectoCommon/VectoCommon/Models/PowertrainPosition.cs
+++ b/VectoCommon/VectoCommon/Models/PowertrainPosition.cs
@@ -18,35 +18,47 @@ namespace TUGraz.VectoCommon.InputData {
BatteryElectricE4,
BatteryElectricE3,
BatteryElectricE2,
+ IEPC,
+ IHPC
}
public static class PowertrainPositionHelper
{
public const string HybridPrefix = "Hybrid";
- public const string BatteryElectriPrefix = "BatteryElectric";
+ public const string BatteryElectricPrefix = "BatteryElectric";
- public static PowertrainPosition Parse(string pos)
+ public static PowertrainPosition Parse(string prefix, string pos)
{
- if (pos.EndsWith(nameof(PowertrainPosition.GEN))) {
+ if (pos.Equals(nameof(PowertrainPosition.GEN))) {
return PowertrainPosition.GEN;
}
-
- if (pos.StartsWith("P",StringComparison.InvariantCultureIgnoreCase)) {
- return (HybridPrefix + pos).Replace(".", "_").ParseEnum<PowertrainPosition>();
+ if (pos.Equals(nameof(PowertrainPosition.IHPC), StringComparison.InvariantCultureIgnoreCase)) {
+ return PowertrainPosition.IHPC;
}
- if (pos.StartsWith("B", StringComparison.InvariantCultureIgnoreCase)) {
- return (BatteryElectriPrefix + pos.Replace("B", "E")).ParseEnum<PowertrainPosition>();
+ if (prefix.Equals("P", StringComparison.InvariantCultureIgnoreCase)) {
+ return (HybridPrefix + prefix + pos).Replace(".", "_").ParseEnum<PowertrainPosition>();
}
- if (pos.StartsWith("E", StringComparison.InvariantCultureIgnoreCase)) {
- return (BatteryElectriPrefix + pos).ParseEnum<PowertrainPosition>();
+
+ if (prefix.Equals("B", StringComparison.InvariantCultureIgnoreCase) || prefix.Equals("E", StringComparison.InvariantCultureIgnoreCase)) {
+ return (BatteryElectricPrefix + (prefix + pos).Replace("B", "E")).ParseEnum<PowertrainPosition>();
}
+
throw new VectoException("invalid powertrain position {0}", pos);
}
+ public static PowertrainPosition Parse(string pos)
+ {
+ if (pos.Length > 1 && pos[0].IsOneOf('B', 'P', 'E')) {
+ return Parse(pos.Substring(0, 1), pos.Substring(1));
+ }
+
+ return Parse("", pos);
+ }
+
public static string GetName(this PowertrainPosition pos)
{
- return pos.ToString().Replace(HybridPrefix, "").Replace(BatteryElectriPrefix, "").Replace("_", ".");
+ return pos.ToString().Replace(HybridPrefix, "").Replace(BatteryElectricPrefix, "").Replace("_", ".");
}
public static string GetLabel(this PowertrainPosition pos)
@@ -63,7 +75,7 @@ namespace TUGraz.VectoCommon.InputData {
case PowertrainPosition.GEN:
return nameof(PowertrainPosition.GEN);
}
- return pos.ToString().Replace(BatteryElectriPrefix, "").Replace("B", "E");
+ return pos.ToString().Replace(BatteryElectricPrefix, "").Replace("B", "E");
}
public static bool IsBatteryElectric(this PowertrainPosition pos)
@@ -72,6 +84,7 @@ namespace TUGraz.VectoCommon.InputData {
case PowertrainPosition.BatteryElectricE2:
case PowertrainPosition.BatteryElectricE3:
case PowertrainPosition.BatteryElectricE4:
+ case PowertrainPosition.IEPC:
return true;
default:
return false;
@@ -117,7 +130,7 @@ namespace TUGraz.VectoCommon.InputData {
private static string GetPositionWithoutPrefix(string position)
{
- return position.Replace(BatteryElectriPrefix, "").Replace("E", "").Replace(HybridPrefix, "").Replace("P", "")
+ return position.Replace(BatteryElectricPrefix, "").Replace("E", "").Replace(HybridPrefix, "").Replace("P", "")
.Replace("_", ".");
}
public static bool IsSerialHybrid(this PowertrainPosition pos)
diff --git a/VectoCommon/VectoCommon/Models/VehicleClass.cs b/VectoCommon/VectoCommon/Models/VehicleClass.cs
index c135b4322d99548aef6eeddc93f5d5f18f52a896..5ae14c8a307325fe92c70e6279599070543b5e54 100644
--- a/VectoCommon/VectoCommon/Models/VehicleClass.cs
+++ b/VectoCommon/VectoCommon/Models/VehicleClass.cs
@@ -170,7 +170,7 @@ namespace TUGraz.VectoCommon.Models
public static string GetClassNumber(this VehicleClass hdvClass)
{
- return hdvClass == VehicleClass.Unknown ? "-" : hdvClass.ToString().Substring(Prefix.Length);
+ return hdvClass == VehicleClass.Unknown ? "-" : hdvClass.ToString().Substring(Prefix.Length).Replace('_', '/');
}
public static bool IsMediumLorry(this VehicleClass vehicleClass)
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index 180b235fdd5015b93e202d690161c78e0b3838c5..5bd99a03692d08fe4b511aec8593a07feeb8bce3 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -1068,6 +1068,15 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Clutch.
+ /// </summary>
+ public static string BusAux_Clutch {
+ get {
+ return ResourceManager.GetString("BusAux_Clutch", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to ElectricSystem.
/// </summary>
@@ -2463,6 +2472,15 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to gear.
+ /// </summary>
+ public static string ElectricMachine_P2_5GearRatios_Gear_Attr {
+ get {
+ return ResourceManager.GetString("ElectricMachine_P2_5GearRatios_Gear_Attr", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Position.
/// </summary>
@@ -3337,20 +3355,20 @@ namespace TUGraz.VectoCommon.Resources {
}
/// <summary>
- /// Looks up a localized string similar to ManufacturerAddressCompletedVehicle.
+ /// Looks up a localized string similar to ManufacturerAddress.
/// </summary>
- public static string ManufacturerAddressCompletedVehicle {
+ public static string ManufacturerAddress {
get {
- return ResourceManager.GetString("ManufacturerAddressCompletedVehicle", resourceCulture);
+ return ResourceManager.GetString("ManufacturerAddress", resourceCulture);
}
}
/// <summary>
- /// Looks up a localized string similar to ManufacturerAddressPrimaryVehicle.
+ /// Looks up a localized string similar to ManufacturerAddressCompletedVehicle.
/// </summary>
- public static string ManufacturerAddressPrimaryVehicle {
+ public static string ManufacturerAddressCompletedVehicle {
get {
- return ResourceManager.GetString("ManufacturerAddressPrimaryVehicle", resourceCulture);
+ return ResourceManager.GetString("ManufacturerAddressCompletedVehicle", resourceCulture);
}
}
@@ -3939,6 +3957,15 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to ManufacturerRecordSignature.
+ /// </summary>
+ public static string Report_ManufacturerRecord_Signature {
+ get {
+ return ResourceManager.GetString("Report_ManufacturerRecord_Signature", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to EnergyConsumption.
/// </summary>
@@ -4317,6 +4344,15 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to PrimaryVehicleSubgroup.
+ /// </summary>
+ public static string Report_Results_PrimaryVehicleSubgroup {
+ get {
+ return ResourceManager.GetString("Report_Results_PrimaryVehicleSubgroup", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Summary.
/// </summary>
@@ -5648,5 +5684,14 @@ namespace TUGraz.VectoCommon.Resources {
return ResourceManager.GetString("XMLManufacturerReport_torqueLimitPercent", resourceCulture);
}
}
+
+ /// <summary>
+ /// Looks up a localized string similar to type.
+ /// </summary>
+ public static string XSIType {
+ get {
+ return ResourceManager.GetString("XSIType", resourceCulture);
+ }
+ }
}
}
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 47a8c6793dbd9d0194cabd814ccb2c9c7eb89077..ff407bcb2eded8fd0f5b522dbd028acbb08f1435 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1020,6 +1020,9 @@
<data name="Report_ResultData_Signature" xml:space="preserve">
<value>ResultDataSignature</value>
</data>
+ <data name="Report_ManufacturerRecord_Signature" xml:space="preserve">
+ <value>ManufacturerRecordSignature</value>
+ </data>
<data name="Report_Result_Payload" xml:space="preserve">
<value>Payload</value>
</data>
@@ -1149,8 +1152,8 @@
<data name="Engine_WHRCorrectionFactors_Electrical" xml:space="preserve">
<value>Electrical</value>
</data>
- <data name="ManufacturerAddressPrimaryVehicle" xml:space="preserve">
- <value>ManufacturerAddressPrimaryVehicle</value>
+ <data name="ManufacturerAddress" xml:space="preserve">
+ <value>ManufacturerAddress</value>
</data>
<data name="Engine_WHRCorrectionFactors_Mechanical" xml:space="preserve">
<value>Mechanical</value>
@@ -1980,4 +1983,16 @@
<data name="CIF_OutputDataType_Exempted_CompletedBusOutputType" xml:space="preserve">
<value>Exempted_CompletedBusOutputType</value>
</data>
+<data name="BusAux_Clutch" xml:space="preserve">
+ <value>Clutch</value>
+</data>
+<data name="ElectricMachine_P2_5GearRatios_Gear_Attr" xml:space="preserve">
+ <value>gear</value>
+</data>
+<data name="XSIType" xml:space="preserve">
+ <value>type</value>
+</data>
+<data name="Report_Results_PrimaryVehicleSubgroup" xml:space="preserve">
+ <value>PrimaryVehicleSubgroup</value>
+</data>
</root>
\ No newline at end of file
diff --git a/VectoCommon/VectoCommon/Utils/SI.cs b/VectoCommon/VectoCommon/Utils/SI.cs
index 38faea4cd4c9fa93298d6e4a2515ecc1ee710fca..1557949c4a2a338c3a579e26440b098e62d4f589 100644
--- a/VectoCommon/VectoCommon/Utils/SI.cs
+++ b/VectoCommon/VectoCommon/Utils/SI.cs
@@ -850,7 +850,7 @@ namespace TUGraz.VectoCommon.Utils
/// <summary>
/// SI Class for one per second [1/s].
/// </summary>
- [DebuggerDisplay("{Val.ToString(\"F1\"),nq} [rad/s] ({AsRPM.ToString(\"F1\"),nq} [rpm)")]
+ [DebuggerDisplay("{Val.ToString(\"F1\"),nq} [rad/s] ({AsRPM.ToString(\"F1\"),nq} [rpm])")]
public class PerSecond : SIBase<PerSecond>
{
private static readonly int[] Units = { 0, 0, -1, 0, 0, 0, 0 };
@@ -864,14 +864,36 @@ namespace TUGraz.VectoCommon.Utils
return SIBase<PerSquareSecond>.Create(perSecond.Val / second.Value());
}
+ public static PerMeter operator /(PerSecond perSecond, MeterPerSecond second)
+ {
+ return SIBase<PerMeter>.Create(perSecond.Val / second.Value());
+ }
+
public static MeterPerSecond operator *(PerSecond perSecond, Meter meter)
{
return SIBase<MeterPerSecond>.Create(perSecond.Val * meter.Value());
}
-
+
public double AsRPM => Val * 60 / (2 * Math.PI);
}
+ /// <summary>
+ /// SI Class for one per meter [1/m].
+ /// </summary>
+ [DebuggerDisplay("{Val.ToString(\"F1\"),nq} [1/m]")]
+ public class PerMeter : SIBase<PerMeter>
+ {
+ private static readonly int[] Units = { 0, -1, 0, 0, 0, 0, 0 };
+
+ [DebuggerHidden]
+ private PerMeter(double val) : base(val, Units) { }
+
+ public static PerSecond operator *(PerMeter perMeter, MeterPerSecond meterPerSecond) =>
+ SIBase<PerSecond>.Create(perMeter.Val * meterPerSecond.Value());
+
+ public static PerSecond operator *(MeterPerSecond meterPerSecond, PerMeter perMeter) => perMeter * meterPerSecond;
+ }
+
/// <summary>
/// SI Class for Meter per second [m/s].
/// </summary>
@@ -1143,6 +1165,8 @@ namespace TUGraz.VectoCommon.Utils
private Ohm(double val) : base(val, Units) { }
public override string UnitString => "Ω";
+
+ public double AsMilliOhm => Val * 1000;
}
public class Farad : SIBase<Farad>
diff --git a/VectoCommon/VectoCommon/Utils/SIUtils.cs b/VectoCommon/VectoCommon/Utils/SIUtils.cs
index 993a93f9096b9f653229155ec3b4e0ef3aa02c67..e0d3190b8bd0b479070a0c1d848bc1ad56330d1a 100644
--- a/VectoCommon/VectoCommon/Utils/SIUtils.cs
+++ b/VectoCommon/VectoCommon/Utils/SIUtils.cs
@@ -285,6 +285,21 @@ namespace TUGraz.VectoCommon.Utils
}
}
+ /// <summary>
+ /// [m]
+ /// </summary>
+ public UnitInstance Ohm {
+ get {
+ var reciprocAndExponent = _reciproc * _exponent;
+ _units[0] += 1 * reciprocAndExponent;
+ _units[1] += 2 * reciprocAndExponent;
+ _units[2] -= 3 * reciprocAndExponent;
+ _units[3] -= 2 * reciprocAndExponent;
+
+ return this;
+ }
+ }
+
/// <summary>
/// Defines the denominator by the terms following after the Per.
/// </summary>
diff --git a/VectoCommon/VectoCommon/Utils/StringExtensionMethods.cs b/VectoCommon/VectoCommon/Utils/StringExtensionMethods.cs
index ba437ff526a43c7efc30a04d8e85013edf665e33..189d426e3798592ca3645e0ddc7b08dce578dc2f 100644
--- a/VectoCommon/VectoCommon/Utils/StringExtensionMethods.cs
+++ b/VectoCommon/VectoCommon/Utils/StringExtensionMethods.cs
@@ -54,14 +54,17 @@ namespace TUGraz.VectoCommon.Utils
throw new FormatException("Cannot convert an empty string to a number.");
}
- try {
- return double.Parse(self, CultureInfo.InvariantCulture);
- } catch (FormatException) {
- if (defaultValue.HasValue) {
- return defaultValue.Value;
- }
- throw;
+ var success = double.TryParse(self, NumberStyles.Float, CultureInfo.InvariantCulture, out var retVal);
+ if (success) {
+ return retVal;
+ }
+
+ if (defaultValue.HasValue) {
+ return defaultValue.Value;
}
+
+ // throws an exception
+ return double.Parse(self, CultureInfo.InvariantCulture);
}
public static int ToInt(this string self, int? defaultValue = null)
diff --git a/VectoCommon/VectoHashing/VectoHash.cs b/VectoCommon/VectoHashing/VectoHash.cs
index 9b0c9c6b1dc05bf9e4b6365afefb1d9c1c30c3a0..e389713ead82e7ce606c8408d317dce0eadf9f68 100644
--- a/VectoCommon/VectoHashing/VectoHash.cs
+++ b/VectoCommon/VectoHashing/VectoHash.cs
@@ -288,7 +288,7 @@ namespace TUGraz.VectoHashing
return components.First();
}
if (Document.DocumentElement.LocalName.Equals("VectoOutput")) {
- return VectoComponents.VectoOutput;
+ return VectoComponents.VectoManufacturerReport;
}
if (Document.DocumentElement.LocalName.Equals("VectoCustomerInformation")) {
return VectoComponents.VectoCustomerInformation;
diff --git a/VectoCommon/VectoHashingTest/VectoHashTest.cs b/VectoCommon/VectoHashingTest/VectoHashTest.cs
index af3457ba5635fa09e1b1dc0874efb977a037c7ed..066dd767fe7b54c637f338699e8c86fe7efb892c 100644
--- a/VectoCommon/VectoHashingTest/VectoHashTest.cs
+++ b/VectoCommon/VectoHashingTest/VectoHashTest.cs
@@ -640,7 +640,7 @@ namespace VectoHashingTest
var reader = XmlReader.Create(file);
- var vif = xmlInputReader.CreateDeclaration(reader) as IMultistageBusInputDataProvider;
+ var vif = xmlInputReader.CreateDeclaration(reader) as IMultistepBusInputDataProvider;
var inputDataProvider = new XMLDeclarationVIFInputData(vif, null);
diff --git a/VectoConsole/Program.cs b/VectoConsole/Program.cs
index 2f43f120b314381f5ed3bc70fd4479f1ffc5d7f2..a3b973cece77d621addb072cb06f3f486f5814a8 100644
--- a/VectoConsole/Program.cs
+++ b/VectoConsole/Program.cs
@@ -236,7 +236,7 @@ Examples:
}
fileWriter = new FileOutputWriter(file);
- var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(mode, dataProvider, fileWriter, null, null, true);
+ var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(mode, dataProvider, fileWriter, null, null);
//var runsFactory = SimulatorFactory.CreateSimulatorFactory(mode, dataProvider, fileWriter);
runsFactory.ModalResults1Hz = args.Contains("-1Hz");
runsFactory.WriteModalResults = args.Contains("-mod");
diff --git a/VectoCore/VectoCore/Configuration/Constants.cs b/VectoCore/VectoCore/Configuration/Constants.cs
index f704edb773ff567b4066696aecb160a93fe1c676..f4df273aa7cda478f3b1c98790a79b1406fb74c0 100644
--- a/VectoCore/VectoCore/Configuration/Constants.cs
+++ b/VectoCore/VectoCore/Configuration/Constants.cs
@@ -254,6 +254,8 @@ namespace TUGraz.VectoCore.Configuration
public const string HybridStrategyParameters = ".vhctl";
public const string Json = ".json";
+
+ public const string IEPCDataFile = ".viepc";
}
public static class SimulationSettings
@@ -280,6 +282,11 @@ namespace TUGraz.VectoCore.Configuration
public static readonly Meter BrakeNextTargetDistance = 2.5.SI<Meter>();
+ /// <summary>
+ /// used in DriverModeBrake to detect if a vehicle is already below the speed of the brake trigger.
+ /// </summary>
+ public static readonly MeterPerSecond BrakeTriggerSpeedTolerance = 0.1.KMPHtoMeterPerSecond();
+
public static readonly MeterPerSecond MinVelocityForCoast = 5.KMPHtoMeterPerSecond();
/// <summary>
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
index 6fd637d21c13dfa1ea909c0d20a1b793f11ff6f0..a0c64f7b78d7da6b595177cad441f46b60fcc9f8 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
@@ -69,7 +69,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
private IBatteryPackEngineeringInputData Battery;
private IElectricMotorEngineeringInputData ElectricMotor;
private IBusAuxiliariesEngineeringData BusAux;
-
+ private IIEPCEngineeringInputData IEPCData;
public JSONComponentInputData(string filename, IJSONVehicleComponents job, bool tolerateMissing = false)
{
@@ -101,6 +101,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
case ".vaux":
tmp = JSONInputDataFactory.ReadEngineeringBusAuxiliaries(filename, tolerateMissing);
break;
+ case Constants.FileExtensions.IEPCDataFile:
+ tmp = JSONInputDataFactory.ReadIEPCEngineeringInputData(filename, tolerateMissing);
+ break;
}
if(tmp is IVehicleEngineeringInputData x1) VehicleData = x1;
@@ -119,6 +122,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
if(tmp is IElectricMotorEngineeringInputData x14) ElectricMotor = x14;
if(tmp is IHybridStrategyParameters x15) HybridStrategyParameters = x15;
if(tmp is IBusAuxiliariesEngineeringData x16) BusAux = x16;
+ if (tmp is IIEPCEngineeringInputData x17) IEPCData = x17;
_filename = filename;
}
@@ -217,7 +221,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
});
} }
- public IIEPCDeclarationInputData IEPC => null;
+ public IIEPCEngineeringInputData IEPCEngineeringInputData => IEPCData;
+
+ public IIEPCDeclarationInputData IEPC => IEPCData;
IElectricStorageSystemDeclarationInputData IVehicleComponentsDeclaration.ElectricStorage =>
new JSONElectricStorageSystemEngineeringInputData(new List<IElectricStorageEngineeringInputData>() {
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONIEPCData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONIEPCData.cs
new file mode 100644
index 0000000000000000000000000000000000000000..2e4141fa84e66eeaf16eeb5e11204704caec5854
--- /dev/null
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONIEPCData.cs
@@ -0,0 +1,157 @@
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.Impl;
+using TUGraz.VectoCore.Configuration;
+
+namespace TUGraz.VectoCore.InputData.FileIO.JSON
+{
+ public class JSONIEPCData : JSONFile, IIEPCEngineeringInputData
+ {
+ private readonly JObject _header;
+
+ public JSONIEPCData(JObject data, string filename, bool tolerateMissing = false)
+ : base(data, filename, tolerateMissing)
+ {
+ _header = (JObject)data.GetEx(JsonKeys.JsonHeader);
+ }
+
+ #region Overrides of JSONFile
+
+ public override string AppVersion => _header.GetEx<string>(JsonKeys.AppVersion);
+
+ #endregion
+
+ #region Implementation of IComponentInputData
+
+ public string Manufacturer => Constants.NOT_AVAILABLE;
+ public string Model => Body.GetEx<string>(JsonKeys.Component_Model);
+
+ public DateTime Date => DateTime.MinValue;
+
+ public CertificationMethod CertificationMethod => CertificationMethod.NotCertified;
+ public string CertificationNumber => Constants.NOT_AVAILABLE;
+ public DigestData DigestValue => null;
+
+ #endregion
+
+ #region Implementation of IIEPCDeclarationInputData
+
+ public ElectricMachineType ElectricMachineType { get; }
+ public Watt R85RatedPower => null;
+ public KilogramSquareMeter Inertia => Body.GetEx<double>(JsonKeys.IEPC_Inertia).SI<KilogramSquareMeter>();
+ public bool DifferentialIncluded => Body.GetEx<bool>(JsonKeys.IEPC_DifferentialIncluded);
+ public bool DesignTypeWheelMotor => Body.GetEx<bool>(JsonKeys.IEPC_DesignTypeWheelMotor);
+ public int? NrOfDesignTypeWheelMotorMeasured => Body.GetEx<int?>(JsonKeys.IEPC_NrOfDesignTypeWheelMotorMeasured);
+ public IList<IGearEntry> Gears => ReadGearEntries(Body[JsonKeys.Gearbox_Gears ]);
+ public IList<IElectricMotorVoltageLevel> VoltageLevels => ReadVoltageLevel(Body[JsonKeys.IEPC_VoltageLevels]);
+ public IList<IDragCurve> DragCurves => ReadDragCurve(Body[JsonKeys.IEPC_DragCurves]);
+ public TableData Conditioning => null;
+
+ #endregion
+
+ #region Implementation of IIEPCEngineeringInputData
+
+ public double OverloadRecoveryFactor => Body.GetEx<double>(JsonKeys.IEPC_ThermalOverloadRecoveryFactor);
+
+ #endregion
+
+
+ protected virtual IList<IGearEntry> ReadGearEntries(JToken gears)
+ {
+ var gearData = new List<IGearEntry>();
+ var gearNumber = 1;
+ foreach (var gear in gears) {
+ gearData.Add(new GearEntry {
+ GearNumber = gearNumber,
+ Ratio = gear.GetEx<double>(JsonKeys.Gearbox_Gear_Ratio),
+ MaxOutputShaftTorque = gear[JsonKeys.Gearbox_Gear_MaxOutShaftTorque] == null ? null : gear.GetEx<double>(JsonKeys.Gearbox_Gear_MaxOutShaftTorque).SI<NewtonMeter>(),
+ MaxOutputShaftSpeed = gear[JsonKeys.Gearbox_Gear_MaxOutShaftSpeed] == null ? null : gear.GetEx<double>(JsonKeys.Gearbox_Gear_MaxOutShaftSpeed).SI<PerSecond>()
+ });
+
+ gearNumber++;
+ }
+ return gearData;
+ }
+
+ protected virtual IList<IElectricMotorVoltageLevel> ReadVoltageLevel(JToken voltageLevels)
+ {
+ var voltageLevelData = new List<IElectricMotorVoltageLevel>();
+ foreach (var voltageLevel in voltageLevels) {
+ voltageLevelData.Add(new ElectricMotorVoltageLevel {
+
+ VoltageLevel = voltageLevel.GetEx<double>(JsonKeys.IEPC_Voltage).SI<Volt>(),
+ ContinuousTorque = voltageLevel.GetEx<double>(JsonKeys.IEPC_ContinuousTorque).SI<NewtonMeter>(),
+ ContinuousTorqueSpeed = voltageLevel.GetEx<double>(JsonKeys.IEPC_ContinuousTorqueSpeed).RPMtoRad(),
+ OverloadTorque = voltageLevel.GetEx<double>(JsonKeys.IEPC_OverloadTorque).SI<NewtonMeter>(),
+ OverloadTestSpeed = voltageLevel.GetEx<double>(JsonKeys.IEPC_OverloadTorqueSpeed).RPMtoRad(),
+ OverloadTime = voltageLevel.GetValueOrDefault<double>(JsonKeys.IEPC_OverloadTime)?.SI<Second>() ?? 0.SI<Second>(),
+ FullLoadCurve = ReadTableData(voltageLevel.GetEx<string>(JsonKeys.IEPC_FullLoadCurve), "ElectricMotor FullLoadCurve"),
+ PowerMap = ReadPowerMap(voltageLevel[JsonKeys.IEPC_PowerMaps])
+ });
+ }
+
+ return voltageLevelData;
+ }
+
+ protected virtual IList<IElectricMotorPowerMap> ReadPowerMap(JToken powerMapEntry)
+ {
+ var powerMaps = new List<IElectricMotorPowerMap>();
+
+ foreach (var powerMap in powerMapEntry) {
+ var key = ((JProperty)powerMap).Name;
+ var value = ((JProperty)powerMap).Value.Value<string>();
+
+ powerMaps.Add(new JSONElectricMotorPowerMap {
+ Gear = Convert.ToInt32(key),
+ PowerMap = ReadTableData(value, "ElectricMotor Power Map")
+ });
+ }
+
+ return powerMaps;
+ }
+
+ protected virtual IList<IDragCurve> ReadDragCurve(JToken dragCurveEntry)
+ {
+ var dragCurves = new List<IDragCurve>();
+
+ foreach (var dragCurve in dragCurveEntry) {
+
+ var key = ((JProperty)dragCurve).Name;
+ var value = ((JProperty)dragCurve).Value.Value<string>();
+
+ dragCurves.Add(new DragCurveEntry {
+ Gear = Convert.ToInt32(key),
+ DragCurve = ReadTableData(value, "ElectricMotor Drag Curve")
+ });
+ }
+
+ return dragCurves;
+ }
+ }
+
+ public class GearEntry : IGearEntry
+ {
+ #region Implementation of IGearEntry
+
+ public int GearNumber { get; internal set; }
+ public double Ratio { get; internal set; }
+ public NewtonMeter MaxOutputShaftTorque { get; internal set; }
+ public PerSecond MaxOutputShaftSpeed { get; internal set; }
+
+ #endregion
+ }
+
+ public class DragCurveEntry : IDragCurve
+ {
+ #region Implementation of IDragCurve
+
+ public int? Gear { get; internal set; }
+ public TableData DragCurve { get; internal set; }
+
+ #endregion
+ }
+}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index 04cea2dbe10bc3be121b9974b9f191feb0bc4d7a..cb1d9668c0c121abf7171690cccda88dea71c927 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -836,7 +836,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
TotalVehicleMass = (node.SelectSingleNode($"./*[local-name()='{XMLNames.Report_ResultEntry_TotalVehicleMass}']")?.InnerText.ToDouble() ?? 0).SI<Kilogram>(),
Payload = (node.SelectSingleNode($"./*[local-name()='{XMLNames.Report_Result_Payload}']")?.InnerText.ToDouble() ?? 0).SI<Kilogram>(),
PassengerCount = node.SelectSingleNode($"./*[local-name()='{XMLNames.Bus_PassengerCount}']")?.InnerText.ToDouble() ?? 0,
- FuelMode = "" //node.SelectSingleNode($"./*[local-name()='{XMLNames.Report_Result_FuelMode}']").InnerText
+ //FuelMode = "" //node.SelectSingleNode($"./*[local-name()='{XMLNames.Report_Result_FuelMode}']").InnerText
};
}
@@ -1012,7 +1012,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
// --------------------------
- public class JSONInputDataCompletedBusFactorMethodV7 : JSONFile, IDeclarationInputDataProvider, IDeclarationJobInputData
+ public class JSONInputDataCompletedBusFactorMethodV7 : JSONFile, IMultistageVIFInputData //, IDeclarationInputDataProvider, IDeclarationJobInputData
{
private readonly IXMLInputDataReader _xmlInputReader;
protected internal string PrimaryInputDataFile;
@@ -1027,12 +1027,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
PrimaryInputDataFile = Path.Combine(BasePath, Body.GetEx<string>("PrimaryVehicleResults"));
CompletedInputDataFile = Path.Combine(BasePath, Body.GetEx<string>("CompletedVehicle"));
- //PrimaryVehicle = CreateReader(primaryInputData);
+ //PrimaryVehicle = CreateReader(primaryInputData);
- Vehicle = _xmlInputReader.CreateDeclaration(CompletedInputDataFile).JobInputData.Vehicle;
- PrimaryVehicleData = (_xmlInputReader.Create(PrimaryInputDataFile) as IPrimaryVehicleInformationInputDataProvider);
- JobName = Vehicle.VIN;
- }
+ Vehicle = _xmlInputReader.CreateDeclaration(CompletedInputDataFile).JobInputData.Vehicle;
+ PrimaryVehicleData = (_xmlInputReader.Create(PrimaryInputDataFile) as IMultistepBusInputDataProvider);
+ //JobName = Vehicle.VIN;
+ }
//private IDeclarationInputDataProvider CreateReader(string vehicleFileName)
@@ -1048,22 +1048,29 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public override bool SavedInDeclarationMode => true;
- #endregion
+ #endregion
- #region Implementation of IDeclarationInputDataProvider
+ //#region Implementation of IDeclarationInputDataProvider
- public IDeclarationJobInputData JobInputData => this;
- public IPrimaryVehicleInformationInputDataProvider PrimaryVehicleData { get; }
- public XElement XMLHash { get; }
+ //public IDeclarationJobInputData JobInputData => this;
+ public IMultistepBusInputDataProvider PrimaryVehicleData { get; }
+ //public XElement XMLHash { get; }
- #endregion
+ //#endregion
- #region Implementation of IDeclarationJobInputData
+ //#region Implementation of IDeclarationJobInputData
- public IVehicleDeclarationInputData Vehicle { get; }
- public string JobName { get; }
-
- public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
+ public IVehicleDeclarationInputData Vehicle { get; }
+ //public string JobName { get; }
+
+ //public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
+
+ //#endregion
+
+ #region Implementation of IMultistageVIFInputData
+
+ public IVehicleDeclarationInputData VehicleInputData => Vehicle;
+ public IMultistepBusInputDataProvider MultistageJobInputData => PrimaryVehicleData;
#endregion
}
@@ -1142,7 +1149,48 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
// --------------------------
- public class JSONInputDataV10_PrimaryAndStageInputBus : JSONFile, IInputDataProvider, IMultistagePrimaryAndStageInputDataProvider
+ public class JSONInputDataV12_IEPC : AbstractJSONInputData
+ {
+ public JSONInputDataV12_IEPC(JObject data, string filename, bool tolerateMissing = false) : base(data, filename,
+ tolerateMissing)
+ {
+ VehicleData = ReadVehicle();
+ if (Body[JsonKeys.Vehicle_EngineFile] != null) {
+ Engine = ReadEngine();
+ }
+
+ if (Body[JsonKeys.Vehicle_GearboxFile] != null && !string.IsNullOrWhiteSpace(Body[JsonKeys.Vehicle_GearboxFile].Value<string>())) {
+ //AxleGear = ReadGearbox() as IAxleGearInputData;
+ Gearbox = ReadGearbox(); // gearbox is not used, but required by GUI
+ AxleGear = Gearbox as IAxleGearInputData;
+ }
+ }
+
+ public override IGearshiftEngineeringInputData GearshiftInputData =>
+ Body["TCU"] == null
+ ? null
+ : JSONInputDataFactory.ReadShiftParameters(Path.Combine(BasePath, Body.GetEx<string>("TCU")), false);
+
+ public override IHybridStrategyParameters HybridStrategyParameters =>
+ Body["HybridStrategyParams"] == null
+ ? null : JSONInputDataFactory.ReadHybridStrategyParameters(
+ Path.Combine(BasePath, Body.GetEx<string>("HybridStrategyParams")), false);
+
+ public override VectoSimulationJobType JobType => VehicleData.VehicleType;
+ }
+
+ // --------------------------
+
+ public class JSONInputDataV13_IHPC : JSONInputDataV8_ParallelHybrid
+ {
+ public JSONInputDataV13_IHPC(JObject data, string filename, bool tolerateMissing = false) : base(data, filename, tolerateMissing) { }
+
+ public override VectoSimulationJobType JobType => VectoSimulationJobType.IHPC;
+ }
+
+ // --------------------------
+
+ public class JSONInputDataV10_PrimaryAndStageInputBus : JSONFile, IInputDataProvider, IMultistagePrimaryAndStageInputDataProvider
{
private readonly IXMLInputDataReader _xmlInputReader;
private readonly string _primaryVehicleInputDataPath;
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
index ee7398b57abf412bcfeeb3f1c0b1b05d693b87a0..950eb28af3d32daa64c3e718325d869e968974de 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
@@ -106,6 +106,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
return new JSONInputDataV10_PrimaryAndStageInputBus(json, filename, tolerateMissing);
case 11:
return new JSONInputDataV11_SerialHybrid(json, filename, tolerateMissing);
+ case 12:
+ return new JSONInputDataV12_IEPC(json, filename, tolerateMissing);
+ case 13:
+ return new JSONInputDataV13_IHPC(json, filename, tolerateMissing);
default:
throw new VectoException("Job-File: Unsupported FileVersion. Got: {0} ", version);
}
@@ -124,6 +128,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
return new JSONVehicleDataV9(json, filename, job, tolerateMissing);
case 10:
return new JSONVehicleDataV10_HEV_BEV(json, filename, job, tolerateMissing);
+ case 11:
+ return new JSONVehicleDataV11_IEPC(json, filename, job, tolerateMissing);
default:
throw new VectoException("Vehicle-File: Unsupported FileVersion. Got {0}", version);
}
@@ -239,5 +245,32 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
throw new VectoException("Engineering BusAuxiliaries: Unsupported FileVersion. Got {0}", version);
}
}
+
+ public static IIEPCEngineeringInputData ReadIEPCEngineeringInputData(string filename,
+ bool tolerateMissing = false)
+ {
+ var json = ReadFile(filename);
+ var version = ReadVersion(json);
+ switch (version) {
+ case 1:
+ return new JSONIEPCData(json, filename, tolerateMissing);
+ default:
+ throw new VectoException("Engineering IEPC: Unsupported FileVersion. Got {0}", version);
+ }
+ }
+
+ public static IElectricMotorEngineeringInputData ReadIHPCEngineeringInputData(string filename,
+ bool tolerateMissing = false)
+ {
+ var json = ReadFile(filename);
+ var version = ReadVersion(json);
+ switch (version)
+ {
+ case 5:
+ return ReadElectricMotorData(filename, tolerateMissing);
+ default:
+ throw new VectoException("Engineering IHPC: Unsupported FileVersion. Got {0}", version);
+ }
+ }
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index ab4a8346d27230cd87b6a35e5b3861afafe71d4f..82a85abcf19d72a5322e68dd3b8c4f71c6472bab 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -47,6 +47,25 @@ using TUGraz.VectoCore.Models.SimulationComponent.Impl;
namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
+ public class JSONVehicleDataV11_IEPC : JSONVehicleDataV10_HEV_BEV
+ {
+ public JSONVehicleDataV11_IEPC(JObject data, string fileName, IJSONVehicleComponents job, bool tolerateMissing = false) :
+ base(data, fileName, job, tolerateMissing)
+ { }
+
+ public override IIEPCEngineeringInputData IEPCEngineeringInputData => JSONInputDataFactory.ReadIEPCEngineeringInputData(
+ Path.Combine(BasePath, Body.GetEx<string>("IEPC")), false);
+
+ public override IIEPCDeclarationInputData IEPC => JSONInputDataFactory.ReadIEPCEngineeringInputData(
+ Path.Combine(BasePath, Body.GetEx<string>("IEPC")), false);
+
+ #region Overrides of JSONVehicleDataV10_HEV_BEV
+
+ public override TableData BoostingLimitations => null;
+
+ #endregion
+ }
+
public class JSONVehicleDataV10_HEV_BEV : JSONVehicleDataV9
{
private JSONElectricStorageSystemEngineeringInputData _batteries;
@@ -79,6 +98,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
case "ParallelHybrid": return VectoSimulationJobType.ParallelHybridVehicle;
case "BatteryElectric": return VectoSimulationJobType.BatteryElectricVehicle;
case "SerialHybrid": return VectoSimulationJobType.SerialHybridVehicle;
+ case "IEPC_E":
+ case "IEPC": return VectoSimulationJobType.IEPC_E;
+ case "IEPC_S":
+ case "IEPC-S": return VectoSimulationJobType.IEPC_S;
+ case "IHPC": return VectoSimulationJobType.IHPC;
default: throw new VectoException("Invalid parameter value {0}", Body.GetEx<String>("PowertrainConfiguration"));
}
}
@@ -102,7 +126,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
"EM ADC LossMap")
: null,
Count = entry.GetEx<int>("Count"),
- ElectricMachine =
+ ElectricMachine =
JSONInputDataFactory.ReadElectricMotorData(
Path.Combine(BasePath, entry.GetEx<string>("MotorFile")), false)
};
@@ -119,9 +143,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
switch (VehicleType) {
case VectoSimulationJobType.BatteryElectricVehicle:
+ case VectoSimulationJobType.IEPC_E:
return _adasInputData = new JSONADASInputDataV10BEV(this);
case VectoSimulationJobType.ParallelHybridVehicle:
+ case VectoSimulationJobType.IHPC:
case VectoSimulationJobType.SerialHybridVehicle:
+ case VectoSimulationJobType.IEPC_S:
return _adasInputData = new JSONADASInputDataV10HEV(this);
default:
return base.GetADS();
@@ -436,7 +463,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
IElectricMachinesEngineeringInputData IVehicleComponentsEngineering.ElectricMachines => GetElectricMachines();
- public IIEPCDeclarationInputData IEPC => null;
+ public virtual IIEPCEngineeringInputData IEPCEngineeringInputData => null;
+ public virtual IIEPCDeclarationInputData IEPC => null;
protected virtual IElectricMachinesEngineeringInputData GetElectricMachines()
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Common/AbstractXMLType.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Common/AbstractXMLType.cs
index a4c38f960ef474cdf54032b579a02c0b1a333960..aaf93c05a5982a2877a06e26a5f7036468896ed3 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Common/AbstractXMLType.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Common/AbstractXMLType.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using System;
using System.Collections.Generic;
using System.Xml;
using TUGraz.VectoCommon.Exceptions;
@@ -136,12 +137,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Common {
protected virtual TableData ReadTableData(string baseElement, string entryElement, Dictionary<string, string> mapping)
{
- var entries = BaseNode.SelectNodes(
- XMLHelper.QueryLocalName(baseElement, entryElement));
- if (entries != null && entries.Count > 0) {
- return XMLHelper.ReadTableData(mapping, entries);
+ try {
+ var entries = BaseNode.SelectNodes(XMLHelper.QueryLocalName(baseElement, entryElement));
+ if (entries != null && entries.Count > 0) {
+ return XMLHelper.ReadTableData(mapping, entries);
+ }
+ } catch (NullReferenceException) {
+ throw new VectoException($"Could not find element: {baseElement} {entryElement}");
}
-
return null;
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
index 277ad4e1446343776bd1bb6ec090b71605d8694e..95db59ab682dadd3fb90828a3f7238ee15fb403e 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
@@ -38,7 +38,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get
{
return GetNodes(new[] { "SteeringPump", XMLNames.Auxiliaries_Auxiliary_Technology })
- .Cast<XmlNode>().Select(x => x.InnerText).ToList();
+ .Cast<XmlNode>().OrderBy(x => x.Attributes.GetNamedItem("axleNumber").InnerText.ToInt())
+ .Select(x => x.InnerText).ToList();
}
}
@@ -290,6 +291,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public override string Clutch => null;
public override double Ratio => double.NaN;
+
+ #region Overrides of AbstractXMLDeclarationPrimaryBusAuxiliariesDataProviderV24
+
+ public override ConsumerTechnology AdBlueDosing => ConsumerTechnology.Unknown;
+
+ #endregion
}
// ---------------------------------------------------------------------------------------
@@ -314,20 +321,42 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public override string Clutch => null;
public override double Ratio => double.NaN;
+
+
+ public override ConsumerTechnology AdBlueDosing => ConsumerTechnology.Unknown;
+
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+
+ public class XMLPrimaryBusAuxiliaries_Conventional_DataProviderV01 : AbstractXMLDeclarationPrimaryBusAuxiliariesDataProviderV24
+ {
+ public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public const string XSD_TYPE = "AUX_Conventional_PrimaryBusType";
+
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLPrimaryBusAuxiliaries_Conventional_DataProviderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile)
+ : base(componentNode) { }
+
+
+ public override XmlNode XMLSource => BaseNode;
}
// ---------------------------------------------------------------------------------------
- public class XMLDeclarationPrimaryBusAuxiliariesDataProviderV01 : AbstractXMLDeclarationPrimaryBusAuxiliariesDataProviderV24
+ public class XMLPrimaryBusAuxiliaries_HEV_P_DataProviderV01 : AbstractXMLDeclarationPrimaryBusAuxiliariesDataProviderV24
{
public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
- public const string XSD_TYPE = "AuxiliaryDataVIFType";
+ public const string XSD_TYPE = "AUX_HEV-P_PrimaryBusType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
- public XMLDeclarationPrimaryBusAuxiliariesDataProviderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile)
+ public XMLPrimaryBusAuxiliaries_HEV_P_DataProviderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile)
: base(componentNode) { }
@@ -337,6 +366,86 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
// ---------------------------------------------------------------------------------------
+ public class XMLPrimaryBusAuxiliaries_HEV_S_DataProviderV01 : AbstractXMLDeclarationPrimaryBusAuxiliariesDataProviderV24
+ {
+ public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public const string XSD_TYPE = "AUX_HEV-S_PrimaryBusType";
+
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLPrimaryBusAuxiliaries_HEV_S_DataProviderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile)
+ : base(componentNode) { }
+
+
+ public override XmlNode XMLSource => BaseNode;
+
+ #region Overrides of AbstractXMLDeclarationPrimaryBusAuxiliariesDataProviderV24
+
+ public override bool SmartAirCompression => false;
+
+ #endregion
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+
+ public class XMLPrimaryBusAuxiliaries_PEV_DataProviderV01 : AbstractXMLDeclarationPrimaryBusAuxiliariesDataProviderV24
+ {
+ public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public const string XSD_TYPE = "AUX_PEV_PrimaryBusType";
+
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLPrimaryBusAuxiliaries_PEV_DataProviderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile)
+ : base(componentNode) { }
+
+
+ public override XmlNode XMLSource => BaseNode;
+
+ #region Overrides of AbstractXMLDeclarationPrimaryBusAuxiliariesDataProviderV24
+
+ public override string FanTechnology => null;
+
+ public override bool SmartAirCompression => false;
+
+ public override bool EngineWasteGasHeatExchanger => false;
+
+ #endregion
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+
+ public class XMLPrimaryBusAuxiliaries_IEPC_DataProviderV01 : AbstractXMLDeclarationPrimaryBusAuxiliariesDataProviderV24
+ {
+ public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public const string XSD_TYPE = "AUX_IEPC_PrimaryBusType";
+
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLPrimaryBusAuxiliaries_IEPC_DataProviderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile)
+ : base(componentNode) { }
+
+
+ public override XmlNode XMLSource => BaseNode;
+
+ #region Overrides of AbstractXMLDeclarationPrimaryBusAuxiliariesDataProviderV24
+
+ public override string FanTechnology => null;
+
+ public override bool SmartAirCompression => false;
+
+ public override bool EngineWasteGasHeatExchanger => false;
+
+ #endregion
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+
public class XMLDeclarationCompletedBusAuxiliariesDataProviderV24 : AbstractXMLDeclarationPrimaryBusAuxiliariesDataProviderV24, IElectricConsumersDeclarationData
{
public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
index f5779e14bd6cd7ce87af32454bb0484abbaecefa..42cc0ea13bf82f23cfa0037dc7639c1fe3e5fa75 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
@@ -191,37 +191,178 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData => null;
- #region Overrides of XMLDeclarationComponentsDataProviderV10
+ public override IBusAuxiliariesDeclarationData BusAuxiliaries =>
+ _busAuxiliaries ?? (_busAuxiliaries = ComponentReader.BusAuxiliariesInputData);
- public override IAngledriveInputData AngledriveInputData =>
- ElementExists(XMLNames.Component_Angledrive) ? base.AngledriveInputData : null;
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
+ }
- public override IRetarderInputData RetarderInputData =>
- ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null;
+ // ---------------------------------------------------------------------------------------
+
+
+ public class XMLDeclarationComponentsMultistagePrimaryVehicleBus_Conventional_DataProviderV01 : XMLDeclarationComponentsDataProviderV10,
+ IXMLVehicleComponentsDeclaration, IRetarderInputData
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_Conventional_ComponentsVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ private IBusAuxiliariesDeclarationData _busAuxiliaries;
+
+ public XMLDeclarationComponentsMultistagePrimaryVehicleBus_Conventional_DataProviderV01(IXMLDeclarationVehicleData vehicle,
+ XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
+
+
+ IRetarderInputData IVehicleComponentsDeclaration.RetarderInputData => this;
+
+ IAirdragDeclarationInputData IVehicleComponentsDeclaration.AirdragInputData => null;
+
+ IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData => null;
+
+ public override IBusAuxiliariesDeclarationData BusAuxiliaries => _busAuxiliaries ?? (_busAuxiliaries = ComponentReader.BusAuxiliariesInputData);
+
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
+
+ #region IRetarderInputData Interface Implementation
+
+ public RetarderType Type => _vehicle.RetarderType;
+ public double Ratio => _vehicle.RetarderRatio;
+ public TableData LossMap { get; }
#endregion
+ }
- public override IBusAuxiliariesDeclarationData BusAuxiliaries =>
- _busAuxiliaries ?? (_busAuxiliaries = ComponentReader.BusAuxiliariesInputData);
+ // ---------------------------------------------------------------------------------------
+
+
+ public class XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_Px_DataProviderV01 : XMLDeclarationComponentsDataProviderV10,
+ IXMLVehicleComponentsDeclaration, IRetarderInputData
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_HEV-Px_ComponentsVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ private IBusAuxiliariesDeclarationData _busAuxiliaries;
+
+ public XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_Px_DataProviderV01(IXMLDeclarationVehicleData vehicle,
+ XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
+
+
+ IRetarderInputData IVehicleComponentsDeclaration.RetarderInputData => this;
+
+ IAirdragDeclarationInputData IVehicleComponentsDeclaration.AirdragInputData => null;
+
+ IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData => null;
+
+ public override IBusAuxiliariesDeclarationData BusAuxiliaries => _busAuxiliaries ?? (_busAuxiliaries = ComponentReader.BusAuxiliariesInputData);
protected override XNamespace SchemaNamespace => NAMESPACE_URI;
+
+ #region IRetarderInputData Interface Implementation
+
+ public RetarderType Type => _vehicle.RetarderType;
+ public double Ratio => _vehicle.RetarderRatio;
+ public TableData LossMap { get; }
+
+ #endregion
}
// ---------------------------------------------------------------------------------------
- public class XMLDeclarationComponentsMultistagePrimaryVehicleBusDataProviderV01 : XMLDeclarationComponentsDataProviderV10,
+ public class XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_S2_DataProviderV01 : XMLDeclarationComponentsDataProviderV10,
IXMLVehicleComponentsDeclaration, IRetarderInputData
{
public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
- public new const string XSD_TYPE = "Vehicle_Conventional_ComponentsVIFType";
+ public new const string XSD_TYPE = "Vehicle_HEV-S2_ComponentsVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ private IBusAuxiliariesDeclarationData _busAuxiliaries;
+
+ public XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_S2_DataProviderV01(IXMLDeclarationVehicleData vehicle,
+ XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
+
+
+ IRetarderInputData IVehicleComponentsDeclaration.RetarderInputData => this;
+
+ IAirdragDeclarationInputData IVehicleComponentsDeclaration.AirdragInputData => null;
+
+ IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData => null;
+
+ public override IBusAuxiliariesDeclarationData BusAuxiliaries => _busAuxiliaries ?? (_busAuxiliaries = ComponentReader.BusAuxiliariesInputData);
+
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
+
+ #region IRetarderInputData Interface Implementation
+
+ public RetarderType Type => _vehicle.RetarderType;
+ public double Ratio => _vehicle.RetarderRatio;
+ public TableData LossMap { get; }
+
+ #endregion
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_S3_DataProviderV01 :
+ XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_S2_DataProviderV01
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_HEV-S3_ComponentsVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+ public XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_S3_DataProviderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
+
+ #region Overrides of XMLDeclarationComponentsDataProviderV10
+
+ public override IGearboxDeclarationInputData GearboxInputData => null;
+
+ #endregion
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_S4_DataProviderV01 :
+ XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_S2_DataProviderV01
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_HEV-S4_ComponentsVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+ public XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_S4_DataProviderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
+
+ #region Overrides of XMLDeclarationComponentsDataProviderV10
+
+ public override IGearboxDeclarationInputData GearboxInputData => null;
+
+ public override IAxleGearInputData AxleGearInputData => null;
+
+ #endregion
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+
+ public class XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_IEPC_S_DataProviderV01 : XMLDeclarationComponentsDataProviderV10,
+ IXMLVehicleComponentsDeclaration, IRetarderInputData
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_HEV-IEPC-S_ComponentsVIFType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
private IBusAuxiliariesDeclarationData _busAuxiliaries;
- public XMLDeclarationComponentsMultistagePrimaryVehicleBusDataProviderV01(IXMLDeclarationVehicleData vehicle,
+ public XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_IEPC_S_DataProviderV01(IXMLDeclarationVehicleData vehicle,
XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
@@ -244,6 +385,103 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#endregion
}
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_E2_DataProviderV01 : XMLDeclarationComponentsDataProviderV10,
+ IXMLVehicleComponentsDeclaration, IRetarderInputData
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_PEV-E2_ComponentsVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ private IBusAuxiliariesDeclarationData _busAuxiliaries;
+
+ public XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_E2_DataProviderV01(IXMLDeclarationVehicleData vehicle,
+ XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
+
+ public override IEngineDeclarationInputData EngineInputData => null;
+
+ IRetarderInputData IVehicleComponentsDeclaration.RetarderInputData => this;
+
+ IAirdragDeclarationInputData IVehicleComponentsDeclaration.AirdragInputData => null;
+
+ IAuxiliariesDeclarationInputData IVehicleComponentsDeclaration.AuxiliaryInputData => null;
+
+ public override IBusAuxiliariesDeclarationData BusAuxiliaries => _busAuxiliaries ?? (_busAuxiliaries = ComponentReader.BusAuxiliariesInputData);
+
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
+
+ #region IRetarderInputData Interface Implementation
+
+ public RetarderType Type => _vehicle.RetarderType;
+ public double Ratio => _vehicle.RetarderRatio;
+ public TableData LossMap { get; }
+
+ #endregion
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_E3_DataProviderV01 :
+ XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_E2_DataProviderV01
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_PEV-E3_ComponentsVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+ public XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_E3_DataProviderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
+
+ #region Overrides of XMLDeclarationComponentsDataProviderV10
+
+ public override IGearboxDeclarationInputData GearboxInputData => null;
+
+ #endregion
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_E4_DataProviderV01 :
+ XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_E2_DataProviderV01
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_PEV-E4_ComponentsVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+ public XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_E4_DataProviderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
+
+ #region Overrides of XMLDeclarationComponentsDataProviderV10
+
+ public override IGearboxDeclarationInputData GearboxInputData => null;
+
+ public override IAxleGearInputData AxleGearInputData => null;
+
+ #endregion
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_IEPC_DataProviderV01 :
+ XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_E2_DataProviderV01
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_PEV-IEPC_ComponentsVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+ public XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_IEPC_DataProviderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
+
+ #region Overrides of XMLDeclarationComponentsDataProviderV10
+
+ public override IGearboxDeclarationInputData GearboxInputData => null;
+
+ public override IAxleGearInputData AxleGearInputData => null;
+
+ #endregion
+ }
// ---------------------------------------------------------------------------------------
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs
index ed683e1e1e91b5b74400b06dacd5101770e4c444..1f0434442227980454d81e326553d32634b71d3f 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs
@@ -87,6 +87,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
case "APT-N":
case "APT-P":
case "AT - PowerSplit": return GearboxType.ATPowerSplit;
+ case "IHPC Type 1": return GearboxType.IHPC;
}
throw new ArgumentOutOfRangeException("GearboxType", value);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
index 10edeb2ae6772304ee2e7201bd8ed89e3bf898e4..fd22e022021574822578eca5bc58127d67d93936 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
@@ -108,22 +108,26 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
// ---------------------------------------------------------------------------------------
- public class XMLDeclarationMultistagePrimaryVehicleBusJobInputDataProviderV01 : AbstractXMLResource,
+ public class XMLDeclarationMultistage_Conventional_PrimaryVehicleBusJobInputDataProviderV01 : AbstractXMLResource,
IXMLPrimaryVehicleBusJobInputData
{
- public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+ public static readonly XNamespace NAMESPACE_URI =
+ XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
public const string XSD_TYPE = "ConventionalVehicleVIFType";
- public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+ public static readonly string QUALIFIED_XSD_TYPE =
+ XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
protected IVehicleDeclarationInputData _vehicle;
- public XMLDeclarationMultistagePrimaryVehicleBusJobInputDataProviderV01(XmlNode node, IXMLPrimaryVehicleBusInputData inputProvider,
+ public XMLDeclarationMultistage_Conventional_PrimaryVehicleBusJobInputDataProviderV01(XmlNode node,
+ IXMLPrimaryVehicleBusInputData inputProvider,
string fileName) : base(node, fileName)
{
InputData = inputProvider;
}
+
protected override XNamespace SchemaNamespace => NAMESPACE_URI;
public IVehicleDeclarationInputData Vehicle => _vehicle ?? (_vehicle = Reader.CreateVehicle);
@@ -131,20 +135,105 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
protected override DataSourceType SourceType { get; }
public bool SavedInDeclarationMode { get; }
public string JobName { get; }
-
+
public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
public IXMLJobDataReader Reader { protected get; set; }
- public IXMLPrimaryVehicleBusInputData InputData { get; }
+ public virtual IXMLPrimaryVehicleBusInputData InputData { get; }
+
}
// ---------------------------------------------------------------------------------------
+ public class XMLDeclarationMultistage_HEV_Px_PrimaryVehicleBusJobInputDataProviderV01 : XMLDeclarationMultistage_Conventional_PrimaryVehicleBusJobInputDataProviderV01
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public const string XSD_TYPE = "HEV-Px_VehicleVIFType";
+
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLDeclarationMultistage_HEV_Px_PrimaryVehicleBusJobInputDataProviderV01(XmlNode node, IXMLPrimaryVehicleBusInputData inputProvider,
+ string fileName) : base(node,inputProvider, fileName)
+ { }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
+
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationMultistage_HEV_Sx_PrimaryVehicleBusJobInputDataProviderV01 : XMLDeclarationMultistage_Conventional_PrimaryVehicleBusJobInputDataProviderV01
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public const string XSD_TYPE = "HEV-Sx_VehicleVIFType";
+
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLDeclarationMultistage_HEV_Sx_PrimaryVehicleBusJobInputDataProviderV01(XmlNode node, IXMLPrimaryVehicleBusInputData inputProvider,
+ string fileName) : base(node, inputProvider, fileName)
+ { }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
+
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationMultistage_HEV_IEPC_S_PrimaryVehicleBusJobInputDataProviderV01 : XMLDeclarationMultistage_Conventional_PrimaryVehicleBusJobInputDataProviderV01
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public const string XSD_TYPE = "HEV-IEPC-S_VehicleVIFType";
+
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLDeclarationMultistage_HEV_IEPC_S_PrimaryVehicleBusJobInputDataProviderV01(XmlNode node, IXMLPrimaryVehicleBusInputData inputProvider,
+ string fileName) : base(node, inputProvider, fileName)
+ { }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
+
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationMultistage_PEV_Ex_PrimaryVehicleBusJobInputDataProviderV01 : XMLDeclarationMultistage_Conventional_PrimaryVehicleBusJobInputDataProviderV01
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public const string XSD_TYPE = "PEV_Ex_VehicleVIFType";
+
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLDeclarationMultistage_PEV_Ex_PrimaryVehicleBusJobInputDataProviderV01(XmlNode node, IXMLPrimaryVehicleBusInputData inputProvider,
+ string fileName) : base(node, inputProvider, fileName)
+ { }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
+
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationMultistage_PEV_IEPC_PrimaryVehicleBusJobInputDataProviderV01 : XMLDeclarationMultistage_Conventional_PrimaryVehicleBusJobInputDataProviderV01
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public const string XSD_TYPE = "IEPC_VehicleVIFType";
+
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLDeclarationMultistage_PEV_IEPC_PrimaryVehicleBusJobInputDataProviderV01(XmlNode node, IXMLPrimaryVehicleBusInputData inputProvider,
+ string fileName) : base(node, inputProvider, fileName)
+ { }
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
+
+ }
+ // ---------------------------------------------------------------------------------------
+
public class XMLDeclarationMultistageExemptedPrimaryVehicleBusJobInputDataProviderV01 :
- XMLDeclarationMultistagePrimaryVehicleBusJobInputDataProviderV01
+ XMLDeclarationMultistage_Conventional_PrimaryVehicleBusJobInputDataProviderV01
{
public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
- public new const string XSD_TYPE = "VehicleExemptedPrimaryBusType";
+ public new const string XSD_TYPE = "Exempted_VehicleVIFType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
index 14c1eaecd0480908eab71bb61be8e7b0ad856c92..8d45c71e4fbc6da601b81b3d401d7d8685dcdc80 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
@@ -84,7 +84,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public IManufacturingStageInputData ConsolidateManufacturingStage => _concolidateManfacturingStage ?? (_concolidateManfacturingStage = Reader.ConsolidateManufacturingStage);
- public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
+ public VectoSimulationJobType JobType => ConsolidateManufacturingStage.Vehicle.VehicleType;
public bool InputComplete => Reader.InputComplete;
@@ -153,8 +153,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
{
return ResultsInputData.Results.FirstOrDefault(
x => x.VehicleGroup == vehicleClass &&
- (x.SimulationParameter.Payload - payload).IsEqual(0, 1) && x.Mission == mission &&
- x.SimulationParameter.FuelMode.Equals(fuelMode, StringComparison.InvariantCultureIgnoreCase));
+ (x.SimulationParameter.Payload - payload).IsEqual(0, 1) && x.Mission == mission
+ // && x.SimulationParameter.FuelMode.Equals(fuelMode, StringComparison.InvariantCultureIgnoreCase)
+ );
}
public XmlNode ResultsNode => GetNode(XMLNames.Report_Results);
@@ -217,10 +218,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationVIFInputData : IMultistageVIFInputData
{
- private readonly IMultistageBusInputDataProvider _multistageJobInputData;
+ private readonly IMultistepBusInputDataProvider _multistageJobInputData;
private readonly IVehicleDeclarationInputData _vehicleInput;
- public XMLDeclarationVIFInputData(IMultistageBusInputDataProvider multistageJobInputData,
+ public XMLDeclarationVIFInputData(IMultistepBusInputDataProvider multistageJobInputData,
IVehicleDeclarationInputData vehicleInput)
{
_multistageJobInputData = multistageJobInputData;
@@ -229,7 +230,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public IVehicleDeclarationInputData VehicleInputData => _vehicleInput;
- public IMultistageBusInputDataProvider MultistageJobInputData => _multistageJobInputData;
+ public IMultistepBusInputDataProvider MultistageJobInputData => _multistageJobInputData;
public DataSource DataSource { get; }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPrimaryVehicleBusResultsInputDataProviderV01.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPrimaryVehicleBusResultsInputDataProviderV01.cs
index 21ae0bdaed5b9af7f160bd03ddaa1ff917a57e64..68546d42827cca2fc83d8f7cb7952457f28c12a4 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPrimaryVehicleBusResultsInputDataProviderV01.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPrimaryVehicleBusResultsInputDataProviderV01.cs
@@ -52,7 +52,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
private IResult GetResult(XmlNode xmlNode)
{
var resultStatus = GetAttribute(xmlNode, XMLNames.Result_Status);
- var vehicleGroup = GetString(XMLNames.Report_Vehicle_VehicleGroup, xmlNode);
+ var vehicleGroup = GetString(XMLNames.Report_Results_PrimaryVehicleSubgroup, xmlNode);
var mission = GetString(XMLNames.Report_Result_Mission, xmlNode).ParseEnum<MissionType>();
var simulationNode = GetNode(XMLNames.Report_ResultEntry_SimulationParameters, xmlNode);
var simulationParams = GetSimulationParameter(simulationNode);
@@ -84,7 +84,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
TotalVehicleMass = GetString(XMLNames.Report_ResultEntry_TotalVehicleMass, xmlNode).ToDouble().SI<Kilogram>(),
Payload = GetString(XMLNames.Report_Result_Payload, xmlNode).ToDouble().SI<Kilogram>(),
PassengerCount = GetString(XMLNames.Bus_PassengerCount, xmlNode).ToDouble(),
- FuelMode = GetString(XMLNames.Report_Result_FuelMode, xmlNode)
+ //FuelMode = GetString(XMLNames.Report_Result_FuelMode, xmlNode)
};
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTyreDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTyreDataProvider.cs
index 7b2dfa10639d032fbf52ba1bf731bff6b92c2252..94364961bee7ed9cc3ac2d6295fa474d82d7ff8e 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTyreDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTyreDataProvider.cs
@@ -75,7 +75,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public virtual Newton TyreTestLoad => _fzIso ?? (_fzIso = GetDouble(XMLNames.AxleWheels_Axles_Axle_FzISO).SI<Newton>());
- public virtual string FuelEfficiencyClass => DeclarationData.Wheels.TyreClass.Lookup(RollResistanceCoefficient);
+ public virtual string FuelEfficiencyClass => null;// DeclarationData.Wheels.TyreClass.Lookup(RollResistanceCoefficient);
+
+ #endregion
+
+ #region Implementation of IXMLTyreDeclarationInputData
+
+ public XmlNode GetXmlNode => BaseNode;
#endregion
}
@@ -116,7 +122,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationTyreDataProviderV23 : XMLDeclarationTyreDataProviderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
//public new const string XSD_TYPE = "TyreComponentDeclarationType";
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index a0a439904b7984e69b42c106c4cff796a460f1d7..ed054c69f25eea0ab17f1248a58aee2e613c70e0 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -461,7 +461,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
// ---------------------------------------------------------------------------------------
- public class XMLDeclarationMultistagePrimaryVehicleBusDataProviderV01 : AbstractCommonComponentType, IXMLDeclarationVehicleData
+ public class XMLDeclarationMultistage_Conventional_PrimaryVehicleBusDataProviderV01 : AbstractCommonComponentType, IXMLDeclarationVehicleData
{
public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
@@ -476,7 +476,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
private XmlElement _componentNode;
private IVehicleComponentsDeclaration _components;
- public XMLDeclarationMultistagePrimaryVehicleBusDataProviderV01(
+ public XMLDeclarationMultistage_Conventional_PrimaryVehicleBusDataProviderV01(
IXMLPrimaryVehicleBusJobInputData busJobData, XmlNode xmlNode, string sourceFile)
: base(xmlNode, sourceFile)
{
@@ -485,12 +485,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of AbstractCommonComponentType
- public override string Manufacturer => GetString(XMLNames.ManufacturerPrimaryVehicle);
-
- public string ManufacturerAddress => GetString(XMLNames.ManufacturerAddressPrimaryVehicle);
+
+ public virtual string ManufacturerAddress => GetString(XMLNames.ManufacturerAddress);
#endregion
+ public virtual string PowertrainPositionPrefix => "-";
+
#region IXMLDeclarationVehicleData interface
@@ -550,16 +551,16 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public virtual ConsumerTechnology? DoorDriveTechnology => ConsumerTechnology.Unknown;
public virtual VehicleDeclarationType VehicleDeclarationType { get; }
- public Dictionary<PowertrainPosition, List<Tuple<Volt, TableData>>> ElectricMotorTorqueLimits { get; }
- public TableData BoostingLimitations { get; }
+ public virtual Dictionary<PowertrainPosition, List<Tuple<Volt, TableData>>> ElectricMotorTorqueLimits { get; }
+ public virtual TableData BoostingLimitations { get; }
public virtual string VehicleTypeApprovalNumber { get; }
public virtual IVehicleComponentsDeclaration Components => _components ?? (_components = ComponentReader.ComponentInputData);
- public ArchitectureID ArchitectureID { get; }
- public bool OvcHev { get; }
- public Watt MaxChargingPower { get; }
+ public virtual ArchitectureID ArchitectureID => ElementExists(XMLNames.Vehicle_ArchitectureID) ? ArchitectureIDHelper.Parse(GetString(XMLNames.Vehicle_ArchitectureID)) : ArchitectureID.UNKNOWN;
+ public virtual bool OvcHev { get; }
+ public virtual Watt MaxChargingPower { get; }
#region Non seeded Properties
@@ -634,12 +635,106 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
// ---------------------------------------------------------------------------------------
- public class XMLDeclarationMultistageExemptedPrimaryVehicleBusDataProviderV01 : XMLDeclarationMultistagePrimaryVehicleBusDataProviderV01
+ public class XMLDeclarationMultistage_HEV_Px_PrimaryVehicleBusDataProviderV01 : XMLDeclarationMultistage_Conventional_PrimaryVehicleBusDataProviderV01
+ {
+
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "HEV-Px_VehicleVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE =
+ XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLDeclarationMultistage_HEV_Px_PrimaryVehicleBusDataProviderV01(IXMLPrimaryVehicleBusJobInputData busJobData, XmlNode xmlNode, string sourceFile) : base(busJobData, xmlNode, sourceFile) { }
+
+ public override VectoSimulationJobType VehicleType { get => VectoSimulationJobType.ParallelHybridVehicle; }
+
+ public override string PowertrainPositionPrefix => "P";
+
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationMultistage_HEV_Sx_PrimaryVehicleBusDataProviderV01 : XMLDeclarationMultistage_Conventional_PrimaryVehicleBusDataProviderV01
+ {
+
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "HEV-Sx_VehicleVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE =
+ XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLDeclarationMultistage_HEV_Sx_PrimaryVehicleBusDataProviderV01(IXMLPrimaryVehicleBusJobInputData busJobData, XmlNode xmlNode, string sourceFile) : base(busJobData, xmlNode, sourceFile) { }
+
+ public override VectoSimulationJobType VehicleType { get => VectoSimulationJobType.SerialHybridVehicle; }
+
+ public override string PowertrainPositionPrefix => "E";
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationMultistage_HEV_IEPC_S_PrimaryVehicleBusDataProviderV01 : XMLDeclarationMultistage_Conventional_PrimaryVehicleBusDataProviderV01
+ {
+
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "HEV-IEPC-S_VehicleVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE =
+ XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLDeclarationMultistage_HEV_IEPC_S_PrimaryVehicleBusDataProviderV01(IXMLPrimaryVehicleBusJobInputData busJobData, XmlNode xmlNode, string sourceFile) : base(busJobData, xmlNode, sourceFile) { }
+
+ public override VectoSimulationJobType VehicleType { get => VectoSimulationJobType.SerialHybridVehicle; }
+
+ public override string PowertrainPositionPrefix => "S";
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationMultistage_PEV_Ex_PrimaryVehicleBusDataProviderV01 : XMLDeclarationMultistage_Conventional_PrimaryVehicleBusDataProviderV01
+ {
+
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "PEV_Ex_VehicleVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE =
+ XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLDeclarationMultistage_PEV_Ex_PrimaryVehicleBusDataProviderV01(IXMLPrimaryVehicleBusJobInputData busJobData, XmlNode xmlNode, string sourceFile) : base(busJobData, xmlNode, sourceFile) { }
+
+ public override VectoSimulationJobType VehicleType { get => VectoSimulationJobType.BatteryElectricVehicle; }
+
+ public override string PowertrainPositionPrefix => "E";
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationMultistage_PEV_IEPC_PrimaryVehicleBusDataProviderV01 : XMLDeclarationMultistage_Conventional_PrimaryVehicleBusDataProviderV01
+ {
+
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "IEPC_VehicleVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE =
+ XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLDeclarationMultistage_PEV_IEPC_PrimaryVehicleBusDataProviderV01(IXMLPrimaryVehicleBusJobInputData busJobData, XmlNode xmlNode, string sourceFile) : base(busJobData, xmlNode, sourceFile) { }
+
+ public override VectoSimulationJobType VehicleType { get => VectoSimulationJobType.BatteryElectricVehicle; }
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLDeclarationMultistageExemptedPrimaryVehicleBusDataProviderV01 : XMLDeclarationMultistage_Conventional_PrimaryVehicleBusDataProviderV01
{
public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
- public new const string XSD_TYPE = "VehicleExemptedPrimaryBusType";
+ public new const string XSD_TYPE = "Exempted_VehicleVIFType";
public new static readonly string QUALIFIED_XSD_TYPE =
XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -737,7 +832,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
foreach (XmlNode electricMachineNode in electricMachineNodes)
{
var powertrainPosition =
- PowertrainPositionHelper.Parse(PowertrainPositionPrefix + GetString(XMLNames.ElectricMachine_Position, electricMachineNode));
+ PowertrainPositionHelper.Parse(PowertrainPositionPrefix, GetString(XMLNames.ElectricMachine_Position, electricMachineNode));
if (!motorTorqueLimits.ContainsKey(powertrainPosition))
motorTorqueLimits.Add(powertrainPosition, new List<Tuple<Volt, TableData>>());
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs
index a4abc2cbdf8deb6c05f504c065eef5d6ee35a5e2..365a218186703a42bb0727f04b815bc356e21ab2 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs
@@ -17,7 +17,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
public static readonly string QUALIFIED_GEN_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_GEN_TYPE);
- private IXMLDeclarationVehicleData _vehicle;
+ protected IXMLDeclarationVehicleData _vehicle;
private IList<ElectricMachineEntry<IElectricMotorDeclarationInputData>> _entries;
public XMLElectricMachinesDeclarationInputDataProvider(
@@ -35,10 +35,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#endregion
- private List<ElectricMachineEntry<IElectricMotorDeclarationInputData>> GetEntries()
+ protected virtual List<ElectricMachineEntry<IElectricMotorDeclarationInputData>> GetEntries()
{
var machineEntry = new ElectricMachineEntry<IElectricMotorDeclarationInputData> {
- Position = PowertrainPositionHelper.Parse(((AbstractXMLVehicleDataProviderV24)_vehicle).PowertrainPositionPrefix +
+ Position = PowertrainPositionHelper.Parse(((AbstractXMLVehicleDataProviderV24)_vehicle).PowertrainPositionPrefix,
GetString(XMLNames.ElectricMachine_PowertrainPosition)),
Count = XmlConvert.ToInt32(GetString(XMLNames.ElectricMachine_Count)),
ElectricMachine = ElectricMachineSystemReader.CreateElectricMachineSystem(GetNode(XMLNames.ElectricMachineSystem)),
@@ -53,7 +53,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
return new List<ElectricMachineEntry<IElectricMotorDeclarationInputData>>{machineEntry};
}
- private void SetGearRatios(ElectricMachineEntry<IElectricMotorDeclarationInputData> machineEntry)
+ protected void SetGearRatios(ElectricMachineEntry<IElectricMotorDeclarationInputData> machineEntry)
{
var gearRatios = GetNode(XMLNames.ElectricMachine_P2_5GearRatios, null, false);
if (gearRatios != null) {
@@ -134,4 +134,37 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
});
#endregion
- } }
+ }
+
+ public class XMLDeclarationElectricMachinesDataProviderV01 : XMLElectricMachinesDeclarationInputDataProvider
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "ElectricMachineType";
+ public const string XSD_GEN_TYPE = "ElectricMachineGENType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+ public static readonly string QUALIFIED_GEN_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_GEN_TYPE);
+
+ public XMLDeclarationElectricMachinesDataProviderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
+
+ protected override List<ElectricMachineEntry<IElectricMotorDeclarationInputData>> GetEntries()
+ {
+ var machineEntry = new ElectricMachineEntry<IElectricMotorDeclarationInputData> {
+ Position = PowertrainPositionHelper.Parse(((XMLDeclarationMultistage_Conventional_PrimaryVehicleBusDataProviderV01)_vehicle).PowertrainPositionPrefix,
+ GetString(XMLNames.ElectricMachine_PowertrainPosition)),
+ Count = XmlConvert.ToInt32(GetString(XMLNames.ElectricMachine_Count)),
+ ElectricMachine = ElectricMachineSystemReader.CreateElectricMachineSystem(GetNode(XMLNames.ElectricMachineSystem)),
+ };
+
+ if (ElementExists("ADC"))
+ machineEntry.ADC = ElectricMachineSystemReader.ADCInputData;
+
+ if (ElementExists(XMLNames.ElectricMachine_P2_5GearRatios))
+ SetGearRatios(machineEntry);
+
+ return new List<ElectricMachineEntry<IElectricMotorDeclarationInputData>> { machineEntry };
+ }
+ }
+
+}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
index 5b4e004570209e971071e75e546138deab6ff35f..117a95ea192a81bb889d78b304529b701f92c4f0 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
@@ -107,6 +107,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
voltageLevels.Add(new XMLElectricMotorIEPCIInputDataProviderV23(null, voltageLevelNode, null));
}
+ if (voltageLevels.Count > 1) {
+ voltageLevels = voltageLevels.OrderBy(x => x.VoltageLevel.Value()).ToList();
+ }
+
return voltageLevels;
}
@@ -186,7 +190,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public virtual TableData Conditioning => ElementExists(XMLNames.Conditioning)
? ReadConditioning() : null;
- public virtual double OverloadRecoveryFactor { get; }
#endregion
@@ -464,4 +467,51 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#endregion
}
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLElectricMotorDeclarationInputDataProviderV01 : XMLCommonElectricMotorDeclarationInputData,
+ IXMLElectricMotorDeclarationInputData
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+ public const string XSD_TYPE = "ElectricMachineSystemDataDeclarationType";
+
+ public static readonly string QUALIFIED_XSD_TYPE =
+ XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ private IList<IElectricMotorVoltageLevel> _voltageLevels;
+
+ public XMLElectricMotorDeclarationInputDataProviderV01(
+ XmlNode componentNode, string sourceFile) : base(componentNode, sourceFile)
+ {
+ SourceType = DataSourceType.XMLEmbedded;
+ }
+
+ #region Implementation of IElectricMotorDeclarationInputData
+
+ public bool DcDcConverterIncluded => GetBool(XMLNames.ElectricMachine_DcDcConverterIncluded);
+
+ public string IHPCType => GetString(XMLNames.ElectricMachine_IHPCType);
+
+ public IList<IElectricMotorVoltageLevel> VoltageLevels =>
+ _voltageLevels ?? (_voltageLevels = GetVoltageLevels());
+ public TableData DragCurve => ReadDragCurve();
+ public TableData Conditioning => ElementExists(XMLNames.Conditioning)
+ ? ReadConditioning() : null;
+
+ #endregion
+
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
+ protected override DataSourceType SourceType { get; }
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLElectricMotorIEPCIInputDataProviderV01 : XMLElectricMotorIEPCIInputDataProviderV23
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+ public const string XSD_TYPE = "IEPCMeasuredDataDeclarationType";
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+ public XMLElectricMotorIEPCIInputDataProviderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
+ }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs
index 17f31db33e864065fbfb885246932bca6c58027f..d2555cb1c639422a6b3902d2c376f57cb5aee1ad 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs
@@ -11,7 +11,7 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
{
- public class XMLElectricStorageSystemDeclarationInputData : AbstractCommonComponentType,
+ public class XMLElectricStorageSystemDeclarationInputDataV24 : AbstractCommonComponentType,
IXMLElectricStorageSystemDeclarationInputData
{
public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
@@ -21,7 +21,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
private IList<IElectricStorageDeclarationInputData> _electricStorageElements;
private IXMLDeclarationVehicleData _vehicle;
- public XMLElectricStorageSystemDeclarationInputData(
+ public XMLElectricStorageSystemDeclarationInputDataV24(
IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile)
: base(componentNode, sourceFile)
{
@@ -84,14 +84,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
// ---------------------------------------------------------------------------------------
- public class XMLBatteryPackDeclarationDeclarationInputData : AbstractCommonComponentType,
+ public class XMLBatteryPackDeclarationDeclarationInputDataV24 : AbstractCommonComponentType,
IXMLBatteryPackDeclarationInputData
{
public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_TYPE = "REESSBatteryType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
- public XMLBatteryPackDeclarationDeclarationInputData(XmlNode componentNode, string sourceFile)
+ public XMLBatteryPackDeclarationDeclarationInputDataV24(XmlNode componentNode, string sourceFile)
: base(componentNode, sourceFile)
{
SourceType = DataSourceType.XMLEmbedded;
@@ -151,16 +151,29 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#endregion
}
-
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLBatteryPackDeclarationDeclarationInputDataV01 : XMLBatteryPackDeclarationDeclarationInputDataV24
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+ public const string XSD_TYPE = "REESSBatteryType";
+
+ public static readonly string QUALIFIED_XSD_TYPE =
+ XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLBatteryPackDeclarationDeclarationInputDataV01(XmlNode componentNode, string sourceFile) : base(componentNode, sourceFile) { }
+ }
+
// ---------------------------------------------------------------------------------------
-
- public class XMLSuperCapDeclarationInputData : AbstractCommonComponentType, IXMLSuperCapDeclarationInputData
+
+ public class XMLSuperCapDeclarationInputDataV24 : AbstractCommonComponentType, IXMLSuperCapDeclarationInputData
{
public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_TYPE = "REESSCapacitorType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
- public XMLSuperCapDeclarationInputData(XmlNode componentNode, string sourceFile) : base(componentNode, sourceFile)
+ public XMLSuperCapDeclarationInputDataV24(XmlNode componentNode, string sourceFile) : base(componentNode, sourceFile)
{
SourceType = DataSourceType.XMLEmbedded;
}
@@ -174,7 +187,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of ISuperCapDeclarationInputData
public Farad Capacity => GetDouble(XMLNames.Capacitor_Capacitance).SI<Farad>();
- public Ohm InternalResistance => GetDouble(XMLNames.Capacitor_InternalResistance).SI<Ohm>() / 1000;
+ public Ohm InternalResistance => GetDouble(XMLNames.Capacitor_InternalResistance).SI(Unit.SI.Milli.Ohm).Cast<Ohm>();
public Volt MinVoltage => GetDouble(XMLNames.Capacitor_MinVoltage).SI<Volt>();
public Volt MaxVoltage => GetDouble(XMLNames.Capacitor_MaxVoltage).SI<Volt>();
public Ampere MaxCurrentCharge => GetDouble(XMLNames.Capacitor_MaxChargingCurrent).SI<Ampere>();
@@ -193,4 +206,30 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#endregion
}
+
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLSuperCapDeclarationInputDataV01 : XMLSuperCapDeclarationInputDataV24
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+ public const string XSD_TYPE = "REESSCapacitorType";
+
+ public static readonly string QUALIFIED_XSD_TYPE =
+ XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLSuperCapDeclarationInputDataV01(XmlNode componentNode, string sourceFile) : base(componentNode, sourceFile) { }
+ }
+
+ //===================
+
+ public class XMLElectricStorageSystemDeclarationInputDataV01 : XMLElectricStorageSystemDeclarationInputDataV24
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+ public const string XSD_TYPE = "ElectricEnergyStorageType";
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+
+ public XMLElectricStorageSystemDeclarationInputDataV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
+ }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationCompletedBusVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationCompletedBusVehicleDataProvider.cs
index 11204f01839578431c2017c4d3239517e9271415..591861cd97dd425cf70a2707864992fb13fe969b 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationCompletedBusVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationCompletedBusVehicleDataProvider.cs
@@ -202,6 +202,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
public XMLDeclarationHevCompletedBusDataProviderV24(IXMLDeclarationJobInputData jobData, XmlNode xmlNode, string sourceFile) : base(jobData, xmlNode, sourceFile) { }
+
+ public override bool HybridElectricHDV => true;
+
}
// ---------------------------------------------------------------------------------------
@@ -226,6 +229,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
public XMLDeclarationIepcCompletedBusDataProviderV24(IXMLDeclarationJobInputData jobData, XmlNode xmlNode, string sourceFile) : base(jobData, xmlNode, sourceFile) { }
+
+ public override bool HybridElectricHDV => true;
+
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs
index adb09b293f45da99eaffdb3ec363f0666e26009f..386fc4618468ad4e29d6bb29a3bcdf1ab7b9c0b0 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs
@@ -88,10 +88,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
#endregion
+ public override bool HybridElectricHDV => true;
+
public override VectoSimulationJobType VehicleType
{
get => VectoSimulationJobType.ParallelHybridVehicle;
}
+
}
// ---------------------------------------------------------------------------------------
@@ -124,6 +127,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
{
get => VectoSimulationJobType.SerialHybridVehicle;
}
+
+ public override bool HybridElectricHDV => true;
+
}
// ---------------------------------------------------------------------------------------
@@ -234,6 +240,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
{
get => VectoSimulationJobType.SerialHybridVehicle;
}
+
+ public override bool HybridElectricHDV => true;
+
}
// ---------------------------------------------------------------------------------------
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationMediumLorryVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationMediumLorryVehicleDataProvider.cs
index 4d6ee26359c708aa52b6d7fdc13d8e28cad156a6..e31c7547c9f0ea15d863fe8c812bddec055f0593 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationMediumLorryVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationMediumLorryVehicleDataProvider.cs
@@ -116,6 +116,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
#endregion
+ public override bool HybridElectricHDV => true;
+
}
// ---------------------------------------------------------------------------------------
@@ -144,6 +146,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override XmlElement PTONode => null;
#endregion
+
+ public override bool HybridElectricHDV => true;
+
}
// ---------------------------------------------------------------------------------------
@@ -243,6 +248,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
#endregion
public override VectoSimulationJobType VehicleType => VectoSimulationJobType.SerialHybridVehicle;
+
+ public override bool HybridElectricHDV => true;
+
}
// ---------------------------------------------------------------------------------------
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationPrimaryBusVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationPrimaryBusVehicleDataProvider.cs
index a06e7213923da611f0d1cb057da3d29ba7f2c523..909afc0e9853ab4fab803d83c3f1efa15cddf3fb 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationPrimaryBusVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationPrimaryBusVehicleDataProvider.cs
@@ -116,6 +116,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
: base(jobData, xmlNode, sourceFile) { }
public override VectoSimulationJobType VehicleType => VectoSimulationJobType.ParallelHybridVehicle;
+
+ public override bool HybridElectricHDV => true;
+
}
// ---------------------------------------------------------------------------------------
@@ -138,6 +141,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override IList<ITorqueLimitInputData> TorqueLimits => null;
public override VectoSimulationJobType VehicleType => VectoSimulationJobType.SerialHybridVehicle;
+
+ public override bool HybridElectricHDV => true;
+
}
// ---------------------------------------------------------------------------------------
@@ -218,6 +224,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
#endregion
#endregion
+
+ public override bool HybridElectricHDV => true;
+
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Interfaces/IXMLDeclarationInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Interfaces/IXMLDeclarationInputData.cs
index 37de4917517342fc4abe7c4f7159064a273332af..eb247dd05d26dabb1f4bbd620e299af4527bddd0 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Interfaces/IXMLDeclarationInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Interfaces/IXMLDeclarationInputData.cs
@@ -48,7 +48,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Interfaces
XmlNode ApplicationInformationNode { get; }
}
- public interface IXMLMultistageInputDataProvider : IMultistageBusInputDataProvider, IXMLResource
+ public interface IXMLMultistageInputDataProvider : IMultistepBusInputDataProvider, IXMLResource
{
IXMLDeclarationMultistageVehicleInputDataReader Reader { set; }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Interfaces/IXMLTyreDeclarationInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Interfaces/IXMLTyreDeclarationInputData.cs
index b31986822a02a0653f13b7e2b324ce76e2b06cba..79ed20d1a651d249c367b6a87e24b227988af2f3 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Interfaces/IXMLTyreDeclarationInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Interfaces/IXMLTyreDeclarationInputData.cs
@@ -29,9 +29,13 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using System.Xml;
using TUGraz.VectoCommon.InputData;
namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Interfaces
{
- public interface IXMLTyreDeclarationInputData : ITyreDeclarationInputData, IXMLResource { }
+ public interface IXMLTyreDeclarationInputData : ITyreDeclarationInputData, IXMLResource
+ {
+ XmlNode GetXmlNode { get; }
+ }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataMultistageV01InjectModule.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataMultistageV01InjectModule.cs
index 8f61766998e747ae0ca2b542dbf3a8f650fe4b6e..359aced15d0c743a61d9ecc0bb9e385134afcef0 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataMultistageV01InjectModule.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataMultistageV01InjectModule.cs
@@ -30,43 +30,182 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
Bind<IXMLPrimaryVehicleBusInputData>().To<XMLDeclarationMultistagePrimaryVehicleInputDataV01>()
.Named(XMLDeclarationMultistagePrimaryVehicleInputDataV01.QUALIFIED_XSD_TYPE);
- Bind<IXMLBusAuxiliariesDeclarationData>().To<XMLDeclarationPrimaryBusAuxiliariesDataProviderV01>()
- .Named(XMLDeclarationPrimaryBusAuxiliariesDataProviderV01.QUALIFIED_XSD_TYPE);
+ Bind<IXMLBusAuxiliariesDeclarationData>().To<XMLPrimaryBusAuxiliaries_Conventional_DataProviderV01>()
+ .Named(XMLPrimaryBusAuxiliaries_Conventional_DataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLBusAuxiliariesDeclarationData>().To<XMLPrimaryBusAuxiliaries_HEV_P_DataProviderV01>()
+ .Named(XMLPrimaryBusAuxiliaries_HEV_P_DataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLBusAuxiliariesDeclarationData>().To<XMLPrimaryBusAuxiliaries_HEV_S_DataProviderV01>()
+ .Named(XMLPrimaryBusAuxiliaries_HEV_S_DataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLBusAuxiliariesDeclarationData>().To<XMLPrimaryBusAuxiliaries_PEV_DataProviderV01>()
+ .Named(XMLPrimaryBusAuxiliaries_PEV_DataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLBusAuxiliariesDeclarationData>().To<XMLPrimaryBusAuxiliaries_IEPC_DataProviderV01>()
+ .Named(XMLPrimaryBusAuxiliaries_IEPC_DataProviderV01.QUALIFIED_XSD_TYPE);
Bind<IXMLDeclarationPrimaryVehicleBusInputDataReader>().To<XMLMultistagePrimaryVehicleReaderV01>()
.Named(XMLMultistagePrimaryVehicleReaderV01.QUALIFIED_XSD_TYPE);
- Bind<IXMLPrimaryVehicleBusJobInputData>().To<XMLDeclarationMultistagePrimaryVehicleBusJobInputDataProviderV01>()
- .Named(XMLDeclarationMultistagePrimaryVehicleBusJobInputDataProviderV01.QUALIFIED_XSD_TYPE);
+ Bind<IXMLPrimaryVehicleBusJobInputData>().To<XMLDeclarationMultistage_Conventional_PrimaryVehicleBusJobInputDataProviderV01>()
+ .Named(XMLDeclarationMultistage_Conventional_PrimaryVehicleBusJobInputDataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLPrimaryVehicleBusJobInputData>().To<XMLDeclarationMultistage_HEV_Px_PrimaryVehicleBusJobInputDataProviderV01>()
+ .Named(XMLDeclarationMultistage_HEV_Px_PrimaryVehicleBusJobInputDataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLPrimaryVehicleBusJobInputData>().To<XMLDeclarationMultistage_HEV_Sx_PrimaryVehicleBusJobInputDataProviderV01>()
+ .Named(XMLDeclarationMultistage_HEV_Sx_PrimaryVehicleBusJobInputDataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLPrimaryVehicleBusJobInputData>().To<XMLDeclarationMultistage_HEV_IEPC_S_PrimaryVehicleBusJobInputDataProviderV01>()
+ .Named(XMLDeclarationMultistage_HEV_IEPC_S_PrimaryVehicleBusJobInputDataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLPrimaryVehicleBusJobInputData>().To<XMLDeclarationMultistage_PEV_Ex_PrimaryVehicleBusJobInputDataProviderV01>()
+ .Named(XMLDeclarationMultistage_PEV_Ex_PrimaryVehicleBusJobInputDataProviderV01.QUALIFIED_XSD_TYPE);
- Bind<IXMLPrimaryVehicleBusJobInputData>().To<XMLDeclarationMultistageExemptedPrimaryVehicleBusJobInputDataProviderV01>()
+ Bind<IXMLPrimaryVehicleBusJobInputData>().To<XMLDeclarationMultistage_PEV_IEPC_PrimaryVehicleBusJobInputDataProviderV01>()
+ .Named(XMLDeclarationMultistage_PEV_IEPC_PrimaryVehicleBusJobInputDataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLPrimaryVehicleBusJobInputData>().To<XMLDeclarationMultistageExemptedPrimaryVehicleBusJobInputDataProviderV01>()
.Named(XMLDeclarationMultistageExemptedPrimaryVehicleBusJobInputDataProviderV01.QUALIFIED_XSD_TYPE);
- Bind<IXMLJobDataReader>().To<XMLJobDataMultistagePrimaryVehicleReaderV01>()
- .Named(XMLJobDataMultistagePrimaryVehicleReaderV01.QUALIFIED_XSD_TYPE);
+ Bind<IXMLJobDataReader>().To<XMLJobDataMultistage_Conventional_PrimaryVehicleReaderV01>()
+ .Named(XMLJobDataMultistage_Conventional_PrimaryVehicleReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLJobDataReader>().To<XMLJobDataMultistage_HEV_Px_PrimaryVehicleReaderV01>()
+ .Named(XMLJobDataMultistage_HEV_Px_PrimaryVehicleReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLJobDataReader>().To<XMLJobDataMultistage_HEV_Sx_PrimaryVehicleReaderV01>()
+ .Named(XMLJobDataMultistage_HEV_Sx_PrimaryVehicleReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLJobDataReader>().To<XMLJobDataMultistage_HEV_IEPC_S_PrimaryVehicleReaderV01>()
+ .Named(XMLJobDataMultistage_HEV_IEPC_S_PrimaryVehicleReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLJobDataReader>().To<XMLJobDataMultistage_PEV_Ex_PrimaryVehicleReaderV01>()
+ .Named(XMLJobDataMultistage_PEV_Ex_PrimaryVehicleReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLJobDataReader>().To<XMLJobDataMultistage_PEV_IEPC_PrimaryVehicleReaderV01>()
+ .Named(XMLJobDataMultistage_PEV_IEPC_PrimaryVehicleReaderV01.QUALIFIED_XSD_TYPE);
Bind<IXMLJobDataReader>().To<XMLJobDataMultistageExemptedPrimaryVehicleReaderV01>()
.Named(XMLJobDataMultistageExemptedPrimaryVehicleReaderV01.QUALIFIED_XSD_TYPE);
- Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationMultistagePrimaryVehicleBusDataProviderV01>()
- .Named(XMLDeclarationMultistagePrimaryVehicleBusDataProviderV01.QUALIFIED_XSD_TYPE);
+ Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationMultistage_Conventional_PrimaryVehicleBusDataProviderV01>()
+ .Named(XMLDeclarationMultistage_Conventional_PrimaryVehicleBusDataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationMultistage_HEV_Px_PrimaryVehicleBusDataProviderV01>()
+ .Named(XMLDeclarationMultistage_HEV_Px_PrimaryVehicleBusDataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationMultistage_HEV_Sx_PrimaryVehicleBusDataProviderV01>()
+ .Named(XMLDeclarationMultistage_HEV_Sx_PrimaryVehicleBusDataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationMultistage_HEV_IEPC_S_PrimaryVehicleBusDataProviderV01>()
+ .Named(XMLDeclarationMultistage_HEV_IEPC_S_PrimaryVehicleBusDataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationMultistage_PEV_Ex_PrimaryVehicleBusDataProviderV01>()
+ .Named(XMLDeclarationMultistage_PEV_Ex_PrimaryVehicleBusDataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationMultistage_PEV_IEPC_PrimaryVehicleBusDataProviderV01>()
+ .Named(XMLDeclarationMultistage_PEV_IEPC_PrimaryVehicleBusDataProviderV01.QUALIFIED_XSD_TYPE);
Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationMultistageExemptedPrimaryVehicleBusDataProviderV01>()
.Named(XMLDeclarationMultistageExemptedPrimaryVehicleBusDataProviderV01.QUALIFIED_XSD_TYPE);
// -----------------------------------
- Bind<IXMLComponentReader>().To<XMLMultistagePrimaryVehicleBusComponentReaderV01>()
- .Named(XMLMultistagePrimaryVehicleBusComponentReaderV01.QUALIFIED_XSD_TYPE);
+ Bind<IXMLComponentReader>().To<XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01>()
+ .Named(XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLComponentReader>().To<XMLMultistagePrimaryVehicleBus_HEV_Px_ComponentReaderV01>()
+ .Named(XMLMultistagePrimaryVehicleBus_HEV_Px_ComponentReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLComponentReader>().To<XMLMultistagePrimaryVehicleBus_HEV_S2_ComponentReaderV01>()
+ .Named(XMLMultistagePrimaryVehicleBus_HEV_S2_ComponentReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLComponentReader>().To<XMLMultistagePrimaryVehicleBus_HEV_S3_ComponentReaderV01>()
+ .Named(XMLMultistagePrimaryVehicleBus_HEV_S3_ComponentReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLComponentReader>().To<XMLMultistagePrimaryVehicleBus_HEV_S4_ComponentReaderV01>()
+ .Named(XMLMultistagePrimaryVehicleBus_HEV_S4_ComponentReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLComponentReader>().To<XMLMultistagePrimaryVehicleBus_HEV_IEPC_S_ComponentReaderV01>()
+ .Named(XMLMultistagePrimaryVehicleBus_HEV_IEPC_S_ComponentReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLComponentReader>().To<XMLMultistagePrimaryVehicleBus_PEV_E2_ComponentReaderV01>()
+ .Named(XMLMultistagePrimaryVehicleBus_PEV_E2_ComponentReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLComponentReader>().To<XMLMultistagePrimaryVehicleBus_PEV_E3_ComponentReaderV01>()
+ .Named(XMLMultistagePrimaryVehicleBus_PEV_E3_ComponentReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLComponentReader>().To<XMLMultistagePrimaryVehicleBus_PEV_E4_ComponentReaderV01>()
+ .Named(XMLMultistagePrimaryVehicleBus_PEV_E4_ComponentReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLComponentReader>().To<XMLMultistagePrimaryVehicleBus_PEV_IEPC_ComponentReaderV01>()
+ .Named(XMLMultistagePrimaryVehicleBus_PEV_IEPC_ComponentReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLGearboxReader>().To<XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01>()
+ .Named(XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01.GEARBOX_READER_QUALIFIED_XSD_TYPE);
- Bind<IXMLGearboxReader>().To<XMLMultistagePrimaryVehicleBusComponentReaderV01>()
- .Named(XMLMultistagePrimaryVehicleBusComponentReaderV01.GEARBOX_READER_QUALIFIED_XSD_TYPE);
+ Bind<IXMLAxlesReader>().To<XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01>()
+ .Named(XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01.AXLES_READER_QUALIFIED_XSD_TYPE);
- Bind<IXMLAxlesReader>().To<XMLMultistagePrimaryVehicleBusComponentReaderV01>()
- .Named(XMLMultistagePrimaryVehicleBusComponentReaderV01.AXLES_READER_QUALIFIED_XSD_TYPE);
+ Bind<IXMLElectricMachineSystemReader>().To<XMLElectricMachineSystemReaderV01>().Named(XMLElectricMachineSystemReaderV01.QUALIFIED_XSD_TYPE);
+ Bind<IXMLElectricMachineSystemReader>().To<XMLElectricMachineSystemReaderV01>().Named(XMLElectricMachineSystemReaderV01.QUALIFIED_GEN_XSD_TYPE);
+
+ Bind<IXMLElectricStorageSystemDeclarationInputData>().To<XMLElectricStorageSystemDeclarationInputDataV01>()
+ .Named(XMLElectricStorageSystemDeclarationInputDataV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLREESSReader>().To<XMLREESSReaderV01>().Named(XMLREESSReaderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLBatteryPackDeclarationInputData>().To<XMLBatteryPackDeclarationDeclarationInputDataV01>()
+ .Named(XMLBatteryPackDeclarationDeclarationInputDataV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLSuperCapDeclarationInputData>().To<XMLSuperCapDeclarationInputDataV01>()
+ .Named(XMLSuperCapDeclarationInputDataV01.QUALIFIED_XSD_TYPE);
+
+ //Bind<IXMLADCDeclarationInputData>().To<XMLADCDeclarationInputDataV23>()
+ // .Named(XMLADCDeclarationInputDataV23.QUALIFIED_XSD_TYPE);
+
+
+
+ Bind<IXMLVehicleComponentsDeclaration>()
+ .To<XMLDeclarationComponentsMultistagePrimaryVehicleBus_Conventional_DataProviderV01>()
+ .Named(XMLDeclarationComponentsMultistagePrimaryVehicleBus_Conventional_DataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLVehicleComponentsDeclaration>()
+ .To<XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_Px_DataProviderV01>()
+ .Named(XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_Px_DataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLVehicleComponentsDeclaration>()
+ .To<XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_S2_DataProviderV01>()
+ .Named(XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_S2_DataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLVehicleComponentsDeclaration>()
+ .To<XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_S3_DataProviderV01>()
+ .Named(XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_S3_DataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLVehicleComponentsDeclaration>()
+ .To<XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_S4_DataProviderV01>()
+ .Named(XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_S4_DataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLVehicleComponentsDeclaration>()
+ .To<XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_IEPC_S_DataProviderV01>()
+ .Named(XMLDeclarationComponentsMultistagePrimaryVehicleBus_HEV_IEPC_S_DataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLVehicleComponentsDeclaration>()
+ .To<XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_E2_DataProviderV01>()
+ .Named(XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_E2_DataProviderV01.QUALIFIED_XSD_TYPE);
Bind<IXMLVehicleComponentsDeclaration>()
- .To<XMLDeclarationComponentsMultistagePrimaryVehicleBusDataProviderV01>()
- .Named(XMLDeclarationComponentsMultistagePrimaryVehicleBusDataProviderV01.QUALIFIED_XSD_TYPE);
+ .To<XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_E3_DataProviderV01>()
+ .Named(XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_E3_DataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLVehicleComponentsDeclaration>()
+ .To<XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_E4_DataProviderV01>()
+ .Named(XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_E4_DataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLVehicleComponentsDeclaration>()
+ .To<XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_IEPC_DataProviderV01>()
+ .Named(XMLDeclarationComponentsMultistagePrimaryVehicleBus_PEV_IEPC_DataProviderV01.QUALIFIED_XSD_TYPE);
// -----------------------------------
@@ -98,6 +237,17 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
Bind<IXMLResultsInputData>().To<XMLDeclarationMultistagePrimaryVehicleBusResultsInputDataProviderV01>()
.Named(XMLDeclarationMultistagePrimaryVehicleBusResultsInputDataProviderV01.QUALIFIED_XSD_TYPE);
+ Bind<IXMLElectricMachinesDeclarationInputData>().To<XMLDeclarationElectricMachinesDataProviderV01>().Named(
+ XMLDeclarationElectricMachinesDataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLElectricMachinesDeclarationInputData>().To<XMLDeclarationElectricMachinesDataProviderV01>().Named(
+ XMLDeclarationElectricMachinesDataProviderV01.QUALIFIED_GEN_XSD_TYPE);
+
+ Bind<IXMLElectricMotorDeclarationInputData>().To<XMLElectricMotorDeclarationInputDataProviderV01>()
+ .Named(XMLElectricMotorDeclarationInputDataProviderV01.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLIEPCInputData>().To<XMLElectricMotorIEPCIInputDataProviderV01>()
+ .Named(XMLElectricMotorIEPCIInputDataProviderV01.QUALIFIED_XSD_TYPE);
// -----------------------------------
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV24InjectModule.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV24InjectModule.cs
index 6d3098666294a5f40584badcc167690c1dbea1c8..ee30672666c20b4f285fd53dd77fe2eb861daca0 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV24InjectModule.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV24InjectModule.cs
@@ -19,11 +19,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationConventionalCompletedBusDataProviderV24>()
.Named(XMLDeclarationConventionalCompletedBusDataProviderV24.QUALIFIED_XSD_TYPE);
- Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationConventionalCompletedBusDataProviderV24>()
+ Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationHevCompletedBusDataProviderV24>()
.Named(XMLDeclarationHevCompletedBusDataProviderV24.QUALIFIED_XSD_TYPE);
- Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationConventionalCompletedBusDataProviderV24>()
+ Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationPeVompletedBusDataProviderV24>()
.Named(XMLDeclarationPeVompletedBusDataProviderV24.QUALIFIED_XSD_TYPE);
- Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationConventionalCompletedBusDataProviderV24>()
+ Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationIepcCompletedBusDataProviderV24>()
.Named(XMLDeclarationIepcCompletedBusDataProviderV24.QUALIFIED_XSD_TYPE);
Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationExemptedCompletedBusDataProviderV24>()
@@ -315,14 +315,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
Bind<IXMLIEPCInputData>().To<XMLElectricMotorIepciStandardInputDataProviderV23>()
.Named(XMLElectricMotorIepciStandardInputDataProviderV23.QUALIFIED_XSD_TYPE);
- Bind<IXMLElectricStorageSystemDeclarationInputData>().To<XMLElectricStorageSystemDeclarationInputData>()
- .Named(XMLElectricStorageSystemDeclarationInputData.QUALIFIED_XSD_TYPE);
+ Bind<IXMLElectricStorageSystemDeclarationInputData>().To<XMLElectricStorageSystemDeclarationInputDataV24>()
+ .Named(XMLElectricStorageSystemDeclarationInputDataV24.QUALIFIED_XSD_TYPE);
- Bind<IXMLBatteryPackDeclarationInputData>().To<XMLBatteryPackDeclarationDeclarationInputData>()
- .Named(XMLBatteryPackDeclarationDeclarationInputData.QUALIFIED_XSD_TYPE);
+ Bind<IXMLBatteryPackDeclarationInputData>().To<XMLBatteryPackDeclarationDeclarationInputDataV24>()
+ .Named(XMLBatteryPackDeclarationDeclarationInputDataV24.QUALIFIED_XSD_TYPE);
- Bind<IXMLSuperCapDeclarationInputData>().To<XMLSuperCapDeclarationInputData>()
- .Named(XMLSuperCapDeclarationInputData.QUALIFIED_XSD_TYPE);
+ Bind<IXMLSuperCapDeclarationInputData>().To<XMLSuperCapDeclarationInputDataV24>()
+ .Named(XMLSuperCapDeclarationInputDataV24.QUALIFIED_XSD_TYPE);
Bind<IXMLADCDeclarationInputData>().To<XMLADCDeclarationInputDataV23>()
.Named(XMLADCDeclarationInputDataV23.QUALIFIED_XSD_TYPE);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV26InjectModule.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV26InjectModule.cs
deleted file mode 100644
index 228888aa42a97cd10366bc0f4517e962434b795e..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV26InjectModule.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Ninject.Modules;
-using TUGraz.VectoCommon.InputData;
-using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
-using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Interfaces;
-using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader;
-using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl;
-
-namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules {
- public class XMLDeclarationInputDataV26InjectModule : NinjectModule
- {
- #region Overrides of NinjectModule
-
- public override void Load()
- {
-
-
- }
-
- #endregion
- }
-}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationReaderInjectModule.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationReaderInjectModule.cs
index cc6f795b7e7f2509428bda2e85fca9b4e41a896a..8115e26038546b04ea2c9a2cb52841a91f48f584 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationReaderInjectModule.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationReaderInjectModule.cs
@@ -52,7 +52,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
new XMLDeclarationInputDataV22InjectModule(),
new XMLDeclarationInputDataV221InjectModule(),
new XMLDeclarationInputDataV23InjectModule(),
- new XMLDeclarationInputDataV26InjectModule(),
new XMLDeclarationInputDataV24InjectModule(),
new XMLDeclarationInputDataMultistageV01InjectModule(),
});
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
index 259deb4bd6c3bb21604263687c2fab19a9989be9..f0fbde21e29c2a6ddf564843bf2020252e249139 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
@@ -558,13 +558,61 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
// ---------------------------------------------------------------------------------------
+ public class XMLElectricMachineSystemReaderV01 : AbstractComponentReader, IXMLElectricMachineSystemReader
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+ public const string XSD_TYPE = "ElectricMachineType";
+ public const string XSD_GEN_TYPE = "ElectricMachineGENType";
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+ public static readonly string QUALIFIED_GEN_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_GEN_TYPE);
+
+ [Inject]
+ public IDeclarationInjectFactory Factory { protected get; set; }
+
+ public XMLElectricMachineSystemReaderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode,
+ string sourceFile) : base(vehicle, componentNode)
+ {
+
+ }
+
+ #region Implementation of IXMLElectricMotorReader
+
+ public virtual IElectricMotorDeclarationInputData CreateElectricMachineSystem(XmlNode electricMachineSystem)
+ {
+ return CreateComponent(XMLNames.ElectricMachineSystem, ElectricMachinesCreator);
+ }
+
+ public virtual IADCDeclarationInputData ADCInputData {
+ get {
+ return CreateComponent("ADC", ADCCreator);
+ }
+ }
+
+
+ protected virtual IADCDeclarationInputData ADCCreator(string version,
+ XmlNode componentNode, string sourcefile)
+ {
+ return Factory.CreateADCDeclarationInputData(version, componentNode, sourcefile);
+ }
+
+ protected virtual IElectricMotorDeclarationInputData ElectricMachinesCreator(string version,
+ XmlNode componentNode, string sourcefile)
+ {
+ return Factory.CreateElectricMotorDeclarationInputData(version, componentNode, sourcefile);
+ }
+
+ #endregion
+ }
+
+ // ---------------------------------------------------------------------------------------
+
public class XMLREESSReaderV24 : AbstractComponentReader, IXMLREESSReader
{
public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_TYPE = "ElectricEnergyStorageType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
- [Inject] public IDeclarationInjectFactory Factory { protected get; set; }
+ [Inject] public virtual IDeclarationInjectFactory Factory { protected get; set; }
public XMLREESSReaderV24(IXMLDeclarationVehicleData vehicle, XmlNode componentNode,
string sourceFile) : base(vehicle, componentNode) { }
@@ -604,8 +652,21 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
}
// ---------------------------------------------------------------------------------------
+ public class XMLREESSReaderV01 : XMLREESSReaderV24
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+ public const string XSD_TYPE = "ElectricEnergyStorageType";
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
- public class XMLMultistagePrimaryVehicleBusComponentReaderV01 : XMLComponentReaderV20
+
+ public XMLREESSReaderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentNode,
+ string sourceFile) : base(vehicle, componentNode, sourceFile) { }
+
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01 : XMLComponentReaderV20
{
public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
@@ -619,7 +680,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
protected IBusAuxiliariesDeclarationData _busAuxInputData;
- public XMLMultistagePrimaryVehicleBusComponentReaderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode)
+ public XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode)
: base(vehicle, componentsNode) { }
public override IGearboxDeclarationInputData GearboxInputData => _gearboxInputData ?? (_gearboxInputData = CreateComponent(XMLNames.Component_Transmission, GearboxCreator));
@@ -638,6 +699,190 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
}
}
+ // ---------------------------------------------------------------------------------------
+ public class XMLMultistagePrimaryVehicleBus_HEV_Px_ComponentReaderV01 : XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01
+ {
+ public new static readonly XNamespace NAMESPACE_URI =
+ XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_HEV-Px_ComponentsVIFType";
+ //public new const string GEARBOX_READER_TYPE = "TransmissionDataVIFType";
+ //public new const string AXLES_READER_TYPE = "AxleWheelsDataVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ //public new static readonly string GEARBOX_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, GEARBOX_READER_TYPE);
+
+ //public new static readonly string AXLES_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, AXLES_READER_TYPE);
+
+ public XMLMultistagePrimaryVehicleBus_HEV_Px_ComponentReaderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode) : base (vehicle, componentsNode) {}
+ }
+
+ // ---------------------------------------------------------------------------------------
+ public class XMLMultistagePrimaryVehicleBus_HEV_S2_ComponentReaderV01 : XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01
+ {
+ public new static readonly XNamespace NAMESPACE_URI =
+ XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_HEV-S2_ComponentsVIFType";
+ //public new const string GEARBOX_READER_TYPE = "TransmissionDataVIFType";
+ //public new const string AXLES_READER_TYPE = "AxleWheelsDataVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ //public new static readonly string GEARBOX_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, GEARBOX_READER_TYPE);
+
+ //public new static readonly string AXLES_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, AXLES_READER_TYPE);
+
+ public XMLMultistagePrimaryVehicleBus_HEV_S2_ComponentReaderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode) : base(vehicle, componentsNode) { }
+
+ }
+
+ // ---------------------------------------------------------------------------------------
+ public class XMLMultistagePrimaryVehicleBus_HEV_S3_ComponentReaderV01 : XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01
+ {
+ public new static readonly XNamespace NAMESPACE_URI =
+ XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_HEV-S3_ComponentsVIFType";
+ //public new const string GEARBOX_READER_TYPE = "TransmissionDataVIFType";
+ //public new const string AXLES_READER_TYPE = "AxleWheelsDataVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ //public new static readonly string GEARBOX_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, GEARBOX_READER_TYPE);
+
+ //public new static readonly string AXLES_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, AXLES_READER_TYPE);
+
+ public XMLMultistagePrimaryVehicleBus_HEV_S3_ComponentReaderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode) : base(vehicle, componentsNode) { }
+ }
+
+ // ---------------------------------------------------------------------------------------
+ public class XMLMultistagePrimaryVehicleBus_HEV_S4_ComponentReaderV01 : XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01
+ {
+ public new static readonly XNamespace NAMESPACE_URI =
+ XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_HEV-S4_ComponentsVIFType";
+ //public new const string GEARBOX_READER_TYPE = "TransmissionDataVIFType";
+ //public new const string AXLES_READER_TYPE = "AxleWheelsDataVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ //public new static readonly string GEARBOX_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, GEARBOX_READER_TYPE);
+
+ //public new static readonly string AXLES_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, AXLES_READER_TYPE);
+
+ public XMLMultistagePrimaryVehicleBus_HEV_S4_ComponentReaderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode) : base(vehicle, componentsNode) { }
+
+ #region Overrides of XMLComponentReaderV10
+
+ public override IAxleGearInputData AxleGearInputData => null;
+
+ #endregion
+ }
+
+ // ---------------------------------------------------------------------------------------
+ public class XMLMultistagePrimaryVehicleBus_HEV_IEPC_S_ComponentReaderV01 : XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01
+ {
+ public new static readonly XNamespace NAMESPACE_URI =
+ XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_HEV-IEPC-S_ComponentsVIFType";
+ //public new const string GEARBOX_READER_TYPE = "TransmissionDataVIFType";
+ //public new const string AXLES_READER_TYPE = "AxleWheelsDataVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ //public new static readonly string GEARBOX_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, GEARBOX_READER_TYPE);
+
+ //public new static readonly string AXLES_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, AXLES_READER_TYPE);
+
+ public XMLMultistagePrimaryVehicleBus_HEV_IEPC_S_ComponentReaderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode) : base(vehicle, componentsNode) { }
+
+ #region Overrides of XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01
+
+ public override IGearboxDeclarationInputData GearboxInputData => null;
+
+ #endregion
+ }
+
+ // ---------------------------------------------------------------------------------------
+ public class XMLMultistagePrimaryVehicleBus_PEV_E2_ComponentReaderV01 : XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01
+ {
+ public new static readonly XNamespace NAMESPACE_URI =
+ XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_PEV-E2_ComponentsVIFType";
+ //public new const string GEARBOX_READER_TYPE = "TransmissionDataVIFType";
+ //public new const string AXLES_READER_TYPE = "AxleWheelsDataVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ //public new static readonly string GEARBOX_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, GEARBOX_READER_TYPE);
+
+ //public new static readonly string AXLES_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, AXLES_READER_TYPE);
+
+ public XMLMultistagePrimaryVehicleBus_PEV_E2_ComponentReaderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode) : base(vehicle, componentsNode) { }
+ }
+
+ // ---------------------------------------------------------------------------------------
+ public class XMLMultistagePrimaryVehicleBus_PEV_E3_ComponentReaderV01 : XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01
+ {
+ public new static readonly XNamespace NAMESPACE_URI =
+ XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_PEV-E3_ComponentsVIFType";
+ //public new const string GEARBOX_READER_TYPE = "TransmissionDataVIFType";
+ //public new const string AXLES_READER_TYPE = "AxleWheelsDataVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ //public new static readonly string GEARBOX_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, GEARBOX_READER_TYPE);
+
+ //public new static readonly string AXLES_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, AXLES_READER_TYPE);
+
+ public XMLMultistagePrimaryVehicleBus_PEV_E3_ComponentReaderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode) : base(vehicle, componentsNode) { }
+ }
+
+ // ---------------------------------------------------------------------------------------
+ public class XMLMultistagePrimaryVehicleBus_PEV_E4_ComponentReaderV01 : XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01
+ {
+ public new static readonly XNamespace NAMESPACE_URI =
+ XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_PEV-E4_ComponentsVIFType";
+ //public new const string GEARBOX_READER_TYPE = "TransmissionDataVIFType";
+ //public new const string AXLES_READER_TYPE = "AxleWheelsDataVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ //public new static readonly string GEARBOX_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, GEARBOX_READER_TYPE);
+
+ //public new static readonly string AXLES_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, AXLES_READER_TYPE);
+
+ public XMLMultistagePrimaryVehicleBus_PEV_E4_ComponentReaderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode) : base(vehicle, componentsNode) { }
+ }
+
+ // ---------------------------------------------------------------------------------------
+ public class XMLMultistagePrimaryVehicleBus_PEV_IEPC_ComponentReaderV01 : XMLMultistagePrimaryVehicleBus_Conventional_ComponentReaderV01
+ {
+ public new static readonly XNamespace NAMESPACE_URI =
+ XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public new const string XSD_TYPE = "Vehicle_PEV-IEPC_ComponentsVIFType";
+ //public new const string GEARBOX_READER_TYPE = "TransmissionDataVIFType";
+ //public new const string AXLES_READER_TYPE = "AxleWheelsDataVIFType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ //public new static readonly string GEARBOX_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, GEARBOX_READER_TYPE);
+
+ //public new static readonly string AXLES_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, AXLES_READER_TYPE);
+
+ public XMLMultistagePrimaryVehicleBus_PEV_IEPC_ComponentReaderV01(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode) : base(vehicle, componentsNode) { }
+ }
+
// ---------------------------------------------------------------------------------------
public class XMLPrimaryBusHEVPxDeclarationComponentReaderV201 : XMLComponentReaderV10
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
index b30e1819905547827656caee6e8c7c1c4e348583..14f4b96240ffd26de9e170fc1624c6498cf5b8b4 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
@@ -592,8 +592,22 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
////return _manufacturingStages.Any(x => x.Vehicle.ExemptedVehicle);
}
}
- public VehicleCategory VehicleCategory { get => VehicleDeclarationType == VehicleDeclarationType.final ? VehicleCategory.HeavyBusCompletedVehicle : VehicleCategory.HeavyBusInterimVehicle; }
- public AxleConfiguration AxleConfiguration { get; }
+ public VehicleCategory VehicleCategory
+ {
+ get
+ {
+ if (ExemptedVehicle) {
+ return IsInputDataCompleteExempted(VectoSimulationJobType.ConventionalVehicle, false)
+ ? VehicleCategory.HeavyBusCompletedVehicle
+ : VehicleCategory.HeavyBusInterimVehicle;
+ }
+ return VehicleDeclarationType == VehicleDeclarationType.final
+ ? VehicleCategory.HeavyBusCompletedVehicle
+ : VehicleCategory.HeavyBusInterimVehicle;
+ }
+ }
+
+ public AxleConfiguration AxleConfiguration => _primaryVehicle.Vehicle.AxleConfiguration;
public IList<ITorqueLimitInputData> TorqueLimits { get; }
public PerSecond EngineIdleSpeed { get; }
@@ -869,7 +883,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
private bool PrimaryGearboxIsAT()
{
- switch (_primaryVehicleData.Components.GearboxInputData.Type) {
+ switch (_primaryVehicleData.Components.GearboxInputData?.Type) {
case GearboxType.ATPowerSplit:
case GearboxType.ATSerial:
return true;
@@ -1029,6 +1043,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public SquareMeter TransferredAirDragArea => AirdragEntry?.TransferredAirDragArea;
public SquareMeter AirDragArea_0 => AirdragEntry.AirDragArea_0;
+
+ public XmlNode XMLSource => AirdragEntry.XMLSource;
public DataSource DataSource => AirdragEntry?.DataSource;
public bool SavedInDeclarationMode { get; }
@@ -1072,6 +1088,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
private ConsolidateElectricConsumerData _consolidateElectricConsumerData;
private ConsolidatedHVACBusAuxiliariesData _consolidatedHVACBusAuxiliariesData;
private XmlNode _xmlNode;
+ private IList<string> _consolidateSteeringPumpData;
public ConsolidatedBusAuxiliariesData(IEnumerable<IManufacturingStageInputData> manufacturingStages)
@@ -1181,10 +1198,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
}
}
+
// ---------------------------------------------------------------------------------------
- public class ConsolidateElectricConsumerData : ConsolidatedDataBase, IElectricConsumersDeclarationData
+ public class ConsolidateElectricConsumerData : ConsolidatedDataBase, IElectricConsumersDeclarationData
{
public ConsolidateElectricConsumerData(IEnumerable<IManufacturingStageInputData> manufacturingStages)
: base(manufacturingStages) { }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLJobDataReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLJobDataReader.cs
index 71682ad5986a59a61fa2560f6dea64a47e6f4b6e..7abb3d9dfbe0f5541353a31baf57f4f25a01fdae 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLJobDataReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLJobDataReader.cs
@@ -137,7 +137,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
// ---------------------------------------------------------------------------------------
- public class XMLJobDataMultistagePrimaryVehicleReaderV01 : AbstractComponentReader, IXMLJobDataReader
+ public class XMLJobDataMultistage_Conventional_PrimaryVehicleReaderV01 : AbstractComponentReader, IXMLJobDataReader
{
public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
@@ -153,7 +153,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
private readonly IXMLPrimaryVehicleBusJobInputData _primaryBusJobData;
- public XMLJobDataMultistagePrimaryVehicleReaderV01(IXMLPrimaryVehicleBusJobInputData busJobData, XmlNode jobNode)
+ public XMLJobDataMultistage_Conventional_PrimaryVehicleReaderV01(IXMLPrimaryVehicleBusJobInputData busJobData, XmlNode jobNode)
: base(busJobData, jobNode)
{
_primaryBusJobData = busJobData;
@@ -173,11 +173,86 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
// ---------------------------------------------------------------------------------------
- public class XMLJobDataMultistageExemptedPrimaryVehicleReaderV01 : XMLJobDataMultistagePrimaryVehicleReaderV01
+ public class XMLJobDataMultistage_HEV_Px_PrimaryVehicleReaderV01 : XMLJobDataMultistage_Conventional_PrimaryVehicleReaderV01
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public const string XSD_TYPE = "HEV-Px_VehicleVIFType";
+
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLJobDataMultistage_HEV_Px_PrimaryVehicleReaderV01(IXMLPrimaryVehicleBusJobInputData busJobData, XmlNode jobNode)
+ : base(busJobData, jobNode)
+ { }
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLJobDataMultistage_HEV_Sx_PrimaryVehicleReaderV01 : XMLJobDataMultistage_Conventional_PrimaryVehicleReaderV01
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public const string XSD_TYPE = "HEV-Sx_VehicleVIFType";
+
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLJobDataMultistage_HEV_Sx_PrimaryVehicleReaderV01(IXMLPrimaryVehicleBusJobInputData busJobData, XmlNode jobNode)
+ : base(busJobData, jobNode)
+ { }
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLJobDataMultistage_HEV_IEPC_S_PrimaryVehicleReaderV01 : XMLJobDataMultistage_Conventional_PrimaryVehicleReaderV01
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public const string XSD_TYPE = "HEV-IEPC-S_VehicleVIFType";
+
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLJobDataMultistage_HEV_IEPC_S_PrimaryVehicleReaderV01(IXMLPrimaryVehicleBusJobInputData busJobData, XmlNode jobNode)
+ : base(busJobData, jobNode)
+ { }
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLJobDataMultistage_PEV_Ex_PrimaryVehicleReaderV01 : XMLJobDataMultistage_Conventional_PrimaryVehicleReaderV01
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public const string XSD_TYPE = "PEV_Ex_VehicleVIFType";
+
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLJobDataMultistage_PEV_Ex_PrimaryVehicleReaderV01(IXMLPrimaryVehicleBusJobInputData busJobData, XmlNode jobNode)
+ : base(busJobData, jobNode)
+ { }
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLJobDataMultistage_PEV_IEPC_PrimaryVehicleReaderV01 : XMLJobDataMultistage_Conventional_PrimaryVehicleReaderV01
+ {
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
+
+ public const string XSD_TYPE = "IEPC_VehicleVIFType";
+
+ public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLJobDataMultistage_PEV_IEPC_PrimaryVehicleReaderV01(IXMLPrimaryVehicleBusJobInputData busJobData, XmlNode jobNode)
+ : base(busJobData, jobNode)
+ { }
+ }
+
+ // ---------------------------------------------------------------------------------------
+
+ public class XMLJobDataMultistageExemptedPrimaryVehicleReaderV01 : XMLJobDataMultistage_Conventional_PrimaryVehicleReaderV01
{
public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
- public new const string XSD_TYPE = "VehicleExemptedPrimaryBusType";
+ public new const string XSD_TYPE = "Exempted_VehicleVIFType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleComponentsDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleComponentsDataProvider.cs
index 382c34b66996136bcfaae75b8e546dcefd723eaa..95ab45b0b57193249b44774ccd6ad187671261dc 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleComponentsDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleComponentsDataProvider.cs
@@ -93,12 +93,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public virtual IElectricStorageSystemEngineeringInputData ElectricStorage => null;
public virtual IElectricMachinesEngineeringInputData ElectricMachines => null;
+ public IIEPCEngineeringInputData IEPCEngineeringInputData => null;
#endregion
#region Implementation of IXMLResource
-
+
#endregion
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/XMLInputDataFactory.cs b/VectoCore/VectoCore/InputData/FileIO/XML/XMLInputDataFactory.cs
index 31163f17f984a89a0828caa419b6856163e548b9..0a144792ccb442b556c992178fb3ad4566311877 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/XMLInputDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/XMLInputDataFactory.cs
@@ -155,7 +155,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML
}
}
- protected virtual IMultistageBusInputDataProvider ReadMultistageDeclarationJob(XmlDocument xmlDoc, string source)
+ protected virtual IMultistepBusInputDataProvider ReadMultistageDeclarationJob(XmlDocument xmlDoc, string source)
{
var versionNumber = XMLHelper.GetXsdType(xmlDoc.DocumentElement?.SchemaInfo.SchemaType);
try {
diff --git a/VectoCore/VectoCore/InputData/Impl/InputData.cs b/VectoCore/VectoCore/InputData/Impl/InputData.cs
index e3a7d4c85dfe044c14a3dad93e055fc48597a4c4..903a0d7ffe3656de5604285dbf323ec0b26dfabe 100644
--- a/VectoCore/VectoCore/InputData/Impl/InputData.cs
+++ b/VectoCore/VectoCore/InputData/Impl/InputData.cs
@@ -284,7 +284,7 @@ namespace TUGraz.VectoCore.InputData.Impl
public Kilogram TotalVehicleMass { get; internal set; }
public Kilogram Payload { get; internal set; }
public double PassengerCount { get; internal set; }
- public string FuelMode { get; internal set; }
+ //public string FuelMode { get; internal set; }
}
public class ApplicationInformation : IApplicationInformation
diff --git a/VectoCore/VectoCore/InputData/Reader/ComponentData/BatterySOCReader.cs b/VectoCore/VectoCore/InputData/Reader/ComponentData/BatterySOCReader.cs
index ac3b230f9ed4ad3710a0cc62dbfce276a1595ebc..26ed7e131ef7253f6869037009847f5a968fb5dc 100644
--- a/VectoCore/VectoCore/InputData/Reader/ComponentData/BatterySOCReader.cs
+++ b/VectoCore/VectoCore/InputData/Reader/ComponentData/BatterySOCReader.cs
@@ -2,6 +2,7 @@
using System.IO;
using System.Linq;
using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Battery;
@@ -50,4 +51,21 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData {
public const string BatteryVoltage = "V";
}
}
+
+ public static class BatteryHelper
+ {
+ public static WattSecond TotalUsableCapacityInSimulation(this IBatteryPackDeclarationInputData batteryData)
+ {
+ var tmp = BatterySOCReader.Create(batteryData.VoltageCurve);
+ var voltage = tmp.Lookup(((batteryData.MinSOC ?? 0) + (batteryData.MaxSOC ?? 1)) / 2.0);
+ return batteryData.Capacity * voltage;
+ }
+
+ public static WattSecond TotalStorageCapacity(this IBatteryPackDeclarationInputData batteryData)
+ {
+ var tmp = BatterySOCReader.Create(batteryData.VoltageCurve);
+ var voltage = tmp.Lookup(((batteryData.MinSOC ?? 0) + (batteryData.MaxSOC ?? 1)) / 2.0);
+ return batteryData.Capacity * voltage;
+ }
+ }
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricFullLoadCurveReader.cs b/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricFullLoadCurveReader.cs
index e914ea7a2143896c5f7cd4796c6f262f890320da..222f26ef5a2e828a8b9b0150bdef4f268583c0c4 100644
--- a/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricFullLoadCurveReader.cs
+++ b/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricFullLoadCurveReader.cs
@@ -3,7 +3,6 @@ using System.IO;
using System.Linq;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Utils;
-using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor;
using TUGraz.VectoCore.Utils;
@@ -55,39 +54,4 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData
public const string GenerationTorque = "T_recuperation";
}
}
-
- public static class ElectricMotorDragCurveReader
- {
- public static DragCurve Create(DataTable data, int count)
- {
- if (data.Columns.Count < 2) {
- throw new VectoException("Drag Curve must contain at least 2 columns");
- }
-
- if (data.Rows.Count < 2) {
- throw new VectoException("Drag Curve must contain at least 2 rows with numeric values");
- }
-
- if (!HeaderIsValid(data.Columns)) {
- data.Columns[0].ColumnName = Fields.MotorSpeed;
- data.Columns[1].ColumnName = Fields.DragTorque;
- }
- return new DragCurve(data.AsEnumerable().Cast<DataRow>().Select(x => new DragCurve.DragLoadEntry() {
- MotorSpeed = x.ParseDouble(Fields.MotorSpeed).RPMtoRad(), // / ratio,
- DragTorque = -x.ParseDouble(Fields.DragTorque).SI<NewtonMeter>() * count, // * ratio / efficiency
- }).ToList());
- }
-
- private static bool HeaderIsValid(DataColumnCollection columns)
- {
- return columns.Contains(Fields.MotorSpeed) && columns.Contains(Fields.DragTorque);
- }
-
- public static class Fields
- {
- public const string MotorSpeed = "n";
-
- public const string DragTorque = "T_drag";
- }
- }
}
diff --git a/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorDragCurveReader.cs b/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorDragCurveReader.cs
new file mode 100644
index 0000000000000000000000000000000000000000..0714cd6cbb899cd1e319951d64013d985ad82994
--- /dev/null
+++ b/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorDragCurveReader.cs
@@ -0,0 +1,44 @@
+using System.Data;
+using System.Linq;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.InputData.Reader.ComponentData
+{
+ public static class ElectricMotorDragCurveReader
+ {
+ public static DragCurve Create(DataTable data, int count)
+ {
+ if (data.Columns.Count < 2) {
+ throw new VectoException("Drag Curve must contain at least 2 columns");
+ }
+
+ if (data.Rows.Count < 2) {
+ throw new VectoException("Drag Curve must contain at least 2 rows with numeric values");
+ }
+
+ if (!HeaderIsValid(data.Columns)) {
+ data.Columns[0].ColumnName = Fields.MotorSpeed;
+ data.Columns[1].ColumnName = Fields.DragTorque;
+ }
+ return new DragCurve(data.AsEnumerable().Cast<DataRow>().Select(x => new DragCurve.DragLoadEntry() {
+ MotorSpeed = x.ParseDouble(Fields.MotorSpeed).RPMtoRad(), // / ratio,
+ DragTorque = -x.ParseDouble(Fields.DragTorque).SI<NewtonMeter>() * count, // * ratio / efficiency
+ }).ToList());
+ }
+
+ private static bool HeaderIsValid(DataColumnCollection columns)
+ {
+ return columns.Contains(Fields.MotorSpeed) && columns.Contains(Fields.DragTorque);
+ }
+
+ public static class Fields
+ {
+ public const string MotorSpeed = "n";
+
+ public const string DragTorque = "T_drag";
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorMapReader.cs b/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorMapReader.cs
index d59b6c034864c960e6c3cf92afac88bea0ee0bb8..9e618d77472d984bfde999b651a6088a66981605 100644
--- a/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorMapReader.cs
+++ b/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorMapReader.cs
@@ -4,6 +4,7 @@ using System.Data;
using System.IO;
using System.Linq;
using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
@@ -13,7 +14,7 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.InputData.Reader.ComponentData {
- public static class ElectricMotorMapReader
+ public class ElectricMotorMapReader
{
public static EfficiencyMap Create(Stream data, int count)
{
@@ -24,7 +25,7 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData {
{
var headerValid = HeaderIsValid(data.Columns);
if (!headerValid) {
- LoggingObject.Logger<FuelConsumptionMap>().Warn(
+ LoggingObject.Logger<ElectricMotorMapReader>().Warn(
"Efficiency Map: Header Line is not valid. Expected: '{0}, {1}, {2}', Got: {3}. Falling back to column index.",
Fields.MotorSpeed,
Fields.Torque,
@@ -148,8 +149,7 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData {
public const string Torque = "T";
public const string PowerElectrical = "P_el";
}
+
+
}
-
-
-
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/Reader/ComponentData/IEPCDragCurveReader.cs b/VectoCore/VectoCore/InputData/Reader/ComponentData/IEPCDragCurveReader.cs
new file mode 100644
index 0000000000000000000000000000000000000000..06ab1f11507a639579c9e96aeb4d640f717da2fd
--- /dev/null
+++ b/VectoCore/VectoCore/InputData/Reader/ComponentData/IEPCDragCurveReader.cs
@@ -0,0 +1,44 @@
+using System.Data;
+using System.Linq;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.InputData.Reader.ComponentData
+{
+ public static class IEPCDragCurveReader
+ {
+ public static DragCurve Create(DataTable data, int count, double ratio)
+ {
+ if (data.Columns.Count < 2) {
+ throw new VectoException("Drag Curve must contain at least 2 columns");
+ }
+
+ if (data.Rows.Count < 2) {
+ throw new VectoException("Drag Curve must contain at least 2 rows with numeric values");
+ }
+
+ if (!HeaderIsValid(data.Columns)) {
+ data.Columns[0].ColumnName = Fields.MotorSpeed;
+ data.Columns[1].ColumnName = Fields.DragTorque;
+ }
+ return new DragCurve(data.AsEnumerable().Cast<DataRow>().Select(x => new DragCurve.DragLoadEntry() {
+ MotorSpeed = x.ParseDouble(Fields.MotorSpeed).RPMtoRad() * ratio,
+ DragTorque = -x.ParseDouble(Fields.DragTorque).SI<NewtonMeter>() * count / ratio // / efficiency
+ }).ToList());
+ }
+
+ private static bool HeaderIsValid(DataColumnCollection columns)
+ {
+ return columns.Contains(Fields.MotorSpeed) && columns.Contains(Fields.DragTorque);
+ }
+
+ public static class Fields
+ {
+ public const string MotorSpeed = "n_out";
+
+ public const string DragTorque = "T_drag_out";
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/Reader/ComponentData/IEPCFullLoadCurveReader.cs b/VectoCore/VectoCore/InputData/Reader/ComponentData/IEPCFullLoadCurveReader.cs
new file mode 100644
index 0000000000000000000000000000000000000000..0d89f874d44a2ce98811893ba8ce20bab1a1a322
--- /dev/null
+++ b/VectoCore/VectoCore/InputData/Reader/ComponentData/IEPCFullLoadCurveReader.cs
@@ -0,0 +1,57 @@
+using System.Data;
+using System.IO;
+using System.Linq;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.InputData.Reader.ComponentData
+{
+ public static class IEPCFullLoadCurveReader
+ {
+ public static ElectricMotorFullLoadCurve Read(Stream str, int count, double ratio)
+ {
+ return Create(VectoCSVFile.ReadStream(str), count, ratio);
+ }
+
+ public static ElectricMotorFullLoadCurve Create(DataTable data, int count, double ratio)
+ {
+ if (data.Columns.Count < 3) {
+ throw new VectoException("Motor FullLoadCurve Data must contain at least 3 columns");
+ }
+ if (data.Rows.Count < 2) {
+ throw new VectoException("Motor FullLoadCurve Data must contain at least 2 rows with numeric values");
+ }
+
+ if (!HeaderIsValid(data.Columns)) {
+ data.Columns[0].ColumnName = Fields.MotorSpeed;
+ data.Columns[1].ColumnName = Fields.DrivingTorque;
+ data.Columns[2].ColumnName = Fields.GenerationTorque;
+ }
+
+ return new ElectricMotorFullLoadCurve(
+ (from DataRow row in data.Rows
+ select new ElectricMotorFullLoadCurve.FullLoadEntry {
+ MotorSpeed = row.ParseDouble(Fields.MotorSpeed).RPMtoRad() * ratio,
+ FullDriveTorque = -row.ParseDouble(Fields.DrivingTorque).SI<NewtonMeter>() * count / ratio, // * efficiency,
+ FullGenerationTorque = -row.ParseDouble(Fields.GenerationTorque).SI<NewtonMeter>() * count / ratio // / efficiency
+ }).ToList());
+ }
+
+ private static bool HeaderIsValid(DataColumnCollection dataColumns)
+ {
+ return dataColumns.Contains(Fields.MotorSpeed) && dataColumns.Contains(Fields.DrivingTorque) &&
+ dataColumns.Contains(Fields.GenerationTorque);
+ }
+
+ public static class Fields
+ {
+ public const string MotorSpeed = "n_out";
+
+ public const string DrivingTorque = "T_drive_out";
+
+ public const string GenerationTorque = "T_recuperation_out";
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/Reader/ComponentData/IEPCMapReader.cs b/VectoCore/VectoCore/InputData/Reader/ComponentData/IEPCMapReader.cs
new file mode 100644
index 0000000000000000000000000000000000000000..cc6d9229d7d4f40da249ecb19269ea0a8486aa2f
--- /dev/null
+++ b/VectoCore/VectoCore/InputData/Reader/ComponentData/IEPCMapReader.cs
@@ -0,0 +1,152 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.InputData.Reader.ComponentData
+{
+ public class IEPCMapReader
+ {
+ public static EfficiencyMap Create(Stream data, int count, double ratio)
+ {
+ return Create(VectoCSVFile.ReadStream(data), count, ratio);
+ }
+
+ public static EfficiencyMap Create(DataTable data, int count, double ratio)
+ {
+ var headerValid = HeaderIsValid(data.Columns);
+ if (!headerValid) {
+ LoggingObject.Logger<IEPCMapReader>().Warn(
+ "Efficiency Map: Header Line is not valid. Expected: '{0}, {1}, {2}', Got: {3}. Falling back to column index.",
+ Fields.MotorSpeed,
+ Fields.Torque,
+ Fields.PowerElectrical,
+ data.Columns.Cast<DataColumn>().Select(c => c.ColumnName).Join());
+ data.Columns[0].ColumnName = Fields.MotorSpeed;
+ data.Columns[1].ColumnName = Fields.Torque;
+ data.Columns[2].ColumnName = Fields.PowerElectrical;
+ }
+
+ var entries = (from DataRow row in data.Rows select CreateEntry(row, ratio)).ToList();
+ var entriesZero = GetEntriesAtZeroRpm(entries);
+
+ var delaunayMap = new DelaunayMap("ElectricMotorEfficiencyMap Mechanical to Electric");
+ var retVal = new EfficiencyMapNew(delaunayMap);
+
+ foreach (var entry in entriesZero.OrderBy(x => x.Torque)) {
+ try {
+ delaunayMap.AddPoint(-entry.Torque.Value() * count,
+ 0,
+ retVal.GetDelaunayZValue(entry) * count);
+ } catch (Exception e) {
+ throw new VectoException($"EfficiencyMap - Entry {entry}: {e.Message}", e);
+ }
+ }
+
+ foreach (var entry in entries.Where(x => x.MotorSpeed.IsGreater(0)).OrderBy(x => x.MotorSpeed)
+ .ThenBy(x => x.Torque)) {
+ try {
+ delaunayMap.AddPoint(-entry.Torque.Value() * count,
+ entry.MotorSpeed.Value(),
+ retVal.GetDelaunayZValue(entry) * count);
+ } catch (Exception e) {
+ throw new VectoException($"EfficiencyMap - Entry {entry}: {e.Message}", e);
+ }
+ }
+
+ delaunayMap.Triangulate();
+ return retVal;
+ }
+
+ private static List<EfficiencyMap.Entry> GetEntriesAtZeroRpm(List<EfficiencyMap.Entry> entries)
+ {
+ // find entries at first grid point above 0. em-speed might vary slightly,
+ // so apply clustering, and use distance between first clusters to select all entries at lowest speed grid point
+
+ const int numEntriesExtrapolationFitting = 4;
+
+ var speeds = new MeanShiftClustering() { ClusterCount = 100 }.FindClusters(entries.Select(x => x.MotorSpeed.AsRPM).ToArray(), 10)
+ .Where(x => x > 0).ToList();
+ var lowerSpeed = speeds.First().RPMtoRad() / 2.0;
+ var upperSpeed = speeds.First().RPMtoRad() + (speeds[1] - speeds.First()).RPMtoRad() / 2.0;
+
+ //entries at lowest speed gridpoint
+ var torquesMinRpm = entries.Where(x => x.MotorSpeed.IsBetween(lowerSpeed, upperSpeed)).OrderBy(x => x.Torque).ToList();
+ // entries at 0 rpm grid point
+ var torquesZeroRpm = entries.Where(x => x.MotorSpeed.IsEqual(0)).OrderBy(x => x.Torque).ToList();
+ if (torquesZeroRpm.Count == 0) {
+ throw new VectoException("Electric Motor PowerMap contains no entries at 0 rpm!");
+ }
+
+ var entriesZero = new List<EfficiencyMap.Entry>();
+ var avgSpeed = torquesMinRpm.Average(x => x.MotorSpeed.Value()).SI<PerSecond>();
+ var torquesZeroMin = torquesZeroRpm.Min(x => x.Torque);
+ // if at 0 rpm a torque entry below the min torque at min speed is present, extrapolate to this torque
+ if (torquesZeroMin.IsSmaller(torquesMinRpm.Min(x => x.Torque))) {
+ // extrapolate entry at 0 rpm with min torque
+ var negTorque = torquesMinRpm.Where(x => x.Torque <= 0).OrderBy(x => x.Torque).ToList();
+ if (negTorque.Count < 2) {
+ throw new VectoException(
+ "Failed to generate electric power map - at least two negative entries are required");
+ }
+
+ var (k, d) = VectoMath.LeastSquaresFitting(negTorque.Take(numEntriesExtrapolationFitting), x => x.Torque.Value(),
+ x => x.PowerElectrical.Value());
+ var extrapolatedPwr = (torquesZeroMin.Value() * k + d).SI<Watt>();
+ entriesZero.Add(new EfficiencyMap.Entry(avgSpeed, torquesZeroMin, extrapolatedPwr));
+ }
+ // copy all entries in-between
+ foreach (var entry in torquesMinRpm) {
+ entriesZero.Add(new EfficiencyMap.Entry(avgSpeed, entry.Torque, entry.PowerElectrical));
+ }
+
+ // if at 0 rpm a torque entry above the max torqe at min speed is present, extrapolate to this torque
+ var torquesZeroMax = torquesZeroRpm.Max(x => x.Torque);
+ if (torquesZeroMax.IsGreater(torquesMinRpm.Max(x => x.Torque))) {
+ // extrapolate entry at 0 rpm with max torque
+ var posTorque = torquesMinRpm.Where(x => x.Torque >= 0).OrderBy(x => x.Torque).Reverse().ToList();
+ if (posTorque.Count < 2) {
+ throw new VectoException(
+ "Failed to generate electrip power map - at least two positive entries are required");
+ }
+
+ var (k, d) = VectoMath.LeastSquaresFitting(posTorque.Take(numEntriesExtrapolationFitting), x => x.Torque.Value(),
+ x => x.PowerElectrical.Value());
+ var extrapolatedPwr = (torquesZeroMax.Value() * k + d).SI<Watt>();
+ entriesZero.Add(new EfficiencyMap.Entry(avgSpeed, torquesZeroRpm.Max(x => x.Torque), extrapolatedPwr));
+ }
+
+ return entriesZero;
+ }
+
+ private static EfficiencyMap.Entry CreateEntry(DataRow row, double ratio)
+ {
+ return new EfficiencyMap.Entry(
+ speed: row.ParseDouble(Fields.MotorSpeed).RPMtoRad() * ratio,
+ torque: row.ParseDouble(Fields.Torque).SI<NewtonMeter>() / ratio,
+ powerElectrical: row.ParseDouble(Fields.PowerElectrical).SI(Unit.SI.Kilo.Watt).Cast<Watt>());
+ }
+
+
+ private static bool HeaderIsValid(DataColumnCollection columns)
+ {
+ return columns.Contains(Fields.MotorSpeed) && columns.Contains(Fields.Torque) &&
+ columns.Contains(Fields.PowerElectrical);
+ }
+
+ public static class Fields
+ {
+ public const string MotorSpeed = "n_out";
+ public const string Torque = "T_out";
+ public const string PowerElectrical = "P_el";
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusGeneric.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusGeneric.cs
index e96fd6c86edfcba667b4efb628b1425bb8cfe4d4..8d8b4f2750b4d7f91720c9fee5146c84e08e01a6 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusGeneric.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusGeneric.cs
@@ -25,6 +25,14 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
#region Overrides of DeclarationDataAdapterPrimaryBus
+ public override DriverData CreateDriverData()
+ {
+ var retVal = base.CreateDriverData();
+ retVal.LookAheadCoasting.Enabled = false;
+ retVal.OverSpeed.Enabled = false;
+ return retVal;
+ }
+
public override VehicleData CreateVehicleData(
IVehicleDeclarationInputData data, Segment segment, Mission mission, KeyValuePair<LoadingType, Tuple<Kilogram, double?>> loading, bool allowVocational)
{
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
index b2d437bb2d471ae5387a829f6757d700d2a0b5a4..b11c599c0695fa580b9b2254e5113d525004d290 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
@@ -168,8 +168,10 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
Current = spPower / Constants.BusAuxiliaries.ElectricSystem.PowernetVoltage
};
- var fanPower = DeclarationData.Fan.LookupElectricalPowerDemand(
- vehicleClass, mission.MissionType, busAuxPrimary.FanTechnology);
+ var fanPower = vehicleData.VehicleType == VectoSimulationJobType.BatteryElectricVehicle
+ ? 0.SI<Watt>()
+ : DeclarationData.Fan.LookupElectricalPowerDemand(
+ vehicleClass, mission.MissionType, busAuxPrimary.FanTechnology);
retVal[Constants.Auxiliaries.IDs.Fan] = new ElectricConsumerEntry {
ActiveDuringEngineStopStandstill = false,
ActiveDuringEngineStopDriving = false,
@@ -183,9 +185,14 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
IVehicleDeclarationInputData completedVehicle)
{
return new PneumaticUserInputsConfig {
- CompressorMap = DeclarationData.BusAuxiliaries.GetCompressorMap(primaryBusAuxiliaries.PneumaticSupply.CompressorSize, primaryBusAuxiliaries.PneumaticSupply.Clutch),
+ CompressorMap = completedVehicle.VehicleType == VectoSimulationJobType.BatteryElectricVehicle
+ ? null
+ : DeclarationData.BusAuxiliaries.GetCompressorMap(
+ primaryBusAuxiliaries.PneumaticSupply.CompressorSize,
+ primaryBusAuxiliaries.PneumaticSupply.Clutch),
CompressorGearEfficiency = Constants.BusAuxiliaries.PneumaticUserConfig.CompressorGearEfficiency,
- CompressorGearRatio = primaryBusAuxiliaries.PneumaticSupply.Ratio,
+ CompressorGearRatio = completedVehicle.VehicleType == VectoSimulationJobType.BatteryElectricVehicle
+ ? 0 : primaryBusAuxiliaries.PneumaticSupply.Ratio,
SmartAirCompression = primaryBusAuxiliaries.PneumaticSupply.SmartAirCompression,
SmartRegeneration = primaryBusAuxiliaries.PneumaticSupply.SmartRegeneration,
KneelingHeight = VectoMath.Max(0.SI<Meter>(),
@@ -345,6 +352,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
Mission mission)
{
var hvacConfiguration = completedVehicle.Components.BusAuxiliaries.HVACAux.SystemConfiguration;
+ if (!hvacConfiguration.HasValue || hvacConfiguration.IsOneOf(BusHVACSystemConfiguration.Configuration0, BusHVACSystemConfiguration.Unknown )) {
+ throw new VectoException(
+ $"HVAC Configuration {hvacConfiguration.ToXmlFormat()} is invalid for final step");
+ }
+
var correctionLengthDrivetrainVolume = DeclarationData.BusAuxiliaries.CorrectionLengthDrivetrainVolume(
completedVehicle.VehicleCode, completedVehicle.LowEntry, primaryVehicle.AxleConfiguration.NumAxles(),
primaryVehicle.Articulated);
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterMultistageBus.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterMultistageBus.cs
index d4895ea0363ba2a54b1f941e3d0fe50cfd503419..45f045e6f4807422299308d2936e76e721fbe85e 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterMultistageBus.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterMultistageBus.cs
@@ -50,7 +50,9 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var retVal = GetDefaultElectricalUserConfig();
var primaryBusAuxiliaries = primaryVehicle.Components.BusAuxiliaries;
- retVal.AlternatorType = primaryBusAuxiliaries.ElectricSupply.AlternatorTechnology;
+ retVal.AlternatorType = primaryVehicle.VehicleType == VectoSimulationJobType.BatteryElectricVehicle
+ ? AlternatorType.None
+ : primaryBusAuxiliaries.ElectricSupply.AlternatorTechnology;
retVal.ElectricalConsumers = currentDemand;
retVal.AlternatorMap = new SimpleAlternator(
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
index 42ceafbcce0fdcf03aa878f88cefc9ccfdb4d392..395d9e9d5bc8f29fea0e097e2302c7f905f57cb0 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
@@ -26,7 +26,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
public override DriverData CreateDriverData()
{
var retVal = base.CreateDriverData();
- retVal.LookAheadCoasting.Enabled = false;
+ retVal.LookAheadCoasting.Enabled = true;
return retVal;
}
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index f9798274940804902cf76b7757f5e0db53520941..cc5641aa7a050e65bff2fffad14d9d7564a23dff 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -38,6 +38,8 @@ using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
+using TUGraz.VectoCore.InputData.FileIO.JSON;
+using TUGraz.VectoCore.InputData.Impl;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.InputData.Reader.ShiftStrategy;
using TUGraz.VectoCore.Models.BusAuxiliaries;
@@ -49,6 +51,7 @@ using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Battery;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
using TUGraz.VectoCore.Utils;
@@ -207,7 +210,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
retVal.Inertia = engine.Inertia +
(gbx != null && gbx.Type.AutomaticTransmission()
- ? (gbx.Type == GearboxType.APTN ? 0.SI<KilogramSquareMeter>() : torqueConverter.Inertia)
+ ? (gbx.Type == GearboxType.APTN || gbx.Type == GearboxType.IHPC ? 0.SI<KilogramSquareMeter>() : torqueConverter.Inertia)
: 0.SI<KilogramSquareMeter>());
retVal.EngineStartTime = engine.EngineStartTime ?? DeclarationData.Engine.DefaultEngineStartTime;
var limits = torqueLimits.ToDictionary(e => e.Gear);
@@ -283,9 +286,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
internal GearboxData CreateGearboxData(IEngineeringInputDataProvider inputData, VectoRunData runData, IShiftPolygonCalculator shiftPolygonCalc)
- //IGearboxEngineeringInputData gearbox, CombustionEngineData engineData, IGearshiftEngineeringInputData gearshiftData,
- //double axlegearRatio, Meter dynamicTyreRadius, VehicleCategory vehicleCategory,
- //ITorqueConverterEngineeringInputData torqueConverter, IShiftPolygonCalculator shiftPolygonCalc, IAdvancedDriverAssistantSystemDeclarationInputData adas)
{
var vehicle = inputData.JobInputData.Vehicle;
var gearbox = vehicle.Components.GearboxInputData;
@@ -316,6 +316,16 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
}
retVal.ATEcoRollReleaseLockupClutch = adas != null && adas.EcoRoll != EcoRollType.None && retVal.Type.AutomaticTransmission() ? adas.ATEcoRollReleaseLockupClutch.Value : false;
+ if (retVal.Type == GearboxType.IEPC) {
+ if (gearbox.Gears.Count > 0) {
+ throw new VectoSimulationException("No gears are allowed for IEPC gearbox.");
+ }
+
+ retVal.Inertia = 0.SI<KilogramSquareMeter>();
+ retVal.TractionInterruption = 0.SI<Second>();
+ return retVal;
+ }
+
//var gears = gearbox.Gears;
if (gearbox.Gears.Count < 2) {
throw new VectoSimulationException("At least two Gear-Entries must be defined in Gearbox!");
@@ -323,7 +333,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
SetEngineeringData(gearbox, gearshiftData, retVal);
- var hasTorqueConverter = retVal.Type.AutomaticTransmission() && retVal.Type != GearboxType.APTN;
+ var hasTorqueConverter = retVal.Type.AutomaticTransmission() && retVal.Type != GearboxType.APTN && retVal.Type != GearboxType.IHPC;
var gearDifferenceRatio = hasTorqueConverter && gearbox.Gears.Count > 2
? gearbox.Gears[0].Ratio / gearbox.Gears[1].Ratio
@@ -421,8 +431,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
IGearboxEngineeringInputData gearbox, IGearshiftEngineeringInputData gearshiftData, GearboxData retVal)
{
retVal.Inertia = gearbox.Type.ManualTransmission() ? gearbox.Inertia : 0.SI<KilogramSquareMeter>();
- retVal.TractionInterruption = gearbox.Type == GearboxType.APTN ? 0.SI<Second>() : gearbox.TractionInterruption;
-
+ retVal.TractionInterruption = gearbox.Type == GearboxType.APTN || gearbox.Type == GearboxType.IHPC ? 0.SI<Second>() : gearbox.TractionInterruption;
}
public AxleGearData CreateAxleGearData(IAxleGearInputData data)
@@ -887,7 +896,8 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
public List<Tuple<PowertrainPosition, ElectricMotorData>> CreateElectricMachines(
IElectricMachinesEngineeringInputData electricMachines,
- Dictionary<PowertrainPosition, List<Tuple<Volt, TableData>>> torqueLimits, Volt averageVoltage)
+ Dictionary<PowertrainPosition, List<Tuple<Volt, TableData>>> torqueLimits, Volt averageVoltage,
+ GearList gearlist = null)
{
if (electricMachines == null) {
return null;
@@ -903,13 +913,14 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
return electricMachines.Entries
.Select(x => Tuple.Create(x.Position,
- CreateElectricMachine(x.ElectricMachine, x.Count, x.RatioADC, x.RatioPerGear, x.MechanicalTransmissionEfficiency,
- x.MechanicalTransmissionLossMap, torqueLimits?.First(t =>t.Key == x.Position).Value, averageVoltage))).ToList();
+ CreateElectricMachine(x.Position, x.ElectricMachine, x.Count, x.RatioADC, x.RatioPerGear, x.MechanicalTransmissionEfficiency,
+ x.MechanicalTransmissionLossMap, torqueLimits?.First(t =>t.Key == x.Position).Value, averageVoltage, gearlist))).ToList();
}
- private ElectricMotorData CreateElectricMachine(IElectricMotorEngineeringInputData motorData, int count,
+ private ElectricMotorData CreateElectricMachine(PowertrainPosition powertrainPosition,
+ IElectricMotorEngineeringInputData motorData, int count,
double ratio, double[] ratioPerGear, double efficiency, TableData adcLossMap,
- List<Tuple<Volt, TableData>> torqueLimits, Volt averageVoltage)
+ List<Tuple<Volt, TableData>> torqueLimits, Volt averageVoltage, GearList gearList)
{
var voltageLevels = new List<ElectricMotorVoltageLevelData>();
@@ -922,13 +933,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var fullLoadCurveCombined = IntersectEMFullLoadCurves(fullLoadCurve, maxTorqueCurve);
- voltageLevels.Add(new ElectricMotorVoltageLevelData() {
- Voltage = entry.VoltageLevel,
-
- FullLoadCurve = fullLoadCurveCombined,
- // DragCurve = ElectricMotorDragCurveReader.Create(entry.DragCurve, count),
- EfficiencyMap = ElectricMotorMapReader.Create(entry.PowerMap.First().PowerMap, count), //PowerMap
- });
+ var vLevelData = powertrainPosition == PowertrainPosition.IHPC
+ ? CreateIHPCVoltageLevelData(count, entry, fullLoadCurveCombined, gearList)
+ : CreateEmVoltageLevelData(count, entry, fullLoadCurveCombined);
+ voltageLevels.Add(vLevelData);
+
}
if (averageVoltage == null) {
@@ -936,13 +945,15 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
averageVoltage = (voltageLevels.Min(x => x.Voltage) + voltageLevels.Max(x => x.Voltage)) / 2.0;
}
- var lossMap = adcLossMap != null
- ? TransmissionLossMapReader.CreateEmADCLossMap(adcLossMap, ratio, "EM ADC LossMap")
- : TransmissionLossMapReader.CreateEmADCLossMap(efficiency, ratio, "EM ADC LossMap Eff");
+ var lossMap = powertrainPosition == PowertrainPosition.IHPC
+ ? TransmissionLossMapReader.CreateEmADCLossMap(1.0, 1.0, "EM ADC IHPC LossMap Eff")
+ : adcLossMap != null
+ ? TransmissionLossMapReader.CreateEmADCLossMap(adcLossMap, ratio, "EM ADC LossMap")
+ : TransmissionLossMapReader.CreateEmADCLossMap(efficiency, ratio, "EM ADC LossMap Eff");
var retVal = new ElectricMotorData() {
EfficiencyData = new VoltageLevelData() { VoltageLevels = voltageLevels},
- DragCurve = ElectricMotorDragCurveReader.Create(motorData.DragCurve, count),
+ EMDragCurve = ElectricMotorDragCurveReader.Create(motorData.DragCurve, count),
Inertia = motorData.Inertia * count,
OverloadRegenerationFactor = motorData.OverloadRecoveryFactor,
RatioADC = ratio,
@@ -953,6 +964,38 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
return retVal;
}
+ private ElectricMotorVoltageLevelData CreateIHPCVoltageLevelData(int count, IElectricMotorVoltageLevel entry, ElectricMotorFullLoadCurve fullLoadCurveCombined, GearList gearList)
+ {
+ if (gearList == null) {
+ throw new VectoException("no gears provided for IHPC EM");
+ }
+
+ if (gearList.Count() != entry.PowerMap.Count) {
+ throw new VectoException(
+ $"number of gears in transmission does not match gears in electric motor (IHPC) - {gearList.Count()}/{entry.PowerMap.Count}");
+ }
+ var effMap = new Dictionary<uint, EfficiencyMap>();
+ foreach (var gear in gearList) {
+ effMap.Add(gear.Gear, ElectricMotorMapReader.Create(entry.PowerMap[(int)gear.Gear - 1].PowerMap, count));
+ }
+ return new IEPCVoltageLevelData() {
+ Voltage = entry.VoltageLevel,
+ FullLoadCurve = fullLoadCurveCombined,
+ EfficiencyMaps = effMap,
+ };
+ }
+
+ private static ElectricMotorVoltageLevelData CreateEmVoltageLevelData(int count, IElectricMotorVoltageLevel entry, ElectricMotorFullLoadCurve fullLoadCurveCombined)
+ {
+ return new ElectricMotorVoltageLevelData() {
+ Voltage = entry.VoltageLevel,
+
+ FullLoadCurve = fullLoadCurveCombined,
+ // DragCurve = ElectricMotorDragCurveReader.Create(entry.DragCurve, count),
+ EfficiencyMap = ElectricMotorMapReader.Create(entry.PowerMap.First().PowerMap, count), //PowerMap
+ };
+ }
+
private OverloadData CalculateOverloadData(IElectricMotorEngineeringInputData motorData, int count, VoltageLevelData voltageLevels, Volt averageVoltage)
{
@@ -976,24 +1019,49 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
return retVal;
}
+ private OverloadData CalculateOverloadData(IIEPCEngineeringInputData iepc, int count,
+ VoltageLevelData voltageLevels, Volt averageVoltage, Tuple<uint, double> gearRatioUsedForMeasurement)
+ {
+ // if average voltage is outside of the voltage-level range, do not extrapolate but take the min voltage entry, or max voltage entry
+ if (averageVoltage < iepc.VoltageLevels.Min(x => x.VoltageLevel)) {
+ return CalculateOverloadBuffer(iepc.VoltageLevels.First(), count, voltageLevels, gearRatioUsedForMeasurement);
+ }
+ if (averageVoltage > iepc.VoltageLevels.Max(x => x.VoltageLevel)) {
+ return CalculateOverloadBuffer(iepc.VoltageLevels.Last(), count, voltageLevels, gearRatioUsedForMeasurement);
+ }
+
+ var (vLow, vHigh) = iepc.VoltageLevels.OrderBy(x => x.VoltageLevel).GetSection(x => x.VoltageLevel < averageVoltage);
+ var ovlLo = CalculateOverloadBuffer(vLow, count, voltageLevels, gearRatioUsedForMeasurement);
+ var ovlHi = CalculateOverloadBuffer(vHigh, count, voltageLevels, gearRatioUsedForMeasurement);
+
+ var retVal = new OverloadData() {
+ OverloadBuffer = VectoMath.Interpolate(vLow.VoltageLevel, vHigh.VoltageLevel, ovlLo.OverloadBuffer, ovlHi.OverloadBuffer, averageVoltage),
+ ContinuousTorque = VectoMath.Interpolate(vLow.VoltageLevel, vHigh.VoltageLevel, ovlLo.ContinuousTorque, ovlHi.ContinuousTorque, averageVoltage),
+ ContinuousPowerLoss = VectoMath.Interpolate(vLow.VoltageLevel, vHigh.VoltageLevel, ovlLo.ContinuousPowerLoss, ovlHi.ContinuousPowerLoss, averageVoltage)
+ };
+ return retVal;
+ }
+
private OverloadData CalculateOverloadBuffer(IElectricMotorVoltageLevel voltageEntry,
- int count, VoltageLevelData voltageLevels)
+ int count, VoltageLevelData voltageLevels, Tuple<uint, double> gearUsedForMeasurement = null)
{
- var continuousTorque = voltageEntry.ContinuousTorque * count;
- var continuousTorqueSpeed = voltageEntry.ContinuousTorqueSpeed;
- var overloadTorque = (voltageEntry.OverloadTorque ?? 0.SI<NewtonMeter>()) * count;
- var overloadTestSpeed = voltageEntry.OverloadTestSpeed ?? 0.RPMtoRad();
+ var gearRatioUsedForMeasurement = gearUsedForMeasurement?.Item2 ?? 1.0;
+ var gear = new GearshiftPosition(gearUsedForMeasurement?.Item1 ?? 1);
+ var continuousTorque = voltageEntry.ContinuousTorque * count / gearRatioUsedForMeasurement;
+ var continuousTorqueSpeed = voltageEntry.ContinuousTorqueSpeed * gearRatioUsedForMeasurement;
+ var overloadTorque = (voltageEntry.OverloadTorque ?? 0.SI<NewtonMeter>()) * count / gearRatioUsedForMeasurement;
+ var overloadTestSpeed = (voltageEntry.OverloadTestSpeed ?? 0.RPMtoRad()) * gearRatioUsedForMeasurement;
- var peakElPwr = voltageLevels.LookupElectricPower(voltageEntry.VoltageLevel, overloadTestSpeed, -overloadTorque, true)
+ var peakElPwr = voltageLevels.LookupElectricPower(voltageEntry.VoltageLevel, overloadTestSpeed, -overloadTorque, gear, true)
.ElectricalPower;
var peakPwrLoss = -peakElPwr - overloadTorque * overloadTestSpeed; // losses need to be positive
var contElPwr = voltageLevels.LookupElectricPower(voltageEntry.VoltageLevel, continuousTorqueSpeed,
- -continuousTorque).ElectricalPower ??
+ -continuousTorque, gear).ElectricalPower ??
voltageLevels.LookupElectricPower(voltageEntry.VoltageLevel, continuousTorqueSpeed,
voltageLevels.FullLoadDriveTorque(voltageEntry.VoltageLevel, continuousTorqueSpeed),
- true).ElectricalPower;
+ gear, true).ElectricalPower;
var continuousPowerLoss = -contElPwr - continuousTorque * continuousTorqueSpeed; // loss needs to be positive
var overloadBuffer = (peakPwrLoss - continuousPowerLoss) * voltageEntry.OverloadTime;
return new OverloadData() {
@@ -1059,7 +1127,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
FullDriveTorque = gearboxData.Gears[key].MaxTorque
}
}.ToList();
- retVal[new GearshiftPosition(key)] = new VehicleMaxPropulsionTorque(gbxLimit);
+ retVal[new GearshiftPosition(key, true)] = new VehicleMaxPropulsionTorque(gbxLimit);
continue;
}
@@ -1091,11 +1159,197 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
// if no gearbox limit is defined, MaxTorque is null;
// in case of P3 or P4, do not apply gearbox limit to propulsion limit as ICE is already cropped with max torque
var gearboxTorqueLimit = isP3OrP4Hybrid ? null : gearboxData.Gears[key].MaxTorque;
- retVal[new GearshiftPosition(key)] = new VehicleMaxPropulsionTorque(IntersectMaxPropulsionTorqueCurve(entries, gearboxTorqueLimit));
+ retVal[new GearshiftPosition(key, true)] = new VehicleMaxPropulsionTorque(IntersectMaxPropulsionTorqueCurve(entries, gearboxTorqueLimit));
+
+ }
+
+ return retVal;
+ }
+
+ public List<Tuple<PowertrainPosition, ElectricMotorData>> CreateIEPCElectricMachines(IIEPCEngineeringInputData iepc, Volt averageVoltage)
+ {
+ if (iepc == null) {
+ return null;
+ }
+
+ var pos = PowertrainPosition.IEPC;
+ var count = iepc.DesignTypeWheelMotor && iepc.NrOfDesignTypeWheelMotorMeasured == 1 ? 2 : 1;
+
+ // the full-load curve is measured in the gear with the ratio closest to 1,
+ // in case two gears have the same difference, the higher one is used
+ var gearRatioUsedForMeasurement = iepc.Gears
+ .Select(x => new { x.GearNumber, x.Ratio, Diff = Math.Round(Math.Abs(x.Ratio - 1), 6) }).GroupBy(x => x.Diff)
+ .OrderBy(x => x.Key).First().OrderBy(x => x.Ratio).Reverse().First();
+
+
+ var voltageLevels = new List<ElectricMotorVoltageLevelData>();
+ foreach (var entry in iepc.VoltageLevels.OrderBy(x => x.VoltageLevel)) {
+ var effMap = new Dictionary<uint, EfficiencyMap>();
+ for (var i = 0u; i < entry.PowerMap.Count; i++) {
+ var ratio = iepc.Gears.First(x => x.GearNumber == i + 1).Ratio;
+ effMap.Add(i + 1, IEPCMapReader.Create(entry.PowerMap[(int)i].PowerMap, count, ratio));
+ //fullLoadCurves.Add(i + 1, IEPCFullLoadCurveReader.Create(entry.FullLoadCurve, count, ratio));
+ }
+ voltageLevels.Add(new IEPCVoltageLevelData() {
+ Voltage = entry.VoltageLevel,
+ FullLoadCurve = IEPCFullLoadCurveReader.Create(entry.FullLoadCurve, count, gearRatioUsedForMeasurement.Ratio),
+ EfficiencyMaps = effMap,
+ });
+ }
+
+ var dragCurves = new Dictionary<uint, DragCurve>();
+ if (iepc.DragCurves.Count > 1) {
+ for (var i = 0u; i < iepc.DragCurves.Count; i++) {
+ var ratio = iepc.Gears.First(x => x.GearNumber == i + 1).Ratio;
+ dragCurves.Add(i + 1, IEPCDragCurveReader.Create(iepc.DragCurves[(int)i].DragCurve, count, ratio));
+ }
+ } else {
+ var dragCurve = iepc.DragCurves.First().DragCurve;
+ for (var i = 0u; i < iepc.Gears.Count; i++) {
+ var ratio = iepc.Gears.First(x => x.GearNumber == i + 1).Ratio;
+ dragCurves.Add(i + 1, IEPCDragCurveReader.Create(dragCurve, count, ratio));
+ }
+ }
+ var retVal = new IEPCElectricMotorData() {
+ EfficiencyData = new VoltageLevelData() { VoltageLevels = voltageLevels },
+ IEPCDragCurves = dragCurves,
+ Inertia = iepc.Inertia * count,
+ OverloadRegenerationFactor = iepc.OverloadRecoveryFactor,
+ RatioADC = 1,
+ RatioPerGear = null,
+ TransmissionLossMap = TransmissionLossMapReader.CreateEmADCLossMap(1.0, 1.0, "EM ADC LossMap Eff"),
+
+ };
+ retVal.Overload = CalculateOverloadData(iepc, count, retVal.EfficiencyData, averageVoltage,
+ Tuple.Create((uint)gearRatioUsedForMeasurement.GearNumber, gearRatioUsedForMeasurement.Ratio));
+ ;
+ return new List<Tuple<PowertrainPosition, ElectricMotorData>>() { Tuple.Create<PowertrainPosition, ElectricMotorData>(pos, retVal) };
+ }
+
+
+
+
+ public GearboxData CreateIEPCGearboxData(IEngineeringInputDataProvider inputData, VectoRunData runData, IShiftPolygonCalculator shiftPolygonCalc)
+ {
+ var vehicle = inputData.JobInputData.Vehicle;
+
+ var iepc = vehicle.Components.IEPCEngineeringInputData;
+
+ var axlegearRatio = runData.AxleGearData?.AxleGear.Ratio ?? 1.0;
+ var dynamicTyreRadius = runData.VehicleData.DynamicTyreRadius;
+
+
+ var retVal = new GearboxData() {
+ Type = GearboxType.APTN,
+ Inertia = 0.SI<KilogramSquareMeter>(),
+ TractionInterruption = 0.SI<Second>(),
+ InputData = new IEPCGearboxInputData(iepc),
+ };
+
+ var gearInput = iepc.Gears.Select((x, idx) => new TransmissionInputData() { Gear = idx + 1, Ratio = x.Ratio }).Cast<ITransmissionInputData>().ToList();
+ var gears = new Dictionary<uint, GearData>();
+ for (uint i = 0; i < iepc.Gears.Count; i++) {
+ var gear = iepc.Gears[(int)i];
+ var lossMap = TransmissionLossMapReader.Create(1, gear.Ratio, $"Gear{i+1}");
+
+ ShiftPolygon shiftPolygon = null;
+ if (iepc.Gears.Count > 1) {
+ if (shiftPolygonCalc != null) {
+ shiftPolygon = shiftPolygonCalc.ComputeDeclarationShiftPolygon(GearboxType.APTN, (int)i,
+ null, gearInput, null, axlegearRatio,
+ dynamicTyreRadius, runData.ElectricMachinesData?.FirstOrDefault()?.Item2);
+ } else {
+ shiftPolygon = DeclarationData.Gearbox.ComputeShiftPolygon(GearboxType.APTN, (int)i,
+ null, gearInput, null, axlegearRatio,
+ dynamicTyreRadius, runData.ElectricMachinesData?.FirstOrDefault()?.Item2);
+ }
+ }
+ var gearData = new GearData {
+ ShiftPolygon = shiftPolygon,
+ MaxSpeed = gear.MaxOutputShaftSpeed == null ? null : gear.MaxOutputShaftSpeed * gear.Ratio,
+ MaxTorque = gear.MaxOutputShaftTorque == null ? null : gear.MaxOutputShaftTorque / gear.Ratio,
+ Ratio = gear.Ratio,
+ LossMap = lossMap,
+ };
+
+ gears.Add(i + 1, gearData);
+ }
+
+ retVal.Gears = gears;
+
+ // update disengageWhenHaltingSpeed
+ var firstGear = retVal.GearList.First(x => x.IsLockedGear());
+ if (iepc.Gears.Count > 1 && retVal.Gears[firstGear.Gear].ShiftPolygon.Downshift.Any()) {
+ var downshiftSpeedInc = retVal.Gears[firstGear.Gear].ShiftPolygon
+ .InterpolateDownshiftSpeed(0.SI<NewtonMeter>()) * 1.05;
+ var vehicleSpeedDisengage = downshiftSpeedInc / axlegearRatio / retVal.Gears[firstGear.Gear].Ratio *
+ dynamicTyreRadius;
+ retVal.DisengageWhenHaltingSpeed = vehicleSpeedDisengage;
}
return retVal;
}
+
+ public PTOData CreateBatteryElectricPTOTransmissionData(IPTOTransmissionInputData pto)
+ {
+ if (pto.PTOTransmissionType != "None") {
+ var ptoData = new PTOData() {
+ TransmissionType = pto.PTOTransmissionType,
+ LossMap = pto.PTOLossMap == null
+ ? PTOIdleLossMapReader.GetZeroLossMap()
+ : PTOIdleLossMapReader.Create(pto.PTOLossMap)
+ };
+ return ptoData;
+ }
+
+ return null;
+ }
+ }
+
+ public class IEPCGearboxInputData : IGearboxDeclarationInputData
+ {
+ protected readonly IIEPCEngineeringInputData _iepc;
+ private IList<ITransmissionInputData> _gears;
+
+ public IEPCGearboxInputData(IIEPCEngineeringInputData iepc)
+ {
+ _iepc = iepc;
+ }
+
+ #region Implementation of IComponentInputData
+
+ public DataSource DataSource => _iepc.DataSource;
+ public bool SavedInDeclarationMode => _iepc.SavedInDeclarationMode;
+ public string Manufacturer => _iepc.Manufacturer;
+ public string Model => _iepc.Model;
+ public DateTime Date => _iepc.Date;
+ public string AppVersion => _iepc.AppVersion;
+ public CertificationMethod CertificationMethod => _iepc.CertificationMethod;
+ public string CertificationNumber => _iepc.CertificationNumber;
+ public DigestData DigestValue => _iepc.DigestValue;
+
+ #endregion
+
+ #region Implementation of IGearboxDeclarationInputData
+
+ public GearboxType Type => GearboxType.APTN;
+ public IList<ITransmissionInputData> Gears => _gears ?? (_gears = ConvertGears());
+
+ public bool DifferentialIncluded => false;
+ public double AxlegearRatio => double.NaN;
+
+ #endregion
+ protected virtual IList<ITransmissionInputData> ConvertGears()
+ {
+ return _iepc.Gears.Select(x => new TransmissionInputData() {
+ Gear = x.GearNumber,
+ Ratio = x.Ratio,
+ MaxInputSpeed = x.MaxOutputShaftSpeed == null ? null : x.MaxOutputShaftSpeed * x.Ratio,
+ MaxTorque = x.MaxOutputShaftTorque == null ? null : x.MaxOutputShaftTorque / x.Ratio,
+ }).Cast<ITransmissionInputData>().ToList();
+ }
+
+
}
}
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
index cf14ca188adeb53348a7e11c947ca8474c8f3c3b..7d9a3523e5079a18b21af8309ed0bfc1b1f022fd 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
@@ -18,7 +18,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
{
public class DeclarationModeCompletedMultistageBusVectoRunDataFactory : LoggingObject, IVectoRunDataFactory
{
- protected readonly IMultistageBusInputDataProvider InputDataProvider;
+ protected readonly IMultistepBusInputDataProvider InputDataProvider;
protected IDeclarationReport Report;
protected Segment _segmentCompletedBus;
@@ -34,7 +34,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
protected DeclarationDataAdapterCompletedBusGeneric DataAdapterGeneric = new DeclarationDataAdapterCompletedBusGeneric();
public DeclarationModeCompletedMultistageBusVectoRunDataFactory(
- IMultistageBusInputDataProvider dataProvider, IDeclarationReport report)
+ IMultistepBusInputDataProvider dataProvider, IDeclarationReport report)
{
InputDataProvider = dataProvider;
@@ -92,7 +92,8 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
Report = Report,
Mission = new Mission() {
MissionType = MissionType.ExemptedMission
- }
+ },
+ InputData = InputDataProvider
};
}
@@ -149,61 +150,69 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
protected virtual IEnumerable<VectoRunData> VectoRunDataHeavyBusCompleted()
{
- var engineModes = InputDataProvider.JobInputData.PrimaryVehicle.Vehicle.Components.EngineInputData.EngineModes;
+ if (InputDataProvider.JobInputData.PrimaryVehicle.Vehicle.VehicleType ==
+ VectoSimulationJobType.BatteryElectricVehicle) {
+ foreach (var vectoRunData in CreateVectoRunDataForMissions(0, ""))
+ yield return vectoRunData;
+ } else {
+ var engineModes = InputDataProvider.JobInputData.PrimaryVehicle.Vehicle.Components.EngineInputData
+ ?.EngineModes;
+
+ for (var modeIdx = 0; modeIdx < engineModes.Count; modeIdx++) {
+ var fuelMode = "single fuel mode";
+ if (engineModes[modeIdx].Fuels.Count > 1) {
+ fuelMode = "dual fuel mode";
+ }
- for (var modeIdx = 0; modeIdx < engineModes.Count; modeIdx++)
- {
- var fuelMode = "single fuel mode";
- if (engineModes[modeIdx].Fuels.Count > 1)
- {
- fuelMode = "dual fuel mode";
+ foreach (var vectoRunData in CreateVectoRunDataForMissions(modeIdx, fuelMode))
+ yield return vectoRunData;
}
- foreach (var mission in _segmentCompletedBus.Missions)
- {
- foreach (var loading in mission.Loadings)
- {
- var simulationRunData = CreateVectoRunDataSpecific(mission, loading, modeIdx);
- if (simulationRunData != null)
- {
- yield return simulationRunData;
- }
-
- var primarySegment = GetPrimarySegment(PrimaryVehicle);
- var primaryMission = primarySegment.Missions.Where(
- m => {
- return m.BusParameter.DoubleDecker ==
- CompletedVehicle.VehicleCode.IsDoubleDeckerBus() &&
- m.MissionType == mission.MissionType &&
- m.BusParameter.FloorType == CompletedVehicle.VehicleCode.GetFloorType();
- }).First();
- simulationRunData = CreateVectoRunDataGeneric(
- primaryMission,
- new KeyValuePair<LoadingType, Tuple<Kilogram, double?>>(loading.Key, primaryMission.Loadings[loading.Key]),
- primarySegment, modeIdx);
-
- var primaryResult = InputDataProvider.JobInputData.PrimaryVehicle.GetResult(
+ }
+ }
+
+ private IEnumerable<VectoRunData> CreateVectoRunDataForMissions(int modeIdx, string fuelMode)
+ {
+ foreach (var mission in _segmentCompletedBus.Missions) {
+ foreach (var loading in mission.Loadings) {
+ var simulationRunData = CreateVectoRunDataSpecific(mission, loading, modeIdx);
+ if (simulationRunData != null) {
+ yield return simulationRunData;
+ }
+
+ var primarySegment = GetPrimarySegment(PrimaryVehicle);
+ var primaryMission = primarySegment.Missions.Where(
+ m => {
+ return m.BusParameter.DoubleDecker ==
+ CompletedVehicle.VehicleCode.IsDoubleDeckerBus() &&
+ m.MissionType == mission.MissionType &&
+ m.BusParameter.FloorType == CompletedVehicle.VehicleCode.GetFloorType();
+ }).First();
+ simulationRunData = CreateVectoRunDataGeneric(
+ primaryMission,
+ new KeyValuePair<LoadingType, Tuple<Kilogram, double?>>(loading.Key,
+ primaryMission.Loadings[loading.Key]),
+ primarySegment, modeIdx);
+
+ var primaryResult = InputDataProvider.JobInputData.PrimaryVehicle.GetResult(
+ simulationRunData.Mission.BusParameter.BusGroup, simulationRunData.Mission.MissionType, fuelMode,
+ simulationRunData.VehicleData.Loading);
+ if (primaryResult == null || !primaryResult.ResultStatus.Equals("success")) {
+ throw new VectoException(
+ "Failed to find results in PrimaryVehicleReport for vehicle group: {0}, mission: {1}, fuel mode: '{2}', payload: {3}. Make sure PIF and completed vehicle data match!",
simulationRunData.Mission.BusParameter.BusGroup, simulationRunData.Mission.MissionType, fuelMode,
simulationRunData.VehicleData.Loading);
- if (primaryResult == null || !primaryResult.ResultStatus.Equals("success"))
- {
- throw new VectoException(
- "Failed to find results in PrimaryVehicleReport for vehicle group: {0}, mission: {1}, fuel mode: '{2}', payload: {3}. Make sure PIF and completed vehicle data match!",
- simulationRunData.Mission.BusParameter.BusGroup, simulationRunData.Mission.MissionType, fuelMode,
- simulationRunData.VehicleData.Loading);
- }
-
- if (primaryResult.ResultStatus != "success")
- {
- throw new VectoException(
- "Simulation results in PrimaryVehicleReport for vehicle group: {0}, mission: {1}, fuel mode: '{2}', payload: {3} not finished successfully.",
- simulationRunData.Mission.BusParameter.BusGroup, simulationRunData.Mission.MissionType, fuelMode,
- simulationRunData.VehicleData.Loading);
- }
-
- simulationRunData.PrimaryResult = primaryResult;
+ }
- yield return simulationRunData;
+ if (primaryResult.ResultStatus != "success") {
+ throw new VectoException(
+ "Simulation results in PrimaryVehicleReport for vehicle group: {0}, mission: {1}, fuel mode: '{2}', payload: {3} not finished successfully.",
+ simulationRunData.Mission.BusParameter.BusGroup, simulationRunData.Mission.MissionType, fuelMode,
+ simulationRunData.VehicleData.Loading);
}
+
+ simulationRunData.PrimaryResult = primaryResult;
+
+ yield return simulationRunData;
}
}
}
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
index 09465baf9c3c4289d07a0dc8bf43fc620438bbef..5e162563ef680f08e2841efecbebecd7f8d3b627 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
@@ -66,6 +66,38 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
}
private IEnumerable<VectoRunData> VectoRunDataHeavyBusPrimary()
+ {
+ switch (InputDataProvider.JobInputData.JobType) {
+ case VectoSimulationJobType.ConventionalVehicle:
+ case VectoSimulationJobType.ParallelHybridVehicle:
+ case VectoSimulationJobType.SerialHybridVehicle:
+ return VectoRunDataConventionalHeavyBusPrimaryNonExempted();
+ case VectoSimulationJobType.BatteryElectricVehicle:
+ return VectoRunDataBatteryElectricHeavyBusPrimaryNonExempted();
+ case VectoSimulationJobType.EngineOnlySimulation:
+ break;
+ default:
+ throw new ArgumentOutOfRangeException();
+ }
+ return VectoRunDataConventionalHeavyBusPrimaryNonExempted();
+ }
+
+ private IEnumerable<VectoRunData> VectoRunDataBatteryElectricHeavyBusPrimaryNonExempted()
+ {
+ var vehicle = InputDataProvider.JobInputData.Vehicle;
+ foreach (var mission in _segment.Missions) {
+ foreach (var loading in mission.Loadings) {
+ var simulationRunData = CreateVectoRunData(vehicle, 0, mission, loading);
+ if (simulationRunData == null) {
+ continue;
+ }
+ yield return simulationRunData;
+ }
+
+ }
+ }
+
+ private IEnumerable<VectoRunData> VectoRunDataConventionalHeavyBusPrimaryNonExempted()
{
var vehicle = InputDataProvider.JobInputData.Vehicle;
var engine = vehicle.Components.EngineInputData;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
index 819baba620f71a2b110e568101943f768406b1d1..17625e41092ba0b2261a5d2bdd54e8dae53cf746 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
@@ -34,6 +34,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
+using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
@@ -44,6 +45,7 @@ using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Battery;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
using TUGraz.VectoCore.Utils;
@@ -72,12 +74,17 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
switch(InputDataProvider.JobInputData.JobType) {
case VectoSimulationJobType.ConventionalVehicle:
case VectoSimulationJobType.ParallelHybridVehicle:
+ case VectoSimulationJobType.IHPC:
case VectoSimulationJobType.EngineOnlySimulation:
return GetConventionalVehicleRunData();
case VectoSimulationJobType.BatteryElectricVehicle:
return GetBatteryElectricVehicleRunData();
case VectoSimulationJobType.SerialHybridVehicle:
return GetSerialHybridRunData();
+ case VectoSimulationJobType.IEPC_E:
+ return GetIEPCRunData();
+ case VectoSimulationJobType.IEPC_S:
+ return GetIEPC_S_RunData();
default:
throw new ArgumentOutOfRangeException($"Invalid JobType {InputDataProvider.JobInputData.JobType}");
}
@@ -304,7 +311,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
var crossWindRequired = vehicle.Components.AirdragInputData.CrossWindCorrectionMode ==
CrossWindCorrectionMode.VAirBetaLookupTable;
- //var ptoTransmissionData = dao.CreatePTOTransmissionData(vehicle.Components.PTOTransmissionInputData);
+ var ptoTransmissionData = dao.CreateBatteryElectricPTOTransmissionData(vehicle.Components.PTOTransmissionInputData);
var drivingCycle = GetDrivingCycle(cycle, crossWindRequired);
@@ -322,7 +329,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
Aux = dao.CreateAuxiliaryData(vehicle.Components.AuxiliaryInputData),
BusAuxiliaries = dao.CreateBusAuxiliariesData(vehicle.Components.AuxiliaryInputData, vehicleData, VectoSimulationJobType.BatteryElectricVehicle),
Retarder = dao.CreateRetarderData(vehicle.Components.RetarderInputData, powertrainPosition),
- //PTO = ptoTransmissionData,
+ PTO = ptoTransmissionData,
Cycle = new DrivingCycleProxy(drivingCycle, cycle.Name),
ExecutionMode = ExecutionMode.Engineering,
ElectricMachinesData = electricMachinesData,
@@ -336,6 +343,163 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
}
}
+ private IEnumerable<VectoRunData> GetIEPCRunData()
+ {
+ var axleGearRequired = AxleGearRequired();
+ var dao = new EngineeringDataAdapter();
+ foreach (var cycle in InputDataProvider.JobInputData.Cycles) {
+ yield return GetIEPCVectoRunData(axleGearRequired, cycle, dao);
+ }
+ }
+
+ private bool AxleGearRequired()
+ {
+ var vehicle = InputDataProvider.JobInputData.Vehicle;
+ var iepcInput = vehicle.Components.IEPCEngineeringInputData;
+ var axleGearRequired = !iepcInput.DifferentialIncluded && !iepcInput.DesignTypeWheelMotor;
+ if (axleGearRequired && vehicle.Components.AxleGearInputData == null) {
+ throw new VectoException(
+ $"Axlegear reqhired for selected type of IEPC! DifferentialIncluded: {iepcInput.DifferentialIncluded}, DesignTypeWheelMotor: {iepcInput.DesignTypeWheelMotor}");
+ }
+
+ var numGearsPowermap =
+ iepcInput.VoltageLevels.Select(x => Tuple.Create(x.VoltageLevel, x.PowerMap.Count)).ToArray();
+ var gearCount = iepcInput.Gears.Count;
+ var numGearsDrag = iepcInput.DragCurves.Count;
+
+ if (numGearsPowermap.Any(x => x.Item2 != gearCount)) {
+ throw new VectoException(
+ $"Number of gears for voltage levels does not match! PowerMaps: {numGearsPowermap.Select(x => $"{x.Item1}: {x.Item2}").Join()}; Gear count: {gearCount}");
+ }
+
+ if (numGearsDrag > 1 && numGearsDrag != gearCount) {
+ throw new VectoException(
+ $"Number of gears drag curve does not match gear count! DragCurve {numGearsDrag}; Gear count: {gearCount}");
+ }
+
+ return axleGearRequired;
+ }
+
+ private IEnumerable<VectoRunData> GetIEPC_S_RunData()
+ {
+ var axleGearRequired = AxleGearRequired();
+
+ var vehicle = InputDataProvider.JobInputData.Vehicle;
+ var engine = vehicle.Components.EngineInputData;
+ if (engine == null) {
+ throw new VectoException("Combustion Engine is required for IEPC-S vehicle configurations");
+ }
+ var engineModes = engine.EngineModes;
+
+ var dao = new EngineeringDataAdapter();
+ for (var modeIdx = 0; modeIdx < engineModes.Count; modeIdx++) {
+ var engineMode = engineModes[modeIdx];
+ foreach (var cycle in InputDataProvider.JobInputData.Cycles) {
+ var engineData = dao.CreateEngineData(vehicle, engineMode);
+ engineData.FuelMode = modeIdx;
+
+ var runData = GetIEPCVectoRunData(axleGearRequired, cycle, dao);
+ var averageVoltage = CalculateAverageVoltage(runData.BatteryData);
+
+ var electricMachinesData = dao.CreateElectricMachines(vehicle.Components.ElectricMachines, vehicle.ElectricMotorTorqueLimits, averageVoltage);
+
+ var hybridParameters = dao.CreateHybridStrategyParameters(InputDataProvider.JobInputData,
+ engineData, runData.GearboxData);
+
+ foreach (var gear in runData.GearboxData.Gears.Keys) {
+ engineData.FullLoadCurves[gear] = engineData.FullLoadCurves[0];
+ }
+ runData.JobType = VectoSimulationJobType.IEPC_S;
+ runData.EngineData = engineData;
+ runData.ElectricMachinesData.Add(electricMachinesData.First(x => x.Item1 == PowertrainPosition.GEN));
+ runData.HybridStrategyParameters = hybridParameters;
+ yield return runData;
+ }
+ }
+ }
+
+
+ private VectoRunData GetIEPCVectoRunData(bool axleGearRequired, ICycleData cycle, EngineeringDataAdapter dao)
+ {
+ var vehicle = InputDataProvider.JobInputData.Vehicle;
+
+ var driver = dao.CreateDriverData(InputDataProvider.DriverInputData);
+
+ var axlegearData = axleGearRequired && vehicle.Components.AxleGearInputData != null
+ ? dao.CreateAxleGearData(vehicle.Components.AxleGearInputData)
+ : null;
+
+ var batteryData = dao.CreateBatteryData(vehicle.Components.ElectricStorage, vehicle.InitialSOC);
+ var supercapData = dao.CreateSuperCapData(vehicle.Components.ElectricStorage, vehicle.InitialSOC);
+
+ var averageVoltage = batteryData != null ? CalculateAverageVoltage(batteryData) : null;
+ var electricMachinesData =
+ dao.CreateIEPCElectricMachines(vehicle.Components.IEPCEngineeringInputData, averageVoltage);
+ var powertrainPosition = electricMachinesData.First(e => e.Item1 != PowertrainPosition.GEN).Item1;
+ var retarderData = axleGearRequired
+ ? dao.CreateRetarderData(vehicle.Components.RetarderInputData, powertrainPosition)
+ : new RetarderData() {
+ Type = RetarderType.LossesIncludedInTransmission,
+ Ratio = 1.0
+ };
+
+ var gearshiftParams = dao.CreateGearshiftData(GearboxType.APTN,
+ InputDataProvider.DriverInputData.GearshiftInputData,
+ axlegearData?.AxleGear.Ratio ?? 1.0, null);
+ var tmpRunData = new VectoRunData() {
+ JobType = VectoSimulationJobType.IEPC_E,
+ GearboxData = new GearboxData() {
+ Type = GearboxType.APTN,
+ },
+ GearshiftParameters = gearshiftParams,
+ ElectricMachinesData = electricMachinesData,
+ //VehicleData = dao.CreateVehicleData(vehicle)
+ };
+ var tempVehicle = dao.CreateVehicleData(vehicle);
+ var tmpStrategy = PowertrainBuilder.GetShiftStrategy(new SimplePowertrainContainer(tmpRunData));
+ var gearboxData = dao.CreateIEPCGearboxData(
+ InputDataProvider, new VectoRunData() {
+ JobType = VectoSimulationJobType.IEPC_E,
+ VehicleData = tempVehicle,
+ AxleGearData = axlegearData,
+ ElectricMachinesData = electricMachinesData
+ }, tmpStrategy);
+
+ var crossWindRequired = vehicle.Components.AirdragInputData.CrossWindCorrectionMode ==
+ CrossWindCorrectionMode.VAirBetaLookupTable;
+ //var ptoTransmissionData = dao.CreatePTOTransmissionData(vehicle.Components.PTOTransmissionInputData);
+
+ var drivingCycle = GetDrivingCycle(cycle, crossWindRequired);
+
+ var vehicleData = dao.CreateVehicleData(vehicle);
+ return new VectoRunData {
+ JobName = InputDataProvider.JobInputData.JobName,
+ JobType = VectoSimulationJobType.IEPC_E,
+ GearboxData = gearboxData,
+ AxleGearData = axlegearData,
+ AngledriveData = null,
+ VehicleData = vehicleData,
+ AirdragData = dao.CreateAirdragData(vehicle.Components.AirdragInputData, vehicle),
+ DriverData = driver,
+ Aux = dao.CreateAuxiliaryData(vehicle.Components.AuxiliaryInputData),
+ BusAuxiliaries = dao.CreateBusAuxiliariesData(vehicle.Components.AuxiliaryInputData, vehicleData,
+ VectoSimulationJobType.BatteryElectricVehicle),
+ Retarder = retarderData,
+ //PTO = ptoTransmissionData,
+ Cycle = new DrivingCycleProxy(drivingCycle, cycle.Name),
+ ExecutionMode = ExecutionMode.Engineering,
+ ElectricMachinesData = electricMachinesData,
+ //HybridStrategyParameters = dao.CreateHybridStrategyParameters(InputDataProvider.JobInputData.HybridStrategyParameters),
+ BatteryData = batteryData,
+ SuperCapData = supercapData,
+ SimulationType = SimulationType.DistanceCycle | SimulationType.MeasuredSpeedCycle | SimulationType.PWheel,
+ GearshiftParameters = gearshiftParams,
+ ElectricAuxDemand = InputDataProvider.JobInputData.Vehicle.Components.AuxiliaryInputData.Auxiliaries
+ .ElectricPowerDemand,
+ };
+ }
+
+
protected virtual IEnumerable<VectoRunData> GetConventionalVehicleRunData()
{
var engine = InputDataProvider.JobInputData.Vehicle.Components.EngineInputData;
@@ -358,6 +522,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
var axlegearData = dao.CreateAxleGearData(vehicle.Components.AxleGearInputData);
var tmpRunData = new VectoRunData() {
+ JobType = InputDataProvider.JobInputData.JobType,
GearboxData = new GearboxData() {
Type = vehicle.Components.GearboxInputData.Type,
}
@@ -405,7 +570,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
var electricMachines =
dao.CreateElectricMachines(vehicle.Components.ElectricMachines,
- vehicle.ElectricMotorTorqueLimits, averageVoltage) ??
+ vehicle.ElectricMotorTorqueLimits, averageVoltage, gearboxData.GearList) ??
new List<Tuple<PowertrainPosition, ElectricMotorData>>();
var powertrainPosition = electricMachines.FirstOrDefault(e => e.Item1 != PowertrainPosition.GEN)?.Item1 ?? PowertrainPosition.HybridPositionNotSet;
@@ -413,6 +578,10 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
? VectoSimulationJobType.ParallelHybridVehicle
: VectoSimulationJobType.ConventionalVehicle;
+ if (powertrainPosition == PowertrainPosition.HybridP2 && gearboxData.Type.AutomaticTransmission()) {
+ throw new VectoException(
+ "Powertrain Architecture 'hybrid electric vehicle, P2' with AT transmission not supported");
+ }
var vehicleData = dao.CreateVehicleData(vehicle);
var gearshiftParams = dao.CreateGearshiftData(
diff --git a/VectoCore/VectoCore/JsonKeys.Designer.cs b/VectoCore/VectoCore/JsonKeys.Designer.cs
index 6e6af76ed1e2ccfdbc8a9af7216d10b68c011ee3..62ae58c6222f7ef7d2a7e7e7c5efb4582399f3af 100644
--- a/VectoCore/VectoCore/JsonKeys.Designer.cs
+++ b/VectoCore/VectoCore/JsonKeys.Designer.cs
@@ -19,7 +19,7 @@ namespace TUGraz.VectoCore {
// 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.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class JsonKeys {
@@ -60,6 +60,15 @@ namespace TUGraz.VectoCore {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to AppVersion.
+ /// </summary>
+ internal static string AppVersion {
+ get {
+ return ResourceManager.GetString("AppVersion", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Completed.
/// </summary>
@@ -69,6 +78,15 @@ namespace TUGraz.VectoCore {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Model.
+ /// </summary>
+ internal static string Component_Model {
+ get {
+ return ResourceManager.GetString("Component_Model", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to VACC.
/// </summary>
@@ -204,6 +222,105 @@ namespace TUGraz.VectoCore {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to ContinuousTorque.
+ /// </summary>
+ internal static string EM_ContinuousTorque {
+ get {
+ return ResourceManager.GetString("EM_ContinuousTorque", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to ContinuousTorqueSpeed.
+ /// </summary>
+ internal static string EM_ContinuousTorqueSpeed {
+ get {
+ return ResourceManager.GetString("EM_ContinuousTorqueSpeed", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to DragCurve.
+ /// </summary>
+ internal static string EM_DragCurve {
+ get {
+ return ResourceManager.GetString("EM_DragCurve", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to EfficiencyMap.
+ /// </summary>
+ internal static string EM_EfficiencyMap {
+ get {
+ return ResourceManager.GetString("EM_EfficiencyMap", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to FullLoadCurve.
+ /// </summary>
+ internal static string EM_FullLoadCurve {
+ get {
+ return ResourceManager.GetString("EM_FullLoadCurve", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to OverloadTime.
+ /// </summary>
+ internal static string EM_OverloadTime {
+ get {
+ return ResourceManager.GetString("EM_OverloadTime", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to OverloadTorque.
+ /// </summary>
+ internal static string EM_OverloadTorque {
+ get {
+ return ResourceManager.GetString("EM_OverloadTorque", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to OverloadTorqueSpeed.
+ /// </summary>
+ internal static string EM_OverloadTorqueSpeed {
+ get {
+ return ResourceManager.GetString("EM_OverloadTorqueSpeed", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to ThermalOverloadRecoveryFactor.
+ /// </summary>
+ internal static string EM_ThermalOverloadRecoveryFactor {
+ get {
+ return ResourceManager.GetString("EM_ThermalOverloadRecoveryFactor", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Voltage.
+ /// </summary>
+ internal static string EM_Voltage {
+ get {
+ return ResourceManager.GetString("EM_Voltage", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to VoltageLevels.
+ /// </summary>
+ internal static string EM_VoltageLevels {
+ get {
+ return ResourceManager.GetString("EM_VoltageLevels", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Displacement.
/// </summary>
@@ -321,6 +438,24 @@ namespace TUGraz.VectoCore {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to MaxOutShaftSpeed.
+ /// </summary>
+ internal static string Gearbox_Gear_MaxOutShaftSpeed {
+ get {
+ return ResourceManager.GetString("Gearbox_Gear_MaxOutShaftSpeed", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to MaxOutShaftTorque.
+ /// </summary>
+ internal static string Gearbox_Gear_MaxOutShaftTorque {
+ get {
+ return ResourceManager.GetString("Gearbox_Gear_MaxOutShaftTorque", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Ratio.
/// </summary>
@@ -492,6 +627,141 @@ namespace TUGraz.VectoCore {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to ContinuousTorque.
+ /// </summary>
+ internal static string IEPC_ContinuousTorque {
+ get {
+ return ResourceManager.GetString("IEPC_ContinuousTorque", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to ContinuousTorqueSpeed.
+ /// </summary>
+ internal static string IEPC_ContinuousTorqueSpeed {
+ get {
+ return ResourceManager.GetString("IEPC_ContinuousTorqueSpeed", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to DesignTypeWheelMotor.
+ /// </summary>
+ internal static string IEPC_DesignTypeWheelMotor {
+ get {
+ return ResourceManager.GetString("IEPC_DesignTypeWheelMotor", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to DifferentialIncluded.
+ /// </summary>
+ internal static string IEPC_DifferentialIncluded {
+ get {
+ return ResourceManager.GetString("IEPC_DifferentialIncluded", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to DragCurves.
+ /// </summary>
+ internal static string IEPC_DragCurves {
+ get {
+ return ResourceManager.GetString("IEPC_DragCurves", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to FullLoadCurve.
+ /// </summary>
+ internal static string IEPC_FullLoadCurve {
+ get {
+ return ResourceManager.GetString("IEPC_FullLoadCurve", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Inertia.
+ /// </summary>
+ internal static string IEPC_Inertia {
+ get {
+ return ResourceManager.GetString("IEPC_Inertia", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to NrOfDesignTypeWheelMotorMeasured.
+ /// </summary>
+ internal static string IEPC_NrOfDesignTypeWheelMotorMeasured {
+ get {
+ return ResourceManager.GetString("IEPC_NrOfDesignTypeWheelMotorMeasured", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to OverloadTime.
+ /// </summary>
+ internal static string IEPC_OverloadTime {
+ get {
+ return ResourceManager.GetString("IEPC_OverloadTime", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to OverloadTorque.
+ /// </summary>
+ internal static string IEPC_OverloadTorque {
+ get {
+ return ResourceManager.GetString("IEPC_OverloadTorque", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to OverloadTorqueSpeed.
+ /// </summary>
+ internal static string IEPC_OverloadTorqueSpeed {
+ get {
+ return ResourceManager.GetString("IEPC_OverloadTorqueSpeed", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to PowerMaps.
+ /// </summary>
+ internal static string IEPC_PowerMaps {
+ get {
+ return ResourceManager.GetString("IEPC_PowerMaps", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to ThermalOverloadRecoveryFactor.
+ /// </summary>
+ internal static string IEPC_ThermalOverloadRecoveryFactor {
+ get {
+ return ResourceManager.GetString("IEPC_ThermalOverloadRecoveryFactor", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Voltage.
+ /// </summary>
+ internal static string IEPC_Voltage {
+ get {
+ return ResourceManager.GetString("IEPC_Voltage", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to VoltageLevels.
+ /// </summary>
+ internal static string IEPC_VoltageLevels {
+ get {
+ return ResourceManager.GetString("IEPC_VoltageLevels", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to InterimStep.
/// </summary>
@@ -537,6 +807,24 @@ namespace TUGraz.VectoCore {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to CreatedBy.
+ /// </summary>
+ internal static string JsonHeader_CreatedBy {
+ get {
+ return ResourceManager.GetString("JsonHeader_CreatedBy", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Date.
+ /// </summary>
+ internal static string JsonHeader_Date {
+ get {
+ return ResourceManager.GetString("JsonHeader_Date", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to FileVersion.
/// </summary>
diff --git a/VectoCore/VectoCore/JsonKeys.resx b/VectoCore/VectoCore/JsonKeys.resx
index bb4fdb88ba958319e22aff7b7e272c21af4177b6..04560f85bea6e606998446aeebf62bd79aff605c 100644
--- a/VectoCore/VectoCore/JsonKeys.resx
+++ b/VectoCore/VectoCore/JsonKeys.resx
@@ -375,9 +375,9 @@
<data name="Vehicle_PTO_CycleDriving" xml:space="preserve">
<value>CycleDriving</value>
</data>
- <data name="HEV_Vehicle_MaxDrivetrainPower" xml:space="preserve">
- <value>MaxDrivetrainPower</value>
- </data>
+ <data name="HEV_Vehicle_MaxDrivetrainPower" xml:space="preserve">
+ <value>MaxDrivetrainPower</value>
+ </data>
<data name="PrimaryVehicle" xml:space="preserve">
<value>PrimaryVehicle</value>
</data>
@@ -387,4 +387,100 @@
<data name="Completed" xml:space="preserve">
<value>Completed</value>
</data>
+ <data name="AppVersion" xml:space="preserve">
+ <value>AppVersion</value>
+ </data>
+ <data name="Component_Model" xml:space="preserve">
+ <value>Model</value>
+ </data>
+ <data name="Gearbox_Gear_MaxOutShaftSpeed" xml:space="preserve">
+ <value>MaxOutShaftSpeed</value>
+ </data>
+ <data name="Gearbox_Gear_MaxOutShaftTorque" xml:space="preserve">
+ <value>MaxOutShaftTorque</value>
+ </data>
+ <data name="IEPC_ContinuousTorque" xml:space="preserve">
+ <value>ContinuousTorque</value>
+ </data>
+ <data name="IEPC_ContinuousTorqueSpeed" xml:space="preserve">
+ <value>ContinuousTorqueSpeed</value>
+ </data>
+ <data name="IEPC_DesignTypeWheelMotor" xml:space="preserve">
+ <value>DesignTypeWheelMotor</value>
+ </data>
+ <data name="IEPC_DifferentialIncluded" xml:space="preserve">
+ <value>DifferentialIncluded</value>
+ </data>
+ <data name="IEPC_DragCurves" xml:space="preserve">
+ <value>DragCurves</value>
+ </data>
+ <data name="IEPC_FullLoadCurve" xml:space="preserve">
+ <value>FullLoadCurve</value>
+ </data>
+ <data name="IEPC_Inertia" xml:space="preserve">
+ <value>Inertia</value>
+ </data>
+ <data name="IEPC_NrOfDesignTypeWheelMotorMeasured" xml:space="preserve">
+ <value>NrOfDesignTypeWheelMotorMeasured</value>
+ </data>
+ <data name="IEPC_OverloadTime" xml:space="preserve">
+ <value>OverloadTime</value>
+ </data>
+ <data name="IEPC_OverloadTorque" xml:space="preserve">
+ <value>OverloadTorque</value>
+ </data>
+ <data name="IEPC_OverloadTorqueSpeed" xml:space="preserve">
+ <value>OverloadTorqueSpeed</value>
+ </data>
+ <data name="IEPC_PowerMaps" xml:space="preserve">
+ <value>PowerMaps</value>
+ </data>
+ <data name="IEPC_ThermalOverloadRecoveryFactor" xml:space="preserve">
+ <value>ThermalOverloadRecoveryFactor</value>
+ </data>
+ <data name="IEPC_Voltage" xml:space="preserve">
+ <value>Voltage</value>
+ </data>
+ <data name="IEPC_VoltageLevels" xml:space="preserve">
+ <value>VoltageLevels</value>
+ </data>
+ <data name="EM_ContinuousTorque" xml:space="preserve">
+ <value>ContinuousTorque</value>
+ </data>
+ <data name="EM_ContinuousTorqueSpeed" xml:space="preserve">
+ <value>ContinuousTorqueSpeed</value>
+ </data>
+ <data name="EM_DragCurve" xml:space="preserve">
+ <value>DragCurve</value>
+ </data>
+ <data name="EM_EfficiencyMap" xml:space="preserve">
+ <value>EfficiencyMap</value>
+ </data>
+ <data name="EM_FullLoadCurve" xml:space="preserve">
+ <value>FullLoadCurve</value>
+ </data>
+ <data name="EM_OverloadTime" xml:space="preserve">
+ <value>OverloadTime</value>
+ </data>
+ <data name="EM_OverloadTorque" xml:space="preserve">
+ <value>OverloadTorque</value>
+ </data>
+ <data name="EM_OverloadTorqueSpeed" xml:space="preserve">
+ <value>OverloadTorqueSpeed</value>
+ </data>
+ <data name="EM_ThermalOverloadRecoveryFactor" xml:space="preserve">
+ <value>ThermalOverloadRecoveryFactor</value>
+ </data>
+ <data name="EM_Voltage" xml:space="preserve">
+ <value>Voltage</value>
+ </data>
+ <data name="EM_VoltageLevels" xml:space="preserve">
+ <value>VoltageLevels</value>
+ </data>
+ <data name="JsonHeader_CreatedBy" xml:space="preserve">
+ <value>CreatedBy</value>
+ </data>
+ <data name="JsonHeader_Date" xml:space="preserve">
+ <value>Date</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleBattery.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleBattery.cs
index 6fff2a8be4a8dcf535cdb86ffb59d39ff3118cea..2a7375c231c5ea8c72d3930b084c2a6556cad9c6 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleBattery.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleBattery.cs
@@ -56,6 +56,12 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
}
#endregion
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) => false;
+
+ #endregion
}
// ########################################
@@ -114,6 +120,8 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
ConsumedEnergy = 0.SI<WattSecond>();
}
public WattSecond ConsumedEnergy { get; set; }
+
+ public State Clone() => (State)MemberwiseClone();
}
#region Overrides of VectoSimulationComponent
@@ -136,7 +144,17 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
}
AdvanceState();
}
+ #endregion
+ #region Implementation of IUpdateable
+ public bool UpdateFrom(object other) {
+ if (other is SimpleBattery b) {
+ PreviousState = b.PreviousState.Clone();
+ SOC = b.SOC;
+ return true;
+ }
+ return false;
+ }
#endregion
}
}
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ISimpleBattery.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ISimpleBattery.cs
index 2afae59c4be801d0be66884e164fffc859df2095..1c615da59feeee6c47f6faf5c003e56862a30e91 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ISimpleBattery.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ISimpleBattery.cs
@@ -1,4 +1,5 @@
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.SimulationComponent;
namespace TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.Electrics {
@@ -9,7 +10,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.El
}
- public interface ISimpleBattery : ISimpleBatteryInfo
+ public interface ISimpleBattery : ISimpleBatteryInfo, IUpdateable
{
WattSecond ConsumedEnergy { get; }
diff --git a/VectoCore/VectoCore/Models/Declaration/AuxDemandEntry.cs b/VectoCore/VectoCore/Models/Declaration/AuxDemandEntry.cs
index ea94166fb09a07a2ccc14fda3231bee7a14de48e..b9561d719efb5329cb39e09efd850de76b34f21e 100644
--- a/VectoCore/VectoCore/Models/Declaration/AuxDemandEntry.cs
+++ b/VectoCore/VectoCore/Models/Declaration/AuxDemandEntry.cs
@@ -36,5 +36,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public struct AuxDemandEntry
{
public Watt PowerDemand;
+
+ public NewtonMeter TorqueLoss;
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index 955717ee9ec407cb19102cd8679252112d63c42c..2b593d99bf07c3f629dfedea82157584a1933ad1 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -137,6 +137,56 @@ namespace TUGraz.VectoCore.Models.Declaration
grossVehicleWeight - curbWeight).Value() / 100, 0) * 100).SI<Kilogram>();
}
+ public static VehicleClass GetVehicleGroupGroup(IVehicleDeclarationInputData vehicleData)
+ {
+ switch (vehicleData.VehicleCategory) {
+ case VehicleCategory.Van:
+ case VehicleCategory.RigidTruck:
+ case VehicleCategory.Tractor:
+ var truckSegment = DeclarationData.TruckSegments.Lookup(vehicleData.VehicleCategory,
+ vehicleData.AxleConfiguration, vehicleData.GrossVehicleMassRating, vehicleData.CurbMassChassis,
+ vehicleData.VocationalVehicle);
+ return truckSegment.VehicleClass;
+ case VehicleCategory.HeavyBusPrimaryVehicle:
+ var primarySegment = DeclarationData.PrimaryBusSegments.Lookup(vehicleData.VehicleCategory,
+ vehicleData.AxleConfiguration, vehicleData.Articulated);
+ return primarySegment.VehicleClass;
+ case VehicleCategory.HeavyBusCompletedVehicle:
+ var segment = DeclarationData.CompletedBusSegments.Lookup(vehicleData.AxleConfiguration.NumAxles(),
+ vehicleData.VehicleCode,
+ vehicleData.RegisteredClass, vehicleData.NumberPassengerSeatsLowerDeck, vehicleData.Height,
+ vehicleData.LowEntry);
+ return segment.VehicleClass;
+ }
+
+ throw new VectoException("No Group found for vehicle");
+ }
+
+ public static WeightingGroup GetVehicleGroupCO2StandardsGroup(IVehicleDeclarationInputData vehicleData)
+ {
+ switch (vehicleData.VehicleCategory) {
+ case VehicleCategory.Van:
+ case VehicleCategory.RigidTruck:
+ case VehicleCategory.Tractor:
+ var vehicleGroup = GetVehicleGroupGroup(vehicleData);
+ var propulsionPower = (vehicleData.Components?.EngineInputData?.RatedPowerDeclared ?? 0.SI<Watt>()) +
+ (vehicleData.Components?.ElectricMachines?.Entries
+ .Where(x => x.Position != PowertrainPosition.GEN)
+ .Sum(x => x.ElectricMachine.R85RatedPower * x.Count) ?? 0.SI<Watt>()) +
+ (vehicleData.Components?.IEPC?.R85RatedPower ?? 0.SI<Watt>()) +
+ (vehicleData.MaxNetPower1 ?? 0.SI<Watt>());
+ var co2Group = WeightingGroup.Lookup(vehicleGroup, vehicleData.SleeperCab ?? false, propulsionPower);
+ return co2Group;
+ default:
+ return Declaration.WeightingGroup.Unknown;
+ }
+ //throw new VectoException("No CO2 Group found for vehicle");
+ }
+
+ public static WeightingGroup GetVehicleGroupCO2StandardsGroup(IMultistepBusInputDataProvider multiStageInputDataProvider)
+ {
+ return Declaration.WeightingGroup.Unknown;
+ }
@@ -336,7 +386,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public static Meter CorrectionLengthDrivetrainVolume(VehicleCode? vehicleCode, bool? lowEntry, int numAxles, bool articulated)
{
- if ((vehicleCode == VehicleCode.CE || vehicleCode == VehicleCode.CG) && !(bool)lowEntry) {
+ if ((vehicleCode == VehicleCode.CE || vehicleCode == VehicleCode.CG) && (bool)lowEntry) {
switch (numAxles) {
case 2: return 1.0.SI<Meter>();
case 3: return articulated ? 1.0.SI<Meter>() : 1.25.SI<Meter>();
@@ -577,6 +627,7 @@ namespace TUGraz.VectoCore.Models.Declaration
switch (type) {
case GearboxType.AMT:
case GearboxType.APTN:
+ case GearboxType.IHPC:
// TODO MQ: 2020-10-14: compute for AMT with ICE and AMT with EM differently
return ComputeEfficiencyShiftPolygon(gearIdx, fullLoadCurve, gears, engine, axlegearRatio, dynamicTyreRadius);
case GearboxType.MT:
@@ -1154,5 +1205,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public const bool EngineStopStartDefault = false;
}
}
+
+
}
}
diff --git a/VectoCore/VectoCore/Models/Declaration/PTOTransmission.cs b/VectoCore/VectoCore/Models/Declaration/PTOTransmission.cs
index 61cb57c6f31781722ee7c76aded1bbd144676cc4..5d0eadeb4055b3727496379c163ca76e33c71dcf 100644
--- a/VectoCore/VectoCore/Models/Declaration/PTOTransmission.cs
+++ b/VectoCore/VectoCore/Models/Declaration/PTOTransmission.cs
@@ -48,7 +48,10 @@ namespace TUGraz.VectoCore.Models.Declaration
{
Data = table.Rows.Cast<DataRow>().ToDictionary(
r => r.Field<string>("technology"),
- r => new AuxDemandEntry { PowerDemand = r.ParseDouble("powerloss").SI<Watt>() });
+ r => new AuxDemandEntry {
+ PowerDemand = r.ParseDouble("powerloss").SI<Watt>(),
+ TorqueLoss = r.ParseDouble("torqueloss").SI<NewtonMeter>()
+ });
}
public string[] GetTechnologies()
diff --git a/VectoCore/VectoCore/Models/Simulation/Data/ModalResultField.cs b/VectoCore/VectoCore/Models/Simulation/Data/ModalResultField.cs
index 140efb62cfc0fb95ce2d5375fcdba714a8b96fb6..3480f889ddd1ccf50f48a916ff4a9d4cf3c11b99 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/ModalResultField.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/ModalResultField.cs
@@ -394,7 +394,25 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
[ModalResultField(typeof(SI), caption: "EM_OVL-{0}-em [%]", outputFactor: 100)] ElectricMotor_OvlBuffer_,
[ModalResultField(typeof(SI), caption: "EM_{0}_off")] EM_Off_,
- [ModalResultField(typeof(SI), caption: "EM_E2_off")] EM_E2_Off_,
+
+ [ModalResultField(typeof(SI), caption: "n_{0}_int_avg [1/min]", outputFactor: 60 / (2 * Math.PI))] n_IEPC_int_,
+ [ModalResultField(typeof(SI), caption: "T_{0}_int [Nm]")] T_IEPC_,
+ [ModalResultField(typeof(SI), caption: "T_{0}_int_map [Nm]")] T_IEPC_map_,
+ [ModalResultField(typeof(SI), caption: "T_{0}_int_drive_max [Nm]")] T_IEPC_int_drive_max_,
+ [ModalResultField(typeof(SI), caption: "T_{0}_int_gen_max [Nm]")] T_IEPC_int_gen_max_,
+ [ModalResultField(typeof(SI), caption: "P_{0}_int_gen_max [kW]", outputFactor: 1e-3)] P_IEPC_int_gen_max_,
+ [ModalResultField(typeof(SI), caption: "P_{0}_int_drive_max [kW]", outputFactor: 1e-3)] P_IEPC_int_drive_max_,
+ [ModalResultField(typeof(SI), caption: "P_{0}_inertia_loss [kW]", outputFactor: 1e-3)] P_IEPC_electricMotorInertiaLoss_,
+ [ModalResultField(typeof(SI), caption: "P_{0}_int_mech_map [kW]", outputFactor: 1e-3)] P_IEPC_int_mech_map_,
+ [ModalResultField(typeof(SI), caption: "P_{0}_el [kW]", outputFactor: 1e-3)] P_IEPC_el_,
+ [ModalResultField(typeof(SI), caption: "P_{0}_out [kW]", outputFactor: 1e-3)] P_IEPC_out_,
+ [ModalResultField(typeof(SI), caption: "n_IEPC_out_avg [kW]", outputFactor: 1e-3)] n_IEPC_out_avg,
+ [ModalResultField(typeof(SI), caption: "T_IEPC_out [kW]", outputFactor: 1e-3)] T_IEPC_out,
+ [ModalResultField(typeof(SI), caption: "P_{0}_loss [kW]", outputFactor: 1e-3)] P_IEPC_electricMotorLoss_,
+ [ModalResultField(typeof(SI), caption: "{0}_off")] IEPC_Off_,
+ [ModalResultField(typeof(SI), caption: "{0}_OVL [%]", outputFactor: 100)] IEPC_OvlBuffer_,
+
+
// only for graphDrawing Testcase
@@ -464,6 +482,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
{
private static ConcurrentDictionary<ModalResultField, ModalResultFieldAttribute> _attributeDictionary =
new ConcurrentDictionary<ModalResultField, ModalResultFieldAttribute>();
+
public static string GetName(this ModalResultField field)
{
return GetAttribute(field).Name ?? field.ToString();
diff --git a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
index fa57a3e5f78949c943349866d08c342594988d13..91a78f96b37a8f5480c6f937b7443a89bb9848f8 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
@@ -48,6 +48,7 @@ using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Battery;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
+using TUGraz.VectoCore.Models.SimulationComponent.Strategies;
using TUGraz.VectoCore.OutputData;
using DriverData = TUGraz.VectoCore.Models.SimulationComponent.Data.DriverData;
@@ -157,6 +158,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
[JsonIgnore]
public IMultistageVIFInputData MultistageVIFInputData { get; internal set; }
+ // container to pass genset data from powertrain to post-processing, not filled by dataadapter/rundatafactory
+ public GenSetData GenSet { get; set; }
[JsonIgnore]
public IDeclarationInputDataProvider InputData { get; internal set; }
@@ -178,6 +181,12 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
public MissionType? MissionType;
}
+ // container to pass genset data from powertrain to post-processing, not filled by dataadapter/rundatafactory
+ public class GenSetData
+ {
+ public GenSetCharacteristics GenSetCharacteristics { get; set; }
+ }
+
public static ValidationResult ValidateRunData(VectoRunData runData, ValidationContext validationContext)
{
var gearboxData = runData.GearboxData;
@@ -203,9 +212,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
}
if (runData.Cycle != null && runData.Cycle.Entries.Any(e => e.PTOActive == PTOActivity.PTOActivityDuringStop)) {
- if (jobType == VectoSimulationJobType.BatteryElectricVehicle) {
- // TODO: MQ 20201020 - validate depending on EM position!?
- }
+ if (jobType == VectoSimulationJobType.BatteryElectricVehicle) {
+ // TODO: MQ 20201020 - validate depending on EM position!?
+ }
if (runData.PTO == null || runData.PTO.PTOCycle == null) {
return new ValidationResult("PTOCycle is used in DrivingCycle, but is not defined in Vehicle-Data.");
diff --git a/VectoCore/VectoCore/Models/Simulation/DataBus/IElectricMotorInfo.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IElectricMotorInfo.cs
index 9c65c7585e9c48cee154e80b36d6d46c8d9b00dc..802703c7fa154dbff43dadeafd6cdf786e99eeb6 100644
--- a/VectoCore/VectoCore/Models/Simulation/DataBus/IElectricMotorInfo.cs
+++ b/VectoCore/VectoCore/Models/Simulation/DataBus/IElectricMotorInfo.cs
@@ -1,5 +1,6 @@
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.SimulationComponent.Impl;
namespace TUGraz.VectoCore.Models.Simulation.DataBus
{
@@ -10,9 +11,9 @@ namespace TUGraz.VectoCore.Models.Simulation.DataBus
PerSecond ElectricMotorSpeed { get; }
PowertrainPosition Position { get; }
PerSecond MaxSpeed { get; }
- Watt DragPower(Volt volt, PerSecond electricMotorSpeed);
- Watt MaxPowerDrive(Volt volt, PerSecond inAngularVelocity);
- NewtonMeter GetTorqueForElectricPower(Volt volt, Watt electricPower, PerSecond avgEmSpeed, Second dt);
+ Watt DragPower(Volt volt, PerSecond electricMotorSpeed, GearshiftPosition gear);
+ Watt MaxPowerDrive(Volt volt, PerSecond inAngularVelocity, GearshiftPosition gear);
+ NewtonMeter GetTorqueForElectricPower(Volt volt, Watt electricPower, PerSecond avgEmSpeed, Second dt, GearshiftPosition gear, bool allowExtrapolation);
bool DeRatingActive { get; }
}
diff --git a/VectoCore/VectoCore/Models/Simulation/DataBus/IGearboxInfo.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IGearboxInfo.cs
index 481476c7796efa52764dca63c72bf5f8cda19aa1..ea6f671b0a563001a3caa80f31aedf6efff758de 100644
--- a/VectoCore/VectoCore/Models/Simulation/DataBus/IGearboxInfo.cs
+++ b/VectoCore/VectoCore/Models/Simulation/DataBus/IGearboxInfo.cs
@@ -78,6 +78,8 @@ namespace TUGraz.VectoCore.Models.Simulation.DataBus
bool DisengageGearbox { get; }
bool GearEngaged(Second absTime);
+
+ bool RequestAfterGearshift { get; set; }
}
public interface IGearboxControl
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs b/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs
index a4c164085967cd5d1dba5f7da262c492ad33e547..f86537721f1e1632699272eaf3f4a30e59fecace 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs
@@ -349,8 +349,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
_runsRwLock.EnterWriteLock();
//_unfinishedRuns.Remove(runId);
_unfinishedRuns.TryRemove(runId, out var tmpVal);
- if (AllCompletedUnsafe())
- {
+ if (AllCompletedUnsafe()) {
_sumWriter.Finish();
}
} finally {
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PCCEcoRollEngineStopPreprocessor.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PCCEcoRollEngineStopPreprocessor.cs
index d2b1379ec1550d6139d663c702fa8d296f6cc1eb..1b6c4c75fbfd4bd1b5210f1c1a66119c29697cbc 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PCCEcoRollEngineStopPreprocessor.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PCCEcoRollEngineStopPreprocessor.cs
@@ -125,7 +125,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
var gradient = 0.SI<Radian>();
foreach (var motor in container.ElectricMotors.Values) {
- ((motor as ElectricMotor).Control as DummyElectricMotorControl).EmTorque = null;
+ if ((motor as ElectricMotor).Control is DummyElectricMotorControl emCtl) {
+ emCtl.EmTorque = null;
+ }
}
var initialResponse = vehicle.Request(absTime, simulationInterval, acceleration, gradient);
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index 4dc41679bd1a1b254e18a5f1f4bd8d55cb5c8f53..7c95e3401ef4cce19cecc8d394d0d9aa65f44566 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -77,34 +77,28 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
/// <summary>
/// Provides Methods to build a simulator with a powertrain step by step.
/// </summary>
- public class PowertrainBuilder
+ public static class PowertrainBuilder
{
- private readonly IModalDataContainer _modData;
- private readonly WriteSumData _sumWriter;
- public PowertrainBuilder(IModalDataContainer modData, WriteSumData sumWriter = null)
- {
- _modData = modData ?? throw new VectoException("Modal Data Container can't be null");
- _sumWriter = sumWriter;
- }
-
- public IVehicleContainer Build(VectoRunData data)
+ public static IVehicleContainer Build(VectoRunData data, IModalDataContainer modData, WriteSumData sumWriter = null)
{
switch (data.Cycle.CycleType) {
case CycleType.DistanceBased:
switch (data.JobType) {
- case VectoSimulationJobType.ConventionalVehicle: return BuildFullPowertrainConventional(data);
- case VectoSimulationJobType.ParallelHybridVehicle: return BuildFullPowertrainParallelHybrid(data);
- case VectoSimulationJobType.SerialHybridVehicle: return BuildFullPowertrainSerialHybrid(data);
- case VectoSimulationJobType.BatteryElectricVehicle: return BuildBatteryElectricPowertrain(data);
- case VectoSimulationJobType.EngineOnlySimulation: return BuildEngineOnly(data);
+ case VectoSimulationJobType.ConventionalVehicle: return BuildFullPowertrainConventional(data, modData, sumWriter);
+ case VectoSimulationJobType.ParallelHybridVehicle: return BuildFullPowertrainParallelHybrid(data, modData, sumWriter);
+ case VectoSimulationJobType.SerialHybridVehicle: return BuildFullPowertrainSerialHybrid(data, modData, sumWriter);
+ case VectoSimulationJobType.BatteryElectricVehicle: return BuildFulPowertrainBatteryElectric(data, modData, sumWriter);
+ case VectoSimulationJobType.EngineOnlySimulation: return BuildEngineOnly(data, modData, sumWriter);
+ case VectoSimulationJobType.IEPC_E: return BuildFullPowertrainIEPCE(data, modData, sumWriter);
+ case VectoSimulationJobType.IEPC_S: return BuildFullPowertrainIEPCSerial(data, modData, sumWriter);
default: throw new ArgumentOutOfRangeException($"Powertrain Builder cannot build Powertrain for JobType: {data.JobType}");
}
- case CycleType.EngineOnly: return BuildEngineOnly(data);
- case CycleType.PWheel: return BuildPWheel(data);
- case CycleType.VTP: return BuildVTP(data);
- case CycleType.MeasuredSpeed: return BuildMeasuredSpeed(data);
- case CycleType.MeasuredSpeedGear: return BuildMeasuredSpeedGear(data);
+ case CycleType.EngineOnly: return BuildEngineOnly(data, modData, sumWriter);
+ case CycleType.PWheel: return BuildPWheel(data, modData, sumWriter);
+ case CycleType.VTP: return BuildVTP(data, modData, sumWriter);
+ case CycleType.MeasuredSpeed: return BuildMeasuredSpeed(data, modData, sumWriter);
+ case CycleType.MeasuredSpeedGear: return BuildMeasuredSpeedGear(data, modData, sumWriter);
default: throw new VectoException("Powertrain Builder cannot build Powertrain for CycleType: {0}", data.Cycle.CycleType);
}
}
@@ -117,13 +111,15 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
/// â””(Aux)
/// </code>
/// </summary>
- private IVehicleContainer BuildEngineOnly(VectoRunData data)
+ private static IVehicleContainer BuildEngineOnly(VectoRunData data, IModalDataContainer modData, WriteSumData _sumWriter)
{
+ if (_sumWriter == null)
+ throw new ArgumentNullException(nameof(_sumWriter));
if (data.Cycle.CycleType != CycleType.EngineOnly) {
throw new VectoException("CycleType must be EngineOnly.");
}
- var container = new VehicleContainer(ExecutionMode.Engineering, _modData, _sumWriter) { RunData = data };
+ var container = new VehicleContainer(ExecutionMode.Engineering, modData, _sumWriter) { RunData = data };
container.ModalData.AddAuxiliary(Constants.Auxiliaries.Cycle);
var cycle = new PowertrainDrivingCycle(container, data.Cycle);
@@ -155,13 +151,15 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
/// â””(Aux)
/// </code>
/// </summary>
- private IVehicleContainer BuildPWheel(VectoRunData data)
+ private static IVehicleContainer BuildPWheel(VectoRunData data, IModalDataContainer modData, WriteSumData _sumWriter)
{
+ if (_sumWriter == null)
+ throw new ArgumentNullException(nameof(_sumWriter));
if (data.Cycle.CycleType != CycleType.PWheel) {
throw new VectoException("CycleType must be PWheel.");
}
- var container = new VehicleContainer(ExecutionMode.Engineering, _modData, _sumWriter) { RunData = data };
+ var container = new VehicleContainer(ExecutionMode.Engineering, modData, _sumWriter) { RunData = data };
var engine = new StopStartCombustionEngine(container, data.EngineData, pt1Disabled: true);
new PWheelCycle(container, data.Cycle)
.AddComponent(new AxleGear(container, data.AxleGearData))
@@ -191,13 +189,13 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
/// â””(VTPTruckAuxiliaries or VTPBusAuxiliaries)
/// </code>
/// </summary>
- private IVehicleContainer BuildVTP(VectoRunData data)
+ private static IVehicleContainer BuildVTP(VectoRunData data, IModalDataContainer modData, WriteSumData sumWriter)
{
if (data.Cycle.CycleType != CycleType.VTP) {
throw new VectoException("CycleType must be VTP.");
}
- var container = new VehicleContainer(data.ExecutionMode, _modData, _sumWriter) { RunData = data };
+ var container = new VehicleContainer(data.ExecutionMode, modData, sumWriter) { RunData = data };
var engine = new VTPCombustionEngine(container, data.EngineData, pt1Disabled: true);
new VTPCycle(container, data.Cycle)
@@ -220,7 +218,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
return container;
}
- private void AddVTPBusAuxiliaries(VectoRunData data, VehicleContainer container, VTPCombustionEngine engine)
+ private static void AddVTPBusAuxiliaries(VectoRunData data, VehicleContainer container, VTPCombustionEngine engine)
{
var aux = new EngineAuxiliary(container);
foreach (var auxData in data.Aux) {
@@ -248,7 +246,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
engine.Connect(aux.Port());
}
- private void AddVTPTruckAuxiliaries(VectoRunData data, VehicleContainer container, VTPCombustionEngine engine)
+ private static void AddVTPTruckAuxiliaries(VectoRunData data, VehicleContainer container, VTPCombustionEngine engine)
{
var aux = CreateSpeedDependentAuxiliaries(data, container);
var engineFan = new EngineFanAuxiliary(data.FanDataVTP.FanCoefficients.Take(3).ToArray(), data.FanDataVTP.FanDiameter);
@@ -287,13 +285,13 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
/// â””(Aux)
/// </code>
/// </summary>
- private IVehicleContainer BuildMeasuredSpeed(VectoRunData data)
+ private static IVehicleContainer BuildMeasuredSpeed(VectoRunData data, IModalDataContainer modData, WriteSumData sumWriter)
{
if (data.Cycle.CycleType != CycleType.MeasuredSpeed) {
throw new VectoException("CycleType must be MeasuredSpeed.");
}
- var container = new VehicleContainer(ExecutionMode.Engineering, _modData, _sumWriter) { RunData = data };
+ var container = new VehicleContainer(ExecutionMode.Engineering, modData, sumWriter) { RunData = data };
var engine = new StopStartCombustionEngine(container, data.EngineData);
new MeasuredSpeedDrivingCycle(container, data.Cycle)
.AddComponent(new Vehicle(container, data.VehicleData, data.AirdragData))
@@ -327,13 +325,13 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
/// â””(Aux)
/// </code>
/// </summary>
- private IVehicleContainer BuildMeasuredSpeedGear(VectoRunData data)
+ private static IVehicleContainer BuildMeasuredSpeedGear(VectoRunData data, IModalDataContainer modData, WriteSumData sumWriter)
{
if (data.Cycle.CycleType != CycleType.MeasuredSpeedGear) {
throw new VectoException("CycleType must be MeasuredSpeed with Gear.");
}
- var container = new VehicleContainer(ExecutionMode.Engineering, _modData, _sumWriter) { RunData = data };
+ var container = new VehicleContainer(ExecutionMode.Engineering, modData, sumWriter) { RunData = data };
new MeasuredSpeedDrivingCycle(container, data.Cycle)
.AddComponent(new Vehicle(container, data.VehicleData, data.AirdragData))
.AddComponent(new Wheels(container, data.VehicleData.DynamicTyreRadius, data.VehicleData.WheelsInertia))
@@ -369,13 +367,13 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
/// â””(Aux)
/// </code>
/// </summary>
- private IVehicleContainer BuildFullPowertrainConventional(VectoRunData data)
+ private static IVehicleContainer BuildFullPowertrainConventional(VectoRunData data, IModalDataContainer modData, WriteSumData sumWriter)
{
if (data.Cycle.CycleType != CycleType.DistanceBased) {
throw new VectoException("CycleType must be DistanceBased");
}
- var container = new VehicleContainer(data.ExecutionMode, _modData, _sumWriter) { RunData = data };
+ var container = new VehicleContainer(data.ExecutionMode, modData, sumWriter) { RunData = data };
var cycle = new DistanceBasedDrivingCycle(container, data.Cycle);
var engine = new StopStartCombustionEngine(container, data.EngineData);
var idleController = GetIdleController(data.PTO, engine, container);
@@ -419,8 +417,10 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
/// â””(Aux)
/// </code>
/// </summary>
- private IVehicleContainer BuildFullPowertrainParallelHybrid(VectoRunData data)
+ private static IVehicleContainer BuildFullPowertrainParallelHybrid(VectoRunData data, IModalDataContainer modData, WriteSumData _sumWriter)
{
+ if (_sumWriter == null)
+ throw new ArgumentNullException(nameof(_sumWriter));
if (data.Cycle.CycleType != CycleType.DistanceBased) {
throw new VectoException("CycleType must be DistanceBased");
}
@@ -434,7 +434,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
throw new VectoException("P0 Hybrids are modeled as SmartAlternator in the BusAuxiliary model.");
}
- var container = new VehicleContainer(data.ExecutionMode, _modData, _sumWriter) { RunData = data };
+ var container = new VehicleContainer(data.ExecutionMode, modData, _sumWriter) { RunData = data };
var es = ConnectREESS(data, container);
var aux = new ElectricAuxiliary(container);
aux.AddConstant("P_aux_el", data.ElectricAuxDemand ?? 0.SI<Watt>());
@@ -442,13 +442,15 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
HybridController ctl;
SwitchableClutch clutch = null;
- if (data.GearboxData.Type.ManualTransmission()) {
- ctl = new HybridController(container, new HybridStrategy(data, container), es);
+
+ if (data.GearboxData.Type.ManualTransmission() || data.GearboxData.Type == GearboxType.IHPC) {
+ ctl = new HybridController(container,new HybridStrategy(data, container), es);
clutch = new SwitchableClutch(container, data.EngineData);
} else {
ctl = new HybridController(container, new HybridStrategyAT(data, container), es);
new ATClutchInfo(container);
}
+
// add engine before gearbox in the container, that gearbox can obtain it
var engine = new StopStartCombustionEngine(container, data.EngineData);
@@ -485,6 +487,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
.AddComponent(GetRetarder(RetarderType.TransmissionInputRetarder, data.Retarder, container))
.AddComponent(GetElectricMachine(PowertrainPosition.HybridP2_5, data.ElectricMachinesData, container, es, ctl))
.AddComponent(GetElectricMachine(PowertrainPosition.HybridP2, data.ElectricMachinesData, container, es, ctl))
+ .AddComponent(GetElectricMachine(PowertrainPosition.IHPC, data.ElectricMachinesData, container, es, ctl))
.AddComponent(clutch)
.AddComponent(GetElectricMachine(PowertrainPosition.HybridP1, data.ElectricMachinesData, container, es, ctl))
.AddComponent(engine, idleController)
@@ -540,8 +543,10 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
/// â””Engine E2
/// </code>
/// </summary>
- private IVehicleContainer BuildFullPowertrainSerialHybrid(VectoRunData data)
+ private static IVehicleContainer BuildFullPowertrainSerialHybrid(VectoRunData data, IModalDataContainer modData, WriteSumData sumWriter)
{
+ if (sumWriter == null)
+ throw new ArgumentNullException(nameof(sumWriter));
if (data.Cycle.CycleType != CycleType.DistanceBased) {
throw new VectoException("CycleType must be DistanceBased");
}
@@ -552,7 +557,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
throw new VectoException("SerialHybrid needs exactly one electric motor.");
}
- var container = new VehicleContainer(data.ExecutionMode, _modData, _sumWriter) { RunData = data };
+ var container = new VehicleContainer(data.ExecutionMode, modData, sumWriter) { RunData = data };
var es = ConnectREESS(data, container);
var strategy = data.GearboxData != null && data.GearboxData.Type.AutomaticTransmission()
? (IHybridControlStrategy)new SerialHybridStrategyAT(data, container)
@@ -621,6 +626,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
.AddComponent(GetRetarder(RetarderType.TransmissionOutputRetarder, data.Retarder, container))
.AddComponent(gearbox)
.AddComponent(GetRetarder(RetarderType.TransmissionInputRetarder, data.Retarder, container))
+ .AddComponent(GetPEVPTO(container, data))
.AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE2,
data.ElectricMachinesData, container, es, ctl));
new ATClutchInfo(container);
@@ -650,7 +656,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
ctl.GenSet.AddComponent(GetElectricMachine(PowertrainPosition.GEN, data.ElectricMachinesData, container, es, ctl))
.AddComponent(engine, idleController)
- .AddAuxiliaries(container, data);
+ .AddAuxiliariesSerialHybrid(container, data);
return container;
}
@@ -675,7 +681,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
/// â””Engine E2
/// </code>
/// </summary>
- private IVehicleContainer BuildBatteryElectricPowertrain(VectoRunData data)
+ private static IVehicleContainer BuildFulPowertrainBatteryElectric(VectoRunData data, IModalDataContainer modData, WriteSumData sumWriter)
{
if (data.Cycle.CycleType != CycleType.DistanceBased) {
throw new VectoException("CycleType must be DistanceBased");
@@ -687,7 +693,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
throw new VectoException("Battery electric vehicle needs exactly one electric motor.");
}
- var container = new VehicleContainer(data.ExecutionMode, _modData, _sumWriter) { RunData = data };
+ var container = new VehicleContainer(data.ExecutionMode, modData, sumWriter) { RunData = data };
var es = ConnectREESS(data, container);
var ctl = new BatteryElectricMotorController(container, es);
@@ -738,6 +744,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
.AddComponent(GetRetarder(RetarderType.TransmissionOutputRetarder, data.Retarder, container))
.AddComponent(gearbox)
.AddComponent(GetRetarder(RetarderType.TransmissionInputRetarder, data.Retarder, container))
+ .AddComponent(GetPEVPTO(container, data))
.AddComponent(em);
new ATClutchInfo(container);
@@ -767,10 +774,53 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
return container;
}
+ private static IPowerTrainComponent GetPEVPTO(VehicleContainer container, VectoRunData data)
+ {
+ if (data.PTO == null) {
+ return null;
+ }
+ var pto = new PEVPTO(container);
+
+ RoadSweeperAuxiliary rdSwpAux = null;
+ PTODriveAuxiliary ptoDrive = null;
+ if (data.ExecutionMode == ExecutionMode.Engineering && data.Cycle.Entries.Any(x => x.PTOActive == PTOActivity.PTOActivityRoadSweeping)) {
+ if (data.DriverData.PTODriveMinSpeed == null) {
+ throw new VectoSimulationException("PTO activity 'road sweeping' requested, but no min. engine speed or gear provided");
+ }
+ rdSwpAux = new RoadSweeperAuxiliary(container);
+ pto.Add(Constants.Auxiliaries.IDs.PTORoadsweeping, (nEng, absTime, dt, dryRun) => rdSwpAux.PowerDemand(nEng, absTime, dt, dryRun) / nEng);
+ container.ModalData?.AddAuxiliary(Constants.Auxiliaries.IDs.PTORoadsweeping, Constants.Auxiliaries.PowerPrefix + Constants.Auxiliaries.IDs.PTORoadsweeping);
+ }
+
+ if (data.ExecutionMode == ExecutionMode.Engineering &&
+ data.Cycle.Entries.Any(x => x.PTOActive == PTOActivity.PTOActivityWhileDrive)) {
+ if (data.PTOCycleWhileDrive == null) {
+ throw new VectoException("PTO activation while drive requested in cycle but no PTO cycle provided");
+ }
+
+ ptoDrive = new PTODriveAuxiliary(container, data.PTOCycleWhileDrive);
+ pto.Add(Constants.Auxiliaries.IDs.PTODuringDrive, (nEng, absTime, dt, dryRun) => ptoDrive.PowerDemand(nEng, absTime, dt, dryRun) / nEng);
+ container.ModalData?.AddAuxiliary(Constants.Auxiliaries.IDs.PTODuringDrive, Constants.Auxiliaries.PowerPrefix + Constants.Auxiliaries.IDs.PTODuringDrive);
+ }
+ if (data.PTO != null) {
+ pto.AddConstant(Constants.Auxiliaries.IDs.PTOTransmission,
+ DeclarationData.PTOTransmission.Lookup(data.PTO.TransmissionType).TorqueLoss);
+ container.ModalData?.AddAuxiliary(Constants.Auxiliaries.IDs.PTOTransmission,
+ Constants.Auxiliaries.PowerPrefix + Constants.Auxiliaries.IDs.PTOTransmission);
+
+ pto.Add(Constants.Auxiliaries.IDs.PTOConsumer,
+ (n, absTime, dt, dryRun) => container.DrivingCycleInfo.PTOActive || (rdSwpAux?.Active(absTime) ?? false) || (ptoDrive?.Active(absTime) ?? false) ? null : data.PTO.LossMap.GetTorqueLoss(n));
+ container.ModalData?.AddAuxiliary(Constants.Auxiliaries.IDs.PTOConsumer,
+ Constants.Auxiliaries.PowerPrefix + Constants.Auxiliaries.IDs.PTOConsumer);
+ }
+
+ return pto;
+ }
+
private static Retarder GetRetarder(RetarderType type, RetarderData data, IVehicleContainer container) =>
type == data.Type ? new Retarder(container, data.LossMap, data.Ratio) : null;
- private IElectricMotor GetElectricMachine(PowertrainPosition pos, IList<Tuple<PowertrainPosition,
+ private static IElectricMotor GetElectricMachine(PowertrainPosition pos, IList<Tuple<PowertrainPosition,
ElectricMotorData>> electricMachinesData, VehicleContainer container, IElectricSystem es, IHybridController ctl)
{
var motorData = electricMachinesData.FirstOrDefault(x => x.Item1 == pos);
@@ -780,7 +830,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
container.ModData?.AddElectricMotor(pos);
ctl.AddElectricMotor(pos, motorData.Item2);
- var motor = new ElectricMotor(container, motorData.Item2, ctl.ElectricMotorControl(pos), pos);
+ var motor = pos == PowertrainPosition.IEPC
+ ? new IEPC(container, motorData.Item2, ctl.ElectricMotorControl(pos), pos)
+ : new ElectricMotor(container, motorData.Item2, ctl.ElectricMotorControl(pos), pos);
if (pos == PowertrainPosition.GEN) {
es.Connect(new GensetChargerAdapter(motor));
} else {
@@ -798,11 +850,195 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
}
container.ModData?.AddElectricMotor(pos);
- var motor = new ElectricMotor(container, motorData.Item2, ctl, pos);
+ var motor = pos == PowertrainPosition.IEPC
+ ? new IEPC(container, motorData.Item2, ctl, pos)
+ : new ElectricMotor(container, motorData.Item2, ctl, pos);
motor.Connect(es);
return motor;
}
+ /// <summary>
+ /// Builds a battery electric powertrain for either E4, E3, or E2.
+ /// <code>
+ /// DistanceBasedDrivingCycle
+ /// â””Driver
+ /// â””Vehicle
+ /// â””Wheels
+ /// â””Brakes
+ /// â””AxleGear
+ /// │ ├(AxlegearInputRetarder)
+ /// | ├Singlespeed Gearbox
+ /// | â””Engine IEPC
+ /// â”” APTNGearbox
+ /// â””Engine IEPC
+ /// </code>
+ /// </summary>
+ private static IVehicleContainer BuildFullPowertrainIEPCE(VectoRunData data, IModalDataContainer modData, WriteSumData sumWriter)
+ {
+ if (data.Cycle.CycleType != CycleType.DistanceBased) {
+ throw new VectoException("CycleType must be DistanceBased");
+ }
+ if (data.ElectricMachinesData.Any(x => x.Item1 == PowertrainPosition.GEN)) {
+ throw new VectoException("IEPC vehicle does not support GEN set.");
+ }
+ if (data.ElectricMachinesData.Count != 1) {
+ throw new VectoException("IEPC vehicle needs exactly one electric motor.");
+ }
+
+ var container = new VehicleContainer(data.ExecutionMode, modData, sumWriter) { RunData = data };
+ var es = ConnectREESS(data, container);
+
+ var ctl = new BatteryElectricMotorController(container, es);
+
+ var aux = new ElectricAuxiliary(container);
+ aux.AddConstant("P_aux_el", data.ElectricAuxDemand ?? 0.SI<Watt>());
+ es.Connect(aux);
+
+ var cycle = new DistanceBasedDrivingCycle(container, data.Cycle);
+ var powertrain = cycle
+ .AddComponent(new Driver(container, data.DriverData, new DefaultDriverStrategy(container)))
+ .AddComponent(new Vehicle(container, data.VehicleData, data.AirdragData))
+ .AddComponent(new Wheels(container, data.VehicleData.DynamicTyreRadius, data.VehicleData.WheelsInertia))
+ .AddComponent(new Brakes(container));
+
+ var pos = data.ElectricMachinesData.First().Item1;
+ IElectricMotor em;
+ if (pos != PowertrainPosition.IEPC) {
+ throw new ArgumentOutOfRangeException(nameof(pos), pos, "Invalid engine powertrain position for BatteryElectric Vehicle");
+ }
+
+ //-->AxleGear-->APTNGearbox or SinglespeedGearbox-->Engine E2
+ var gearbox = data.GearboxData.Gears.Count > 1
+ ? (IGearbox)new IEPCGearbox(container, new APTNShiftStrategy(container))
+ : new SingleSpeedGearbox(container, data.GearboxData);
+ em = GetElectricMachine(PowertrainPosition.IEPC, data.ElectricMachinesData, container, es, ctl);
+ powertrain
+ .AddComponent(data.AxleGearData != null ? new AxleGear(container, data.AxleGearData) : null)
+ .AddComponent(GetRetarder(RetarderType.AxlegearInputRetarder, data.Retarder, container))
+ .AddComponent(gearbox)
+ .AddComponent(em);
+
+ new ATClutchInfo(container);
+ if (data.AxleGearData == null) {
+ new DummyAxleGearInfo(container);
+ }
+ new DummyEngineInfo(container);
+
+ if (data.BusAuxiliaries != null) {
+ if (!data.BusAuxiliaries.ElectricalUserInputsConfig.ConnectESToREESS) {
+ throw new VectoException("BusAux must be supplied from REESS!");
+ }
+
+ var auxCfg = data.BusAuxiliaries;
+ var busAux = new BusAuxiliariesAdapter(container, auxCfg);
+ var electricStorage = new NoBattery(container);
+ busAux.ElectricStorage = electricStorage;
+ var dcdc = new DCDCConverter(container, data.BusAuxiliaries.ElectricalUserInputsConfig.DCDCEfficiency);
+ busAux.DCDCConverter = dcdc;
+ es.Connect(dcdc);
+ em.BusAux = busAux;
+ }
+
+ return container;
+ }
+
+ /// <summary>
+ /// Builds a battery electric powertrain for either E4, E3, or E2.
+ /// <code>
+ /// DistanceBasedDrivingCycle
+ /// â””Driver
+ /// â””Vehicle
+ /// â””Wheels
+ /// â””Brakes
+ /// â””AxleGear
+ /// │ ├(AxlegearInputRetarder)
+ /// | ├Singlespeed Gearbox
+ /// | â””Engine IEPC
+ /// â”” APTNGearbox
+ /// â””Engine IEPC
+ /// </code>
+ /// </summary>
+ private static IVehicleContainer BuildFullPowertrainIEPCSerial(VectoRunData data, IModalDataContainer modData, WriteSumData _sumWriter)
+ {
+ if (_sumWriter == null)
+ throw new ArgumentNullException(nameof(_sumWriter));
+ if (data.Cycle.CycleType != CycleType.DistanceBased) {
+ throw new VectoException("CycleType must be DistanceBased");
+ }
+ if (data.ElectricMachinesData.Count(x => x.Item1 == PowertrainPosition.GEN) != 1) {
+ throw new VectoException("IEPC vehicle needs exactly one GEN set.");
+ }
+ if (data.ElectricMachinesData.Count(x => x.Item1 != PowertrainPosition.GEN) != 1) {
+ throw new VectoException("IEPC vehicle needs exactly one electric motor.");
+ }
+
+ var container = new VehicleContainer(data.ExecutionMode, modData, _sumWriter) { RunData = data };
+ var es = ConnectREESS(data, container);
+
+ var strategy = new SerialHybridStrategy(data, container);
+ var ctl = new SerialHybridController(container, strategy, es);
+
+ var engine = new StopStartCombustionEngine(container, data.EngineData);
+
+ var idleController = engine.IdleController;
+ ctl.Engine = engine;
+
+ var aux = new ElectricAuxiliary(container);
+ aux.AddConstant("P_aux_el", data.ElectricAuxDemand ?? 0.SI<Watt>());
+ es.Connect(aux);
+
+ var cycle = new DistanceBasedDrivingCycle(container, data.Cycle);
+ var powertrain = cycle
+ .AddComponent(new Driver(container, data.DriverData, new DefaultDriverStrategy(container)))
+ .AddComponent(new Vehicle(container, data.VehicleData, data.AirdragData))
+ .AddComponent(new Wheels(container, data.VehicleData.DynamicTyreRadius, data.VehicleData.WheelsInertia))
+ .AddComponent(ctl)
+ .AddComponent(new Brakes(container));
+
+ var pos = data.ElectricMachinesData.First(x => x.Item1 != PowertrainPosition.GEN).Item1;
+ IElectricMotor em;
+ if (pos != PowertrainPosition.IEPC) {
+ throw new ArgumentOutOfRangeException(nameof(pos), pos, "Invalid engine powertrain position for BatteryElectric Vehicle");
+ }
+
+ //-->AxleGear-->APTNGearbox or SinglespeedGearbox-->Engine E2
+ var gearbox = data.GearboxData.Gears.Count > 1
+ ? (IGearbox)new IEPCGearbox(container, new APTNShiftStrategy(container))
+ : new SingleSpeedGearbox(container, data.GearboxData);
+ em = GetElectricMachine(PowertrainPosition.IEPC, data.ElectricMachinesData, container, es, ctl);
+ powertrain
+ .AddComponent(data.AxleGearData != null ? new AxleGear(container, data.AxleGearData) : null)
+ .AddComponent(GetRetarder(RetarderType.AxlegearInputRetarder, data.Retarder, container))
+ .AddComponent(gearbox)
+ .AddComponent(em);
+
+ new ATClutchInfo(container);
+ if (data.AxleGearData == null) {
+ new DummyAxleGearInfo(container);
+ }
+
+ if (data.BusAuxiliaries != null) {
+ if (!data.BusAuxiliaries.ElectricalUserInputsConfig.ConnectESToREESS) {
+ throw new VectoException("BusAux must be supplied from REESS!");
+ }
+
+ var auxCfg = data.BusAuxiliaries;
+ var busAux = new BusAuxiliariesAdapter(container, auxCfg);
+ var electricStorage = new NoBattery(container);
+ busAux.ElectricStorage = electricStorage;
+ var dcdc = new DCDCConverter(container, data.BusAuxiliaries.ElectricalUserInputsConfig.DCDCEfficiency);
+ busAux.DCDCConverter = dcdc;
+ es.Connect(dcdc);
+ em.BusAux = busAux;
+ }
+
+ ctl.GenSet.AddComponent(GetElectricMachine(PowertrainPosition.GEN, data.ElectricMachinesData, container, es, ctl))
+ .AddComponent(engine, idleController)
+ .AddAuxiliaries(container, data);
+
+ return container;
+ }
+
/// <summary>
/// Builds a simple conventional powertrain.
/// <code>
@@ -820,7 +1056,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
/// â””(Aux)
/// </code>
/// </summary>
- public void BuildSimplePowertrain(VectoRunData data, IVehicleContainer container)
+ public static void BuildSimplePowertrain(VectoRunData data, IVehicleContainer container)
{
IVehicle vehicle = new Vehicle(container, data.VehicleData, data.AirdragData);
// TODO: MQ 2018-11-19: engineering mode needs AUX power from cycle, use face cycle...
@@ -869,7 +1105,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
/// â””Engine E2
/// </code>
/// </summary>
- public void BuildSimpleSerialHybridPowertrain(VectoRunData data, VehicleContainer container)
+ public static void BuildSimpleSerialHybridPowertrain(VectoRunData data, VehicleContainer container)
{
var es = ConnectREESS(data, container);
var aux = new ElectricAuxiliary(container);
@@ -926,6 +1162,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
.AddComponent(GetRetarder(RetarderType.TransmissionOutputRetarder, data.Retarder, container))
.AddComponent(gearbox)
.AddComponent(GetRetarder(RetarderType.TransmissionInputRetarder, data.Retarder, container))
+ .AddComponent(GetPEVPTO(container, data))
.AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE2,
data.ElectricMachinesData, container, es, ctl));
break;
@@ -935,7 +1172,60 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
}
}
- public void BuildSimpleGenSet(VectoRunData data, VehicleContainer container)
+ /// <summary>
+ /// Builds a simple serial hybrid powertrain with either E4, E3, or E2.
+ /// <code>
+ /// Vehicle
+ /// â””Wheels
+ /// â””SimpleHybridController
+ /// â””Brakes
+ /// │ └Engine E4
+ /// â””AxleGear
+ /// │ ├(AxlegearInputRetarder)
+ /// │ └Engine E3
+ /// ├(AngleDrive)
+ /// ├(TransmissionOutputRetarder)
+ /// â””Gearbox or APTNGearbox
+ /// ├(TransmissionInputRetarder)
+ /// â””Engine E2
+ /// </code>
+ /// </summary>
+ public static void BuildSimpleIEPCHybridPowertrain(VectoRunData data, VehicleContainer container)
+ {
+ var es = ConnectREESS(data, container);
+ var aux = new ElectricAuxiliary(container);
+ aux.AddConstant("P_aux_el", data.ElectricAuxDemand ?? 0.SI<Watt>());
+ es.Connect(aux);
+ es.Connect(new GensetChargerAdapter(null));
+
+ var ctl = new SimpleHybridController(container, es);
+
+ //Vehicle-->Wheels-->SimpleHybridController-->Brakes
+ var powertrain = new Vehicle(container, data.VehicleData, data.AirdragData)
+ .AddComponent(new Wheels(container, data.VehicleData.DynamicTyreRadius, data.VehicleData.WheelsInertia))
+ .AddComponent(ctl)
+ .AddComponent(new Brakes(container));
+
+ var pos = data.ElectricMachinesData.First(x => x.Item1 != PowertrainPosition.GEN).Item1;
+ var gearbox = data.GearboxData.Gears.Count > 1
+ ? (IGearbox)new APTNGearbox(container, ctl.ShiftStrategy)
+ : new SingleSpeedGearbox(container, data.GearboxData);
+ var em = GetElectricMachine(PowertrainPosition.IEPC, data.ElectricMachinesData, container, es, ctl);
+ powertrain
+ .AddComponent(data.AxleGearData != null ? new AxleGear(container, data.AxleGearData) : null)
+ .AddComponent(GetRetarder(RetarderType.AxlegearInputRetarder, data.Retarder, container))
+ .AddComponent(gearbox)
+ .AddComponent(em);
+ }
+
+ /// <summary>
+ /// Builds a simple genset
+ /// <code>
+ /// Engine Gen
+ /// â””CombustionEngine
+ /// </code>
+ /// </summary>
+ public static void BuildSimpleGenSet(VectoRunData data, VehicleContainer container)
{
var es = ConnectREESS(data, container);
var ctl = new GensetMotorController(container, es);
@@ -970,7 +1260,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
/// â””(Aux)
/// </code>
/// </summary>
- public void BuildSimpleHybridPowertrain(VectoRunData data, VehicleContainer container)
+ public static void BuildSimpleHybridPowertrain(VectoRunData data, VehicleContainer container)
{
var es = ConnectREESS(data, container);
var aux = new ElectricAuxiliary(container);
@@ -985,7 +1275,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
}
var ctl = new SimpleHybridController(container, es) { Gearbox = gbx, Engine = engine };
var idleController = GetIdleController(data.PTO, engine, container);
- var clutch = data.GearboxData.Type.ManualTransmission() ? new SwitchableClutch(container, data.EngineData) : null;
+ var clutch = (data.GearboxData.Type.ManualTransmission() || data.GearboxData.Type == GearboxType.IHPC) ? new SwitchableClutch(container, data.EngineData) : null;
var vehicle = new Vehicle(container, data.VehicleData, data.AirdragData);
@@ -1015,6 +1305,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
.AddComponent(GetRetarder(RetarderType.TransmissionInputRetarder, data.Retarder, container))
.AddComponent(GetElectricMachine(PowertrainPosition.HybridP2_5, data.ElectricMachinesData, container, es, ctl))
.AddComponent(GetElectricMachine(PowertrainPosition.HybridP2, data.ElectricMachinesData, container, es, ctl))
+ .AddComponent(GetElectricMachine(PowertrainPosition.IHPC, data.ElectricMachinesData, container, es, ctl))
.AddComponent(clutch)
.AddComponent(GetElectricMachine(PowertrainPosition.HybridP1, data.ElectricMachinesData, container, es, ctl))
.AddComponent(engine, idleController)
@@ -1060,7 +1351,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
/// â””Electric Motor
/// </code>
/// </summary>
- public void BuildSimplePowertrainElectric(VectoRunData data, VehicleContainer container)
+ public static void BuildSimplePowertrainElectric(VectoRunData data, VehicleContainer container)
{
var es = ConnectREESS(data, container);
var aux = new ElectricAuxiliary(container);
@@ -1092,6 +1383,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
.AddComponent(data.GearboxData is null ? null : GetSimpleGearbox(container, data))
.AddComponent(GetElectricMachine(data.ElectricMachinesData.First(x => x.Item1 != PowertrainPosition.GEN).Item1,
data.ElectricMachinesData, container, es, new DummyElectricMotorControl()));
+ if (data.AxleGearData == null) {
+ new DummyAxleGearInfo(container); // necessary for certain IEPC configurations
+ }
}
private static ElectricSystem ConnectREESS(VectoRunData data, VehicleContainer container)
@@ -1125,7 +1419,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
return es;
}
- private DrivingCycleData GetMeasuredSpeedDummyCycle() =>
+ private static DrivingCycleData GetMeasuredSpeedDummyCycle() =>
DrivingCycleDataReader.ReadFromStream((
"<t>,<v>,<grad>\n" +
"0, 50, 0\n" +
@@ -1207,7 +1501,32 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
return aux;
}
- private EngineAuxiliary CreateSpeedDependentAuxiliaries(VectoRunData data, IVehicleContainer container)
+ internal static EngineAuxiliary CreateAuxiliariesSerialHybrid(VectoRunData data,
+ IVehicleContainer container)
+ {
+ var aux = new EngineAuxiliary(container);
+ foreach (var auxData in data.Aux) {
+ // id's in upper case
+ var id = auxData.ID.ToUpper();
+
+ switch (auxData.DemandType) {
+ case AuxiliaryDemandType.Constant:
+ aux.AddConstant(id, auxData.PowerDemand);
+ break;
+ case AuxiliaryDemandType.Direct:
+ aux.AddCycle(id);
+ break;
+ default:
+ throw new ArgumentOutOfRangeException("AuxiliaryDemandType", auxData.DemandType.ToString());
+ }
+
+ container.ModalData?.AddAuxiliary(id);
+ }
+
+ return aux;
+ }
+
+ private static EngineAuxiliary CreateSpeedDependentAuxiliaries(VectoRunData data, IVehicleContainer container)
{
var aux = new EngineAuxiliary(container);
var auxData = data.Aux.ToArray();
@@ -1218,7 +1537,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
return aux;
}
- private void AddSwitchingAux(EngineAuxiliary aux, IModalDataContainer modData, string auxId, VectoRunData.AuxData[] auxData)
+ private static void AddSwitchingAux(EngineAuxiliary aux, IModalDataContainer modData, string auxId, VectoRunData.AuxData[] auxData)
{
var urban = auxData.First(x => x.ID == auxId && x.MissionType == MissionType.UrbanDelivery);
var rural = auxData.First(x => x.ID == auxId && x.MissionType == MissionType.RegionalDelivery);
@@ -1251,6 +1570,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
return new ATGearbox(container, strategy);
case GearboxType.APTN:
return new APTNGearbox(container, strategy);
+ case GearboxType.IHPC:
+ return new APTNGearbox(container, strategy);
default:
throw new ArgumentOutOfRangeException("Unknown Gearbox Type", container.RunData.GearboxData.Type.ToString());
}
@@ -1264,6 +1585,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
case GearboxType.AMT:
switch (runData.JobType) {
case VectoSimulationJobType.ConventionalVehicle:
+ case VectoSimulationJobType.ParallelHybridVehicle:
runData.ShiftStrategy = AMTShiftStrategyOptimized.Name;
return new AMTShiftStrategyOptimized(container);
case VectoSimulationJobType.BatteryElectricVehicle:
@@ -1300,6 +1622,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
case VectoSimulationJobType.ParallelHybridVehicle:
case VectoSimulationJobType.SerialHybridVehicle:
case VectoSimulationJobType.BatteryElectricVehicle:
+ case VectoSimulationJobType.IEPC_E:
+ case VectoSimulationJobType.IEPC_S:
runData.ShiftStrategy = APTNShiftStrategy.Name;
return new APTNShiftStrategy(container);
case VectoSimulationJobType.ConventionalVehicle when container.IsTestPowertrain:
@@ -1307,7 +1631,14 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
default:
throw new ArgumentException("APT-N Gearbox is only applicable on hybrids and battery electric vehicles.");
}
-
+ case GearboxType.IHPC:
+ switch (runData.JobType) {
+ case VectoSimulationJobType.IHPC:
+ runData.ShiftStrategy = AMTShiftStrategyOptimized.Name;
+ return new AMTShiftStrategyOptimized(container);
+ default:
+ throw new ArgumentException("IHPC Gearbox is only applicable on hybrid vehicle of type IHPC.");
+ }
default:
throw new ArgumentOutOfRangeException("GearboxType", runData.GearboxData.Type, "VECTO can not automatically derive shift strategy for GearboxType.");
}
@@ -1315,7 +1646,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
private static IGearbox GetSimpleGearbox(IVehicleContainer container, VectoRunData runData)
{
- if (runData.GearboxData.Type.AutomaticTransmission() && runData.GearboxData.Type != GearboxType.APTN) {
+ if (runData.GearboxData.Type.AutomaticTransmission() && runData.GearboxData.Type != GearboxType.APTN && runData.GearboxData.Type != GearboxType.IHPC) {
new ATClutchInfo(container);
return new ATGearbox(container, null);
}
@@ -1323,28 +1654,30 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
}
}
- public class SimpleCharger : IElectricChargerPort
+ public class SimpleCharger : IElectricChargerPort, IUpdateable
{
#region Implementation of IElectricChargerPort
+ private Watt _chargingPower;
+ public SimpleCharger() => _chargingPower = 0.SI<Watt>();
+ public Watt Initialize() => _chargingPower = 0.SI<Watt>();
+ public Watt PowerDemand(Second absTime, Second dt, Watt powerDemandEletricMotor, Watt auxPower, bool dryRun) => _chargingPower;
+ #endregion
- public Watt ChargingPower { get; set; }
-
- public SimpleCharger()
+ #region Implementation of IUpdateable
+ public bool UpdateFrom(object other)
{
- ChargingPower = 0.SI<Watt>();
- }
+ if (other is IElectricSystemInfo es) {
+ _chargingPower = es.ChargePower;
+ return true;
+ }
- public Watt Initialize()
- {
- ChargingPower = 0.SI<Watt>();
- return ChargingPower;
- }
+ if (other is Watt w) {
+ _chargingPower = w;
+ return true;
+ }
- public Watt PowerDemand(Second absTime, Second dt, Watt powerDemandEletricMotor, Watt auxPower, bool dryRun)
- {
- return ChargingPower;
+ return false;
}
-
#endregion
}
@@ -1551,6 +1884,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
return true;
}
+ public bool RequestAfterGearshift { get; set; }
+
#endregion
}
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/IFollowUpSimulatorFactoryCreator.cs b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/IFollowUpSimulatorFactoryCreator.cs
index 14718d11ac0d1f94ab9d37994c88f3e2b1f2dccb..0187e3d88f5cba46819d752fa86be834d94581d1 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/IFollowUpSimulatorFactoryCreator.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/IFollowUpSimulatorFactoryCreator.cs
@@ -69,7 +69,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory
new TempFileOutputWriter(originalReportWriter, ReportType.DeclarationReportManufacturerXML)
;
_currentStageDeclarationReport =
- new XMLDeclarationReportPrimaryVehicle(_currentStageOutputDataWriter, true);
+ new XMLDeclarationReportPrimaryVehicle(_currentStageOutputDataWriter);
_currentStageInputData = originalStageInputData.PrimaryVehicle;
}
@@ -82,7 +82,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory
{
//Prepare inputdata for next simulation step
var primaryInputData = _inputDataReader.CreateDeclaration(_currentStageOutputDataWriter
- .GetDocument(ReportType.DeclarationReportPrimaryVehicleXML).CreateReader()) as IMultistageBusInputDataProvider;
+ .GetDocument(ReportType.DeclarationReportPrimaryVehicleXML).CreateReader()) as IMultistepBusInputDataProvider;
Debug.Assert(primaryInputData != null);
var stageInputData = _originalStageInputData.StageInputData;
@@ -133,7 +133,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory
public override ISimulatorFactory GetNextFactory()
{
var output = _xmlInputDataReader.CreateDeclaration(
- XmlReader.Create(CurrentStageOutputDataWriter.MultistageXmlReport.ToString().ToStream())) as IMultistageBusInputDataProvider;
+ XmlReader.Create(CurrentStageOutputDataWriter.MultistageXmlReport.ToString().ToStream())) as IMultistepBusInputDataProvider;
var nextStageInput = new XMLDeclarationVIFInputData(output, null);
return _simulatorFactoryFactory.Factory(ExecutionMode.Declaration, nextStageInput, CurrentStageOutputDataWriter, null, null,
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactory.cs b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactory.cs
index 5078ec85869f6b4da9879eceb4793c20f9d4b3c7..bbb72c4f4c58013f4cf57ccf4903eb847deaa9ff 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactory.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactory.cs
@@ -206,14 +206,11 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory
JsonConvert.SerializeObject(data, Formatting.Indented));
}
- var builder = new PowertrainBuilder(
- modContainer, modData => {
- if (SumData != null) {
- SumData.Write(modData, JobNumber, current, d);
- }
- });
-
- var run = GetVectoRun(data, builder);
+ var run = GetVectoRun(data, modContainer, modData => {
+ if (SumData != null) {
+ SumData.Write(modData, JobNumber, current, d);
+ }
+ });
if (Validate) {
ValidateVectoRunData(
@@ -244,7 +241,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory
}
}
- private static VectoRun GetVectoRun(VectoRunData data, PowertrainBuilder builder)
+ private static VectoRun GetVectoRun(VectoRunData data, IModalDataContainer modData, WriteSumData sumWriter)
{
VectoRun run;
switch (data.Cycle.CycleType) {
@@ -252,19 +249,19 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory
if ((data.SimulationType & SimulationType.DistanceCycle) == 0) {
throw new VectoException("Distance-based cycle can not be simulated in {0} mode", data.SimulationType);
}
- run = new DistanceRun(builder.Build(data));
+ run = new DistanceRun(PowertrainBuilder.Build(data, modData, sumWriter));
break;
case CycleType.EngineOnly:
if ((data.SimulationType & SimulationType.EngineOnly) == 0) {
throw new VectoException("Engine-only cycle can not be simulated in {0} mode", data.SimulationType);
}
- run = new TimeRun(builder.Build(data));
+ run = new TimeRun(PowertrainBuilder.Build(data, modData, sumWriter));
break;
case CycleType.VTP:
if ((data.SimulationType & SimulationType.VerificationTest) == 0) {
throw new VectoException("VTP-cycle can not be simulated in {0} mode", data.SimulationType);
}
- run = new TimeRun(builder.Build(data));
+ run = new TimeRun(PowertrainBuilder.Build(data, modData, sumWriter));
break;
case CycleType.PWheel:
@@ -273,7 +270,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory
if ((data.SimulationType & (SimulationType.PWheel | SimulationType.MeasuredSpeedCycle)) == 0) {
throw new VectoException("{1}-cycle can not be simulated in {0} mode", data.SimulationType, data.Cycle.CycleType);
}
- run = new TimeRun(builder.Build(data));
+ run = new TimeRun(PowertrainBuilder.Build(data, modData, sumWriter));
break;
case CycleType.PTO:
throw new VectoException("PTO Cycle can not be used as main cycle!");
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactoryDeclaration.cs b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactoryDeclaration.cs
index e66dc7943879413e68c9b0a3b8422e170cd32a8e..5f0400aa30f90e7cf7c2c4dd1495a53dd4d718ad 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactoryDeclaration.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactoryDeclaration.cs
@@ -170,7 +170,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory
var tempOutputWriter = new TempFileOutputWriter(ReportWriter, ReportType.DeclarationReportManufacturerXML);
var originalReportWriter = ReportWriter;
ReportWriter = tempOutputWriter;
- var tempPrimaryReport = new XMLDeclarationReportPrimaryVehicle(tempOutputWriter, true);
+ var tempPrimaryReport = new XMLDeclarationReportPrimaryVehicle(tempOutputWriter);
RunDataFactory = CreateRunDataReader(multiStagePrimaryAndStageInputData.PrimaryVehicle, tempPrimaryReport);
@@ -185,7 +185,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory
.GetDocument(ReportType.DeclarationReportPrimaryVehicleXML).CreateReader());
var vifInputData = new XMLDeclarationVIFInputData(
- primaryInputData as IMultistageBusInputDataProvider,
+ primaryInputData as IMultistepBusInputDataProvider,
multiStagePrimaryAndStageInputData.StageInputData);
var manStagesCount =
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs b/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
index 182243953ca8db344caa0fa760ecda4cf0134093..ba4dc24e765f76485295b8dd39e45f9f5dcf8a29 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
@@ -198,8 +198,49 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
//todo mk20210617 use sorted list with inverse commitPriority (-commitPriority)
_components = _components.OrderBy(x => x.Item1).Reverse().ToList();
}
+ private List<(IUpdateable, object)> ComponentUpdateList = new List<(IUpdateable, object)>();
+ protected void UpdateComponentsInternal(IDataBus realContainer)
+ {
+ if (ComponentUpdateList.Any()) {
+ foreach (var (target, source) in ComponentUpdateList) {
+ target.UpdateFrom(source);
+ }
+ } else {
+ foreach (var (_, c) in _components) {
+#if DEBUG
+ var found = false;
+#endif
+ if (c is IUpdateable target) {
+ foreach (var (_, source) in (realContainer as VehicleContainer)._components) {
+ if (target.UpdateFrom(source)) {
+ ComponentUpdateList.Add((target, source));
+#if DEBUG
+ found = true;
+#endif
+ }
+ }
+ }
+
+#if DEBUG
+ if (!found) {
+ Console.WriteLine("Test Component is not updateable: " + c.GetType());
+ }
+#endif
+ }
+
+#if DEBUG
+ var sourceList = ComponentUpdateList.Select(st => st.Item2).ToArray();
+ foreach (var (_, source) in (realContainer as VehicleContainer)._components) {
+ if (!sourceList.Contains(source)){
+ Console.WriteLine("Real Component is not used for update: " + source.GetType());
+ }
+ }
+#endif
+ ComponentUpdateList = ComponentUpdateList.Distinct().ToList();
+ }
+ }
public virtual void CommitSimulationStep(Second time, Second simulationInterval)
{
@@ -244,7 +285,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
public virtual VectoRun.Status RunStatus { get; set; }
- #endregion
+#endregion
public IReadOnlyCollection<VectoSimulationComponent> SimulationComponents()
{
@@ -285,22 +326,22 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
_gearboxInfo = new EngineOnlyGearboxInfo(this);
}
- #region Overrides of VehicleContainer
+#region Overrides of VehicleContainer
public override IMileageCounter MileageCounter => _mileageCounter;
- #endregion
+#endregion
- #region Overrides of VehicleContainer
+#region Overrides of VehicleContainer
public override IVehicleInfo VehicleInfo => _vehicleInfo;
- #endregion
+#endregion
- #region Overrides of VehicleContainer
+#region Overrides of VehicleContainer
public override IGearboxInfo GearboxInfo => _gearboxInfo;
- #endregion
+#endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/WHRCharger.cs b/VectoCore/VectoCore/Models/Simulation/Impl/WHRCharger.cs
index 979140c4bf42541505cbf90fe33e3f423fca91ef..6ee398a33c537809c5005956f2c794792ff2400b 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/WHRCharger.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/WHRCharger.cs
@@ -5,7 +5,7 @@ using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoCore.Models.Simulation.Impl
{
- public class WHRCharger : StatefulVectoSimulationComponent<WHRCharger.State>, IElectricChargerPort
+ public class WHRCharger : StatefulVectoSimulationComponent<WHRCharger.State>, IElectricChargerPort, IUpdateable
{
public double Efficiency { get; }
@@ -71,7 +71,20 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
public WattSecond GeneratedEnergy { get; set; }
public WattSecond ExcessiveEnergy { get; set; }
+
+ public State Clone() => (State)MemberwiseClone();
+ }
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is WHRCharger c) {
+ PreviousState = c.PreviousState.Clone();
+ return true;
+ }
+ return false;
}
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/DCDCConverter.cs b/VectoCore/VectoCore/Models/SimulationComponent/DCDCConverter.cs
index c42d792ece20407478f89db7f2525e25cbf6649b..34559dde4aab10a71114be5c4f32364a79b6f22f 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/DCDCConverter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/DCDCConverter.cs
@@ -8,7 +8,7 @@ using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoCore.Models.SimulationComponent
{
- public class DCDCConverter : StatefulVectoSimulationComponent<DCDCConverter.State>, IDCDCConverter
+ public class DCDCConverter : StatefulVectoSimulationComponent<DCDCConverter.State>, IDCDCConverter, IUpdateable
{
public double Efficiency { get; protected set; }
@@ -90,6 +90,18 @@ namespace TUGraz.VectoCore.Models.SimulationComponent
public WattSecond ConsumedEnergy { get; set; }
public WattSecond MissingEnergy { get; set; }
+
+ public State Clone() => (State)MemberwiseClone();
}
+
+ #region Implementation of IUpdateable
+ public bool UpdateFrom(object other) {
+ if (other is DCDCConverter d) {
+ PreviousState = d.PreviousState.Clone();
+ return true;
+ }
+ return false;
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
index ead6520b54df8872e43876e02c015cb8df5488f4..e1a85359dd7eab76c6cb292f8f0db0b7bc17edcc 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
@@ -145,6 +145,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
EngineSpeed = entry.EngineSpeed;
FanSpeed = entry.FanSpeed;
PTOPowerDemandDuringDrive = entry.PTOPowerDemandDuringDrive;
+ Highway = entry.Highway;
}
/// <summary>
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
index f81e5e977d5077fb6ac407b2c8647eb1ac103182..88f5c076d72ecec46d75d944df8120537dcfb974 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
@@ -26,12 +26,40 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
[ValidateObject]
public VoltageLevelData EfficiencyData { get; internal set; }
- public DragCurve DragCurve { get; internal set; }
+ protected internal DragCurve EMDragCurve { private get; set; }
+
+ public virtual NewtonMeter DragCurveLookup(PerSecond emSpeed, uint gear)
+ {
+ return EMDragCurve.Lookup(emSpeed);
+ }
+
+ public virtual NewtonMeter DragCurveLookup(PerSecond emSpeed, GearshiftPosition gear)
+ {
+ return EMDragCurve.Lookup(emSpeed);
+ }
// not read direcly from input but calculated in a pre-processing step
public OverloadData Overload { get; internal set; }
}
+ public class IEPCElectricMotorData : ElectricMotorData
+ {
+ protected internal Dictionary<uint, DragCurve> IEPCDragCurves { private get; set; }
+
+ #region Overrides of ElectricMotorData
+
+ public override NewtonMeter DragCurveLookup(PerSecond emSpeed, uint gear)
+ {
+ return IEPCDragCurves[gear].Lookup(emSpeed);
+ }
+
+ public override NewtonMeter DragCurveLookup(PerSecond emSpeed, GearshiftPosition gear)
+ {
+ return IEPCDragCurves[gear.Gear].Lookup(emSpeed);
+ }
+ #endregion
+ }
+
public class VoltageLevelData
{
private PerSecond _maxSpeed;
@@ -41,17 +69,17 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
public PerSecond MaxSpeed =>
_maxSpeed ?? (_maxSpeed = VoltageLevels
- .Min(v => VectoMath.Min(v.EfficiencyMap.MaxSpeed, v.FullLoadCurve.MaxSpeed)));
+ .Min(v => v.MaxSpeed));
- public NewtonMeter EfficiencyMapLookupTorque(Volt voltage, Watt electricPower, PerSecond avgSpeed, NewtonMeter maxEmTorque)
+ public NewtonMeter EfficiencyMapLookupTorque(Volt voltage, Watt electricPower, PerSecond avgSpeed, NewtonMeter maxEmTorque, GearshiftPosition gear)
{
if (avgSpeed.IsEqual(0.RPMtoRad()) || avgSpeed.IsGreater(MaxSpeed)) {
return 0.SI<NewtonMeter>();
}
var (vLow, vHigh) = GetSection(voltage);
- var r1 = vLow.EfficiencyMap.LookupTorque(electricPower, avgSpeed, maxEmTorque);
- var r2 = vHigh.EfficiencyMap.LookupTorque(electricPower, avgSpeed, maxEmTorque);
+ var r1 = vLow.LookupTorque(electricPower, avgSpeed, maxEmTorque, gear.Gear);
+ var r2 = vHigh.LookupTorque(electricPower, avgSpeed, maxEmTorque, gear.Gear);
if (r1 is null && r2 is null) {
return null;
@@ -69,7 +97,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
? r1
: VectoMath.Interpolate(vLow.Voltage, vHigh.Voltage,
r1, r2, voltage);
- var elPwr = LookupElectricPower(voltage, avgSpeed, retVal, true);
+ var elPwr = LookupElectricPower(voltage, avgSpeed, retVal, gear, true);
if (elPwr.ElectricalPower != null && electricPower.IsEqual(elPwr.ElectricalPower, 1e-3.SI<Watt>())) {
return retVal;
}
@@ -77,7 +105,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
var searchResult = SearchAlgorithm.Search(retVal, electricPower - elPwr.ElectricalPower,
interval: 10.SI<NewtonMeter>(),
getYValue: x => (Watt)x - electricPower,
- evaluateFunction: x => LookupElectricPower(voltage, avgSpeed, x, true).ElectricalPower,
+ evaluateFunction: x => LookupElectricPower(voltage, avgSpeed, x, gear, true).ElectricalPower,
criterion: x => ((Watt)x - electricPower).Value(),
searcher: this
);
@@ -87,12 +115,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
//throw new NotImplementedException("EfficientyMapLookupTorque");
}
- public EfficiencyMap.EfficiencyResult LookupElectricPower(Volt voltage, PerSecond avgSpeed, NewtonMeter torque, bool allowExtrapolation = false)
+ public EfficiencyMap.EfficiencyResult LookupElectricPower(Volt voltage, PerSecond avgSpeed, NewtonMeter torque, GearshiftPosition gear, bool allowExtrapolation = false)
{
var (vLow, vHigh) = GetSection(voltage);
- var r1 = vLow.EfficiencyMap.LookupElectricPower(avgSpeed, torque, allowExtrapolation);
- var r2 = vHigh.EfficiencyMap.LookupElectricPower(avgSpeed, torque, allowExtrapolation);
+ var r1 = vLow.LookupElectricPower(avgSpeed, torque, gear.Gear, allowExtrapolation);
+ var r2 = vHigh.LookupElectricPower(avgSpeed, torque, gear.Gear, allowExtrapolation);
if (r1 == null || r2 == null || r1.ElectricalPower == null || r2.ElectricalPower == null) {
return new EfficiencyMap.EfficiencyResult() {
@@ -120,12 +148,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
var (vLow, vHigh) = GetSection(voltage);
if (vLow.Voltage.IsEqual(vHigh.Voltage)) {
- return vLow.FullLoadCurve.FullGenerationTorque(avgSpeed);
+ return vLow.FullGenerationTorque(avgSpeed);
}
return VectoMath.Interpolate(vLow.Voltage, vHigh.Voltage,
- vLow.FullLoadCurve.FullGenerationTorque(avgSpeed),
- vHigh.FullLoadCurve.FullGenerationTorque(avgSpeed), voltage);
+ vLow.FullGenerationTorque(avgSpeed),
+ vHigh.FullGenerationTorque(avgSpeed), voltage);
}
public NewtonMeter FullLoadDriveTorque(Volt voltage, PerSecond avgSpeed)
@@ -133,12 +161,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
var (vLow, vHigh) = GetSection(voltage);
if (vLow.Voltage.IsEqual(vHigh.Voltage)) {
- return vLow.FullLoadCurve.FullLoadDriveTorque(avgSpeed);
+ return vLow.FullLoadDriveTorque(avgSpeed);
}
return VectoMath.Interpolate(vLow.Voltage, vHigh.Voltage,
- vLow.FullLoadCurve.FullLoadDriveTorque(avgSpeed),
- vHigh.FullLoadCurve.FullLoadDriveTorque(avgSpeed), voltage);
+ vLow.FullLoadDriveTorque(avgSpeed),
+ vHigh.FullLoadDriveTorque(avgSpeed), voltage);
}
protected (ElectricMotorVoltageLevelData, ElectricMotorVoltageLevelData) GetSection(Volt voltage)
@@ -156,15 +184,62 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
public class ElectricMotorVoltageLevelData
{
+ protected PerSecond _maxSpeed;
+
[SIRange(0, double.MaxValue)]
public Volt Voltage { get; internal set; }
[ValidateObject]
- public ElectricMotorFullLoadCurve FullLoadCurve { get; internal set; }
+ public ElectricMotorFullLoadCurve FullLoadCurve { get; protected internal set; }
[ValidateObject]
- public EfficiencyMap EfficiencyMap { get; internal set; }
+ protected internal EfficiencyMap EfficiencyMap { protected get; set; }
+
+ public virtual PerSecond MaxSpeed => _maxSpeed ?? (_maxSpeed = VectoMath.Min(EfficiencyMap.MaxSpeed, FullLoadCurve.MaxSpeed));
+
+ public virtual EfficiencyMap.EfficiencyResult LookupElectricPower(PerSecond avgSpeed, NewtonMeter torque, uint gear, bool allowExtrapolation)
+ {
+ return EfficiencyMap.LookupElectricPower(avgSpeed, torque, allowExtrapolation);
+ }
+
+ public virtual NewtonMeter LookupTorque(Watt electricPower, PerSecond avgSpeed, NewtonMeter maxEmTorque, uint gear)
+ {
+ return EfficiencyMap.LookupTorque(electricPower, avgSpeed, maxEmTorque);
+ }
+ public virtual NewtonMeter FullLoadDriveTorque(PerSecond avgSpeed)
+ {
+ return FullLoadCurve.FullLoadDriveTorque(avgSpeed);
+ }
+
+ public virtual NewtonMeter FullGenerationTorque(PerSecond avgSpeed)
+ {
+ return FullLoadCurve.FullGenerationTorque(avgSpeed);
+ }
+ }
+
+ public class IEPCVoltageLevelData : ElectricMotorVoltageLevelData
+ {
+ [ValidateObject]
+ protected internal Dictionary<uint, EfficiencyMap> EfficiencyMaps { protected get; set; }
+
+
+ public override PerSecond MaxSpeed => _maxSpeed ?? (_maxSpeed = VectoMath.Min(FullLoadCurve.MaxSpeed, EfficiencyMaps.Values.Min(x => x.MaxSpeed)));
+
+ public override EfficiencyMap.EfficiencyResult LookupElectricPower(PerSecond avgSpeed, NewtonMeter torque, uint gear, bool allowExtrapolation)
+ {
+ return EfficiencyMaps[gear].LookupElectricPower(avgSpeed, torque, allowExtrapolation);
+ }
+
+ public override NewtonMeter LookupTorque(Watt electricPower, PerSecond avgSpeed, NewtonMeter maxEmTorque, uint gear)
+ {
+ return EfficiencyMaps[gear].LookupTorque(electricPower, avgSpeed, maxEmTorque);
+ }
+
+ }
+
+ public class IHPCVoltageLevelData : IEPCVoltageLevelData
+ {
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
index 36384aae716e1f57ee561071ee5894ea66798b71..f93e0b4c043bd2a70946d05f09d6c39383429604 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs
@@ -135,11 +135,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
return new ValidationResult("Torque Converter can only be used with AT gearbox model");
}
} else {
- if (gearboxData.Type.AutomaticTransmission() && gearboxData.Type != GearboxType.APTN) {
+ if (gearboxData.Type.AutomaticTransmission() && gearboxData.Type != GearboxType.APTN && gearboxData.Type != GearboxType.IHPC) {
return new ValidationResult("AT gearbox model requires torque converter");
}
}
- if (gearboxData.Type.AutomaticTransmission() && gearboxData.Type != GearboxType.APTN) {
+ if (gearboxData.Type.AutomaticTransmission() && gearboxData.Type != GearboxType.APTN && gearboxData.Type != GearboxType.IHPC) {
gearboxData.TorqueConverterData.RequiredSpeedRatio =
Math.Round(gearboxData.Gears[1].TorqueConverterRatio / gearboxData.Gears[1].Ratio, 4) * 0.95;
result.AddRange(gearboxData.TorqueConverterData.Validate(mode, jobType, emPos, gearboxData.Type, emsMission));
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/ElectricSystem.cs b/VectoCore/VectoCore/Models/SimulationComponent/ElectricSystem.cs
index d4903f8f0bce7d77d53c52f467cb77f3a33ee50c..66338c293e6d96e6e450f26d251e0fee97bdb006 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/ElectricSystem.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/ElectricSystem.cs
@@ -6,11 +6,13 @@ using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Impl;
using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoCore.Models.SimulationComponent
{
- public class ElectricSystem : StatefulVectoSimulationComponent<ElectricSystem.State>, IElectricSystem, IElectricAuxConnecor, IElectricChargerConnector, IBatteryConnector
+ public class ElectricSystem : StatefulVectoSimulationComponent<ElectricSystem.State>, IElectricSystem, IElectricAuxConnecor,
+ IElectricChargerConnector, IBatteryConnector, IUpdateable
{
protected readonly List<IElectricAuxPort> Consumers = new List<IElectricAuxPort>();
@@ -141,7 +143,21 @@ namespace TUGraz.VectoCore.Models.SimulationComponent
ConsumerPower = powerDemand;
BatteryPower = batteryPower;
}
+
+ public State Clone() => (State)MemberwiseClone();
}
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is ElectricSystem s) {
+ PreviousState = s.PreviousState.Clone();
+ return true;
+ }
+
+ return false;
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/IAuxPort.cs b/VectoCore/VectoCore/Models/SimulationComponent/IAuxPort.cs
index 8ffddbf456c1cf2f3f9c42112a21cddca1f8df29..04a22c88b3c5ddbf69df4769bab30d8a6c5d54df 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/IAuxPort.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/IAuxPort.cs
@@ -43,7 +43,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent
void Connect(IAuxPort aux);
}
- public interface IAuxPort
+ public interface IAuxPort: IUpdateable
{
NewtonMeter Initialize(NewtonMeter torque, PerSecond angularSpeed);
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/IBrakes.cs b/VectoCore/VectoCore/Models/SimulationComponent/IBrakes.cs
index 06e5019264e03483b670752220c06f5236bbe6d9..24c9b210d2348657fae37f93465e5da52abfbc37 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/IBrakes.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/IBrakes.cs
@@ -33,7 +33,7 @@ using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent
{
- public interface IBrakes
+ public interface IBrakes: IUpdateable
{
Watt BrakePower { get; set; }
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs
index 716fec7e0bf24e8a33803be389641c116fcb9741..6c6abb3a54e3d01bf215d08a249117ec1aab3f85 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs
@@ -98,7 +98,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent
/// </value>
IGearbox Gearbox { get; set; }
- GearshiftPosition NextGear { get; }
+ GearshiftPosition NextGear { get; }
bool CheckGearshiftRequired { get; }
GearshiftPosition MaxStartGear { get; }
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/IUpdateable.cs b/VectoCore/VectoCore/Models/SimulationComponent/IUpdateable.cs
new file mode 100644
index 0000000000000000000000000000000000000000..f60db9bb59ec3c8e23098c94fd182502cc3f25db
--- /dev/null
+++ b/VectoCore/VectoCore/Models/SimulationComponent/IUpdateable.cs
@@ -0,0 +1,42 @@
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2019 European Union
+*
+* Developed by Graz University of Technology,
+* Institute of Internal Combustion Engines and Thermodynamics,
+* Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
+
+namespace TUGraz.VectoCore.Models.SimulationComponent
+{
+ public interface IUpdateable
+ {
+ /// <summary>
+ /// Tries to update the internal state of this object from the other object.
+ /// </summary>
+ /// <returns>True if the update was possible. False if the update is not possible.</returns>
+ bool UpdateFrom(object other);
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyOptimized.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyOptimized.cs
index dc0a77b3e23a4b7bf0a1548166c9f94bda28a2dc..d63082eec148f69c0e9137a1cbfc32ed6a05a388 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyOptimized.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategyOptimized.cs
@@ -61,10 +61,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
var runData = dataBus.RunData;
// MQ: 2019-11-29 - fuel used here has no effect as this is the modDatacontainer for the test-powertrain only!
- var modData = new ModalDataContainer(runData, null, null);
- var builder = new PowertrainBuilder(modData);
TestContainer = new SimplePowertrainContainer(runData);
- builder.BuildSimplePowertrain(runData, TestContainer);
+ PowertrainBuilder.BuildSimplePowertrain(runData, TestContainer);
TestContainerGbx = TestContainer.GearboxCtl as Gearbox;
if (TestContainerGbx == null) {
throw new VectoException("Unknown gearboxtype: {0}", TestContainer.GearboxCtl.GetType().FullName);
@@ -132,9 +130,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
continue;
}
- var estimatedEngineSpeed = (vehicleSpeedPostShift * (totalTransmissionRatio /
- GearboxModelData.Gears[currentGear.Gear].Ratio * GearboxModelData.Gears[tryNextGear.Gear].Ratio))
- .Cast<PerSecond>();
+ var estimatedEngineSpeed = vehicleSpeedPostShift * (totalTransmissionRatio /
+ GearboxModelData.Gears[currentGear.Gear].Ratio * GearboxModelData.Gears[tryNextGear.Gear].Ratio);
if (estimatedEngineSpeed.IsSmaller(shiftStrategyParameters.MinEngineSpeedPostUpshift)) {
continue;
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/APTNGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/APTNGearbox.cs
index f0c00dce38b4517a0c5e4f8ae07c961331689625..fd345f22f0dd77198f9511164f5e76a4eb8157f8 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/APTNGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/APTNGearbox.cs
@@ -3,6 +3,7 @@ using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
@@ -71,12 +72,18 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var response = NextComponent.Request(absTime, Constants.SimulationSettings.TargetTimeInterval, inTorque, inAngularVelocity, true);
var eMotor = DataBus.ElectricMotorInfo(DataBus.PowertrainInfo.ElectricMotorPositions[0]);
- var fullLoad = -eMotor.MaxPowerDrive(DataBus.BatteryInfo.InternalVoltage, inAngularVelocity);
+ var fullLoad = -eMotor.MaxPowerDrive(DataBus.BatteryInfo.InternalVoltage, inAngularVelocity, gear);
Gear = oldGear;
return new ResponseDryRun(this, response) {
ElectricMotor = { PowerRequest = response.ElectricMotor.PowerRequest },
- Gearbox = { PowerRequest = outTorque * outAngularVelocity },
+ Gearbox = {
+ PowerRequest = outTorque * outAngularVelocity,
+ InputSpeed = inAngularVelocity,
+ InputTorque = inTorque,
+ OutputTorque = outTorque,
+ OutputSpeed = outAngularVelocity,
+ },
DeltaFullLoad = response.ElectricMotor.PowerRequest - fullLoad
};
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/APTNShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/APTNShiftStrategy.cs
index c2166b8895b10ee83c88a922765ce2a897922789..ed2c50526f16e5319ecf01a5efbd3bcc161196fe 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/APTNShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/APTNShiftStrategy.cs
@@ -25,7 +25,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
if (dataBus.RunData.VehicleData == null) {
return;
}
- SetupVelocityDropPreprocessor(dataBus);
+
+ if (!dataBus.IsTestPowertrain) {
+ SetupVelocityDropPreprocessor(dataBus);
+ }
}
public new static string Name => "APT-N";
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
index 1de8dd3d0c4c7018288aa78a7c38708858541f93..087876ce24f6f1f24b288f591f5599b543301928 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
@@ -40,17 +40,17 @@ using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
+using TUGraz.VectoCore.Models.SimulationComponent.Strategies;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
- public class ATGearbox : AbstractGearbox<ATGearbox.ATGearboxState>, IHybridControlledGearbox
+ public class ATGearbox : AbstractGearbox<ATGearbox.ATGearboxState>, IHybridControlledGearbox, IUpdateable
{
protected internal readonly IShiftStrategy _strategy;
protected internal readonly TorqueConverter TorqueConverter;
private IIdleController _idleController;
- protected internal bool RequestAfterGearshift;
internal WattSecond _powershiftLossEnergy;
protected internal KilogramSquareMeter EngineInertia;
@@ -581,8 +581,27 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public bool Disengaged = true;
public WattSecond PowershiftLossEnergy;
public NewtonMeter PowershiftLoss;
+
+ public new ATGearboxState Clone() => (ATGearboxState)MemberwiseClone();
+
}
public bool SwitchToNeutral { get; set; }
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other)
+ {
+ if (other is ATGearbox g) {
+ PreviousState = g.PreviousState.Clone();
+ _powershiftLossEnergy = g._powershiftLossEnergy;
+ LastShift = g.LastShift;
+ return true;
+ }
+
+ return false;
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategyOptimized.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategyOptimized.cs
index da97a2b2c7841ded9b88308bd6a24ca967734e72..dbda13c068acc15ad117c4da3d36f8d50610c388 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategyOptimized.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategyOptimized.cs
@@ -107,11 +107,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
private void InitializeTestContainer(VectoRunData runData)
{
// fuel list here has no effect as this is the mod-container for the test-powertrain only
- var modData = new ModalDataContainer(runData, null, null);
- var builder = new PowertrainBuilder(modData);
TestContainer = new SimplePowertrainContainer(runData);
- builder.BuildSimplePowertrain(runData, TestContainer);
+ PowertrainBuilder.BuildSimplePowertrain(runData, TestContainer);
TestContainerGbx = TestContainer.GearboxCtl as ATGearbox;
if (TestContainerGbx == null) {
throw new VectoException("Unknown gearboxtype: {0}", TestContainer.GearboxCtl.GetType().FullName);
@@ -252,7 +250,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var inAngularVelocity = GearboxModelData.Gears[next.Gear].Ratio * outAngularVelocity;
var totalTransmissionRatio = inAngularVelocity / (DataBus.VehicleInfo.VehicleSpeed + DataBus.DriverInfo.DriverAcceleration * dt);
- var estimatedEngineSpeed = (vehicleSpeedPostShift * totalTransmissionRatio).Cast<PerSecond>();
+ var estimatedEngineSpeed = vehicleSpeedPostShift * totalTransmissionRatio;
if (estimatedEngineSpeed.IsSmaller(shiftStrategyParameters.MinEngineSpeedPostUpshift)) {
continue;
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AbstractGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AbstractGearbox.cs
index e7b845bf7362c79d6caa4cef783f79cd4805e519..6c150c41888a239767076191a5bfa8ce02d1b2b1 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AbstractGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AbstractGearbox.cs
@@ -124,6 +124,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
#endregion
public abstract bool GearEngaged(Second absTime);
+ public bool RequestAfterGearshift { get; set; }
protected bool ConsiderShiftLosses(GearshiftPosition nextGear, NewtonMeter torqueOut)
{
@@ -170,5 +171,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public GearshiftPosition Gear;
public TransmissionLossMap.LossMapResult TorqueLossResult;
public DrivingBehavior DrivingBehavior;
+
+ public new GearboxState Clone() => (GearboxState)base.Clone();
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs
index 7d84011aee946b43143c2309e93fcfdfa18be9e7..dc0116d06b836915fbdf1c5007d601b744de5bb1 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs
@@ -39,7 +39,7 @@ using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
- public class AxleGear : TransmissionComponent, IAxlegear
+ public class AxleGear : TransmissionComponent, IAxlegear, IUpdateable
{
public AxleGear(IVehicleContainer container, AxleGearData modelData) : base(container, modelData.AxleGear) { }
@@ -53,7 +53,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public override IResponse Request(
Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity,
- bool dryRun = false)
+ bool dryRun)
{
var retVal = base.Request(absTime, dt, outTorque, outAngularVelocity, dryRun);
retVal.Axlegear.PowerRequest = outTorque * (PreviousState.OutAngularVelocity + outAngularVelocity) / 2.0;
@@ -81,5 +81,18 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
(PreviousState.InAngularVelocity + CurrentState.InAngularVelocity) / 2.0, CurrentState.InTorque);
public double Ratio => ModelData.Ratio;
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is AxleGear g) {
+ PreviousState = g.PreviousState.Clone();
+ return true;
+ }
+
+ return false;
+ }
+
+ #endregion
}
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Battery.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Battery.cs
index 2d131e2d6177c1e0abcbe683102e4037f6f22c30..c18f5f57e096b896125c9496c7fe65cf87e73a4b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Battery.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Battery.cs
@@ -14,7 +14,7 @@ using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
- public class Battery : StatefulVectoSimulationComponent<Battery.State>, IElectricEnergyStorage, IElectricEnergyStoragePort
+ public class Battery : StatefulVectoSimulationComponent<Battery.State>, IElectricEnergyStorage, IElectricEnergyStoragePort, IUpdateable
{
protected readonly BatteryData ModelData;
@@ -274,8 +274,21 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public Watt MaxDischargePower;
public Watt BatteryLoss;
public Second PulseDuration;
+ public State Clone() => (State)MemberwiseClone();
}
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is Battery b) {
+ PreviousState = b.PreviousState.Clone();
+ return true;
+ }
+
+ return false;
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BatterySystem.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BatterySystem.cs
index 556b71c828e5aef112c4aad7c323d2292505f708..0e3475ba42091f1d1917672aa2bec7b5a840c93d 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BatterySystem.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BatterySystem.cs
@@ -14,9 +14,9 @@ using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
- public class BatterySystem : StatefulVectoSimulationComponent<BatterySystem.State>, IElectricEnergyStorage, IElectricEnergyStoragePort
+ public class BatterySystem : StatefulVectoSimulationComponent<BatterySystem.State>, IElectricEnergyStorage, IElectricEnergyStoragePort, IUpdateable
{
- public class BatteryString
+ public class BatteryString: IUpdateable
{
protected readonly List<Battery> _batteries;
@@ -111,6 +111,17 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
: MaxChargeCurrent(dt);
return solutions.Where(x => Math.Sign(sign) == Math.Sign(x) && Math.Abs(x).IsSmallerOrEqual(Math.Abs(maxCurrent.Value()), 1e-3)).Min().SI<Ampere>();
}
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is BatteryString bs) {
+ return _batteries.ZipAll(bs._batteries).All(ts => ts.Item1.UpdateFrom(ts.Item2));
+ }
+ return false;
+ }
+
+ #endregion
}
protected internal readonly Dictionary<int, BatteryString> Batteries = new Dictionary<int, BatteryString>();
@@ -377,6 +388,20 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public Watt MaxDischargePower;
public Watt BatteryLoss;
public Second PulseDuration;
+ public State Clone() => (State)MemberwiseClone();
+ }
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is BatterySystem b) {
+ PreviousState = b.PreviousState.Clone();
+ return Batteries.All(kv => kv.Value.UpdateFrom(b.Batteries[kv.Key]));
+ }
+
+ return false;
}
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Brakes.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Brakes.cs
index bf6ef7e401733830f8742026bdc155343526774e..738460f4cfca7fe491d39f8b86b90a5e81b61b09 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Brakes.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Brakes.cs
@@ -41,8 +41,7 @@ using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
public class Brakes : StatefulProviderComponent<SimpleComponentState, ITnOutPort, ITnInPort, ITnOutPort>,
- IPowerTrainComponent, ITnOutPort,
- ITnInPort, IBrakes
+ IPowerTrainComponent, ITnOutPort, ITnInPort, IBrakes, IUpdateable
{
public Watt BrakePower { get; set; }
@@ -93,5 +92,18 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
BrakePower = 0.SI<Watt>();
base.DoCommitSimulationStep(time, simulationInterval);
}
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is Brakes b) {
+ PreviousState = b.PreviousState.Clone();
+ BrakePower = b.BrakePower;
+ return true;
+ }
+ return false;
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
index 3465fa90b62566887383800703b6b2e56988954a..a2f3f19d393ab4114d21d2e5db07ddde404363a6 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
@@ -31,6 +31,7 @@
using System;
using TUGraz.VectoCommon.BusAuxiliaries;
+using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.BusAuxiliaries;
@@ -378,6 +379,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var missingEnergy = energyDemand - batEnergy;
if (AuxCfg.ElectricalUserInputsConfig.ConnectESToREESS) {
+ if (DCDCConverter is null) {
+ throw new VectoException("DCDCConverter is missing: The current configuration for the bus auxiliaries " +
+ "requires a DCDCConverter (ES supply from HEV REESS is activated).");
+ }
DCDCConverter.ConsumerEnergy(-missingEnergy, dryRun);
} else {
if (!dryRun) {
@@ -396,6 +401,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public WattSecond MissingElectricEnergy { get; set; }
public Watt ExcessiveDragPower = 0.SI<Watt>();
+
+ public BusAuxState Clone() => (BusAuxState)MemberwiseClone();
}
public class ElectricStorageWrapper : ISimpleBatteryInfo
@@ -433,5 +440,18 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
#endregion
}
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is BusAuxiliariesAdapter b) {
+ PreviousState = b.PreviousState.Clone();
+ return ElectricStorage.UpdateFrom(b.ElectricStorage);
+ }
+
+ return false;
+ }
+
+ #endregion
}
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
index 668e1523b35a4d0b139ea244d580668ffcbfaabb..d7d03ce19f404ce777e9906e1355ff79f49043d9 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
@@ -43,9 +43,8 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
- public class
- Clutch : StatefulProviderComponent<Clutch.ClutchState, ITnOutPort, ITnInPort, ITnOutPort>, IClutch,
- ITnOutPort, ITnInPort
+ public class Clutch : StatefulProviderComponent<Clutch.ClutchState, ITnOutPort, ITnInPort, ITnOutPort>, IClutch,
+ ITnOutPort, ITnInPort, IUpdateable
{
protected readonly PerSecond _idleSpeed;
protected readonly PerSecond _ratedSpeed;
@@ -252,6 +251,19 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public Watt ClutchLoss { get; set; }
public bool ICEOn { get; set; }
public PerSecond ICEOnSpeed { get; set; }
+ public new ClutchState Clone() => (ClutchState)base.Clone();
}
+
+ #region Implementation of IUpdateable
+
+ public virtual bool UpdateFrom(object other) {
+ if (other is Clutch c) {
+ PreviousState = c.PreviousState.Clone();
+ return true;
+ }
+ return false;
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
index 6537f031fbd106f6293dd1303979a7cdec869d1c..a45144c5ca126b8a02fa0e5e2eacba9db14483bc 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
@@ -113,15 +113,26 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
if (ADAS.PredictiveCruiseControl != PredictiveCruiseControlType.None) {
// create a dummy powertrain for pre-processing and estimations
- var modData = new ModalDataContainer(data, null, null);
- var builder = new PowertrainBuilder(modData);
var testContainer = new SimplePowertrainContainer(data);
- if (data.JobType != VectoSimulationJobType.BatteryElectricVehicle && data.JobType != VectoSimulationJobType.SerialHybridVehicle)
- builder.BuildSimplePowertrain(data, testContainer);
- else {
- builder.BuildSimplePowertrainElectric(data, testContainer);
- }
+ switch (data.JobType) {
+ case VectoSimulationJobType.BatteryElectricVehicle:
+ case VectoSimulationJobType.SerialHybridVehicle:
+ case VectoSimulationJobType.IEPC_E:
+ case VectoSimulationJobType.IEPC_S:
+ PowertrainBuilder.BuildSimplePowertrainElectric(data, testContainer);
+ break;
+ case VectoSimulationJobType.IHPC:
+ case VectoSimulationJobType.ParallelHybridVehicle:
+ PowertrainBuilder.BuildSimpleHybridPowertrain(data, testContainer);
+ break;
+ case VectoSimulationJobType.ConventionalVehicle:
+ PowertrainBuilder.BuildSimplePowertrain(data, testContainer);
+ break;
+ default:
+ throw new ArgumentOutOfRangeException(nameof(data.JobType));
+ }
+
container.AddPreprocessor(new PCCSegmentPreprocessor(testContainer, PCCSegments, data?.DriverData.PCC));
}
}
@@ -427,7 +438,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var axleLoss = DataBus.AxlegearInfo.AxlegearLoss();
var emDragLoss = CalculateElectricMotorDragLoss();
var iceDragLoss = 0.SI<Watt>();
- if (dataBus.GearboxInfo.GearboxType.AutomaticTransmission()) {
+ if (dataBus.GearboxInfo.GearboxType.AutomaticTransmission() && dataBus.GearboxInfo.GearboxType != GearboxType.IHPC) {
if (ADAS.EcoRoll == EcoRollType.None && ATEcoRollReleaseLockupClutch) {
iceDragLoss = DataBus.EngineInfo.EngineDragPower(DataBus.EngineInfo.EngineSpeed);
}
@@ -736,13 +747,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
foreach (var pos in db.PowertrainInfo.ElectricMotorPositions)
sum += db.ElectricMotorInfo(pos).DragPower(
db.BatteryInfo.InternalVoltage,
- db.ElectricMotorInfo(pos).ElectricMotorSpeed);
+ db.ElectricMotorInfo(pos).ElectricMotorSpeed, db.GearboxInfo.Gear);
return sum;
}
public bool IsOverspeedAllowed(MeterPerSecond velocity, bool prohibitOverspeed = false) =>
!prohibitOverspeed
- && Driver.DriverData.OverSpeed.Enabled
+ // allow overspeed either if enabled in the driver model, or ADAS PCC option 3 is enabled in the vehicle and we are on a highway
+ && (Driver.DriverData.OverSpeed.Enabled || ADAS.PredictiveCruiseControl == PredictiveCruiseControlType.Option_1_2_3 && DataBus.DrivingCycleInfo.CycleData.LeftSample.Highway)
&& velocity > Driver.DriverData.OverSpeed.MinSpeed
&& ApplyOverspeed(velocity) < (DataBus.VehicleInfo.MaxVehicleSpeed ?? 500.KMPHtoMeterPerSecond());
}
@@ -1166,7 +1178,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient,
bool prohibitOverspeed = false)
{
- if (DataBus.VehicleInfo.VehicleSpeed.IsSmallerOrEqual(DriverStrategy.BrakeTrigger.NextTargetSpeed) && !DataBus.VehicleInfo.VehicleStopped) {
+ if (DataBus.VehicleInfo.VehicleSpeed.IsSmaller(DriverStrategy.BrakeTrigger.NextTargetSpeed, Constants.SimulationSettings.BrakeTriggerSpeedTolerance)
+ && !DataBus.VehicleInfo.VehicleStopped) {
var retVal = HandleTargetspeedReached(absTime, ds, targetVelocity, gradient);
for (var i = 0; i < 3 && retVal == null; i++) {
retVal = HandleTargetspeedReached(absTime, ds, targetVelocity, gradient);
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
index 4f623cfa4501b73ca7c0de29522b51dafda09bff..a61d012880d55c66a6c438ce8cfda14fa67fa651 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
@@ -52,11 +52,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
/// </summary>
public sealed class DistanceBasedDrivingCycle : StatefulProviderComponent
<DistanceBasedDrivingCycle.DrivingCycleState, ISimulationOutPort, IDrivingCycleInPort, IDrivingCycleOutPort>,
- IDrivingCycle, ISimulationOutPort, IDrivingCycleInPort, IDisposable
+ IDrivingCycle, ISimulationOutPort, IDrivingCycleInPort, IDisposable, IUpdateable
{
private const double LookaheadTimeSafetyMargin = 1.5;
internal readonly IDrivingCycleData Data;
- internal readonly DrivingCycleEnumerator CycleIntervalIterator;
+ internal DrivingCycleEnumerator CycleIntervalIterator;
private bool _intervalProlonged;
internal IdleControllerSwitcher IdleController;
private Meter CycleEndDistance;
@@ -579,5 +579,20 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
CycleIntervalIterator.Dispose();
}
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is DistanceBasedDrivingCycle c) {
+ PreviousState = c.PreviousState.Clone();
+ CycleIntervalIterator = c.CycleIntervalIterator;
+ //TODO MK-20220523 also allow updating from measuredspeeddrivingcycle?
+ return true;
+ }
+
+ return false;
+ }
+
+ #endregion
}
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyGearboxInfo.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyGearboxInfo.cs
index 74ee79b2c1000f1b4084ef1899fc9d936ffccc2a..66cbd71d1c98257a598e418ece40099d758d9a03 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyGearboxInfo.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyGearboxInfo.cs
@@ -67,6 +67,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return true;
}
+ public bool RequestAfterGearshift { get; set; }
+
#endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
index 8ef923828af37da0c9bc0a5704a39d2b8658f64d..39ea12f2c6ca10290670f09c376c2dc1d502cf22 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
@@ -9,13 +9,14 @@ using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Strategies;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
-
- public class ElectricMotor : StatefulProviderComponent<ElectricMotorState, ITnOutPort, ITnInPort, ITnOutPort>, IPowerTrainComponent, IElectricMotor, ITnOutPort, ITnInPort
+ public class ElectricMotor : StatefulProviderComponent<ElectricMotorState, ITnOutPort, ITnInPort, ITnOutPort>,
+ IPowerTrainComponent, IElectricMotor, ITnOutPort, ITnInPort, IUpdateable
{
protected internal IElectricSystem ElectricPower;
@@ -55,22 +56,22 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public PowertrainPosition Position { get; }
public PerSecond MaxSpeed => _maxSpeed ?? (_maxSpeed = ModelData.EfficiencyData.MaxSpeed / ModelData.RatioADC);
- public Watt DragPower(Volt volt, PerSecond electricMotorSpeed)
+ public Watt DragPower(Volt volt, PerSecond electricMotorSpeed, GearshiftPosition gear)
{
- return ModelData.DragCurve.Lookup(electricMotorSpeed) * electricMotorSpeed;
+ return ModelData.DragCurveLookup(electricMotorSpeed, gear) * electricMotorSpeed;
}
- public Watt MaxPowerDrive(Volt volt, PerSecond electricMotorSpeed)
+ public Watt MaxPowerDrive(Volt volt, PerSecond electricMotorSpeed, GearshiftPosition gear)
{
return ModelData.EfficiencyData.FullLoadDriveTorque(volt, electricMotorSpeed) * electricMotorSpeed;
}
- public NewtonMeter GetTorqueForElectricPower(Volt volt, Watt electricPower, PerSecond avgEmSpeed, Second dt)
+ public NewtonMeter GetTorqueForElectricPower(Volt volt, Watt electricPower, PerSecond avgEmSpeed, Second dt, GearshiftPosition gear, bool allowExtrapolation)
{
var maxTorque = electricPower > 0
- ? GetMaxRecuperationTorque(volt, dt, avgEmSpeed)
- : GetMaxDriveTorque(volt, dt, avgEmSpeed);
- var tqEmMap = ModelData.EfficiencyData.EfficiencyMapLookupTorque(volt, electricPower, avgEmSpeed, maxTorque);
+ ? GetMaxRecuperationTorque(volt, dt, avgEmSpeed, gear)
+ : GetMaxDriveTorque(volt, dt, avgEmSpeed, gear);
+ var tqEmMap = ModelData.EfficiencyData.EfficiencyMapLookupTorque(volt, electricPower, avgEmSpeed, maxTorque, gear);
if (tqEmMap == null) {
return null;
}
@@ -79,7 +80,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var tqInertia = Formulas.InertiaPower(emSpeed, PreviousState.EMSpeed, ModelData.Inertia, dt) / avgEmSpeed;
var tqEm = tqEmMap + tqInertia;
- var tqDt = ConvertEmTorqueToDrivetrain(avgEmSpeed, tqEm);
+ var tqDt = ConvertEmTorqueToDrivetrain(avgEmSpeed, tqEm, allowExtrapolation);
return tqDt;
}
@@ -144,6 +145,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public IResponse DoHandleRequest(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity,
bool dryRun, double ratio)
{
+ var gear = DataBus.GearboxInfo?.Gear ?? new GearshiftPosition(1);
+ if (gear.Gear == 0) {
+ gear = new GearshiftPosition(1);
+ }
+
var voltage = DataBus.BatteryInfo.InternalVoltage;
var iceOn = Position == PowertrainPosition.HybridP1 &&
@@ -159,8 +165,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
? 0.SI<NewtonMeter>()
: Formulas.InertiaPower(avgEmSpeed, PreviousState.EMSpeed, ModelData.Inertia, dt) / avgEmSpeed;
- var maxDriveTorqueEmMap = GetMaxDriveTorque(voltage, dt, avgEmSpeed);
- var maxRecuperationTorqueEmMap = GetMaxRecuperationTorque(voltage, dt, avgEmSpeed);
+ var maxDriveTorqueEmMap = GetMaxDriveTorque(voltage, dt, avgEmSpeed, gear);
+ var maxRecuperationTorqueEmMap = GetMaxRecuperationTorque(voltage, dt, avgEmSpeed, gear);
// inertia has to be added here. drive torque is negative, when accelerating inertia is positive and thus 'reduces' drive torque, i.e 'less negative'
var maxDriveTorqueEm = maxDriveTorqueEmMap == null ? null : maxDriveTorqueEmMap + inertiaTorqueEm;
@@ -174,8 +180,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
maxRecuperationTorqueEm = null;
}
- var maxDriveTorqueDt = maxDriveTorqueEm == null ? null : ConvertEmTorqueToDrivetrain(avgEmSpeed, maxDriveTorqueEm);
- var maxRecuperationTorqueDt = maxRecuperationTorqueEm == null ? null : ConvertEmTorqueToDrivetrain(avgEmSpeed, maxRecuperationTorqueEm);
+ var maxDriveTorqueDt = maxDriveTorqueEm == null ? null : ConvertEmTorqueToDrivetrain(avgEmSpeed, maxDriveTorqueEm, dryRun);
+ var maxRecuperationTorqueDt = maxRecuperationTorqueEm == null ? null : ConvertEmTorqueToDrivetrain(avgEmSpeed, maxRecuperationTorqueEm, dryRun);
// control returns torque that shall be applied on the drivetrain. calculate backward to the EM
var emTorqueDt = Control.MechanicalAssistPower(absTime, dt, outTorque,
@@ -198,7 +204,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
- if ((Position == PowertrainPosition.HybridP2 || Position == PowertrainPosition.HybridP2_5 ) && !DataBus.GearboxInfo.GearEngaged(absTime)) {
+ if ((Position == PowertrainPosition.HybridP2 || Position == PowertrainPosition.HybridP2_5 || Position == PowertrainPosition.IHPC) && !DataBus.GearboxInfo.GearEngaged(absTime)) {
// electric motor is between gearbox and clutch, but no gear is engaged...
if (emTorque != null) {
if (!DataBus.HybridControllerInfo.GearboxEngaged || (DataBus.HybridControllerInfo.GearboxEngaged && !DataBus.GearboxInfo.GearEngaged(absTime))) {
@@ -240,8 +246,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
// no electric system or EM shall be off - apply drag only
// if EM is off, calculate EM drag torque 'forward' to be applied on drivetrain
// add inertia, drag is positive
- emTorque = ModelData.DragCurve.Lookup(avgEmSpeed) + inertiaTorqueEm;
- emTorqueDt = ConvertEmTorqueToDrivetrain(avgEmSpeed, emTorque);
+ emTorque = ModelData.DragCurveLookup(avgEmSpeed, gear) + inertiaTorqueEm;
+ emTorqueDt = ConvertEmTorqueToDrivetrain(avgEmSpeed, emTorque, dryRun);
emOff = true;
}
@@ -254,10 +260,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
emTorqueMap = null;
}
- var electricPower = emOff || (ModelData.DragCurve.Lookup(avgEmSpeed) + inertiaTorqueEm).IsEqual(emTorque, 1e-3.SI<NewtonMeter>())
+
+ var electricPower = emOff || (ModelData.DragCurveLookup(avgEmSpeed, gear) + inertiaTorqueEm).IsEqual(emTorque, 1e-3.SI<NewtonMeter>())
? 0.SI<Watt>()
: ModelData.EfficiencyData
- .LookupElectricPower(voltage, avgEmSpeed, emTorqueMap, DataBus.ExecutionMode != ExecutionMode.Declaration)
+ .LookupElectricPower(voltage, avgEmSpeed, emTorqueMap, gear, DataBus.ExecutionMode != ExecutionMode.Declaration)
.ElectricalPower;
var electricSupplyResponse =
@@ -379,7 +386,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return retVal;
}
- private NewtonMeter GetMaxRecuperationTorque(Volt volt, Second dt, PerSecond avgSpeed)
+ private NewtonMeter GetMaxRecuperationTorque(Volt volt, Second dt, PerSecond avgSpeed, GearshiftPosition gear)
{
var tqContinuousPwr = DeRatingActive ? ModelData.Overload.ContinuousTorque : null;
@@ -393,21 +400,21 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
var maxBatRecuperationTorque = maxBatPower.IsEqual(0, 1e-3)
- ? ModelData.DragCurve.Lookup(avgSpeed)
- : ModelData.EfficiencyData.EfficiencyMapLookupTorque(volt, maxBatPower, avgSpeed, maxEmTorque);
+ ? ModelData.DragCurveLookup(avgSpeed, gear)
+ : ModelData.EfficiencyData.EfficiencyMapLookupTorque(volt, maxBatPower, avgSpeed, maxEmTorque, gear);
var maxTorqueRecuperate = VectoMath.Min(maxEmTorque, maxBatRecuperationTorque);
if (maxTorqueRecuperate < 0) {
return null;
}
- var elPower = ModelData.EfficiencyData.LookupElectricPower(volt, avgSpeed, maxTorqueRecuperate);
+ var elPower = ModelData.EfficiencyData.LookupElectricPower(volt, avgSpeed, maxTorqueRecuperate, gear);
if (elPower.ElectricalPower?.IsSmallerOrEqual(0) ?? true) {
return null;
}
return maxTorqueRecuperate;
}
- private NewtonMeter GetMaxDriveTorque(Volt volt, Second dt, PerSecond avgSpeed)
+ private NewtonMeter GetMaxDriveTorque(Volt volt, Second dt, PerSecond avgSpeed, GearshiftPosition gear)
{
var tqContinuousPwr = DeRatingActive ? -ModelData.Overload.ContinuousTorque : null;
@@ -421,17 +428,17 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
var maxBatDriveTorque = maxBatPower.IsEqual(0, 1e-3)
- ? ModelData.DragCurve.Lookup(avgSpeed)
- : ModelData.EfficiencyData.EfficiencyMapLookupTorque(volt, maxBatPower, avgSpeed, maxEmTorque);
+ ? ModelData.DragCurveLookup(avgSpeed, gear)
+ : ModelData.EfficiencyData.EfficiencyMapLookupTorque(volt, maxBatPower, avgSpeed, maxEmTorque, gear);
var maxTorqueDrive = VectoMath.Max(maxEmTorque, maxBatDriveTorque);
return maxTorqueDrive > 0 ? null : maxTorqueDrive;
}
- protected internal NewtonMeter ConvertEmTorqueToDrivetrain(PerSecond emSpeed, NewtonMeter emTorque)
+ protected internal NewtonMeter ConvertEmTorqueToDrivetrain(PerSecond emSpeed, NewtonMeter emTorque, bool dryRun)
{
- var dtTorque = ModelData.TransmissionLossMap.GetOutTorque(emSpeed, emTorque);
+ var dtTorque = ModelData.TransmissionLossMap.GetOutTorque(emSpeed, emTorque, DataBus.IsTestPowertrain || dryRun);
var dtSpeed = emSpeed / ModelData.RatioADC;
var emTorqueBwd = ConvertDrivetrainTorqueToEm(dtSpeed, dtTorque);
@@ -486,8 +493,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
container[ModalResultField.P_EM_electricMotor_em_mech_, Position] = (CurrentState.EMTorque ?? 0.SI<NewtonMeter>() ) * avgEMSpeed;
container[ModalResultField.P_EM_electricMotor_em_mech_map_, Position] = (CurrentState.EmTorqueMap ?? 0.SI<NewtonMeter>()) * avgEMSpeed;
+ if (!Position.IsBatteryElectric()) {
+ container[ModalResultField.P_EM_in_, Position] = CurrentState.DrivetrainInTorque * avgDTSpeed;
+ }
- container[ModalResultField.P_EM_in_, Position] = CurrentState.DrivetrainInTorque * avgDTSpeed;
container[ModalResultField.P_EM_out_, Position] = CurrentState.DrivetrainOutTorque * avgDTSpeed;
container[ModalResultField.P_EM_mech_, Position] = (CurrentState.DrivetrainInTorque - CurrentState.DrivetrainOutTorque) * avgDTSpeed;
@@ -569,6 +578,20 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
return emSpeed / ModelData.RatioADC;
}
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is ElectricMotor e && Position == e.Position) {
+ ThermalBuffer = e.ThermalBuffer;
+ DeRatingActive = e.DeRatingActive;
+ return true;
+ }
+
+ return false;
+ }
+
+ #endregion
}
public class ElectricMotorState // : SimpleComponentState
@@ -596,5 +619,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public Watt ElectricPowerToBattery;
+
+ public ElectricMotorState Clone() => (ElectricMotorState)MemberwiseClone();
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs
index e7f82a552ccc70b5474a6cd02d3b8de041e16a0b..18ee0611a90ad3d22da5b7c553c47f8b8dc51d49 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs
@@ -244,6 +244,21 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
public PerSecond AngularSpeed;
public Dictionary<string, Watt> PowerDemands;
+
+ public State Clone() => (State)MemberwiseClone();
}
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is EngineAuxiliary a) {
+ PreviousState = a.PreviousState.Clone();
+ return true;
+ }
+
+ return false;
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
index ed4a81f1f7feb69534f24f723c431ce117226336..86c5c945cb8242a1236396b93a8b5e373081235e 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
@@ -43,7 +43,7 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
- public class Gearbox : AbstractGearbox<GearboxState>, IHybridControlledGearbox
+ public class Gearbox : AbstractGearbox<GearboxState>, IHybridControlledGearbox, IUpdateable
{
/// <summary>
/// The shift strategy.
@@ -272,6 +272,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
(DataBus.Brakes.BrakePower.IsGreater(0) || inTorque.IsSmaller(0));
var vehicleSpeedBelowThreshold =
DataBus.VehicleInfo.VehicleSpeed.IsSmaller(ModelData.DisengageWhenHaltingSpeed);
+ if (!dryRun) {
+ CurrentState.DrivingBehavior = DataBus.DriverInfo.DriverBehavior;
+ }
+
if (halted || (driverDeceleratingNegTorque && vehicleSpeedBelowThreshold)) {
EngageTime = VectoMath.Max(EngageTime, absTime + dt);
_strategy?.Disengage(absTime, dt, outTorque, outAngularVelocity);
@@ -284,10 +288,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return RequestGearDisengaged(absTime, dt, outTorque, outAngularVelocity, inTorque, dryRun);
}
- if (!dryRun) {
- CurrentState.DrivingBehavior = DataBus.DriverInfo.DriverBehavior;
- }
-
if (GearEngaged(absTime)) {
return RequestGearEngaged(absTime, dt, outTorque, outAngularVelocity, inTorque, inTorqueLossResult, inertiaTorqueLossOut, dryRun);
} else {
@@ -565,5 +565,17 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
public override Second LastShift => EngageTime;
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is Gearbox g) {
+ PreviousState = g.PreviousState.Clone();
+ return true;
+ }
+ return false;
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/GensetChargerAdapter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/GensetChargerAdapter.cs
index 0a38a67fde8b6c1647d3bb04f5f4c5081a9982ea..1a43cf623976f9edf5c99975a358bf39e53fb1ea 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/GensetChargerAdapter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/GensetChargerAdapter.cs
@@ -1,10 +1,11 @@
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
+using TUGraz.VectoCore.Models.SimulationComponent.Strategies;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
- public class GensetChargerAdapter : IElectricChargerPort
+ public class GensetChargerAdapter : IElectricChargerPort, IUpdateable
{
protected IElectricSystem es;
protected Watt PowerGenerated;
@@ -75,5 +76,17 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
#endregion
}
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is GenSetOperatingPoint p) {
+ ChargingPower = p.ElectricPower;
+ return true;
+ }
+ return false;
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
index 3b0b51dc8c526f0678ff790fe8c4423752bed34e..0e2910e5e1eaf4937ee0ef2367616ae02e11c3a2 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
@@ -38,9 +38,22 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public HybridController(IVehicleContainer container, IHybridControlStrategy strategy, IElectricSystem es) : base(container)
{
_electricMotorCtl = new Dictionary<PowertrainPosition, ElectricMotorController>();
- _shiftStrategy = container.RunData.GearboxData.Type.AutomaticTransmission()
- ? new HybridCtlATShiftStrategy(this, container)
- : new HybridCtlShiftStrategy(this, container);
+
+ switch (container.RunData.GearboxData.Type) {
+ case GearboxType.ATPowerSplit:
+ case GearboxType.ATSerial:
+ _shiftStrategy = new HybridCtlATShiftStrategy(this, container);
+ break;
+ case GearboxType.AMT:
+ _shiftStrategy = new HybridCtlShiftStrategy(this, container);
+ break;
+ case GearboxType.APTN:
+ case GearboxType.IHPC:
+ _shiftStrategy = new HybridCtlIHPCShiftStrategy(this, container);
+ break;
+ default: throw new ArgumentException($"Unsupported Gearbox type for Hybrid Controller: {container.RunData.GearboxData.Type}");
+ }
+
_hybridStrategy = strategy;
strategy.Controller = this;
@@ -291,7 +304,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected GearshiftPosition _nextGear { get; set; }
protected readonly GearList GearList;
- private readonly VectoRunData _runData;
+ protected readonly VectoRunData _runData;
public HybridCtlShiftStrategy(HybridController hybridController, IVehicleContainer container) : base(
container)
@@ -397,7 +410,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return _nextGear;
}
- protected GearshiftPosition InitStartGear(Second absTime, NewtonMeter outTorque, PerSecond outAngularVelocity)
+ protected virtual GearshiftPosition InitStartGear(Second absTime, NewtonMeter outTorque, PerSecond outAngularVelocity)
{
if (!DataBus.EngineCtl.CombustionEngineOn) {
return _nextGear;
@@ -564,5 +577,84 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return base.SpeedTooHighForEngine(gear, outAngularSpeed);
}
}
+
+ ///=======================================================================================
+
+ public class HybridCtlIHPCShiftStrategy : HybridCtlATShiftStrategy
+ {
+ protected new APTNGearbox _gearbox;
+
+ public HybridCtlIHPCShiftStrategy(HybridController hybridController, IVehicleContainer container) : base(hybridController, container) { }
+
+ public override IGearbox Gearbox {
+ get => _gearbox;
+ set => _gearbox = value as APTNGearbox ?? throw new VectoException("This shift strategy can't handle gearbox of type {0}", value.GetType());
+ }
+
+ public override GearshiftPosition InitGear(Second absTime, Second dt, NewtonMeter torque, PerSecond outAngularVelocity)
+ {
+ if (DataBus.VehicleInfo.VehicleSpeed.IsEqual(0)) {
+ return InitStartGear(absTime, torque, outAngularVelocity);
+ }
+
+ foreach (var gear in Gears.Reverse()) {
+ var response = _gearbox.Initialize(absTime, gear, torque, outAngularVelocity);
+
+ if (response.Engine.EngineSpeed > DataBus.EngineInfo.EngineRatedSpeed || response.Engine.EngineSpeed < DataBus.EngineInfo.EngineIdleSpeed) {
+ continue;
+ }
+
+ if (!IsBelowDownShiftCurve(gear, response.Engine.PowerRequest / response.Engine.EngineSpeed, response.Engine.EngineSpeed)) {
+ _gearbox.Disengaged = false;
+ return gear;
+ }
+ }
+
+ // fallback: start with first gear;
+ _gearbox.Disengaged = false;
+ return Gears.First();
+ }
+
+ public override void Disengage(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity) { }
+
+ protected override GearshiftPosition InitStartGear(Second absTime, NewtonMeter outTorque, PerSecond outAngularVelocity)
+ {
+ if (!DataBus.EngineCtl.CombustionEngineOn) {
+ return _nextGear;
+ }
+
+ foreach (var gear in GearList.IterateGears(MaxStartGear, GearList.First())) {
+ //for (var gear = MaxStartGear; gear > 1; gear--) {
+ var inAngularSpeed = outAngularVelocity * GearboxModelData.Gears[gear.Gear].Ratio;
+
+ var ratedSpeed = DataBus.EngineInfo.EngineRatedSpeed;
+ if (inAngularSpeed > ratedSpeed || inAngularSpeed.IsEqual(0)) {
+ continue;
+ }
+
+ var response = _gearbox.Initialize(absTime, gear, outTorque, outAngularVelocity);
+
+ var fullLoadPower =
+ response.Engine.DynamicFullLoadTorque; //EnginePowerRequest - response.DeltaFullLoad;
+ var reserve = 1 - response.Engine.TorqueOutDemand / fullLoadPower;
+
+ if (_runData != null && _runData.HybridStrategyParameters.MaxPropulsionTorque?.GetVECTOValueOrDefault(gear) != null) {
+ var tqRequest = response.Gearbox.InputTorque;
+ var maxTorque = _runData.HybridStrategyParameters.MaxPropulsionTorque[gear].FullLoadDriveTorque(response.Gearbox.InputSpeed);
+ reserve = 1 - VectoMath.Min(response.Engine.TorqueOutDemand / fullLoadPower, tqRequest / maxTorque);
+ }
+
+ if (response.Engine.EngineSpeed > DataBus.EngineInfo.EngineIdleSpeed &&
+ reserve.IsGreaterOrEqual(0)) {
+ //reserve >= GearshiftParams.StartTorqueReserve) {
+ _nextGear = gear;
+ return gear;
+ }
+ }
+
+ _nextGear = GearList.First();
+ return _nextGear;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/IEPC.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/IEPC.cs
new file mode 100644
index 0000000000000000000000000000000000000000..867a88f2ba682b0a7c69b6b5ab2f35f7a169963e
--- /dev/null
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/IEPC.cs
@@ -0,0 +1,72 @@
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.Simulation;
+using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.OutputData;
+
+namespace TUGraz.VectoCore.Models.SimulationComponent.Impl{
+
+ public class IEPC : ElectricMotor
+ {
+ public IEPC(IVehicleContainer container, ElectricMotorData data, IElectricMotorControl control, PowertrainPosition position) : base(container, data, control, position) { }
+
+
+ protected override void DoWriteModalResults(Second time, Second simulationInterval, IModalDataContainer container)
+ {
+ var prevDtSpeed = CurrentState.IceSwitchedOn ? CurrentState.ICEOnSpeed : PreviousState.DrivetrainSpeed;
+ var prevEmSpeed = CurrentState.IceSwitchedOn ? prevDtSpeed * ModelData.RatioADC : PreviousState.EMSpeed;
+
+ var avgEMSpeed = (prevEmSpeed + CurrentState.EMSpeed) / 2;
+ var avgDTSpeed = (prevDtSpeed + CurrentState.DrivetrainSpeed) / 2;
+
+ //container[ModalResultField.EM_ratio_, Position] = ModelData.RatioADC.SI<Scalar>();
+ container[ModalResultField.n_IEPC_int_, Position] = avgEMSpeed;
+ container[ModalResultField.T_IEPC_, Position] = CurrentState.EMTorque;
+ container[ModalResultField.T_IEPC_map_, Position] = CurrentState.EmTorqueMap;
+
+ container[ModalResultField.T_IEPC_int_drive_max_, Position] = CurrentState.DriveMax;
+ container[ModalResultField.T_IEPC_int_gen_max_, Position] = CurrentState.DragMax;
+
+ container[ModalResultField.P_IEPC_int_gen_max_, Position] = (CurrentState.DragMax ?? 0.SI<NewtonMeter>()) * avgEMSpeed;
+ container[ModalResultField.P_IEPC_int_drive_max_, Position] = (CurrentState.DriveMax ?? 0.SI<NewtonMeter>()) * avgEMSpeed;
+
+ //container[ModalResultField.P_EM_electricMotor_em_mech_, Position] = (CurrentState.EMTorque ?? 0.SI<NewtonMeter>()) * avgEMSpeed;
+ container[ModalResultField.P_IEPC_int_mech_map_, Position] = (CurrentState.EmTorqueMap ?? 0.SI<NewtonMeter>()) * avgEMSpeed;
+
+
+ //container[ModalResultField.P_EM_in_, Position] = CurrentState.DrivetrainInTorque * avgDTSpeed;
+ container[ModalResultField.P_IEPC_out_, Position] = CurrentState.DrivetrainOutTorque * avgDTSpeed;
+ //container[ModalResultField.P_EM_mech_, Position] = (CurrentState.DrivetrainInTorque - CurrentState.DrivetrainOutTorque) * avgDTSpeed;
+
+ container[ModalResultField.P_IEPC_el_, Position] = CurrentState.ElectricPowerToBattery;
+
+ container[ModalResultField.P_IEPC_electricMotorLoss_, Position] = (CurrentState.DrivetrainInTorque - CurrentState.DrivetrainOutTorque) * avgDTSpeed - CurrentState.ElectricPowerToBattery;
+
+ //container[ModalResultField.P_EM_TransmissionLoss_, Position] = CurrentState.TransmissionTorqueLoss * avgDTSpeed;
+
+ container[ModalResultField.P_IEPC_electricMotorInertiaLoss_, Position] = CurrentState.InertiaTorqueLoss * avgEMSpeed;
+
+ //container[ModalResultField.P_EM_loss_, Position] = (CurrentState.DrivetrainInTorque - CurrentState.DrivetrainOutTorque) * avgDTSpeed - CurrentState.ElectricPowerToBattery;
+
+ container[ModalResultField.IEPC_Off_, Position] = CurrentState.EMTorque == null ? 1.SI<Scalar>() : 0.SI<Scalar>();
+
+ var losses = (CurrentState.EmTorqueMap ?? 0.SI<NewtonMeter>()) * avgEMSpeed - CurrentState.ElectricPowerToBattery;
+ var contribution = (losses - ModelData.Overload.ContinuousPowerLoss) * simulationInterval;
+ if (DeRatingActive && contribution.IsGreater(0)) {
+ contribution = 0.SI<WattSecond>();
+ }
+
+ if (ThermalBuffer + contribution > ModelData.Overload.OverloadBuffer) {
+ contribution = (ModelData.Overload.OverloadBuffer - ThermalBuffer).Cast<WattSecond>();
+ }
+ if (ModelData.Overload.OverloadBuffer.Value() != 0) { // mk2021-08-03 overloadbuffer was 0 in Test Case: "ADASTestPEV.TestPCCEngineeringSampleCases G5Eng PCC12 Case A"
+ container[ModalResultField.IEPC_OvlBuffer_, Position] = VectoMath.Max(0, (ThermalBuffer + contribution) / ModelData.Overload.OverloadBuffer);
+ }
+
+ if (NextComponent == null && BusAux != null) {
+ BusAux.DoWriteModalResultsICE(time, simulationInterval, container);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/IEPCGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/IEPCGearbox.cs
new file mode 100644
index 0000000000000000000000000000000000000000..ccc88dd5136ce06397fe4332e7eea78e13ed786d
--- /dev/null
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/IEPCGearbox.cs
@@ -0,0 +1,30 @@
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.Simulation;
+using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.OutputData;
+
+namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
+{
+ public class IEPCGearbox : APTNGearbox
+ {
+ public IEPCGearbox(IVehicleContainer container, IShiftStrategy strategy) : base(container, strategy) { }
+
+ protected override void DoWriteModalResults(Second time, Second simulationInterval,
+ IModalDataContainer container)
+ {
+ //var avgInAngularSpeed = (PreviousState.InAngularVelocity + CurrentState.InAngularVelocity) / 2.0;
+ //var avgOutAngularSpeed = (PreviousState.OutAngularVelocity + CurrentState.OutAngularVelocity) / 2.0;
+ //var inPower = CurrentState.InTorque * avgInAngularSpeed;
+ //var outPower = CurrentState.OutTorque * avgOutAngularSpeed;
+ container[ModalResultField.Gear] = Disengaged || DataBus.VehicleInfo.VehicleStopped ? 0 : Gear.Gear;
+ //container[ModalResultField.P_gbx_loss] = inPower - outPower;
+ //container[ModalResultField.P_gbx_inertia] = CurrentState.InertiaTorqueLossOut * avgOutAngularSpeed;
+ //container[ModalResultField.P_gbx_in] = inPower;
+ container[ModalResultField.n_IEPC_out_avg] = (PreviousState.OutAngularVelocity +
+ CurrentState.OutAngularVelocity) / 2.0;
+ container[ModalResultField.T_IEPC_out] = CurrentState.OutTorque;
+ //container[ModalResultField.T_gbx_in] = CurrentState.InTorque;
+ _strategy.WriteModalResults(container);
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/MTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/MTShiftStrategy.cs
index deb1e9e501dc01f49fca3b719b2a722e986611b8..a390b6d8ab318b5caaf021e84ac9d27b70293490 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/MTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/MTShiftStrategy.cs
@@ -29,6 +29,9 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.DataBus;
@@ -44,5 +47,93 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
public new static string Name => "MT Shift Strategy";
+
+ protected override GearshiftPosition DoCheckUpshift(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity,
+ NewtonMeter inTorque, PerSecond inAngularVelocity, GearshiftPosition currentGear, IResponse response1)
+ {
+ // upshift
+ if (IsAboveUpShiftCurve(currentGear, inTorque, inAngularVelocity)) {
+ currentGear = Gears.Successor(currentGear);
+
+ while (SkipGears && currentGear.Gear < GearboxModelData.Gears.Count) {
+ currentGear = Gears.Successor(currentGear);
+ var tmpGear = Gearbox.Gear;
+ _gearbox.Gear = currentGear;
+ var response = (ResponseDryRun)_gearbox.Request(absTime, dt, outTorque, outAngularVelocity, true);
+ _gearbox.Gear = tmpGear;
+
+ inAngularVelocity = response.Engine.EngineSpeed; //ModelData.Gears[currentGear].Ratio * outAngularVelocity;
+ inTorque = response.Clutch.PowerRequest / inAngularVelocity;
+
+ var maxTorque = VectoMath.Min(response.Engine.DynamicFullLoadPower / ((DataBus.EngineInfo.EngineSpeed + response.Engine.EngineSpeed) / 2),
+ currentGear.Gear > 1
+ ? GearboxModelData.Gears[currentGear.Gear].ShiftPolygon.InterpolateDownshift(response.Engine.EngineSpeed)
+ : double.MaxValue.SI<NewtonMeter>());
+ var reserve = 1 - inTorque / maxTorque;
+
+ if (reserve >= GearshiftParams.TorqueReserve && IsAboveDownShiftCurve(currentGear, inTorque, inAngularVelocity)) {
+ continue;
+ }
+
+ currentGear = Gears.Predecessor(currentGear);
+ break;
+ }
+ }
+
+ // early up shift to higher gear ---------------------------------------
+ if (EarlyShiftUp && currentGear.Gear < GearboxModelData.Gears.Count) {
+ // try if next gear would provide enough torque reserve
+ var tryNextGear = Gears.Successor(currentGear);
+ var tmpGear = Gearbox.Gear;
+ _gearbox.Gear = tryNextGear;
+ var response = (ResponseDryRun)_gearbox.Request(absTime, dt, outTorque, outAngularVelocity, true);
+ _gearbox.Gear = tmpGear;
+
+ inAngularVelocity = GearboxModelData.Gears[tryNextGear.Gear].Ratio * outAngularVelocity;
+ inTorque = response.Clutch.PowerRequest / inAngularVelocity;
+
+ // if next gear supplied enough power reserve: take it
+ // otherwise take
+ if (!IsBelowDownShiftCurve(tryNextGear, inTorque, inAngularVelocity)) {
+ var fullLoadPower = response.Engine.PowerRequest - response.DeltaFullLoad;
+ var reserve = 1 - response.Engine.PowerRequest / fullLoadPower;
+
+ if (reserve >= GearshiftParams.TorqueReserve) {
+ currentGear = tryNextGear;
+ }
+ }
+ }
+ return currentGear;
+ }
+
+ protected override GearshiftPosition DoCheckDownshift(Second absTime, Second dt, NewtonMeter outTorque,
+ PerSecond outAngularVelocity, NewtonMeter inTorque, PerSecond inAngularVelocity, GearshiftPosition currentGear, IResponse response1)
+ {
+ // down shift
+ if (IsBelowDownShiftCurve(currentGear, inTorque, inAngularVelocity)) {
+ currentGear = Gears.Predecessor(currentGear);
+ while (SkipGears && currentGear.Gear > 1) {
+ currentGear = Gears.Predecessor(currentGear);
+ var tmpGear = Gearbox.Gear;
+ _gearbox.Gear = currentGear;
+ var response = (ResponseDryRun)_gearbox.Request(absTime, dt, outTorque, outAngularVelocity, true);
+ _gearbox.Gear = tmpGear;
+
+ inAngularVelocity = GearboxModelData.Gears[currentGear.Gear].Ratio * outAngularVelocity;
+ inTorque = response.Clutch.PowerRequest / inAngularVelocity;
+ var maxTorque = VectoMath.Min(response.Engine.DynamicFullLoadPower / ((DataBus.EngineInfo.EngineSpeed + response.Engine.EngineSpeed) / 2),
+ currentGear.Gear > 1
+ ? GearboxModelData.Gears[currentGear.Gear].ShiftPolygon.InterpolateDownshift(response.Engine.EngineSpeed)
+ : double.MaxValue.SI<NewtonMeter>());
+ var reserve = maxTorque.IsEqual(0) ? -1 : (1 - inTorque / maxTorque).Value();
+ if (reserve >= GearshiftParams.TorqueReserve && IsBelowUpShiftCurve(currentGear, inTorque, inAngularVelocity)) {
+ continue;
+ }
+ currentGear = Gears.Successor(currentGear);
+ break;
+ }
+ }
+ return currentGear;
+ }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/MaxCardanTorqueLookup.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/MaxCardanTorqueLookup.cs
deleted file mode 100644
index aeb4302e2133dcc71061326587bf8ede374a9b04..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/MaxCardanTorqueLookup.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-using TUGraz.VectoCommon.Utils;
-
-namespace TUGraz.VectoCore.Models.SimulationComponent.Impl {
- public class MaxCardanTorqueLookup
- {
- public Dictionary<uint, List<KeyValuePair<PerSecond, NewtonMeter>>> Data { protected get; set; }
-
- public NewtonMeter Lookup(uint gear, PerSecond engineSpeed)
- {
- return Data[gear].Interpolate(x => x.Key.Value(), y => y.Value, engineSpeed.Value());
- }
- }
-}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/MaxGradabilityLookup.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/MaxGradabilityLookup.cs
deleted file mode 100644
index f89cc3c0246505e73047495966ad0006d6031c8f..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/MaxGradabilityLookup.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using TUGraz.VectoCommon.Utils;
-
-namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
-{
- public class MaxGradabilityLookup
- {
- protected internal Dictionary<uint, Tuple<Radian, Radian>> _data;
-
- public Dictionary<uint, Tuple<Radian, Radian>> Data
- {
- set { _data = value; }
- }
-
- public Radian GradabilityMaxTorque(uint gear)
- {
- return _data[gear].Item1;
- }
-
- public Radian GradabilityLimitedTorque(uint gear)
- {
- return _data[gear].Item2;
- }
- }
-}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
index 10c099c6556a4eacc0f7857ea50f570c915088d3..c441b6e66c7928b1ab0d838551784293e8e1a6e6 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
@@ -49,6 +49,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
private SimpleCharger TestContainerElectricSystemCharger;
private double EMRatio;
+ protected PowertrainPosition EMPos;
public static string Name => "AMT - EffShift (BEV)";
@@ -60,6 +61,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
if (dataBus.RunData.VehicleData == null) {
return;
}
+
+ EMPos = dataBus.RunData.ElectricMachinesData.FirstOrDefault(x =>
+ x.Item1 == PowertrainPosition.BatteryElectricE2 || x.Item1 == PowertrainPosition.IEPC)?.Item1 ?? PowertrainPosition.HybridPositionNotSet;
SetupVelocityDropPreprocessor(dataBus);
}
@@ -71,50 +75,45 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
if (runData.VehicleData == null) {
return;
}
+ EMPos = runData.ElectricMachinesData.FirstOrDefault(x =>
+ x.Item1 == PowertrainPosition.BatteryElectricE2 || x.Item1 == PowertrainPosition.IEPC)?.Item1 ?? PowertrainPosition.HybridPositionNotSet;
+
GearboxModelData = runData.GearboxData;
GearshiftParams = runData.GearshiftParameters;
GearList = GearboxModelData.GearList;
MaxStartGear = GearList.Reverse().First();
VoltageLevels = runData.ElectricMachinesData
- .FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2)?.Item2.EfficiencyData;
+ .FirstOrDefault(x => x.Item1 == EMPos)?.Item2.EfficiencyData;
-
-
- TransmissionRatio = runData.AxleGearData.AxleGear.Ratio *
+ TransmissionRatio = (runData.AxleGearData?.AxleGear.Ratio ?? 1.0) * // axlegeardata may be null for certain IEPC configurations
(runData.AngledriveData?.Angledrive.Ratio ?? 1.0) /
runData.VehicleData.DynamicTyreRadius;
- //var minEngineSpeed = (runData.EngineData.FullLoadCurves[0].RatedSpeed - runData.EngineData.IdleSpeed) *
- // Constants.SimulationSettings.ClutchClosingSpeedNorm + runData.EngineData.IdleSpeed;
-
-
if (shiftStrategyParameters == null) {
throw new VectoException("Parameters for shift strategy missing!");
}
- var em = runData.ElectricMachinesData.First(x => x.Item1 == PowertrainPosition.BatteryElectricE2).Item2;
+ var em = runData.ElectricMachinesData.First(x => x.Item1 == EMPos).Item2;
EMRatio = em.RatioADC;
DeRatedShiftpolygons = CalculateDeratedShiftLines(em,
runData.GearboxData.InputData.Gears, runData.VehicleData.DynamicTyreRadius,
- runData.AxleGearData.AxleGear.Ratio, runData.GearboxData.Type);
+ runData.AxleGearData?.AxleGear.Ratio ?? 1.0, runData.GearboxData.Type);
}
protected void SetupVelocityDropPreprocessor(IVehicleContainer dataBus)
{
var runData = dataBus.RunData;
// MQ: 2019-11-29 - fuel used here has no effect as this is the modDatacontainer for the test-powertrain only!
- var modData = new ModalDataContainer(runData, null, null);
- var builder = new PowertrainBuilder(modData);
TestContainer = new SimplePowertrainContainer(runData);
- builder.BuildSimplePowertrainElectric(runData, TestContainer);
+ PowertrainBuilder.BuildSimplePowertrainElectric(runData, TestContainer);
TestContainerGbx = TestContainer.GearboxCtl as Gearbox;
TestContainerBattery = TestContainer.BatteryInfo as Battery;
TestContainerBatterySystem = TestContainer.BatteryInfo as BatterySystem;
TestContainerSuperCap = TestContainer.BatteryInfo as SuperCap;
TestContainerElectricSystemCharger = (TestContainer.ElectricSystemInfo as ElectricSystem)?.Charger.FirstOrDefault(x => x is SimpleCharger) as SimpleCharger ;
TestContainerElectricMotor =
- TestContainer.ElectricMotorInfo(PowertrainPosition.BatteryElectricE2) as ElectricMotor;
+ TestContainer.ElectricMotorInfo(EMPos) as ElectricMotor;
if (TestContainerGbx == null) {
throw new VectoException("Unknown gearboxtype: {0}", TestContainer.GearboxCtl.GetType().FullName);
}
@@ -161,30 +160,31 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
IList<ITransmissionInputData> gearData, Meter rDyn, double axleGearRatio, GearboxType gearboxType)
{
var retVal = new Dictionary<uint, ShiftPolygon>();
- var emFld = em.EfficiencyData.VoltageLevels.First().FullLoadCurve;
- var contTqFld = new ElectricMotorFullLoadCurve(new List<ElectricMotorFullLoadCurve.FullLoadEntry>() {
- new ElectricMotorFullLoadCurve.FullLoadEntry() {
- MotorSpeed = 0.RPMtoRad(),
- FullDriveTorque = -em.Overload.ContinuousTorque,
- FullGenerationTorque = em.Overload.ContinuousTorque
- },
- new ElectricMotorFullLoadCurve.FullLoadEntry() {
- MotorSpeed = 1.1 * emFld.MaxSpeed,
- FullDriveTorque = -em.Overload.ContinuousTorque,
- FullGenerationTorque = em.Overload.ContinuousTorque
- }
- });
- var limitedFld = AbstractSimulationDataAdapter.IntersectEMFullLoadCurves(emFld, contTqFld);
- var limitedEm = new ElectricMotorData() {
- EfficiencyData = new VoltageLevelData() {
- VoltageLevels = new List<ElectricMotorVoltageLevelData>() {
- new ElectricMotorVoltageLevelData() {
- FullLoadCurve = limitedFld
+ for (var i = 0u; i < gearData.Count; i++) {
+ var emFld = em.EfficiencyData.VoltageLevels.First().FullLoadCurve;
+ var contTqFld = new ElectricMotorFullLoadCurve(new List<ElectricMotorFullLoadCurve.FullLoadEntry>() {
+ new ElectricMotorFullLoadCurve.FullLoadEntry() {
+ MotorSpeed = 0.RPMtoRad(),
+ FullDriveTorque = -em.Overload.ContinuousTorque,
+ FullGenerationTorque = em.Overload.ContinuousTorque
+ },
+ new ElectricMotorFullLoadCurve.FullLoadEntry() {
+ MotorSpeed = 1.1 * emFld.MaxSpeed,
+ FullDriveTorque = -em.Overload.ContinuousTorque,
+ FullGenerationTorque = em.Overload.ContinuousTorque
+ }
+ });
+ var limitedFld = AbstractSimulationDataAdapter.IntersectEMFullLoadCurves(emFld, contTqFld);
+ var limitedEm = new ElectricMotorData() {
+ EfficiencyData = new VoltageLevelData() {
+ VoltageLevels = new List<ElectricMotorVoltageLevelData>() {
+ new ElectricMotorVoltageLevelData() {
+ FullLoadCurve = limitedFld
+ }
}
}
- }
- };
- for (var i = 0u; i < gearData.Count; i++) {
+ };
+
var shiftPolygon = ComputeDeclarationShiftPolygon((int)i,
gearData, axleGearRatio,
rDyn, limitedEm, shiftStrategyParameters.PEV_DeRatedDownshiftSpeedFactor * emFld.RatedSpeed,
@@ -337,7 +337,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
DataBus.VehicleInfo.VehicleSpeed - vDrop * shiftStrategyParameters.VelocityDropFactor;
var totalTransmissionRatio =
- DataBus.ElectricMotorInfo(PowertrainPosition.BatteryElectricE2).ElectricMotorSpeed /
+ DataBus.ElectricMotorInfo(EMPos).ElectricMotorSpeed /
DataBus.VehicleInfo.VehicleSpeed;
var results = new List<Tuple<GearshiftPosition, double>>();
@@ -352,10 +352,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
continue;
}
- var estimatedEngineSpeed = (vehicleSpeedPostShift * (totalTransmissionRatio /
- GearboxModelData.Gears[currentGear.Gear].Ratio *
- GearboxModelData.Gears[tryNextGear.Gear].Ratio))
- .Cast<PerSecond>();
+ var estimatedEngineSpeed = vehicleSpeedPostShift * (totalTransmissionRatio /
+ GearboxModelData.Gears[currentGear.Gear].Ratio * GearboxModelData.Gears[tryNextGear.Gear].Ratio);
if (estimatedEngineSpeed.IsSmaller(shiftStrategyParameters.MinEngineSpeedPostUpshift)) {
continue;
}
@@ -561,7 +559,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var engineSpeed = response.ElectricMotor.AngularVelocity;
- var fcCurRes = VoltageLevels.LookupElectricPower(DataBus.BatteryInfo.InternalVoltage, engineSpeed, tqCurrent / EMRatio, true);
+ var fcCurRes = VoltageLevels.LookupElectricPower(DataBus.BatteryInfo.InternalVoltage, engineSpeed, tqCurrent / EMRatio, currentGear, true);
if (fcCurRes.Extrapolated) {
Log.Warn(
"EffShift Strategy: Extrapolation of power consumption for current gear! n: {0}, Tq: {1}",
@@ -597,15 +595,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
TestContainerSuperCap?.Initialize(DataBus.BatteryInfo.StateOfCharge);
- if (TestContainerElectricSystemCharger != null) {
- TestContainerElectricSystemCharger.ChargingPower = (DataBus.ElectricSystemInfo.ChargePower);
- }
+ TestContainerElectricSystemCharger?.UpdateFrom(DataBus.ElectricSystemInfo.ChargePower);
+
//var pos = ModelData.ElectricMachinesData.FirstOrDefault().Item1;
TestContainerElectricMotor.ThermalBuffer =
- (DataBus.ElectricMotorInfo(PowertrainPosition.BatteryElectricE2) as ElectricMotor).ThermalBuffer;
+ (DataBus.ElectricMotorInfo(EMPos) as ElectricMotor).ThermalBuffer;
TestContainerElectricMotor.DeRatingActive =
- (DataBus.ElectricMotorInfo(PowertrainPosition.BatteryElectricE2) as ElectricMotor).DeRatingActive;
+ (DataBus.ElectricMotorInfo(EMPos) as ElectricMotor).DeRatingActive;
TestContainer.GearboxOutPort.Initialize(outTorque, outAngularVelocity);
var response = (ResponseDryRun)TestContainer.GearboxOutPort.Request(
@@ -621,7 +618,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return InitStartGear(absTime, outTorque, outAngularVelocity);
}
- var emE2 = DataBus.ElectricMotorInfo(PowertrainPosition.BatteryElectricE2) as ElectricMotor;
+ var emE2 = DataBus.ElectricMotorInfo(EMPos) as ElectricMotor;
if (emE2 is null) {
throw new VectoException("PEV Shift Strategy requires electric motor at position E2");
}
@@ -654,7 +651,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var emSpeeds = new Dictionary<GearshiftPosition, Tuple<PerSecond, PerSecond, double>>();
- var emE2 = DataBus.ElectricMotorInfo(PowertrainPosition.BatteryElectricE2) as ElectricMotor;
+ var emE2 = DataBus.ElectricMotorInfo(EMPos) as ElectricMotor;
if (emE2 is null) {
throw new VectoException("PEV Shift Strategy requires electric motor at position E2");
}
@@ -790,7 +787,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
return
(outAngularSpeed * GearboxModelData.Gears[gear.Gear].Ratio).IsGreaterOrEqual(VectoMath.Min(GearboxModelData.Gears[gear.Gear].MaxSpeed,
- DataBus.ElectricMotorInfo(PowertrainPosition.BatteryElectricE2).MaxSpeed));
+ DataBus.ElectricMotorInfo(EMPos).MaxSpeed));
}
public void Disengage(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity) { }
@@ -827,7 +824,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
DataBus = dataBus;
ElectricMotorData = dataBus.RunData.ElectricMachinesData
- .First(x => x.Item1 == PowertrainPosition.BatteryElectricE2).Item2;
+ .First(x => x.Item1 == PowertrainPosition.BatteryElectricE2 || x.Item1 == PowertrainPosition.IEPC).Item2;
GearboxModelData = dataBus.RunData.GearboxData;
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVGearbox.cs
index 84df366005d118702710010045c3b416c58598fd..772ce783eeee00481780ddf3269408f3fae772f8 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVGearbox.cs
@@ -34,7 +34,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
NextComponent.Request(absTime, Constants.SimulationSettings.TargetTimeInterval, inTorque,
inAngularVelocity, true); //NextComponent.Initialize(inTorque, inAngularVelocity);
- var fullLoad = -DataBus.ElectricMotorInfo(PowertrainPosition.BatteryElectricE2).MaxPowerDrive(DataBus.BatteryInfo.InternalVoltage, inAngularVelocity);
+ var fullLoad = -DataBus.ElectricMotorInfo(PowertrainPosition.BatteryElectricE2).MaxPowerDrive(DataBus.BatteryInfo.InternalVoltage, inAngularVelocity, Gear);
Gear = oldGear;
return new ResponseDryRun(this, response) {
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVPTO.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVPTO.cs
new file mode 100644
index 0000000000000000000000000000000000000000..6fcfa4e524f0f8cd5cdd627bc3b55c17aef410ee
--- /dev/null
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVPTO.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
+using TUGraz.VectoCore.Models.Connector.Ports;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.Simulation;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.OutputData;
+
+namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
+{
+ public class PEVPTO : StatefulProviderComponent<PEVPTO.State, ITnOutPort, ITnInPort, ITnOutPort>,
+ IPowerTrainComponent, ITnInPort, ITnOutPort
+ {
+ public class State
+ {
+ public Dictionary<string, NewtonMeter> PowerDemands { get; set; }
+ public PerSecond OutAngularVelocity { get; set; }
+ }
+
+ protected readonly Dictionary<string, Func<PerSecond, Second, Second, bool, NewtonMeter>> Auxiliaries =
+ new Dictionary<string, Func<PerSecond, Second, Second, bool, NewtonMeter>>();
+
+ public PEVPTO(IVehicleContainer container) : base(container)
+ {
+
+ }
+
+ public void AddConstant(string auxId, NewtonMeter torqueLoss)
+ {
+ Add(auxId, (nEng, absTime, dt, dryRun) => torqueLoss);
+ }
+
+ public void Add(string auxId, Func<PerSecond, Second, Second, bool, NewtonMeter> torqueLossFunction)
+ {
+ Auxiliaries[auxId] = torqueLossFunction;
+ }
+
+ #region Implementation of ITnOutPort
+
+ public IResponse Initialize(NewtonMeter outTorque, PerSecond outAngularVelocity)
+ {
+ PreviousState.OutAngularVelocity = outAngularVelocity;
+ var torqueLoss = outAngularVelocity.IsEqual(0)
+ ? 0.SI<NewtonMeter>()
+ : ComputeTorqueLoss(0.SI<Second>(), Constants.SimulationSettings.TargetTimeInterval, outAngularVelocity,
+ false);
+
+ return NextComponent.Initialize(outTorque + torqueLoss, outAngularVelocity);
+ }
+
+ public IResponse Request(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity, bool dryRun)
+ {
+ var avgAngularSpeed = PreviousState.OutAngularVelocity != null
+ ? (outAngularVelocity + PreviousState.OutAngularVelocity) / 2.0
+ : outAngularVelocity;
+
+ var torqueLoss = 0.SI<NewtonMeter>();
+ if (!DataBus.GearboxInfo.GearEngaged(absTime)) {
+ var powerDemands = new Dictionary<string, NewtonMeter>(Auxiliaries.Count);
+ foreach (var aux in Auxiliaries) {
+ powerDemands[aux.Key] = 0.SI<NewtonMeter>();
+ }
+ if (!dryRun) {
+ CurrentState.PowerDemands = powerDemands;
+ }
+ } else {
+ if (outAngularVelocity != null && !avgAngularSpeed.IsEqual(0)) {
+ torqueLoss = ComputeTorqueLoss(absTime, dt, avgAngularSpeed, dryRun);
+ }
+ }
+
+ if (!dryRun) {
+ CurrentState.OutAngularVelocity = outAngularVelocity;
+ }
+
+ return NextComponent.Request(absTime, dt, outTorque + torqueLoss, outAngularVelocity, dryRun);
+ }
+
+
+ #endregion
+
+ private NewtonMeter ComputeTorqueLoss(Second absTime, Second dt, PerSecond avgAngularSpeed, bool dryRun)
+ {
+ var powerDemands = new Dictionary<string, NewtonMeter>(Auxiliaries.Count);
+ foreach (var item in Auxiliaries) {
+ var value = item.Value(avgAngularSpeed, absTime, dt, dryRun);
+ if (value != null) {
+ powerDemands[item.Key] = value;
+ }
+ }
+ if (!dryRun) {
+ CurrentState.PowerDemands = powerDemands;
+ }
+
+ return powerDemands.Sum(kv => kv.Value) ?? 0.SI<NewtonMeter>();
+ }
+
+
+ #region Overrides of VectoSimulationComponent
+
+ protected override void DoWriteModalResults(Second time, Second simulationInterval, IModalDataContainer container)
+ {
+ var avgAngularSpeed = PreviousState.OutAngularVelocity != null
+ ? (CurrentState.OutAngularVelocity + PreviousState.OutAngularVelocity) / 2.0
+ : CurrentState.OutAngularVelocity;
+ foreach (var kv in CurrentState.PowerDemands) {
+ container[kv.Key] = kv.Value * avgAngularSpeed;
+ }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimplePowertrainContainer.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimplePowertrainContainer.cs
index b50f7d7e463308645f0d49080b280db24bd2c79d..2696b4904738e581962df417053be2ebe788e12e 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimplePowertrainContainer.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimplePowertrainContainer.cs
@@ -36,5 +36,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl {
public MeterPerSecond NextBrakeTriggerSpeed => 0.SI<MeterPerSecond>();
#endregion
+
+ public void UpdateComponents(IDataBus realContainer) => UpdateComponentsInternal(realContainer);
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/SingleSpeedGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/SingleSpeedGearbox.cs
new file mode 100644
index 0000000000000000000000000000000000000000..f52817d0e253d6a7063b64dd4c23058fc1e160e3
--- /dev/null
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/SingleSpeedGearbox.cs
@@ -0,0 +1,90 @@
+using System.Linq;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.Simulation;
+using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
+using TUGraz.VectoCore.OutputData;
+
+namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
+{
+
+ public class SingleSpeedGearbox : TransmissionComponent, IGearbox
+ {
+ protected GearData GearData;
+
+ public SingleSpeedGearbox(IVehicleContainer container, GearboxData modelData) : base(container,
+ modelData.Gears.First().Value)
+ {
+ GearboxType = modelData.Type;
+ Gear = new GearshiftPosition(1);
+ TCLocked = true;
+ GearData = modelData.Gears.First().Value;
+ }
+
+ public override IResponse Request(
+ Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity,
+ bool dryRun)
+ {
+ var retVal = base.Request(absTime, dt, outTorque, outAngularVelocity, dryRun);
+ retVal.Gearbox.PowerRequest = outTorque * (PreviousState.OutAngularVelocity + outAngularVelocity) / 2.0;
+ retVal.Gearbox.OutputTorque = outTorque;
+ retVal.Gearbox.OutputSpeed = outAngularVelocity;
+
+
+
+ return retVal;
+ }
+
+ #region Overrides of VectoSimulationComponent
+
+ protected override void DoWriteModalResults(Second time, Second simulationInterval,
+ IModalDataContainer container)
+ {
+ container[ModalResultField.Gear] = Gear.Gear;
+ }
+
+ #endregion
+
+ #region Implementation of IGearboxInfo
+
+ public GearboxType GearboxType { get; }
+ public GearshiftPosition Gear { get; }
+ public bool TCLocked { get; }
+
+ public Watt GearboxLoss()
+ {
+ //MQ: 2022-05-18: single-speed gearbox is only used in IEPC as 'virtual component' without losses
+ return 0.SI<Watt>();
+ }
+
+ public Second LastShift { get; }
+ public Second LastUpshift { get; }
+ public Second LastDownshift { get; }
+
+ public GearData GetGearData(uint gear)
+ {
+ return GearData;
+ }
+
+ public GearshiftPosition NextGear { get; }
+ public Second TractionInterruption { get; }
+ public uint NumGears { get; }
+ public bool DisengageGearbox { get; set; }
+
+ public void TriggerGearshift(Second absTime, Second dt)
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public bool GearEngaged(Second absTime)
+ {
+ return true;
+ }
+
+ public bool RequestAfterGearshift { get; set; }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs
index 96aba3d63c58f420e2ce372c5339f89f38aef03b..767422c91aa53f0880cf6065c23500d7ca7827a2 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs
@@ -12,7 +12,7 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
- public class StopStartCombustionEngine : CombustionEngine
+ public class StopStartCombustionEngine : CombustionEngine, IUpdateable
{
private WattSecond EngineStartEnergy;
@@ -230,6 +230,19 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
container[ModalResultField.P_WHR_mech_map] = 0.SI<Watt>();
container[ModalResultField.P_WHR_mech_corr] = 0.SI<Watt>();
}
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other)
+ {
+ if (other is CombustionEngine e) {
+ PreviousState = e.PreviousState;
+ return EngineAux.UpdateFrom(e.EngineAux);
+ }
+ return false;
+ }
+
+ #endregion
}
public class SimplePowerrtrainCombustionEngine : StopStartCombustionEngine
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/SuperCap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/SuperCap.cs
index 041129065c6396b2a5e366e47eb03ed60b4fb1ea..bd0aa3e00d4bf82bdd00556b0eab86401e3b57a1 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/SuperCap.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/SuperCap.cs
@@ -13,7 +13,7 @@ using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
- public class SuperCap : StatefulVectoSimulationComponent<SuperCap.State>, IElectricEnergyStorage, IElectricEnergyStoragePort
+ public class SuperCap : StatefulVectoSimulationComponent<SuperCap.State>, IElectricEnergyStorage, IElectricEnergyStoragePort, IUpdateable
{
private SuperCapData ModelData;
@@ -199,6 +199,21 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public Watt MaxChargePower;
public Watt MaxDischargePower;
public Watt InternalLoss;
+
+ public State Clone() => (State)MemberwiseClone();
}
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is SuperCap o) {
+ PreviousState = o.PreviousState.Clone();
+ return true;
+ }
+
+ return false;
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
index 54955db39f6ae5d4f853fbce13c490398f3040a3..a623f26eedf2044e766d7e7c05c453880c21ea40 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
@@ -49,7 +49,7 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
public class TorqueConverter : StatefulVectoSimulationComponent<TorqueConverter.TorqueConverterComponentState>,
- ITnInPort, ITnOutPort, ITorqueConverter
+ ITnInPort, ITnOutPort, ITorqueConverter, IUpdateable
{
protected readonly IGearboxInfo Gearbox;
protected readonly IShiftStrategy ShiftStrategy;
@@ -506,6 +506,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
public TorqueConverterOperatingPoint OperatingPoint;
public bool IgnitionOn;
+
+ public new TorqueConverterComponentState Clone() => (TorqueConverterComponentState)base.Clone();
}
#region Implementation of ITorqueConverterControl
@@ -520,6 +522,18 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public TorqueConverterOperatingPoint SetOperatingPoint { get; set; }
+ #endregion
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is TorqueConverter tc) {
+ PreviousState = tc.PreviousState.Clone();
+ return true;
+ }
+ return false;
+ }
+
#endregion
}
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/TransmissionComponent.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/TransmissionComponent.cs
index adf81d3165fcf0300cfa043f492587fe38e414da..8c7603946fdbaaa6331829a66a17f4e65ead80e2 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/TransmissionComponent.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/TransmissionComponent.cs
@@ -49,6 +49,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
public TransmissionLossMap.LossMapResult TorqueLossResult;
//public NewtonMeter TorqueLoss = 0.SI<NewtonMeter>();
+ public new TransmissionState Clone() => (TransmissionState)MemberwiseClone();
}
protected TransmissionComponent(IVehicleContainer container, TransmissionData modelData) : base(container)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
index f910fa535413d41bf50afa4c4151199798964654..3d5576124f99d3047c1eb40808b9881fcb7e42ca 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
@@ -47,8 +47,7 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
public class Vehicle : StatefulProviderComponent<Vehicle.VehicleState, IDriverDemandOutPort, IFvInPort, IFvOutPort>,
- IVehicle, IMileageCounter, IFvInPort,
- IDriverDemandOutPort
+ IVehicle, IMileageCounter, IFvInPort, IDriverDemandOutPort, IUpdateable
{
internal readonly VehicleData ModelData;
@@ -116,9 +115,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
ratio = DataBus.AxlegearInfo.Ratio;
}
- if (pos == PowertrainPosition.BatteryElectricE2) {
+ if (pos == PowertrainPosition.BatteryElectricE2 || pos == PowertrainPosition.IEPC) {
ratio = DataBus.GearboxInfo.GetGearData(DataBus.GearboxInfo.NumGears).Ratio *
- DataBus.AxlegearInfo.Ratio *
+ (DataBus.AxlegearInfo?.Ratio ?? 1.0) *
(DataBus.AngledriveInfo?.Ratio ?? 1.0);
}
MaxVehicleSpeed = maxEMSpeed / ratio * DataBus.WheelsInfo.DynamicTyreRadius * 0.995;
@@ -280,6 +279,21 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
$"slope_res: {SlopeResistance}, " +
$"air_drag: {AirDragResistance}, " +
$"traction force: {VehicleTractionForce}";
+
+ public VehicleState Clone() => (VehicleState)MemberwiseClone();
+ }
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is Vehicle v) {
+ PreviousState = v.PreviousState.Clone();
+ MaxVehicleSpeed = v.MaxVehicleSpeed;
+ return true;
+ }
+ return false;
}
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs
index 03fb6648e233379500a2e8a419192c62b33d9d2b..f73c9e3ed27a7a2360fa0498f5bfd571bced6bce 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs
@@ -70,7 +70,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var modData = container.ModalData as ModalDataContainer;
var runData = container.RunData;
var ratio = 1.0 / runData.VehicleData.DynamicTyreRadius *
- runData.AxleGearData.AxleGear.Ratio *
+ (runData.AxleGearData?.AxleGear.Ratio ?? 1.0) * // alxlegear may be null for certain IEPC configurations
(runData.AngledriveData?.Angledrive.Ratio ?? 1.0);
var tmp = new List<Entry>();
@@ -217,7 +217,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected override PerSecond GetMotorTargetSpeed(VectoRunData runData)
{
var em = runData.ElectricMachinesData
- .FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2);
+ .FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2 || x.Item1 == PowertrainPosition.IEPC);
if (em == null) {
throw new VectoException("E2 EM required for PEV E2 GearshiftPreprocessing");
}
@@ -228,7 +228,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected override PerSecond GetMaxMotorspeed(VectoRunData runData)
{
var em = runData.ElectricMachinesData
- .FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2);
+ .FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2 || x.Item1 == PowertrainPosition.IEPC);
if (em == null) {
throw new VectoException("E2 EM required for PEV E2 GearshiftPreprocessing");
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Wheels.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Wheels.cs
index 6afaf44cc2d0eb9b8d351fdc9c4eeb73e37b070c..fa96f336de519ac769a24c0706f64a8097b3f752 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Wheels.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Wheels.cs
@@ -40,7 +40,7 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
public class Wheels : StatefulProviderComponent<Wheels.WheelsState, IFvOutPort, ITnInPort, ITnOutPort>, IWheels,
- IFvOutPort, ITnInPort
+ IFvOutPort, ITnInPort, IUpdateable
{
private readonly KilogramSquareMeter _totalWheelsInertia;
@@ -49,6 +49,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public PerSecond AngularVelocity;
public NewtonMeter TorqueIn;
public NewtonMeter InertiaTorqueLoss;
+
+ public WheelsState Clone() => (WheelsState)MemberwiseClone();
}
public Wheels(IVehicleContainer cockpit, Meter rdyn, KilogramSquareMeter totalWheelsInertia)
@@ -96,5 +98,17 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public Kilogram ReducedMassWheels => (_totalWheelsInertia / DynamicTyreRadius / DynamicTyreRadius).Cast<Kilogram>();
public Meter DynamicTyreRadius { get; }
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is Wheels w) {
+ PreviousState = w.PreviousState.Clone();
+ return true;
+ }
+ return false;
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/GensetPreprocessor.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/GensetPreprocessor.cs
index dce109a26ab15efe8b83981c4c0838a3bb92cdc0..482ca5efcb65763c62576d0c9e7db9a9e29fe037 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/GensetPreprocessor.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/GensetPreprocessor.cs
@@ -10,6 +10,7 @@ using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
+using TUGraz.VectoCore.Models.SimulationComponent.Impl;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
@@ -54,17 +55,17 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
.FullLoadEntries.Select(x =>
new ElectricMotorFullLoadCurve.FullLoadEntry() {
FullGenerationTorque =
- Genset.ElectricMotor.ConvertEmTorqueToDrivetrain(x.MotorSpeed, VectoMath.Min(continuousTq ,x.FullGenerationTorque)),
+ Genset.ElectricMotor.ConvertEmTorqueToDrivetrain(x.MotorSpeed, VectoMath.Min(continuousTq ,x.FullGenerationTorque), false),
FullDriveTorque =
- Genset.ElectricMotor.ConvertEmTorqueToDrivetrain(x.MotorSpeed, VectoMath.Max(-continuousTq, x.FullDriveTorque)),
+ Genset.ElectricMotor.ConvertEmTorqueToDrivetrain(x.MotorSpeed, VectoMath.Max(-continuousTq, x.FullDriveTorque), false),
MotorSpeed = Genset.ElectricMotor.ConvertEmSpeedToDrivetrain(x.MotorSpeed)
}).Where(x => x.MotorSpeed.IsSmallerOrEqual(maxSpeed)).ToList());
if (!emFldDrivetrain.FullLoadEntries.Any(x => x.MotorSpeed.IsEqual(maxSpeed))) {
emFldDrivetrain.FullLoadEntries.Add(new ElectricMotorFullLoadCurve.FullLoadEntry() {
FullGenerationTorque =
- Genset.ElectricMotor.ConvertEmTorqueToDrivetrain(maxSpeed, VectoMath.Min(continuousTq, emFldDrivetrain.FullGenerationTorque(maxSpeed))),
+ Genset.ElectricMotor.ConvertEmTorqueToDrivetrain(maxSpeed, VectoMath.Min(continuousTq, emFldDrivetrain.FullGenerationTorque(maxSpeed)), false),
FullDriveTorque =
- Genset.ElectricMotor.ConvertEmTorqueToDrivetrain(maxSpeed, VectoMath.Max(-continuousTq, emFldDrivetrain.FullLoadDriveTorque(maxSpeed))),
+ Genset.ElectricMotor.ConvertEmTorqueToDrivetrain(maxSpeed, VectoMath.Max(-continuousTq, emFldDrivetrain.FullLoadDriveTorque(maxSpeed)), false),
MotorSpeed = maxSpeed
});
}
@@ -154,7 +155,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
try {
Genset.ElectricMotor.Initialize(0.SI<NewtonMeter>(), speed);
- var tq = Genset.ElectricMotor.GetTorqueForElectricPower(voltage, pwr, speed * EmData.RatioADC, dt);
+ var tq = Genset.ElectricMotor.GetTorqueForElectricPower(voltage, pwr, speed * EmData.RatioADC, dt, new GearshiftPosition(0), false);
if (tq == null || tq.IsSmallerOrEqual(0)) {
continue;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
index 627b76836238251d1788b9801e01521bed48afdc..065d7794dc52d609e6d9805b110d34d60d2e2665 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
@@ -6,7 +6,6 @@ using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
-using TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation;
@@ -36,10 +35,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
grad = 2;
}
- var modData = new ModalDataContainer(runData, null, null);
- var builder = new PowertrainBuilder(modData);
var testContainer = new SimplePowertrainContainer(runData);
- builder.BuildSimpleHybridPowertrain(runData, testContainer);
+ PowertrainBuilder.BuildSimpleHybridPowertrain(runData, testContainer);
return new VelocitySpeedGearshiftPreprocessor(VelocityDropData, runData.GearboxData.TractionInterruption,
testContainer, -grad, grad);
@@ -47,44 +44,18 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
protected override IResponse RequestDryRun(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity, GearshiftPosition nextGear, HybridStrategyResponse cfg)
{
- if (DataBus.VehicleInfo.VehicleStopped) {
- TestPowertrain.Gearbox.Gear = Controller.ShiftStrategy.NextGear;
- }
- else if (PreviousState.GearboxEngaged) {
- TestPowertrain.Gearbox.Gear = DataBus.GearboxInfo.Gear;
- } else {
- TestPowertrain.Gearbox.Gear = Controller.ShiftStrategy.NextGear;
- }
+ TestPowertrain.UpdateComponents();
+ TestPowertrain.Gearbox.Gear = DataBus.VehicleInfo.VehicleStopped ? Controller.ShiftStrategy.NextGear : PreviousState.GearboxEngaged ? DataBus.GearboxInfo.Gear : Controller.ShiftStrategy.NextGear;
TestPowertrain.Gearbox.Disengaged = !nextGear.Engaged;
TestPowertrain.Gearbox.DisengageGearbox = !nextGear.Engaged;
TestPowertrain.Container.VehiclePort.Initialize(DataBus.VehicleInfo.VehicleSpeed, DataBus.DrivingCycleInfo.RoadGradient ?? 0.SI<Radian>());
TestPowertrain.HybridController.ApplyStrategySettings(cfg);
TestPowertrain.HybridController.Initialize(Controller.PreviousState.OutTorque, Controller.PreviousState.OutAngularVelocity);
- TestPowertrain.Clutch.Initialize(DataBus.ClutchInfo.ClutchLosses);
- TestPowertrain.Battery?.Initialize(DataBus.BatteryInfo.StateOfCharge);
- if (TestPowertrain.Battery != null) {
- TestPowertrain.Battery.PreviousState.PulseDuration =
- (DataBus.BatteryInfo as Battery).PreviousState.PulseDuration;
- }
- if (TestPowertrain.BatterySystem != null) {
- var batSystem = DataBus.BatteryInfo as BatterySystem;
- foreach (var bsKey in batSystem.Batteries.Keys) {
- for (var i = 0; i < batSystem.Batteries[bsKey].Batteries.Count; i++) {
- TestPowertrain.BatterySystem.Batteries[bsKey].Batteries[i]
- .Initialize(batSystem.Batteries[bsKey].Batteries[i].StateOfCharge);
- }
- }
- TestPowertrain.BatterySystem.PreviousState.PulseDuration =
- (DataBus.BatteryInfo as BatterySystem).PreviousState.PulseDuration;
- }
- TestPowertrain.SuperCap?.Initialize(DataBus.BatteryInfo.StateOfCharge);
TestPowertrain.Brakes.BrakePower = DataBus.Brakes.BrakePower;
-
- var currentGear = DataBus.VehicleInfo.VehicleStopped ? Controller.ShiftStrategy.NextGear : PreviousState.GearboxEngaged ? DataBus.GearboxInfo.Gear : Controller.ShiftStrategy.NextGear;
-
- if (nextGear.Engaged && !nextGear.Equals(currentGear)) {
+
+ if (nextGear.Engaged && !nextGear.Equals(TestPowertrain.Gearbox.Gear)) {
if (!AllowEmergencyShift && ModelData.GearboxData.Gears[nextGear.Gear].Ratio > ModelData.GearshiftParameters.RatioEarlyUpshiftFC) {
return null;
}
@@ -97,11 +68,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
return null;
}
- var vDrop = DataBus.VehicleInfo.VehicleSpeed - estimatedVelocityPostShift;
- var vehicleSpeedPostShift = estimatedVelocityPostShift; // DataBus.VehicleInfo.VehicleSpeed - vDrop * ModelData.GearshiftParameters.VelocityDropFactor;
TestPowertrain.Gearbox.Gear = nextGear;
- var init = TestPowertrain.Container.VehiclePort.Initialize(
- vehicleSpeedPostShift, DataBus.DrivingCycleInfo.RoadGradient ?? 0.SI<Radian>());
+ var init = TestPowertrain.Container.VehiclePort.Initialize(estimatedVelocityPostShift, DataBus.DrivingCycleInfo.RoadGradient ?? 0.SI<Radian>());
if (!AllowEmergencyShift && init.Engine.EngineSpeed.IsSmaller(ModelData.EngineData.IdleSpeed)) {
return null;
}
@@ -109,68 +77,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
TestPowertrain.Gearbox._nextGear = Controller.ShiftStrategy.NextGear;
TestPowertrain.Gearbox.Disengaged = !nextGear.Engaged;
-
- var combustionEngineInfo = DataBus.EngineInfo as CombustionEngine;
- var enginePrevious = combustionEngineInfo.PreviousState;
- TestPowertrain.CombustionEngine.Initialize(enginePrevious.EngineTorque, enginePrevious.EngineSpeed);
- var testPreviousState = TestPowertrain.CombustionEngine.PreviousState;
- testPreviousState.EngineOn = enginePrevious.EngineOn;
- testPreviousState.EnginePower = enginePrevious.EnginePower;
- testPreviousState.dt = enginePrevious.dt;
- testPreviousState.EngineSpeed = enginePrevious.EngineSpeed;
- testPreviousState.EngineTorque = enginePrevious.EngineTorque;
- testPreviousState.EngineTorqueOut = enginePrevious.EngineTorqueOut;
- testPreviousState.DynamicFullLoadTorque = enginePrevious.DynamicFullLoadTorque;
-
- switch (TestPowertrain.CombustionEngine.EngineAux) {
- case EngineAuxiliary engineAux:
- engineAux.PreviousState.AngularSpeed =
- (combustionEngineInfo.EngineAux as EngineAuxiliary).PreviousState
- .AngularSpeed;
- break;
- case BusAuxiliariesAdapter busAux:
- busAux.PreviousState.AngularSpeed =
- (combustionEngineInfo.EngineAux as BusAuxiliariesAdapter).PreviousState
- .AngularSpeed;
- if (busAux.ElectricStorage is SimpleBattery bat) {
- bat.SOC = (combustionEngineInfo.EngineAux as BusAuxiliariesAdapter)
- .ElectricStorage
- .SOC;
- }
- break;
- }
-
- if (TestPowertrain.DCDCConverter != null) {
- TestPowertrain.DCDCConverter.PreviousState.ConsumedEnergy =
- (DataBus.DCDCConverter as DCDCConverter).PreviousState.ConsumedEnergy;
- }
-
- if (TestPowertrain.WHRCharger != null) {
- TestPowertrain.WHRCharger.PreviousState.GeneratedEnergy =
- DataBus.WHRCharger.PreviousState.GeneratedEnergy;
- TestPowertrain.WHRCharger.PreviousState.ExcessiveEnergy =
- DataBus.WHRCharger.PreviousState.ExcessiveEnergy;
- }
-
- TestPowertrain.Gearbox.PreviousState.InAngularVelocity =
- (DataBus.GearboxInfo as Gearbox).PreviousState.InAngularVelocity;
-
- TestPowertrain.Clutch.PreviousState.InAngularVelocity =
- (DataBus.ClutchInfo as SwitchableClutch).PreviousState.InAngularVelocity;
- TestPowertrain.Clutch.PreviousState.OutAngularVelocity =
- (DataBus.ClutchInfo as SwitchableClutch).PreviousState.OutAngularVelocity;
-
- //}
-
+ TestPowertrain.CombustionEngine.UpdateFrom(DataBus.EngineInfo);
+ TestPowertrain.Gearbox.UpdateFrom(DataBus.GearboxInfo);
+ TestPowertrain.Clutch.UpdateFrom(DataBus.ClutchInfo);
var pos = ModelData.ElectricMachinesData.FirstOrDefault().Item1;
- TestPowertrain.ElectricMotor.ThermalBuffer =
- (DataBus.ElectricMotorInfo(pos) as ElectricMotor).ThermalBuffer;
- TestPowertrain.ElectricMotor.DeRatingActive =
- (DataBus.ElectricMotorInfo(pos) as ElectricMotor).DeRatingActive;
-
+ TestPowertrain.ElectricMotor.UpdateFrom(DataBus.ElectricMotorInfo(pos));
foreach (var emPos in TestPowertrain.ElectricMotorsUpstreamTransmission.Keys) {
- TestPowertrain.ElectricMotorsUpstreamTransmission[pos].PreviousState.EMSpeed =
- DataBus.ElectricMotorInfo(emPos).ElectricMotorSpeed;
+ TestPowertrain.ElectricMotorsUpstreamTransmission[pos].PreviousState.EMSpeed = DataBus.ElectricMotorInfo(emPos).ElectricMotorSpeed;
}
var retVal = TestPowertrain.HybridController.NextComponent.Request(absTime, dt, outTorque, outAngularVelocity, true);
@@ -195,58 +108,28 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
//tmp.FuelCosts = double.NaN; // = Tuple.Create(true, response.Gearbox.Gear - 1);
tmp.IgnoreReason |= HybridConfigurationIgnoreReason.EngineSpeedBelowDownshift;
}
-
-
}
-
}
- // =====================================================
-
-
public class HybridStrategyAT : AbstractHybridStrategy<ATGearbox>
{
+ public HybridStrategyAT(VectoRunData runData, IVehicleContainer vehicleContainer) : base(runData, vehicleContainer)
+ { }
- public HybridStrategyAT(VectoRunData runData, IVehicleContainer vehicleContainer) : base(runData,
- vehicleContainer)
- {
-
- }
-
- protected override IResponse RequestDryRun(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity,
- GearshiftPosition nextGear, HybridStrategyResponse cfg)
+ protected override IResponse RequestDryRun(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity, GearshiftPosition nextGear, HybridStrategyResponse cfg)
{
+ TestPowertrain.UpdateComponents();
+
TestPowertrain.Gearbox.Gear = PreviousState.GearboxEngaged ? DataBus.GearboxInfo.Gear : Controller.ShiftStrategy.NextGear;
TestPowertrain.Gearbox.Disengaged = !nextGear.Engaged;
TestPowertrain.Gearbox.DisengageGearbox = !nextGear.Engaged;
TestPowertrain.Container.VehiclePort.Initialize(DataBus.VehicleInfo.VehicleSpeed, DataBus.DrivingCycleInfo.RoadGradient ?? 0.SI<Radian>());
TestPowertrain.HybridController.ApplyStrategySettings(cfg);
TestPowertrain.HybridController.Initialize(Controller.PreviousState.OutTorque, Controller.PreviousState.OutAngularVelocity);
- // TestPowertrain.Clutch.Initialize(DataBus.ClutchInfo.ClutchLosses);
- TestPowertrain.Battery?.Initialize(DataBus.BatteryInfo.StateOfCharge);
- if (TestPowertrain.Battery != null) {
- TestPowertrain.Battery.PreviousState.PulseDuration =
- (DataBus.BatteryInfo as Battery).PreviousState.PulseDuration;
- }
- if (TestPowertrain.BatterySystem != null) {
- var batSystem = DataBus.BatteryInfo as BatterySystem;
- foreach (var bsKey in batSystem.Batteries.Keys) {
- for (var i = 0; i < batSystem.Batteries[bsKey].Batteries.Count; i++) {
- TestPowertrain.BatterySystem.Batteries[bsKey].Batteries[i]
- .Initialize(batSystem.Batteries[bsKey].Batteries[i].StateOfCharge);
- }
- }
- TestPowertrain.BatterySystem.PreviousState.PulseDuration =
- (DataBus.BatteryInfo as BatterySystem).PreviousState.PulseDuration;
- }
- TestPowertrain.SuperCap?.Initialize(DataBus.BatteryInfo.StateOfCharge);
-
+
TestPowertrain.Brakes.BrakePower = DataBus.Brakes.BrakePower;
-
- var currentGear = PreviousState.GearboxEngaged ? DataBus.GearboxInfo.Gear : Controller.ShiftStrategy.NextGear;
-
- var gearboxInfo = DataBus.GearboxInfo as ATGearbox;
- if (nextGear.Engaged && !nextGear.Equals(currentGear)) {
+
+ if (nextGear.Engaged && !nextGear.Equals(TestPowertrain.Gearbox.Gear)) {
if (!AllowEmergencyShift && ModelData.GearboxData.Gears[nextGear.Gear].Ratio > ModelData.GearshiftParameters.RatioEarlyUpshiftFC) {
return null;
}
@@ -256,130 +139,44 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
}
var vDrop = DataBus.DriverInfo.DriverAcceleration * ModelData.GearshiftParameters.ATLookAheadTime;
- var vehicleSpeedPostShift = (DataBus.VehicleInfo.VehicleSpeed + vDrop * ModelData.GearshiftParameters.VelocityDropFactor).LimitTo(
- 0.KMPHtoMeterPerSecond(), DataBus.DrivingCycleInfo.CycleData.LeftSample.VehicleTargetSpeed);
-
- //var estimatedVelocityPostShift = VelocityDropData.Interpolate(DataBus.VehicleInfo.VehicleSpeed, DataBus.DrivingCycleInfo.RoadGradient ?? 0.SI<Radian>());
- //if (!AllowEmergencyShift && !estimatedVelocityPostShift.IsGreater(DeclarationData.GearboxTCU.MIN_SPEED_AFTER_TRACTION_INTERRUPTION)) {
- // return null;
- //}
-
+ var vehicleSpeedPostShift = (DataBus.VehicleInfo.VehicleSpeed + vDrop * ModelData.GearshiftParameters.VelocityDropFactor).LimitTo(0.KMPHtoMeterPerSecond(), DataBus.DrivingCycleInfo.CycleData.LeftSample.VehicleTargetSpeed);
if (nextGear.TorqueConverterLocked.HasValue && nextGear.TorqueConverterLocked.Value) {
var inAngularVelocity = ModelData.GearboxData.Gears[nextGear.Gear].Ratio * outAngularVelocity;
-
if (inAngularVelocity.IsEqual(0)) {
return null;
}
- var totalTransmissionRatio = inAngularVelocity /
- (DataBus.VehicleInfo.VehicleSpeed +
- DataBus.DriverInfo.DriverAcceleration * dt);
-
+ var totalTransmissionRatio = inAngularVelocity / (DataBus.VehicleInfo.VehicleSpeed + DataBus.DriverInfo.DriverAcceleration * dt);
var estimatedEngineSpeed = (vehicleSpeedPostShift * totalTransmissionRatio).Cast<PerSecond>();
if (estimatedEngineSpeed.IsSmaller(ModelData.GearshiftParameters.MinEngineSpeedPostUpshift)) {
return null;
}
}
- //var vDrop = DataBus.VehicleInfo.VehicleSpeed - estimatedVelocityPostShift;
- //var vehicleSpeedPostShift = estimatedVelocityPostShift; // DataBus.VehicleInfo.VehicleSpeed - vDrop * ModelData.GearshiftParameters.VelocityDropFactor;
TestPowertrain.Gearbox.Gear = nextGear;
TestPowertrain.Gearbox.RequestAfterGearshift = true;
- //var init = TestPowertrain.Container.VehiclePort.Initialize(
- // vehicleSpeedPostShift, DataBus.DrivingCycleInfo.RoadGradient ?? 0.SI<Radian>());
- //if (!AllowEmergencyShift && init.Engine.EngineSpeed.IsSmaller(ModelData.EngineData.IdleSpeed)) {
- // return null;
- //}
} else {
- TestPowertrain.Gearbox.RequestAfterGearshift = gearboxInfo.RequestAfterGearshift;
+ TestPowertrain.Gearbox.RequestAfterGearshift = DataBus.GearboxInfo.RequestAfterGearshift;
}
- //TestPowertrain.Gearbox.ShiftToLocked = (DataBus.GearboxInfo as ATGearbox).ShiftToLocked;
-
+
if (!nextGear.Engaged) {
- //TestPowertrain.Gearbox._nextGear = Controller.ShiftStrategy.NextGear;
TestPowertrain.Gearbox.Disengaged = !nextGear.Engaged;
}
- //if (!PreviousState.GearboxEngaged) {
- var engineInfo = DataBus.EngineInfo as CombustionEngine;
- var enginePrevious = engineInfo.PreviousState;
- TestPowertrain.CombustionEngine.Initialize(enginePrevious.EngineTorque, enginePrevious.EngineSpeed);
- var testEnginePrevious = TestPowertrain.CombustionEngine.PreviousState;
- testEnginePrevious.EngineOn = enginePrevious.EngineOn;
- testEnginePrevious.EnginePower = enginePrevious.EnginePower;
- testEnginePrevious.dt = enginePrevious.dt;
- testEnginePrevious.EngineSpeed = enginePrevious.EngineSpeed;
- testEnginePrevious.EngineTorque = enginePrevious.EngineTorque;
- testEnginePrevious.EngineTorqueOut = enginePrevious.EngineTorqueOut;
- testEnginePrevious.DynamicFullLoadTorque = enginePrevious.DynamicFullLoadTorque;
-
- switch (TestPowertrain.CombustionEngine.EngineAux) {
- case EngineAuxiliary engineAux:
- engineAux.PreviousState.AngularSpeed = (engineInfo.EngineAux as EngineAuxiliary).PreviousState.AngularSpeed;
- break;
- case BusAuxiliariesAdapter busAux:
- busAux.PreviousState.AngularSpeed = (engineInfo.EngineAux as BusAuxiliariesAdapter).PreviousState.AngularSpeed;
- if (busAux.ElectricStorage is SimpleBattery bat) {
- bat.SOC = (engineInfo.EngineAux as BusAuxiliariesAdapter)
- .ElectricStorage
- .SOC;
- }
- break;
- }
-
- if (TestPowertrain.DCDCConverter != null) {
- TestPowertrain.DCDCConverter.PreviousState.ConsumedEnergy =
- (DataBus.DCDCConverter as DCDCConverter).PreviousState.ConsumedEnergy;
- }
-
- if (TestPowertrain.WHRCharger != null) {
- TestPowertrain.WHRCharger.PreviousState.GeneratedEnergy =
- DataBus.WHRCharger.PreviousState.GeneratedEnergy;
- TestPowertrain.WHRCharger.PreviousState.ExcessiveEnergy =
- DataBus.WHRCharger.PreviousState.ExcessiveEnergy;
- }
-
- TestPowertrain.Gearbox.PreviousState.OutAngularVelocity = gearboxInfo.PreviousState.OutAngularVelocity;
- TestPowertrain.Gearbox.PreviousState.InAngularVelocity = gearboxInfo.PreviousState.InAngularVelocity;
- TestPowertrain.Gearbox._powershiftLossEnergy = gearboxInfo._powershiftLossEnergy;
- TestPowertrain.Gearbox.PreviousState.PowershiftLossEnergy = gearboxInfo.PreviousState.PowershiftLossEnergy;
- TestPowertrain.Gearbox.LastShift = gearboxInfo.LastShift;
- TestPowertrain.Gearbox.PreviousState.Gear = gearboxInfo.PreviousState.Gear;
-
+ TestPowertrain.CombustionEngine.UpdateFrom(DataBus.EngineInfo);
+ TestPowertrain.Gearbox.UpdateFrom(DataBus.GearboxInfo);
if (nextGear.TorqueConverterLocked.HasValue && !nextGear.TorqueConverterLocked.Value) {
- var dataBusTorqueConverterInfo = DataBus.TorqueConverterInfo as TorqueConverter;
- var prev = dataBusTorqueConverterInfo.PreviousState;
- var testTCPrevious = TestPowertrain.TorqueConverter.PreviousState;
- testTCPrevious.InAngularVelocity = prev.InAngularVelocity;
- testTCPrevious.InTorque = prev.InTorque;
- testTCPrevious.OutAngularVelocity = prev.OutAngularVelocity;
- testTCPrevious.IgnitionOn = prev.IgnitionOn;
+ TestPowertrain.TorqueConverter.UpdateFrom(DataBus.TorqueConverterInfo);
}
- //TestPowertrain.Clutch.PreviousState.InAngularVelocity =
- // (DataBus.ClutchInfo as SwitchableClutch).PreviousState.InAngularVelocity;
-
- //}
-
var pos = ModelData.ElectricMachinesData.FirstOrDefault().Item1;
- TestPowertrain.ElectricMotor.ThermalBuffer =
- (DataBus.ElectricMotorInfo(pos) as ElectricMotor).ThermalBuffer;
- TestPowertrain.ElectricMotor.DeRatingActive =
- (DataBus.ElectricMotorInfo(pos) as ElectricMotor).DeRatingActive;
-
+ TestPowertrain.ElectricMotor.UpdateFrom(DataBus.ElectricMotorInfo(pos));
foreach (var emPos in TestPowertrain.ElectricMotorsUpstreamTransmission.Keys) {
- TestPowertrain.ElectricMotorsUpstreamTransmission[pos].PreviousState.EMSpeed =
- DataBus.ElectricMotorInfo(emPos).ElectricMotorSpeed;
+ TestPowertrain.ElectricMotorsUpstreamTransmission[pos].PreviousState.EMSpeed = DataBus.ElectricMotorInfo(emPos).ElectricMotorSpeed;
}
try {
- var retVal = TestPowertrain.HybridController.NextComponent.Request(absTime, dt, outTorque,
- outAngularVelocity, false);
-
- //if (retVal.Source is TorqueConverter) {
- // return null;
- //}
-
+ var retVal = TestPowertrain.HybridController.NextComponent.Request(absTime, dt, outTorque, outAngularVelocity, false);
retVal.HybridController.StrategySettings = cfg;
return retVal;
} catch (Exception e) {
@@ -423,64 +220,18 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
}
- //protected virtual bool? CheckUpshiftTcTc(
- // Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity, NewtonMeter inTorque,
- // PerSecond inAngularVelocity, GearshiftPosition gear, GearData currentGear, IResponse response)
- //{
- // // C -> C+1
- // var nextGearPos = GearList.Successor(gear); // GearboxModelData.Gears[gear + 1];
- // var nextGear = ModelData.GearboxData.Gears[nextGearPos.Gear];
- // var gearRatio = nextGear.TorqueConverterRatio / currentGear.TorqueConverterRatio;
- // var minEngineSpeed = VectoMath.Min(700.RPMtoRad(), gearRatio * (DataBus.EngineInfo.EngineN80hSpeed - 150.RPMtoRad()));
-
- // var nextGearboxInSpeed = outAngularVelocity * nextGear.TorqueConverterRatio;
- // var nextGearboxInTorque = outTorque / nextGear.TorqueConverterRatio;
- // var shiftLosses = _gearbox.ComputeShiftLosses(outTorque, outAngularVelocity, nextGearPos) /
- // ModelData.GearboxData.PowershiftShiftTime / nextGearboxInSpeed;
- // nextGearboxInTorque += shiftLosses;
- // var tcOperatingPoint =
- // _gearbox.TorqueConverter.FindOperatingPoint(absTime, dt, nextGearboxInTorque, nextGearboxInSpeed);
-
- // var engineSpeedOverMin = tcOperatingPoint.InAngularVelocity.IsGreater(minEngineSpeed);
- // var avgSpeed = (DataBus.EngineInfo.EngineSpeed + tcOperatingPoint.InAngularVelocity) / 2;
- // var engineMaxTorque = DataBus.EngineInfo.EngineStationaryFullPower(avgSpeed) / avgSpeed;
- // var engineInertiaTorque = Formulas.InertiaPower(
- // DataBus.EngineInfo.EngineSpeed, tcOperatingPoint.InAngularVelocity, ModelData.EngineData.Inertia, dt) / avgSpeed;
- // var engineTorqueBelowMax =
- // tcOperatingPoint.InTorque.IsSmallerOrEqual(engineMaxTorque - engineInertiaTorque);
-
- // var reachableAcceleration =
- // EstimateAcceleration(
- // outAngularVelocity, outTorque, inAngularVelocity, inTorque, gear.Gear, response); // EstimateAccelerationForGear(gear + 1, outAngularVelocity);
- // var minAcceleration = VectoMath.Min(
- // ModelData.GearboxData.TorqueConverterData.CCUpshiftMinAcceleration,
- // DataBus.DriverInfo.DriverAcceleration);
- // var minAccelerationReachable = reachableAcceleration.IsGreaterOrEqual(minAcceleration);
-
- // if (engineSpeedOverMin && engineTorqueBelowMax && minAccelerationReachable) {
- // return true;
- // }
-
- // return null;
- //}
}
- // =====================================================
-
public abstract class AbstractHybridStrategy<T> : LoggingObject, IHybridControlStrategy where T : class, IHybridControlledGearbox, IGearbox
{
-
public class StrategyState
{
public PerSecond AngularVelocity { get; set; }
public HybridStrategyResponse Response { get; set; }
public List<HybridResultEntry> Evaluations;
public HybridResultEntry Solution { get; set; }
-
public bool GearboxEngaged { get; set; }
-
public Second ICEStartTStmp { get; set; }
-
public Second GearshiftTriggerTstmp { get; set; }
public NewtonMeter MaxGbxTq { get; set; }
public bool ICEOn { get; set; }
@@ -570,10 +321,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
* x.FuelData.LowerHeatingValueVecto * StrategyParameters.MinICEOnTime).Value());
// create testcontainer
- var modData = new ModalDataContainer(runData, null, null);
- var builder = new PowertrainBuilder(modData);
var testContainer = new SimplePowertrainContainer(runData);
- builder.BuildSimpleHybridPowertrain(runData, testContainer);
+ PowertrainBuilder.BuildSimpleHybridPowertrain(runData, testContainer);
TestPowertrain = new TestPowertrain<T>(testContainer, DataBus);
@@ -613,18 +362,16 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
GearshiftPosition nextGear;
if (DataBus.VehicleInfo.VehicleStopped) {
nextGear = Controller.ShiftStrategy.NextGear;
- }
- else if (!DataBus.GearboxInfo.GearEngaged(absTime)) {
+ } else if (!DataBus.GearboxInfo.GearEngaged(absTime)) {
nextGear = Controller.ShiftStrategy.NextGear;
- }
- else if (PreviousState.GearboxEngaged) {
+ } else if (PreviousState.GearboxEngaged) {
nextGear = DataBus.GearboxInfo.Gear;
} else {
nextGear = Controller.ShiftStrategy.NextGear;
}
if (DataBus.DriverInfo.DrivingAction == DrivingAction.Accelerate && StrategyParameters.MaxPropulsionTorque?.GetVECTOValueOrDefault(nextGear) != null && DataBus.GearboxInfo.TCLocked) {
-
+
var emOff = new HybridStrategyResponse {
CombustionEngineOn = DataBus.EngineInfo.EngineOn, // AllowICEOff(absTime),
GearboxInNeutral = false,
@@ -697,7 +444,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
case DrivingAction.Halt:
HandleHaltAction(absTime, dt, outTorque, outAngularVelocity, dryRun, eval);
break;
- default: throw new ArgumentOutOfRangeException();
+ default:
+ throw new ArgumentOutOfRangeException();
}
@@ -747,8 +495,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
CurrentState.GearshiftTriggerTstmp = absTime;
}
- DebugData.Add("AHS.R", new { DataBus.DriverInfo.DrivingAction, Evaluations = eval,
- Best = best, RetVal = retVal, DryRun = dryRun });
+ DebugData.Add("AHS.R", new {
+ DataBus.DriverInfo.DrivingAction,
+ Evaluations = eval,
+ Best = best,
+ RetVal = retVal,
+ DryRun = dryRun
+ });
return retVal;
}
@@ -907,7 +660,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
}
var testRequest = RequestDryRun(absTime, dt, outTorque, outAngularVelocity, nextGear, emOff);
if (testRequest != null && testRequest.Engine.EngineSpeed < ModelData.EngineData.FullLoadCurves[0].NTq99hSpeed) {
- var maxGbxTorque = StrategyParameters.MaxPropulsionTorque?.GetVECTOValueOrDefault(nextGear).FullLoadDriveTorque(testRequest.Gearbox.InputSpeed);
+ var maxGbxTorque = StrategyParameters.MaxPropulsionTorque?.GetVECTOValueOrDefault(nextGear)?.FullLoadDriveTorque(testRequest.Gearbox.InputSpeed);
candidates[nextGear] = maxGbxTorque != null
? Tuple.Create(maxGbxTorque * testRequest.Gearbox.InputSpeed, testRequest)
: Tuple.Create(testRequest.Gearbox.InputTorque * testRequest.Gearbox.InputSpeed, testRequest);
@@ -1031,7 +784,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
var isP1 = DataBus.PowertrainInfo.ElectricMotorPositions.Contains(PowertrainPosition.HybridP1);
if (isP1 && (!ModelData.VehicleData.ADAS.EngineStopStart || !isPCC))
return false;
-
+
//normal case: only turn of ICE if ESS is activated and the minimal ICE on time is exceeded.
var MinICEonTimeExceeded = PreviousState.ICEStartTStmp is null
|| absTime.IsGreaterOrEqual(PreviousState.ICEStartTStmp + StrategyParameters.MinICEOnTime);
@@ -1052,12 +805,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
var disengageSpeedThreshold = ModelData.GearboxData.DisengageWhenHaltingSpeed;
// hint: only check for halting speed if vehicle is actually braking to halt.
- var vehiclespeedBelowThreshold = DataBus.VehicleInfo.VehicleSpeed.IsSmaller(disengageSpeedThreshold)
- && (DataBus.DriverInfo.NextBrakeTriggerSpeed?.IsEqual(0) ?? false);
+ var vehiclespeedBelowThreshold = DataBus.VehicleInfo.VehicleSpeed.IsSmaller(disengageSpeedThreshold)
+ && (DataBus.DriverInfo.NextBrakeTriggerSpeed?.IsEqual(0) ?? false);
if (ElectricMotorCanPropellDuringTractionInterruption || DataBus.GearboxInfo.GearEngaged(absTime)) {
- if (vehiclespeedBelowThreshold && emPos.IsOneOf(PowertrainPosition.HybridP2, PowertrainPosition.HybridP1)) {
+ if (vehiclespeedBelowThreshold && emPos.IsOneOf(PowertrainPosition.HybridP2, PowertrainPosition.HybridP1, PowertrainPosition.IHPC)) {
if (DataBus.GearboxInfo.GearboxType.AutomaticTransmission()) {
var firstgear = ResponseEmOff;
firstgear.Gear = GearList.First();
@@ -1074,8 +827,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
GearshiftPosition nextGear;
if (!DataBus.GearboxInfo.GearEngaged(absTime)) {
nextGear = new GearshiftPosition(0);
- }
- else if (PreviousState.GearboxEngaged) {
+ } else if (PreviousState.GearboxEngaged) {
nextGear = DataBus.GearboxInfo.Gear;
} else {
nextGear = Controller.ShiftStrategy.NextGear;
@@ -1106,7 +858,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
var endSpeed = DataBus.VehicleInfo.VehicleSpeed +
DataBus.DriverInfo.DriverAcceleration * ModelData.GearboxData.TractionInterruption;
if (EngineSpeedTooLow(response)
- && DataBus.GearboxInfo.GearboxType.ManualTransmission()
+ && (DataBus.GearboxInfo.GearboxType.ManualTransmission() || DataBus.GearboxInfo.GearboxType == GearboxType.IHPC)
&& endSpeed.IsSmallerOrEqual(disengageSpeedThreshold, 0.1.KMPHtoMeterPerSecond())) {
var responseEmOff = ResponseEmOff;
responseEmOff.Gear = new GearshiftPosition(0);
@@ -1116,7 +868,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
return;
}
- if (GearList.HasPredecessor(nextGear)
+ if (GearList.HasPredecessor(nextGear)
&& EngineSpeedTooLow(response)
&& (!vehiclespeedBelowThreshold || AllowEmergencyShift)) {
// engine speed would fall below idling speed - consider downshift
@@ -1171,7 +923,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
var downshift = ResponseEmOff;
//downshift.Gear = GearList.Predecessor(nextGear);
downshift.Gear = best; // GearList.Predecessor(nextGear);
- downshift.Setting.GearboxInNeutral = best.Gear == 0;
+ downshift.Setting.GearboxInNeutral = best.Gear == 0;
downshift.Setting.ShiftRequired = best.Gear == 0;
eval.Add(downshift);
return;
@@ -1238,7 +990,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
? (maxRecuperationResponse as ResponseDryRun).DeltaDragLoadTorque
: maxRecuperationResponse.Engine.TotalTorqueDemand - maxRecuperationResponse.Engine.DragTorque;
- if (!maxRecuperationResponse.Engine.EngineOn && DataBus.GearboxInfo.GearboxType.AutomaticTransmission()) {
+ var isAPTWithTorqueConverter = DataBus.GearboxInfo.GearboxType.AutomaticTransmission() &&
+ DataBus.GearboxInfo.GearboxType != GearboxType.IHPC;
+ if (!maxRecuperationResponse.Engine.EngineOn && isAPTWithTorqueConverter) {
deltaDragTqMaxRecuperation = maxRecuperationResponse.Gearbox.InputTorque;
}
@@ -1282,7 +1036,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
var deltaDragLoad = disengaged
? (r as ResponseDryRun).DeltaDragLoadTorque
: r.Engine.TotalTorqueDemand - r.Engine.DragTorque;
- if (!r.Engine.EngineOn && DataBus.GearboxInfo.GearboxType.AutomaticTransmission()) {
+ if (!r.Engine.EngineOn && isAPTWithTorqueConverter) {
deltaDragLoad = r.Gearbox.InputTorque;
}
return deltaDragLoad;
@@ -1303,7 +1057,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
var deltaDragLoad = disengaged
? (r as ResponseDryRun).DeltaDragLoadTorque
: r.Engine.TotalTorqueDemand - r.Engine.DragTorque;
- if (!r.Engine.EngineOn && DataBus.GearboxInfo.GearboxType.AutomaticTransmission()) {
+ if (!r.Engine.EngineOn && isAPTWithTorqueConverter) {
deltaDragLoad = r.Gearbox.InputTorque;
}
return deltaDragLoad.Value();
@@ -1325,7 +1079,19 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
}
};
entry.Response = RequestDryRun(absTime, dt, outTorque, outAngularVelocity, nextGear, entry.Setting);
- eval.Add(entry);
+ if (entry.Response.ElectricSystem.ConsumerPower.IsGreater(0)) {
+ eval.Add(entry);
+ } else {
+ // for the found operating point, although recuperating no electric energy is generated. leave EM off
+ var off = ResponseEmOff;
+ if (vehiclespeedBelowThreshold && (emPos == PowertrainPosition.HybridP2 || emPos == PowertrainPosition.HybridP1)) {
+ off.Setting.GearboxInNeutral = true;
+ } else {
+ off.Setting.GearboxInNeutral = PreviousState.Solution?.Setting.GearboxInNeutral ?? false;
+ }
+
+ eval.Add(off);
+ }
} else {
if (emRecuperationTq.IsGreater(0)) {
eval.Add(
@@ -1363,7 +1129,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
return false;
}
- if (DataBus.GearboxInfo.GearboxType.AutomaticTransmission()) {
+ if (DataBus.GearboxInfo.GearboxType.AutomaticTransmission() && DataBus.GearboxInfo.GearboxType != GearboxType.IHPC) {
return firstResponse.Engine.EngineOn
? firstResponse.Engine.EngineSpeed.IsSmaller(ModelData.EngineData.IdleSpeed)
: (firstResponse.Gearbox.InputSpeed?.IsSmaller(ModelData.EngineData.IdleSpeed) ?? false);
@@ -1373,11 +1139,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
private GearshiftPosition FindBestGearForBraking(GearshiftPosition nextGear, IResponse firstResponse)
{
- var endSpeed = DataBus.VehicleInfo.VehicleSpeed +
+ var endSpeed = DataBus.VehicleInfo.VehicleSpeed +
DataBus.DriverInfo.DriverAcceleration * ModelData.GearboxData.TractionInterruption;
-
+
// only disengage if we are actually braking for halting (meaning: next brake trigger speed is 0).
- if (DataBus.GearboxInfo.GearboxType.ManualTransmission()
+ if (DataBus.GearboxInfo.GearboxType.ManualTransmission()
&& (DataBus.DriverInfo.NextBrakeTriggerSpeed?.IsEqual(0) ?? false)
&& endSpeed.IsSmallerOrEqual(ModelData.GearboxData.DisengageWhenHaltingSpeed, 0.1.KMPHtoMeterPerSecond())) {
return new GearshiftPosition(0);
@@ -1764,7 +1530,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
// ICE is off, selected solution has a too low or too high engine speed - keep ICE off
retVal.CombustionEngineOn = false;
}
- if (best.IgnoreReason.EngineSpeedTooLow() && !DataBus.EngineInfo.EngineOn
+ if (best.IgnoreReason.EngineSpeedTooLow() && !DataBus.EngineInfo.EngineOn
&& DataBus.VehicleInfo.VehicleSpeed.IsGreater(ModelData.GearshiftParameters.StartSpeed)) {
// ICE is off, selected solution has a too low or too high engine speed - keep ICE off
retVal.CombustionEngineOn = false;
@@ -1975,9 +1741,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
//var emDriveTorque = ModelData.ElectricMachinesData.Where(x => x.Item1 == emPos).First().Item2.EfficiencyMap
// .LookupTorque(emDrivePower, firstResponse.ElectricMotor.AngularVelocity, maxEmTorque);
- var emDriveTorque = DataBus.ElectricMotorInfo(emPos).GetTorqueForElectricPower(voltage, emDrivePower, firstResponse.ElectricMotor.AngularVelocity, dt);
+ var emDriveTorque = DataBus.ElectricMotorInfo(emPos).GetTorqueForElectricPower(voltage, emDrivePower, firstResponse.ElectricMotor.AngularVelocity, dt, new GearshiftPosition(1), dryRun);
var emDragTorque = ModelData.ElectricMachinesData.First(x => x.Item1 == emPos).Item2
- .DragCurve.Lookup(firstResponse.ElectricMotor.AngularVelocity);
+ .DragCurveLookup(firstResponse.ElectricMotor.AngularVelocity, nextGear);
if (emDriveTorque != null &&
emDriveTorque.IsBetween(
firstResponse.ElectricMotor.MaxRecuperationTorque, firstResponse.ElectricMotor.MaxDriveTorque) &&
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/SerialHybridStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/SerialHybridStrategy.cs
index da5d0c02532ae9f635d672d65fc8538f98eab1cb..78f5fa87f671a6be67ae557651f7615a54b8ba52 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/SerialHybridStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/SerialHybridStrategy.cs
@@ -19,104 +19,47 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
{
-
public class SerialHybridStrategyAT : AbstractSerialHybridStrategy<APTNGearbox>
{
public SerialHybridStrategyAT(VectoRunData runData, IVehicleContainer container) : base(runData, container) { }
#region Overrides of AbstractSerialHybridStrategy<ATGearbox>
- protected override DrivetrainDemand GetDrivetrainPowerDemand(Second absTime, Second dt, NewtonMeter outTorque,
- PerSecond outAngularVelocity, GenSetOperatingPoint maxPowerGenset)
+ protected override DrivetrainDemand GetDrivetrainPowerDemand(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity, GenSetOperatingPoint maxPowerGenset)
{
- if (TestPowertrain.Gearbox != null) {
- var gearboxInfo = DataBus.GearboxInfo as APTNGearbox;
- if (gearboxInfo == null) {
- throw new VectoException("AT Gearbox Required!");
- }
- var currentGear = DataBus.VehicleInfo.VehicleStopped
- ? gearboxInfo.NextGear
- : DataBus.GearboxInfo.Gear;
+ TestPowertrain.UpdateComponents();
- TestPowertrain.Gearbox.PreviousState.InAngularVelocity =
- gearboxInfo.PreviousState.InAngularVelocity;
+ if (TestPowertrain.Gearbox != null) {
+ var gearboxInfo = DataBus.GearboxInfo as APTNGearbox ?? throw new VectoException("AT Gearbox Required!");
+ var currentGear = DataBus.VehicleInfo.VehicleStopped ? gearboxInfo.NextGear : DataBus.GearboxInfo.Gear;
TestPowertrain.Gearbox.Disengaged = gearboxInfo.Disengaged;
TestPowertrain.Gearbox.DisengageGearbox = gearboxInfo.DisengageGearbox;
TestPowertrain.Gearbox.Gear = currentGear;
- TestPowertrain.Gearbox._nextGear = gearboxInfo.NextGear;
- }
- TestPowertrain.Container.VehiclePort.Initialize(DataBus.VehicleInfo.VehicleSpeed, DataBus.DrivingCycleInfo.RoadGradient ?? 0.SI<Radian>());
- (TestPowertrain.Container.VehicleInfo as Vehicle).PreviousState.Velocity =
- (DataBus.VehicleInfo as Vehicle).PreviousState.Velocity;
-
- TestPowertrain.ElectricMotor.ThermalBuffer =
- (DataBus.ElectricMotorInfo(EmPosition) as ElectricMotor).ThermalBuffer;
- TestPowertrain.ElectricMotor.DeRatingActive =
- (DataBus.ElectricMotorInfo(EmPosition) as ElectricMotor).DeRatingActive;
-
- TestPowertrain.Battery?.Initialize(DataBus.BatteryInfo.StateOfCharge);
- if (TestPowertrain.Battery != null) {
- TestPowertrain.Battery.PreviousState.PulseDuration =
- (DataBus.BatteryInfo as Battery).PreviousState.PulseDuration;
- TestPowertrain.Battery.PreviousState.PowerDemand =
- (DataBus.BatteryInfo as Battery).PreviousState.PowerDemand;
- }
- if (TestPowertrain.BatterySystem != null) {
- var batSystem = DataBus.BatteryInfo as BatterySystem;
- foreach (var bsKey in batSystem.Batteries.Keys) {
- for (var i = 0; i < batSystem.Batteries[bsKey].Batteries.Count; i++) {
- TestPowertrain.BatterySystem.Batteries[bsKey].Batteries[i]
- .Initialize(batSystem.Batteries[bsKey].Batteries[i].StateOfCharge);
- }
- }
- TestPowertrain.BatterySystem.PreviousState.PulseDuration =
- (DataBus.BatteryInfo as BatterySystem).PreviousState.PulseDuration;
- TestPowertrain.BatterySystem.PreviousState.PowerDemand = (DataBus.BatteryInfo as BatterySystem).PreviousState.PowerDemand;
- }
-
- TestPowertrain.Charger.ChargingPower = maxPowerGenset.ElectricPower;
-
- if (TestPowertrain.WHRCharger != null) {
- TestPowertrain.WHRCharger.PreviousState.GeneratedEnergy =
- DataBus.WHRCharger.PreviousState.GeneratedEnergy;
- TestPowertrain.WHRCharger.PreviousState.ExcessiveEnergy =
- DataBus.WHRCharger.PreviousState.ExcessiveEnergy;
- }
-
- TestPowertrain.HybridController.Initialize(Controller.PreviousState.OutTorque,
- Controller.PreviousState.OutAngularVelocity);
-
- if (TestPowertrain.Gearbox != null) {
- var gearboxInfo = DataBus.GearboxInfo as APTNGearbox;
- TestPowertrain.Gearbox.PreviousState.OutAngularVelocity = gearboxInfo.PreviousState.OutAngularVelocity;
- TestPowertrain.Gearbox.PreviousState.InAngularVelocity = gearboxInfo.PreviousState.InAngularVelocity;
+ TestPowertrain.Gearbox._nextGear = gearboxInfo.NextGear;
}
-
+ TestPowertrain.Container.VehiclePort.Initialize(DataBus.VehicleInfo.VehicleSpeed, DataBus.DrivingCycleInfo.RoadGradient ?? 0.SI<Radian>());
+ TestPowertrain.Charger.UpdateFrom(maxPowerGenset);
+ TestPowertrain.HybridController.Initialize(Controller.PreviousState.OutTorque, Controller.PreviousState.OutAngularVelocity);
+ TestPowertrain.Gearbox?.UpdateFrom(DataBus.GearboxInfo);
+
TestPowertrain.Brakes.BrakePower = DataBus.Brakes.BrakePower;
- var testResponse =
- TestPowertrain.HybridController.NextComponent.Request(absTime, dt, outTorque, outAngularVelocity, false);
- TestPowertrain.HybridController.ApplyStrategySettings(new HybridStrategyResponse() {
- CombustionEngineOn = false,
- MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>>() {
- {
- EmPosition,
- Tuple.Create(testResponse.ElectricMotor.AvgDrivetrainSpeed, -testResponse.ElectricMotor.TorqueRequest)
- }
+ var testResponse = TestPowertrain.HybridController.NextComponent.Request(absTime, dt, outTorque, outAngularVelocity, false);
+ TestPowertrain.HybridController.ApplyStrategySettings(new HybridStrategyResponse {
+ CombustionEngineOn = false,
+ MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>> {
+ { EmPosition, Tuple.Create(testResponse.ElectricMotor.AvgDrivetrainSpeed, -testResponse.ElectricMotor.TorqueRequest) }
}
});
- var testResponse2 =
- TestPowertrain.HybridController.NextComponent.Request(absTime, dt, outTorque, outAngularVelocity,
- false);
- return new DrivetrainDemand() {
+ var testResponse2 = TestPowertrain.HybridController.NextComponent.Request(absTime, dt, outTorque, outAngularVelocity, false);
+ return new DrivetrainDemand {
AvgEmDrivetrainSpeed = testResponse2.ElectricMotor.AvgDrivetrainSpeed,
EmTorqueDemand = testResponse2.ElectricMotor.TorqueRequest,
ElectricPowerDemand = testResponse2.ElectricSystem.ConsumerPower,
Response = testResponse2
};
}
-
-
+
#endregion
}
@@ -125,89 +68,38 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
public class SerialHybridStrategy : AbstractSerialHybridStrategy<Gearbox>
{
-
-
-
public SerialHybridStrategy(VectoRunData runData, IVehicleContainer container) : base(runData, container) { }
-
-
-
protected override DrivetrainDemand GetDrivetrainPowerDemand(Second absTime, Second dt, NewtonMeter outTorque,
PerSecond outAngularVelocity, GenSetOperatingPoint maxPowerGenset)
{
- if (TestPowertrain.Gearbox != null) {
- var currentGear = DataBus.VehicleInfo.VehicleStopped
- ? (DataBus.GearboxInfo as Gearbox).NextGear
- : DataBus.GearboxInfo.Gear;
-
- TestPowertrain.Gearbox.PreviousState.InAngularVelocity =
- (DataBus.GearboxInfo as Gearbox).PreviousState.InAngularVelocity;
- TestPowertrain.Gearbox.Disengaged = (DataBus.GearboxInfo as Gearbox).Disengaged;
- TestPowertrain.Gearbox.DisengageGearbox = (DataBus.GearboxInfo as Gearbox).DisengageGearbox;
- TestPowertrain.Gearbox.Gear = currentGear;
- TestPowertrain.Gearbox._nextGear = (DataBus.GearboxInfo as Gearbox).NextGear;
- }
- TestPowertrain.Container.VehiclePort.Initialize(DataBus.VehicleInfo.VehicleSpeed, DataBus.DrivingCycleInfo.RoadGradient ?? 0.SI<Radian>());
-
- TestPowertrain.ElectricMotor.ThermalBuffer =
- (DataBus.ElectricMotorInfo(EmPosition) as ElectricMotor).ThermalBuffer;
- TestPowertrain.ElectricMotor.DeRatingActive =
- (DataBus.ElectricMotorInfo(EmPosition) as ElectricMotor).DeRatingActive;
-
- TestPowertrain.Battery?.Initialize(DataBus.BatteryInfo.StateOfCharge);
- if (TestPowertrain.Battery != null) {
- TestPowertrain.Battery.PreviousState.PulseDuration =
- (DataBus.BatteryInfo as Battery).PreviousState.PulseDuration;
- TestPowertrain.Battery.PreviousState.PowerDemand =
- (DataBus.BatteryInfo as Battery).PreviousState.PowerDemand;
- }
- if (TestPowertrain.BatterySystem != null) {
- var batSystem = DataBus.BatteryInfo as BatterySystem;
- foreach (var bsKey in batSystem.Batteries.Keys) {
- for (var i = 0; i < batSystem.Batteries[bsKey].Batteries.Count; i++) {
- TestPowertrain.BatterySystem.Batteries[bsKey].Batteries[i]
- .Initialize(batSystem.Batteries[bsKey].Batteries[i].StateOfCharge);
- }
- }
- TestPowertrain.BatterySystem.PreviousState.PulseDuration =
- (DataBus.BatteryInfo as BatterySystem).PreviousState.PulseDuration;
- TestPowertrain.BatterySystem.PreviousState.PowerDemand = (DataBus.BatteryInfo as BatterySystem).PreviousState.PowerDemand;
- }
-
- TestPowertrain.Charger.ChargingPower = maxPowerGenset.ElectricPower;
+ TestPowertrain.UpdateComponents();
- if (TestPowertrain.WHRCharger != null) {
- TestPowertrain.WHRCharger.PreviousState.GeneratedEnergy =
- DataBus.WHRCharger.PreviousState.GeneratedEnergy;
- TestPowertrain.WHRCharger.PreviousState.ExcessiveEnergy =
- DataBus.WHRCharger.PreviousState.ExcessiveEnergy;
+ if (TestPowertrain.Gearbox != null) {
+ var g = DataBus.GearboxInfo as Gearbox ?? throw new VectoException("AMT Gearbox Required!");
+ TestPowertrain.Gearbox.Disengaged = g.Disengaged;
+ TestPowertrain.Gearbox.DisengageGearbox = g.DisengageGearbox;
+ TestPowertrain.Gearbox.Gear = DataBus.VehicleInfo.VehicleStopped ? g.NextGear : DataBus.GearboxInfo.Gear;
+ TestPowertrain.Gearbox._nextGear = g.NextGear;
}
- TestPowertrain.HybridController.Initialize(Controller.PreviousState.OutTorque,
- Controller.PreviousState.OutAngularVelocity);
+ TestPowertrain.Container.VehiclePort.Initialize(DataBus.VehicleInfo.VehicleSpeed, DataBus.DrivingCycleInfo.RoadGradient ?? 0.SI<Radian>());
+ TestPowertrain.Charger.UpdateFrom(maxPowerGenset);
+ TestPowertrain.HybridController.Initialize(Controller.PreviousState.OutTorque, Controller.PreviousState.OutAngularVelocity);
+ TestPowertrain.Gearbox?.UpdateFrom(DataBus.GearboxInfo);
+
TestPowertrain.Brakes.BrakePower = DataBus.Brakes.BrakePower;
- if (TestPowertrain.Gearbox != null) {
- TestPowertrain.Gearbox.PreviousState.InAngularVelocity =
- (DataBus.GearboxInfo as Gearbox).PreviousState.InAngularVelocity;
- }
- var testResponse =
- TestPowertrain.HybridController.NextComponent.Request(absTime, dt, outTorque, outAngularVelocity, false);
-
- TestPowertrain.HybridController.ApplyStrategySettings(new HybridStrategyResponse() {
+
+ var testResponse = TestPowertrain.HybridController.NextComponent.Request(absTime, dt, outTorque, outAngularVelocity, false);
+ TestPowertrain.HybridController.ApplyStrategySettings(new HybridStrategyResponse {
CombustionEngineOn = false,
- MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>>() {
- {
- EmPosition,
- Tuple.Create(testResponse.ElectricMotor.AvgDrivetrainSpeed, -testResponse.ElectricMotor.TorqueRequest)
- }
+ MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond, NewtonMeter>> {
+ { EmPosition, Tuple.Create(testResponse.ElectricMotor.AvgDrivetrainSpeed, -testResponse.ElectricMotor.TorqueRequest) }
}
});
- var testResponse2 =
- TestPowertrain.HybridController.NextComponent.Request(absTime, dt, outTorque, outAngularVelocity,
- false);
- return new DrivetrainDemand() {
+ var testResponse2 = TestPowertrain.HybridController.NextComponent.Request(absTime, dt, outTorque, outAngularVelocity, false);
+ return new DrivetrainDemand {
AvgEmDrivetrainSpeed = testResponse2.ElectricMotor.AvgDrivetrainSpeed,
EmTorqueDemand = testResponse2.ElectricMotor.TorqueRequest,
ElectricPowerDemand = testResponse2.ElectricSystem.ConsumerPower,
@@ -219,7 +111,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
// =======================================================================
- public abstract class AbstractSerialHybridStrategy<T> : LoggingObject, IHybridControlStrategy where T : class, IHybridControlledGearbox, IGearbox
+ public abstract class AbstractSerialHybridStrategy<T> : LoggingObject, IHybridControlStrategy where T : class, IHybridControlledGearbox, IGearbox
{
public enum StateMachineState
@@ -257,13 +149,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
protected TestPowertrain<T> TestPowertrain;
protected TestGenset TestGenSet;
protected GenSetCharacteristics GenSetCharacteristics;
-
+
protected PowertrainPosition EmPosition;
protected DryRunSolutionState DryRunSolution { get; set; }
- public AbstractSerialHybridStrategy (VectoRunData runData, IVehicleContainer container)
+ public AbstractSerialHybridStrategy(VectoRunData runData, IVehicleContainer container)
{
DataBus = container;
ModelData = runData;
@@ -283,22 +175,24 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
var minGensetPower = emDtData.EfficiencyData.VoltageLevels.First().FullLoadCurve.MaxPower * StrategyParameters.GensetMinOptPowerFactor;
GenSetCharacteristics = new GenSetCharacteristics(minGensetPower);
-
+ runData.GenSet = new VectoRunData.GenSetData() { GenSetCharacteristics = GenSetCharacteristics };
// create testcontainer
- var modData = new ModalDataContainer(runData, null, null);
- var builder = new PowertrainBuilder(modData);
var testContainer = new SimplePowertrainContainer(runData);
- builder.BuildSimpleSerialHybridPowertrain(runData, testContainer);
+ if (runData.JobType == VectoSimulationJobType.IEPC_S) {
+ PowertrainBuilder.BuildSimpleIEPCHybridPowertrain(runData, testContainer);
+ } else {
+ PowertrainBuilder.BuildSimpleSerialHybridPowertrain(runData, testContainer);
+ }
- TestPowertrain = new TestPowertrain<T>(testContainer, DataBus);
+ TestPowertrain = new TestPowertrain<T>(testContainer, DataBus);
- var gensetContainer = new SimplePowertrainContainer(runData);
- builder.BuildSimpleGenSet(runData, gensetContainer);
+ var gensetContainer = new SimplePowertrainContainer(runData);
+ PowertrainBuilder.BuildSimpleGenSet(runData, gensetContainer);
TestGenSet = new TestGenset(gensetContainer, DataBus);
-
- container.AddPreprocessor(new GensetPreprocessor(GenSetCharacteristics ,TestGenSet, runData.EngineData,
+
+ container.AddPreprocessor(new GensetPreprocessor(GenSetCharacteristics, TestGenSet, runData.EngineData,
runData.ElectricMachinesData.FirstOrDefault(x => x.Item1 == PowertrainPosition.GEN)?.Item2));
}
@@ -315,7 +209,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
}
GenSetCharacteristics.ContinuousTorque = ModelData.ElectricMachinesData
- .FirstOrDefault(x => x.Item1 == EmPosition)?.Item2.Overload.ContinuousTorque ?? 0.SI<NewtonMeter>();
+ .FirstOrDefault(x => x.Item1 == EmPosition)?.Item2.Overload.ContinuousTorque ?? 0.SI<NewtonMeter>();
PreviousState.AngularVelocity = outAngularVelocity;
PreviousState.SMState = DataBus.BatteryInfo.StateOfCharge > StrategyParameters.TargetSoC
@@ -419,7 +313,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
genSetOperatingPoint = MaxGensetPower(absTime, dt, drivetrainDemand, maxPowerGenset, gensetState);
emTorque = TestPowertrain.ElectricMotor.GetTorqueForElectricPower(
DataBus.BatteryInfo.InternalVoltage, drivetrainDemand.Response.ElectricSystem.MaxPowerDrive,
- drivetrainDemand.Response.ElectricMotor.AngularVelocity, dt);
+ drivetrainDemand.Response.ElectricMotor.AngularVelocity, dt, DataBus.GearboxInfo?.Gear ?? new GearshiftPosition(0), dryRun);
if (emTorque == null) {
emTorque = -emResponse.MaxDriveTorque;
} else {
@@ -543,22 +437,21 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
}
return ApproachGensetOperatingPoint(absTime, dt, gensetLimit, gensetState);
-
+
}
public GenSetOperatingPoint GensetOff => new
- GenSetOperatingPoint
- {
- ICEOn = false,
- ICESpeed = ModelData.EngineData.IdleSpeed,
- ICETorque = null,
- EMTorque = null
- };
+ GenSetOperatingPoint {
+ ICEOn = false,
+ ICESpeed = ModelData.EngineData.IdleSpeed,
+ ICETorque = null,
+ EMTorque = null
+ };
public GenSetOperatingPoint GensetIdle => new GenSetOperatingPoint() {
- ICEOn = true,
+ ICEOn = true,
ICESpeed = ModelData.EngineData.IdleSpeed,
- ICETorque = 0.SI<NewtonMeter>(),
+ ICETorque = 0.SI<NewtonMeter>(),
EMTorque = null,
};
@@ -596,7 +489,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
break;
case StateMachineState.Acc_S1:
if (/*DataBus.BatteryInfo.StateOfCharge >= StrategyParameters.MinSoC &&*/
- DataBus.BatteryInfo.StateOfCharge < StrategyParameters.TargetSoC
+ DataBus.BatteryInfo.StateOfCharge < StrategyParameters.MinSoC
&& -drivetrainDemand.ElectricPowerDemand >
optimalGensetPoint.ElectricPower) {
return StateMachineState.Acc_S2;
@@ -608,14 +501,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
break;
case StateMachineState.Acc_S2:
- if (DataBus.BatteryInfo.StateOfCharge >= StrategyParameters.TargetSoC) {
- return StateMachineState.Acc_S0;
+ if (DataBus.BatteryInfo.StateOfCharge > StrategyParameters.MinSoC) {
+ return StateMachineState.Acc_S1;
}
-
- if (DataBus.BatteryInfo.StateOfCharge >= StrategyParameters.MinSoC &&
- DataBus.BatteryInfo.StateOfCharge < StrategyParameters.TargetSoC
- && -drivetrainDemand.ElectricPowerDemand <=
- optimalGensetPoint.ElectricPower) {
+ if (DataBus.BatteryInfo.StateOfCharge < StrategyParameters.MinSoC &&
+ -drivetrainDemand.ElectricPowerDemand < optimalGensetPoint.ElectricPower) {
return StateMachineState.Acc_S1;
}
break;
@@ -717,7 +607,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
var iceSpeed = op.ICESpeed;
var emTqDt = op.ICETorque;
-
+
TestGenSet.ElectricMotorCtl.EMTorque = emTqDt;
var r1 = TestGenSet.ElectricMotor.Request(absTime, dt, 0.SI<NewtonMeter>(), iceSpeed);
@@ -768,10 +658,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
}
if (rampUp && r1 is ResponseSuccess && r1.Engine.TotalTorqueDemand.IsSmaller(r1.Engine.DynamicFullLoadTorque)) {
- TestGenSet.ElectricMotorCtl.EMTorque = r1.Engine.DynamicFullLoadTorque * 0.1;
- var tmp = TestGenSet.ElectricMotor.Request(absTime, dt, 0.SI<NewtonMeter>(), iceSpeed, true) as ResponseDryRun;
- (emTqDt, iceSpeed, r1) = SearchEMTorque(absTime, dt, iceSpeed, r1.Engine.DynamicFullLoadTorque * 0.1, tmp.DeltaFullLoad);
- }
+ TestGenSet.ElectricMotorCtl.EMTorque = r1.Engine.DynamicFullLoadTorque * 0.1;
+ var tmp = TestGenSet.ElectricMotor.Request(absTime, dt, 0.SI<NewtonMeter>(), iceSpeed, true) as ResponseDryRun;
+ (emTqDt, iceSpeed, r1) = SearchEMTorque(absTime, dt, iceSpeed, r1.Engine.DynamicFullLoadTorque * 0.1, tmp.DeltaFullLoad);
+ }
if (r1 is ResponseSuccess && emTqDt != null && !emTqDt.IsBetween(
r1.ElectricMotor.MaxDriveTorque ?? 0.SI<NewtonMeter>(),
@@ -857,8 +747,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
return (tqDt, iceSpeed, r1);
}
-
-
+
+
public IResponse AmendResponse(IResponse response, Second absTime, Second dt, NewtonMeter outTorque,
PerSecond outAngularVelocity, bool dryRun)
{
@@ -870,7 +760,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
CurrentState.ICEOn = DataBus.EngineCtl.CombustionEngineOn;
PreviousState = CurrentState;
CurrentState = new StrategyState();
-
+
AllowEmergencyShift = false;
}
@@ -885,12 +775,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
public void OperatingpointChangedDuringRequest(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity,
bool dryRun, IResponse retVal)
{
-
+
}
public void RepeatDrivingAction(Second absTime)
{
-
+
}
#endregion
@@ -951,8 +841,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
public GenSetOperatingPoint OptimalPoint
{
- get
- {
+ get {
if (_optimalPoint == null) {
var tmp = OptimalPoints.Values.SelectMany(x => x).Where(x => x.ElectricPower > MinGensetPower).ToArray();
if (!tmp.Any()) {
@@ -967,8 +856,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
public GenSetOperatingPoint OptimalPointDeRated
{
- get
- {
+ get {
if (_optimalPointDerated == null) {
var tmp = OptimalPoints.Values.SelectMany(x => x).Where(x => x.EMTorque.IsSmaller(ContinuousTorque)).Where(x => x.ElectricPower > MinGensetPower).ToArray();
if (!tmp.Any()) {
@@ -977,7 +865,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
.Where(x => x.EMTorque.IsSmaller(ContinuousTorque)).ToArray();
}
-
+
_optimalPointDerated = tmp.MinBy(x => x.FuelConsumption / x.ElectricPower);
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/TestPowertrain.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/TestPowertrain.cs
index bb876d51366a5361b32a22d93fda98059e165df5..e198f3a774097cf830318e2bfc940f4a71a842da 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/TestPowertrain.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/TestPowertrain.cs
@@ -43,6 +43,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
public class TestPowertrain<T> where T: class, IHybridControlledGearbox, IGearbox
{
public SimplePowertrainContainer Container;
+ public IDataBus RealContainer;
+
public T Gearbox;
public SimpleHybridController HybridController;
@@ -63,6 +65,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
public TestPowertrain(SimplePowertrainContainer container, IDataBus realContainer)
{
Container = container;
+ RealContainer = realContainer;
+
Gearbox = Container.GearboxCtl as T;
HybridController = Container.HybridController as SimpleHybridController;
@@ -75,13 +79,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
ElectricMotor = container.ElectricMotors.FirstOrDefault().Value as ElectricMotor;
Charger = ((ElectricMotor?.ElectricPower as ElectricSystem)?.Charger.FirstOrDefault(x => x is GensetChargerAdapter)) as GensetChargerAdapter;
foreach (var pos in container.ElectricMotorPositions) {
- if (pos == PowertrainPosition.HybridP1 || pos == PowertrainPosition.HybridP2 ||
+ if (pos == PowertrainPosition.HybridP1 || pos == PowertrainPosition.HybridP2 || pos == PowertrainPosition.IHPC ||
pos == PowertrainPosition.HybridP2_5 || pos == PowertrainPosition.HybridP3) {
ElectricMotorsUpstreamTransmission[pos] = container.ElectricMotors[pos] as ElectricMotor;
}
}
- if (Gearbox != null && Gearbox.GearboxType.AutomaticTransmission() && Gearbox.GearboxType != GearboxType.APTN) {
+ if (Gearbox != null && Gearbox.GearboxType.AutomaticTransmission() && Gearbox.GearboxType != GearboxType.APTN && Gearbox.GearboxType != GearboxType.IHPC) {
TorqueConverter = Container.TorqueConverterInfo as TorqueConverter;
if (TorqueConverter == null) {
throw new VectoException("Torque converter missing for automatic transmission: {0}", Container.TorqueConverterInfo?.GetType().FullName);
@@ -110,9 +114,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
}
//Brakes = new MockBrakes(container);
}
+
+ public void UpdateComponents() => Container.UpdateComponents(RealContainer);
}
- public class MockBrakes : VectoSimulationComponent, IBrakes
+ public class MockBrakes : VectoSimulationComponent, IBrakes, IUpdateable
{
public MockBrakes(IVehicleContainer container) : base(container)
{
@@ -138,6 +144,19 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
public Watt BrakePower { get; set; }
#endregion
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is IBrakes b) {
+ BrakePower = b.BrakePower;
+ return true;
+ }
+
+ return false;
+ }
+
+ #endregion
}
public class MockDrivingCycle : VectoSimulationComponent, IDrivingCycleInfo
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/SwitchableClutch.cs b/VectoCore/VectoCore/Models/SimulationComponent/SwitchableClutch.cs
index 9b8d9bbe851ce95fcb5c2485e95e731f112560f8..3cd054bcf8f9e1c86fea271a987f5f89928b9d9b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/SwitchableClutch.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/SwitchableClutch.cs
@@ -142,5 +142,18 @@ namespace TUGraz.VectoCore.Models.SimulationComponent
#endregion
#endregion
+
+ #region Implementation of IUpdateable
+
+ public override bool UpdateFrom(object other) {
+ if (other is SwitchableClutch c) {
+ PreviousState = c.PreviousState.Clone();
+ ClutchOpen = c.ClutchOpen;
+ return true;
+ }
+ return false;
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs b/VectoCore/VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs
index 6034fcc178a0acbfad280038e40008ae0210f9ea..584ab68d22ca69ffa46a0092261c4c7de4e6bfda 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs
@@ -145,5 +145,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent
OutTorque = outTorque;
OutAngularVelocity = outAngularVelocity;
}
+
+ public SimpleComponentState Clone() => (SimpleComponentState)MemberwiseClone();
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs b/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
index ed368bc1c4a2c94b2ea74d4a2a6ba2c431664348..3ea6c57d0560151765e54711886ded5b7af82d18 100644
--- a/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
+++ b/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
@@ -41,6 +41,7 @@ using TUGraz.VectoCore.OutputData.XML;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9;
using TUGraz.VectoCore.OutputData.XML.ComponentWriter;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1;
using TUGraz.VectoCore.OutputData.XML.Engineering;
using TUGraz.VectoCore.OutputData.XML.GroupWriter;
@@ -92,6 +93,8 @@ namespace TUGraz.VectoCore
LoadModule<MRFNinjectModule>();
LoadModule<CIFNinjectModule>();
+ LoadModule<VIFNinjectModule>();
+
#if (MOCKUP) //TODO: add second constant for release
diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
index d3d1e1f2871e74d26b87b45f9eba681b29515ed4..d72c196e6f3a646ec6985da39dd8a58fef454ecb 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
@@ -23,6 +23,7 @@ public class JSONFileWriter : IOutputFileWriter
public const int VehicleFormatVersion = 8;
public const int BusVehicleFormatVersion = 9;
public const int HEV_BEVVehicleFormatVersion = 10;
+ public const int IEPCVehicleFormatVersion = 11;
#endregion
@@ -34,10 +35,14 @@ public class JSONFileWriter : IOutputFileWriter
private const int BEVVectoJobFormatVersion = 9;
private const int SHEVVectoJobFormatVersion = 11;
+ private const int IEPCVectoJobFormatVersion = 12;
+ private const int IHPCVectoJobFormatVersion = 13;
#endregion
private const int ElectricMotorFormatVersion = 5;
+
+ private const int IEPCFormatVersion = 1;
private const int REESSFormatVersion = 1;
@@ -71,36 +76,126 @@ public class JSONFileWriter : IOutputFileWriter
var header = GetHeader(ElectricMotorFormatVersion);
var body = new Dictionary<string, object> {
- { "SavedInDeclMode", declMode },
- { "Model", electricMachine.Model },
- { "Inertia", electricMachine.Inertia.Value() },
- { "ThermalOverloadRecoveryFactor", electricMachine.OverloadRecoveryFactor }
+ { JsonKeys.SavedInDeclMode, declMode },
+ { JsonKeys.Component_Model, electricMachine.Model },
+ { JsonKeys.Engine_Inertia, electricMachine.Inertia.Value() },
+ { JsonKeys.EM_ThermalOverloadRecoveryFactor, electricMachine.OverloadRecoveryFactor }
};
+ var vlevels = GetVoltageLevelEntries(electricMachine.VoltageLevels, filename);
+ body.Add(JsonKeys.EM_DragCurve, GetRelativePath(electricMachine.DragCurve.Source, Path.GetDirectoryName(filename)));
+
+ body.Add(JsonKeys.EM_VoltageLevels, vlevels);
+ WriteFile(header, body, filename);
+ }
+
+ public void SaveIHPC(IElectricMotorEngineeringInputData electricMachine, string filename, bool declMode)
+ {
+ var header = GetHeader(ElectricMotorFormatVersion);
+
+ var body = new Dictionary<string, object> {
+ { JsonKeys.SavedInDeclMode, declMode },
+ { JsonKeys.Component_Model, electricMachine.Model },
+ { JsonKeys.EM_DragCurve, GetRelativePath(electricMachine.DragCurve.Source, Path.GetDirectoryName(filename))},
+ { JsonKeys.Engine_Inertia, electricMachine.Inertia.Value() },
+ { JsonKeys.EM_ThermalOverloadRecoveryFactor, electricMachine.OverloadRecoveryFactor }
+ };
+
+ var vlevels = GetVoltageLevelEntries(electricMachine.VoltageLevels, filename);
+ body.Add(JsonKeys.EM_VoltageLevels, vlevels);
+ WriteFile(header, body, filename);
+ }
+
+ private List<Dictionary<string, object>> GetVoltageLevelEntries(IList<IElectricMotorVoltageLevel> voltageLevels, string filename)
+ {
var vlevels = new List<Dictionary<string, object>>();
- foreach (var entry in electricMachine.VoltageLevels) {
+ foreach (var entry in voltageLevels.OrderBy(x => x.VoltageLevel))
+ {
var vlevel = new Dictionary<string, object> {
- { "Voltage", entry.VoltageLevel.Value() },
- { "ContinuousTorque", entry.ContinuousTorque.Value() },
- { "ContinuousTorqueSpeed", entry.ContinuousTorqueSpeed.AsRPM },
- { "OverloadTorque", entry.OverloadTorque.Value() },
- { "OverloadTorqueSpeed", entry.OverloadTestSpeed.AsRPM },
- { "OverloadTime", entry.OverloadTime.Value() },
- { "FullLoadCurve", GetRelativePath(entry.FullLoadCurve.Source, Path.GetDirectoryName(filename)) }
+ { JsonKeys.EM_Voltage, entry.VoltageLevel.Value() },
+ { JsonKeys.EM_ContinuousTorque, entry.ContinuousTorque.Value() },
+ { JsonKeys.EM_ContinuousTorqueSpeed, entry.ContinuousTorqueSpeed.AsRPM },
+ { JsonKeys.EM_OverloadTorque, entry.OverloadTorque.Value() },
+ { JsonKeys.EM_OverloadTorqueSpeed, entry.OverloadTestSpeed.AsRPM },
+ { JsonKeys.EM_OverloadTime, entry.OverloadTime.Value() },
+ { JsonKeys.EM_FullLoadCurve, GetRelativePath(entry.FullLoadCurve.Source, Path.GetDirectoryName(filename)) }
};
var powerMaps = new Dictionary<int, object>();
- foreach (var pMap in entry.PowerMap) {
+ foreach (var pMap in entry.PowerMap.OrderBy(x => x.Gear))
+ {
powerMaps.Add(pMap.Gear, GetRelativePath(pMap.PowerMap.Source, Path.GetDirectoryName(filename)));
}
- vlevel.Add("EfficiencyMap", powerMaps); //PowerMap
+ vlevel.Add(JsonKeys.EM_EfficiencyMap, powerMaps); //PowerMap
vlevels.Add(vlevel);
}
- body.Add("DragCurve", GetRelativePath(electricMachine.DragCurve.Source, Path.GetDirectoryName(filename)));
+
+ return vlevels;
+ }
+
+
+ public void SaveIEPC(IIEPCEngineeringInputData iepc, string filename, bool declMode)
+ {
+ var header = GetHeader(IEPCFormatVersion);
+
+ var body = new Dictionary<string, object>
+ {
+ {JsonKeys.SavedInDeclMode, declMode},
+ {JsonKeys.Component_Model, iepc.Model},
+ {JsonKeys.IEPC_Inertia, iepc.Inertia.Value()},
+ {JsonKeys.IEPC_DifferentialIncluded, iepc.DifferentialIncluded},
+ {JsonKeys.IEPC_DesignTypeWheelMotor, iepc.DesignTypeWheelMotor},
+ {JsonKeys.IEPC_NrOfDesignTypeWheelMotorMeasured, iepc.NrOfDesignTypeWheelMotorMeasured},
+ {JsonKeys.IEPC_ThermalOverloadRecoveryFactor, iepc.OverloadRecoveryFactor}
+ };
+
+ var gears = new List<Dictionary<string, object>>();
+
+ foreach (var gear in iepc.Gears.OrderBy(x => x.GearNumber)) {
+ var currentGear = new Dictionary<string, object> {
+ { JsonKeys.Gearbox_Gear_Ratio, gear.Ratio }
+ };
+ if(gear.MaxOutputShaftTorque != null)
+ currentGear.Add(JsonKeys.Gearbox_Gear_MaxOutShaftTorque, gear.MaxOutputShaftTorque.Value());
+ if(gear.MaxOutputShaftSpeed != null)
+ currentGear.Add(JsonKeys.Gearbox_Gear_MaxOutShaftSpeed, gear.MaxOutputShaftSpeed.AsRPM);
+ gears.Add(currentGear);
+ }
+
+ var voltageLevels = new List<Dictionary<string, object>>();
+ foreach (var voltageLevel in iepc.VoltageLevels.OrderBy(x => x.VoltageLevel)) {
+ var currentLevel = new Dictionary<string, object>
+ {
+ {JsonKeys.IEPC_Voltage, voltageLevel.VoltageLevel.Value()},
+ {JsonKeys.IEPC_ContinuousTorque, voltageLevel.ContinuousTorque.Value()},
+ {JsonKeys.IEPC_ContinuousTorqueSpeed, Convert.ToDouble(voltageLevel.ContinuousTorqueSpeed.AsRPM.ToString())},
+ {JsonKeys.IEPC_OverloadTorque, voltageLevel.OverloadTorque.Value()},
+ {JsonKeys.IEPC_OverloadTorqueSpeed,Convert.ToDouble(voltageLevel.OverloadTestSpeed.AsRPM.ToString())},
+ {JsonKeys.IEPC_OverloadTime, voltageLevel.OverloadTime.Value()},
+ {JsonKeys.IEPC_FullLoadCurve, GetRelativePath(voltageLevel.FullLoadCurve.Source, Path.GetDirectoryName(filename))},
+
+ };
+ var powerMaps = new Dictionary<string, object>();
+ foreach (var pMap in voltageLevel.PowerMap.OrderBy(x => x.Gear))
+ {
+ powerMaps.Add(pMap.Gear.ToString(), GetRelativePath(pMap.PowerMap.Source, Path.GetDirectoryName(filename)));
+ }
+ currentLevel.Add(JsonKeys.IEPC_PowerMaps, powerMaps); //PowerMap
+ voltageLevels.Add(currentLevel);
+ }
- body.Add("VoltageLevels", vlevels);
+ var dragCurves = new Dictionary<string, object>();
+ foreach (var dragCurveEntry in iepc.DragCurves.OrderBy(x => x.Gear)) {
+ dragCurves.Add(dragCurveEntry.Gear.ToString(),
+ GetRelativePath(dragCurveEntry.DragCurve.Source, Path.GetDirectoryName(filename)));
+ }
+
+ body.Add(JsonKeys.Gearbox_Gears, gears);
+ body.Add(JsonKeys.IEPC_VoltageLevels, voltageLevels);
+ body.Add(JsonKeys.IEPC_DragCurves, dragCurves);
+
WriteFile(header, body, filename);
}
-
+
public void SaveBattery(IBatteryPackEngineeringInputData battery, string filename, bool declMode)
{
var header = GetHeader(REESSFormatVersion);
@@ -211,10 +306,10 @@ public class JSONFileWriter : IOutputFileWriter
protected Dictionary<string, object> GetHeader(int fileVersion) =>
new Dictionary<string, object> {
- { "CreatedBy", "" },
- { "Date", DateTime.Now.ToUniversalTime().ToString("o") },
- { "AppVersion", VECTOvers },
- { "FileVersion", fileVersion }
+ { JsonKeys.JsonHeader_CreatedBy, "" },
+ { JsonKeys.JsonHeader_Date , DateTime.Now.ToUniversalTime().ToString("o") },
+ { JsonKeys.AppVersion, VECTOvers },
+ { JsonKeys.JsonHeader_FileVersion, fileVersion }
};
public void SaveGearbox(IGearboxEngineeringInputData gbx, IAxleGearInputData axl,
@@ -260,7 +355,7 @@ public class JSONFileWriter : IOutputFileWriter
body.Add(JsonKeys.Gearbox_GearboxType, gbx.Type.ToString());
var torqueConverterDict = new Dictionary<string, object> { { "Enabled", torqueConverter != null && gbx.Type.AutomaticTransmission() } };
- if (gbx.Type.AutomaticTransmission() && gbx.Type != GearboxType.APTN) {
+ if (gbx.Type.AutomaticTransmission() && gbx.Type != GearboxType.APTN && gbx.Type != GearboxType.IHPC) {
torqueConverterDict.Add("File", GetRelativePath(torqueConverter.TCData.Source, Path.GetDirectoryName(filename)));
torqueConverterDict.Add(JsonKeys.Gearbox_TorqueConverter_ReferenceRPM, Math.Round(torqueConverter.ReferenceRPM.AsRPM, 4));
torqueConverterDict.Add(JsonKeys.Gearbox_TorqueConverter_Inertia, torqueConverter.Inertia.Value());
@@ -292,6 +387,7 @@ public class JSONFileWriter : IOutputFileWriter
break;
case VectoSimulationJobType.ParallelHybridVehicle:
case VectoSimulationJobType.SerialHybridVehicle:
+ case VectoSimulationJobType.IHPC:
SaveHybridVehicle(vehicle, airdrag, retarder, pto, angledrive, filename, DeclMode);
break;
case VectoSimulationJobType.BatteryElectricVehicle:
@@ -299,12 +395,16 @@ public class JSONFileWriter : IOutputFileWriter
break;
case VectoSimulationJobType.EngineOnlySimulation:
break;
+ case VectoSimulationJobType.IEPC_E:
+ case VectoSimulationJobType.IEPC_S:
+ SaveIEPCVehicle(vehicle, airdrag, retarder, pto, angledrive, filename, DeclMode);
+ break;
default:
throw new ArgumentOutOfRangeException();
}
}
-
+
public void SaveConventionalVehicle(
IVehicleEngineeringInputData vehicle, IAirdragEngineeringInputData airdrag, IRetarderInputData retarder,
IPTOTransmissionInputData pto, IAngledriveInputData angledrive, string filename, bool DeclMode)
@@ -473,7 +573,7 @@ public class JSONFileWriter : IOutputFileWriter
}
body.Add("InitialSoC", vehicle.InitialSOC * 100);
- body.Add("PowertrainConfiguration", vehicle.VehicleType == VectoSimulationJobType.SerialHybridVehicle ? "SerialHybrid" : "ParallelHybrid");
+ body.Add("PowertrainConfiguration", vehicle.VehicleType == VectoSimulationJobType.SerialHybridVehicle ? "SerialHybrid" : vehicle.VehicleType == VectoSimulationJobType.IHPC ? "IHPC": "ParallelHybrid");
body.Add("ElectricMotors", GetElectricMotors(vehicle, basePath));
body.Add("Batteries", GetBattery(vehicle, basePath));
@@ -488,13 +588,13 @@ public class JSONFileWriter : IOutputFileWriter
var header = GetHeader(HEV_BEVVehicleFormatVersion);
var retarderOut = GetRetarderOut(retarder, basePath);
- //var ptoOut = GetPTOOut(pto, basePath);
+ var ptoOut = GetPTOOut(pto, basePath);
- //var angledriveOut = GetAngledriveOut(angledrive, basePath);
+ //var angledriveOut = GetAngledriveOut(angledrive, basePath);
- //var torqueLimits = GetTorqueLimits(vehicle);
+ //var torqueLimits = GetTorqueLimits(vehicle);
- var electricMotorsOut = GetElectricMotors(vehicle, basePath);
+ var electricMotorsOut = GetElectricMotors(vehicle, basePath);
var battery = GetBattery(vehicle, basePath);
var body = GetVehicle(vehicle, airdrag, DeclMode, basePath);
body.Add("InitialSoC", vehicle.InitialSOC * 100);
@@ -502,11 +602,50 @@ public class JSONFileWriter : IOutputFileWriter
body.Add("ElectricMotors", electricMotorsOut);
body.Add("Batteries", battery);
+ //body.Add("IdlingSpeed", vehicle.EngineIdleSpeed.AsRPM);
+ if (retarder.Type != RetarderType.None)
+ body.Add("Retarder", retarderOut);
+ //body.Add("Angledrive", angledriveOut);
+ body.Add("PTO", ptoOut);
+ //body.Add("TorqueLimits", torqueLimits);
+
+ if ((vehicle.TankSystem.HasValue))
+ body["TankSystem"] = vehicle.TankSystem.Value.ToString();
+
+ WriteFile(header, body, filename);
+ }
+
+ private void SaveIEPCVehicle(IVehicleEngineeringInputData vehicle, IAirdragEngineeringInputData airdrag,
+ IRetarderInputData retarder, IPTOTransmissionInputData pto, IAngledriveInputData angledrive, string filename,
+ bool DeclMode)
+ {
+ var basePath = Path.GetDirectoryName(filename);
+ var header = GetHeader(IEPCVehicleFormatVersion);
+ var retarderOut = GetRetarderOut(retarder, basePath);
+
+ var ptoOut = GetPTOOut(pto, basePath);
+
+ //var angledriveOut = GetAngledriveOut(angledrive, basePath);
+
+ //var torqueLimits = GetTorqueLimits(vehicle);
+
+ var electricMotorsOut = vehicle.VehicleType == VectoSimulationJobType.IEPC_S ? GetElectricMotors(vehicle, basePath) : null;
+ var battery = GetBattery(vehicle, basePath);
+ var body = GetVehicle(vehicle, airdrag, DeclMode, basePath);
+ body.Add("InitialSoC", vehicle.InitialSOC * 100);
+ body.Add("PowertrainConfiguration", vehicle.VehicleType.ToString());
+ body.Add("IEPC", vehicle.Components.IEPCEngineeringInputData.DataSource.SourceFile);
+ if (electricMotorsOut != null) {
+ body.Add("ElectricMotors", electricMotorsOut);
+ }
+
+ body.Add("Batteries", battery);
+
//body.Add("IdlingSpeed", vehicle.EngineIdleSpeed.AsRPM);
if (retarder.Type != RetarderType.None)
body.Add("Retarder", retarderOut);
//body.Add("Angledrive", angledriveOut);
- //body.Add("PTO", ptoOut);
+ body.Add("PTO", ptoOut);
//body.Add("TorqueLimits", torqueLimits);
if ((vehicle.TankSystem.HasValue))
@@ -566,6 +705,15 @@ public class JSONFileWriter : IOutputFileWriter
case VectoSimulationJobType.BatteryElectricVehicle:
SaveBatteryElectricJob(input, filename, DeclMode);
break;
+ case VectoSimulationJobType.IEPC_E:
+ SaveIEPCEJob(input, filename, DeclMode);
+ break;
+ case VectoSimulationJobType.IEPC_S:
+ SaveIEPCEJob(input, filename, DeclMode);
+ break;
+ case VectoSimulationJobType.IHPC:
+ SaveIHPCJob(input, filename, DeclMode);
+ break;
case VectoSimulationJobType.EngineOnlySimulation:
SaveEngineOnlyJob(input, filename, DeclMode);
break;
@@ -574,10 +722,21 @@ public class JSONFileWriter : IOutputFileWriter
}
}
+ private void SaveIHPCJob(IEngineeringInputDataProvider input, string filename, bool declMode)
+ {
+ DoSaveParallelHybridJob(input, filename, declMode, IHPCVectoJobFormatVersion);
+ }
+
private void SaveParallelHybridJob(IEngineeringInputDataProvider input, string filename, bool declMode)
+ {
+ DoSaveParallelHybridJob(input, filename, declMode, PHEVVectoJobFormatVersion);
+ }
+
+ private void DoSaveParallelHybridJob(IEngineeringInputDataProvider input, string filename, bool declMode,
+ int versionNumber)
{
var basePath = Path.GetDirectoryName(filename);
- var header = GetHeader(PHEVVectoJobFormatVersion);
+ var header = GetHeader(versionNumber);
var body = new Dictionary<string, object>();
// SavedInDeclMode = Cfg.DeclMode
var job = input.JobInputData;
@@ -695,7 +854,7 @@ public class JSONFileWriter : IOutputFileWriter
// Cycles
if (!job.SavedInDeclarationMode)
- body.Add("Cycles", job.Cycles.Select(x => GetRelativePath(x.CycleData.Source, Path.GetDirectoryName(filename))).ToArray());
+ body.Add("Cycles", GetCycles(job, filename));
WriteFile(header, body, filename);
}
@@ -829,13 +988,11 @@ public class JSONFileWriter : IOutputFileWriter
// Cycles
if (!job.SavedInDeclarationMode)
body.Add(
- "Cycles", job.Cycles.Select(x => GetRelativePath(x.CycleData.Source, Path.GetDirectoryName(filename))).ToArray());
+ "Cycles", GetCycles(job, filename));
WriteFile(header, body, filename);
}
-
-
public void SaveBatteryElectricJob(IEngineeringInputDataProvider input, string filename, bool DeclMode)
{
var basePath = Path.GetDirectoryName(filename);
@@ -972,11 +1129,120 @@ public class JSONFileWriter : IOutputFileWriter
// Cycles
if (!job.SavedInDeclarationMode)
- body.Add("Cycles", job.Cycles.Select(x => GetRelativePath(x.CycleData.Source, Path.GetDirectoryName(filename))).ToArray());
+ body.Add("Cycles", GetCycles(job, filename));
+
+ WriteFile(header, body, filename);
+ }
+
+ private void SaveIEPCEJob(IEngineeringInputDataProvider input, string filename, bool declMode)
+ {
+ var basePath = Path.GetDirectoryName(filename);
+
+ // Header
+ var header = GetHeader(IEPCVectoJobFormatVersion);
+
+ // Body
+ var body = new Dictionary<string, object>();
+
+ // SavedInDeclMode = Cfg.DeclMode
+
+ var job = input.JobInputData;
+
+ body.Add("SavedInDeclMode", job.SavedInDeclarationMode);
+ //body.Add("EngineOnlyMode", job.JobType);
+
+ // Main Files
+ body.Add("VehicleFile", GetRelativePath(job.Vehicle.DataSource.SourceFile, basePath));
+ if (job.JobType == VectoSimulationJobType.IEPC_S) {
+ body.Add("EngineFile", GetRelativePath(input.JobInputData.Vehicle.Components.EngineInputData.DataSource.SourceFile, basePath));
+ }
+
+ if (job.Vehicle.Components.GearboxInputData != null) {
+ body.Add("GearboxFile",
+ GetRelativePath(input.JobInputData.Vehicle.Components.GearboxInputData.DataSource.SourceFile, basePath));
+ if (input.DriverInputData.GearshiftInputData != null && !job.SavedInDeclarationMode) {
+ body.Add("TCU", GetRelativePath(input.DriverInputData.GearshiftInputData.Source, basePath));
+ }
+ }
+
+ if (!job.SavedInDeclarationMode && job.Vehicle.VehicleType == VectoSimulationJobType.IEPC_S) {
+ body.Add("HybridStrategyParams", GetRelativePath(input.JobInputData.HybridStrategyParameters.Source, basePath));
+ }
+ body.Add("Padd_electric", input.JobInputData.Vehicle.Components.AuxiliaryInputData.Auxiliaries.ElectricPowerDemand.Value());
+
+ if (!job.SavedInDeclarationMode && job.Vehicle is IVehicleEngineeringInputData engVehicle) {
+ var aux = engVehicle.Components.AuxiliaryInputData;
+ if (aux.BusAuxiliariesData != null) {
+ body.Add("BusAux",
+ GetRelativePath(job.Vehicle.Components.AuxiliaryInputData.BusAuxiliariesData.DataSource.SourceFile,
+ basePath));
+ }
+ }
+
+ var driver = input.DriverInputData;
+
+ if (!job.SavedInDeclarationMode) {
+ body.Add("VACC", GetRelativePath(driver.AccelerationCurve.AccelerationCurve.Source, basePath));
+ body.Add("EngineStopStartAtVehicleStopThreshold", driver.EngineStopStartData.ActivationDelay.Value());
+ body.Add("EngineStopStartMaxOffTimespan", driver.EngineStopStartData.MaxEngineOffTimespan.Value());
+ body.Add("EngineStopStartUtilityFactor", driver.EngineStopStartData.UtilityFactorStandstill);
+ body.Add("EngineStopStartUtilityFactorDriving", driver.EngineStopStartData.UtilityFactorDriving);
+
+ body.Add("EcoRollMinSpeed", driver.EcoRollData.MinSpeed.AsKmph);
+ body.Add("EcoRollActivationDelay", driver.EcoRollData.ActivationDelay.Value());
+ body.Add("EcoRollUnderspeedThreshold", driver.EcoRollData.UnderspeedThreshold.AsKmph);
+
+ body.Add("EcoRollMaxAcceleration", driver.EcoRollData.AccelerationUpperLimit.Value());
+ body.Add("PCCEnableSpeed", driver.PCCData.PCCEnabledSpeed.AsKmph);
+ body.Add("PCCMinSpeed", driver.PCCData.MinSpeed.AsKmph);
+ body.Add("PCCUnderspeed", driver.PCCData.Underspeed.AsKmph);
+ body.Add("PCCOverSpeed", driver.PCCData.OverspeedUseCase3.AsKmph);
+ body.Add("PCCPreviewDistanceUC1", driver.PCCData.PreviewDistanceUseCase1.Value());
+ body.Add("PCCPreviewDistanceUC2", driver.PCCData.PreviewDistanceUseCase2.Value());
+
+ }
+
+ if (!job.SavedInDeclarationMode) {
+ var dfTargetSpeed = driver.Lookahead.CoastingDecisionFactorTargetSpeedLookup != null &&
+ File.Exists(driver.Lookahead.CoastingDecisionFactorTargetSpeedLookup.Source)
+ ? GetRelativePath(driver.Lookahead.CoastingDecisionFactorTargetSpeedLookup.Source, basePath)
+ : "";
+ var dfVelocityDrop = driver.Lookahead.CoastingDecisionFactorVelocityDropLookup != null &&
+ File.Exists(driver.Lookahead.CoastingDecisionFactorVelocityDropLookup.Source)
+ ? GetRelativePath(driver.Lookahead.CoastingDecisionFactorVelocityDropLookup.Source, basePath)
+ : "";
+ body.Add("LAC", new Dictionary<string, object> {
+ { "Enabled", driver.Lookahead.Enabled },
+ { "PreviewDistanceFactor", driver.Lookahead.LookaheadDistanceFactor },
+ { "DF_offset", driver.Lookahead.CoastingDecisionFactorOffset },
+ { "DF_scaling", driver.Lookahead.CoastingDecisionFactorScaling },
+ { "DF_targetSpeedLookup", dfTargetSpeed },
+ { "Df_velocityDropLookup", dfVelocityDrop },
+ { "MinSpeed", driver.Lookahead.MinSpeed.AsKmph }
+ });
+ }
+
+ // Overspeed / EcoRoll
+ var overspeedDic = new Dictionary<string, object> {
+ { "Mode", driver.OverSpeedData.Enabled ? "Overspeed" : "Off" },
+ { "MinSpeed", driver.OverSpeedData.MinSpeed.AsKmph },
+ { "OverSpeed", driver.OverSpeedData.OverSpeed.AsKmph }
+ };
+
+ body.Add("OverSpeedEcoRoll", overspeedDic);
+
+ // Cycles
+ if (!job.SavedInDeclarationMode)
+ body.Add("Cycles", GetCycles(job, filename));
WriteFile(header, body, filename);
}
+ private string[] GetCycles(IEngineeringJobInputData job, string filename)
+ {
+ return job.Cycles.Select(x => x.CycleData.SourceType == DataSourceType.Embedded ? x.Name : GetRelativePath(x.CycleData.Source, Path.GetDirectoryName(filename))).ToArray();
+ }
+
public void SaveEngineOnlyJob(IEngineeringInputDataProvider input, string filename, bool DeclMode)
{
var basePath = Path.GetDirectoryName(filename);
diff --git a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
index 08b45dbda0070d756441b489636c476df8f3d0ec..91059a7dabead453ccd42effd1098a4587e27310 100644
--- a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
@@ -619,8 +619,9 @@ namespace TUGraz.VectoCore.OutputData
public static Scalar ElectricMotorOffTimeShare(this IModalDataContainer data, PowertrainPosition pos)
{
+ var offField = pos == PowertrainPosition.IEPC ? ModalResultField.IEPC_Off_ : ModalResultField.EM_Off_;
var emOff = data.GetValues(x => new {
- dt = x[string.Format(ModalResultField.EM_Off_.GetCaption(), pos.GetName())] is DBNull || !x.Field<Scalar>(string.Format(ModalResultField.EM_Off_.GetCaption(), pos.GetName())).IsEqual(1)
+ dt = x[string.Format(offField.GetCaption(), pos.GetName())] is DBNull || !x.Field<Scalar>(string.Format(offField.GetCaption(), pos.GetName())).IsEqual(1)
? 0.SI<Second>()
: x.Field<Second>(ModalResultField.simulationInterval.GetName())
}).Sum(x => x.dt) ?? 0.SI<Second>();
diff --git a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
index 07d483372ee60feadbb4f8d24c7ec24842c2d290..5e651491b8a7a92734e095fe247bfdff7789ea08 100644
--- a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
@@ -94,6 +94,23 @@ namespace TUGraz.VectoCore.OutputData
ModalResultField.EM_Off_,
};
+ private readonly ModalResultField[] _iepcColumns = {
+ ModalResultField.n_IEPC_int_,
+ ModalResultField.T_IEPC_,
+ ModalResultField.T_IEPC_map_,
+ ModalResultField.T_IEPC_int_drive_max_,
+ ModalResultField.T_IEPC_int_gen_max_,
+ ModalResultField.P_IEPC_int_gen_max_,
+ ModalResultField.P_IEPC_int_drive_max_,
+ ModalResultField.P_IEPC_electricMotorInertiaLoss_,
+ ModalResultField.P_IEPC_int_mech_map_,
+ ModalResultField.P_IEPC_el_,
+ ModalResultField.P_IEPC_out_,
+ ModalResultField.P_IEPC_electricMotorLoss_,
+ ModalResultField.IEPC_Off_,
+ ModalResultField.IEPC_OvlBuffer_
+ };
+
private readonly ModalResultField[] _batterySignals = {
ModalResultField.U0_reess,
ModalResultField.U_reess_terminal,
@@ -142,14 +159,14 @@ namespace TUGraz.VectoCore.OutputData
Data = new ModalResults(false);
CurrentRow = Data.NewRow();
- if (runData.JobType == VectoSimulationJobType.BatteryElectricVehicle) {
- PostProcessingCorrection = new BatteryElectricPostprocessingCorrection();
+ PostProcessingCorrection = GetModDataPostprocessor(runData);
+
+ if (runData.JobType == VectoSimulationJobType.BatteryElectricVehicle ||
+ runData.JobType == VectoSimulationJobType.IEPC_E) {
return;
}
-
- PostProcessingCorrection = new ModalDataPostprocessingCorrection();
-
- var multipleEngineModes = runData.EngineData?.MultipleEngineFuelModes ?? false;
+
+ var multipleEngineModes = runData.EngineData?.MultipleEngineFuelModes ?? false;
var fuels = runData.EngineData?.Fuels ?? new List<CombustionEngineFuelData>();
foreach (var fuel in fuels) {
var entry = fuel.FuelData;
@@ -181,6 +198,20 @@ namespace TUGraz.VectoCore.OutputData
}
+ protected IModalDataPostProcessor GetModDataPostprocessor(VectoRunData runData)
+ {
+ switch (runData.JobType) {
+ case VectoSimulationJobType.BatteryElectricVehicle:
+ case VectoSimulationJobType.IEPC_E:
+ return new BatteryElectricPostprocessingCorrection();
+ case VectoSimulationJobType.IEPC_S:
+ case VectoSimulationJobType.SerialHybridVehicle:
+ return new SerialHybridModalDataPostprocessingCorrection();
+ default:
+ return new ModalDataPostprocessingCorrection();
+ }
+ }
+
public int JobRunId => _runData.JobRunId;
public string RunName => _runData.JobName;
@@ -263,19 +294,22 @@ namespace TUGraz.VectoCore.OutputData
return null;
}
- public bool HasCombustionEngine => _runData.JobType != VectoSimulationJobType.BatteryElectricVehicle;
+ public bool HasCombustionEngine => !(_runData.JobType == VectoSimulationJobType.BatteryElectricVehicle || _runData.JobType == VectoSimulationJobType.IEPC_E);
public WattSecond TotalElectricMotorWorkDrive(PowertrainPosition emPos)
{
+ var offField = emPos == PowertrainPosition.IEPC ? ModalResultField.IEPC_Off_ : ModalResultField.EM_Off_;
+ var mechField = emPos == PowertrainPosition.IEPC ? ModalResultField.P_IEPC_out_ : ModalResultField.P_EM_mech_;
+ var factor = emPos == PowertrainPosition.IEPC ? -1 : 1;
if (!ElectricMotors.Contains(emPos))
return null;
else {
var eEmDrive = Data.AsEnumerable().Select(r => {
var dt = r.Field<Second>(ModalResultField.simulationInterval.GetName());
return new {
- EM_off = r.Field<Scalar>(string.Format(ModalResultField.EM_Off_.GetCaption(), emPos.GetName())),
- E_EM = r.Field<Watt>(string.Format(ModalResultField.P_EM_mech_.GetCaption(), emPos.GetName())) *
- dt
+ EM_off = r.Field<Scalar>(string.Format(offField.GetCaption(), emPos.GetName())),
+ E_EM = r.Field<Watt>(string.Format(mechField.GetCaption(), emPos.GetName())) *
+ dt * factor
};
}).Where(x => x.EM_off.IsEqual(0) && x.E_EM.IsSmaller(0)).Sum(x => x.E_EM) ?? 0.SI<WattSecond>();
return -_eEmDrive.GetOrAdd(emPos, _ => eEmDrive);
@@ -283,22 +317,25 @@ namespace TUGraz.VectoCore.OutputData
}
public WattSecond TotalElectricMotorMotWorkDrive(PowertrainPosition emPos) =>
- !ElectricMotors.Contains(emPos)
+ !ElectricMotors.Contains(emPos) || emPos == PowertrainPosition.IEPC
? null
: -_eEmDriveMot.GetOrAdd(emPos, _ => TimeIntegral<WattSecond>(
string.Format(ModalResultField.P_EM_electricMotor_em_mech_.GetCaption(), emPos.GetName()), x => x < 0));
public WattSecond TotalElectricMotorWorkRecuperate(PowertrainPosition emPos)
{
+ var offField = emPos == PowertrainPosition.IEPC ? ModalResultField.IEPC_Off_ : ModalResultField.EM_Off_;
+ var mechField = emPos == PowertrainPosition.IEPC ? ModalResultField.P_IEPC_out_ : ModalResultField.P_EM_mech_;
+ var factor = emPos == PowertrainPosition.IEPC ? -1 : 1;
if (!ElectricMotors.Contains(emPos))
return null;
else {
var eEmRecup = Data.AsEnumerable().Select(r => {
var dt = r.Field<Second>(ModalResultField.simulationInterval.GetName());
return new {
- EM_off = r.Field<Scalar>(string.Format(ModalResultField.EM_Off_.GetCaption(), emPos.GetName())),
- E_EM = r.Field<Watt>(string.Format(ModalResultField.P_EM_mech_.GetCaption(), emPos.GetName())) *
- dt
+ EM_off = r.Field<Scalar>(string.Format(offField.GetCaption(), emPos.GetName())),
+ E_EM = r.Field<Watt>(string.Format(mechField.GetCaption(), emPos.GetName())) *
+ dt * factor
};
}).Where(x => x.EM_off.IsEqual(0) && x.E_EM.IsGreater(0)).Sum(x => x.E_EM) ?? 0.SI<WattSecond>();
return _eEmRecuperate.GetOrAdd(emPos, _ => eEmRecup);
@@ -318,14 +355,16 @@ namespace TUGraz.VectoCore.OutputData
return double.NaN;
}
+ var elPwrField = emPos == PowertrainPosition.IEPC ? ModalResultField.P_IEPC_el_ : ModalResultField.P_EM_electricMotor_el_;
+ var mechPwrField = emPos == PowertrainPosition.IEPC ? ModalResultField.P_IEPC_int_mech_map_ : ModalResultField.P_EM_mech_;
var selected = Data.AsEnumerable().Select(r => {
var dt = r.Field<Second>(ModalResultField.simulationInterval.GetName());
return new {
- P_em = r.Field<Watt>(string.Format(ModalResultField.P_EM_electricMotor_el_.GetCaption(),
+ P_em = r.Field<Watt>(string.Format(elPwrField.GetCaption(),
emPos.GetName())),
- E_mech = r.Field<Watt>(string.Format(ModalResultField.P_EM_mech_.GetCaption(),
+ E_mech = r.Field<Watt>(string.Format(mechPwrField.GetCaption(),
emPos.GetName())) * dt,
- E_el = r.Field<Watt>(string.Format(ModalResultField.P_EM_electricMotor_el_.GetCaption(),
+ E_el = r.Field<Watt>(string.Format(elPwrField.GetCaption(),
emPos.GetName())) * dt,
};
});
@@ -344,6 +383,9 @@ namespace TUGraz.VectoCore.OutputData
if (!ElectricMotors.Contains(emPos)) {
return double.NaN;
}
+ if (emPos == PowertrainPosition.IEPC) {
+ return double.NaN;
+ }
var selected = Data.AsEnumerable().Select(r => {
var dt = r.Field<Second>(ModalResultField.simulationInterval.GetName());
@@ -373,15 +415,18 @@ namespace TUGraz.VectoCore.OutputData
if (!ElectricMotors.Contains(emPos)) {
return double.NaN;
}
+ var offField = emPos == PowertrainPosition.IEPC ? ModalResultField.IEPC_Off_ : ModalResultField.EM_Off_;
+ var elPwrField = emPos == PowertrainPosition.IEPC ? ModalResultField.P_IEPC_el_ : ModalResultField.P_EM_electricMotor_el_;
+ var mechPwrField = emPos == PowertrainPosition.IEPC ? ModalResultField.P_IEPC_int_mech_map_ : ModalResultField.P_EM_mech_;
var selected = Data.AsEnumerable().Select(r => {
var dt = r.Field<Second>(ModalResultField.simulationInterval.GetName());
return new {
- EM_off = r.Field<Scalar>(string.Format(ModalResultField.EM_Off_.GetCaption(), emPos.GetName())),
- P_em = r.Field<Watt>(string.Format(ModalResultField.P_EM_electricMotor_el_.GetCaption(),
+ EM_off = r.Field<Scalar>(string.Format(offField.GetCaption(), emPos.GetName())),
+ P_em = r.Field<Watt>(string.Format(elPwrField.GetCaption(),
emPos.GetName())),
- E_mech = r.Field<Watt>(string.Format(ModalResultField.P_EM_mech_.GetCaption(),
+ E_mech = r.Field<Watt>(string.Format(mechPwrField.GetCaption(),
emPos.GetName())) * dt,
- E_el = r.Field<Watt>(string.Format(ModalResultField.P_EM_electricMotor_el_.GetCaption(),
+ E_el = r.Field<Watt>(string.Format(elPwrField.GetCaption(),
emPos.GetName())) * dt,
};
});
@@ -401,6 +446,10 @@ namespace TUGraz.VectoCore.OutputData
if (!ElectricMotors.Contains(emPos)) {
return double.NaN;
}
+
+ if (emPos == PowertrainPosition.IEPC) {
+ return double.NaN;
+ }
var selected = Data.AsEnumerable().Select(r => {
var dt = r.Field<Second>(ModalResultField.simulationInterval.GetName());
return new {
@@ -428,13 +477,15 @@ namespace TUGraz.VectoCore.OutputData
if (!ElectricMotors.Contains(emPos)) {
return null;
}
+ var offField = emPos == PowertrainPosition.IEPC ? ModalResultField.IEPC_Off_ : ModalResultField.EM_Off_;
+ var mechField = emPos == PowertrainPosition.IEPC
+ ? ModalResultField.P_IEPC_out_
+ : ModalResultField.P_EM_mech_;
var selected = Data.AsEnumerable().Select(r => {
var dt = r.Field<Second>(ModalResultField.simulationInterval.GetName());
return new {
- EM_off = r.Field<Scalar>(string.Format(ModalResultField.EM_Off_.GetCaption(), emPos.GetName())),
- //P_em = r.Field<Watt>(string.Format(ModalResultField.P_EM_electricMotor_el_.GetCaption(),
- // emPos.GetName())),
- E_mech = r.Field<Watt>(string.Format(ModalResultField.P_EM_mech_.GetCaption(),
+ EM_off = r.Field<Scalar>(string.Format(offField.GetCaption(), emPos.GetName())),
+ E_mech = r.Field<Watt>(string.Format(mechField.GetCaption(),
emPos.GetName())) * dt,
};
});
@@ -443,15 +494,21 @@ namespace TUGraz.VectoCore.OutputData
public WattSecond ElectricMotorLosses(PowertrainPosition emPos)
{
+ var field = emPos == PowertrainPosition.IEPC
+ ? ModalResultField.P_IEPC_electricMotorLoss_
+ : ModalResultField.P_EM_loss_;
return Data.AsEnumerable().Sum(r => {
var dt = r.Field<Second>(ModalResultField.simulationInterval.GetName());
- return r.Field<Watt>(string.Format(ModalResultField.P_EM_loss_.GetCaption(),
+ return r.Field<Watt>(string.Format(field.GetCaption(),
emPos.GetName())) * dt;
});
}
public WattSecond ElectricMotorMotLosses(PowertrainPosition emPos)
{
+ if (emPos == PowertrainPosition.IEPC) {
+ return null;
+ }
return Data.AsEnumerable().Sum(r => {
var dt = r.Field<Second>(ModalResultField.simulationInterval.GetName());
return r.Field<Watt>(string.Format(ModalResultField.P_EM_electricMotorLoss_.GetCaption(),
@@ -461,6 +518,9 @@ namespace TUGraz.VectoCore.OutputData
public WattSecond ElectricMotorTransmissionLosses(PowertrainPosition emPos)
{
+ if (emPos == PowertrainPosition.IEPC) {
+ return null;
+ }
return Data.AsEnumerable().Sum(r => {
var dt = r.Field<Second>(ModalResultField.simulationInterval.GetName());
return r.Field<Watt>(string.Format(ModalResultField.P_EM_TransmissionLoss_.GetCaption(),
@@ -470,7 +530,10 @@ namespace TUGraz.VectoCore.OutputData
public PerSecond ElectricMotorAverageSpeed(PowertrainPosition emPos)
{
- var integral = GetValues(x => x.Field<PerSecond>(string.Format(ModalResultField.n_EM_electricMotor_.GetCaption(), emPos.GetName())).Value() *
+ var field = emPos == PowertrainPosition.IEPC
+ ? ModalResultField.n_IEPC_int_
+ : ModalResultField.n_EM_electricMotor_;
+ var integral = GetValues(x => x.Field<PerSecond>(string.Format(field.GetCaption(), emPos.GetName())).Value() *
x.Field<Second>(ModalResultField.simulationInterval.GetName()).Value()).Sum();
return (integral / Duration.Value()).SI<PerSecond>();
}
@@ -544,7 +607,8 @@ namespace TUGraz.VectoCore.OutputData
public void AddElectricMotor(PowertrainPosition pos)
{
ElectricMotors.Add(pos);
- foreach (var entry in _electricMotorColumns) {
+ var cols = pos == PowertrainPosition.IEPC ? _iepcColumns : _electricMotorColumns;
+ foreach (var entry in cols) {
var col = Data.Columns.Add(string.Format(entry.GetAttribute().Caption, pos.GetName()), typeof(SI));
col.ExtendedProperties[ModalResults.ExtendedPropertyNames.Decimals] =
entry.GetAttribute().Decimals;
@@ -705,7 +769,8 @@ namespace TUGraz.VectoCore.OutputData
ModalResultField.I_reess,
}.Select(x => x.GetName()));
foreach (var em in ElectricMotors.OrderBy(x => x).Reverse()) {
- dataColumns.AddRange(_electricMotorColumns.Select(emCol =>
+ var cols = em == PowertrainPosition.IEPC ? _iepcColumns : _electricMotorColumns;
+ dataColumns.AddRange(cols.Select(emCol =>
string.Format(emCol.GetAttribute().Caption, em.GetName())));
}
}
diff --git a/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs b/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs
index 411fea3308fc5ae7234be802f8a9c011635400e5..e0aa4832bcdedac3fefe2ea5fe2bc21f66e9c994 100644
--- a/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs
+++ b/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs
@@ -3,6 +3,7 @@ using System.Data;
using System.Linq;
using TUGraz.VectoCommon.BusAuxiliaries;
using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.BusAuxiliaries;
@@ -13,6 +14,88 @@ using TUGraz.VectoCore.Models.SimulationComponent.Data;
namespace TUGraz.VectoCore.OutputData
{
+ public class SerialHybridModalDataPostprocessingCorrection : ModalDataPostprocessingCorrection
+ {
+
+ protected override void SetReesCorrectionDemand(IModalDataContainer modData, VectoRunData runData,
+ CorrectedModalData r)
+ {
+ var deltaEReess = modData.TimeIntegral<WattSecond>(ModalResultField.P_reess_int.GetName());
+ var startSoc = modData.REESSStartSoC();
+ var endSoc = modData.REESSEndSoC();
+ var emEff = 0.0;
+ if (endSoc < startSoc) {
+ var etaReessChg = modData.WorkREESSChargeInternal().Value() / modData.WorkREESSChargeTerminal().Value();
+ emEff = 1.0 / (etaReessChg);
+ }
+ if (endSoc > startSoc) {
+ var etaReessDischg = modData.WorkREESSDischargeTerminal().Value() / modData.WorkREESSDischargeInternal().Value();
+ emEff = etaReessDischg;
+ }
+
+ r.DeltaEReessMech = double.IsNaN(emEff) ? 0.SI<WattSecond>() : -deltaEReess * emEff;
+ }
+
+ protected override FuelConsumptionCorrection SetFuelConsumptionCorrection(IModalDataContainer modData, VectoRunData runData,
+ CorrectedModalData r, IFuelProperties fuel)
+ {
+ var duration = modData.Duration;
+ var distance = modData.Distance;
+ var essParams = runData.DriverData.EngineStopStart;
+ var engFuel = runData.EngineData.Fuels.First(x => x.FuelData.Equals(fuel));
+
+ var fcIceIdle = engFuel.ConsumptionMap.GetFuelConsumptionValue(
+ 0.SI<NewtonMeter>(),
+ runData.EngineData.IdleSpeed) *
+ engFuel.FuelConsumptionCorrectionFactor;
+
+ var elPowerGenerated = modData.TimeIntegral<WattSecond>(string.Format(ModalResultField.P_EM_electricMotor_el_.GetCaption(), PowertrainPosition.GEN));
+ var fcGenCharging = modData.TotalFuelConsumption(ModalResultField.FCFinal, fuel);
+ var socCorr = elPowerGenerated.IsEqual(0)
+ ? (runData.GenSet.GenSetCharacteristics.OptimalPoint.FuelConsumption /
+ runData.GenSet.GenSetCharacteristics.OptimalPoint.ElectricPower).Cast<KilogramPerWattSecond>()
+ : (fcGenCharging / elPowerGenerated).Cast<KilogramPerWattSecond>();
+ var engLine = modData.EngineLineCorrectionFactor(fuel);
+ var comp =
+ runData.BusAuxiliaries?.PneumaticUserInputsConfig.CompressorMap
+ .Interpolate(runData.EngineData.IdleSpeed);
+
+ var f = new FuelConsumptionCorrection {
+ Fuel = fuel,
+ Distance = distance != null && distance.IsGreater(0) ? distance : null,
+ Duration = duration != null && duration.IsGreater(0) ? duration : null,
+ EngineLineCorrectionFactor = engLine,
+ VehicleLine = modData.VehicleLineSlope(fuel),
+ FcModSum = modData.TotalFuelConsumption(ModalResultField.FCFinal, fuel),
+ FcESS_EngineStart = engLine * modData.WorkEngineStart(),
+
+ FcESS_AuxStandstill_ICEOff = r.EnergyAuxICEOffStandstill_UF * engLine,
+ FcESS_AuxStandstill_ICEOn = r.EnergyAuxICEOnStandstill_UF * engLine +
+ fcIceIdle * r.ICEOffTimeStandstill * (1 - r.UtilityFactorStandstill),
+
+ FcESS_AuxDriving_ICEOff = r.EnergyAuxICEOffDriving_UF * engLine,
+ FcESS_AuxDriving_ICEOn = r.EnergyAuxICEOnDriving_UF * engLine +
+ fcIceIdle * r.ICEOffTimeDriving * (1 - r.UtilityFactorDriving),
+
+ FcESS_DCDCMissing = r.EnergyDCDCMissing * engLine,
+ FcBusAuxPSAirDemand = engLine * r.WorkBusAuxPSCorr,
+
+ FcBusAuxPSDragICEOffStandstill = comp == null
+ ? 0.SI<Kilogram>()
+ : comp.PowerOff * r.ICEOffTimeStandstill * engLine * (1 - essParams.UtilityFactorStandstill),
+ FcBusAuxPSDragICEOffDriving = comp == null
+ ? 0.SI<Kilogram>()
+ : comp.PowerOff * r.ICEOffTimeDriving * engLine * (1 - essParams.UtilityFactorDriving),
+ FcREESSSoc = r.DeltaEReessMech * socCorr,
+ FcBusAuxEs = engLine * r.WorkBusAuxESMech,
+ FcWHR = engLine * r.WorkWHR,
+ FcAuxHtr = 0.SI<Kilogram>()
+ };
+
+ return f;
+ }
+ }
+
public class ModalDataPostprocessingCorrection : IModalDataPostProcessor
{
@@ -80,17 +163,17 @@ namespace TUGraz.VectoCore.OutputData
return r;
}
- private void SetReesCorrectionDemand(IModalDataContainer modData, VectoRunData runData,
+ protected virtual void SetReesCorrectionDemand(IModalDataContainer modData, VectoRunData runData,
CorrectedModalData r)
{
- var em = runData.ElectricMachinesData?.FirstOrDefault();
+ var em = runData.ElectricMachinesData?.FirstOrDefault(x => x.Item1 != PowertrainPosition.GEN);
if (em != null) {
var deltaEReess = modData.TimeIntegral<WattSecond>(ModalResultField.P_reess_int.GetName());
var startSoc = modData.REESSStartSoC();
var endSoc = modData.REESSEndSoC();
- var emEff = 0.0;
- if (endSoc < startSoc) {
+ var emEff = 0.0;
+ if (endSoc < startSoc) {
var etaEmChg = modData.ElectricMotorEfficiencyGenerate(em.Item1);
var etaReessChg = modData.WorkREESSChargeInternal().Value() / modData.WorkREESSChargeTerminal().Value();
emEff = 1.0 / (etaEmChg * etaReessChg);
@@ -107,7 +190,7 @@ namespace TUGraz.VectoCore.OutputData
}
}
- private static FuelConsumptionCorrection SetFuelConsumptionCorrection(IModalDataContainer modData, VectoRunData runData,
+ protected virtual FuelConsumptionCorrection SetFuelConsumptionCorrection(IModalDataContainer modData, VectoRunData runData,
CorrectedModalData r, IFuelProperties fuel)
{
var duration = modData.Duration;
@@ -163,7 +246,7 @@ namespace TUGraz.VectoCore.OutputData
return f;
}
- private static void SetAuxHeaterDemand(IModalDataContainer modData, CorrectedModalData r, Second duration)
+ protected virtual void SetAuxHeaterDemand(IModalDataContainer modData, CorrectedModalData r, Second duration)
{
var engineWasteheatSum = modData.FuelData.Aggregate(
0.SI<Joule>(),
@@ -174,7 +257,7 @@ namespace TUGraz.VectoCore.OutputData
: modData.AuxHeaterDemandCalc(duration, engineWasteheatSum);
}
- private static void SetMissingDCDCEnergy(IModalDataContainer modData, VectoRunData runData, CorrectedModalData r)
+ protected virtual void SetMissingDCDCEnergy(IModalDataContainer modData, VectoRunData runData, CorrectedModalData r)
{
// either case C1, C2a, or C3a
var missingDCDCEnergy = modData.TimeIntegral<WattSecond>(ModalResultField.P_DCDC_missing);
@@ -203,7 +286,7 @@ namespace TUGraz.VectoCore.OutputData
//}
}
- private static void SetBusAuxMissingPSWork(IModalDataContainer modData, VectoRunData runData, CorrectedModalData r)
+ protected virtual void SetBusAuxMissingPSWork(IModalDataContainer modData, VectoRunData runData, CorrectedModalData r)
{
var actuations = new Actuations() {
Braking = runData.BusAuxiliaries.Actuations.Braking,
@@ -234,7 +317,7 @@ namespace TUGraz.VectoCore.OutputData
r.WorkBusAuxPSCorr = (r.kAir * r.DeltaAir).Cast<WattSecond>();
}
- private static void SetMissingEnergyICEOFf(IModalDataContainer modData, CorrectedModalData r)
+ protected virtual void SetMissingEnergyICEOFf(IModalDataContainer modData, CorrectedModalData r)
{
var entriesAuxICEStandstill = modData.GetValues(x => new {
dt = x.Field<Second>(ModalResultField.simulationInterval.GetName()),
@@ -263,7 +346,7 @@ namespace TUGraz.VectoCore.OutputData
r.EnergyAuxICEOnDriving = entriesAuxICEDriving.Sum(x => x.P_on * x.dt) ?? 0.SI<WattSecond>();
}
- private static void SetWHRWork(IModalDataContainer modData, VectoRunData runData, CorrectedModalData r)
+ protected virtual void SetWHRWork(IModalDataContainer modData, VectoRunData runData, CorrectedModalData r)
{
// no post-processing correction for electric WHR for HEV (WHR is connected to REESS in simulation)
r.WorkWHREl = (runData.BatteryData != null || runData.SuperCapData != null) && runData.EngineData.WHRType.IsElectrical()
diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
index e8e272fff90a1811c03dbbef211170fb948da8e2..7d73e77a65a93c756b4fd64bb89ca06e2e479109 100644
--- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
@@ -593,7 +593,7 @@ namespace TUGraz.VectoCore.OutputData
private void WriteGearshiftStats(IModalDataContainer modData, Dictionary<string, object> row, uint gearCount)
{
- row[Fields.NUM_GEARSHIFTS] = (ConvertedSI)modData.GearshiftCount();
+ row[Fields.NUM_GEARSHIFTS] = gearCount == 1 ? 0.SI<Scalar>() : (ConvertedSI)modData.GearshiftCount();
var timeSharePerGear = modData.TimeSharePerGear(gearCount);
for (uint i = 0; i <= gearCount; i++) {
@@ -660,7 +660,7 @@ namespace TUGraz.VectoCore.OutputData
var eGbxOut = modData.TimeIntegral<WattSecond>(gbxOutSignal, x => x > 0);
row[Fields.AVERAGE_GEARBOX_EFFICIENCY] = eGbxIn.IsEqual(0, 1e-9) ? 0 : (eGbxOut / eGbxIn).Value();
- if (runData.GearboxData != null && runData.GearboxData.Type.AutomaticTransmission() && runData.GearboxData.Type != GearboxType.APTN) {
+ if (runData.GearboxData != null && runData.GearboxData.Type.AutomaticTransmission() && runData.GearboxData.Type != GearboxType.APTN && runData.GearboxData.Type != GearboxType.IHPC) {
var eTcIn = modData.TimeIntegral<WattSecond>(ModalResultField.P_TC_in, x => x > 0);
var eTcOut = eGbxIn;
row[Fields.AVERAGE_TORQUE_CONVERTER_EFFICIENCY_WITHOUT_LOCKUP] = eTcIn.IsEqual(0, 1e-9) ? 0 : (eTcOut / eTcIn).Value();
@@ -735,31 +735,11 @@ namespace TUGraz.VectoCore.OutputData
row[Fields.E_ICE_START] = modData.WorkEngineStart().ConvertToKiloWattHour();
foreach (var em in runData.ElectricMachinesData) {
- var emColumns = new List<Tuple<string, ConvertedSI>>() {
- Tuple.Create(Fields.EM_AVG_SPEED_FORMAT, modData.ElectricMotorAverageSpeed(em.Item1).ConvertToRoundsPerMinute()),
-
- Tuple.Create(Fields.E_EM_Mot_DRIVE_FORMAT, modData.TotalElectricMotorMotWorkDrive(em.Item1).ConvertToKiloWattHour()),
- Tuple.Create(Fields.E_EM_Mot_GENERATE_FORMAT, modData.TotalElectricMotorMotWorkRecuperate(em.Item1).ConvertToKiloWattHour()),
-
- Tuple.Create(Fields.ETA_EM_Mot_DRIVE_FORMAT, new ConvertedSI(modData.ElectricMotorMotEfficiencyDrive(em.Item1), "")),
- Tuple.Create(Fields.ETA_EM_Mot_GEN_FORMAT, new ConvertedSI(modData.ElectricMotorMotEfficiencyGenerate(em.Item1), "")),
-
-
- Tuple.Create(Fields.E_EM_DRIVE_FORMAT, modData.TotalElectricMotorWorkDrive(em.Item1).ConvertToKiloWattHour()),
- Tuple.Create(Fields.E_EM_GENERATE_FORMAT, modData.TotalElectricMotorWorkRecuperate(em.Item1).ConvertToKiloWattHour()),
-
- Tuple.Create(Fields.ETA_EM_DRIVE_FORMAT, new ConvertedSI(modData.ElectricMotorEfficiencyDrive(em.Item1), "")),
- Tuple.Create(Fields.ETA_EM_GEN_FORMAT, new ConvertedSI(modData.ElectricMotorEfficiencyGenerate(em.Item1), "")),
-
- Tuple.Create(Fields.E_EM_OFF_Loss_Format, modData.ElectricMotorOffLosses(em.Item1).ConvertToKiloWattHour()),
- Tuple.Create(Fields.E_EM_LOSS_TRANSM_FORMAT, modData.ElectricMotorTransmissionLosses(em.Item1).ConvertToKiloWattHour()),
- Tuple.Create(Fields.E_EM_Mot_LOSS_FORMAT, modData.ElectricMotorMotLosses(em.Item1).ConvertToKiloWattHour()),
- Tuple.Create(Fields.E_EM_LOSS_FORMAT, modData.ElectricMotorLosses(em.Item1).ConvertToKiloWattHour()),
-
- Tuple.Create(Fields.E_EM_OFF_TIME_SHARE, (ConvertedSI)modData.ElectricMotorOffTimeShare(em.Item1))
- };
- emColumns.Reverse();
- foreach (var entry in emColumns) {
+ var fields = em.Item1 == PowertrainPosition.IEPC
+ ? GetIEPCWorkEntries(modData, row, em)
+ : GetElectricMachineWorkEntries(modData, row, em);
+ fields.Reverse();
+ foreach (var entry in fields) {
var colName = string.Format(entry.Item1, em.Item1.GetName());
lock (Table) {
if (!Table.Columns.Contains(colName)) {
@@ -825,6 +805,77 @@ namespace TUGraz.VectoCore.OutputData
}
}
+ private List<Tuple<string, ConvertedSI>> GetIEPCWorkEntries(IModalDataContainer modData, Dictionary<string, object> row, Tuple<PowertrainPosition, ElectricMotorData> em)
+ {
+ var emColumns = new List<Tuple<string, ConvertedSI>>() {
+ Tuple.Create(Fields.IEPC_AVG_SPEED_FORMAT,
+ modData.ElectricMotorAverageSpeed(em.Item1).ConvertToRoundsPerMinute()),
+
+ //Tuple.Create(Fields.E_EM_Mot_DRIVE_FORMAT,
+ // modData.TotalElectricMotorMotWorkDrive(em.Item1).ConvertToKiloWattHour()),
+ //Tuple.Create(Fields.E_EM_Mot_GENERATE_FORMAT,
+ // modData.TotalElectricMotorMotWorkRecuperate(em.Item1).ConvertToKiloWattHour()),
+
+ //Tuple.Create(Fields.ETA_EM_Mot_DRIVE_FORMAT,
+ // new ConvertedSI(modData.ElectricMotorMotEfficiencyDrive(em.Item1), "")),
+ //Tuple.Create(Fields.ETA_EM_Mot_GEN_FORMAT,
+ // new ConvertedSI(modData.ElectricMotorMotEfficiencyGenerate(em.Item1), "")),
+
+
+ Tuple.Create(Fields.E_IEPC_DRIVE_FORMAT, modData.TotalElectricMotorWorkDrive(em.Item1).ConvertToKiloWattHour()),
+ Tuple.Create(Fields.E_IEPC_GENERATE_FORMAT,
+ modData.TotalElectricMotorWorkRecuperate(em.Item1).ConvertToKiloWattHour()),
+
+ Tuple.Create(Fields.ETA_IEPC_DRIVE_FORMAT, new ConvertedSI(modData.ElectricMotorEfficiencyDrive(em.Item1), "")),
+ Tuple.Create(Fields.ETA_IEPC_GEN_FORMAT, new ConvertedSI(modData.ElectricMotorEfficiencyGenerate(em.Item1), "")),
+
+ Tuple.Create(Fields.E_IEPC_OFF_Loss_Format, modData.ElectricMotorOffLosses(em.Item1).ConvertToKiloWattHour()),
+ //Tuple.Create(Fields.E_EM_LOSS_TRANSM_FORMAT,
+ // modData.ElectricMotorTransmissionLosses(em.Item1).ConvertToKiloWattHour()),
+ //Tuple.Create(Fields.E_EM_Mot_LOSS_FORMAT, modData.ElectricMotorMotLosses(em.Item1).ConvertToKiloWattHour()),
+ Tuple.Create(Fields.E_IEPC_LOSS_FORMAT, modData.ElectricMotorLosses(em.Item1).ConvertToKiloWattHour()),
+
+ Tuple.Create(Fields.E_IEPC_OFF_TIME_SHARE, (ConvertedSI)modData.ElectricMotorOffTimeShare(em.Item1))
+ };
+ return emColumns;
+ }
+
+ private List<Tuple<string, ConvertedSI>> GetElectricMachineWorkEntries(IModalDataContainer modData, Dictionary<string, object> row, Tuple<PowertrainPosition, ElectricMotorData> em)
+ {
+ var emColumns = new List<Tuple<string, ConvertedSI>>() {
+ Tuple.Create(Fields.EM_AVG_SPEED_FORMAT,
+ modData.ElectricMotorAverageSpeed(em.Item1).ConvertToRoundsPerMinute()),
+
+ Tuple.Create(Fields.E_EM_Mot_DRIVE_FORMAT,
+ modData.TotalElectricMotorMotWorkDrive(em.Item1).ConvertToKiloWattHour()),
+ Tuple.Create(Fields.E_EM_Mot_GENERATE_FORMAT,
+ modData.TotalElectricMotorMotWorkRecuperate(em.Item1).ConvertToKiloWattHour()),
+
+ Tuple.Create(Fields.ETA_EM_Mot_DRIVE_FORMAT,
+ new ConvertedSI(modData.ElectricMotorMotEfficiencyDrive(em.Item1), "")),
+ Tuple.Create(Fields.ETA_EM_Mot_GEN_FORMAT,
+ new ConvertedSI(modData.ElectricMotorMotEfficiencyGenerate(em.Item1), "")),
+
+
+ Tuple.Create(Fields.E_EM_DRIVE_FORMAT, modData.TotalElectricMotorWorkDrive(em.Item1).ConvertToKiloWattHour()),
+ Tuple.Create(Fields.E_EM_GENERATE_FORMAT,
+ modData.TotalElectricMotorWorkRecuperate(em.Item1).ConvertToKiloWattHour()),
+
+ Tuple.Create(Fields.ETA_EM_DRIVE_FORMAT, new ConvertedSI(modData.ElectricMotorEfficiencyDrive(em.Item1), "")),
+ Tuple.Create(Fields.ETA_EM_GEN_FORMAT, new ConvertedSI(modData.ElectricMotorEfficiencyGenerate(em.Item1), "")),
+
+ Tuple.Create(Fields.E_EM_OFF_Loss_Format, modData.ElectricMotorOffLosses(em.Item1).ConvertToKiloWattHour()),
+ Tuple.Create(Fields.E_EM_LOSS_TRANSM_FORMAT,
+ modData.ElectricMotorTransmissionLosses(em.Item1).ConvertToKiloWattHour()),
+ Tuple.Create(Fields.E_EM_Mot_LOSS_FORMAT, modData.ElectricMotorMotLosses(em.Item1).ConvertToKiloWattHour()),
+ Tuple.Create(Fields.E_EM_LOSS_FORMAT, modData.ElectricMotorLosses(em.Item1).ConvertToKiloWattHour()),
+
+ Tuple.Create(Fields.E_EM_OFF_TIME_SHARE, (ConvertedSI)modData.ElectricMotorOffTimeShare(em.Item1))
+ };
+ return emColumns;
+
+ }
+
private void WriteFullPowertrain(VectoRunData runData, Dictionary<string, object> row)
{
WriteVehicleData(runData, row);
@@ -1065,7 +1116,7 @@ namespace TUGraz.VectoCore.OutputData
row[Fields.GEAR_RATIO_LAST_GEAR] = data.Gears.Count > 0
? (ConvertedSI)data.Gears.Last().Value.Ratio.SI<Scalar>()
: (ConvertedSI)0.SI<Scalar>();
- if (data.Type != GearboxType.APTN) {
+ if (data.Type != GearboxType.APTN && data.Type != GearboxType.IHPC) {
row[Fields.TORQUECONVERTER_MANUFACTURER] = data.TorqueConverterData.Manufacturer;
row[Fields.TORQUECONVERTER_MODEL] = data.TorqueConverterData.ModelName;
row[Fields.TORQUE_CONVERTER_CERTIFICATION_NUMBER] =
@@ -1380,6 +1431,18 @@ namespace TUGraz.VectoCore.OutputData
public const string E_REESS_T_dischg = "E_REESS_T_dischg [kWh]";
public const string E_REESS_int_chg = "E_REESS_int_chg [kWh]";
public const string E_REESS_int_dischg = "E_REESS_int_dischg [kWh]";
+
+ public const string IEPC_AVG_SPEED_FORMAT = "n_{0}-em_avg [rpm]";
+ public const string E_IEPC_DRIVE_FORMAT = "E_{0}_drive [kWh]";
+ public const string E_IEPC_GENERATE_FORMAT = "E_{0}_gen [kWh]";
+
+ public const string ETA_IEPC_DRIVE_FORMAT = "η_{0}_drive";
+ public const string ETA_IEPC_GEN_FORMAT = "η_{0}_gen";
+ public const string E_IEPC_OFF_Loss_Format = "E_{0}_off_loss [kWh]";
+ public const string E_IEPC_LOSS_FORMAT = "E_{0}_loss [kWh]";
+ public const string E_IEPC_OFF_TIME_SHARE = "{0} off time share [%]";
+
+
}
}
}
diff --git a/VectoCore/VectoCore/OutputData/XML/ComponentWriter/ComponentWriterNinjectModule.cs b/VectoCore/VectoCore/OutputData/XML/ComponentWriter/ComponentWriterNinjectModule.cs
index 3f3db79d76b2e71da25560524c8385f86ad378ec..015197523b60bc480e6c83c7d20e26d9aa617ece 100644
--- a/VectoCore/VectoCore/OutputData/XML/ComponentWriter/ComponentWriterNinjectModule.cs
+++ b/VectoCore/VectoCore/OutputData/XML/ComponentWriter/ComponentWriterNinjectModule.cs
@@ -20,7 +20,7 @@ namespace TUGraz.VectoCore.OutputData.XML.ComponentWriter
//ADASTypes
- var v2102 = XMLDeclarationNamespaces.v2_10_2;
+ var v2102 = XMLDeclarationNamespaces.V24;
Bind<IDeclarationAdasWriter>().To<AdasConventionalWriter>().
Named(GetName(GroupNames.ADAS_Conventional_Type, v2102));
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/AbstractCustomerReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/AbstractCustomerReport.cs
index cbea3389ebbc518d972c61a154f3f263467fff91..968edce4bf5a2a09853757644463b83c614f0958 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/AbstractCustomerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/AbstractCustomerReport.cs
@@ -1,16 +1,20 @@
using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using System.Xml;
using System.Xml.Linq;
using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReport;
using TUGraz.VectoCore.Utils;
+using TUGraz.VectoHashing;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9
{
@@ -18,16 +22,29 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
{
protected readonly ICustomerInformationFileFactory _cifFactory;
protected XNamespace xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
- public static XNamespace Cif => XNamespace.Get("urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9");
+
+ public static XNamespace Cif => XNamespace.Get("urn:tugraz:ivt:VectoAPI:CustomerOutput");
+
+ public static XNamespace Cif_0_9 => XNamespace.Get("urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9");
+ public static XNamespace _di => XNamespace.Get("http://www.w3.org/2000/09/xmldsig#");
+
+
protected XElement Vehicle { get; set; }
protected XElement Results { get; set; }
+ protected XElement InputDataIntegrity { get; set; }
+
public abstract string OutputDataType { get; }
- private bool _ovc = false;
+ protected bool _ovc = false;
protected AbstractCustomerReport(ICustomerInformationFileFactory cifFactory)
{
_cifFactory = cifFactory;
+
+ // MQ: write dummy result element for testcases (2022-07-13)
+ Results = new XElement(Cif_0_9 + "Results",
+ new XElement(Cif_0_9 + "Status", "success"),
+ new XElement(Cif_0_9 + "ExemptedVehicle"));
}
@@ -35,11 +52,13 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
#region Implementation of IXMLCustomerReport
- public void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
+ public virtual void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
InitializeVehicleData(modelData.InputData);
_ovc = modelData.VehicleData.Ocv;
- Results = new XElement(Cif + "Results");
+ Results = new XElement(Cif_0_9 + "Results");
+ InputDataIntegrity = new XElement(Cif_0_9 + XMLNames.Report_InputDataSignature,
+ modelData.InputData.XMLHash == null ? XMLHelper.CreateDummySig(_di) : new XElement(modelData.InputData.XMLHash));
}
public XDocument Report { get; protected set; }
@@ -53,13 +72,39 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public void GenerateReport(XElement resultSignature)
{
- Report = new XDocument(new XElement(Cif + "VectoOutput",
- new XAttribute("xmlns", Cif),
- new XAttribute(XNamespace.Xmlns + "xsi", xsi),
- new XAttribute(XNamespace.Xmlns + "mrf", LorryManufacturerReportBase.Mrf),
- new XAttribute(xsi + "type", $"{OutputDataType}"),
+ var retVal = new XDocument(new XElement(Cif + "VectoCustomerInformation",
+ new XAttribute(XNamespace.Xmlns + "xsi", xsi),
+ new XAttribute(XNamespace.Xmlns + "cif", Cif.NamespaceName),
+ new XAttribute(XNamespace.Xmlns + "cif0.9", Cif_0_9.NamespaceName),
+ new XAttribute("xmlns", Cif_0_9),
+ new XAttribute(XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance") + "schemaLocation",
+ $"{Cif.NamespaceName} " + @"V:\VectoCore\VectoCore\Resources\XSD/VectoOutputCustomer.xsd"),
+
+ new XElement(Cif + XMLNames.Report_DataWrap,
+ new XAttribute(xsi + XMLNames.XSIType, $"{OutputDataType}"),
+ GetReportContents(resultSignature)
+ )
+ )
+ );
+
+ var stream = new MemoryStream();
+ var writer = new StreamWriter(stream);
+ writer.Write(retVal);
+ writer.Flush();
+ stream.Seek(0, SeekOrigin.Begin);
+ var h = VectoHash.Load(stream);
+ Report = h.AddHash();
+ }
+
+ protected virtual IList<XElement> GetReportContents(XElement resultSignature)
+ {
+ return new[] {
Vehicle,
- Results));
+ InputDataIntegrity,
+ new XElement(Cif_0_9 + XMLNames.Report_ManufacturerRecord_Signature, resultSignature),
+ Results,
+ XMLHelper.GetApplicationInfo(Cif_0_9)
+ };
}
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFNinjectModule.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFNinjectModule.cs
index 2c014c529d1961f4f62cdae493fe94b817f0c859..6435bfe621cbedb293badd70008ba7fa38735fe4 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFNinjectModule.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFNinjectModule.cs
@@ -97,7 +97,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
true,
false,
false)));
+
#region MediumLorryCIF
+
Bind<IXMLCustomerReport>().To<ConventionalLorry_CIF>().Named(nameCombinationMethod(
ToParams(VehicleCategoryHelper.Van, VectoSimulationJobType.ConventionalVehicle,
ArchitectureID.UNKNOWN, false, false, false)));
@@ -180,30 +182,79 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
false,
false)));
- Bind<IXMLCustomerReport>().To<HEV_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
+ Bind<IXMLCustomerReport>().To<HEV_Px_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
ToParams(VehicleCategoryHelper.CompletedBus,
- VectoSimulationJobType.SerialHybridVehicle,
+ VectoSimulationJobType.ParallelHybridVehicle,
ArchitectureID.UNKNOWN,
false,
false,
false)));
- Bind<IXMLCustomerReport>().To<HEV_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
+ Bind<IXMLCustomerReport>().To<HEV_S2_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
ToParams(VehicleCategoryHelper.CompletedBus,
- VectoSimulationJobType.ParallelHybridVehicle,
- ArchitectureID.UNKNOWN,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S2,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLCustomerReport>().To<HEV_S3_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.CompletedBus,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S3,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLCustomerReport>().To<HEV_S4_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.CompletedBus,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S4,
+ false,
false,
+ false)));
+
+
+ Bind<IXMLCustomerReport>().To<HEV_IEPC_S_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.CompletedBus,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S_IEPC,
false,
+ true,
false)));
- Bind<IXMLCustomerReport>().To<PEV_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
+ Bind<IXMLCustomerReport>().To<PEV_E2_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
ToParams(VehicleCategoryHelper.CompletedBus,
VectoSimulationJobType.BatteryElectricVehicle,
- ArchitectureID.UNKNOWN,
+ ArchitectureID.E2,
false,
false,
false)));
+ Bind<IXMLCustomerReport>().To<PEV_E3_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.CompletedBus,
+ VectoSimulationJobType.BatteryElectricVehicle,
+ ArchitectureID.E3,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLCustomerReport>().To<PEV_E4_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.CompletedBus,
+ VectoSimulationJobType.BatteryElectricVehicle,
+ ArchitectureID.E4,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLCustomerReport>().To<PEV_IEPC_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.CompletedBus,
+ VectoSimulationJobType.BatteryElectricVehicle,
+ ArchitectureID.E_IEPC,
+ false,
+ true,
+ false)));
+
Bind<IXMLCustomerReport>().To<Exempted_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
ToParams(VehicleCategoryHelper.CompletedBus,
VectoSimulationJobType.ConventionalVehicle,
@@ -217,6 +268,8 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
Bind<IXmlTypeWriter>().To<CIFConventionalLorryVehicleWriter>().When(AccessedViaCIFFactory)
.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetConventionalLorryVehicleType());
+ Bind<IXmlTypeWriter>().To<CIF_HEVPx_LorryVehicleWriter>().When(AccessedViaCIFFactory);
+
Bind<IXmlTypeWriter>().To<CIF_HEVPx_LorryVehicleWriter>().When(AccessedViaCIFFactory)
.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_PxLorryVehicleType());
@@ -247,12 +300,43 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
Bind<IXmlTypeWriter>().To<CIF_Exempted_LorryVehicleWriter>().When(AccessedViaCIFFactory)
.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetExempted_LorryVehicleType());
- Bind<IXmlTypeWriter>().To<CIF_ConventionalCompletedBusVehicleWriter>().When(AccessedViaCIFFactory)
+ Bind<IXmlTypeWriter>().To<CIF_Conventional_CompletedBusVehicleWriter>().When(AccessedViaCIFFactory)
.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetConventional_CompletedBusVehicleType());
+ Bind<IXmlTypeWriter>().To<CIF_HEV_Px_CompletedBusVehicleWriter>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_Px_CompletedBusVehicleType());
+
+ Bind<IXmlTypeWriter>().To<CIF_HEV_IHPC_CompletedBusVehicleWriter>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_IHPC_CompletedBusVehicleType());
+
+ Bind<IXmlTypeWriter>().To<CIF_HEV_S2_CompletedBusVehicleWriter>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_S2_CompletedBusVehicleType());
+
+ Bind<IXmlTypeWriter>().To<CIF_HEV_S3_CompletedBusVehicleWriter>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_S3_CompletedBusVehicleType());
+
+ Bind<IXmlTypeWriter>().To<CIF_HEV_S4_CompletedBusVehicleWriter>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_S4_CompletedBusVehicleType());
+
+ Bind<IXmlTypeWriter>().To<CIF_HEV_IEPC_S_CompletedBusVehicleWriter>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_IEPC_S_CompletedBusVehicleType());
+
+ Bind<IXmlTypeWriter>().To<CIF_PEV_E2_CompletedBusVehicleWriter>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEV_E2_CompletedBusVehicleType());
+
+ Bind<IXmlTypeWriter>().To<CIF_PEV_E3_CompletedBusVehicleWriter>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEV_E3_CompletedBusVehicleType());
+
+ Bind<IXmlTypeWriter>().To<CIF_PEV_E4_CompletedBusVehicleWriter>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEV_E4_CompletedBusVehicleType());
+
+ Bind<IXmlTypeWriter>().To<CIF_PEV_IEPC_CompletedBusVehicleWriter>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEV_IEPC_CompletedBusVehicleType());
+
Bind<IXmlTypeWriter>().To<CIF_ExemptedCompletedBusVehicleWriter>().When(AccessedViaCIFFactory)
.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetExemptedCompletedBusVehicleType());
#endregion
+
#region VehicleGroups
Bind<IReportVehicleOutputGroup>().To<GeneralVehicleOutputSequenceGroupCif>().When(AccessedViaCIFFactory)
.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetGeneralVehicleSequenceGroupWriter());
@@ -265,21 +349,36 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetConventionalLorryVehicleSequenceGroupWriter());
Bind<IReportOutputGroup>().To<HEV_LorryVehicleTypeGroupCIF>().When(AccessedViaCIFFactory)
.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_LorryVehicleTypeGroup());
- Bind<IReportOutputGroup>().To<HEV_VehicleSequenceGroupWriter>().When(AccessedViaCIFFactory)
- .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_VehicleSequenceGroupWriter());
+ Bind<IReportOutputGroup>().To<HEV_LorryVehicleSequenceGroupWriter>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_LorryVehicleSequenceGroupWriter());
Bind<IReportOutputGroup>().To<PEV_LorryVehicleTypeGroupCIF>().When(AccessedViaCIFFactory)
.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEV_LorryVehicleTypeGroup());
- Bind<IReportOutputGroup>().To<PEV_VehicleSequenceGroupWriter>().When(AccessedViaCIFFactory)
- .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEV_VehicleSequenceGroupWriter());
+ Bind<IReportOutputGroup>().To<PEV_LorryVehicleSequenceGroupWriter>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEV_LorryVehicleSequenceGroupWriter());
Bind<IReportOutputGroup>().To<CompletedBusVehicleTypeGroup>().When(AccessedViaCIFFactory)
.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetCompletedBusVehicleTypeGroup());
-
+ Bind<IReportOutputGroup>().To<PEVCompletedBusVehicleTypeGroup>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEVCompletedBusVehicleTypeGroup());
+ Bind<IReportOutputGroup>().To<ExemptedCompletedBusVehicleTypeGroup>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetExemptedCompletedBusVehicleTypeGroup());
+
+ Bind<IReportOutputGroup>().To<HEV_CompletedBusVehicleSequenceGroupWriter>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_CompletedBusVehicleSequenceGroupWriter());
+ Bind<IReportOutputGroup>().To<PEV_CompletedBusVehicleSequenceGroupWriter>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEV_CompletedBusVehicleSequenceGroupWriter());
+ Bind<IReportOutputGroup>().To<ConventionalCompletedBusVehicleSequenceGroupCIF>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetConventionalCompletedBusVehicleSequenceGroupWriter());
+
#endregion
#region ComponentGroups
Bind<IReportOutputGroup>().To<EngineGroup>().When(AccessedViaCIFFactory)
.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetEngineGroup());
- Bind<IReportOutputGroup>().To<TransmissionGroup>().When(AccessedViaCIFFactory)
+ Bind<IReportOutputGroup>().To<TransmissionGroupWithGearbox>().When(AccessedViaCIFFactory)
.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetTransmissionGroup());
+ Bind<IReportOutputGroup>().To<TransmissionGroupWithoutGearbox>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetTransmissionGroupNoGearbox());
+ Bind<IReportOutputGroup>().To<IEPCTransmissionGroup>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetIEPCTransmissionGroup());
Bind<IReportOutputGroup>().To<AxleWheelsGroup>().When(AccessedViaCIFFactory)
.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetAxleWheelsGroup());
Bind<IReportOutputGroup>().To<ElectricMachineGroup>().When(AccessedViaCIFFactory)
@@ -288,12 +387,27 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetREESSGroup());
Bind<IReportOutputGroup>().To<LorryAuxGroup>().When(AccessedViaCIFFactory).
NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetLorryAuxGroup());
- Bind<IReportOutputGroup>().To<CompletedBusAuxGroup>().When(AccessedViaCIFFactory)
- .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetCompletedBusAuxGroup());
+ Bind<IReportOutputGroup>().To<ConventionalCompletedBusAuxGroup>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetConventionalCompletedBusAuxGroup());
+ Bind<IReportOutputGroup>().To<HEV_Px_IHPCompletedBusAuxGroup>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_Px_IHPC_CompletedBusAuxGroup());
+ Bind<IReportOutputGroup>().To<HEV_Sx_CompletedBusAuxGroup>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_Sx_CompletedBusAuxGroup());
+ Bind<IReportOutputGroup>().To<PEVCompletedBusAuxGroup>().When(AccessedViaCIFFactory)
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEV_CompletedBusAuxGroup());
+
#endregion
+ #region ADAS
+ Bind<ICIFAdasType>().To<CIFConventionalAdasType>()
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetConventionalADASType());
+ Bind<ICIFAdasType>().To<CIFHevAdasType>()
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEVADASType());
+ Bind<ICIFAdasType>().To<CIFPevAdasType>()
+ .NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEVADASType());
+ #endregion ADAS
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/AbstractCIFGroupWriter.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/AbstractCIFGroupWriter.cs
index 6e09eea23106306656c7bcacf0f124ca65981a9d..5f5ce5e906a320ad773578b46e929541cc7d6d15 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/AbstractCIFGroupWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/AbstractCIFGroupWriter.cs
@@ -13,7 +13,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
{
public abstract class AbstractCIFGroupWriter : IReportOutputGroup
{
- protected XNamespace _mrf = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9";
+ //protected XNamespace _mrf = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9";
protected XNamespace _cif = "urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9";
protected readonly ICustomerInformationFileFactory _cifFactory;
@@ -27,5 +27,25 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public abstract IList<XElement> GetElements(IDeclarationInputDataProvider inputData);
#endregion
+
+ protected virtual IVehicleDeclarationInputData GetVehicle(IDeclarationInputDataProvider inputData)
+ {
+ if (inputData is IMultistepBusInputDataProvider multistep) {
+ return multistep.JobInputData.PrimaryVehicle.Vehicle;
+ } else {
+ return inputData.JobInputData.Vehicle;
+ }
+ }
+ }
+
+ public abstract class AbstractCifXmlType
+ {
+ protected XNamespace _cif = "urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9";
+ protected readonly ICustomerInformationFileFactory _cifFactory;
+
+ protected AbstractCifXmlType(ICustomerInformationFileFactory cifFactory)
+ {
+ _cifFactory = cifFactory;
+ }
}
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/CIFAdasTypes.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/CIFAdasTypes.cs
new file mode 100644
index 0000000000000000000000000000000000000000..144fb1f962f77dc83ad0a8e8463d6f0322131335
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/CIFAdasTypes.cs
@@ -0,0 +1,69 @@
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter
+{
+ public interface ICIFAdasType
+ {
+ XElement GetXmlType(IAdvancedDriverAssistantSystemDeclarationInputData adas);
+ }
+
+ internal class CIFConventionalAdasType : AbstractCifXmlType, ICIFAdasType
+ {
+ public CIFConventionalAdasType(ICustomerInformationFileFactory mrfFactory) : base(mrfFactory) { }
+
+ #region Overrides of AbstractMRFComponentWriter
+
+ public XElement GetXmlType(IAdvancedDriverAssistantSystemDeclarationInputData inputData)
+ {
+ return new XElement(_cif + XMLNames.Vehicle_ADAS,
+ new XElement(_cif + XMLNames.Vehicle_ADAS_EngineStopStart, inputData.EngineStopStart),
+ new XElement(_cif + "EcoRollWithoutEngineStopStart",
+ inputData.EcoRoll == EcoRollType.WithoutEngineStop),
+ new XElement(_cif + "EcoRollWithEngineStopStart",
+ inputData.EcoRoll == EcoRollType.WithEngineStop),
+ new XElement(_cif + XMLNames.Vehicle_ADAS_PCC,
+ inputData.PredictiveCruiseControl != PredictiveCruiseControlType.None));
+ }
+
+ #endregion
+
+
+ }
+
+ internal class CIFHevAdasType : AbstractCifXmlType, ICIFAdasType
+ {
+ public CIFHevAdasType(ICustomerInformationFileFactory mrfFactory) : base(mrfFactory) { }
+
+ #region Overrides of AbstractMrfXmlType
+
+ public XElement GetXmlType(IAdvancedDriverAssistantSystemDeclarationInputData inputData)
+ {
+ return new XElement(_cif + XMLNames.Vehicle_ADAS,
+ new XElement(_cif + XMLNames.Vehicle_ADAS_EngineStopStart, inputData.EngineStopStart),
+ new XElement(_cif + XMLNames.Vehicle_ADAS_PCC, inputData.PredictiveCruiseControl != PredictiveCruiseControlType.None)
+ );
+ }
+
+ #endregion
+ }
+
+ internal class CIFPevAdasType : AbstractCifXmlType, ICIFAdasType
+ {
+ public CIFPevAdasType(ICustomerInformationFileFactory mrfFactory) : base(mrfFactory) { }
+
+ #region Overrides of AbstractMrfXmlType
+
+ public XElement GetXmlType(IAdvancedDriverAssistantSystemDeclarationInputData inputData)
+ {
+ return new XElement(_cif + XMLNames.Vehicle_ADAS,
+ new XElement(_cif + XMLNames.Vehicle_ADAS_PCC, inputData.PredictiveCruiseControl != PredictiveCruiseControlType.None)
+ );
+ }
+
+ #endregion
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/ComponentGroupWriters.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/ComponentGroupWriters.cs
index 70f1bb8b554d086289052a911279ecfc26940ac4..83688fbcc3146cb7c0712eeee5165678252dd3a3 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/ComponentGroupWriters.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/ComponentGroupWriters.cs
@@ -5,10 +5,12 @@ using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
using TUGraz.VectoCommon.BusAuxiliaries;
+using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter;
using TUGraz.VectoCore.Utils;
@@ -22,7 +24,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
{
- var engine = inputData.JobInputData.Vehicle.Components.EngineInputData;
+ var vehicle = GetVehicle(inputData);
+ var engine = vehicle.Components.EngineInputData;
+
var fuelTypesXElement = new XElement(_cif + XMLNames.Report_Vehicle_FuelTypes);
var fuelTypes = new HashSet<FuelType>();
@@ -39,7 +43,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
return new List<XElement>() {
new XElement(_cif + "EngineRatedPower", engine.RatedPowerDeclared.ValueAsUnit("kW")),
- new XElement(_cif + "EngineCapacity", engine.Displacement.ValueAsUnit("ltr")),
+ new XElement(_cif + "EngineCapacity", engine.Displacement.ValueAsUnit("ltr", 1)),
fuelTypesXElement
};
}
@@ -48,15 +52,17 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
}
- public class TransmissionGroup : AbstractCIFGroupWriter
+ public class TransmissionGroupWithGearbox : AbstractCIFGroupWriter
{
- public TransmissionGroup(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+ public TransmissionGroupWithGearbox(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
#region Overrides of AbstractCIFGroupWriter
public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
{
- var gearbox = inputData.JobInputData.Vehicle.Components.GearboxInputData;
+ var vehicle = GetVehicle(inputData);
+ var gearbox = vehicle.Components.GearboxInputData;
+
return new List<XElement>() {
new XElement(_cif + "TransmissionValues", gearbox.CertificationMethod.ToXMLFormat()),
new XElement(_cif + XMLNames.Gearbox_TransmissionType, gearbox.Type.ToXMLFormat()),
@@ -67,6 +73,43 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
#endregion
}
+ public class TransmissionGroupWithoutGearbox : AbstractCIFGroupWriter
+ {
+ public TransmissionGroupWithoutGearbox(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+
+ #region Overrides of AbstractCIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ //var vehicle = GetVehicle(inputData);
+ //var gearbox = vehicle.Components.GearboxInputData;
+ return new List<XElement>() {
+ new XElement(_cif + "NrOfGears", 1)
+ };
+ }
+
+ #endregion
+ }
+
+ public class IEPCTransmissionGroup : AbstractCIFGroupWriter
+ {
+ public IEPCTransmissionGroup(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+
+ #region Overrides of AbstractCIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var vehicle = GetVehicle(inputData);
+ var iepc = vehicle.Components.IEPC;
+
+ return new List<XElement>() {
+ new XElement(_cif + "NrOfGears", iepc.Gears.Count)
+ };
+ }
+
+ #endregion
+ }
+
public class AxleWheelsGroup : AbstractCIFGroupWriter
{
public AxleWheelsGroup(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
@@ -75,7 +118,8 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
{
- var axleWheels = inputData.JobInputData.Vehicle.Components.AxleWheels;
+ var vehicle = GetVehicle(inputData);
+ var axleWheels = vehicle.Components.AxleWheels;
double averageRRC = 0;
var result = new List<XElement>();
int axleCount = 0;
@@ -127,17 +171,16 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
var result = new List<XElement>();
Watt totalRatedPropulsionPower = null;
IList<IElectricMotorVoltageLevel> voltageLevels = null;
- if (inputData.JobInputData.Vehicle.ArchitectureID == ArchitectureID.S_IEPC || inputData.JobInputData.Vehicle.ArchitectureID == ArchitectureID.E_IEPC)
- {
- totalRatedPropulsionPower = inputData.JobInputData.Vehicle.Components.IEPC.R85RatedPower;
- voltageLevels = inputData.JobInputData.Vehicle.Components.IEPC.VoltageLevels.ToList();
+ var vehicle = GetVehicle(inputData);
+ if (vehicle.ArchitectureID == ArchitectureID.S_IEPC || vehicle.ArchitectureID == ArchitectureID.E_IEPC) {
+ totalRatedPropulsionPower = vehicle.Components.IEPC.R85RatedPower;
+ voltageLevels = vehicle.Components.IEPC.VoltageLevels.ToList();
- }
- else {
+ } else {
voltageLevels = new List<IElectricMotorVoltageLevel>();
- var propulsionElectricMachines = inputData.JobInputData.Vehicle.Components.ElectricMachines.Entries
+ var propulsionElectricMachines = vehicle.Components.ElectricMachines.Entries
.Where(e => e.Position != PowertrainPosition.GEN);
- totalRatedPropulsionPower = propulsionElectricMachines.Sum((e => e.ElectricMachine.R85RatedPower));
+ totalRatedPropulsionPower = propulsionElectricMachines.Sum((e => e.ElectricMachine.R85RatedPower * e.Count));
var groupedVoltageLevels = propulsionElectricMachines
.SelectMany(electricMachine => electricMachine.ElectricMachine.VoltageLevels).GroupBy((level => level.VoltageLevel));
foreach (IGrouping<Volt, IElectricMotorVoltageLevel> electricMotorVoltageLevels in groupedVoltageLevels) {
@@ -145,7 +188,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
}
}
- result.Add(new XElement(_cif + "TotalRatedPropulsionPower", totalRatedPropulsionPower.ValueAsUnit("kW")));
+ result.Add(new XElement(_cif + "TotalRatedPropulsionPower", totalRatedPropulsionPower.ValueAsUnit("kW", 0)));
var voltageLevelsXElement = new XElement(_cif + "VoltageLevels");
result.Add(voltageLevelsXElement);
@@ -153,7 +196,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
foreach (var electricMotorVoltageLevel in voltageLevels)
{
var voltageLevel = new XElement(_cif + XMLNames.ElectricMachine_VoltageLevel,
- new XAttribute("voltage", electricMotorVoltageLevel.VoltageLevel.ToXMLFormat(0)),
+ voltageLevels.Count > 1 ? new XAttribute("voltage", electricMotorVoltageLevel.VoltageLevel.ToXMLFormat(0)) : null,
new XElement(_cif + "MaxContinuousPropulsionPower",
(electricMotorVoltageLevel.ContinuousTorque * electricMotorVoltageLevel.ContinuousTorqueSpeed)
.ToXMLFormat(0)));
@@ -175,40 +218,185 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
{
- var reess = inputData.JobInputData.Vehicle.Components.ElectricStorage;
+ var vehicle = GetVehicle(inputData);
+ var reess = vehicle.Components.ElectricStorage;
var batteries = reess.ElectricStorageElements
.Where(es => es.REESSPack.StorageType == REESSType.Battery)
- .Select(es => es.REESSPack as IBatteryPackDeclarationInputData);
- var totalStorageCapacity = batteries
- .Sum(bp => bp.Capacity);
- var totalUsableCapacity = batteries.Sum(bp => bp.TotalUsableCapacityInSimulation());
+ .Select(es => es.REESSPack as IBatteryPackDeclarationInputData).ToArray();
+ var capacitors = reess.ElectricStorageElements.Where(es => es.REESSPack.StorageType == REESSType.SuperCap)
+ .Select(es => es.REESSPack as ISuperCapDeclarationInputData).ToArray();
+
+ var totalStorageCapacity =
+ (batteries.Length > 0 ? batteries.Sum(bp => bp.TotalStorageCapacity()) : 0.SI<WattSecond>()) +
+ (capacitors.Length > 0 ? capacitors.Sum(cap => GetStorageCapacity(cap)) : 0.SI<WattSecond>());
+ var totalUsableCapacity = (batteries.Length > 0
+ ? batteries.Sum(bp => bp.TotalUsableCapacityInSimulation())
+ : 0.SI<WattSecond>()) +
+ (capacitors.Length > 0
+ ? capacitors.Sum(cap => GetTotalUsableCapacityInSimulation(cap))
+ : 0.SI<WattSecond>());
+
return new List<XElement>() {
- new XElement(_cif + "TotalStorageCapacity", totalUsableCapacity.ValueAsUnit("Ah", 0)),
- new XElement(_cif + "UsableStorageCapacity", totalStorageCapacity.ValueAsUnit("Ah", 0))
+ new XElement(_cif + "TotalStorageCapacity", totalUsableCapacity.ValueAsUnit("kWh", 0)),
+ new XElement(_cif + "UsableStorageCapacity", totalStorageCapacity.ValueAsUnit("kWh", 0))
};
}
+ private WattSecond GetTotalUsableCapacityInSimulation(ISuperCapDeclarationInputData cap)
+ {
+ return GetStorageCapacity(cap) * 0.8;
+ }
+
+ private WattSecond GetStorageCapacity(ISuperCapDeclarationInputData cap)
+ {
+ var voltageRange = cap.MaxVoltage - cap.MinVoltage;
+ //var avgVoltage = (cap.MaxVoltage + cap.MinVoltage) / 2.0;
+ return cap.Capacity * voltageRange * voltageRange / 2.0;
+ }
+
#endregion
}
- public class CompletedBusAuxGroup : AbstractCIFGroupWriter
+ public class ConventionalCompletedBusAuxGroup : AbstractCIFGroupWriter
{
- public CompletedBusAuxGroup(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+ public ConventionalCompletedBusAuxGroup(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
#region Overrides of AbstractCIFGroupWriter
public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
{
- var consolidatedAuxData = ((IMultistageBusInputDataProvider)inputData).JobInputData.ConsolidateManufacturingStage.Vehicle.Components.BusAuxiliaries;
- return new List<XElement>() {
- new XElement(_cif + XMLNames.BusAux_HVAC,
- new XElement(_cif + XMLNames.Bus_SystemConfiguration,
- consolidatedAuxData.HVACAux.SystemConfiguration.ToXmlFormat()),
- new XElement(_cif + "AuxiliaryHeaterPower", consolidatedAuxData.HVACAux.AuxHeaterPower),
- new XElement(_cif + XMLNames.Bus_DoubleGlazing, consolidatedAuxData.HVACAux.DoubleGlazing))
+ var multistage = inputData as IMultistepBusInputDataProvider;
+ if (multistage == null) {
+ throw new VectoException("BusAuxGroupWriter requires MultistepInputData");
+ }
+
+ var completedBusAux = multistage.JobInputData.ConsolidateManufacturingStage.Vehicle.Components.BusAuxiliaries;
+ var primaryBusAux = multistage.JobInputData.PrimaryVehicle.Vehicle.Components.BusAuxiliaries;
+ var retVal = new List<XElement>();
+ retVal.Add(new XElement(_cif + XMLNames.BusAux_SteeringPump, GetSteeringPumpTech(completedBusAux, primaryBusAux)));
+ retVal.Add(new XElement(_cif + XMLNames.BusAux_ElectricSystem, GetElectricSystem(completedBusAux, primaryBusAux)));
+ retVal.Add(new XElement(_cif + XMLNames.BusAux_PneumaticSystem, GetPneumaticSystem(completedBusAux, primaryBusAux)));
+ retVal.Add(new XElement(_cif + XMLNames.BusAux_HVAC, GetHVAC(completedBusAux, primaryBusAux)));
+ return retVal;
+
+ }
+
+ protected virtual IList<XElement> GetPneumaticSystem(
+ IBusAuxiliariesDeclarationData completedBusAux, IBusAuxiliariesDeclarationData primaryBusAux)
+ {
+ return new[] {
+ new XElement(_cif + XMLNames.BusAux_PneumaticSystem_SmartcompressionSystem,
+ primaryBusAux.PneumaticSupply.SmartAirCompression),
+ new XElement(_cif + XMLNames.BusAux_PneumaticSystem_SmartRegenerationSystem,
+ primaryBusAux.PneumaticSupply.SmartRegeneration)
+ };
+ }
+
+ protected virtual IList<XElement> GetElectricSystem(
+ IBusAuxiliariesDeclarationData completedBusAux, IBusAuxiliariesDeclarationData primaryBusAux)
+ {
+ var retVal = new List<XElement>() {
+ new XElement(_cif + "AlternatorTechnology", primaryBusAux.ElectricSupply.AlternatorTechnology.ToXMLFormat())
+ };
+ if (primaryBusAux.ElectricSupply.AlternatorTechnology == AlternatorType.Smart) {
+ retVal.Add(new XElement(_cif + "MaxAlternatorPower",
+ primaryBusAux.ElectricSupply.Alternators.Sum(x => x.RatedCurrent * x.RatedVoltage).ValueAsUnit("kW", 0)));
+ retVal.Add(new XElement(_cif + "ElectricStorageCapacity",
+ primaryBusAux.ElectricSupply.ElectricStorage.Sum(x => x.ElectricStorageCapacity).ValueAsUnit("kWh", 0)));
+ }
+
+ return retVal;
+ }
+
+ protected virtual IList<XElement> GetSteeringPumpTech(
+ IBusAuxiliariesDeclarationData completedBusAux, IBusAuxiliariesDeclarationData primaryBusAux)
+ {
+ return primaryBusAux.SteeringPumpTechnology.Select(x => new XElement(_cif + XMLNames.BusAux_Technology, x))
+ .ToArray();
+ }
+
+ protected virtual IList<XElement> GetHVAC(IBusAuxiliariesDeclarationData completedBusAux,
+ IBusAuxiliariesDeclarationData primaryBusAux)
+ {
+ return new[] {
+ new XElement(_cif + XMLNames.Bus_SystemConfiguration,
+ completedBusAux.HVACAux.SystemConfiguration.ToXmlFormat()),
+ new XElement(_cif + "AuxiliaryHeaterPower",
+ completedBusAux.HVACAux.AuxHeaterPower.ValueAsUnit("kW", 0)),
+ new XElement(_cif + XMLNames.Bus_DoubleGlazing, completedBusAux.HVACAux.DoubleGlazing)
+ };
+ }
+
+ #endregion
+ }
+
+ public class HEV_Px_IHPCompletedBusAuxGroup : ConventionalCompletedBusAuxGroup
+ {
+ public HEV_Px_IHPCompletedBusAuxGroup(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+ }
+
+ //public class HEV_Px_IHPCompleteHEV_Sx_CompletedBusAuxGroupdBusAuxGroup : ConventionalCompletedBusAuxGroup
+ //{
+ // public HEV_Px_IHPCompleteHEV_Sx_CompletedBusAuxGroupdBusAuxGroup(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+ //}
+
+ public class HEV_Sx_CompletedBusAuxGroup : ConventionalCompletedBusAuxGroup
+ {
+ public HEV_Sx_CompletedBusAuxGroup(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+
+ protected override IList<XElement> GetPneumaticSystem(
+ IBusAuxiliariesDeclarationData completedBusAux, IBusAuxiliariesDeclarationData primaryBusAux)
+ {
+ return new[] {
+ //new XElement(_cif + XMLNames.BusAux_PneumaticSystem_SmartcompressionSystem,
+ // primaryBusAux.PneumaticSupply.SmartAirCompression),
+ new XElement(_cif + XMLNames.BusAux_PneumaticSystem_SmartRegenerationSystem,
+ primaryBusAux.PneumaticSupply.SmartRegeneration)
+ };
+ }
+ }
+
+ public class PEVCompletedBusAuxGroup : ConventionalCompletedBusAuxGroup
+ {
+ public PEVCompletedBusAuxGroup(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+
+ #region Overrides of ConventionalCompletedBusAuxGroup
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var multistage = inputData as IMultistepBusInputDataProvider;
+ if (multistage == null) {
+ throw new VectoException("BusAuxGroupWriter requires MultistepInputData");
+ }
+
+ var completedBusAux = multistage.JobInputData.ConsolidateManufacturingStage.Vehicle.Components.BusAuxiliaries;
+ var primaryBusAux = multistage.JobInputData.PrimaryVehicle.Vehicle.Components.BusAuxiliaries;
+ var retVal = new List<XElement>();
+ retVal.Add(new XElement(_cif + XMLNames.BusAux_SteeringPump, GetSteeringPumpTech(completedBusAux, primaryBusAux)));
+ //retVal.Add(new XElement(_cif + XMLNames.BusAux_ElectricSystem, GetElectricSystem(completedBusAux, primaryBusAux)));
+ retVal.Add(new XElement(_cif + XMLNames.BusAux_PneumaticSystem, GetPneumaticSystem(completedBusAux, primaryBusAux)));
+ retVal.Add(new XElement(_cif + XMLNames.BusAux_HVAC, GetHVAC(completedBusAux, primaryBusAux)));
+ return retVal;
+
+ }
+
+ protected override IList<XElement> GetElectricSystem(IBusAuxiliariesDeclarationData completedBusAux, IBusAuxiliariesDeclarationData primaryBusAux)
+ {
+ return new XElement[] { };
+ }
+
+ protected override IList<XElement> GetPneumaticSystem(
+ IBusAuxiliariesDeclarationData completedBusAux, IBusAuxiliariesDeclarationData primaryBusAux)
+ {
+ return new[] {
+ //new XElement(_cif + XMLNames.BusAux_PneumaticSystem_SmartcompressionSystem,
+ // primaryBusAux.PneumaticSupply.SmartAirCompression),
+ new XElement(_cif + XMLNames.BusAux_PneumaticSystem_SmartRegenerationSystem,
+ primaryBusAux.PneumaticSupply.SmartRegeneration)
};
}
#endregion
}
+
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/VehicleGroups.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/VehicleGroups.cs
index a37ea8e21557993eacf1c39d4dfd1fb1f689447d..1ef41b05e93d8d4873cd60c5f61b4dac220f9e89 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/VehicleGroups.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/VehicleGroups.cs
@@ -4,10 +4,13 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
+using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
+using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter;
using TUGraz.VectoCore.Utils;
@@ -35,7 +38,8 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
new XElement(_cif + XMLNames.Vehicle_VehicleCategory, vehicleData.LegislativeClass.ToXMLFormat()),
new XElement(_cif + XMLNames.Vehicle_AxleConfiguration, vehicleData.AxleConfiguration.ToXMLFormat()),
new XElement(_cif + XMLNames.Vehicle_TPMLM, XMLHelper.ValueAsUnit(vehicleData.GrossVehicleMassRating, "kg")),
- new XElement(_cif + XMLNames.Report_Vehicle_VehicleGroup, vehicleData.VehicleCategory.ToXMLFormat())
+ new XElement(_cif + XMLNames.Report_Vehicle_VehicleGroup, DeclarationData.GetVehicleGroupGroup(vehicleData).GetClassNumber()),
+ new XElement(_cif + "VehicleGroupCO2", DeclarationData.GetVehicleGroupCO2StandardsGroup(vehicleData).ToXMLFormat()),
};
return result;
@@ -45,7 +49,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
#region Implementation of IReportCompletedBusOutputGroup
- public IList<XElement> GetElements(IMultistageBusInputDataProvider multiStageInputDataProvider)
+ public IList<XElement> GetElements(IMultistepBusInputDataProvider multiStageInputDataProvider)
{
var consolidatedVehicleData = multiStageInputDataProvider.JobInputData.ConsolidateManufacturingStage.Vehicle;
var primary = multiStageInputDataProvider.JobInputData.PrimaryVehicle.Vehicle;
@@ -54,7 +58,8 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
new XElement(_cif + XMLNames.Vehicle_VehicleCategory, consolidatedVehicleData.LegislativeClass.ToXMLFormat()),
new XElement(_cif + XMLNames.Vehicle_AxleConfiguration, primary.AxleConfiguration.ToXMLFormat()),
new XElement(_cif + XMLNames.Vehicle_TPMLM, XMLHelper.ValueAsUnit(consolidatedVehicleData.GrossVehicleMassRating, "kg")),
- new XElement(_cif + XMLNames.Report_Vehicle_VehicleGroup, consolidatedVehicleData.VehicleCategory.ToXMLFormat())
+ new XElement(_cif + XMLNames.Report_Vehicle_VehicleGroup, DeclarationData.GetVehicleGroupGroup(consolidatedVehicleData).GetClassNumber()),
+ new XElement(_cif + "VehicleGroupCO2", DeclarationData.GetVehicleGroupCO2StandardsGroup(multiStageInputDataProvider).ToXMLFormat()),
};
return result;
}
@@ -73,7 +78,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
{
var vehicleData = inputData.JobInputData.Vehicle;
var result = new List<XElement>() {
- new XElement(_cif + "VehicleGroupCO2", "todo"),
new XElement(_cif + XMLNames.Component_Manufacturer, vehicleData.Manufacturer),
new XElement(_cif + XMLNames.Component_ManufacturerAddress, vehicleData.ManufacturerAddress),
new XElement(_cif + XMLNames.Component_Model, vehicleData.Model),
@@ -114,6 +118,29 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
#endregion
}
+ public class ConventionalCompletedBusVehicleSequenceGroupCIF : AbstractCIFGroupWriter
+ {
+ public ConventionalCompletedBusVehicleSequenceGroupCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+
+ #region Overrides of AbstractCIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var multistep = inputData as IMultistepBusInputDataProvider;
+ if (multistep == null) {
+ throw new VectoException("Completed Bus CIF requires bus input data");
+ }
+ var vehicleData = multistep.JobInputData.PrimaryVehicle.Vehicle;
+ return new List<XElement>() {
+ new XElement(_cif + "WasteHeatRecovery",
+ vehicleData.Components.EngineInputData.WHRType != WHRType.None),
+ new XElement(_cif + XMLNames.Vehicle_DualFuelVehicle, vehicleData.DualFuelVehicle)
+ };
+ }
+
+ #endregion
+ }
+
public class HEV_LorryVehicleTypeGroupCIF : AbstractCIFGroupWriter
{
public HEV_LorryVehicleTypeGroupCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
@@ -125,7 +152,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
var result = new List<XElement>();
result.AddRange(_cifFactory.GetGeneralVehicleSequenceGroupWriter().GetElements(inputData.JobInputData.Vehicle));
result.AddRange(_cifFactory.GetLorryGeneralVehicleSequenceGroupWriter().GetElements(inputData));
- result.AddRange(_cifFactory.GetHEV_VehicleSequenceGroupWriter().GetElements(inputData));
+ result.AddRange(_cifFactory.GetHEV_LorryVehicleSequenceGroupWriter().GetElements(inputData));
return result;
}
@@ -143,7 +170,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
var result = new List<XElement>();
result.AddRange(_cifFactory.GetGeneralVehicleSequenceGroupWriter().GetElements(inputData.JobInputData.Vehicle));
result.AddRange(_cifFactory.GetLorryGeneralVehicleSequenceGroupWriter().GetElements(inputData));
- result.AddRange(_cifFactory.GetPEV_VehicleSequenceGroupWriter().GetElements(inputData));
+ result.AddRange(_cifFactory.GetPEV_LorryVehicleSequenceGroupWriter().GetElements(inputData));
return result;
}
@@ -152,9 +179,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
}
- public class HEV_VehicleSequenceGroupWriter : AbstractCIFGroupWriter
+ public class HEV_LorryVehicleSequenceGroupWriter : AbstractCIFGroupWriter
{
- public HEV_VehicleSequenceGroupWriter(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+ public HEV_LorryVehicleSequenceGroupWriter(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
#region Overrides of AbstractCIFGroupWriter
@@ -168,7 +195,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
new XElement(_cif + "OffVehicleChargingCapability", ovCc)
});
if (ovCc) {
- result.Add(new XElement(_cif + "OffVehicleChargingMaxPower", inputData.JobInputData.Vehicle.MaxChargingPower.ValueAsUnit("kW")));
+ result.Add(new XElement(_cif + "OffVehicleChargingMaxPower", inputData.JobInputData.Vehicle.MaxChargingPower.ValueAsUnit("kW", 1)));
}
return result;
}
@@ -177,23 +204,53 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
}
- public class PEV_VehicleSequenceGroupWriter : AbstractCIFGroupWriter
+ public class PEV_LorryVehicleSequenceGroupWriter : AbstractCIFGroupWriter
{
- public PEV_VehicleSequenceGroupWriter(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+ public PEV_LorryVehicleSequenceGroupWriter(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
#region Overrides of AbstractCIFGroupWriter
public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
{
var result = new List<XElement>();
- var ovCc = inputData.JobInputData.Vehicle.OvcHev;
+ var vehicle = GetVehicle(inputData);
+ var ovCc = vehicle.OvcHev;
result.AddRange(new List<XElement>() {
- new XElement(_cif + "PEVArchitecture", inputData.JobInputData.Vehicle.ArchitectureID.GetLabel()),
+ new XElement(_cif + "PEVArchitecture", vehicle.ArchitectureID.GetLabel()),
new XElement(_cif + "OffVehicleChargingCapability", ovCc)
});
if (ovCc)
{
- result.Add(new XElement(_cif + "OffVehicleChargingMaxPower", inputData.JobInputData.Vehicle.MaxChargingPower.ValueAsUnit("kW")));
+ result.Add(new XElement(_cif + "OffVehicleChargingMaxPower", vehicle.MaxChargingPower.ValueAsUnit("kW", 1)));
+ }
+ return result;
+ }
+
+ #endregion
+ }
+
+
+ public class HEV_CompletedBusVehicleSequenceGroupWriter : AbstractCIFGroupWriter
+ {
+ public HEV_CompletedBusVehicleSequenceGroupWriter(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+
+ #region Overrides of AbstractCIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var multistep = inputData as IMultistepBusInputDataProvider;
+ if (multistep == null) {
+ throw new VectoException("Completed Bus CIF requires bus input data");
+ }
+ var result = new List<XElement>();
+ var ovCc = multistep.JobInputData.PrimaryVehicle.Vehicle.OvcHev;
+ //result.AddRange(_cifFactory.GetConventionalCompletedBusVehicleSequenceGroupWriter().GetElements(inputData));
+ result.AddRange(new List<XElement>() {
+ new XElement(_cif + "HEVArchitecture", multistep.JobInputData.PrimaryVehicle.Vehicle.ArchitectureID.GetLabel()),
+ new XElement(_cif + "OffVehicleChargingCapability", ovCc)
+ });
+ if (ovCc) {
+ result.Add(new XElement(_cif + "OffVehicleChargingMaxPower", multistep.JobInputData.PrimaryVehicle.Vehicle.MaxChargingPower.ValueAsUnit("kW", 1)));
}
return result;
}
@@ -202,6 +259,33 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
}
+ public class PEV_CompletedBusVehicleSequenceGroupWriter : AbstractCIFGroupWriter
+ {
+ public PEV_CompletedBusVehicleSequenceGroupWriter(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+
+ #region Overrides of AbstractCIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var multistep = inputData as IMultistepBusInputDataProvider;
+ if (multistep == null) {
+ throw new VectoException("Completed Bus CIF requires bus input data");
+ }
+ var result = new List<XElement>();
+ var ovCc = multistep.JobInputData.PrimaryVehicle.Vehicle.OvcHev;
+ result.AddRange(new List<XElement>() {
+ new XElement(_cif + "PEVArchitecture", multistep.JobInputData.PrimaryVehicle.Vehicle.ArchitectureID.GetLabel()),
+ new XElement(_cif + "OffVehicleChargingCapability", ovCc)
+ });
+ if (ovCc) {
+ result.Add(new XElement(_cif + "OffVehicleChargingMaxPower", multistep.JobInputData.PrimaryVehicle.Vehicle.MaxChargingPower.ValueAsUnit("kW", 1)));
+ }
+ return result;
+ }
+
+ #endregion
+ }
+
public class CompletedBusVehicleTypeGroup : AbstractCIFGroupWriter
{
private XElement GetManufacturerAndAddress(string manufacturer, string manufacturerAddress, int stepCount)
@@ -217,10 +301,10 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
{
- var completedBusData = inputData as IMultistageBusInputDataProvider;
+ var completedBusData = inputData as IMultistepBusInputDataProvider;
if (completedBusData == null) {
throw new ArgumentException(
- $"{nameof(inputData)} must implement {nameof(IMultistageBusInputDataProvider)}");
+ $"{nameof(inputData)} must implement {nameof(IMultistepBusInputDataProvider)}");
}
var result = new List<XElement>();
result.AddRange(
@@ -231,9 +315,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
var consolidatedVehicle = completedBusData.JobInputData.ConsolidateManufacturingStage.Vehicle;
result.AddRange(new List<XElement>() {
- new XElement(_cif + XMLNames.CorrectedActualMass, consolidatedVehicle.CurbMassChassis),
+ new XElement(_cif + XMLNames.Component_Model, consolidatedVehicle.Model),
+ new XElement(_cif + XMLNames.CorrectedActualMass, consolidatedVehicle.CurbMassChassis.ValueAsUnit("kg", 0)),
new XElement(_cif + XMLNames.Vehicle_ZeroEmissionVehicle, consolidatedVehicle.ZeroEmissionVehicle),
new XElement(_cif + XMLNames.Vehicle_HybridElectricHDV, consolidatedVehicle.HybridElectricHDV),
+ new XElement(_cif + "WasteHeatRecovery", completedBusData.JobInputData.PrimaryVehicle.Vehicle.Components.EngineInputData.WHRType != WHRType.None),
+ new XElement(_cif + XMLNames.Vehicle_DualFuelVehicle, consolidatedVehicle.DualFuelVehicle),
new XElement(_cif + XMLNames.Vehicle_RegisteredClass, consolidatedVehicle.RegisteredClass.ToXMLFormat()),
new XElement(_cif + "TotalNumberOfPassengers", consolidatedVehicle.NumberPassengerSeatsLowerDeck
+ consolidatedVehicle.NumberPassengerSeatsUpperDeck
@@ -245,7 +332,67 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
return result;
}
- private XElement GetManufacturers(IMultistageBusInputDataProvider completedBusData)
+ protected XElement GetManufacturers(IMultistepBusInputDataProvider completedBusData)
+ {
+ var manufacturers = new XElement(_cif + "Manufacturers",
+ GetManufacturerAndAddress(completedBusData.JobInputData.PrimaryVehicle.Vehicle.Manufacturer,
+ completedBusData.JobInputData.PrimaryVehicle.Vehicle.ManufacturerAddress, 1));
+ foreach (var step in completedBusData.JobInputData.ManufacturingStages) {
+ manufacturers.Add(GetManufacturerAndAddress(step.Vehicle.Manufacturer, step.Vehicle.ManufacturerAddress,
+ step.StepCount));
+ }
+
+ return manufacturers;
+ }
+
+ #endregion
+ }
+
+ public class PEVCompletedBusVehicleTypeGroup : AbstractCIFGroupWriter
+ {
+ private XElement GetManufacturerAndAddress(string manufacturer, string manufacturerAddress, int stepCount)
+ {
+ return new XElement(_cif + "Step",
+ new XAttribute(XMLNames.ManufacturingStep_StepCount, stepCount),
+ new XElement(_cif + XMLNames.Component_Manufacturer, manufacturer),
+ new XElement(_cif + XMLNames.Component_ManufacturerAddress, manufacturerAddress));
+ }
+ public PEVCompletedBusVehicleTypeGroup(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+
+ #region Overrides of AbstractCIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var completedBusData = inputData as IMultistepBusInputDataProvider;
+ if (completedBusData == null) {
+ throw new ArgumentException(
+ $"{nameof(inputData)} must implement {nameof(IMultistepBusInputDataProvider)}");
+ }
+ var result = new List<XElement>();
+ result.AddRange(
+ _cifFactory.GetGeneralVehicleSequenceGroupWriterCompletedBus().GetElements(completedBusData));
+ result.Add(GetManufacturers(completedBusData));
+
+
+
+ var consolidatedVehicle = completedBusData.JobInputData.ConsolidateManufacturingStage.Vehicle;
+ result.AddRange(new List<XElement>() {
+ new XElement(_cif + XMLNames.Component_Model, consolidatedVehicle.Model),
+ new XElement(_cif + XMLNames.CorrectedActualMass, consolidatedVehicle.CurbMassChassis.ValueAsUnit("kg", 0)),
+ new XElement(_cif + XMLNames.Vehicle_ZeroEmissionVehicle, consolidatedVehicle.ZeroEmissionVehicle),
+ new XElement(_cif + XMLNames.Vehicle_HybridElectricHDV, consolidatedVehicle.HybridElectricHDV),
+ new XElement(_cif + XMLNames.Vehicle_RegisteredClass, consolidatedVehicle.RegisteredClass.ToXMLFormat()),
+ new XElement(_cif + "TotalNumberOfPassengers", consolidatedVehicle.NumberPassengerSeatsLowerDeck
+ + consolidatedVehicle.NumberPassengerSeatsUpperDeck
+ + consolidatedVehicle.NumberPassengersStandingLowerDeck
+ + consolidatedVehicle.NumberPassengersStandingUpperDeck),
+ !consolidatedVehicle.VehicleTypeApprovalNumber.IsNullOrEmpty() ? new XElement(_cif + XMLNames.VehicleTypeApprovalNumber, consolidatedVehicle.VehicleTypeApprovalNumber) : null
+ });
+
+ return result;
+ }
+
+ private XElement GetManufacturers(IMultistepBusInputDataProvider completedBusData)
{
var manufacturers = new XElement(_cif + "Manufacturers",
GetManufacturerAndAddress(completedBusData.JobInputData.PrimaryVehicle.Vehicle.Manufacturer,
@@ -260,4 +407,42 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
#endregion
}
+
+
+ public class ExemptedCompletedBusVehicleTypeGroup : CompletedBusVehicleTypeGroup
+ {
+ public ExemptedCompletedBusVehicleTypeGroup(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var completedBusData = inputData as IMultistepBusInputDataProvider;
+ if (completedBusData == null) {
+ throw new ArgumentException(
+ $"{nameof(inputData)} must implement {nameof(IMultistepBusInputDataProvider)}");
+ }
+ var result = new List<XElement>();
+ result.AddRange(
+ _cifFactory.GetGeneralVehicleSequenceGroupWriterCompletedBus().GetElements(completedBusData));
+ result.Add(GetManufacturers(completedBusData));
+
+
+
+ var consolidatedVehicle = completedBusData.JobInputData.ConsolidateManufacturingStage.Vehicle;
+ result.AddRange(new List<XElement>() {
+ new XElement(_cif + XMLNames.Component_Model, consolidatedVehicle.Model),
+ new XElement(_cif + XMLNames.CorrectedActualMass, consolidatedVehicle.CurbMassChassis.ValueAsUnit("kg", 0)),
+ new XElement(_cif + XMLNames.Vehicle_ZeroEmissionVehicle, consolidatedVehicle.ZeroEmissionVehicle),
+ new XElement(_cif + XMLNames.Vehicle_HybridElectricHDV, consolidatedVehicle.HybridElectricHDV),
+ new XElement(_cif + XMLNames.Vehicle_RegisteredClass, consolidatedVehicle.RegisteredClass.ToXMLFormat()),
+ new XElement(_cif + "TotalNumberOfPassengers", consolidatedVehicle.NumberPassengerSeatsLowerDeck
+ + consolidatedVehicle.NumberPassengerSeatsUpperDeck
+ + consolidatedVehicle.NumberPassengersStandingLowerDeck
+ + consolidatedVehicle.NumberPassengersStandingUpperDeck),
+ !consolidatedVehicle.VehicleTypeApprovalNumber.IsNullOrEmpty() ? new XElement(_cif + XMLNames.VehicleTypeApprovalNumber, consolidatedVehicle.VehicleTypeApprovalNumber) : null
+ });
+
+ return result;
+ }
+
+ }
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/VehicleWriter.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/VehicleWriter.cs
index 59c4c5d765841c00cb75e1b9505c99c6b366103a..d7dcb8a851b872310612d211dcfba85420275982 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/VehicleWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/VehicleWriter.cs
@@ -16,15 +16,16 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9.CIFWriter
{
public abstract class VehicleWriter : IXmlTypeWriter
- {
+ {
protected readonly ICustomerInformationFileFactory _cifFactory;
- protected readonly IManufacturerReportFactory _mrfFactory;
+ //protected readonly IManufacturerReportFactory _mrfFactory;
protected XNamespace _cif = "urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9";
+ protected XNamespace _xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
public VehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory)
{
_cifFactory = cifFactory;
- _mrfFactory = mrfFactory;
+ //_mrfFactory = mrfFactory;
}
@@ -37,15 +38,26 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
protected XElement GetRetarder(IDeclarationInputDataProvider inputData)
{
+ IRetarderInputData retarder;
+ if (inputData is IMultistepBusInputDataProvider multistage) {
+ retarder = multistage.JobInputData.PrimaryVehicle.Vehicle.Components.RetarderInputData;
+ } else {
+ retarder = inputData.JobInputData.Vehicle.Components.RetarderInputData;
+ }
return new XElement(_cif + XMLNames.Component_Retarder,
- inputData.JobInputData.Vehicle.Components.RetarderInputData.Type != RetarderType.None);
+ retarder.Type != RetarderType.None);
}
protected XElement GetAxleRatio(IDeclarationInputDataProvider inputData, bool optional = false)
{
- if (!optional || (inputData.JobInputData.Vehicle.Components.AxleGearInputData != null)) {
- return new XElement(_cif + "AxleRatio",
- inputData.JobInputData.Vehicle.Components.AxleGearInputData.Ratio.ToXMLFormat(3));
+ IAxleGearInputData axlegear;
+ if (inputData is IMultistepBusInputDataProvider multistage) {
+ axlegear = multistage.JobInputData.PrimaryVehicle.Vehicle.Components.AxleGearInputData;
+ } else {
+ axlegear = inputData.JobInputData.Vehicle.Components.AxleGearInputData;
+ }
+ if (!optional || (axlegear != null)) {
+ return new XElement(_cif + "AxleRatio", axlegear.Ratio.ToXMLFormat(3));
} else {
return null;
}
@@ -71,7 +83,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
_cifFactory.GetGeneralVehicleSequenceGroupWriter().GetElements(inputData.JobInputData.Vehicle),
_cifFactory.GetLorryGeneralVehicleSequenceGroupWriter().GetElements(inputData),
_cifFactory.GetConventionalLorryVehicleSequenceGroupWriter().GetElements(inputData),
- _mrfFactory.GetConventionalADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetConventionalADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
_cifFactory.GetEngineGroup().GetElements(inputData),
_cifFactory.GetTransmissionGroup().GetElements(inputData),
GetRetarder(inputData),
@@ -97,7 +109,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
{
return new XElement(_cif + XMLNames.Component_Vehicle,
_cifFactory.GetHEV_LorryVehicleTypeGroup().GetElements(inputData),
- _mrfFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
_cifFactory.GetEngineGroup().GetElements(inputData),
_cifFactory.GetElectricMachineGroup().GetElements(inputData),
_cifFactory.GetREESSGroup().GetElements(inputData),
@@ -123,7 +135,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
{
return new XElement(_cif + XMLNames.Component_Vehicle,
_cifFactory.GetHEV_LorryVehicleTypeGroup().GetElements(inputData),
- _mrfFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
_cifFactory.GetEngineGroup().GetElements(inputData),
_cifFactory.GetElectricMachineGroup().GetElements(inputData),
_cifFactory.GetREESSGroup().GetElements(inputData),
@@ -149,10 +161,11 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
{
return new XElement(_cif + XMLNames.Component_Vehicle,
_cifFactory.GetHEV_LorryVehicleTypeGroup().GetElements(inputData),
- _mrfFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
_cifFactory.GetEngineGroup().GetElements(inputData),
_cifFactory.GetElectricMachineGroup().GetElements(inputData),
_cifFactory.GetREESSGroup().GetElements(inputData),
+ _cifFactory.GetTransmissionGroupNoGearbox().GetElements(inputData),
GetRetarder(inputData),
GetAxleRatio(inputData),
_cifFactory.GetAxleWheelsGroup().GetElements(inputData),
@@ -174,10 +187,11 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
{
return new XElement(_cif + XMLNames.Component_Vehicle,
_cifFactory.GetHEV_LorryVehicleTypeGroup().GetElements(inputData),
- _mrfFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
_cifFactory.GetEngineGroup().GetElements(inputData),
_cifFactory.GetElectricMachineGroup().GetElements(inputData),
_cifFactory.GetREESSGroup().GetElements(inputData),
+ _cifFactory.GetTransmissionGroupNoGearbox().GetElements(inputData),
_cifFactory.GetAxleWheelsGroup().GetElements(inputData),
_cifFactory.GetLorryAuxGroup().GetElements(inputData)
);
@@ -196,10 +210,11 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
{
return new XElement(_cif + XMLNames.Component_Vehicle,
_cifFactory.GetHEV_LorryVehicleTypeGroup().GetElements(inputData),
- _mrfFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
_cifFactory.GetEngineGroup().GetElements(inputData),
_cifFactory.GetElectricMachineGroup().GetElements(inputData),
_cifFactory.GetREESSGroup().GetElements(inputData),
+ _cifFactory.GetTransmissionGroupNoGearbox().GetElements(inputData),
GetRetarder(inputData),
GetAxleRatio(inputData, true),
_cifFactory.GetAxleWheelsGroup().GetElements(inputData),
@@ -221,7 +236,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
{
return new XElement(_cif + XMLNames.Component_Vehicle,
_cifFactory.GetPEV_LorryVehicleTypeGroup().GetElements(inputData),
- _mrfFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
_cifFactory.GetElectricMachineGroup().GetElements(inputData),
_cifFactory.GetREESSGroup().GetElements(inputData),
_cifFactory.GetTransmissionGroup().GetElements(inputData),
@@ -246,9 +261,10 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
{
return new XElement(_cif + XMLNames.Component_Vehicle,
_cifFactory.GetPEV_LorryVehicleTypeGroup().GetElements(inputData),
- _mrfFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
_cifFactory.GetElectricMachineGroup().GetElements(inputData),
_cifFactory.GetREESSGroup().GetElements(inputData),
+ _cifFactory.GetTransmissionGroupNoGearbox().GetElements(inputData),
GetRetarder(inputData),
GetAxleRatio(inputData),
_cifFactory.GetAxleWheelsGroup().GetElements(inputData),
@@ -270,9 +286,10 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
{
return new XElement(_cif + XMLNames.Component_Vehicle,
_cifFactory.GetPEV_LorryVehicleTypeGroup().GetElements(inputData),
- _mrfFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
_cifFactory.GetElectricMachineGroup().GetElements(inputData),
_cifFactory.GetREESSGroup().GetElements(inputData),
+ _cifFactory.GetTransmissionGroupNoGearbox().GetElements(inputData),
_cifFactory.GetAxleWheelsGroup().GetElements(inputData),
_cifFactory.GetLorryAuxGroup().GetElements(inputData)
@@ -292,9 +309,10 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
{
return new XElement(_cif + XMLNames.Component_Vehicle,
_cifFactory.GetPEV_LorryVehicleTypeGroup().GetElements(inputData),
- _mrfFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS).WithXName(_cif + "ADAS"),
_cifFactory.GetElectricMachineGroup().GetElements(inputData),
_cifFactory.GetREESSGroup().GetElements(inputData),
+ _cifFactory.GetTransmissionGroupNoGearbox().GetElements(inputData),
GetRetarder(inputData),
GetAxleRatio(inputData, true),
_cifFactory.GetAxleWheelsGroup().GetElements(inputData),
@@ -317,7 +335,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
var vehicleData = inputData.JobInputData.Vehicle;
return new XElement(_cif + XMLNames.Component_Vehicle,
_cifFactory.GetGeneralVehicleSequenceGroupWriter().GetElements(vehicleData),
- new XElement(_cif + "VehicleGroupCO2", "todo"),
new XElement(_cif + XMLNames.Component_Manufacturer, vehicleData.Manufacturer),
new XElement(_cif + XMLNames.Component_ManufacturerAddress, vehicleData.ManufacturerAddress),
new XElement(_cif + XMLNames.Component_Model, vehicleData.Model),
@@ -332,29 +349,300 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
#endregion
}
- public class CIF_ConventionalCompletedBusVehicleWriter : VehicleWriter
+ public class CIF_Conventional_CompletedBusVehicleWriter : VehicleWriter
+ {
+ public CIF_Conventional_CompletedBusVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_cif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "Conventional_CompletedBusVehicleType"),
+ _cifFactory.GetCompletedBusVehicleTypeGroup().GetElements(inputData),
+ _cifFactory.GetConventionalADASType().GetXmlType(((IMultistepBusInputDataProvider)inputData)
+ .JobInputData
+ .ConsolidateManufacturingStage.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetEngineGroup().GetElements(inputData),
+ _cifFactory.GetTransmissionGroup().GetElements(inputData),
+ GetRetarder(inputData),
+ GetAxleRatio(inputData),
+ _cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+
+ _cifFactory.GetConventionalCompletedBusAuxGroup().GetElements(inputData)
+ );
+ }
+
+ #endregion
+ }
+
+ public class CIF_HEV_Px_CompletedBusVehicleWriter : VehicleWriter
+ {
+ public CIF_HEV_Px_CompletedBusVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_cif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "HEV_Px_IHPC_CompletedBusVehicleType"),
+ _cifFactory.GetCompletedBusVehicleTypeGroup().GetElements(inputData),
+ _cifFactory.GetHEV_CompletedBusVehicleSequenceGroupWriter().GetElements(inputData),
+ _cifFactory.GetHEVADASType().GetXmlType(((IMultistepBusInputDataProvider)inputData)
+ .JobInputData
+ .ConsolidateManufacturingStage.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetEngineGroup().GetElements(inputData),
+ _cifFactory.GetElectricMachineGroup().GetElements(inputData),
+ _cifFactory.GetREESSGroup().GetElements(inputData),
+ _cifFactory.GetTransmissionGroup().GetElements(inputData),
+ GetRetarder(inputData),
+ GetAxleRatio(inputData),
+ _cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+
+ _cifFactory.GetHEV_Px_IHPC_CompletedBusAuxGroup().GetElements(inputData)
+ );
+ }
+
+ #endregion
+ }
+
+ public class CIF_HEV_IHPC_CompletedBusVehicleWriter : CIF_HEV_Px_CompletedBusVehicleWriter
+ {
+ public CIF_HEV_IHPC_CompletedBusVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+ }
+
+ public class CIF_HEV_S2_CompletedBusVehicleWriter : CIF_HEV_Px_CompletedBusVehicleWriter
+ {
+ public CIF_HEV_S2_CompletedBusVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_cif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "HEV_S2_CompletedBusVehicleType"),
+ _cifFactory.GetCompletedBusVehicleTypeGroup().GetElements(inputData),
+ _cifFactory.GetHEV_CompletedBusVehicleSequenceGroupWriter().GetElements(inputData),
+ _cifFactory.GetHEVADASType().GetXmlType(((IMultistepBusInputDataProvider)inputData)
+ .JobInputData
+ .ConsolidateManufacturingStage.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetEngineGroup().GetElements(inputData),
+ _cifFactory.GetElectricMachineGroup().GetElements(inputData),
+ _cifFactory.GetREESSGroup().GetElements(inputData),
+ _cifFactory.GetTransmissionGroup().GetElements(inputData),
+ GetRetarder(inputData),
+ GetAxleRatio(inputData),
+ _cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+
+ _cifFactory.GetHEV_Sx_CompletedBusAuxGroup().GetElements(inputData)
+ );
+ }
+
+ #endregion
+ }
+
+ public class CIF_HEV_S3_CompletedBusVehicleWriter : CIF_HEV_Px_CompletedBusVehicleWriter
+ {
+ public CIF_HEV_S3_CompletedBusVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_cif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "HEV_S3_CompletedBusVehicleType"),
+ _cifFactory.GetCompletedBusVehicleTypeGroup().GetElements(inputData),
+ _cifFactory.GetHEV_CompletedBusVehicleSequenceGroupWriter().GetElements(inputData),
+ _cifFactory.GetHEVADASType().GetXmlType(((IMultistepBusInputDataProvider)inputData)
+ .JobInputData
+ .ConsolidateManufacturingStage.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetEngineGroup().GetElements(inputData),
+ _cifFactory.GetElectricMachineGroup().GetElements(inputData),
+ _cifFactory.GetREESSGroup().GetElements(inputData),
+ _cifFactory.GetTransmissionGroupNoGearbox().GetElements(inputData),
+ GetRetarder(inputData),
+ GetAxleRatio(inputData),
+ _cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+
+ _cifFactory.GetHEV_Sx_CompletedBusAuxGroup().GetElements(inputData)
+ );
+ }
+
+ #endregion
+ }
+
+ public class CIF_HEV_S4_CompletedBusVehicleWriter : CIF_HEV_Px_CompletedBusVehicleWriter
+ {
+ public CIF_HEV_S4_CompletedBusVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_cif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "HEV_S4_CompletedBusVehicleType"),
+ _cifFactory.GetCompletedBusVehicleTypeGroup().GetElements(inputData),
+ _cifFactory.GetHEV_CompletedBusVehicleSequenceGroupWriter().GetElements(inputData),
+ _cifFactory.GetHEVADASType().GetXmlType(((IMultistepBusInputDataProvider)inputData)
+ .JobInputData
+ .ConsolidateManufacturingStage.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetEngineGroup().GetElements(inputData),
+ _cifFactory.GetElectricMachineGroup().GetElements(inputData),
+ _cifFactory.GetREESSGroup().GetElements(inputData),
+ _cifFactory.GetTransmissionGroupNoGearbox().GetElements(inputData),
+ _cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+
+ _cifFactory.GetHEV_Sx_CompletedBusAuxGroup().GetElements(inputData)
+ );
+ }
+
+ #endregion
+ }
+
+ public class CIF_HEV_IEPC_S_CompletedBusVehicleWriter : CIF_HEV_Px_CompletedBusVehicleWriter
{
- public CIF_ConventionalCompletedBusVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+ public CIF_HEV_IEPC_S_CompletedBusVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
#region Overrides of VehicleWriter
public override XElement GetElement(IDeclarationInputDataProvider inputData)
{
return new XElement(_cif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "HEV_S4_CompletedBusVehicleType"),
_cifFactory.GetCompletedBusVehicleTypeGroup().GetElements(inputData),
- _mrfFactory.GetConventionalADASType().GetXmlType(((IMultistageBusInputDataProvider)inputData)
+ _cifFactory.GetHEV_CompletedBusVehicleSequenceGroupWriter().GetElements(inputData),
+ _cifFactory.GetHEVADASType().GetXmlType(((IMultistepBusInputDataProvider)inputData)
.JobInputData
.ConsolidateManufacturingStage.Vehicle.ADAS).WithXName(_cif + "ADAS"),
- _cifFactory.GetCompletedBusAuxGroup().GetElements(inputData)
+ _cifFactory.GetEngineGroup().GetElements(inputData),
+ _cifFactory.GetElectricMachineGroup().GetElements(inputData),
+ _cifFactory.GetREESSGroup().GetElements(inputData),
+ _cifFactory.GetTransmissionGroupNoGearbox().GetElements(inputData),
+ _cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+
+ _cifFactory.GetHEV_Sx_CompletedBusAuxGroup().GetElements(inputData)
);
}
#endregion
}
+ public class CIF_PEV_E2_CompletedBusVehicleWriter : CIF_HEV_Px_CompletedBusVehicleWriter
+ {
+ public CIF_PEV_E2_CompletedBusVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_cif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "PEV_E2_CompletedBusVehicleType"),
+ _cifFactory.GetPEVCompletedBusVehicleTypeGroup().GetElements(inputData),
+ _cifFactory.GetPEV_CompletedBusVehicleSequenceGroupWriter().GetElements(inputData),
+ _cifFactory.GetPEVADASType().GetXmlType(((IMultistepBusInputDataProvider)inputData)
+ .JobInputData
+ .ConsolidateManufacturingStage.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetElectricMachineGroup().GetElements(inputData),
+ _cifFactory.GetREESSGroup().GetElements(inputData),
+ _cifFactory.GetTransmissionGroup().GetElements(inputData),
+ GetRetarder(inputData),
+ GetAxleRatio(inputData),
+ _cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+ _cifFactory.GetPEV_CompletedBusAuxGroup().GetElements(inputData)
+ );
+ }
+ #endregion
+ }
+ public class CIF_PEV_E3_CompletedBusVehicleWriter : CIF_HEV_Px_CompletedBusVehicleWriter
+ {
+ public CIF_PEV_E3_CompletedBusVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_cif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "PEV_E3_CompletedBusVehicleType"),
+ _cifFactory.GetPEVCompletedBusVehicleTypeGroup().GetElements(inputData),
+ _cifFactory.GetPEV_CompletedBusVehicleSequenceGroupWriter().GetElements(inputData),
+ _cifFactory.GetPEVADASType().GetXmlType(((IMultistepBusInputDataProvider)inputData)
+ .JobInputData
+ .ConsolidateManufacturingStage.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetElectricMachineGroup().GetElements(inputData),
+ _cifFactory.GetREESSGroup().GetElements(inputData),
+ _cifFactory.GetTransmissionGroupNoGearbox().GetElements(inputData),
+ GetRetarder(inputData),
+ GetAxleRatio(inputData),
+ _cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+
+ _cifFactory.GetPEV_CompletedBusAuxGroup().GetElements(inputData)
+ );
+ }
+
+ #endregion
+ }
+
+ public class CIF_PEV_E4_CompletedBusVehicleWriter : CIF_HEV_Px_CompletedBusVehicleWriter
+ {
+ public CIF_PEV_E4_CompletedBusVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_cif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "PEV_E4_CompletedBusVehicleType"),
+ _cifFactory.GetPEVCompletedBusVehicleTypeGroup().GetElements(inputData),
+ _cifFactory.GetPEV_CompletedBusVehicleSequenceGroupWriter().GetElements(inputData),
+ _cifFactory.GetPEVADASType().GetXmlType(((IMultistepBusInputDataProvider)inputData)
+ .JobInputData
+ .ConsolidateManufacturingStage.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ _cifFactory.GetElectricMachineGroup().GetElements(inputData),
+ _cifFactory.GetREESSGroup().GetElements(inputData),
+ _cifFactory.GetTransmissionGroupNoGearbox().GetElements(inputData),
+ //GetRetarder(inputData),
+ //GetAxleRatio(inputData),
+ _cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+
+ _cifFactory.GetPEV_CompletedBusAuxGroup().GetElements(inputData)
+ );
+ }
+
+ #endregion
+ }
+
+ public class CIF_PEV_IEPC_CompletedBusVehicleWriter : CIF_HEV_Px_CompletedBusVehicleWriter
+ {
+ public CIF_PEV_IEPC_CompletedBusVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_cif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "PEV_IEPC_CompletedBusVehicleType"),
+ _cifFactory.GetPEVCompletedBusVehicleTypeGroup().GetElements(inputData),
+ _cifFactory.GetPEV_CompletedBusVehicleSequenceGroupWriter().GetElements(inputData),
+ _cifFactory.GetPEVADASType().GetXmlType(((IMultistepBusInputDataProvider)inputData)
+ .JobInputData
+ .ConsolidateManufacturingStage.Vehicle.ADAS).WithXName(_cif + "ADAS"),
+ //_cifFactory.GetEngineGroup().GetElements(inputData),
+ _cifFactory.GetElectricMachineGroup().GetElements(inputData),
+ _cifFactory.GetREESSGroup().GetElements(inputData),
+ _cifFactory.GetIEPCTransmissionGroup().GetElements(inputData),
+ GetRetarder(inputData),
+ GetAxleRatio(inputData, true),
+ _cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+
+ _cifFactory.GetPEV_CompletedBusAuxGroup().GetElements(inputData)
+ );
+ }
+
+ #endregion
+ }
public class CIF_ExemptedCompletedBusVehicleWriter : VehicleWriter
@@ -365,7 +653,10 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override XElement GetElement(IDeclarationInputDataProvider inputData)
{
- throw new NotImplementedException();
+ return new XElement(_cif + XMLNames.Component_Vehicle,
+ _cifFactory.GetExemptedCompletedBusVehicleTypeGroup().GetElements(inputData)
+ //_cifFactory.GetConveCompletedBusVehicleSequenceGroupWriter().GetElements(inputData),
+ );
}
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CustomerInformationFile/CustomerInformationFile.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CustomerInformationFile/CustomerInformationFile.cs
index 4c5d7cdce4c88f485f90b28b15dc735c7dbc4978..e01d3d70a410e1defd8902b7f3ab6245fe5c09d4 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CustomerInformationFile/CustomerInformationFile.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CustomerInformationFile/CustomerInformationFile.cs
@@ -4,32 +4,24 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
+using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReport;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9.CustomerInformationFile
{
public abstract class CustomerInformationFile : AbstractCustomerReport
{
public static XNamespace Cif => XNamespace.Get("urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9");
-
- protected void GenerateReport(string outputDataType)
- {
- Report = new XDocument(new XElement(Cif + "VectoOutput",
- new XAttribute("xmlns", Cif),
- new XAttribute(XNamespace.Xmlns + "xsi", xsi),
- new XAttribute(XNamespace.Xmlns + "mrf", LorryManufacturerReportBase.Mrf),
- new XAttribute(xsi + "type", $"{outputDataType}"),
- Vehicle));
- //;new XElement(Cif + "Results")));
- }
-
+
protected CustomerInformationFile(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
}
+
#region LorryCIF
public class ConventionalLorry_CIF : CustomerInformationFile
{
@@ -204,7 +196,52 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
#region CompletedBus
- public class Conventional_CompletedBusCIF : CustomerInformationFile
+
+ public abstract class CustomerInformationFileCompletedBus : CustomerInformationFile
+ {
+ protected XElement InputDataIntegrityPrimaryVehicle { get; set; }
+
+ protected XElement ManufacturerReportIntegrityPrimaryVehicle { get; set; }
+
+ protected CustomerInformationFileCompletedBus(ICustomerInformationFileFactory cifFactory) :
+ base(cifFactory) { }
+
+ public override void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
+ {
+ InitializeVehicleData(modelData.InputData);
+ _ovc = modelData.VehicleData.Ocv;
+
+ var inputData = modelData.InputData as IMultistepBusInputDataProvider;
+ if (inputData == null) {
+ throw new VectoException("CompletedBus CustomerInformationFile requires MultistepBusInputData");
+ }
+ Results = new XElement(Cif_0_9 + "Results");
+ InputDataIntegrity = new XElement(Cif_0_9 + XMLNames.Report_InputDataSignature,
+ inputData.JobInputData.ConsolidateManufacturingStage.Signature == null
+ ? XMLHelper.CreateDummySig(_di)
+ : inputData.JobInputData.ConsolidateManufacturingStage.Signature.ToXML(_di));
+ //new XElement());
+ InputDataIntegrityPrimaryVehicle = new XElement(Cif_0_9 + "InputDataSignaturePrimaryVehicle",
+ inputData.JobInputData.PrimaryVehicle.PrimaryVehicleInputDataHash.ToXML(_di));
+ ManufacturerReportIntegrityPrimaryVehicle =
+ new XElement(Cif_0_9 + "ManufacturerRecordSignaturePrimaryVehicle", inputData.JobInputData.PrimaryVehicle.ManufacturerRecordHash.ToXML(_di));
+ }
+
+ protected override IList<XElement> GetReportContents(XElement resultSignature)
+ {
+ return new[] {
+ Vehicle,
+ InputDataIntegrityPrimaryVehicle,
+ ManufacturerReportIntegrityPrimaryVehicle,
+ InputDataIntegrity,
+ new XElement(Cif_0_9 + XMLNames.Report_ManufacturerRecord_Signature, resultSignature),
+ Results,
+ XMLHelper.GetApplicationInfo(Cif_0_9)
+ };
+ }
+ }
+
+ public class Conventional_CompletedBusCIF : CustomerInformationFileCompletedBus
{
public override string OutputDataType => "Conventional_CompletedBusOutputType";
@@ -218,35 +255,148 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
}
}
+ public class HEV_Px_CompletedBusCIF : CustomerInformationFileCompletedBus
+ {
+ public override string OutputDataType => "HEV_CompletedBusOutputType";
+
+ public HEV_Px_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
+ {
+ }
+
+ public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _cifFactory.GetHEV_Px_CompletedBusVehicleType().GetElement(inputData);
+ }
+ }
- public class HEV_CompletedBusCIF : CustomerInformationFile
+ public class HEV_IHPC_CompletedBusCIF : CustomerInformationFileCompletedBus
+ {
+ public override string OutputDataType => "HEV_CompletedBusOutputType";
+
+ public HEV_IHPC_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
+ {
+ }
+
+ public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _cifFactory.GetHEV_IHPC_CompletedBusVehicleType().GetElement(inputData);
+ }
+ }
+
+ public class HEV_S2_CompletedBusCIF : CustomerInformationFileCompletedBus
+ {
+ public override string OutputDataType => "HEV_CompletedBusOutputType";
+
+ public HEV_S2_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
+ {
+ }
+
+ public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _cifFactory.GetHEV_S2_CompletedBusVehicleType().GetElement(inputData);
+ }
+ }
+
+ public class HEV_S3_CompletedBusCIF : CustomerInformationFileCompletedBus
{
public override string OutputDataType => "HEV_CompletedBusOutputType";
- public HEV_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
+
+ public HEV_S3_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
{
}
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
- Vehicle = _cifFactory.GetHEV_CompletedBusVehicleType().GetElement(inputData);
+ Vehicle = _cifFactory.GetHEV_S3_CompletedBusVehicleType().GetElement(inputData);
}
}
- public class PEV_CompletedBusCIF : CustomerInformationFile
+ public class HEV_S4_CompletedBusCIF : CustomerInformationFileCompletedBus
+ {
+ public override string OutputDataType => "HEV_CompletedBusOutputType";
+
+ public HEV_S4_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
+ {
+ }
+
+ public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _cifFactory.GetHEV_S4_CompletedBusVehicleType().GetElement(inputData);
+ }
+ }
+
+ public class HEV_IEPC_S_CompletedBusCIF : CustomerInformationFileCompletedBus
+ {
+ public override string OutputDataType => "HEV_CompletedBusOutputType";
+
+ public HEV_IEPC_S_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
+ {
+ }
+
+ public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _cifFactory.GetHEV_IEPC_S_CompletedBusVehicleType().GetElement(inputData);
+ }
+ }
+
+ public class PEV_E2_CompletedBusCIF : CustomerInformationFileCompletedBus
+ {
+ public override string OutputDataType => "PEV_CompletedBusOutputType";
+
+ public PEV_E2_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
+ {
+ }
+
+ public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _cifFactory.GetPEV_E2_CompletedBusVehicleType().GetElement(inputData);
+ }
+ }
+
+ public class PEV_E3_CompletedBusCIF : CustomerInformationFileCompletedBus
+ {
+ public override string OutputDataType => "PEV_CompletedBusOutputType";
+
+ public PEV_E3_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
+ {
+ }
+
+ public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _cifFactory.GetPEV_E3_CompletedBusVehicleType().GetElement(inputData);
+ }
+ }
+
+ public class PEV_E4_CompletedBusCIF : CustomerInformationFileCompletedBus
{
public override string OutputDataType => "PEV_CompletedBusOutputType";
- public PEV_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
+
+ public PEV_E4_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
+ {
+ }
+
+ public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _cifFactory.GetPEV_E4_CompletedBusVehicleType().GetElement(inputData);
+ }
+ }
+
+ public class PEV_IEPC_CompletedBusCIF : CustomerInformationFileCompletedBus
+ {
+ public override string OutputDataType => "PEV_CompletedBusOutputType";
+
+ public PEV_IEPC_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
{
}
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
- Vehicle = _cifFactory.GetPEV_CompletedBusVehicleType().GetElement(inputData);
+ Vehicle = _cifFactory.GetPEV_IEPC_CompletedBusVehicleType().GetElement(inputData);
}
}
- public class Exempted_CompletedBusCIF : CustomerInformationFile
+ public class Exempted_CompletedBusCIF : CustomerInformationFileCompletedBus
{
public Exempted_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/ICustomerInformationFileFactory.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/ICustomerInformationFileFactory.cs
index 8adb4ed243653ec87007cad413f97dcd31ca2be0..58816ff398eac6a9a42c5dc5c9d0c94ed1f2d610 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/ICustomerInformationFileFactory.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/ICustomerInformationFileFactory.cs
@@ -31,8 +31,20 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
IXmlTypeWriter GetExempted_LorryVehicleType();
IXmlTypeWriter GetConventional_CompletedBusVehicleType();
- IXmlTypeWriter GetHEV_CompletedBusVehicleType();
- IXmlTypeWriter GetPEV_CompletedBusVehicleType();
+ IXmlTypeWriter GetHEV_Px_CompletedBusVehicleType();
+ IXmlTypeWriter GetHEV_IHPC_CompletedBusVehicleType();
+ IXmlTypeWriter GetHEV_S2_CompletedBusVehicleType();
+ IXmlTypeWriter GetHEV_S3_CompletedBusVehicleType();
+ IXmlTypeWriter GetHEV_S4_CompletedBusVehicleType();
+ IXmlTypeWriter GetHEV_IEPC_S_CompletedBusVehicleType();
+
+ IXmlTypeWriter GetPEV_E2_CompletedBusVehicleType();
+ IXmlTypeWriter GetPEV_E3_CompletedBusVehicleType();
+ IXmlTypeWriter GetPEV_E4_CompletedBusVehicleType();
+ IXmlTypeWriter GetPEV_IEPC_CompletedBusVehicleType();
+
+
+ //IXmlTypeWriter GetPEV_CompletedBusVehicleType();
IXmlTypeWriter GetExemptedCompletedBusVehicleType();
@@ -40,20 +52,36 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
IReportVehicleOutputGroup GetGeneralVehicleSequenceGroupWriter();
IReportOutputGroup GetLorryGeneralVehicleSequenceGroupWriter();
IReportOutputGroup GetConventionalLorryVehicleSequenceGroupWriter();
+ IReportOutputGroup GetConventionalCompletedBusVehicleSequenceGroupWriter();
IReportOutputGroup GetEngineGroup();
IReportOutputGroup GetTransmissionGroup();
+ IReportOutputGroup GetTransmissionGroupNoGearbox();
IReportOutputGroup GetAxleWheelsGroup();
IReportOutputGroup GetLorryAuxGroup();
- IReportOutputGroup GetCompletedBusAuxGroup();
- IReportOutputGroup GetHEV_VehicleSequenceGroupWriter();
+ IReportOutputGroup GetConventionalCompletedBusAuxGroup();
+ IReportOutputGroup GetHEV_Px_IHPC_CompletedBusAuxGroup();
+ IReportOutputGroup GetHEV_Sx_CompletedBusAuxGroup();
+ IReportOutputGroup GetPEV_CompletedBusAuxGroup();
+
+ IReportOutputGroup GetHEV_LorryVehicleSequenceGroupWriter();
+ IReportOutputGroup GetHEV_CompletedBusVehicleSequenceGroupWriter();
IReportOutputGroup GetHEV_LorryVehicleTypeGroup();
IReportOutputGroup GetElectricMachineGroup();
IReportOutputGroup GetREESSGroup();
IReportOutputGroup GetPEV_LorryVehicleTypeGroup();
- IReportOutputGroup GetPEV_VehicleSequenceGroupWriter();
+
+ IReportOutputGroup GetPEV_LorryVehicleSequenceGroupWriter();
+ IReportOutputGroup GetPEV_CompletedBusVehicleSequenceGroupWriter();
IReportOutputGroup GetCompletedBusVehicleTypeGroup();
+ IReportOutputGroup GetExemptedCompletedBusVehicleTypeGroup();
IReportCompletedBusOutputGroup GetGeneralVehicleSequenceGroupWriterCompletedBus();
+ ICIFAdasType GetConventionalADASType();
+ ICIFAdasType GetHEVADASType();
+ ICIFAdasType GetPEVADASType();
+ //IReportOutputGroup GetHEV_VehicleSequenceGroup();
+ IReportOutputGroup GetPEVCompletedBusVehicleTypeGroup();
+ IReportOutputGroup GetIEPCTransmissionGroup();
}
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReport.cs
index 9d5c5a935cab08a8b8162f4d37539cc080a9da7e..38ff22b18cceb85d1502bdb45d7eb451edd20545 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReport.cs
@@ -49,6 +49,7 @@ using TUGraz.VectoHashing;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile
{
+
public class XMLCustomerReport : IXMLCustomerReport
{
public const string CURRENT_SCHEMA_VERSION = "0.8";
@@ -99,12 +100,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
);
if (exempted) {
- VehiclePart.Add(new XAttribute(xsi + "type", "ExemptedVehicleType"),
+ VehiclePart.Add(new XAttribute(xsi + XMLNames.XSIType, "ExemptedVehicleType"),
ExemptedData(modelData));
Results.Add(new XElement(tns + XMLNames.Report_ExemptedVehicle));
} else {
VehiclePart.Add(
- new XAttribute(xsi + "type", "VehicleType"),
+ new XAttribute(xsi + XMLNames.XSIType, "VehicleType"),
new XElement(tns + XMLNames.Vehicle_AxleConfiguration, modelData.VehicleData.AxleConfiguration.GetName()),
new XElement(tns + XMLNames.Report_Vehicle_VehicleGroup, modelData.VehicleData.VehicleClass.GetClassNumber()),
new XElement(tns + XMLNames.Vehicle_VocationalVehicle, modelData.VehicleData.VocationalVehicle),
@@ -204,7 +205,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
return new XElement(tns + XMLNames.Report_Result_Result,
new XAttribute(XMLNames.Report_Result_Status_Attr, "error"),
- new XAttribute(xsi + "type", "ResultErrorType"),
+ new XAttribute(xsi + XMLNames.XSIType, "ResultErrorType"),
new XElement(tns + XMLNames.Report_Result_Mission, resultEntry.Mission.ToXMLFormat()),
content);
}
@@ -214,7 +215,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
return new XElement(
tns + XMLNames.Report_Result_Result,
new XAttribute(XMLNames.Report_Result_Status_Attr, "success"),
- new XAttribute(xsi + "type", "ResultSuccessType"),
+ new XAttribute(xsi + XMLNames.XSIType, "ResultSuccessType"),
new XElement(tns + XMLNames.Report_Result_Mission, result.Mission.ToXMLFormat()),
new XElement(tns + XMLNames.Report_ResultEntry_TotalVehicleMass,
XMLHelper.ValueAsUnit(result.TotalVehicleMass, XMLNames.Unit_kg)),
@@ -275,7 +276,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
new XAttribute(xsi + "schemaLocation",
$"{rootNS} {AbstractXMLWriter.SchemaLocationBaseUrl}DEV/VectoOutputCustomer.xsd"),
new XElement(rootNS + XMLNames.Report_DataWrap,
- new XAttribute(xsi + "type", "VectoOutputDataType"),
+ new XAttribute(xsi + XMLNames.XSIType, "VectoOutputDataType"),
vehicle,
new XElement(tns + XMLNames.Report_ResultData_Signature, resultSignature),
results,
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReportCompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReportCompletedBus.cs
index 4c65a69830f2860cc6c764b01ceeb38f1c2277b7..c604214d7c580f3e8e3ba213a9e1443b9748fe88 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReportCompletedBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReportCompletedBus.cs
@@ -30,7 +30,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
{
_tankSystem = modelData.VehicleData.InputData.TankSystem;
VehiclePart.Add(
- new XAttribute(xsi + "type", "VehicleCompletedBusType"),
+ new XAttribute(xsi + XMLNames.XSIType, "VehicleCompletedBusType"),
new XElement(tns + XMLNames.Component_Model, modelData.VehicleData.ModelName),
new XElement(
tns + "PrimaryVehicle",
@@ -118,7 +118,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
return new XElement(
tns + XMLNames.Report_Result_Result,
new XAttribute(XMLNames.Report_Result_Status_Attr, "error"),
- new XAttribute(xsi + "type", "ResultErrorType"),
+ new XAttribute(xsi + XMLNames.XSIType, "ResultErrorType"),
new XElement(tns + XMLNames.Report_Result_Mission, genericResult.Mission.ToXMLFormat()),
GetSimulationParameters(specificResult, primaryResult),
content);
@@ -129,7 +129,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
return new XElement(
tns + XMLNames.Report_Result_Result,
new XAttribute(XMLNames.Report_Result_Status_Attr, "success"),
- new XAttribute(xsi + "type", "ResultSuccessType"),
+ new XAttribute(xsi + XMLNames.XSIType, "ResultSuccessType"),
new XElement(tns + XMLNames.Report_Result_Mission, genericResult.Mission.ToXMLFormat()),
//new XElement(tns + XMLNames.Report_ResultEntry_Distance, XMLHelper.ValueAsUnit(specificResult.Distance, XMLNames.Unit_km, 3)),
GetSimulationParameters(specificResult, primaryResult),
@@ -149,7 +149,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
XMLHelper.ValueAsUnit(result.TotalVehicleMass, XMLNames.Unit_kg)),
new XElement(tns + XMLNames.Report_Result_MassPassengers, XMLHelper.ValueAsUnit(result.Payload, XMLNames.Unit_kg)),
result.PassengerCount.HasValue && result.PassengerCount.Value > 0 ? new XElement(tns + XMLNames.Report_Result_PassengerCount, result.PassengerCount.Value.ToMinSignificantDigits(3, 1)) : null,
- new XElement(tns + XMLNames.Report_Result_FuelMode, primaryResult.SimulationParameter.FuelMode)
+ //new XElement(tns + XMLNames.Report_Result_FuelMode, primaryResult.SimulationParameter.FuelMode)
};
}
@@ -288,7 +288,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
new XAttribute(xsi + "schemaLocation",
$"{rootNS} {AbstractXMLWriter.SchemaLocationBaseUrl}DEV/VectoOutputCustomer.xsd"),
new XElement(rootNS + XMLNames.Report_DataWrap,
- new XAttribute(xsi + "type", "VectoOutputDataType"),
+ new XAttribute(xsi + XMLNames.XSIType, "VectoOutputDataType"),
vehicle,
new XElement(tns + XMLNames.Report_ResultData_Signature, resultSignature),
results,
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReportExemptedCompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReportExemptedCompletedBus.cs
index 0fdb84069614a29c9a09359acde0ea9d379381b4..89ed7fe8871935c4a4ee0b0d6fbc1a16846f07d3 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReportExemptedCompletedBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/XMLCustomerReportExemptedCompletedBus.cs
@@ -14,7 +14,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
VehiclePart.Add(
- new XAttribute(xsi + "type", "VehicleCompletedExemptedBusType"),
+ new XAttribute(xsi + XMLNames.XSIType, "VehicleCompletedExemptedBusType"),
new XElement(tns + XMLNames.Component_Model, modelData.VehicleData.ModelName),
new XElement(
tns + "PrimaryVehicle",
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/AbstractXMLManufacturerReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/AbstractXMLManufacturerReport.cs
index af9f75522eb3f7620146b859f2593bc4404712bb..9ad7ca0bf5f4f104cd915e24927c68fa07ca8da3 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/AbstractXMLManufacturerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/AbstractXMLManufacturerReport.cs
@@ -77,7 +77,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
$"{mrf} {AbstractXMLWriter.SchemaLocationBaseUrl}/DEV/VectoOutputManufacturer.xsd"),
new XElement(
mrf + XMLNames.Report_DataWrap,
- new XAttribute(xsi + "type", "tns:VectoOutputDataType"),
+ new XAttribute(xsi + XMLNames.XSIType, "tns:VectoOutputDataType"),
vehicle,
results,
GetApplicationInfo())
@@ -144,7 +144,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
tns + XMLNames.Report_Result_Result,
new XAttribute(
XMLNames.Report_Result_Status_Attr, "error"),
- new XAttribute(xsi + "type", "ResultErrorType"),
+ new XAttribute(xsi + XMLNames.XSIType, "ResultErrorType"),
new XElement(tns + XMLNames.Report_Result_Mission, resultEntry.Mission.ToXMLFormat()),
content);
}
@@ -155,7 +155,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
tns + XMLNames.Report_Result_Result,
new XAttribute(
XMLNames.Report_Result_Status_Attr, "success"),
- new XAttribute(xsi + "type", "ResultSuccessType"),
+ new XAttribute(xsi + XMLNames.XSIType, "ResultSuccessType"),
new XElement(tns + XMLNames.Report_Result_Mission, result.Mission.ToXMLFormat()),
new XElement(
tns + XMLNames.Report_ResultEntry_Distance, new XAttribute(XMLNames.Report_Results_Unit_Attr, XMLNames.Unit_km),
@@ -258,7 +258,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
return new XElement(
tns + XMLNames.Vehicle_ADAS,
new XAttribute(XNamespace.Xmlns + adasPrefix, ns.NamespaceName),
- new XAttribute(xsi + "type", $"{adasPrefix}:{type}"),
+ new XAttribute(xsi + XMLNames.XSIType, $"{adasPrefix}:{type}"),
XElement.Parse(adasData.InputData.XMLSource.OuterXml).Elements()
);
}
@@ -272,7 +272,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
return new XElement(
tns + XMLNames.Vehicle_ADAS,
new XAttribute(XNamespace.Xmlns + adasPrefix, ns.NamespaceName),
- new XAttribute(xsi + "type", $"{adasPrefix}:{type}"),
+ new XAttribute(xsi + XMLNames.XSIType, $"{adasPrefix}:{type}"),
new XElement(ns + XMLNames.Vehicle_ADAS_EngineStopStart, adasData.EngineStopStart),
new XElement(ns + XMLNames.Vehicle_ADAS_EcoRollWithoutEngineStop, adasData.EcoRoll.WithoutEngineStop()),
new XElement(ns + XMLNames.Vehicle_ADAS_EcoRollWithEngineStopStart, adasData.EcoRoll.WithEngineStop()),
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/AbstractManufacturerReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/AbstractManufacturerReport.cs
index 38f3e6df54e18f3105c9159d691058a7cc3d26dd..d23eac2738f725808b09f54d7b3d2222ed2964db 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/AbstractManufacturerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/AbstractManufacturerReport.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -12,70 +13,106 @@ using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
using TUGraz.VectoCore.Utils;
+using TUGraz.VectoHashing;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9
{
public abstract class AbstractManufacturerReport : IXMLManufacturerReport
{
protected XNamespace xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
- public static XNamespace Mrf => XNamespace.Get("urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9");
+
+ public static XNamespace Mrf => XNamespace.Get("urn:tugraz:ivt:VectoAPI:DeclarationOutput");
+
+ public static XNamespace Mrf_0_9 => XNamespace.Get("urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9");
+ public static XNamespace _di => XNamespace.Get("http://www.w3.org/2000/09/xmldsig#");
protected readonly IManufacturerReportFactory _mRFReportFactory;
- private bool _ovc = false;
+ protected bool _ovc = false;
protected XElement Results { get; set; }
protected XElement Vehicle { get; set; }
+ protected XElement InputDataIntegrity { get; set; }
+
protected XElement Signature { get; set; }
- private VectoRunData _modelData;
public abstract string OutputDataType { get; } //also used as name for the mockup result element
protected AbstractManufacturerReport(IManufacturerReportFactory MRFReportFactory)
{
_mRFReportFactory = MRFReportFactory;
+
+ // MQ: write dummy result element for testcases (2022-07-13)
+ Results = new XElement(Mrf_0_9 + "Results",
+ new XElement(Mrf_0_9 + "Status", "success"),
+ new XElement(Mrf_0_9 + "ExemptedVehicle"));
}
#region Implementation of IXMLManufacturerReport
public abstract void InitializeVehicleData(IDeclarationInputDataProvider inputData);
- public void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
+ public virtual void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
InitializeVehicleData(modelData.InputData);
_ovc = modelData.VehicleData.Ocv;
- _modelData = modelData;
- Results = new XElement(Mrf + XMLNames.Report_Results);
+
+ Results = new XElement(Mrf_0_9 + XMLNames.Report_Results);
+ InputDataIntegrity = new XElement(Mrf_0_9 + XMLNames.Report_InputDataSignature,
+ modelData.InputData.XMLHash == null ? XMLHelper.CreateDummySig(_di) : new XElement(modelData.InputData.XMLHash));
}
public XDocument Report { get; protected set; }
private List<XMLDeclarationReport.ResultEntry> results = new List<XMLDeclarationReport.ResultEntry>();
+
public void WriteResult(XMLDeclarationReport.ResultEntry resultValue)
{
}
-
-
-
-
public void GenerateReport()
{
- Report = new XDocument(new XElement(Mrf + "VectoOutput",
- new XAttribute("xmlns", Mrf),
+ var retVal = new XDocument(new XElement(Mrf + "VectoOutput",
new XAttribute(XNamespace.Xmlns + "xsi", xsi),
- new XAttribute(xsi + "type", $"{OutputDataType}"),
- Vehicle,
- Results));
+ new XAttribute(XNamespace.Xmlns + "mrf", Mrf),
+ new XAttribute(XNamespace.Xmlns + "mrf0.9", Mrf_0_9),
+ new XAttribute("xmlns", Mrf_0_9),
+ new XAttribute(XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance") + "schemaLocation",
+ $"{Mrf.NamespaceName} " + @"V:\VectoCore\VectoCore\Resources\XSD/VectoOutputManufacturer.xsd"),
+
+ new XElement(Mrf + XMLNames.Report_DataWrap,
+ new XAttribute(xsi + XMLNames.XSIType, $"{OutputDataType}"),
+ GetContents()
+ )
+ )
+ );
+
+ var stream = new MemoryStream();
+ var writer = new StreamWriter(stream);
+ writer.Write(retVal);
+ writer.Flush();
+ stream.Seek(0, SeekOrigin.Begin);
+ var h = VectoHash.Load(stream);
+ Report = h.AddHash();
}
+ protected virtual IList<XElement> GetContents()
+ {
+ return new[] {
+ Vehicle,
+ InputDataIntegrity,
+ Results,
+ XMLHelper.GetApplicationInfo(Mrf_0_9)
+ };
+ }
#endregion
+
}
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/IManufacturerReportFactory.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/IManufacturerReportFactory.cs
index 4b0afcf56451e787f023b53b389d4b171a0e8f56..dc8b1fbcd876ffa6aa8b24c11b9882e18117b247 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/IManufacturerReportFactory.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/IManufacturerReportFactory.cs
@@ -75,10 +75,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
IXmlTypeWriter GetPEV_CompletedBusComponentsType();
-
-
-
-
IReportVehicleOutputGroup GetGeneralVehicleOutputGroup();
@@ -93,7 +89,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
IReportOutputGroup GetHEV_PrimaryBusVehicleOutputGroup();
-
IXmlTypeWriter GetEngineTorqueLimitationsType();
IXmlTypeWriter GetEngineType();
IXmlTypeWriter GetRetarderType();
@@ -133,14 +128,25 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
IMRFBusAuxiliariesType GetConventionalCompletedBusAuxType();
IMRFBusAuxiliariesType GetConventionalCompletedBus_HVACSystemType();
- IMRFBusAuxiliariesType GetCompletedBusElectricSystemType();
+ IMRFBusAuxiliariesType GetConventionalCompletedBusElectricSystemType();
+
+ IMRFBusAuxiliariesType GetHEVCompletedBusAuxType();
+ IMRFBusAuxiliariesType GetHEVCompletedBus_HVACSystemType();
+ IMRFBusAuxiliariesType GetHEVCompletedBusElectricSystemType();
+
+ IMRFBusAuxiliariesType GetPEVCompletedBusAuxType();
+ IMRFBusAuxiliariesType GetPEVCompletedBus_HVACSystemType();
+ IMRFBusAuxiliariesType GetPEVCompletedBusElectricSystemType();
IReportOutputGroup GetPEV_PrimaryBusVehicleOutputGroup();
- IReportOutputGroup GetCompletedBusGeneralVehicleOutputGroup();
+ IReportOutputGroup GetConventionalCompletedBusGeneralVehicleOutputGroup();
+ IReportOutputGroup GetHEVCompletedBusGeneralVehicleOutputGroup();
+ IReportOutputGroup GetPEVCompletedBusGeneralVehicleOutputGroup();
IReportVehicleOutputGroup GetCompletedBusSequenceGroup();
IReportVehicleOutputGroup GetCompletedBusDimensionSequenceGroup();
IMrfBusAuxGroup GetCompletedBus_HVACSystemGroup();
+ IMrfBusAuxGroup GetCompletedBus_xEVHVACSystemGroup();
IMrfVehicleType GetBoostingLimitationsType();
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/MRFNinjectModule.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/MRFNinjectModule.cs
index 607876cc79c8007734e7bfeeffdd92c302910597..99011c4508806e819e084113dc8fcba49f9d398b 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/MRFNinjectModule.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/MRFNinjectModule.cs
@@ -54,7 +54,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
if (exempted) {
result += exempted + vehicleType;
} else {
- if (vehicleType == VehicleCategoryHelper.Lorry || vehicleType == VehicleCategoryHelper.PrimaryBus || vehicleType == VehicleCategoryHelper.Van) {
+ if (vehicleType == VehicleCategoryHelper.Lorry || vehicleType == VehicleCategoryHelper.PrimaryBus || vehicleType == VehicleCategoryHelper.CompletedBus || vehicleType == VehicleCategoryHelper.Van) {
if (jobType == VectoSimulationJobType.ParallelHybridVehicle || ihpc) {
result += "HEV-Px/IHPC";
}else if (jobType == VectoSimulationJobType.SerialHybridVehicle) {
@@ -383,6 +383,78 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
false,
false)));
+ Bind<IXMLManufacturerReport>().To<HEV_CompletedBusManufacturerReport>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.CompletedBus,
+ VectoSimulationJobType.ParallelHybridVehicle,
+ ArchitectureID.UNKNOWN,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLManufacturerReport>().To<HEV_CompletedBusManufacturerReport>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.CompletedBus,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S2,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLManufacturerReport>().To<HEV_CompletedBusManufacturerReport>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.CompletedBus,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S3,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLManufacturerReport>().To<HEV_CompletedBusManufacturerReport>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.CompletedBus,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S4,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLManufacturerReport>().To<HEV_CompletedBusManufacturerReport>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.CompletedBus,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S_IEPC,
+ false,
+ true,
+ false)));
+
+ Bind<IXMLManufacturerReport>().To<PEV_CompletedBusManufacturerReport>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.CompletedBus,
+ VectoSimulationJobType.BatteryElectricVehicle,
+ ArchitectureID.E2,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLManufacturerReport>().To<PEV_CompletedBusManufacturerReport>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.CompletedBus,
+ VectoSimulationJobType.BatteryElectricVehicle,
+ ArchitectureID.E3,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLManufacturerReport>().To<PEV_CompletedBusManufacturerReport>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.CompletedBus,
+ VectoSimulationJobType.BatteryElectricVehicle,
+ ArchitectureID.E4,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLManufacturerReport>().To<PEV_CompletedBusManufacturerReport>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.CompletedBus,
+ VectoSimulationJobType.BatteryElectricVehicle,
+ ArchitectureID.E_IEPC,
+ false,
+ true,
+ false)));
+
Bind<IXMLManufacturerReport>().To<Exempted_CompletedBusManufacturerReport>().Named(nameCombinationMethod.Invoke(
ToParams(VehicleCategoryHelper.CompletedBus,
VectoSimulationJobType.ConventionalVehicle,
@@ -610,8 +682,26 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
Bind<IMRFBusAuxiliariesType>().To<MRFConventionalCompletedBus_HVACSystemType>().When(AccessedViaMRFFactory)
.NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetConventionalCompletedBus_HVACSystemType());
- Bind<IMRFBusAuxiliariesType>().To<MRFCompletedBusElectricSystemType>().When(AccessedViaMRFFactory)
- .NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetCompletedBusElectricSystemType());
+ Bind<IMRFBusAuxiliariesType>().To<MRFConventionalCompletedBusElectricSystemType>().When(AccessedViaMRFFactory)
+ .NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetConventionalCompletedBusElectricSystemType());
+
+ Bind<IMRFBusAuxiliariesType>().To<MRFHEVCompletedBusAuxType>().When(AccessedViaMRFFactory)
+ .NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetHEVCompletedBusAuxType());
+
+ Bind<IMRFBusAuxiliariesType>().To<MRFHEVCompletedBus_HVACSystemType>().When(AccessedViaMRFFactory)
+ .NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetHEVCompletedBus_HVACSystemType());
+
+ Bind<IMRFBusAuxiliariesType>().To<MRFHEVCompletedBusElectricSystemType>().When(AccessedViaMRFFactory)
+ .NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetHEVCompletedBusElectricSystemType());
+
+ Bind<IMRFBusAuxiliariesType>().To<MRFPEVCompletedBusAuxType>().When(AccessedViaMRFFactory)
+ .NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetPEVCompletedBusAuxType());
+
+ Bind<IMRFBusAuxiliariesType>().To<MRFPEVCompletedBus_HVACSystemType>().When(AccessedViaMRFFactory)
+ .NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetPEVCompletedBus_HVACSystemType());
+
+ Bind<IMRFBusAuxiliariesType>().To<MRFPEVCompletedBusElectricSystemType>().When(AccessedViaMRFFactory)
+ .NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetPEVCompletedBusElectricSystemType());
#region Groups
@@ -648,13 +738,22 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
Bind<IReportVehicleOutputGroup>().To<CompletedBusDimensionsSequenceOutputGroup>().When(AccessedViaMRFFactory)
.NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetCompletedBusDimensionSequenceGroup());
- Bind<IReportOutputGroup>().To<CompletedBusGeneralVehicleOutputGroup>().When(AccessedViaMRFFactory)
- .NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetCompletedBusGeneralVehicleOutputGroup());
+ Bind<IReportOutputGroup>().To<ConventionalCompletedBusGeneralVehicleOutputGroup>().When(AccessedViaMRFFactory)
+ .NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetConventionalCompletedBusGeneralVehicleOutputGroup());
+
+ Bind<IReportOutputGroup>().To<HEVCompletedBusGeneralVehicleOutputGroup>().When(AccessedViaMRFFactory)
+ .NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetHEVCompletedBusGeneralVehicleOutputGroup());
+
+ Bind<IReportOutputGroup>().To<PEVCompletedBusGeneralVehicleOutputGroup>().When(AccessedViaMRFFactory)
+ .NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetPEVCompletedBusGeneralVehicleOutputGroup());
Bind<IMrfBusAuxGroup>().To<CompletedBus_HVACSystem_Group>().When(AccessedViaMRFFactory)
.NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetCompletedBus_HVACSystemGroup());
+ Bind<IMrfBusAuxGroup>().To<CompletedBus_xEVHVACSystem_Group>().When(AccessedViaMRFFactory)
+ .NamedLikeFactoryMethod((IManufacturerReportFactory f) => f.GetCompletedBus_xEVHVACSystemGroup());
+
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/CompletedBusManufacturerReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/CompletedBusManufacturerReport.cs
index 82c6e93c08886a8168c52ea39909b4f04f55622f..c447e1d1f899576d9f9114edbd753af2c4119df8 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/CompletedBusManufacturerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/CompletedBusManufacturerReport.cs
@@ -4,8 +4,13 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
+using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReport
{
@@ -14,15 +19,21 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
protected XNamespace _mrf = XNamespace.Get("urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9");
public CompletedBusManufacturerReportBase(IManufacturerReportFactory MRFReportFactory) : base(MRFReportFactory) { }
- protected void GenerateReport(string outputDataType)
+ public override void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
- Report = new XDocument(new XElement(_mrf + "VectoOutput",
- new XAttribute("xmlns", _mrf),
- new XAttribute(XNamespace.Xmlns + "xsi", xsi),
- new XAttribute(xsi + "type", $"{outputDataType}"),
- Vehicle,
- new XElement(_mrf + "Results")));
+ InitializeVehicleData(modelData.InputData);
+ _ovc = modelData.VehicleData.Ocv;
+ var inputData = modelData.InputData as IMultistepBusInputDataProvider;
+ if (inputData == null) {
+ throw new VectoException("CompletedBus ManrufacturersRecordFile requires MultistepBusInputData");
+ }
+ Results = new XElement(Mrf_0_9 + XMLNames.Report_Results);
+ InputDataIntegrity = new XElement(Mrf_0_9 + XMLNames.Report_InputDataSignature,
+ inputData.JobInputData.ConsolidateManufacturingStage.Signature == null
+ ? XMLHelper.CreateDummySig(_di)
+ : inputData.JobInputData.ConsolidateManufacturingStage.Signature.ToXML(_di));
}
+
}
internal class Conventional_CompletedBusManufacturerReport : CompletedBusManufacturerReportBase
@@ -33,10 +44,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public override string OutputDataType => "ConventionalCompletedBusManufacturerOutputDataType";
+
+
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _mRFReportFactory.GetConventional_CompletedBusVehicleType().GetElement(inputData);
- GenerateReport(OutputDataType);
+ //GenerateReport(OutputDataType);
}
@@ -49,12 +62,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string OutputDataType { get; }
+ public override string OutputDataType => "HEVCompletedBusManufacturerOutputDataType";
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
- Vehicle = _mRFReportFactory.GetConventional_CompletedBusVehicleType().GetElement(inputData);
- GenerateReport("HEVCompletedBusManufacturerOutputDataType");
+ Vehicle = _mRFReportFactory.GetHEV_CompletedBusVehicleType().GetElement(inputData);
+ //GenerateReport("HEVCompletedBusManufacturerOutputDataType");
}
#endregion
@@ -66,12 +79,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string OutputDataType => "PEV_CompletedBusManufacturerOutputDataType";
+ public override string OutputDataType => "PEVCompletedBusManufacturerOutputDataType";
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
- Vehicle = _mRFReportFactory.GetConventional_CompletedBusVehicleType().GetElement(inputData);
- GenerateReport(OutputDataType);
+ Vehicle = _mRFReportFactory.GetPEV_CompletedBusVehicleType().GetElement(inputData);
+ //GenerateReport(OutputDataType);
}
#endregion
@@ -87,7 +100,8 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
- throw new NotImplementedException();
+ Vehicle = _mRFReportFactory.GetExempted_CompletedBusVehicleType().GetElement(inputData);
+ //GenerateReport(OutputDataType);
}
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/LorryManufacturerReports.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/LorryManufacturerReports.cs
index 54b00b10bc0e4e7db647d44b886512f4d938bfc8..9baebdb892613c0d3bfd406347cecb588ef4bb9b 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/LorryManufacturerReports.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/LorryManufacturerReports.cs
@@ -7,23 +7,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
{
internal abstract class LorryManufacturerReportBase : AbstractManufacturerReport
{
-
-
-
public LorryManufacturerReportBase(IManufacturerReportFactory MRFReportFactory) : base(MRFReportFactory)
{
}
- protected void GenerateReport(string outputDataType)
- {
- Report = new XDocument(new XElement(Mrf + "VectoOutput",
- new XAttribute("xmlns", Mrf),
- new XAttribute(XNamespace.Xmlns + "xsi", xsi),
- new XAttribute(xsi + "type", $"{outputDataType}"),
- Vehicle,
- new XElement(Mrf + "Results")));
- }
+
}
internal class ConventionalLorryManufacturerReport : LorryManufacturerReportBase
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/PrimaryBusManufacturerReports.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/PrimaryBusManufacturerReports.cs
index 1d75abef3a479e37734b52790c18792fae96753e..a15ca5d30d179a7872aed6953e030afad0f00915 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/PrimaryBusManufacturerReports.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/PrimaryBusManufacturerReports.cs
@@ -17,7 +17,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
Report = new XDocument(new XElement(_mrf + "VectoOutput",
new XAttribute("xmlns", _mrf),
new XAttribute(XNamespace.Xmlns + "xsi", xsi),
- new XAttribute(xsi + "type", $"{outputDataType}"),
+ new XAttribute(xsi + XMLNames.XSIType, $"{outputDataType}"),
Vehicle,
new XElement(_mrf + "Results")));
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/GeneralVehicleOutputXmlGroup.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/GeneralVehicleOutputXmlGroup.cs
index fffc1e784406a0a43ae8dbe26bef947e2c3cfdeb..9dc8e1f83e319c05ccd1a9a1ec2ff52748461818 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/GeneralVehicleOutputXmlGroup.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/GeneralVehicleOutputXmlGroup.cs
@@ -4,10 +4,13 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
+using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
+using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter
@@ -40,7 +43,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XElement(_mrf + XMLNames.Vehicle_VehicleCategory, vehicleData.LegislativeClass.ToXMLFormat()),
new XElement(_mrf + XMLNames.Vehicle_AxleConfiguration, vehicleData.AxleConfiguration.ToXMLFormat()),
new XElement(_mrf + XMLNames.TPMLM, vehicleData.GrossVehicleMassRating.ToXMLFormat(0)),
- new XElement(_mrf + XMLNames.Report_Vehicle_VehicleGroup, vehicleData.VehicleCategory.ToXMLFormat()),
+ new XElement(_mrf + XMLNames.Report_Vehicle_VehicleGroup, DeclarationData.GetVehicleGroupGroup(vehicleData).GetClassNumber()),
+ new XElement(_mrf + "VehicleGroupCO2", DeclarationData.GetVehicleGroupCO2StandardsGroup(vehicleData).ToXMLFormat()),
+
};
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/HEV-VehicleSequenceGroup.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/HEV-VehicleSequenceGroup.cs
index abf82605827eeb9588fb4547a3cbdcfbc684be09..ebf83391a00b080d97d2a9257ddd056eb70f35df 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/HEV-VehicleSequenceGroup.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/HEV-VehicleSequenceGroup.cs
@@ -7,6 +7,7 @@ using System.Xml.Linq;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter.Vehicle.Lorry
{
@@ -24,7 +25,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XElement(_mrf + XMLNames.Vehicle_DualFuelVehicle, vehicleData.DualFuelVehicle),
new XElement(_mrf + "HEVArchitecture", vehicleData.ArchitectureID.GetLabel()),
new XElement(_mrf + "OffVehicleChargingCapability", vehicleData.OvcHev),
- vehicleData.OvcHev ? new XElement(_mrf + "OffVehicleChargingMaxPower", vehicleData.MaxChargingPower.ToXMLFormat(0)) : null,
+ vehicleData.OvcHev ? new XElement(_mrf + "OffVehicleChargingMaxPower", vehicleData.MaxChargingPower.ValueAsUnit("kW", 1)) : null,
};
result.Add(_mrfFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS));
result.Add(_mrfFactory.GetBoostingLimitationsType().GetElement(inputData.JobInputData.Vehicle));
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/PEV-VehicleSequenceGroup .cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/PEV-VehicleSequenceGroup .cs
index 4bd4d0813db45de7b05840232031080ce57de408..2b0c365285fbdb44ab68d8b2770886e1ff263896 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/PEV-VehicleSequenceGroup .cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/PEV-VehicleSequenceGroup .cs
@@ -7,6 +7,7 @@ using System.Xml.Linq;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter.Vehicle.Lorry
{
@@ -23,7 +24,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
{
new XElement(_mrf + "PEVArchitecture", vehicleData.ArchitectureID.GetLabel()),
new XElement(_mrf + "OffVehicleChargingCapability", vehicleData.OvcHev),
- vehicleData.MaxChargingPower != null ? new XElement(_mrf + "OffVehicleChargingMaxPower") : null,
+ vehicleData.MaxChargingPower != null ? new XElement(_mrf + "OffVehicleChargingMaxPower", vehicleData.MaxChargingPower.ValueAsUnit("kW", 1)) : null,
};
result.Add(_mrfFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS));
result.Add(_mrfFactory.GetBoostingLimitationsType().GetElement(inputData.JobInputData.Vehicle));
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/CompletedBus/CompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/CompletedBus/CompletedBus.cs
index ab2555e5f16f14b60111801352f6671b6df7c8a8..671edb5a150228cf2d70ac6100415ac1852522a0 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/CompletedBus/CompletedBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/CompletedBus/CompletedBus.cs
@@ -11,52 +11,84 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.Manu
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter.Vehicle.CompletedBus
{
- internal class CompletedBusGeneralVehicleOutputGroup : AbstractReportOutputGroup
+ internal class ConventionalCompletedBusGeneralVehicleOutputGroup : AbstractReportOutputGroup
{
- private XElement GetManufacturerAndAddress(string manufacturer, string address, int stepCount)
- {
- return new XElement(_mrf + "Step",
- new XAttribute("Count", stepCount),
- new XElement(_mrf + XMLNames.Component_Manufacturer, manufacturer),
- new XElement(_mrf + XMLNames.Component_ManufacturerAddress, address));
- }
- public CompletedBusGeneralVehicleOutputGroup(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
+
+ public ConventionalCompletedBusGeneralVehicleOutputGroup(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
#region Overrides of AbstractMrfXmlGroup
public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
{
- var multiStageInputData = inputData as IMultistageBusInputDataProvider;
+ var multiStageInputData = inputData as IMultistepBusInputDataProvider;
if (multiStageInputData == null) {
- throw new ArgumentException($"inputdata must implement {nameof(IMultistageBusInputDataProvider)}");
+ throw new ArgumentException($"inputdata must implement {nameof(IMultistepBusInputDataProvider)}");
}
- var primaryVehicleData = multiStageInputData.JobInputData.PrimaryVehicle.Vehicle;
var consolidatedVehicleData = multiStageInputData.JobInputData.ConsolidateManufacturingStage.Vehicle;
var result = new List<XElement>();
+ result.Add(GetManufacturers(multiStageInputData));
+ result.AddRange(_mrfFactory.GetGeneralVehicleOutputGroup().GetElements(multiStageInputData.JobInputData.ConsolidateManufacturingStage.Vehicle));
+ result.AddRange(_mrfFactory.GetCompletedBusSequenceGroup().GetElements(consolidatedVehicleData));
+ result.AddRange(_mrfFactory.GetCompletedBusDimensionSequenceGroup().GetElements(consolidatedVehicleData));
+ result.Add(new XElement(_mrf + XMLNames.Bus_DoorDriveTechnology, consolidatedVehicleData.DoorDriveTechnology.ToXMLFormat()));
+ result.Add(GetNGTankSystem(multiStageInputData));
+ return result;
+ }
+
+ protected virtual XElement GetNGTankSystem(IMultistepBusInputDataProvider multiStageInputData)
+ {
+ var consolidatedVehicleData = multiStageInputData.JobInputData.ConsolidateManufacturingStage.Vehicle;
+ return new XElement(_mrf + XMLNames.Vehicle_NgTankSystem, consolidatedVehicleData.TankSystem);
+ }
+
+ protected virtual XElement GetManufacturers(IMultistepBusInputDataProvider multiStageInputData)
+ {
+ var primaryVehicleData = multiStageInputData.JobInputData.PrimaryVehicle.Vehicle;
var manufacturers = new XElement(_mrf + "Manufacturers");
- result.Add(manufacturers);
- manufacturers.Add(GetManufacturerAndAddress(primaryVehicleData.Manufacturer, primaryVehicleData.ManufacturerAddress, 1));
+ manufacturers.Add(GetManufacturerAndAddress(primaryVehicleData.Manufacturer, primaryVehicleData.ManufacturerAddress,
+ 1));
foreach (var manufacturingStageInputData in multiStageInputData.JobInputData.ManufacturingStages) {
manufacturers.Add(GetManufacturerAndAddress(manufacturingStageInputData.Vehicle.Manufacturer,
manufacturingStageInputData.Vehicle.ManufacturerAddress,
stepCount: manufacturingStageInputData.StepCount));
}
- //result.AddRange(_mrfFactory.GetGeneralVehicleOutputGroup().GetElements(multiStageInputData.JobInputData.ConsolidateManufacturingStage.Vehicle));
- result.AddRange(new List<XElement>() {
- new XElement(_mrf + XMLNames.Component_Model, consolidatedVehicleData.Model),
- new XElement(_mrf + XMLNames.Vehicle_VIN, consolidatedVehicleData.VIN),
- consolidatedVehicleData.VehicleTypeApprovalNumber != null ? new XElement(_mrf + XMLNames.Vehicle_TypeApprovalNumber, consolidatedVehicleData.VehicleTypeApprovalNumber) : null,
- new XElement(_mrf + XMLNames.Vehicle_VehicleCategory, consolidatedVehicleData.LegislativeClass.ToXMLFormat()),
- new XElement(_mrf + XMLNames.Vehicle_AxleConfiguration, primaryVehicleData.AxleConfiguration.ToXMLFormat()),
- new XElement(_mrf + XMLNames.TPMLM, consolidatedVehicleData.GrossVehicleMassRating.ToXMLFormat(0)),
- new XElement(_mrf + XMLNames.Report_Vehicle_VehicleGroup, consolidatedVehicleData.VehicleCategory.ToXMLFormat()),
- });
-
- result.AddRange(_mrfFactory.GetCompletedBusSequenceGroup().GetElements(consolidatedVehicleData));
- result.AddRange(_mrfFactory.GetCompletedBusDimensionSequenceGroup().GetElements(consolidatedVehicleData));
- result.Add(new XElement(_mrf + XMLNames.Bus_DoorDriveTechnology, consolidatedVehicleData.DoorDriveTechnology.ToXMLFormat()));
- result.Add(new XElement(_mrf + XMLNames.Vehicle_NgTankSystem, consolidatedVehicleData.TankSystem));
- return result;
+
+ return manufacturers;
+ }
+
+ protected XElement GetManufacturerAndAddress(string manufacturer, string address, int stepCount)
+ {
+ return new XElement(_mrf + "Step",
+ new XAttribute("Count", stepCount),
+ new XElement(_mrf + XMLNames.Component_Manufacturer, manufacturer),
+ new XElement(_mrf + XMLNames.Component_ManufacturerAddress, address));
+ }
+
+ #endregion
+ }
+
+ internal class HEVCompletedBusGeneralVehicleOutputGroup : ConventionalCompletedBusGeneralVehicleOutputGroup
+ {
+
+ public HEVCompletedBusGeneralVehicleOutputGroup(IManufacturerReportFactory mrfFactory) :
+ base(mrfFactory) { }
+
+ }
+
+
+
+ internal class PEVCompletedBusGeneralVehicleOutputGroup : ConventionalCompletedBusGeneralVehicleOutputGroup
+ {
+
+ public PEVCompletedBusGeneralVehicleOutputGroup(IManufacturerReportFactory mrfFactory) :
+ base(mrfFactory)
+ { }
+
+ #region Overrides of ConventionalCompletedBusGeneralVehicleOutputGroup
+
+ protected override XElement GetNGTankSystem(IMultistepBusInputDataProvider multiStageInputData)
+ {
+ return null;
}
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/CompletedBus/CompletedBusAuxiliaries.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/CompletedBus/CompletedBusAuxiliaries.cs
index 5775b44746e970a0902287c1e0109e39c3b3aeeb..06841535a9fdb3e65d1584ef056371e5d41c287e 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/CompletedBus/CompletedBusAuxiliaries.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/CompletedBus/CompletedBusAuxiliaries.cs
@@ -7,6 +7,7 @@ using System.Xml.Linq;
using TUGraz.VectoCommon.BusAuxiliaries;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter.CompletedBus
@@ -49,7 +50,36 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XElement(_mrf + XMLNames.Bus_DoubleGlazing, busAuxiliaries.HVACAux.DoubleGlazing),
new XElement(_mrf + XMLNames.Bus_AdjustableAuxiliaryHeater, busAuxiliaries.HVACAux.AdjustableAuxiliaryHeater),
- new XElement(_mrf + XMLNames.Bus_SeparateAirDistributionDucts, busAuxiliaries.HVACAux.SeparateAirDistributionDucts)
+ new XElement(_mrf + XMLNames.Bus_SeparateAirDistributionDucts, busAuxiliaries.HVACAux.SeparateAirDistributionDucts),
+ new XElement(_mrf + XMLNames.Bus_AuxiliaryHeaterPower, busAuxiliaries.HVACAux.AuxHeaterPower.ConvertToKiloWatt().ToXMLFormat(0))
+ };
+ }
+
+ #endregion
+ }
+
+ internal class CompletedBus_xEVHVACSystem_Group : AbstractReportOutputGroup, IMrfBusAuxGroup
+ {
+ public CompletedBus_xEVHVACSystem_Group(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
+
+ #region Overrides of AbstractMrfXmlGroup
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ throw new NotImplementedException();
+ }
+
+ #endregion
+
+ #region Implementation of IMrfBusAuxGroup
+
+ public IList<XElement> GetElements(IBusAuxiliariesDeclarationData busAuxiliaries)
+ {
+ return new List<XElement>() {
+ new XElement(_mrf + XMLNames.Bus_WaterElectricHeater,
+ busAuxiliaries.HVACAux.WaterElectricHeater),
+ new XElement(_mrf + XMLNames.Bus_AirElectricHeater, busAuxiliaries.HVACAux.AirElectricHeater),
+ new XElement(_mrf + XMLNames.Bus_OtherHeatingTechnology, busAuxiliaries.HVACAux.OtherHeatingTechnology)
};
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/IMRFGroupWriter.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/IMRFGroupWriter.cs
index e1da3ed0add39336367edfe0ef0e979500f6c785..ab0746d1b440ae342742feb37a4bfc1862727883 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/IMRFGroupWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/IMRFGroupWriter.cs
@@ -20,6 +20,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public interface IReportCompletedBusOutputGroup
{
- IList<XElement> GetElements(IMultistageBusInputDataProvider multiStageInputDataProvider);
+ IList<XElement> GetElements(IMultistepBusInputDataProvider multiStageInputDataProvider);
}
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/AbstractMrfXmlType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/AbstractMrfXmlType.cs
index 607970f14be6560333c196faa3034682a9339795..d59563f0a578dbdb32b84029fc0dc8baccdacaea 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/AbstractMrfXmlType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/AbstractMrfXmlType.cs
@@ -1,12 +1,11 @@
using System.Xml.Linq;
+using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter
{
public abstract class AbstractMrfXmlType
{
-
-
protected XNamespace _mrf = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9";
protected readonly IManufacturerReportFactory _mrfFactory;
@@ -14,5 +13,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
{
_mrfFactory = mrfFactory;
}
+
}
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAdasTypes.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAdasTypes.cs
index 503af606082b28140c1e1dd117ef714e25813d48..d4be0fcd16599348f82a0f977282e6bf07a7cb23 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAdasTypes.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFAdasTypes.cs
@@ -11,6 +11,8 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
internal class MRFConventionalAdasType : AbstractMrfXmlType, IMRFAdasType
{
+ public MRFConventionalAdasType(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
+
#region Overrides of AbstractMRFComponentWriter
public XElement GetXmlType(IAdvancedDriverAssistantSystemDeclarationInputData inputData)
@@ -27,7 +29,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#endregion
- public MRFConventionalAdasType(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
+
}
internal class MRFHevAdasType : AbstractMrfXmlType, IMRFAdasType
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFBusAuxiliaryTypes.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFBusAuxiliaryTypes.cs
index e677e684743aa124026ec379cad99097662dfe10..051f4c84c1ecc0b0a19d32e8927131d8c05d5513 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFBusAuxiliaryTypes.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFBusAuxiliaryTypes.cs
@@ -169,12 +169,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public XElement GetElement(IBusAuxiliariesDeclarationData auxData)
{
var result = new XElement(_mrf + XMLNames.Component_Auxiliaries,
- new XElement(_mrf + XMLNames.BusAux_ElectricSystem,
- new XElement(_mrf + "DayRunningLightsLED", auxData.ElectricConsumers.DayrunninglightsLED),
- new XElement(_mrf + "HeadLightsLED", auxData.ElectricConsumers.HeadlightsLED),
- new XElement(_mrf + "PositionLightsLED", auxData.ElectricConsumers.PositionlightsLED),
- new XElement(_mrf + "BrakeLightsLED", auxData.ElectricConsumers.BrakelightsLED),
- new XElement(_mrf + "InteriorLightsLED", auxData.ElectricConsumers.InteriorLightsLED)),
+ _mrfFactory.GetConventionalCompletedBusElectricSystemType().GetElement(auxData),
_mrfFactory.GetConventionalCompletedBus_HVACSystemType().GetElement(auxData)
);
return result;
@@ -183,14 +178,67 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#endregion
}
+ internal class MRFHEVCompletedBusAuxType : AbstractMrfXmlType, IMRFBusAuxiliariesType
+ {
+ public MRFHEVCompletedBusAuxType(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
+
+ #region Overrides of AbstractMrfXmlType
+
+ public XElement GetXmlType(IDeclarationInputDataProvider inputData)
+ {
+ throw new NotImplementedException();
+ }
+
+ #endregion
- internal class MRFCompletedBusElectricSystemType : AbstractMrfXmlType, IMRFBusAuxiliariesType
+ #region Implementation of IMRFBusAuxiliariesType
+
+ public XElement GetElement(IBusAuxiliariesDeclarationData auxData)
+ {
+ var result = new XElement(_mrf + XMLNames.Component_Auxiliaries,
+ _mrfFactory.GetHEVCompletedBusElectricSystemType().GetElement(auxData),
+ _mrfFactory.GetHEVCompletedBus_HVACSystemType().GetElement(auxData)
+ );
+ return result;
+ }
+
+ #endregion
+ }
+
+ internal class MRFPEVCompletedBusAuxType : AbstractMrfXmlType, IMRFBusAuxiliariesType
{
- public MRFCompletedBusElectricSystemType(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
+ public MRFPEVCompletedBusAuxType(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
+
+ #region Overrides of AbstractMrfXmlType
+
+ public XElement GetXmlType(IDeclarationInputDataProvider inputData)
+ {
+ throw new NotImplementedException();
+ }
+
+ #endregion
#region Implementation of IMRFBusAuxiliariesType
public XElement GetElement(IBusAuxiliariesDeclarationData auxData)
+ {
+ var result = new XElement(_mrf + XMLNames.Component_Auxiliaries,
+ _mrfFactory.GetPEVCompletedBusElectricSystemType().GetElement(auxData),
+ _mrfFactory.GetPEVCompletedBus_HVACSystemType().GetElement(auxData)
+ );
+ return result;
+ }
+
+ #endregion
+ }
+
+ internal class MRFConventionalCompletedBusElectricSystemType : AbstractMrfXmlType, IMRFBusAuxiliariesType
+ {
+ public MRFConventionalCompletedBusElectricSystemType(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
+
+ #region Implementation of IMRFBusAuxiliariesType
+
+ public virtual XElement GetElement(IBusAuxiliariesDeclarationData auxData)
{
return new XElement(_mrf + XMLNames.BusAux_ElectricSystem,
new XElement(_mrf + "DayRunningLightsLED", auxData.ElectricConsumers.DayrunninglightsLED),
@@ -203,6 +251,18 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#endregion
}
+ internal class MRFHEVCompletedBusElectricSystemType : MRFConventionalCompletedBusElectricSystemType
+ {
+ public MRFHEVCompletedBusElectricSystemType(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
+
+ }
+
+ internal class MRFPEVCompletedBusElectricSystemType : MRFConventionalCompletedBusElectricSystemType
+ {
+ public MRFPEVCompletedBusElectricSystemType(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
+
+ }
+
internal class MRFConventionalCompletedBus_HVACSystemType : AbstractMrfXmlType, IMRFBusAuxiliariesType
{
public MRFConventionalCompletedBus_HVACSystemType(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
@@ -218,6 +278,29 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#endregion
}
+ internal class MRFHEVCompletedBus_HVACSystemType : AbstractMrfXmlType, IMRFBusAuxiliariesType
+ {
+ public MRFHEVCompletedBus_HVACSystemType(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
+
+ #region Implementation of IMRFBusAuxiliariesType
+
+ public virtual XElement GetElement(IBusAuxiliariesDeclarationData auxData)
+ {
+ return new XElement(_mrf + "HVACSystem",
+ _mrfFactory.GetCompletedBus_HVACSystemGroup().GetElements(auxData),
+ _mrfFactory.GetCompletedBus_xEVHVACSystemGroup().GetElements(auxData));
+ }
+
+ #endregion
+ }
+
+ internal class MRFPEVCompletedBus_HVACSystemType : MRFHEVCompletedBus_HVACSystemType
+ {
+ public MRFPEVCompletedBus_HVACSystemType(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
+
+
+ }
+
internal class MRFPrimaryBusElectricSystemType_Conventional_HEV : AbstractMrfXmlType, IMRFBusAuxiliariesType
{
public MRFPrimaryBusElectricSystemType_Conventional_HEV(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
@@ -230,15 +313,17 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
var maxAlternatorPower = auxData.ElectricSupply.GetMaxAlternatorPower();
var electricStorageCapacity =
- auxData.ElectricSupply.ElectricStorage?.Sum(electricStorage => electricStorage.ElectricStorageCapacity);
+ auxData.ElectricSupply.ElectricStorage?.Sum(electricStorage => electricStorage.ElectricStorageCapacity) ?? 0.SI<WattSecond>();
return new XElement(_mrf + XMLNames.BusAux_ElectricSystem,
new XElement(_mrf + XMLNames.BusAux_ElectricSystem_AlternatorTechnology,
auxData.ElectricSupply.AlternatorTechnology.ToXMLFormat()),
- (auxData.ElectricSupply.AlternatorTechnology == AlternatorType.None || maxAlternatorPower == null)
- ? null
- : new XElement(_mrf + "MaxAlternatorPower", maxAlternatorPower.ToXMLFormat(0)),
+ (auxData.ElectricSupply.AlternatorTechnology == AlternatorType.Smart
+ ? new XElement(_mrf + "MaxAlternatorPower", maxAlternatorPower.ToXMLFormat(0))
+ : null),
- auxData.ElectricSupply.ElectricStorage == null || electricStorageCapacity == null ? null : new XElement(_mrf + "ElectricStorageCapacity", electricStorageCapacity.ToXMLFormat()));
+ auxData.ElectricSupply.AlternatorTechnology == AlternatorType.Smart
+ ? new XElement(_mrf + "ElectricStorageCapacity", electricStorageCapacity.ToXMLFormat())
+ : null);
}
#endregion
@@ -269,10 +354,10 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Implementation of IMRFBusAuxiliariesType
- public XElement GetElement(IBusAuxiliariesDeclarationData auxData)
+ public virtual XElement GetElement(IBusAuxiliariesDeclarationData auxData)
{
return new XElement(_mrf + XMLNames.BusAux_PneumaticSystem,
- new XElement(_mrf + XMLNames.Auxiliaries_Auxiliary_Technology, auxData.PneumaticSupply.CompressorDrive.GetLabel()),
+ new XElement(_mrf + XMLNames.Auxiliaries_Auxiliary_Technology, GetPneumaticSystemTechnology(auxData)),
new XElement(_mrf + XMLNames.Bus_CompressorRatio, auxData.PneumaticSupply.Ratio.ToXMLFormat(3)),
new XElement(_mrf + XMLNames.BusAux_PneumaticSystem_SmartcompressionSystem, auxData.PneumaticSupply.SmartAirCompression),
@@ -282,19 +367,24 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
);
}
+ protected virtual string GetPneumaticSystemTechnology(IBusAuxiliariesDeclarationData auxData)
+ {
+ return $"{auxData.PneumaticSupply.CompressorSize}, {auxData.PneumaticSupply.CompressorDrive.GetLabel()}, clutch: {auxData.PneumaticSupply.Clutch}";
+ }
+
#endregion
}
- internal class MRFPrimaryBusPneumaticSystemType_HEV_S : AbstractMrfXmlType, IMRFBusAuxiliariesType
+ internal class MRFPrimaryBusPneumaticSystemType_HEV_S : MRFPrimaryBusPneumaticSystemType_Conventional_Hev_Px
{
public MRFPrimaryBusPneumaticSystemType_HEV_S(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
#region Implementation of IMRFBusAuxiliariesType
- public XElement GetElement(IBusAuxiliariesDeclarationData auxData)
+ public override XElement GetElement(IBusAuxiliariesDeclarationData auxData)
{
return new XElement(_mrf + XMLNames.BusAux_PneumaticSystem,
- new XElement(_mrf + XMLNames.Auxiliaries_Auxiliary_Technology, auxData.PneumaticSupply.CompressorDrive.GetLabel()),
+ new XElement(_mrf + XMLNames.Auxiliaries_Auxiliary_Technology, GetPneumaticSystemTechnology(auxData)),
new XElement(_mrf + XMLNames.Bus_CompressorRatio, auxData.PneumaticSupply.Ratio.ToXMLFormat(3)),
new XElement(_mrf + XMLNames.BusAux_PneumaticSystem_SmartRegenerationSystem, auxData.PneumaticSupply.SmartRegeneration),
new XElement(_mrf + XMLNames.BusAux_PneumaticSystem_AirsuspensionControl, auxData.PneumaticConsumers.AirsuspensionControl.ToXMLFormat()),
@@ -305,19 +395,18 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#endregion
}
- internal class MRFPrimaryBusPneumaticSystemType_PEV_IEPC : AbstractMrfXmlType, IMRFBusAuxiliariesType
+ internal class MRFPrimaryBusPneumaticSystemType_PEV_IEPC : MRFPrimaryBusPneumaticSystemType_Conventional_Hev_Px
{
public MRFPrimaryBusPneumaticSystemType_PEV_IEPC(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
#region Implementation of IMRFBusAuxiliariesType
- public XElement GetElement(IBusAuxiliariesDeclarationData auxData)
+ public override XElement GetElement(IBusAuxiliariesDeclarationData auxData)
{
return new XElement(_mrf + XMLNames.BusAux_PneumaticSystem,
- new XElement(_mrf + XMLNames.Auxiliaries_Auxiliary_Technology, auxData.PneumaticSupply.CompressorDrive.GetLabel()),
+ new XElement(_mrf + XMLNames.Auxiliaries_Auxiliary_Technology, auxData.PneumaticSupply.CompressorDrive.ToString()),
new XElement(_mrf + XMLNames.BusAux_PneumaticSystem_SmartRegenerationSystem, auxData.PneumaticSupply.SmartRegeneration),
- new XElement(_mrf + XMLNames.BusAux_PneumaticSystem_AirsuspensionControl, auxData.PneumaticConsumers.AirsuspensionControl.ToXMLFormat()),
- new XElement(_mrf + "ReagentDosing", auxData.PneumaticConsumers.AdBlueDosing == ConsumerTechnology.Pneumatically)
+ new XElement(_mrf + XMLNames.BusAux_PneumaticSystem_AirsuspensionControl, auxData.PneumaticConsumers.AirsuspensionControl.ToXMLFormat())
);
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFComponentsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFComponentsType.cs
index d46737c96a787bebf287cb4c0e63e233f3ffc1dc..b2fdd96d16416a9c7a9c2535ece6ef7988452cec 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFComponentsType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFComponentsType.cs
@@ -530,9 +530,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public XElement GetElement(IDeclarationInputDataProvider inputData)
{
- var multistageInputData = inputData as IMultistageBusInputDataProvider;
+ var multistageInputData = inputData as IMultistepBusInputDataProvider;
if (multistageInputData == null) {
- throw new ArgumentException($"inputData must implement {nameof(IMultistageBusInputDataProvider)}");
+ throw new ArgumentException($"inputData must implement {nameof(IMultistepBusInputDataProvider)}");
}
return new XElement(_mrf + XMLNames.Vehicle_Components,
multistageInputData.JobInputData.ConsolidateManufacturingStage.Vehicle.Components.AirdragInputData != null
@@ -552,7 +552,15 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public XElement GetElement(IDeclarationInputDataProvider inputData)
{
- throw new NotImplementedException();
+ var multistageInputData = inputData as IMultistepBusInputDataProvider;
+ if (multistageInputData == null) {
+ throw new ArgumentException($"inputData must implement {nameof(IMultistepBusInputDataProvider)}");
+ }
+ return new XElement(_mrf + XMLNames.Vehicle_Components,
+ multistageInputData.JobInputData.ConsolidateManufacturingStage.Vehicle.Components.AirdragInputData != null
+ ? _mrfFactory.GetAirdragType().GetXmlType(multistageInputData.JobInputData.ConsolidateManufacturingStage.Vehicle.Components.AirdragInputData) : null,
+ _mrfFactory.GetHEVCompletedBusAuxType().GetElement(multistageInputData.JobInputData.ConsolidateManufacturingStage.Vehicle.Components.BusAuxiliaries)
+ );
}
#endregion
@@ -566,7 +574,15 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public XElement GetElement(IDeclarationInputDataProvider inputData)
{
- throw new NotImplementedException();
+ var multistageInputData = inputData as IMultistepBusInputDataProvider;
+ if (multistageInputData == null) {
+ throw new ArgumentException($"inputData must implement {nameof(IMultistepBusInputDataProvider)}");
+ }
+ return new XElement(_mrf + XMLNames.Vehicle_Components,
+ multistageInputData.JobInputData.ConsolidateManufacturingStage.Vehicle.Components.AirdragInputData != null
+ ? _mrfFactory.GetAirdragType().GetXmlType(multistageInputData.JobInputData.ConsolidateManufacturingStage.Vehicle.Components.AirdragInputData) : null,
+ _mrfFactory.GetPEVCompletedBusAuxType().GetElement(multistageInputData.JobInputData.ConsolidateManufacturingStage.Vehicle.Components.BusAuxiliaries)
+ );
}
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFElectricMachinesType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFElectricMachinesType.cs
index cd6bc82c564468d19d3338d15e1d0e5da1b38f45..922083df74ea83859d635dec0b02a59781311901 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFElectricMachinesType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFElectricMachinesType.cs
@@ -41,12 +41,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
var voltageLevels = new XElement(_mrf + "VoltageLevels");
electricMachineSystem.Add(voltageLevels);
- foreach (var electricMotorVoltageLevel in electricMachine.ElectricMachine.VoltageLevels)
- {
+ foreach (var electricMotorVoltageLevel in electricMachine.ElectricMachine.VoltageLevels) {
var voltageLevel = new XElement(_mrf + XMLNames.ElectricMachine_VoltageLevel,
- new XAttribute("voltage", electricMotorVoltageLevel.VoltageLevel.ToXMLFormat(0)),
+ electricMachine.ElectricMachine.VoltageLevels.Count > 1
+ ? new XAttribute("voltage", electricMotorVoltageLevel.VoltageLevel.ToXMLFormat(0))
+ : null,
new XElement(_mrf + "MaxContinuousPower",
- (electricMotorVoltageLevel.ContinuousTorque * electricMotorVoltageLevel.ContinuousTorqueSpeed)
+ (electricMotorVoltageLevel.ContinuousTorque *
+ electricMotorVoltageLevel.ContinuousTorqueSpeed)
.ToXMLFormat(0)));
@@ -56,7 +58,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
electricMachineElement.Add(electricMachineSystem);
if (electricMachine.ADC != null) {
var adc = electricMachine.ADC;
- result.Add(new XElement(_mrf + XMLNames.Component_ADC,
+ electricMachineElement.Add(new XElement(_mrf + XMLNames.Component_ADC,
new XElement(_mrf + XMLNames.Component_Model, adc.Model),
new XElement(_mrf + XMLNames.Component_CertificationNumber, adc.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, adc.DigestValue?.DigestValue ?? ""),
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCSpecificationsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCType.cs
similarity index 94%
rename from VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCSpecificationsType.cs
rename to VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCType.cs
index 9acaae31c7a71b35810b720a86dd5962dc5c7b51..82747fa1aad6737994fcb197a2e1d4e091472b29 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCSpecificationsType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCType.cs
@@ -25,7 +25,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XElement(_mrf + XMLNames.Component_Model, iepcData.Model),
new XElement(_mrf + XMLNames.Component_CertificationNumber, iepcData.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, iepcData.DigestValue?.DigestValue ?? ""),
- new XElement(_mrf + XMLNames.Engine_RatedPower, iepcData.R85RatedPower.ToXMLFormat()));
+ new XElement(_mrf + XMLNames.Engine_RatedPower, iepcData.R85RatedPower.ConvertToKiloWatt().ToXMLFormat(0)));
//new XElement(_mrf + "MaxContinuousPower",(iepcData.ContinuousTorque*iepcData.ContinuousTorqueSpeed).ToXMLFormat()),
var voltageLevels = new XElement(_mrf + "VoltageLevels");
@@ -47,6 +47,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XElement(_mrf + "LowestTotalTransmissionRatio", (iepcData.Gears.OrderByDescending(g => g.GearNumber).First().Ratio
* inputData.JobInputData.Vehicle.Components.AxleGearInputData.Ratio).ToXMLFormat(3)),
new XElement(_mrf + XMLNames.IEPC_DifferentialIncluded, iepcData.DifferentialIncluded),
+ new XElement(_mrf + XMLNames.IEPC_DesignTypeWheelMotor, iepcData.DesignTypeWheelMotor),
new XElement(_mrf + XMLNames.Component_CertificationMethod, iepcData.CertificationMethod)
);
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIepcSpecificationsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIepcSpecificationsType.cs
deleted file mode 100644
index 9acaae31c7a71b35810b720a86dd5962dc5c7b51..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIepcSpecificationsType.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-using TUGraz.VectoCommon.InputData;
-using TUGraz.VectoCommon.Resources;
-using TUGraz.VectoCommon.Utils;
-
-namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter.Components
-{
- internal class MrfiepcSpecificationsTypeWriter : AbstractMrfXmlType, IXmlTypeWriter
- {
- public MrfiepcSpecificationsTypeWriter(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
-
- #region Overrides of AbstractMrfXmlType
-
- public XElement GetElement(IDeclarationInputDataProvider inputData)
- {
- var iepcData = inputData.JobInputData.Vehicle.Components.IEPC;
-
-
- var iepcXElement = new XElement(_mrf + "IEPCSpecifications",
- new XElement(_mrf + XMLNames.Component_Model, iepcData.Model),
- new XElement(_mrf + XMLNames.Component_CertificationNumber, iepcData.CertificationNumber),
- new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, iepcData.DigestValue?.DigestValue ?? ""),
- new XElement(_mrf + XMLNames.Engine_RatedPower, iepcData.R85RatedPower.ToXMLFormat()));
- //new XElement(_mrf + "MaxContinuousPower",(iepcData.ContinuousTorque*iepcData.ContinuousTorqueSpeed).ToXMLFormat()),
-
- var voltageLevels = new XElement(_mrf + "VoltageLevels");
- iepcXElement.Add(voltageLevels);
-
- foreach (var electricMotorVoltageLevel in iepcData.VoltageLevels) {
- var voltageLevel = new XElement(_mrf + XMLNames.ElectricMachine_VoltageLevel,
- new XAttribute("voltage", electricMotorVoltageLevel.VoltageLevel.ToXMLFormat(0)),
- new XElement(_mrf + "MaxContinuousPower",
- (electricMotorVoltageLevel.ContinuousTorque * electricMotorVoltageLevel.ContinuousTorqueSpeed)
- .ToXMLFormat(0)));
-
-
- voltageLevels.Add(voltageLevel);
- }
-
- iepcXElement.Add(
- new XElement(_mrf + "NrOfGears", iepcData.Gears.Count),
- new XElement(_mrf + "LowestTotalTransmissionRatio", (iepcData.Gears.OrderByDescending(g => g.GearNumber).First().Ratio
- * inputData.JobInputData.Vehicle.Components.AxleGearInputData.Ratio).ToXMLFormat(3)),
- new XElement(_mrf + XMLNames.IEPC_DifferentialIncluded, iepcData.DifferentialIncluded),
- new XElement(_mrf + XMLNames.Component_CertificationMethod, iepcData.CertificationMethod)
- );
-
-
- return iepcXElement;
- }
-
- #endregion
- }
-}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFREESSSpecificationsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFREESSSpecificationsType.cs
index bb2c3f2e7740618ed8f52144504a7719e7e9545c..b467210b32094e1cfb89ca2d7e7715d46efd6b14 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFREESSSpecificationsType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFREESSSpecificationsType.cs
@@ -11,6 +11,7 @@ using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Battery;
+using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter.Components
{
@@ -35,21 +36,23 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XElement(_mrf + XMLNames.Component_CertificationNumber, battery.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, battery.DigestValue?.DigestValue ?? ""),
new XElement(_mrf + XMLNames.BusAux_ElectricSystem_NominalVoltage, BatterySOCReader.Create(battery.VoltageCurve).Lookup(0.5).ToXMLFormat(0)),
- new XElement(_mrf + "TotalStorageCapacity", battery.Capacity.AsAmpHour.ToXMLFormat(0)),
- new XElement(_mrf + "TotalUsableCapacityInSimulation", battery.TotalUsableCapacityInSimulation().AsAmpHour),
+ new XElement(_mrf + "TotalStorageCapacity", battery.TotalStorageCapacity().ValueAsUnit("kWh", 0)),
+ new XElement(_mrf + "TotalUsableCapacityInSimulation", battery.TotalUsableCapacityInSimulation().ValueAsUnit("kWh"), 0),
new XElement(_mrf + XMLNames.Component_CertificationMethod, battery.CertificationMethod.ToXMLFormat())
)
);
- }else if (electricStorage.REESSPack.StorageType == REESSType.SuperCap &&
+ } else if (electricStorage.REESSPack.StorageType == REESSType.SuperCap &&
electricStorage.REESSPack is ISuperCapDeclarationInputData superCap) {
- result.Add(new XElement(_mrf + XMLNames.ElectricEnergyStorage_Capacitor),
- new XElement(_mrf + XMLNames.Component_Model, superCap.Model),
- new XElement(_mrf + XMLNames.Component_CertificationNumber, superCap.CertificationNumber),
- new XElement(_mrf + XMLNames.Capacitor_Capacitance, superCap.Capacity.ToXMLFormat()),
- new XElement(_mrf + XMLNames.Capacitor_MinVoltage, superCap.MinVoltage),
- new XElement(_mrf + XMLNames.Capacitor_MaxVoltage, superCap.MinVoltage),
- new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, superCap.DigestValue?.DigestValue ?? "")
- );
+ result.Add(new XElement(_mrf + XMLNames.ElectricEnergyStorage_Capacitor,
+ new XElement(_mrf + XMLNames.Component_Model, superCap.Model),
+ new XElement(_mrf + XMLNames.Component_CertificationNumber, superCap.CertificationNumber),
+ new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue,
+ superCap.DigestValue?.DigestValue ?? ""),
+ new XElement(_mrf + XMLNames.Capacitor_Capacitance, superCap.Capacity.ToXMLFormat()),
+ new XElement(_mrf + XMLNames.Capacitor_MinVoltage, superCap.MinVoltage.ToXMLFormat(2)),
+ new XElement(_mrf + XMLNames.Capacitor_MaxVoltage, superCap.MaxVoltage.ToXMLFormat(2))
+ )
+ );
} else {
throw new VectoException("Invalid REESS type");
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFRetarderType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFRetarderType.cs
index ec14cb417114bacc9f62a3fa92a7285f612865ed..30242b960407b54b613bfdb0d948a8f51bbd7759 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFRetarderType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFRetarderType.cs
@@ -19,16 +19,24 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public XElement GetElement(IDeclarationInputDataProvider inputData)
{
var retarderData = inputData.JobInputData.Vehicle.Components.RetarderInputData;
- if (retarderData == null || retarderData.Type == RetarderType.None) {
+ var iepcData = inputData.JobInputData.Vehicle.Components.IEPC;
+ var retarderPossible = iepcData == null || !iepcData.DesignTypeWheelMotor;
+ if (retarderData == null || !retarderPossible) {
return null;
}
var result = new XElement(_mrf + XMLNames.Component_Retarder,
- new XElement(_mrf + XMLNames.Component_Model,
- inputData.JobInputData.Vehicle.Components.RetarderInputData.Model),
- new XElement(_mrf + XMLNames.Component_CertificationNumber, retarderData.CertificationNumber),
- new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, retarderData.DigestValue?.DigestValue ?? ""),
- new XElement(_mrf + XMLNames.Component_CertificationMethod,
- retarderData.CertificationMethod.ToXMLFormat()));
+ new XElement(_mrf + XMLNames.Vehicle_RetarderType,
+ retarderData.Type.ToXMLFormat()));
+ if (retarderData.Type.IsDedicatedComponent()) {
+ result.Add(new XElement(_mrf + XMLNames.Component_Model,
+ inputData.JobInputData.Vehicle.Components.RetarderInputData.Model),
+ new XElement(_mrf + XMLNames.Component_CertificationNumber, retarderData.CertificationNumber),
+ new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue,
+ retarderData.DigestValue?.DigestValue ?? ""),
+ new XElement(_mrf + XMLNames.Component_CertificationMethod,
+ retarderData.CertificationMethod.ToXMLFormat()));
+ }
+
return result;
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTorqueLimitationsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTorqueLimitationsType.cs
index 55e1b58109b4e7675826e60998931b755e7b24bb..628de75510d7bb823c12966c8b459d2ad3c1e939 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTorqueLimitationsType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTorqueLimitationsType.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using System.Xml.Linq;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter
{
@@ -23,8 +24,10 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
var maxEngineTorque = inputData.JobInputData.Vehicle.Components.EngineInputData.MaxTorqueDeclared;
foreach (var torqueLimitInputData in inputData.JobInputData.Vehicle.TorqueLimits) {
-
- torqueLimitsElement.Add(new XElement(_mrf + "EngineTorqueLimit", new XAttribute("Gear", torqueLimitInputData.Gear), ((torqueLimitInputData.MaxTorque/maxEngineTorque)*100).ToXMLFormat(0)));
+ var value = (torqueLimitInputData.MaxTorque / maxEngineTorque).Value();
+ torqueLimitsElement.Add(new XElement(_mrf + "EngineTorqueLimit",
+ new XAttribute("Gear", torqueLimitInputData.Gear), value.ValueAsUnit("%", 0)
+ ));
}
return torqueLimitsElement;
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTransmissionType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTransmissionType.cs
index e4328256b0078487caa22070addd9de6a27daca5..23cac4bece1c0f1d169132477f3664fbdc43b269 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTransmissionType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFTransmissionType.cs
@@ -26,13 +26,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
vehicleComponents.GearboxInputData.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue,
vehicleComponents.GearboxInputData.DigestValue?.DigestValue ?? ""),
+ new XElement(_mrf + XMLNames.Component_CertificationMethod, vehicleComponents.GearboxInputData.CertificationMethod.ToXMLFormat()),
new XElement(_mrf + "Type",
vehicleComponents.GearboxInputData.Type.ToXMLFormat()),
new XElement(_mrf + "NrOfGears", vehicleComponents.GearboxInputData.Gears.Count),
new XElement(_mrf + "FinalGearRatio",
vehicleComponents.GearboxInputData.Gears.Last().Ratio.ToXMLFormat(3)),
- new XElement(_mrf + XMLNames.Vehicle_RetarderType,
- vehicleComponents.RetarderInputData.Type.ToXMLFormat()),
+ //new XElement(_mrf + XMLNames.Vehicle_RetarderType,
+ // vehicleComponents.RetarderInputData.Type.ToXMLFormat()),
(vehicleComponents.PTOTransmissionInputData != null ? new XElement(_mrf + "PowerTakeOff",
vehicleComponents.PTOTransmissionInputData.PTOTransmissionType != "None") : null));
return result;
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/IMRFXMLType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/IMRFXMLType.cs
index 94b6f2c03266a55fdf75dbf5520860098e1a9f23..8506e8653de1beb12462d60c81f2b0d639e27622 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/IMRFXMLType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/IMRFXMLType.cs
@@ -6,6 +6,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public interface IXmlTypeWriter
{
XElement GetElement(IDeclarationInputDataProvider inputData);
-
+
}
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/MRFVehicleWriter.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/MRFVehicleWriter.cs
index a46c1b4d47adffdcb5e2bcb51b3a0f4ada503dc5..7836bc5d9fba5dafc66022092e2b4e012d64d023 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/MRFVehicleWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/MRFVehicleWriter.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Linq;
using System.Xml.Linq;
using TUGraz.VectoCommon.InputData;
@@ -230,6 +231,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
_mrfFactory.GetPrimaryBusGeneralVehicleOutputGroup().GetElements(inputData),
new XElement(_mrf + XMLNames.Vehicle_DualFuelVehicle, inputData.JobInputData.Vehicle.DualFuelVehicle),
_mrfFactory.GetConventionalADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS),
+ _mrfFactory.GetEngineTorqueLimitationsType().GetElement(inputData),
_mrfFactory.GetConventional_PrimaryBusComponentsType().GetElement(inputData)
);
}
@@ -248,6 +250,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
{
return new XElement(_mrf + XMLNames.Component_Vehicle,
_mrfFactory.GetHEV_PrimaryBusVehicleOutputGroup().GetElements(inputData),
+ _mrfFactory.GetEngineTorqueLimitationsType().GetElement(inputData),
_mrfFactory.GetHEV_Px_IHPC_PrimaryBusComponentsType().GetElement(inputData)
);
}
@@ -408,12 +411,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public override XElement GetElement(IDeclarationInputDataProvider inputData)
{
- var multistageInputdata = inputData as IMultistageBusInputDataProvider;
+ var multistageInputdata = inputData as IMultistepBusInputDataProvider;
if (multistageInputdata == null) {
- throw new ArgumentException($"inputdata must implement {nameof(IMultistageBusInputDataProvider)}");
+ throw new ArgumentException($"inputdata must implement {nameof(IMultistepBusInputDataProvider)}");
}
return new XElement(_mrf + XMLNames.Component_Vehicle,
- _mrfFactory.GetCompletedBusGeneralVehicleOutputGroup().GetElements(inputData),
+ _mrfFactory.GetConventionalCompletedBusGeneralVehicleOutputGroup().GetElements(inputData),
_mrfFactory.GetConventionalADASType().GetXmlType(multistageInputdata.JobInputData.ConsolidateManufacturingStage.Vehicle.ADAS),
_mrfFactory.GetConventional_CompletedBusComponentsType().GetElement(inputData)
);
@@ -431,7 +434,15 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public override XElement GetElement(IDeclarationInputDataProvider inputData)
{
- throw new NotImplementedException();
+ var multistageInputdata = inputData as IMultistepBusInputDataProvider;
+ if (multistageInputdata == null) {
+ throw new ArgumentException($"inputdata must implement {nameof(IMultistepBusInputDataProvider)}");
+ }
+ return new XElement(_mrf + XMLNames.Component_Vehicle,
+ _mrfFactory.GetHEVCompletedBusGeneralVehicleOutputGroup().GetElements(inputData),
+ _mrfFactory.GetHEVADASType().GetXmlType(multistageInputdata.JobInputData.ConsolidateManufacturingStage.Vehicle.ADAS),
+ _mrfFactory.GetHEV_CompletedBusComponentsType().GetElement(inputData)
+ );
}
#endregion
@@ -445,7 +456,15 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public override XElement GetElement(IDeclarationInputDataProvider inputData)
{
- throw new NotImplementedException();
+ var multistageInputdata = inputData as IMultistepBusInputDataProvider;
+ if (multistageInputdata == null) {
+ throw new ArgumentException($"inputdata must implement {nameof(IMultistepBusInputDataProvider)}");
+ }
+ return new XElement(_mrf + XMLNames.Component_Vehicle,
+ _mrfFactory.GetPEVCompletedBusGeneralVehicleOutputGroup().GetElements(inputData),
+ _mrfFactory.GetPEVADASType().GetXmlType(multistageInputdata.JobInputData.ConsolidateManufacturingStage.Vehicle.ADAS),
+ _mrfFactory.GetPEV_CompletedBusComponentsType().GetElement(inputData)
+ );
}
#endregion
@@ -459,16 +478,39 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public override XElement GetElement(IDeclarationInputDataProvider inputData)
{
- var multistageInputdata = inputData as IMultistageBusInputDataProvider;
+ var multistageInputdata = inputData as IMultistepBusInputDataProvider;
if (multistageInputdata == null)
{
- throw new ArgumentException($"inputdata must implement {nameof(IMultistageBusInputDataProvider)}");
+ throw new ArgumentException($"inputdata must implement {nameof(IMultistepBusInputDataProvider)}");
}
- return new XElement(_mrf + XMLNames.Component_Vehicle,
- _mrfFactory.GetCompletedBusGeneralVehicleOutputGroup().GetElements(inputData)
- );
+ var primaryVehicleData = multistageInputdata.JobInputData.PrimaryVehicle.Vehicle;
+ var consolidatedVehicleData = multistageInputdata.JobInputData.ConsolidateManufacturingStage.Vehicle;
+ var result = new XElement(_mrf + XMLNames.Component_Vehicle);
+ var manufacturers = new XElement(_mrf + "Manufacturers");
+ result.Add(manufacturers);
+ manufacturers.Add(GetManufacturerAndAddress(primaryVehicleData.Manufacturer, primaryVehicleData.ManufacturerAddress, 1));
+ foreach (var manufacturingStageInputData in multistageInputdata.JobInputData.ManufacturingStages) {
+ manufacturers.Add(GetManufacturerAndAddress(manufacturingStageInputData.Vehicle.Manufacturer,
+ manufacturingStageInputData.Vehicle.ManufacturerAddress,
+ stepCount: manufacturingStageInputData.StepCount));
+ }
+ result.Add(_mrfFactory.GetGeneralVehicleOutputGroup().GetElements(multistageInputdata.JobInputData.ConsolidateManufacturingStage.Vehicle));
+ result.Add(_mrfFactory.GetCompletedBusSequenceGroup().GetElements(consolidatedVehicleData));
+ return result;
+
+ //return new XElement(_mrf + XMLNames.Component_Vehicle,
+ // _mrfFactory.GetCompletedBusGeneralVehicleOutputGroup().GetElements(inputData)
+ //);
}
#endregion
+
+ protected XElement GetManufacturerAndAddress(string manufacturer, string address, int stepCount)
+ {
+ return new XElement(_mrf + "Step",
+ new XAttribute("Count", stepCount),
+ new XElement(_mrf + XMLNames.Component_Manufacturer, manufacturer),
+ new XElement(_mrf + XMLNames.Component_ManufacturerAddress, address));
+ }
}
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportCompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportCompletedBus.cs
index dc29a872ee98c7cf7dc702ad78b372ab9445617c..770a98df0ab4644f95a18d3e83a0d8b762af591c 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportCompletedBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportCompletedBus.cs
@@ -30,7 +30,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
{
_tankSystem = modelData.VehicleData.InputData.TankSystem;
VehiclePart.Add(
- new XAttribute(xsi + "type", "VehicleCompletedBusType"),
+ new XAttribute(xsi + XMLNames.XSIType, "VehicleCompletedBusType"),
GetPrimaryVehicleInformation(),
new XElement(
tns + "CompletedVehicle",
@@ -115,7 +115,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
return new XElement(
tns + XMLNames.Report_Result_Result,
new XAttribute(XMLNames.Report_Result_Status_Attr, "error"),
- new XAttribute(xsi + "type", "ResultErrorType"),
+ new XAttribute(xsi + XMLNames.XSIType, "ResultErrorType"),
new XElement(tns + XMLNames.Report_Result_Mission, genericResult.Mission.ToXMLFormat()),
GetSimulationParameters(specificResult),
content);
@@ -126,7 +126,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
return new XElement(
tns + XMLNames.Report_Result_Result,
new XAttribute(XMLNames.Report_Result_Status_Attr, "success"),
- new XAttribute(xsi + "type", "ResultCompletedVehicleSuccessType"),
+ new XAttribute(xsi + XMLNames.XSIType, "ResultCompletedVehicleSuccessType"),
new XElement(tns + XMLNames.Report_Result_Mission, genericResult.Mission.ToXMLFormat()),
new XElement(tns + XMLNames.Report_ResultEntry_Distance, XMLHelper.ValueAsUnit(specificResult.Distance, XMLNames.Unit_km, 3)),
GetSimulationParametersPrimaryVehicle(primaryResult),
@@ -190,8 +190,8 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
tns + XMLNames.Report_ResultEntry_TotalVehicleMass,
XMLHelper.ValueAsUnit(primaryResult.SimulationParameter.TotalVehicleMass, XMLNames.Unit_kg)),
new XElement(tns + XMLNames.Report_ResultEntry_Payload, XMLHelper.ValueAsUnit(primaryResult.SimulationParameter.Payload, XMLNames.Unit_kg)),
- new XElement(tns + "PassengerCount", primaryResult.SimulationParameter.PassengerCount.ToMinSignificantDigits(3, 1)),
- new XElement(tns + XMLNames.Report_Result_FuelMode, primaryResult.SimulationParameter.FuelMode)
+ new XElement(tns + "PassengerCount", primaryResult.SimulationParameter.PassengerCount.ToMinSignificantDigits(3, 1))
+ //new XElement(tns + XMLNames.Report_Result_FuelMode, primaryResult.SimulationParameter.FuelMode)
);
}
@@ -341,7 +341,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
{
return new XElement(
tns + XMLNames.Vehicle_Components,
- new XAttribute(xsi + "type", "ComponentsCompletedBusType"),
+ new XAttribute(xsi + XMLNames.XSIType, "ComponentsCompletedBusType"),
GetAirDragDescription(modelData.AirdragData),
GetAuxiliariesDescription(modelData)
);
@@ -380,7 +380,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
return new XElement(
tns + XMLNames.Component_Auxiliaries,
new XAttribute(XNamespace.Xmlns + auxPrefix, namespaceName),
- new XAttribute(xsi + "type", $"{auxPrefix}:CompletedVehicleAuxiliaryDataDeclarationType"),
+ new XAttribute(xsi + XMLNames.XSIType, $"{auxPrefix}:CompletedVehicleAuxiliaryDataDeclarationType"),
XElement.Parse(busAuxXML.InnerXml).Elements()
);
}
@@ -389,7 +389,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
return new XElement(
tns + XMLNames.Component_Auxiliaries,
new XAttribute(XNamespace.Xmlns + auxPrefix, ns.NamespaceName),
- new XAttribute(xsi + "type", $"{auxPrefix}:{busAuxXML.FirstChild.SchemaInfo.SchemaType.QualifiedName.Name}"),
+ new XAttribute(xsi + XMLNames.XSIType, $"{auxPrefix}:{busAuxXML.FirstChild.SchemaInfo.SchemaType.QualifiedName.Name}"),
XElement.Parse(busAuxXML.InnerXml).Elements()
);
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedCompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedCompletedBus.cs
index 39bc841a7a608484aae7fe04edda00dbf181e484..f203b0cbe518aee03b76023b226f76f27499967e 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedCompletedBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedCompletedBus.cs
@@ -14,7 +14,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
public override void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
VehiclePart.Add(
- new XAttribute(xsi + "type", "VehicleExemptedCompletedBusType"),
+ new XAttribute(xsi + XMLNames.XSIType, "VehicleExemptedCompletedBusType"),
GetPrimaryVehicleInformation(),
new XElement(
tns + "CompletedVehicle",
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedTruck.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedTruck.cs
index dff94b2e3fefe0d78cccdf729afb30b348d54295..de9ccd34d9c5be4da55f9c9104262c00864ac771 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedTruck.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedTruck.cs
@@ -13,7 +13,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
public override void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
VehiclePart.Add(
- new XAttribute(xsi + "type", "VehicleExemptedTruckType"),
+ new XAttribute(xsi + XMLNames.XSIType, "VehicleExemptedTruckType"),
new XElement(tns + XMLNames.Component_Model, modelData.VehicleData.ModelName),
new XElement(tns + XMLNames.Component_Manufacturer, modelData.VehicleData.Manufacturer),
new XElement(tns + XMLNames.Component_ManufacturerAddress, modelData.VehicleData.ManufacturerAddress),
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExeptedPrimaryBus.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExeptedPrimaryBus.cs
index 0ffdd2282aede0b4e3f0109b14ec06fdfcf49c0e..96719d814625cb2129c51425d3dba6d34d7b1ab1 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExeptedPrimaryBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExeptedPrimaryBus.cs
@@ -19,7 +19,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
public override void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
VehiclePart.Add(
- new XAttribute(xsi + "type", "VehicleExemptedPrimaryBusType"),
+ new XAttribute(xsi + XMLNames.XSIType, "VehicleExemptedPrimaryBusType"),
new XElement(vns + XMLNames.Component_Manufacturer, modelData.VehicleData.Manufacturer),
new XElement(vns + XMLNames.Component_ManufacturerAddress, modelData.VehicleData.ManufacturerAddress),
new XElement(vns + XMLNames.Component_Model, modelData.VehicleData.ModelName),
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportPrimaryBus.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportPrimaryBus.cs
index d3011bc2e24c6ec332db6655ccb50769df229bce..986154b38828457d04593a2261f8b1398dd72608 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportPrimaryBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportPrimaryBus.cs
@@ -14,7 +14,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
public override void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
VehiclePart.Add(
- new XAttribute(xsi + "type", "VehiclePrimaryBusType"),
+ new XAttribute(xsi + XMLNames.XSIType, "VehiclePrimaryBusType"),
new XElement(tns + XMLNames.Component_Model, modelData.VehicleData.ModelName),
new XElement(tns + XMLNames.Component_Manufacturer, modelData.VehicleData.Manufacturer),
new XElement(tns + XMLNames.Component_ManufacturerAddress, modelData.VehicleData.ManufacturerAddress),
@@ -43,7 +43,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
{
return new XElement(
tns + XMLNames.Vehicle_Components,
- new XAttribute(xsi + "type", "ComponentsPrimaryBusType"),
+ new XAttribute(xsi + XMLNames.XSIType, "ComponentsPrimaryBusType"),
GetEngineDescription(modelData.EngineData, fuelModes),
GetGearboxDescription(modelData.GearboxData),
GetTorqueConverterDescription(modelData.GearboxData.TorqueConverterData),
@@ -64,7 +64,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
return new XElement(
tns + XMLNames.Component_Auxiliaries,
new XAttribute(XNamespace.Xmlns + auxPrefix, ns.NamespaceName),
- new XAttribute(xsi + "type", $"{auxPrefix}:{busAuxXML.FirstChild.SchemaInfo.SchemaType.QualifiedName.Name}"),
+ new XAttribute(xsi + XMLNames.XSIType, $"{auxPrefix}:{busAuxXML.FirstChild.SchemaInfo.SchemaType.QualifiedName.Name}"),
XElement.Parse(busAuxXML.InnerXml).Elements()
);
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportTruck.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportTruck.cs
index ab08dd4c1b8d78e741013f7f1533493f626b381a..52a7effd760fbbb06c64c7dfc42bbd26b15c9d08 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportTruck.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportTruck.cs
@@ -46,7 +46,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
public override void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
VehiclePart.Add(
- new XAttribute(xsi + "type", "VehicleTruckType"),
+ new XAttribute(xsi + XMLNames.XSIType, "VehicleTruckType"),
new XElement(tns + XMLNames.Component_Model, modelData.VehicleData.ModelName),
new XElement(tns + XMLNames.Component_Manufacturer, modelData.VehicleData.Manufacturer),
new XElement(tns + XMLNames.Component_ManufacturerAddress, modelData.VehicleData.ManufacturerAddress),
@@ -80,7 +80,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
if (modelData.VehicleData.AxleConfiguration.AxlegearIncludedInGearbox()) {
return new XElement(
tns + XMLNames.Vehicle_Components,
- new XAttribute(xsi + "type", "ComponentsTruckFWDType"),
+ new XAttribute(xsi + XMLNames.XSIType, "ComponentsTruckFWDType"),
GetEngineDescription(modelData.EngineData, fuelModes),
GetGearboxDescription(modelData.GearboxData, modelData.AxleGearData),
GetTorqueConverterDescription(modelData.GearboxData.TorqueConverterData),
@@ -93,7 +93,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
}
return new XElement(
tns + XMLNames.Vehicle_Components,
- new XAttribute(xsi + "type", "ComponentsTruckType"),
+ new XAttribute(xsi + XMLNames.XSIType, "ComponentsTruckType"),
GetEngineDescription(modelData.EngineData, fuelModes),
GetGearboxDescription(modelData.GearboxData),
GetTorqueConverterDescription(modelData.GearboxData.TorqueConverterData),
@@ -129,19 +129,5 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
return auxId + "Technology";
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
}
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VTPReport/XMLVTPReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VTPReport/XMLVTPReport.cs
index c3e2338ebdb8c16e13072ea4fd625dfae4811249..826aee0066813c1df8857fbfe6f90e1b8a06e95d 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VTPReport/XMLVTPReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VTPReport/XMLVTPReport.cs
@@ -331,7 +331,7 @@ namespace TUGraz.VectoCore.OutputData.XML
$"{rootNS} {AbstractXMLWriter.SchemaLocationBaseUrl}VTPReport.xsd"),
new XElement(
rootNS + "Data",
- new XAttribute(xsi + "type", "VTPReportDataType"),
+ new XAttribute(xsi + XMLNames.XSIType, "VTPReportDataType"),
new XElement(GeneralPart),
new XElement(VehiclePart),
new XElement(DataIntegrityPart),
@@ -355,7 +355,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.Component_Manufacturer, modelData.VehicleData.Manufacturer),
new XElement(tns + XMLNames.Component_ManufacturerAddress, modelData.VehicleData.ManufacturerAddress));
VehiclePart.Add(
- new XAttribute(xsi + "type", "VehicleType"),
+ new XAttribute(xsi + XMLNames.XSIType, "VehicleType"),
new XElement(tns + XMLNames.Component_Model, modelData.VehicleData.ModelName),
new XElement(tns + XMLNames.Vehicle_VIN, modelData.VehicleData.VIN),
new XElement(tns + XMLNames.Vehicle_LegislativeClass, modelData.VehicleData.LegislativeClass.ToXMLFormat()),
@@ -371,7 +371,7 @@ namespace TUGraz.VectoCore.OutputData.XML
VehiclePart.Add(
new XElement(
tns + XMLNames.Vehicle_Components,
- new XAttribute(xsi + "type", "ComponentsTruckFWDType"),
+ new XAttribute(xsi + XMLNames.XSIType, "ComponentsTruckFWDType"),
GetEngineDescription(modelData.EngineData, fuelModes),
GetGearboxDescription(modelData.GearboxData, modelData.AxleGearData.AxleGear.Ratio),
GetTorqueConverterDescription(modelData.GearboxData.TorqueConverterData),
@@ -385,7 +385,7 @@ namespace TUGraz.VectoCore.OutputData.XML
VehiclePart.Add(
new XElement(
tns + XMLNames.Vehicle_Components,
- new XAttribute(xsi + "type", "ComponentsTruckType"),
+ new XAttribute(xsi + XMLNames.XSIType, "ComponentsTruckType"),
GetEngineDescription(modelData.EngineData, fuelModes),
GetGearboxDescription(modelData.GearboxData),
GetTorqueConverterDescription(modelData.GearboxData.TorqueConverterData),
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/IXMLMultistageReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/IXMLMultistepIntermediateReport.cs
similarity index 84%
rename from VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/IXMLMultistageReport.cs
rename to VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/IXMLMultistepIntermediateReport.cs
index 8111f0f90327ad62916024eb1a0593f6d8343f86..c7773ea200500399a9b0cade1f6ed30247590072 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/IXMLMultistageReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/IXMLMultistepIntermediateReport.cs
@@ -3,7 +3,7 @@ using TUGraz.VectoCore.Models.Simulation.Data;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile
{
- public interface IXMLMultistageReport
+ public interface IXMLMultistepIntermediateReport
{
void Initialize(VectoRunData modelData);
XDocument Report { get; }
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/IXMLPrimaryVehicleReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/IXMLVehicleInformationFile.cs
similarity index 91%
rename from VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/IXMLPrimaryVehicleReport.cs
rename to VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/IXMLVehicleInformationFile.cs
index 04ff8f39576cd35964ab65587db81ff3aab88b43..7cd02a7241e187c775828ec47bfc8d6bb121f46d 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/IXMLPrimaryVehicleReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/IXMLVehicleInformationFile.cs
@@ -5,7 +5,7 @@ using TUGraz.VectoCore.Models.Simulation.Data;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile
{
- public interface IXMLPrimaryVehicleReport
+ public interface IXMLVehicleInformationFile
{
void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes);
void WriteResult(XMLDeclarationReport.ResultEntry result);
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/AbstractVIFGroupWriter.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/AbstractVIFGroupWriter.cs
new file mode 100644
index 0000000000000000000000000000000000000000..96273458f05f0dace0dad629c893d7c5d08dcb6d
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/AbstractVIFGroupWriter.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1
+{
+ public abstract class AbstractVIFGroupWriter : IReportOutputGroup
+ {
+ protected readonly IVIFReportFactory _vifReportFactory;
+ protected XNamespace _vif = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1";
+ protected XNamespace _v24 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4";
+
+
+ protected AbstractVIFGroupWriter(IVIFReportFactory vifReportFactory)
+ {
+ _vifReportFactory = vifReportFactory;
+ }
+
+ #region Implementation of IReportOutputGroup
+
+ public abstract IList<XElement> GetElements(IDeclarationInputDataProvider inputData);
+
+ #endregion
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/AbstractVIFXmlType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/AbstractVIFXmlType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..d6170e971d60e3629526e6fcb94eef9094efd7a5
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/AbstractVIFXmlType.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1
+{
+ public abstract class AbstractVIFXmlType
+ {
+
+ protected XNamespace _vif = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1";
+ protected XNamespace _v24 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4";
+ protected XNamespace _v23 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3";
+ protected XNamespace _v20 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0";
+ protected XNamespace _xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
+ protected XNamespace _di = XNamespace.Get("http://www.w3.org/2000/09/xmldsig#");
+
+
+
+ protected readonly IVIFReportFactory _vifFactory;
+
+ protected AbstractVIFXmlType(IVIFReportFactory vifFactory)
+ {
+ _vifFactory = vifFactory;
+ }
+
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/AbstractVehicleInformationFile.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/AbstractVehicleInformationFile.cs
new file mode 100644
index 0000000000000000000000000000000000000000..b5bbe10ee0b220c73e09967aa6425c226331ba8b
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/AbstractVehicleInformationFile.cs
@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.Hashing;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.Models.Simulation.Impl;
+using TUGraz.VectoCore.Utils;
+using TUGraz.VectoHashing;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1
+{
+ public abstract class AbstractVehicleInformationFile : IXMLVehicleInformationFile
+ {
+ protected XNamespace _tns;
+
+ protected readonly IVIFReportFactory _vifFactory;
+
+
+ public static XNamespace VIF => XNamespace.Get("urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1");
+
+ protected XNamespace _xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
+ protected XNamespace _di = "http://www.w3.org/2000/09/xmldsig#";
+ protected XNamespace _v20 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0";
+ protected XNamespace _v21 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1";
+ protected XNamespace _v23 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3";
+ protected XNamespace _v24 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4";
+ protected XNamespace _v10 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0";
+
+ public abstract string OutputDataType { get; }
+
+ protected XElement Vehicle { get; set; }
+ protected XElement Results { get; set; }
+
+ protected List<XMLDeclarationReport.ResultEntry> _results = new List<XMLDeclarationReport.ResultEntry>();
+ protected XElement InputDataIntegrity;
+
+ protected AbstractVehicleInformationFile(IVIFReportFactory vifFactory)
+ {
+ _vifFactory = vifFactory;
+ }
+
+ protected abstract void InitializeVehicleData(IDeclarationInputDataProvider inputData);
+
+ #region Implementation of IXMLPrimaryVehicleReport
+
+ public void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
+ {
+ InitializeVehicleData(modelData.InputData);
+ Results = new XElement(VIF + XMLNames.Report_Results);
+ InputDataIntegrity = new XElement(VIF + XMLNames.Report_InputDataSignature,
+ modelData.InputDataHash == null ? XMLHelper.CreateDummySig(_di) : new XElement(modelData.InputDataHash));
+
+ }
+
+
+ public void WriteResult(XMLDeclarationReport.ResultEntry result)
+ {
+ _results.Add(result);
+ }
+
+ public virtual void GenerateReport(XElement fullReportHash)
+ {
+ var retVal = new XDocument(new XElement(VIF + XMLNames.VectoOutputMultistep,
+ new XAttribute(XNamespace.Xmlns + "di", _di),
+ new XAttribute(XNamespace.Xmlns + "xsi", _xsi.NamespaceName),
+ new XAttribute(XNamespace.Xmlns + "vif", VIF),
+ new XAttribute(XNamespace.Xmlns + "v1.0", _v10),
+ new XAttribute(XNamespace.Xmlns + "v2.0", _v20),
+ new XAttribute(XNamespace.Xmlns + "v2.1", _v21),
+ new XAttribute(XNamespace.Xmlns + "v2.3", _v23),
+ new XAttribute(XNamespace.Xmlns + "v2.4", _v24),
+ new XAttribute(_xsi + "schemaLocation", $"{_tns.NamespaceName} " + @"V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd"),
+ new XAttribute("xmlns", _tns),
+
+ GeneratePrimaryVehicle(fullReportHash)
+ ));
+
+ Report = retVal;
+ }
+
+ public XDocument Report { get; protected set; }
+
+ public XNamespace Tns => _tns;
+
+ #endregion
+
+ protected virtual XElement GeneratePrimaryVehicle(XElement resultSignature)
+ {
+ var allSuccess = _results.All(x => x.Status == VectoRun.Status.Success);
+
+ var results = new XElement(Results);
+ results.AddFirst(new XElement(VIF + XMLNames.Report_Result_Status, allSuccess ? "success" : "error"));
+ var vehicleId = $"{VectoComponents.VectoPrimaryVehicleInformation.HashIdPrefix()}{XMLHelper.GetGUID()}";
+
+ var primaryVehicle = new XElement(VIF + XMLNames.Bus_PrimaryVehicle,
+ new XElement(VIF + XMLNames.Report_DataWrap,
+ new XAttribute(XMLNames.Component_ID_Attr, vehicleId),
+ new XAttribute(_xsi + XMLNames.XSIType, "PrimaryVehicleDataType"),
+ Vehicle,
+ InputDataIntegrity,
+ new XElement(VIF + "ManufacturerRecordSignature", resultSignature),
+ Results,
+ XMLHelper.GetApplicationInfo(VIF)
+ )
+ );
+
+ var sigXElement = GetSignatureElement(primaryVehicle);
+ primaryVehicle.LastNode.Parent.Add(sigXElement);
+ return primaryVehicle;
+ }
+
+ protected XElement GetSignatureElement(XElement stage)
+ {
+ var stream = new MemoryStream();
+ var writer = new XmlTextWriter(stream, Encoding.UTF8);
+ stage.WriteTo(writer);
+ writer.Flush();
+ stream.Seek(0, SeekOrigin.Begin);
+
+ return new XElement(VIF + XMLNames.DI_Signature,
+ VectoHash.Load(stream).ComputeXmlHash
+ (VectoHash.DefaultCanonicalizationMethod, VectoHash.DefaultDigestMethod));
+ }
+
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/IVIFReportFactory.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/IVIFReportFactory.cs
new file mode 100644
index 0000000000000000000000000000000000000000..c1ed87270a122b4deacb823604872ad012f9c06e
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/IVIFReportFactory.cs
@@ -0,0 +1,169 @@
+using System.Collections.Generic;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1
+{
+ public interface IXmlMultistepTypeWriter
+ {
+ XElement GetElement(IMultistageVIFInputData inputData);
+ }
+
+ public interface IReportMultistepCompletedBusOutputGroup
+ {
+ IList<XElement> GetElements(IMultistageVIFInputData multiStageInputDataProvider);
+ }
+
+ public interface IReportMultistepCompletedBusTypeWriter
+ {
+ XElement GetElement(IMultistageVIFInputData inputData);
+
+ }
+
+ public interface IVIFReportInterimFactory
+ {
+ IXMLMultistepIntermediateReport GetInterimVIFReport(VehicleCategory vehicleType,
+ VectoSimulationJobType jobType, ArchitectureID archId, bool exempted, bool iepc, bool ihpc);
+
+ #region Vehicle
+
+ IXmlMultistepTypeWriter GetConventionalVehicleType();
+
+ IXmlMultistepTypeWriter GetHEVVehicleType();
+
+ IXmlMultistepTypeWriter GetPEVVehicleType();
+
+ IXmlMultistepTypeWriter GetIEPCVehicleType();
+
+ IXmlMultistepTypeWriter GetExemptedVehicleType();
+
+ #endregion
+
+ IReportMultistepCompletedBusOutputGroup GetCompletedBusGeneralParametersGroup();
+ IReportMultistepCompletedBusOutputGroup GetCompletedBusParametersGroup();
+ IReportMultistepCompletedBusOutputGroup GetCompletedBusPassengerCountGroup();
+ IReportMultistepCompletedBusOutputGroup GetCompletedBusDimensionsGroup();
+
+ IReportMultistepCompletedBusTypeWriter GetConventionalInterimComponentsType();
+
+ IReportMultistepCompletedBusTypeWriter GetxEVInterimComponentsType();
+
+
+ IReportMultistepCompletedBusTypeWriter GetInterimAirdragType();
+ IReportMultistepCompletedBusTypeWriter GetInterimConventionalAuxiliariesType();
+
+ IReportMultistepCompletedBusTypeWriter GetInterimxEVAuxiliariesType();
+
+ IVIFFAdasType GetConventionalInterimADASType();
+
+ IVIFFAdasType GetHEVInterimADASType();
+
+ IVIFFAdasType GetPEVInterimADASType();
+
+ IVIFFAdasType GetIEPCInterimADASType();
+
+ }
+
+
+ public interface IVIFReportFactory
+ {
+ IXMLVehicleInformationFile GetVIFReport(VehicleCategory vehicleType, VectoSimulationJobType jobType,
+ ArchitectureID archId, bool exempted, bool iepc, bool ihpc);
+
+
+ #region Vehicle
+
+ IXmlTypeWriter GetConventionalVehicleType();
+ IXmlTypeWriter GetHevIepcSVehicleType();
+ IXmlTypeWriter GetHevPxVehicleType();
+ IXmlTypeWriter GetHevS2VehicleType();
+ IXmlTypeWriter GetHevS3VehicleType();
+ IXmlTypeWriter GetHevS4VehicleType();
+ IXmlTypeWriter GetIepcVehicleType();
+ IXmlTypeWriter GetPevE2VehicleType();
+ IXmlTypeWriter GetPevE3VehicleType();
+ IXmlTypeWriter GetPevE4VehicleType();
+
+ IXmlTypeWriter GetPevIEPCVehicleType();
+
+ IXmlTypeWriter GetExemptedVehicleType();
+
+
+ #endregion
+
+ #region Componenet Group
+
+ IXmlTypeWriter GetConventionalComponentType();
+ IXmlTypeWriter GetHevIepcSComponentVIFType();
+ IXmlTypeWriter GetHevPxComponentVIFType();
+ IXmlTypeWriter GetHevS2ComponentVIFType();
+ IXmlTypeWriter GetHevS3ComponentVIFType();
+ IXmlTypeWriter GetHevS4ComponentVIFType();
+ IXmlTypeWriter GetPevE2ComponentVIFType();
+ IXmlTypeWriter GetPevE3ComponentVIFType();
+ IXmlTypeWriter GetPevE4ComponentVIFType();
+ IXmlTypeWriter GetPevIEPCComponentVIFType();
+
+ #endregion
+
+
+ #region Components
+
+ IVIFFAdasType GetConventionalADASType();
+ IVIFFAdasType GetHEVADASType();
+ IVIFFAdasType GetPEVADASType();
+ IVIFFAdasType GetIEPCADASType();
+
+ IXmlTypeWriter GetAngelDriveType();
+
+ IXmlTypeWriter GetRetarderType();
+ IXmlTypeWriter GetAuxiliaryType();
+ IXmlTypeWriter GetAuxiliaryHevSType();
+
+ IXmlTypeWriter GetAuxiliaryIEPC_SType();
+
+ IXmlTypeWriter GetAuxiliaryHevPType();
+ IXmlTypeWriter GetAuxiliaryIEPCType();
+ IXmlTypeWriter GetAuxiliaryPEVType();
+ IXmlTypeWriter GetAxlegearType();
+ IXmlTypeWriter GetAxleWheelsType();
+ IXmlTypeWriter GetBoostingLimitationsType();
+ IXmlTypeWriter GetElectricEnergyStorageType();
+ IXmlTypeWriter GetElectricMachineGENType();
+ IXmlElectricMachineSystemType GetElectricMachineSystemType();
+ IXmlTypeWriter GetElectricMachineType();
+ IXmlTypeWriter GetElectricMotorTorqueLimitsType();
+ IXmlTypeWriter GetEngineType();
+ IXmlTypeWriter GetTorqueConvertType();
+ IXmlTypeWriter GetIepcType();
+ IXmlTypeWriter GetTorqueLimitsType();
+ IXmlTypeWriter GetTransmissionType();
+
+ #endregion
+
+
+ #region Parameter Groups
+
+ IReportOutputGroup GetConventionalVehicleGroup();
+ IReportOutputGroup GetPrimaryBusGeneralParameterGroup();
+ IReportOutputGroup GetPrimaryBusChassisParameterGroup();
+ IReportOutputGroup GetPrimaryBusRetarderParameterGroup();
+ IReportOutputGroup GetPrimaryBusXevParameterGroup();
+
+ IReportOutputGroup GetHevIepcSVehicleParameterGroup();
+ IReportOutputGroup GetHevSxVehicleParameterGroup();
+ IReportOutputGroup GetIepcVehicleParameterGroup();
+ IReportOutputGroup GetPevExVehicleParmeterGroup();
+ IReportOutputGroup GetPevIEPCVehicleParmeterGroup();
+ IReportOutputGroup GetHevPxVehicleParameterGroup();
+
+ IReportOutputGroup GetExemptedVehicleParameterGroup();
+
+ #endregion
+
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponentVIFType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponentVIFType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..cfc23d3ec1232081a00402d14b5585764c06aa67
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponentVIFType.cs
@@ -0,0 +1,77 @@
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1
+{
+ public abstract class CompletedComponentVIFType : IReportMultistepCompletedBusTypeWriter
+ {
+ protected readonly IVIFReportInterimFactory _vifReportFactory;
+ protected XNamespace _vif = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1";
+ protected XNamespace _v24 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4";
+ protected XNamespace _xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
+
+ protected CompletedComponentVIFType(IVIFReportInterimFactory vifReportFactory)
+ {
+ _vifReportFactory = vifReportFactory;
+ }
+
+ #region Implementation of IReportMultistepCompletedBusTypeWriter
+
+ public abstract XElement GetElement(IMultistageVIFInputData inputData);
+
+ #endregion
+ }
+
+
+ public class ConventionalComponentsInterimVIFType : CompletedComponentVIFType
+ {
+ public ConventionalComponentsInterimVIFType(IVIFReportInterimFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of CompletedComponentVIFType
+
+ public override XElement GetElement(IMultistageVIFInputData inputData)
+ {
+ var airDrag = _vifReportFactory.GetInterimAirdragType().GetElement(inputData);
+ var auxiliaries = _vifReportFactory.GetInterimConventionalAuxiliariesType().GetElement(inputData);
+
+ if (airDrag == null && auxiliaries == null) {
+ return null;
+ }
+
+ return new XElement(_v24 + XMLNames.Vehicle_Components,
+ new XAttribute(_xsi + XMLNames.XSIType, "Components_Conventional_CompletedBusType"),
+ airDrag,
+ auxiliaries);
+
+ }
+
+ #endregion
+ }
+
+
+ public class XEVComponentsInterimVIFType : CompletedComponentVIFType
+ {
+ public XEVComponentsInterimVIFType(IVIFReportInterimFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of CompletedComponentVIFType
+
+ public override XElement GetElement(IMultistageVIFInputData inputData)
+ {
+ var airDrag = _vifReportFactory.GetInterimAirdragType().GetElement(inputData);
+ var auxiliaries = _vifReportFactory.GetInterimxEVAuxiliariesType().GetElement(inputData);
+
+ if (airDrag == null && auxiliaries == null) {
+ return null;
+ }
+
+ return new XElement(_v24 + XMLNames.Vehicle_Components,
+ new XAttribute(_xsi + XMLNames.XSIType, "Components_xEV_CompletedBusType"),
+ airDrag,
+ auxiliaries);
+
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000000000000000000000000000000000..03c65264aa420e6eed82a20d3078292739ec6d1b
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs
@@ -0,0 +1,126 @@
+using System;
+using System.Xml;
+using System.Xml.Linq;
+using System.Xml.XPath;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Hashing;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.InterimComponents
+{
+ public class AirdragInterimType : IReportMultistepCompletedBusTypeWriter
+ {
+ protected XNamespace xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
+
+ protected XNamespace di = "http://www.w3.org/2000/09/xmldsig#";
+ protected XNamespace v10 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0";
+ protected XNamespace v20 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0";
+ protected XNamespace v23 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3";
+ protected XNamespace v24 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4";
+
+ public AirdragInterimType() {}
+
+ #region Implementation of IReportMultistepCompletedBusTypeWriter
+
+ public XElement GetElement(IMultistageVIFInputData inputData)
+ {
+ var airdrag = inputData.VehicleInputData.Components?.AirdragInputData;
+ if (airdrag != null && inputData.VehicleInputData.AirdragModifiedMultistep != false) {
+ return GetAirdragElement(airdrag);
+ }
+
+ return inputData.VehicleInputData.AirdragModifiedMultistep == true
+ ? GetBusAirdragUseStandardValues()
+ : null;
+ }
+
+ #endregion
+
+ protected XElement GetAirdragElement(XMLDeclarationAirdragDataProviderV10 airdrag)
+ {
+ var retVal = new XElement(v24 + XMLNames.Component_AirDrag);
+ var tmp = XElement.Load(airdrag.XMLSource.CreateNavigator().ReadSubtree());
+ retVal.Add(tmp.Elements());
+ return retVal;
+ }
+
+ protected XElement GetAirdragElement(XMLDeclarationAirdragDataProviderV20 airdrag)
+ {
+ 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;
+ }
+
+ protected XElement GetAirdragElement(XMLDeclarationAirdragDataProviderV24 airdrag)
+ {
+ var retVal = new XElement(v24 + XMLNames.Component_AirDrag);
+ var tmp = XElement.Load(airdrag.XMLSource.CreateNavigator().ReadSubtree());
+ retVal.Add(tmp.Elements());
+ return retVal;
+ }
+
+ protected XElement GetAirdragElement(IAirdragDeclarationInputData airdrag)
+ {
+ switch (airdrag) {
+ case XMLDeclarationAirdragDataProviderV20 av20:
+ return GetAirdragElement(av20);
+ case XMLDeclarationAirdragDataProviderV24 av24:
+ return GetAirdragElement(av24);
+ case XMLDeclarationAirdragDataProviderV10 av10:
+ return GetAirdragElement(av10);
+ }
+ throw new VectoException(
+ $"Specific implementation for Airdrag Data (Interim Stage) missing {airdrag.GetType().Name}");
+
+ // //if (airdrag == null)
+ // // return null;
+
+ // //var dataAndSig =
+ // // airdrag.XMLSource.SelectSingleNode(XMLHelper.QueryLocalName(XMLNames.Component_AirDrag));
+ // //var dataXmlType = dataAndSig.FirstChild.SchemaInfo.SchemaAttribute.QualifiedName;
+
+ // //return null;
+ // //XmlNode airdragNode = null;
+ // //if (airdrag is AbstractCommonComponentType)
+ // // airdragNode = (airdrag as AbstractCommonComponentType).XMLSource;
+ // //else {
+ // // var type = airdrag.GetType();
+ // // var property = type.GetProperty(nameof(AbstractCommonComponentType.XMLSource));
+ // // if (property != null)
+ // // airdragNode = (XmlNode)property.GetValue(airdrag, null);
+ // //}
+
+ // //if (airdragNode == null)
+ // // return null;
+
+ // //var dataNode = airdragNode.SelectSingleNode(".//*[local-name()='Data']");
+ // //var signatureNode = airdragNode.SelectSingleNode(".//*[local-name()='Signature']");
+
+ // //if (dataNode == null)
+ // // throw new VectoException("Data node of airdrag component is null!");
+ // //if (signatureNode == null)
+ // // throw new VectoException("Signature node of the given airdrag component is null!");
+
+ // //return dataNode.NamespaceURI == v10.NamespaceName
+ // // ? GetAirdragXMLElementV1(dataNode, signatureNode)
+ // // : GetAirdragXMLElementV2(dataNode, signatureNode);
+ }
+
+ protected XElement GetBusAirdragUseStandardValues()
+ {
+ var id = $"{VectoComponents.Airdrag.HashIdPrefix()}{XMLHelper.GetGUID()}";
+
+ return new XElement(v24 + XMLNames.Component_AirDrag,
+ new XElement(v20 + XMLNames.ComponentDataWrapper,
+ new XAttribute(xsi + XMLNames.Attr_Type, "AirDragModifiedUseStandardValueType"),
+ new XAttribute(XMLNames.Component_ID_Attr, id)
+ ),
+ new XElement(v20 + XMLNames.DI_Signature, XMLHelper.CreateDummySig(di)));
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAuxiliaryType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAuxiliaryType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..a6abe6982eb10be5bc60edfd4882354f470810e7
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAuxiliaryType.cs
@@ -0,0 +1,150 @@
+using System.Xml.Linq;
+using NLog.LayoutRenderers;
+using TUGraz.VectoCommon.BusAuxiliaries;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.InterimComponents
+{
+ public abstract class InterimVIFAuxiliaryType : IReportMultistepCompletedBusTypeWriter
+ {
+ protected XNamespace _vif = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1";
+ protected XNamespace _v24 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4";
+ protected XNamespace _xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
+
+ protected readonly IVIFReportInterimFactory _vifFactory;
+
+ protected InterimVIFAuxiliaryType(IVIFReportInterimFactory vifFactory)
+ {
+ _vifFactory = vifFactory;
+ }
+
+ #region Implementation of IReportMultistepCompletedBusTypeWriter
+
+ public abstract XElement GetElement(IMultistageVIFInputData inputData);
+
+ #endregion
+ }
+
+ public class ConventionalInterimAuxiliaryType : InterimVIFAuxiliaryType
+ {
+ public ConventionalInterimAuxiliaryType(IVIFReportInterimFactory vifFactory) : base(vifFactory) { }
+
+ protected virtual string XMLType => "AUX_Conventional_CompletedBusType";
+
+ #region Overrides of InterimVIFAuxiliaryType
+
+ public override XElement GetElement(IMultistageVIFInputData inputData)
+ {
+ var busAux = inputData.VehicleInputData.Components?.BusAuxiliaries;
+ if (busAux == null)
+ return null;
+
+ var electricSystemEntry = GetElectricSystem(busAux.ElectricConsumers);
+ var hvacEntry = GetHVAC(busAux.HVACAux);
+
+ if (electricSystemEntry == null && hvacEntry == null)
+ return null;
+
+ return new XElement(_v24 + XMLNames.Component_Auxiliaries,
+ new XElement(_v24 + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.Attr_Type, XMLType),
+ electricSystemEntry != null
+ ? GetElectricSystem(busAux.ElectricConsumers) : null,
+ hvacEntry != null
+ ? GetHVAC(busAux.HVACAux) : null
+ ));
+ }
+
+ #endregion
+
+ protected virtual XElement GetElectricSystem(IElectricConsumersDeclarationData electricConsumer)
+ {
+ if (electricConsumer == null)
+ return null;
+
+ if (electricConsumer.InteriorLightsLED == null && electricConsumer.DayrunninglightsLED == null &&
+ electricConsumer.PositionlightsLED == null && electricConsumer.BrakelightsLED == null &&
+ electricConsumer.HeadlightsLED == null)
+ return null;
+
+ return new XElement(_v24 + XMLNames.BusAux_ElectricSystem,
+ new XElement(_v24 + XMLNames.BusAux_LEDLights,
+ electricConsumer.InteriorLightsLED != null
+ ? new XElement(_v24 + XMLNames.Bus_Interiorlights, electricConsumer.InteriorLightsLED) : null,
+ electricConsumer.DayrunninglightsLED != null
+ ? new XElement(_v24 + XMLNames.Bus_Dayrunninglights, electricConsumer.DayrunninglightsLED) : null,
+ electricConsumer.PositionlightsLED != null
+ ? new XElement(_v24 + XMLNames.Bus_Positionlights, electricConsumer.PositionlightsLED) : null,
+ electricConsumer.BrakelightsLED != null
+ ? new XElement(_v24 + XMLNames.Bus_Brakelights, electricConsumer.BrakelightsLED) : null,
+ electricConsumer.HeadlightsLED != null
+ ? new XElement(_v24 + XMLNames.Bus_Headlights, electricConsumer.HeadlightsLED) : null
+ ));
+ }
+
+ protected virtual XElement GetHVAC(IHVACBusAuxiliariesDeclarationData hvac)
+ {
+ if (hvac == null)
+ return null;
+
+ if (hvac.SystemConfiguration == null &&
+ hvac.HeatPumpTypeCoolingDriverCompartment == null && hvac.HeatPumpTypeHeatingDriverCompartment == null &&
+ hvac.HeatPumpTypeCoolingPassengerCompartment == null && hvac.HeatPumpTypeHeatingPassengerCompartment == null &&
+ hvac.AuxHeaterPower == null && hvac.DoubleGlazing == null &&
+ hvac.AdjustableAuxiliaryHeater == null && hvac.SeparateAirDistributionDucts == null &&
+ hvac.WaterElectricHeater == null && hvac.AirElectricHeater == null && hvac.OtherHeatingTechnology == null)
+ return null;
+
+ return new XElement(_v24 + XMLNames.BusAux_HVAC,
+ hvac.SystemConfiguration != null
+ ? new XElement(_v24 + XMLNames.Bus_SystemConfiguration, hvac.SystemConfiguration.ToXmlFormat()) : null,
+ hvac.HeatPumpTypeCoolingDriverCompartment != null && hvac.HeatPumpTypeHeatingDriverCompartment != null
+ ? new XElement(_v24 + XMLNames.Bus_HeatPumpTypeDriver,
+ new XElement(_v24 + XMLNames.BusHVACHeatPumpCooling, hvac.HeatPumpTypeCoolingDriverCompartment.GetLabel()),
+ new XElement(_v24 + XMLNames.BusHVACHeatPumpHeating, hvac.HeatPumpTypeHeatingDriverCompartment.GetLabel())) : null,
+ hvac.HeatPumpTypeCoolingPassengerCompartment != null && hvac.HeatPumpTypeHeatingPassengerCompartment != null
+ ? new XElement(_v24 + XMLNames.Bus_HeatPumpTypePassenger,
+ new XElement(_v24 + XMLNames.BusHVACHeatPumpCooling, hvac.HeatPumpTypeCoolingPassengerCompartment.GetLabel()),
+ new XElement(_v24 + XMLNames.BusHVACHeatPumpHeating, hvac.HeatPumpTypeHeatingPassengerCompartment.GetLabel())) : null,
+ hvac.AuxHeaterPower != null
+ ? new XElement(_v24 + XMLNames.Bus_AuxiliaryHeaterPower, hvac.AuxHeaterPower.ToXMLFormat(0)) : null,
+ hvac.DoubleGlazing != null
+ ? new XElement(_v24 + XMLNames.Bus_DoubleGlazing, hvac.DoubleGlazing) : null,
+ hvac.AdjustableAuxiliaryHeater != null
+ ? new XElement(_v24 + XMLNames.Bus_AdjustableAuxiliaryHeater, hvac.AdjustableAuxiliaryHeater) : null,
+ hvac.SeparateAirDistributionDucts != null
+ ? new XElement(_v24 + XMLNames.Bus_SeparateAirDistributionDucts, hvac.SeparateAirDistributionDucts) : null
+ );
+ }
+
+ }
+
+ public class XEVInterimAuxiliaryType : ConventionalInterimAuxiliaryType
+ {
+ public XEVInterimAuxiliaryType(IVIFReportInterimFactory vifFactory) : base(vifFactory) { }
+
+ protected override string XMLType => "AUX_xEV_CompletedBusType";
+
+ protected override XElement GetHVAC(IHVACBusAuxiliariesDeclarationData hvac)
+ {
+ var retVal = base.GetHVAC(hvac);
+ retVal.Add(GetxEVHVAC(hvac));
+
+ return retVal;
+
+ }
+
+ protected virtual XElement[] GetxEVHVAC(IHVACBusAuxiliariesDeclarationData hvac)
+ {
+ return new[] {
+ hvac.WaterElectricHeater.HasValue ?
+ new XElement(_v24 + XMLNames.Bus_WaterElectricHeater, hvac.WaterElectricHeater) :null,
+ hvac.AirElectricHeater.HasValue ?
+ new XElement(_v24 + XMLNames.Bus_AirElectricHeater, hvac.AirElectricHeater) : null,
+ hvac.OtherHeatingTechnology.HasValue ?
+ new XElement(_v24 + XMLNames.Bus_OtherHeatingTechnology, hvac.OtherHeatingTechnology) : null
+ };
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimVIFAdasType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimVIFAdasType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..3583ba7922a34cbd93b477923f2ee0b9f911d606
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimVIFAdasType.cs
@@ -0,0 +1,96 @@
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.InterimComponents
+{
+ public class VIFCompletedConventionalAdasType : AbstractVIFXmlType, IVIFFAdasType
+ {
+ public VIFCompletedConventionalAdasType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetXmlType(IAdvancedDriverAssistantSystemDeclarationInputData adas)
+ {
+ if (adas == null)
+ return null;
+
+ return new XElement(_v24 + XMLNames.Vehicle_ADAS,
+ new XAttribute(_xsi + XMLNames.XSIType, "ADAS_Conventional_Type"),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_EngineStopStart, adas.EngineStopStart),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_EcoRollWithoutEngineStop, adas.EcoRoll == EcoRollType.WithoutEngineStop),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_EcoRollWithEngineStopStart, adas.EcoRoll == EcoRollType.WithEngineStop),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_PCC, adas.PredictiveCruiseControl.ToXMLFormat()),
+ adas.ATEcoRollReleaseLockupClutch.HasValue
+ ? new XElement(_v24 + XMLNames.Vehicle_ADAS_ATEcoRollReleaseLockupClutch,
+ adas.ATEcoRollReleaseLockupClutch.Value)
+ : null);
+ }
+
+ #endregion
+ }
+
+
+ public class VIFCompletedHEVAdasType : AbstractVIFXmlType, IVIFFAdasType
+ {
+ public VIFCompletedHEVAdasType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetXmlType(IAdvancedDriverAssistantSystemDeclarationInputData adas)
+ {
+ if (adas == null)
+ return null;
+
+ return new XElement(_v24 + XMLNames.Vehicle_ADAS,
+ new XAttribute(_xsi + XMLNames.XSIType, "ADAS_HEV_Type"),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_EngineStopStart, adas.EngineStopStart),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_PCC, adas.PredictiveCruiseControl.ToXMLFormat()),
+ adas.ATEcoRollReleaseLockupClutch.HasValue
+ ? new XElement(_v24 + XMLNames.Vehicle_ADAS_ATEcoRollReleaseLockupClutch,
+ adas.ATEcoRollReleaseLockupClutch.Value)
+ : null);
+ }
+
+ #endregion
+ }
+
+ public class VIFCompletedPEVAdasType : AbstractVIFXmlType, IVIFFAdasType
+ {
+ public VIFCompletedPEVAdasType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetXmlType(IAdvancedDriverAssistantSystemDeclarationInputData adas)
+ {
+ if (adas == null)
+ return null;
+
+ return new XElement(_v24 + XMLNames.Vehicle_ADAS,
+ new XAttribute(_xsi + XMLNames.XSIType, "ADAS_PEV_Type"),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_PCC, adas.PredictiveCruiseControl.ToXMLFormat()));
+ }
+
+ #endregion
+ }
+
+ public class VIFCompletedIEPCAdasType : AbstractVIFXmlType, IVIFFAdasType
+ {
+ public VIFCompletedIEPCAdasType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetXmlType(IAdvancedDriverAssistantSystemDeclarationInputData adas)
+ {
+ if (adas == null)
+ return null;
+
+ return new XElement(_v24 + XMLNames.Vehicle_ADAS,
+ new XAttribute(_xsi + XMLNames.XSIType, "ADAS_IEPC_Type"),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_PCC, adas.PredictiveCruiseControl.ToXMLFormat()));
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimVehicleParameterGroup.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimVehicleParameterGroup.cs
new file mode 100644
index 0000000000000000000000000000000000000000..57c61a1f31d6c21071350479b50288ffa955d94d
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimVehicleParameterGroup.cs
@@ -0,0 +1,147 @@
+using System.Collections.Generic;
+using System.Xml;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1
+{
+ public abstract class AbstractInterimVIFGroupWriter : IReportMultistepCompletedBusOutputGroup
+ {
+ protected readonly IVIFReportInterimFactory _vifReportFactory;
+ protected XNamespace _vif = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1";
+ protected XNamespace _v24 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4";
+
+ protected AbstractInterimVIFGroupWriter(IVIFReportInterimFactory vifReportFactory)
+ {
+ _vifReportFactory = vifReportFactory;
+ }
+
+ #region Implementation of IReportMultistepCompletedBusOutputGroup
+
+ public abstract IList<XElement> GetElements(IMultistageVIFInputData multiStageInputDataProvider);
+
+ #endregion
+ }
+
+ public class CompletedBusGeneralParametersGroup : AbstractInterimVIFGroupWriter
+ {
+ public CompletedBusGeneralParametersGroup(IVIFReportInterimFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractInterimVIFGroupWriter
+
+ public override IList<XElement> GetElements(IMultistageVIFInputData multiStageInputDataProvider)
+ {
+ var vehicleInputData = multiStageInputDataProvider.VehicleInputData;
+ return new[] {
+ new XElement(_v24 + XMLNames.Component_Manufacturer, vehicleInputData.Manufacturer),
+ new XElement(_v24 + XMLNames.Component_ManufacturerAddress, vehicleInputData.ManufacturerAddress),
+ new XElement(_v24 + XMLNames.Vehicle_VIN, vehicleInputData.VIN),
+ new XElement(_v24 + XMLNames.Component_Date,
+ XmlConvert.ToString(vehicleInputData.Date, XmlDateTimeSerializationMode.Utc)),
+
+ };
+ }
+
+ #endregion
+ }
+
+ public class GetCompletedBusParametersGroup : AbstractInterimVIFGroupWriter
+ {
+ public GetCompletedBusParametersGroup(IVIFReportInterimFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractInterimVIFGroupWriter
+
+ public override IList<XElement> GetElements(IMultistageVIFInputData multiStageInputDataProvider)
+ {
+ var vehicleInputData = multiStageInputDataProvider.VehicleInputData;
+ return new [] {
+ vehicleInputData.Model != null
+ ? new XElement(_v24 + XMLNames.Component_Model, vehicleInputData.Model) : null,
+ vehicleInputData.LegislativeClass != null
+ ? new XElement(_v24 + XMLNames.Vehicle_LegislativeCategory, vehicleInputData.LegislativeClass.ToXMLFormat()) : null,
+ vehicleInputData.CurbMassChassis != null
+ ? new XElement(_v24 + XMLNames.CorrectedActualMass, vehicleInputData.CurbMassChassis.ToXMLFormat(0)) : null,
+ vehicleInputData.GrossVehicleMassRating != null
+ ? new XElement(_v24 + XMLNames.TPMLM, vehicleInputData.GrossVehicleMassRating.ToXMLFormat(0)) : null,
+ GetAirdragModifiedMultistageEntry(multiStageInputDataProvider),
+ vehicleInputData.RegisteredClass != null
+ ? new XElement(_v24 + XMLNames.Vehicle_RegisteredClass, vehicleInputData.RegisteredClass.ToXMLFormat()) : null,
+ };
+ }
+
+ protected XElement GetAirdragModifiedMultistageEntry(IMultistageVIFInputData multiStageInputDataProvider)
+ {
+ var consolidatedInputData = multiStageInputDataProvider.MultistageJobInputData.JobInputData
+ .ConsolidateManufacturingStage;
+ var vehicleInputData = multiStageInputDataProvider.VehicleInputData;
+ if (consolidatedInputData?.Vehicle?.Components?.AirdragInputData == null)
+ return null;
+
+ switch (vehicleInputData.AirdragModifiedMultistep) {
+ case null:
+ throw new VectoException("AirdragModifiedMultistage must be set if an airdrag component has been set in previous stages.");
+ default:
+ return new XElement(_v24 + XMLNames.Bus_AirdragModifiedMultistep, vehicleInputData.AirdragModifiedMultistep);
+ }
+ }
+ #endregion
+ }
+
+ public class CompletedBusPassengerCountGroup : AbstractInterimVIFGroupWriter
+ {
+ public CompletedBusPassengerCountGroup(IVIFReportInterimFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractInterimVIFGroupWriter
+
+ public override IList<XElement> GetElements(IMultistageVIFInputData multiStageInputDataProvider)
+ {
+ var vehicleInputData = multiStageInputDataProvider.VehicleInputData;
+
+ if (vehicleInputData.NumberPassengerSeatsLowerDeck == null ||
+ vehicleInputData.NumberPassengersStandingLowerDeck == null ||
+ vehicleInputData.NumberPassengerSeatsUpperDeck == null ||
+ vehicleInputData.NumberPassengersStandingUpperDeck == null) {
+ return new XElement[] {};
+ }
+
+ return new [] {
+ new XElement(_v24 + XMLNames.Bus_NumberPassengerSeatsLowerDeck, vehicleInputData.NumberPassengerSeatsLowerDeck),
+ new XElement(_v24 + XMLNames.Bus_NumberPassengersStandingLowerDeck, vehicleInputData.NumberPassengersStandingLowerDeck),
+ new XElement(_v24 + XMLNames.Bus_NumberPassengerSeatsUpperDeck, vehicleInputData.NumberPassengerSeatsUpperDeck),
+ new XElement(_v24 + XMLNames.Bus_NumberPassengersStandingUpperDeck, vehicleInputData.NumberPassengersStandingUpperDeck),
+ };
+ }
+
+ #endregion
+ }
+
+ public class CompletedBusDimensionsGroup : AbstractInterimVIFGroupWriter
+ {
+ public CompletedBusDimensionsGroup(IVIFReportInterimFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractInterimVIFGroupWriter
+
+ public override IList<XElement> GetElements(IMultistageVIFInputData multiStageInputDataProvider)
+ {
+ var vehicleInputData = multiStageInputDataProvider.VehicleInputData;
+
+ if (vehicleInputData.Height == null || vehicleInputData.Length == null ||
+ vehicleInputData.Width == null || vehicleInputData.EntranceHeight == null) {
+ return new XElement[] { };
+ }
+
+ return new[] {
+ new XElement(_v24 + XMLNames.Bus_HeightIntegratedBody, vehicleInputData.Height.ConvertToMilliMeter().ToXMLFormat(0)),
+ new XElement(_v24 + XMLNames.Bus_VehicleLength, vehicleInputData.Length.ConvertToMilliMeter().ToXMLFormat(0)),
+ new XElement(_v24 + XMLNames.Bus_VehicleWidth, vehicleInputData.Width.ConvertToMilliMeter().ToXMLFormat(0)),
+ new XElement(_v24 + XMLNames.Bus_EntranceHeight, vehicleInputData.EntranceHeight.ConvertToMilliMeter().ToXMLFormat(0)),
+ };
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimVehicleWriter.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimVehicleWriter.cs
new file mode 100644
index 0000000000000000000000000000000000000000..2c778cdd51ba502b3b5c82869ac9f21b7efcef26
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimVehicleWriter.cs
@@ -0,0 +1,269 @@
+using System.Xml.Linq;
+using TUGraz.VectoCommon.BusAuxiliaries;
+using TUGraz.VectoCommon.Hashing;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1
+{
+ public abstract class InterimVehicleWriter : IXmlMultistepTypeWriter
+ {
+ protected readonly IVIFReportInterimFactory _vifReportFactory;
+
+ protected XNamespace _vif = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1";
+ protected XNamespace _v24 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4";
+ protected XNamespace _xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
+
+ protected InterimVehicleWriter(IVIFReportInterimFactory vifReportFactory)
+ {
+ _vifReportFactory = vifReportFactory;
+ }
+
+ #region Implementation of IXmlMultistepTypeWriter
+
+ public abstract XElement GetElement(IMultistageVIFInputData inputData);
+
+ #endregion
+
+ protected string GetVehicleID()
+ {
+ return $"{VectoComponents.Vehicle.HashIdPrefix()}{XMLHelper.GetGUID()}";
+ }
+ }
+
+ public class ConventionalInterimVehicleType : InterimVehicleWriter
+ {
+ public ConventionalInterimVehicleType(IVIFReportInterimFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IMultistageVIFInputData inputData)
+ {
+ var vehicleInput = inputData.VehicleInputData;
+ var ngTankSystem = vehicleInput.TankSystem.HasValue
+ ? new XElement(_v24 + XMLNames.Vehicle_NgTankSystem, vehicleInput.TankSystem.ToString())
+ : null;
+ var bodyworkCode = vehicleInput.VehicleCode.HasValue
+ ? new XElement(_v24 + XMLNames.Vehicle_BodyworkCode, vehicleInput.VehicleCode.ToXMLFormat())
+ : null;
+ var lowEntry = vehicleInput.LowEntry.HasValue
+ ? new XElement(_v24 + XMLNames.Bus_LowEntry, vehicleInput.LowEntry)
+ : null;
+ var doordriveTechnology = vehicleInput.DoorDriveTechnology.HasValue
+ ? new XElement(_v24 + XMLNames.Bus_DoorDriveTechnology,
+ vehicleInput.DoorDriveTechnology.ToXMLFormat())
+ : null;
+ var vehicleTypeApprovalNumber = string.IsNullOrWhiteSpace(vehicleInput.VehicleTypeApprovalNumber)
+ ? null
+ : new XElement(_v24 + XMLNames.VehicleTypeApprovalNumber, vehicleInput.VehicleTypeApprovalNumber);
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(XMLNames.Component_ID_Attr, GetVehicleID()),
+ new XAttribute(_xsi + XMLNames.XSIType, "Vehicle_Conventional_CompletedBusDeclarationType"),
+ new XAttribute("xmlns", _v24),
+ //new XAttribute(XNamespace.Xmlns + "xsi", _xsi),
+ _vifReportFactory.GetCompletedBusGeneralParametersGroup().GetElements(inputData),
+ _vifReportFactory.GetCompletedBusParametersGroup().GetElements(inputData),
+ ngTankSystem,
+ _vifReportFactory.GetCompletedBusPassengerCountGroup().GetElements(inputData),
+ bodyworkCode,
+ lowEntry,
+ _vifReportFactory.GetCompletedBusDimensionsGroup().GetElements(inputData),
+ doordriveTechnology,
+ new XElement(_v24 + XMLNames.Bus_VehicleDeclarationType,
+ inputData.VehicleInputData.VehicleDeclarationType.GetLabel()),
+ vehicleTypeApprovalNumber,
+ _vifReportFactory.GetConventionalInterimADASType().GetXmlType(inputData.VehicleInputData.ADAS),
+ _vifReportFactory.GetConventionalInterimComponentsType().GetElement(inputData)
+ );
+ }
+
+ #endregion
+ }
+
+ public class HEVInterimVehicleType : InterimVehicleWriter
+ {
+ public HEVInterimVehicleType(IVIFReportInterimFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of InterimVehicleWriter
+
+ public override XElement GetElement(IMultistageVIFInputData inputData)
+ {
+ var vehicleInput = inputData.VehicleInputData;
+ var ngTankSystem = vehicleInput.TankSystem.HasValue
+ ? new XElement(_v24 + XMLNames.Vehicle_NgTankSystem, vehicleInput.TankSystem.ToString())
+ : null;
+ var bodyworkCode = vehicleInput.VehicleCode.HasValue
+ ? new XElement(_v24 + XMLNames.Vehicle_BodyworkCode, vehicleInput.VehicleCode.ToXMLFormat())
+ : null;
+ var lowEntry = vehicleInput.LowEntry.HasValue
+ ? new XElement(_v24 + XMLNames.Bus_LowEntry, vehicleInput.LowEntry)
+ : null;
+ var doordriveTechnology = vehicleInput.DoorDriveTechnology.HasValue
+ ? new XElement(_v24 + XMLNames.Bus_DoorDriveTechnology,
+ vehicleInput.DoorDriveTechnology.ToXMLFormat())
+ : null;
+ var vehicleTypeApprovalNumber = string.IsNullOrWhiteSpace(vehicleInput.VehicleTypeApprovalNumber)
+ ? null
+ : new XElement(_v24 + XMLNames.VehicleTypeApprovalNumber, vehicleInput.VehicleTypeApprovalNumber);
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(XMLNames.Component_ID_Attr, GetVehicleID()),
+ new XAttribute(_xsi + XMLNames.XSIType, "Vehicle_HEV_CompletedBusDeclarationType"),
+ new XAttribute("xmlns", _v24),
+ //new XAttribute(XNamespace.Xmlns + "xsi", _xsi),
+ _vifReportFactory.GetCompletedBusGeneralParametersGroup().GetElements(inputData),
+ _vifReportFactory.GetCompletedBusParametersGroup().GetElements(inputData),
+ ngTankSystem,
+ _vifReportFactory.GetCompletedBusPassengerCountGroup().GetElements(inputData),
+ bodyworkCode,
+ lowEntry,
+ _vifReportFactory.GetCompletedBusDimensionsGroup().GetElements(inputData),
+ doordriveTechnology,
+ new XElement(_v24 + XMLNames.Bus_VehicleDeclarationType,
+ inputData.VehicleInputData.VehicleDeclarationType.GetLabel()),
+ vehicleTypeApprovalNumber,
+ _vifReportFactory.GetHEVInterimADASType().GetXmlType(inputData.VehicleInputData.ADAS),
+ _vifReportFactory.GetxEVInterimComponentsType().GetElement(inputData)
+ );
+ }
+
+ #endregion
+ }
+
+ public class PEVInterimVehicleType : InterimVehicleWriter
+ {
+ public PEVInterimVehicleType(IVIFReportInterimFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of InterimVehicleWriter
+
+ public override XElement GetElement(IMultistageVIFInputData inputData)
+ {
+ var vehicleInput = inputData.VehicleInputData;
+ var bodyworkCode = vehicleInput.VehicleCode.HasValue
+ ? new XElement(_v24 + XMLNames.Vehicle_BodyworkCode, vehicleInput.VehicleCode.ToXMLFormat())
+ : null;
+ var lowEntry = vehicleInput.LowEntry.HasValue
+ ? new XElement(_v24 + XMLNames.Bus_LowEntry, vehicleInput.LowEntry)
+ : null;
+ var doordriveTechnology = vehicleInput.DoorDriveTechnology.HasValue
+ ? new XElement(_v24 + XMLNames.Bus_DoorDriveTechnology,
+ vehicleInput.DoorDriveTechnology.ToXMLFormat())
+ : null;
+ var vehicleTypeApprovalNumber = string.IsNullOrWhiteSpace(vehicleInput.VehicleTypeApprovalNumber)
+ ? null
+ : new XElement(_v24 + XMLNames.VehicleTypeApprovalNumber, vehicleInput.VehicleTypeApprovalNumber);
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(XMLNames.Component_ID_Attr, GetVehicleID()),
+ new XAttribute(_xsi + XMLNames.XSIType, "Vehicle_PEV_CompletedBusDeclarationType"),
+ new XAttribute("xmlns", _v24),
+ //new XAttribute(XNamespace.Xmlns + "xsi", _xsi),
+ _vifReportFactory.GetCompletedBusGeneralParametersGroup().GetElements(inputData),
+ _vifReportFactory.GetCompletedBusParametersGroup().GetElements(inputData),
+ _vifReportFactory.GetCompletedBusPassengerCountGroup().GetElements(inputData),
+ bodyworkCode,
+ lowEntry,
+ _vifReportFactory.GetCompletedBusDimensionsGroup().GetElements(inputData),
+ doordriveTechnology,
+ new XElement(_v24 + XMLNames.Bus_VehicleDeclarationType,
+ inputData.VehicleInputData.VehicleDeclarationType.GetLabel()),
+ vehicleTypeApprovalNumber,
+ _vifReportFactory.GetPEVInterimADASType().GetXmlType(inputData.VehicleInputData.ADAS),
+ _vifReportFactory.GetxEVInterimComponentsType().GetElement(inputData)
+ );
+ }
+
+ #endregion
+ }
+
+ public class IEPCInterimVehicleType : InterimVehicleWriter
+ {
+ public IEPCInterimVehicleType(IVIFReportInterimFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of InterimVehicleWriter
+
+ public override XElement GetElement(IMultistageVIFInputData inputData)
+ {
+ var vehicleInput = inputData.VehicleInputData;
+ var bodyworkCode = vehicleInput.VehicleCode.HasValue
+ ? new XElement(_v24 + XMLNames.Vehicle_BodyworkCode, vehicleInput.VehicleCode.ToXMLFormat())
+ : null;
+ var lowEntry = vehicleInput.LowEntry.HasValue
+ ? new XElement(_v24 + XMLNames.Bus_LowEntry, vehicleInput.LowEntry)
+ : null;
+ var doordriveTechnology = vehicleInput.DoorDriveTechnology.HasValue
+ ? new XElement(_v24 + XMLNames.Bus_DoorDriveTechnology,
+ vehicleInput.DoorDriveTechnology.ToXMLFormat())
+ : null;
+ var vehicleTypeApprovalNumber = string.IsNullOrWhiteSpace(vehicleInput.VehicleTypeApprovalNumber)
+ ? null
+ : new XElement(_v24 + XMLNames.VehicleTypeApprovalNumber, vehicleInput.VehicleTypeApprovalNumber);
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(XMLNames.Component_ID_Attr, GetVehicleID()),
+ new XAttribute(_xsi + XMLNames.XSIType, "Vehicle_IEPC_CompletedBusDeclarationType"),
+ new XAttribute("xmlns", _v24),
+ //new XAttribute(XNamespace.Xmlns + "xsi", _xsi),
+ _vifReportFactory.GetCompletedBusGeneralParametersGroup().GetElements(inputData),
+ _vifReportFactory.GetCompletedBusParametersGroup().GetElements(inputData),
+ _vifReportFactory.GetCompletedBusPassengerCountGroup().GetElements(inputData),
+ bodyworkCode,
+ lowEntry,
+ _vifReportFactory.GetCompletedBusDimensionsGroup().GetElements(inputData),
+ doordriveTechnology,
+ new XElement(_v24 + XMLNames.Bus_VehicleDeclarationType,
+ inputData.VehicleInputData.VehicleDeclarationType.GetLabel()),
+ vehicleTypeApprovalNumber,
+ _vifReportFactory.GetIEPCInterimADASType().GetXmlType(inputData.VehicleInputData.ADAS),
+ _vifReportFactory.GetxEVInterimComponentsType().GetElement(inputData)
+ );
+ }
+
+ #endregion
+ }
+
+ public class ExemptedInterimVehicleType : InterimVehicleWriter
+ {
+ public ExemptedInterimVehicleType(IVIFReportInterimFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of InterimVehicleWriter
+
+ public override XElement GetElement(IMultistageVIFInputData inputData)
+ {
+ var vehicleInput = inputData.VehicleInputData;
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(XMLNames.Component_ID_Attr, GetVehicleID()),
+ new XAttribute(_xsi + XMLNames.XSIType, "Vehicle_Exempted_CompletedBusDeclarationType"),
+ new XAttribute("xmlns", _v24),
+ _vifReportFactory.GetCompletedBusGeneralParametersGroup().GetElements(inputData),
+ vehicleInput.Model != null
+ ? new XElement(_v24 + XMLNames.Component_Model, vehicleInput.Model) : null,
+ vehicleInput.LegislativeClass != null
+ ? new XElement(_v24 + XMLNames.Vehicle_LegislativeCategory, vehicleInput.LegislativeClass.ToXMLFormat()) : null,
+ vehicleInput.CurbMassChassis != null
+ ? new XElement(_v24 + XMLNames.CorrectedActualMass, vehicleInput.CurbMassChassis.ToXMLFormat(0)) : null,
+ vehicleInput.GrossVehicleMassRating != null
+ ? new XElement(_v24 + XMLNames.TPMLM, vehicleInput.GrossVehicleMassRating.ToXMLFormat(0)) : null,
+ vehicleInput.AirdragModifiedMultistep != null ?
+ new XElement(_v24 + XMLNames.Bus_AirdragModifiedMultistep, vehicleInput.AirdragModifiedMultistep) : null,
+ vehicleInput.RegisteredClass != null && vehicleInput.RegisteredClass != RegistrationClass.unknown
+ ? new XElement(_v24 + XMLNames.Vehicle_RegisteredClass, vehicleInput.RegisteredClass.ToXMLFormat()) : null,
+ _vifReportFactory.GetCompletedBusPassengerCountGroup().GetElements(inputData),
+ vehicleInput.VehicleCode.HasValue
+ ? new XElement(_v24 + XMLNames.Vehicle_BodyworkCode, vehicleInput.VehicleCode.ToXMLFormat())
+ : null,
+ vehicleInput.LowEntry != null
+ ? new XElement(_v24 + XMLNames.Bus_LowEntry, vehicleInput.LowEntry) : null,
+ vehicleInput.Height != null
+ ? new XElement(_v24 + XMLNames.Bus_HeightIntegratedBody, vehicleInput.Height.ConvertToMilliMeter().ToXMLFormat(0)) : null
+
+ );
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponentGroup.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponentGroup.cs
new file mode 100644
index 0000000000000000000000000000000000000000..7a1af05caf0731af06df0f74f6bbe31e57ad35ab
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponentGroup.cs
@@ -0,0 +1,260 @@
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1
+{
+ public abstract class PrimaryComponentVIFType : IXmlTypeWriter
+ {
+ protected readonly IVIFReportFactory _vifReportFactory;
+ protected XNamespace _vif = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1";
+ protected XNamespace _xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
+
+ protected PrimaryComponentVIFType(IVIFReportFactory vifReportFactory)
+ {
+ _vifReportFactory = vifReportFactory;
+ }
+
+ #region Implementation of IXmlTypeWriter
+
+ public abstract XElement GetElement(IDeclarationInputDataProvider inputData);
+
+ #endregion
+ }
+
+
+ public class ConventionalComponentVIFType : PrimaryComponentVIFType
+ {
+ public ConventionalComponentVIFType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of ComponentVIFType
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_vif + XMLNames.Vehicle_Components,
+ new XAttribute(_xsi + XMLNames.XSIType, "Vehicle_Conventional_ComponentsVIFType"),
+ _vifReportFactory.GetEngineType().GetElement(inputData),
+ _vifReportFactory.GetTransmissionType().GetElement(inputData),
+ _vifReportFactory.GetTorqueConvertType().GetElement(inputData),
+ _vifReportFactory.GetAngelDriveType().GetElement(inputData),
+ _vifReportFactory.GetRetarderType().GetElement(inputData),
+ _vifReportFactory.GetAxlegearType().GetElement(inputData),
+ _vifReportFactory.GetAxleWheelsType().GetElement(inputData),
+ _vifReportFactory.GetAuxiliaryType().GetElement(inputData));
+ }
+
+ #endregion
+ }
+
+
+ public class HevIepcSComponentVIFType : PrimaryComponentVIFType
+ {
+ public HevIepcSComponentVIFType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of ComponentVIFType
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_vif + XMLNames.Vehicle_Components,
+ new XAttribute(_xsi + XMLNames.XSIType, "Vehicle_HEV-IEPC-S_ComponentsVIFType"),
+ _vifReportFactory.GetEngineType().GetElement(inputData),
+ _vifReportFactory.GetElectricMachineGENType().GetElement(inputData),
+ _vifReportFactory.GetElectricEnergyStorageType().GetElement(inputData),
+ _vifReportFactory.GetIepcType().GetElement(inputData),
+ _vifReportFactory.GetRetarderType().GetElement(inputData),
+ _vifReportFactory.GetAxlegearType().GetElement(inputData),
+ _vifReportFactory.GetAxleWheelsType().GetElement(inputData),
+ _vifReportFactory.GetAuxiliaryIEPC_SType().GetElement(inputData));
+ }
+
+ #endregion
+ }
+
+ public class HevPxComponentVIFType : PrimaryComponentVIFType
+ {
+ public HevPxComponentVIFType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of ComponentVIFType
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_vif + XMLNames.Vehicle_Components,
+ new XAttribute(_xsi + XMLNames.XSIType, "Vehicle_HEV-Px_ComponentsVIFType"),
+ _vifReportFactory.GetEngineType().GetElement(inputData),
+ _vifReportFactory.GetElectricMachineType().GetElement(inputData),
+ _vifReportFactory.GetElectricEnergyStorageType().GetElement(inputData),
+ _vifReportFactory.GetTransmissionType().GetElement(inputData),
+ _vifReportFactory.GetTorqueConvertType().GetElement(inputData),
+ _vifReportFactory.GetAngelDriveType().GetElement(inputData),
+ _vifReportFactory.GetRetarderType().GetElement(inputData),
+ _vifReportFactory.GetAxlegearType().GetElement(inputData),
+ _vifReportFactory.GetAxleWheelsType().GetElement(inputData),
+ _vifReportFactory.GetAuxiliaryHevPType().GetElement(inputData));
+ }
+
+ #endregion
+ }
+
+ public class HevS2ComponentVIFType: PrimaryComponentVIFType
+ {
+ public HevS2ComponentVIFType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of ComponentVIFType
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_vif + XMLNames.Vehicle_Components,
+ new XAttribute(_xsi + XMLNames.XSIType, "Vehicle_HEV-S2_ComponentsVIFType"),
+ _vifReportFactory.GetEngineType().GetElement(inputData),
+ _vifReportFactory.GetElectricMachineGENType().GetElement(inputData),
+ _vifReportFactory.GetElectricEnergyStorageType().GetElement(inputData),
+ _vifReportFactory.GetElectricMachineType().GetElement(inputData),
+ _vifReportFactory.GetTransmissionType().GetElement(inputData),
+ _vifReportFactory.GetTorqueConvertType().GetElement(inputData),
+ _vifReportFactory.GetAngelDriveType().GetElement(inputData),
+ _vifReportFactory.GetRetarderType().GetElement(inputData),
+ _vifReportFactory.GetAxlegearType().GetElement(inputData),
+ _vifReportFactory.GetAxleWheelsType().GetElement(inputData),
+ _vifReportFactory.GetAuxiliaryHevSType().GetElement(inputData));
+ }
+
+ #endregion
+ }
+
+
+ public class HevS3ComponentVIFType : PrimaryComponentVIFType
+ {
+ public HevS3ComponentVIFType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of ComponentVIFType
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_vif + XMLNames.Vehicle_Components,
+ new XAttribute(_xsi + XMLNames.XSIType, "Vehicle_HEV-S3_ComponentsVIFType"),
+ _vifReportFactory.GetEngineType().GetElement(inputData),
+ _vifReportFactory.GetElectricMachineGENType().GetElement(inputData),
+ _vifReportFactory.GetElectricEnergyStorageType().GetElement(inputData),
+ _vifReportFactory.GetElectricMachineType().GetElement(inputData),
+ _vifReportFactory.GetRetarderType().GetElement(inputData),
+ _vifReportFactory.GetAxlegearType().GetElement(inputData),
+ _vifReportFactory.GetAxleWheelsType().GetElement(inputData),
+ _vifReportFactory.GetAuxiliaryHevSType().GetElement(inputData));
+ }
+
+ #endregion
+ }
+
+
+ public class HevS4ComponentVIFType : PrimaryComponentVIFType
+ {
+ public HevS4ComponentVIFType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of ComponentVIFType
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_vif + XMLNames.Vehicle_Components,
+ new XAttribute(_xsi + XMLNames.XSIType, "Vehicle_HEV-S4_ComponentsVIFType"),
+ _vifReportFactory.GetEngineType().GetElement(inputData),
+ _vifReportFactory.GetElectricMachineGENType().GetElement(inputData),
+ _vifReportFactory.GetElectricEnergyStorageType().GetElement(inputData),
+ _vifReportFactory.GetElectricMachineType().GetElement(inputData),
+ _vifReportFactory.GetAxleWheelsType().GetElement(inputData),
+ _vifReportFactory.GetAuxiliaryHevSType().GetElement(inputData));
+ }
+
+ #endregion
+ }
+
+
+ public class PevE2ComponentVIFType : PrimaryComponentVIFType
+ {
+ public PevE2ComponentVIFType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of ComponentVIFType
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_vif + XMLNames.Vehicle_Components,
+ new XAttribute(_xsi + XMLNames.XSIType, "Vehicle_PEV-E2_ComponentsVIFType"),
+ _vifReportFactory.GetElectricMachineType().GetElement(inputData),
+ _vifReportFactory.GetElectricEnergyStorageType().GetElement(inputData),
+ _vifReportFactory.GetTransmissionType().GetElement(inputData),
+ _vifReportFactory.GetTorqueConvertType().GetElement(inputData),
+ _vifReportFactory.GetAngelDriveType().GetElement(inputData),
+ _vifReportFactory.GetRetarderType().GetElement(inputData),
+ _vifReportFactory.GetAxlegearType().GetElement(inputData),
+ _vifReportFactory.GetAxleWheelsType().GetElement(inputData),
+ _vifReportFactory.GetAuxiliaryPEVType().GetElement(inputData));
+ }
+
+ #endregion
+ }
+
+
+ public class PevE3ComponentVIFType : PrimaryComponentVIFType
+ {
+ public PevE3ComponentVIFType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of ComponentVIFType
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_vif + XMLNames.Vehicle_Components,
+ new XAttribute(_xsi + XMLNames.XSIType, "Vehicle_PEV-E3_ComponentsVIFType"),
+ _vifReportFactory.GetElectricMachineType().GetElement(inputData),
+ _vifReportFactory.GetElectricEnergyStorageType().GetElement(inputData),
+ _vifReportFactory.GetRetarderType().GetElement(inputData),
+ _vifReportFactory.GetAxlegearType().GetElement(inputData),
+ _vifReportFactory.GetAxleWheelsType().GetElement(inputData),
+ _vifReportFactory.GetAuxiliaryPEVType().GetElement(inputData));
+ }
+
+ #endregion
+ }
+
+
+ public class PevE4ComponentVIFType : PrimaryComponentVIFType
+ {
+ public PevE4ComponentVIFType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of ComponentVIFType
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_vif + XMLNames.Vehicle_Components,
+ new XAttribute(_xsi + XMLNames.XSIType, "Vehicle_PEV-E4_ComponentsVIFType"),
+ _vifReportFactory.GetElectricMachineType().GetElement(inputData),
+ _vifReportFactory.GetElectricEnergyStorageType().GetElement(inputData),
+ _vifReportFactory.GetAxleWheelsType().GetElement(inputData),
+ _vifReportFactory.GetAuxiliaryPEVType().GetElement(inputData));
+ }
+
+ #endregion
+ }
+
+
+ public class IepcComponentVIFType : PrimaryComponentVIFType
+ {
+ public IepcComponentVIFType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of ComponentVIFType
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ return new XElement(_vif + XMLNames.Vehicle_Components,
+ new XAttribute(_xsi + XMLNames.XSIType, "Vehicle_PEV-IEPC_ComponentsVIFType"),
+ _vifReportFactory.GetIepcType().GetElement(inputData),
+ _vifReportFactory.GetElectricEnergyStorageType().GetElement(inputData),
+ _vifReportFactory.GetRetarderType().GetElement(inputData),
+ _vifReportFactory.GetAxlegearType().GetElement(inputData),
+ _vifReportFactory.GetAxleWheelsType().GetElement(inputData),
+ _vifReportFactory.GetAuxiliaryIEPCType().GetElement(inputData));
+ }
+
+ #endregion
+ }
+
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAdasType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAdasType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..63c3c10761211c293ab960e5929ee0e02e948159
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAdasType.cs
@@ -0,0 +1,107 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public interface IVIFFAdasType
+ {
+ XElement GetXmlType(IAdvancedDriverAssistantSystemDeclarationInputData adas);
+ }
+
+ public class VIFConventionalAdasType : AbstractVIFXmlType, IVIFFAdasType
+ {
+ public VIFConventionalAdasType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetXmlType(IAdvancedDriverAssistantSystemDeclarationInputData adas)
+ {
+ if (adas == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Vehicle_ADAS,
+ new XAttribute("xmlns", _v24),
+ new XAttribute(_xsi + XMLNames.XSIType, "ADAS_Conventional_Type"),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_EngineStopStart, adas.EngineStopStart),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_EcoRollWithoutEngineStop, adas.EcoRoll == EcoRollType.WithoutEngineStop),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_EcoRollWithEngineStopStart, adas.EcoRoll == EcoRollType.WithEngineStop),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_PCC, adas.PredictiveCruiseControl.ToXMLFormat()),
+ adas.ATEcoRollReleaseLockupClutch.HasValue
+ ? new XElement(_v24 + XMLNames.Vehicle_ADAS_ATEcoRollReleaseLockupClutch,
+ adas.ATEcoRollReleaseLockupClutch.Value)
+ : null);
+ }
+
+ #endregion
+ }
+
+ public class VIFHEVAdasType : AbstractVIFXmlType, IVIFFAdasType
+ {
+ public VIFHEVAdasType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetXmlType(IAdvancedDriverAssistantSystemDeclarationInputData adas)
+ {
+ if (adas == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Vehicle_ADAS,
+ new XAttribute("xmlns", _v24),
+ new XAttribute(_xsi + XMLNames.XSIType, "ADAS_HEV_Type"),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_EngineStopStart, adas.EngineStopStart),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_PCC, adas.PredictiveCruiseControl.ToXMLFormat()),
+ adas.ATEcoRollReleaseLockupClutch.HasValue
+ ? new XElement(_v24 + XMLNames.Vehicle_ADAS_ATEcoRollReleaseLockupClutch,
+ adas.ATEcoRollReleaseLockupClutch.Value)
+ : null);
+ }
+
+ #endregion
+ }
+
+ public class VIFPEVAdasType : AbstractVIFXmlType, IVIFFAdasType
+ {
+ public VIFPEVAdasType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetXmlType(IAdvancedDriverAssistantSystemDeclarationInputData adas)
+ {
+ if (adas == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Vehicle_ADAS,
+ new XAttribute("xmlns", _v24),
+ new XAttribute(_xsi + XMLNames.XSIType, "ADAS_PEV_Type"),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_PCC, adas.PredictiveCruiseControl.ToXMLFormat()));
+ }
+
+ #endregion
+ }
+
+ public class VIFIEPCAdasType : AbstractVIFXmlType, IVIFFAdasType
+ {
+ public VIFIEPCAdasType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetXmlType(IAdvancedDriverAssistantSystemDeclarationInputData adas)
+ {
+ if (adas == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Vehicle_ADAS,
+ new XAttribute("xmlns", _v24),
+ new XAttribute(_xsi + XMLNames.XSIType, "ADAS_IEPC_Type"),
+ new XElement(_v24 + XMLNames.Vehicle_ADAS_PCC, adas.PredictiveCruiseControl.ToXMLFormat()));
+ }
+
+ #endregion
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAngleDriveType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAngleDriveType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..71665bdef412ee440d13d21f1354003ab28ec2aa
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAngleDriveType.cs
@@ -0,0 +1,42 @@
+using System.Xml;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public class VIFAngleDriveType : AbstractVIFXmlType, IXmlTypeWriter
+ {
+ public VIFAngleDriveType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var angelDrive = inputData.JobInputData.Vehicle.Components.AngledriveInputData;
+ if (angelDrive == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Component_Angledrive,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "AngledriveDataVIFType"),
+ new XElement(_vif + XMLNames.Component_Manufacturer, angelDrive.Manufacturer),
+ new XElement(_vif + XMLNames.Component_Model, angelDrive.Model),
+ new XElement(_vif + XMLNames.Component_CertificationMethod, angelDrive.CertificationMethod.ToXMLFormat()),
+ angelDrive.CertificationMethod == CertificationMethod.StandardValues
+ ? null
+ : new XElement(_vif + XMLNames.Report_Component_CertificationNumber,
+ angelDrive.CertificationNumber),
+ new XElement(_vif + XMLNames.Component_Date,
+ XmlConvert.ToString(angelDrive.Date, XmlDateTimeSerializationMode.Utc)),
+ new XElement(_vif + XMLNames.Component_AppVersion, angelDrive.AppVersion),
+ new XElement(_vif + XMLNames.AngleDrive_Ratio, angelDrive.Ratio.ToXMLFormat(3))
+ ));
+ }
+
+ #endregion
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAuxiliaryType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAuxiliaryType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..b3f7a339ac7c234d4cca18013efd640d579906f5
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAuxiliaryType.cs
@@ -0,0 +1,373 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.BusAuxiliaries;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.Impl;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public class VIFAuxiliaryType : AbstractVIFXmlType, IXmlTypeWriter
+ {
+ public VIFAuxiliaryType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public virtual XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var aux = inputData.JobInputData.Vehicle.Components.BusAuxiliaries;
+ if (aux == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Component_Auxiliaries,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "AUX_Conventional_PrimaryBusType"),
+ new XElement(_vif + XMLNames.BusAux_Fan,
+ new XElement(_vif + XMLNames.Auxiliaries_Auxiliary_Technology, aux.FanTechnology)),
+ GetSteeringPumpElement(aux.SteeringPumpTechnology),
+ GetElectricSystem(aux.ElectricSupply),
+ GetPneumaticSystem(aux.PneumaticSupply, aux.PneumaticConsumers),
+ GetHvac(aux.HVACAux)
+ ));
+ }
+
+ protected virtual XElement GetSteeringPumpElement(IList<string> steeringPumps)
+ {
+ var result = new List<XElement>();
+ for (int i = 0; i < steeringPumps.Count; i++)
+ {
+ result.Add(new XElement(_vif + XMLNames.BusAux_Technology,
+ new XAttribute("axleNumber", (i + 1).ToString()), steeringPumps[i]));
+ }
+
+ return new XElement(_vif + XMLNames.BusAux_SteeringPump, result);
+ }
+
+
+ protected virtual XElement GetElectricSystem(IElectricSupplyDeclarationData electricSupply)
+ {
+ var alternatorTech = new XElement(_vif + XMLNames.Bus_AlternatorTechnology, electricSupply.AlternatorTechnology.ToXMLFormat());
+
+ List<XElement> smartAlternators = null;
+ List<XElement> auxBattery = null;
+ List<XElement> auxCapacitor = null;
+
+ if (electricSupply.Alternators?.Any() == true)
+ {
+ smartAlternators = new List<XElement>();
+
+ foreach (var alternator in electricSupply.Alternators)
+ {
+ smartAlternators.Add(new XElement(_vif + XMLNames.BusAux_ElectricSystem_SmartAlternator,
+ new XElement(_vif + XMLNames.BusAux_ElectricSystem_RatedCurrent, alternator.RatedCurrent.Value()),
+ new XElement(_vif + XMLNames.BusAux_ElectricSystem_RatedRatedVoltage, alternator.RatedVoltage.Value())));
+ }
+ }
+
+ if (electricSupply.ElectricStorage?.Any() == true)
+ {
+ auxBattery = new List<XElement>();
+ auxCapacitor = new List<XElement>();
+
+ foreach (var electricStorage in electricSupply.ElectricStorage)
+ {
+ if (electricStorage is BusAuxBatteryInputData battery)
+ {
+ auxBattery.Add(new XElement(_vif + XMLNames.BusAux_ElectricSystem_Battery,
+ new XElement(_vif + XMLNames.BusAux_ElectricSystem_BatteryTechnology, battery.Technology),
+ new XElement(_vif + XMLNames.BusAux_ElectricSystem_RatedCapacity, battery.Capacity.AsAmpHour),
+ new XElement(_vif + XMLNames.BusAux_ElectricSystem_NominalVoltage, battery.Voltage.Value())));
+ }
+ else if (electricStorage is BusAuxCapacitorInputData capacitor)
+ {
+ auxCapacitor.Add(new XElement(_vif + XMLNames.BusAux_ElectricSystem_Capacitor,
+ new XElement(_vif + XMLNames.BusAux_ElectricSystem_CapacitorTechnology, capacitor.Technology),
+ new XElement(_vif + XMLNames.BusAux_ElectricSystem_RatedCapacitance, capacitor.Capacity.Value()),
+ new XElement(_vif + XMLNames.BusAux_ElectricSystem_RatedVoltage, capacitor.Voltage.Value())));
+ }
+ }
+
+ auxBattery = auxBattery.Any() ? auxBattery : null;
+ auxCapacitor = auxCapacitor.Any() ? auxCapacitor : null;
+ }
+
+ return new XElement(_vif + XMLNames.BusAux_ElectricSystem,
+ alternatorTech,
+ smartAlternators,
+ auxBattery,
+ auxCapacitor,
+ new XElement(_vif + XMLNames.BusAux_ElectricSystem_SupplyFromHEVPossible, electricSupply.ESSupplyFromHEVREESS)
+ );
+ }
+
+
+ protected virtual XElement GetPneumaticSystem(IPneumaticSupplyDeclarationData pSupply, IPneumaticConsumersDeclarationData pConsumer)
+ {
+
+ return new XElement(_vif + XMLNames.BusAux_PneumaticSystem,
+ new XElement(_vif + XMLNames.Bus_SizeOfAirSupply, pSupply.CompressorSize),
+ new XElement(_vif + XMLNames.CompressorDrive, pSupply.CompressorDrive.GetLabel()),
+ new XElement(_vif + XMLNames.Vehicle_Clutch, pSupply.Clutch),
+ new XElement(_vif + XMLNames.Bus_CompressorRatio, pSupply.Ratio.ToXMLFormat(3)),
+ new XElement(_vif + XMLNames.Bus_SmartCompressionSystem, pSupply.SmartAirCompression),
+ new XElement(_vif + XMLNames.Bus_SmartRegenerationSystem, pSupply.SmartRegeneration),
+ new XElement(_vif + XMLNames.Bus_AirsuspensionControl, GetXMLAirsuspensionControl(pConsumer.AirsuspensionControl)),
+ new XElement(_vif + XMLNames.BusAux_PneumaticSystem_SCRReagentDosing, pConsumer.AdBlueDosing == ConsumerTechnology.Pneumatically)
+ );
+ }
+
+ protected string GetXMLAirsuspensionControl(ConsumerTechnology airsuspensionControl)
+ {
+ switch (airsuspensionControl)
+ {
+ case ConsumerTechnology.Electrically:
+ return "electronically";
+ case ConsumerTechnology.Mechanically:
+ return "mechanically";
+ default:
+ throw new VectoException("Unknown AirsuspensionControl!");
+ }
+ }
+
+
+ protected virtual XElement GetHvac(IHVACBusAuxiliariesDeclarationData hvac)
+ {
+ return new XElement(new XElement(_vif + XMLNames.BusAux_HVAC,
+ new XElement(_vif + XMLNames.Bus_AdjustableCoolantThermostat, hvac.AdjustableCoolantThermostat),
+ new XElement(_vif + XMLNames.Bus_EngineWasteGasHeatExchanger, hvac.EngineWasteGasHeatExchanger)));
+ }
+
+ #endregion
+ }
+
+ public class VIFAuxiliaryHevSType : VIFAuxiliaryType
+ {
+ public VIFAuxiliaryHevSType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+
+ #region Overrides of VIFAuxiliaryType
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var aux = inputData.JobInputData.Vehicle.Components.BusAuxiliaries;
+ if (aux == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Component_Auxiliaries,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "AUX_HEV-S_PrimaryBusType"),
+ new XElement(_vif + XMLNames.BusAux_Fan,
+ new XElement(_vif + XMLNames.Auxiliaries_Auxiliary_Technology, aux.FanTechnology)),
+ GetSteeringPumpElement(aux.SteeringPumpTechnology),
+ GetElectricSystem(aux.ElectricSupply),
+ GetPneumaticSystem(aux.PneumaticSupply, aux.PneumaticConsumers),
+ GetHvac(aux.HVACAux)
+ ));
+ }
+
+
+ protected override XElement GetElectricSystem(IElectricSupplyDeclarationData electricSupply)
+ {
+ return new XElement(_vif + XMLNames.BusAux_ElectricSystem,
+ new XElement(_vif + XMLNames.BusAux_ElectricSystem_AlternatorTechnology,
+ electricSupply.AlternatorTechnology.ToXMLFormat()),
+ new XElement(_vif + XMLNames.BusAux_ElectricSystem_SupplyFromHEVPossible,
+ electricSupply.ESSupplyFromHEVREESS));
+ }
+
+
+ protected override XElement GetPneumaticSystem(IPneumaticSupplyDeclarationData pSupply, IPneumaticConsumersDeclarationData pConsumer)
+ {
+ return new XElement(_vif + XMLNames.BusAux_PneumaticSystem,
+ new XElement(_vif + XMLNames.Bus_SizeOfAirSupply, pSupply.CompressorSize),
+ new XElement(_vif + XMLNames.CompressorDrive, pSupply.CompressorDrive.GetLabel()),
+ new XElement(_vif + XMLNames.Vehicle_Clutch, pSupply.Clutch),
+ new XElement(_vif + XMLNames.Bus_CompressorRatio, pSupply.Ratio.ToXMLFormat(3)),
+ new XElement(_vif + XMLNames.Bus_SmartRegenerationSystem, pSupply.SmartRegeneration),
+ new XElement(_vif + XMLNames.Bus_AirsuspensionControl, GetXMLAirsuspensionControl(pConsumer.AirsuspensionControl)),
+ new XElement(_vif + XMLNames.BusAux_PneumaticSystem_SCRReagentDosing, pConsumer.AdBlueDosing == ConsumerTechnology.Pneumatically)
+ );
+ }
+
+ #endregion
+ }
+
+ public class VIFAuxiliaryIEPC_SType : VIFAuxiliaryType
+ {
+ public VIFAuxiliaryIEPC_SType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+
+ #region Overrides of VIFAuxiliaryType
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var aux = inputData.JobInputData.Vehicle.Components.BusAuxiliaries;
+ if (aux == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Component_Auxiliaries,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "AUX_HEV-S_PrimaryBusType"),
+ new XElement(_vif + XMLNames.BusAux_Fan,
+ new XElement(_vif + XMLNames.Auxiliaries_Auxiliary_Technology, aux.FanTechnology)),
+ GetSteeringPumpElement(aux.SteeringPumpTechnology),
+ GetElectricSystem(aux.ElectricSupply),
+ GetPneumaticSystem(aux.PneumaticSupply, aux.PneumaticConsumers),
+ GetHvac(aux.HVACAux)
+ ));
+ }
+
+
+ protected override XElement GetElectricSystem(IElectricSupplyDeclarationData electricSupply)
+ {
+ return new XElement(_vif + XMLNames.BusAux_ElectricSystem,
+ new XElement(_vif + XMLNames.BusAux_ElectricSystem_AlternatorTechnology,
+ electricSupply.AlternatorTechnology.ToXMLFormat()),
+ new XElement(_vif + XMLNames.BusAux_ElectricSystem_SupplyFromHEVPossible,
+ electricSupply.ESSupplyFromHEVREESS));
+ }
+
+
+ protected override XElement GetPneumaticSystem(IPneumaticSupplyDeclarationData pSupply, IPneumaticConsumersDeclarationData pConsumer)
+ {
+ return new XElement(_vif + XMLNames.BusAux_PneumaticSystem,
+ new XElement(_vif + XMLNames.Bus_SizeOfAirSupply, pSupply.CompressorSize),
+ new XElement(_vif + XMLNames.CompressorDrive, pSupply.CompressorDrive.GetLabel()),
+ new XElement(_vif + XMLNames.Vehicle_Clutch, pSupply.Clutch),
+ new XElement(_vif + XMLNames.Bus_CompressorRatio, pSupply.Ratio.ToXMLFormat(3)),
+ new XElement(_vif + XMLNames.Bus_SmartRegenerationSystem, pSupply.SmartRegeneration),
+ new XElement(_vif + XMLNames.Bus_AirsuspensionControl, GetXMLAirsuspensionControl(pConsumer.AirsuspensionControl)),
+ new XElement(_vif + XMLNames.BusAux_PneumaticSystem_SCRReagentDosing, pConsumer.AdBlueDosing == ConsumerTechnology.Pneumatically)
+ );
+ }
+
+ #endregion
+ }
+
+ public class VIFAuxiliaryHevPType : VIFAuxiliaryType
+ {
+ public VIFAuxiliaryHevPType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+
+ #region Overrides of VIFAuxiliaryHevSType
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+
+ var aux = inputData.JobInputData.Vehicle.Components.BusAuxiliaries;
+ if (aux == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Component_Auxiliaries,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "AUX_HEV-P_PrimaryBusType"),
+ new XElement(_vif + XMLNames.BusAux_Fan,
+ new XElement(_vif + XMLNames.Auxiliaries_Auxiliary_Technology, aux.FanTechnology)),
+ GetSteeringPumpElement(aux.SteeringPumpTechnology),
+ GetElectricSystem(aux.ElectricSupply),
+ GetPneumaticSystem(aux.PneumaticSupply, aux.PneumaticConsumers),
+ GetHvac(aux.HVACAux)
+ ));
+
+ }
+
+ #endregion
+
+ #region Overrides of VIFAuxiliaryHevSType
+
+ protected override XElement GetPneumaticSystem(IPneumaticSupplyDeclarationData pSupply, IPneumaticConsumersDeclarationData pConsumer)
+ {
+ return new XElement(_vif + XMLNames.BusAux_PneumaticSystem,
+ new XElement(_vif + XMLNames.Bus_SizeOfAirSupply, pSupply.CompressorSize),
+ new XElement(_vif + XMLNames.CompressorDrive, pSupply.CompressorDrive.GetLabel()),
+ new XElement(_vif + XMLNames.BusAux_Clutch, pSupply.Clutch),
+ new XElement(_vif + XMLNames.Bus_CompressorRatio, pSupply.Ratio.ToXMLFormat(3)),
+ new XElement(_vif + XMLNames.BusAux_PneumaticSystem_SmartcompressionSystem, pSupply.SmartAirCompression),
+ new XElement(_vif + XMLNames.BusAux_PneumaticSystem_SmartRegenerationSystem, pSupply.SmartRegeneration),
+ new XElement(_vif + XMLNames.Bus_AirsuspensionControl, GetXMLAirsuspensionControl(pConsumer.AirsuspensionControl)),
+ new XElement(_vif + XMLNames.BusAux_PneumaticSystem_SCRReagentDosing, pConsumer.AdBlueDosing == ConsumerTechnology.Pneumatically)
+ );
+ }
+
+ #endregion
+ }
+
+ public class VIFAuxiliaryIEPCType : VIFAuxiliaryType
+ {
+ public VIFAuxiliaryIEPCType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var aux = inputData.JobInputData.Vehicle.Components.BusAuxiliaries;
+ if (aux == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Component_Auxiliaries,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "AUX_IEPC_PrimaryBusType"),
+ GetSteeringPumpElement(aux.SteeringPumpTechnology),
+ GetPneumaticSystem(aux.PneumaticSupply, aux.PneumaticConsumers),
+ GetHvac(aux.HVACAux)
+ ));
+ }
+
+ #endregion
+
+
+ #region Overrides of VIFAuxiliaryType
+
+ protected override XElement GetPneumaticSystem(IPneumaticSupplyDeclarationData pSupply, IPneumaticConsumersDeclarationData pConsumer)
+ {
+ return new XElement(_vif + XMLNames.BusAux_PneumaticSystem,
+ new XElement(_vif + XMLNames.CompressorDrive, pSupply.CompressorDrive.GetLabel()),
+ new XElement(_vif + XMLNames.Bus_SmartRegenerationSystem, pSupply.SmartRegeneration),
+ new XElement(_vif + XMLNames.Bus_AirsuspensionControl, GetXMLAirsuspensionControl(pConsumer.AirsuspensionControl)),
+ new XElement(_vif + XMLNames.BusAux_PneumaticSystem_SCRReagentDosing, pConsumer.AdBlueDosing == ConsumerTechnology.Pneumatically)
+ );
+ }
+
+ protected override XElement GetHvac(IHVACBusAuxiliariesDeclarationData hvac)
+ {
+ return new XElement(new XElement(_vif + XMLNames.BusAux_HVAC,
+ new XElement(_vif + XMLNames.Bus_AdjustableCoolantThermostat, hvac.AdjustableCoolantThermostat)));
+ }
+
+ #endregion
+ }
+
+ public class VIFAuxiliaryPEVType : VIFAuxiliaryIEPCType
+ {
+ public VIFAuxiliaryPEVType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+
+ #region Overrides of VIFAuxiliaryType
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+
+ var aux = inputData.JobInputData.Vehicle.Components.BusAuxiliaries;
+ if (aux == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Component_Auxiliaries,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "AUX_PEV_PrimaryBusType"),
+ GetSteeringPumpElement(aux.SteeringPumpTechnology),
+ GetPneumaticSystem(aux.PneumaticSupply, aux.PneumaticConsumers),
+ GetHvac(aux.HVACAux)
+ ));
+ }
+
+ #endregion
+
+
+ }
+
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAxleWheelsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAxleWheelsType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..f4119fb9f8af240b49f8a68a9cae57885be09ed6
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAxleWheelsType.cs
@@ -0,0 +1,86 @@
+using System.Collections.Generic;
+using System.Xml;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Interfaces;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public class VIFAxleWheelsType : AbstractVIFXmlType, IXmlTypeWriter
+ {
+ public VIFAxleWheelsType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var axleWheels = inputData.JobInputData.Vehicle.Components.AxleWheels;
+ if (axleWheels == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Component_AxleWheels,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "AxleWheelsDataVIFType"),
+ new XElement(_vif + XMLNames.AxleWheels_Axles,
+ GetAxleData(axleWheels.AxlesDeclaration)
+ )
+ )
+ );
+ }
+
+ private List<XElement> GetAxleData(IList<IAxleDeclarationInputData> axleInput)
+ {
+ var axles = new List<XElement>();
+
+ var axleNumber = 1;
+ foreach (var currentAxle in axleInput) {
+ var axle = new XElement(_vif + XMLNames.AxleWheels_Axles_Axle,
+ new XAttribute(XMLNames.AxleWheels_Axles_Axle_AxleNumber_Attr, axleNumber++),
+ new XAttribute("xmlns", _v20),
+ new XAttribute(_xsi + XMLNames.XSIType, "AxleDataDeclarationType"),
+ new XElement(_v20 + XMLNames.AxleWheels_Axles_Axle_AxleType, currentAxle.AxleType.ToXMLFormat()),
+ new XElement(_v20 + XMLNames.AxleWheels_Axles_Axle_TwinTyres, currentAxle.TwinTyres),
+ new XElement(_v20 + XMLNames.AxleWheels_Axles_Axle_Steered, currentAxle.Steered),
+ GetTyre(currentAxle.Tyre));
+ axles.Add(axle);
+ }
+
+ return axles;
+ }
+
+ private XElement GetTyre(ITyreDeclarationInputData tyre)
+ {
+ var xmlTyre = tyre as IXMLTyreDeclarationInputData;
+ if (xmlTyre == null) {
+ throw new VectoException("Tyre input data must be in XML format");
+ }
+
+ return XElement.Load(xmlTyre.GetXmlNode.CreateNavigator().ReadSubtree());
+ //var currentTyre =
+ // new XElement(_v20 + XMLNames.ComponentDataWrapper,
+ // new XAttribute(_xsi + XMLNames.XSIType, "TyreDataDeclarationType"),
+ // new XAttribute("id", tyre.DigestValue.Reference),
+ // new XElement(XMLNames.Component_Manufacturer, tyre.Manufacturer),
+ // new XElement(XMLNames.Component_Model, tyre.Model),
+ // new XElement(XMLNames.Component_CertificationNumber, tyre.CertificationNumber),
+ // new XElement(XMLNames.Component_Date, XmlConvert.ToString(tyre.Date, XmlDateTimeSerializationMode.Utc)),
+ // new XElement(XMLNames.Component_AppVersion, tyre.Date),
+ // new XElement(XMLNames.AxleWheels_Axles_Axle_Dimension, tyre.Dimension),
+ // new XElement(XMLNames.AxleWheels_Axles_Axle_RRCDeclared, tyre.RollResistanceCoefficient.ToXMLFormat(4)),
+ // new XElement(XMLNames.AxleWheels_Axles_Axle_FzISO, tyre.TyreTestLoad.ToXMLFormat())
+ //);
+
+ //return new XElement(_v20 + XMLNames.AxleWheels_Axles_Axle_Tyre,
+ // currentTyre,
+ // GetSignature(tyre.DigestValue)
+ //);
+ }
+
+ #endregion
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAxlegearType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAxlegearType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..385754ac7be82d9b02c2c52e1293828f09e58c65
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAxlegearType.cs
@@ -0,0 +1,42 @@
+using System.Xml;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public class VIFAxlegearType : AbstractVIFXmlType, IXmlTypeWriter
+ {
+ public VIFAxlegearType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var axleGear = inputData.JobInputData.Vehicle.Components.AxleGearInputData;
+ if (axleGear == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Component_Axlegear,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "AxlegearDataVIFType"),
+ new XElement(_vif + XMLNames.Component_Manufacturer, axleGear.Manufacturer),
+ new XElement(_vif + XMLNames.Component_Model, axleGear.Model),
+ new XElement(_vif + XMLNames.Component_CertificationMethod, axleGear.CertificationMethod.ToXMLFormat()),
+ axleGear.CertificationMethod == CertificationMethod.StandardValues
+ ? null
+ : new XElement(_vif + XMLNames.Report_Component_CertificationNumber,
+ axleGear.CertificationNumber),
+ new XElement(_vif + XMLNames.Component_Date,
+ XmlConvert.ToString(axleGear.Date, XmlDateTimeSerializationMode.Utc)),
+ new XElement(_vif + XMLNames.Component_AppVersion, axleGear.AppVersion),
+ new XElement(_vif + XMLNames.Axlegear_LineType, axleGear.LineType.ToXMLFormat()),
+ new XElement(_vif + XMLNames.Axlegear_Ratio, axleGear.Ratio.ToXMLFormat(3))));
+ }
+
+ #endregion
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFBoostingLimitationsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFBoostingLimitationsType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..7de33a3fac3f196c114fdcd0f9516a95d7d31df4
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFBoostingLimitationsType.cs
@@ -0,0 +1,37 @@
+using System.Data;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public class VIFBoostingLimitationsType : AbstractVIFXmlType, IXmlTypeWriter
+ {
+ public VIFBoostingLimitationsType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var boostingLimitations = inputData.JobInputData.Vehicle.BoostingLimitations;
+ if (boostingLimitations == null)
+ return null;
+
+ var boostingLimitationsXElement = new XElement(_vif + XMLNames.Vehicle_BoostingLimitation,
+ new XAttribute(_xsi + XMLNames.XSIType, "BoostingLimitationsType"),
+ new XAttribute("xmlns", _v24.NamespaceName));
+ foreach (DataRow row in boostingLimitations.Rows)
+ {
+ boostingLimitationsXElement.Add(new XElement(_v24 + XMLNames.BoostingLimitation_Entry,
+ new XAttribute(XMLNames.BoostingLimitation_RotationalSpeed, row[XMLNames.BoostingLimitation_RotationalSpeed]),
+ new XAttribute(XMLNames.BoostingLimitation_BoostingTorque, row[XMLNames.BoostingLimitation_BoostingTorque])
+ ));
+ }
+
+ return boostingLimitationsXElement;
+ }
+
+ #endregion
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricEnergyStorageType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricEnergyStorageType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..70d5658a7355777e8957d4aebb9fff987b547b35
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricEnergyStorageType.cs
@@ -0,0 +1,161 @@
+using System.Collections.Generic;
+using System.Data;
+using System.Xml;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public class VIFElectricEnergyStorageType : AbstractVIFXmlType, IXmlTypeWriter
+ {
+ public VIFElectricEnergyStorageType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var electricStorages = inputData.JobInputData.Vehicle.Components.ElectricStorage.ElectricStorageElements;
+ if (electricStorages == null)
+ return null;
+
+ var result = new List<XElement>();
+
+ foreach (var entry in electricStorages) {
+ switch (entry.REESSPack.StorageType) {
+ case REESSType.SuperCap:
+ result.Add(GetCapacitor(entry));
+ break;
+ case REESSType.Battery:
+ result.Add(GetBattery(entry));
+ break;
+ }
+ }
+
+ return new XElement(_vif + XMLNames.Component_ElectricEnergyStorage, result);
+ }
+
+ #endregion
+
+ private XElement GetCapacitor(IElectricStorageDeclarationInputData reess)
+ {
+ if(reess == null)
+ return null;
+
+ var supercap = reess.REESSPack as ISuperCapDeclarationInputData;
+ if (supercap == null) {
+ throw new VectoException("Electric energy storage of type 'Capacitor' requires capacitor component");
+ }
+
+ return new XElement(_vif + XMLNames.ElectricEnergyStorage_Capacitor,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "CapacitorSystemDataType"),
+ new XElement(_vif + XMLNames.Component_Manufacturer, supercap.Manufacturer),
+ new XElement(_vif + XMLNames.Component_Model, supercap.Model),
+ new XElement(_vif + XMLNames.Component_CertificationMethod, supercap.CertificationMethod.ToXMLFormat()),
+ supercap.CertificationMethod == CertificationMethod.StandardValues
+ ? null
+ : new XElement(_vif + XMLNames.Report_Component_CertificationNumber, supercap.CertificationNumber),
+ new XElement(_vif + XMLNames.Component_Date, XmlConvert.ToString(supercap.Date, XmlDateTimeSerializationMode.Utc)),
+ new XElement(_vif + XMLNames.Component_AppVersion, supercap.AppVersion),
+ new XElement(_vif + XMLNames.Capacitor_Capacitance, supercap.Capacity.ToXMLFormat(2)),
+ new XElement(_vif + XMLNames.Capacitor_InternalResistance, supercap.InternalResistance.AsMilliOhm.ToXMLFormat(2)),
+ new XElement(_vif + XMLNames.Capacitor_MinVoltage, supercap.MinVoltage.ToXMLFormat(2)),
+ new XElement(_vif + XMLNames.Capacitor_MaxVoltage, supercap.MaxVoltage.ToXMLFormat(2)),
+ new XElement(_vif + XMLNames.Capacitor_MaxChargingCurrent, supercap.MaxCurrentCharge.ToXMLFormat(2)),
+ new XElement(_vif + XMLNames.Capacitor_MaxDischargingCurrent, supercap.MaxCurrentDischarge.ToXMLFormat(2)),
+ supercap.TestingTemperature == null
+ ? null
+ : new XElement(_vif + XMLNames.REESS_TestingTemperature, supercap.TestingTemperature.AsDegCelsius.ToXMLFormat(0))
+ ));
+ }
+
+
+ private XElement GetBattery(IElectricStorageDeclarationInputData reess)
+ {
+ if (reess == null)
+ return null;
+ var battery = reess.REESSPack as IBatteryPackDeclarationInputData;
+ if (battery == null) {
+ throw new VectoException("Electric energy storage of type 'Battery' requires battery component");
+ }
+
+
+ var result = new XElement(_vif + XMLNames.ElectricEnergyStorage_Battery,
+ new XElement(_vif + XMLNames.Battery_StringID, reess.StringId),
+ new XElement(_vif + "REESS", GetReess(battery)),
+ battery.MinSOC.HasValue ? new XElement(_vif + XMLNames.Battery_SOCmin, battery.MinSOC.Value) : null,
+ battery.MaxSOC.HasValue ? new XElement(_vif + XMLNames.Battery_SOCmax, battery.MaxSOC.Value) : null
+ );
+
+ return result;
+ }
+
+
+ private XElement GetReess(IBatteryPackDeclarationInputData battery)
+ {
+ return new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "BatterySystemDataType"),
+ new XElement(_vif + XMLNames.Component_Manufacturer, battery.Manufacturer),
+ new XElement(_vif + XMLNames.Component_Model, battery.Model),
+ new XElement(_vif + XMLNames.Component_CertificationMethod, battery.CertificationMethod.ToXMLFormat()),
+ battery.CertificationMethod == CertificationMethod.StandardValues
+ ? null
+ : new XElement(_vif + XMLNames.Report_Component_CertificationNumber, battery.CertificationNumber),
+ new XElement(_vif + XMLNames.Component_Date,
+ XmlConvert.ToString(battery.Date, XmlDateTimeSerializationMode.Utc)),
+ new XElement(_vif + XMLNames.Component_AppVersion, battery.AppVersion),
+ new XElement(_vif + XMLNames.REESS_BatteryType, battery.BatteryType.ToString()),
+ new XElement(_vif + XMLNames.REESS_RatedCapacity, battery.Capacity.AsAmpHour.ToXMLFormat(2)),
+ new XElement(_vif + XMLNames.REESS_ConnectorsSubsystemsIncluded, battery.ConnectorsSubsystemsIncluded),
+ new XElement(_vif + XMLNames.REESS_JunctionboxIncluded, battery.JunctionboxIncluded),
+ battery.TestingTemperature == null
+ ? null
+ : new XElement(_vif + XMLNames.REESS_TestingTemperature, battery.TestingTemperature.AsDegCelsius.ToXMLFormat(0)),
+ GetOcv(battery.VoltageCurve),
+ GetCurrentLimits(battery.MaxCurrentMap)
+ );
+
+ }
+
+
+ private XElement GetOcv(DataTable voltageCurve)
+ {
+ var entries = new List<XElement>();
+
+ foreach (DataRow row in voltageCurve.Rows) {
+ var soc = row[XMLNames.REESS_OCV_SoC];
+ var ocv = row[XMLNames.REESS_OCV_OCV].ToString().ToDouble();
+
+ entries.Add(new XElement(_vif + XMLNames.REESS_MapEntry,
+ new XAttribute(XMLNames.REESS_OCV_SoC, soc),
+ new XAttribute(XMLNames.REESS_OCV_OCV, ocv.ToXMLFormat(2))));
+ }
+ return new XElement(_vif + XMLNames.REESS_OCV, entries);
+ }
+
+ private XElement GetCurrentLimits(DataTable batteryMaxCurrentMap)
+ {
+ var entries = new List<XElement>();
+
+ foreach (DataRow row in batteryMaxCurrentMap.Rows)
+ {
+ var soc = row[XMLNames.REESS_CurrentLimits_SoC];
+ var maxChargingCurrent = row[XMLNames.REESS_CurrentLimits_MaxChargingCurrent].ToString().ToDouble();
+ var maxDischargingCurrent = row[XMLNames.REESS_CurrentLimits_MaxDischargingCurrent].ToString().ToDouble();
+
+ entries.Add(new XElement(_vif + XMLNames.REESS_MapEntry,
+ new XAttribute(XMLNames.REESS_OCV_SoC, soc),
+ new XAttribute(XMLNames.REESS_CurrentLimits_MaxChargingCurrent, maxChargingCurrent.ToXMLFormat(2)),
+ new XAttribute(XMLNames.REESS_CurrentLimits_MaxDischargingCurrent, maxDischargingCurrent.ToXMLFormat(2))
+ ));
+ }
+
+ return new XElement(_vif + XMLNames.REESS_CurrentLimits, entries);
+ }
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricMachineGENType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricMachineGENType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..58f6eb5c68f01e8931345715d4b2b00efea78336
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricMachineGENType.cs
@@ -0,0 +1,67 @@
+using System.Collections.Generic;
+using System.Data;
+using System.Xml;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public class VIFElectricMachineGENType : AbstractVIFXmlType, IXmlTypeWriter
+ {
+ public VIFElectricMachineGENType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public virtual XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+
+ foreach (var entry in inputData.JobInputData.Vehicle.Components.ElectricMachines.Entries) {
+
+ if (entry.Position == PowertrainPosition.GEN)
+ return GetElectricMachineGENType(entry);
+ }
+
+ return null;
+ }
+
+ #endregion
+
+
+ private XElement GetElectricMachineGENType(ElectricMachineEntry<IElectricMotorDeclarationInputData> electricMachineData)
+ {
+ return new XElement(_vif + XMLNames.Component_ElectricMachineGEN,
+ new XElement(_vif + XMLNames.ElectricMachine_PowertrainPosition,
+ electricMachineData.Position.ToXmlFormat()),
+ new XElement(_vif + XMLNames.ElectricMachine_Count, electricMachineData.Count),
+ _vifFactory.GetElectricMachineSystemType().GetElement(electricMachineData.ElectricMachine),
+ GetADC(electricMachineData.ADC)
+ );
+ }
+
+ protected virtual XElement GetADC(IADCDeclarationInputData adcData)
+ {
+ if (adcData == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Component_ADC,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "ADCDataDeclarationType"),
+ new XElement(_vif + XMLNames.Component_Manufacturer, adcData.Manufacturer),
+ new XElement(_vif + XMLNames.Component_Model, adcData.Model),
+ new XElement(_vif + XMLNames.Report_Component_CertificationNumber, adcData.CertificationNumber),
+ new XElement(_vif + XMLNames.Component_Date, XmlConvert.ToString(adcData.Date, XmlDateTimeSerializationMode.Utc)),
+ new XElement(_vif + XMLNames.Component_AppVersion, adcData.AppVersion),
+ new XElement(_vif + XMLNames.ADC_Ratio, adcData.Ratio.ToXMLFormat(3)),
+ new XElement(_vif + XMLNames.Component_CertificationMethod, adcData.CertificationMethod.ToXMLFormat())
+ )
+ );
+ }
+
+
+
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricMachineSystemMeasuredType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricMachineSystemMeasuredType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..9545147c1681f73e5b3c4a3891cec78e5693307b
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricMachineSystemMeasuredType.cs
@@ -0,0 +1,156 @@
+using System.Collections.Generic;
+using System.Data;
+using System.Xml;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public interface IXmlElectricMachineSystemType
+ {
+ XElement GetElement(IElectricMotorDeclarationInputData em);
+ }
+
+
+ public class XmlElectricMachineSystemMeasuredType : AbstractVIFXmlType, IXmlElectricMachineSystemType
+ {
+
+ public XmlElectricMachineSystemMeasuredType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IVIFElectricMachineSystemType
+
+ public virtual XElement GetElement(IElectricMotorDeclarationInputData em)
+ {
+ return new XElement(_vif + XMLNames.ElectricMachineSystem,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "ElectricMachineSystemDataDeclarationType"),
+ GetElectricMachineSystemCommon(em),
+ GetElectricMachineSystemPowerRange(em),
+ new XElement(_vif + XMLNames.ElectricMachine_DcDcConverterIncluded, em.DcDcConverterIncluded),
+ new XElement(_vif + XMLNames.ElectricMachine_IHPCType, em.IHPCType),
+ GetVoltageLevels(em.VoltageLevels, em.CertificationMethod),
+ GetDragCurve(em.DragCurve),
+ GetConditioning(em.Conditioning)
+ )
+ );
+ }
+
+ #endregion
+
+ protected virtual List<XElement> GetElectricMachineSystemCommon(IElectricMotorDeclarationInputData em)
+ {
+ return new List<XElement> {
+ new XElement(_vif + XMLNames.Component_Manufacturer, em.Manufacturer),
+ new XElement(_vif + XMLNames.Component_Model, em.Model),
+ new XElement(_vif + XMLNames.Component_CertificationMethod, em.CertificationMethod.ToXMLFormat()),
+ em.CertificationMethod == CertificationMethod.StandardValues
+ ? null
+ : new XElement(_vif + XMLNames.Component_CertificationNumber, em.CertificationNumber),
+ new XElement(_vif + XMLNames.Component_Date,
+ XmlConvert.ToString(em.Date, XmlDateTimeSerializationMode.Utc)),
+ new XElement(_vif + XMLNames.Component_AppVersion, em.AppVersion),
+ new XElement(_vif + XMLNames.ElectricMachine_ElectricMachineType, em.ElectricMachineType.ToString()),
+ };
+ }
+
+ protected virtual List<XElement> GetElectricMachineSystemPowerRange(IElectricMotorDeclarationInputData em)
+ {
+ return new List<XElement> {
+ new XElement(_vif + XMLNames.ElectricMachine_R85RatedPower, em.R85RatedPower.ToXMLFormat(0)),
+ new XElement(_vif + XMLNames.ElectricMachine_RotationalInertia, em.Inertia.ToXMLFormat(2))
+ };
+ }
+
+
+ protected virtual List<XElement> GetVoltageLevels(IList<IElectricMotorVoltageLevel> voltageLevels, CertificationMethod certificationMethod)
+ {
+ var result = new List<XElement>();
+
+ foreach (var voltageLevel in voltageLevels) {
+
+ var entry = new XElement(_vif + XMLNames.ElectricMachine_VoltageLevel,
+ voltageLevels.Count > 1
+ ? new XElement(_vif + XMLNames.VoltageLevel_Voltage, voltageLevel.VoltageLevel.ToXMLFormat(0))
+ : null,
+ new XElement(_vif + XMLNames.ElectricMachine_ContinuousTorque, voltageLevel.ContinuousTorque.ToXMLFormat(2)),
+ new XElement(_vif + XMLNames.ElectricMachine_TestSpeedContinuousTorque,
+ voltageLevel.ContinuousTorqueSpeed.ToXMLFormat(2)), new XElement(_vif + XMLNames.ElectricMachine_OverloadTorque,
+ voltageLevel.OverloadTorque.ToXMLFormat(2)), new XElement(_vif + XMLNames.ElectricMachine_TestSpeedOverloadTorque,
+ voltageLevel.OverloadTestSpeed.ToXMLFormat(2)), new XElement(_vif + XMLNames.ElectricMachine_OverloadDuration,
+ voltageLevel.OverloadTime.ToXMLFormat(2)), GetMaxTorqueCurve(voltageLevel.FullLoadCurve)
+ );
+ result.Add(entry);
+ }
+
+ return result;
+ }
+
+
+ protected virtual XElement GetMaxTorqueCurve(DataTable maxTorqueData)
+ {
+ var maxTorqueCurveEntries = new List<XElement>();
+
+ for (int r = 0; r < maxTorqueData.Rows.Count; r++)
+ {
+ var row = maxTorqueData.Rows[r];
+ var outShaftSpeed = row[XMLNames.MaxTorqueCurve_OutShaftSpeed];
+ var maxTorque = row[XMLNames.MaxTorqueCurve_MaxTorque];
+ var minTorque = row[XMLNames.MaxTorqueCurve_MinTorque];
+
+ var element = new XElement(_vif + XMLNames.MaxTorqueCurve_Entry,
+ new XAttribute(XMLNames.MaxTorqueCurve_OutShaftSpeed, outShaftSpeed),
+ new XAttribute(XMLNames.MaxTorqueCurve_MaxTorque, maxTorque),
+ new XAttribute(XMLNames.MaxTorqueCurve_MinTorque, minTorque)
+ );
+
+ maxTorqueCurveEntries.Add(element);
+ }
+
+ return new XElement(_vif + XMLNames.MaxTorqueCurve, maxTorqueCurveEntries);
+ }
+
+
+ protected XElement GetDragCurve(TableData dragCurve)
+ {
+ var entries = new List<XElement>();
+ foreach (DataRow rowEntry in dragCurve.Rows)
+ {
+ var outShaftSpeed = rowEntry[XMLNames.DragCurve_OutShaftSpeed].ToString().ToDouble();
+ var dragTorque = rowEntry[XMLNames.DragCurve_DragTorque].ToString().ToDouble();
+
+ var entry = new XElement(_vif + XMLNames.DragCurve_Entry,
+ new XAttribute(XMLNames.DragCurve_OutShaftSpeed, outShaftSpeed.ToXMLFormat(2)),
+ new XAttribute(XMLNames.DragCurve_DragTorque, dragTorque.ToXMLFormat(2)));
+
+ entries.Add(entry);
+ }
+
+ return new XElement(_vif + XMLNames.DragCurve, entries);
+ }
+
+
+ protected XElement GetConditioning(DataTable iepcData)
+ {
+ if (iepcData == null)
+ return null;
+
+ var entries = new List<XElement>();
+ for (int r = 0; r < iepcData.Rows.Count; r++)
+ {
+
+ var coolantTempInLet = iepcData.Rows[r][XMLNames.Conditioning_CoolantTempInlet];
+ var coolingPower = iepcData.Rows[r][XMLNames.Conditioning_CoolingPower];
+
+ entries.Add(new XElement(_vif + XMLNames.Conditioning_Entry,
+ new XAttribute(XMLNames.Conditioning_CoolantTempInlet, coolantTempInLet),
+ new XAttribute(XMLNames.Conditioning_CoolingPower, coolingPower)));
+ }
+
+ return new XElement(_vif + XMLNames.Conditioning, entries);
+ }
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricMachineType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricMachineType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..1582901c6038fe647b035a9ee9c5779acfe1cbb2
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricMachineType.cs
@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public class VIFElectricMachineType : VIFElectricMachineGENType
+ {
+ public VIFElectricMachineType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var electricMachineEntries = inputData.JobInputData.Vehicle.Components.ElectricMachines.Entries;
+ if (electricMachineEntries == null || electricMachineEntries.Count == 0)
+ return null;
+
+ foreach (var electricMachine in electricMachineEntries) {
+ if (electricMachine.Position != PowertrainPosition.GEN)
+ return GetElectricMachineType(electricMachine);
+ }
+
+ return null;
+ }
+
+ #endregion
+
+ private XElement GetElectricMachineType(ElectricMachineEntry<IElectricMotorDeclarationInputData> electricMachineData)
+ {
+ return new XElement(_vif + XMLNames.Component_ElectricMachine,
+ new XElement(_vif + XMLNames.ElectricMachine_PowertrainPosition,
+ electricMachineData.Position.ToXmlFormat()),
+ new XElement(_vif + XMLNames.ElectricMachine_Count, electricMachineData.Count),
+ _vifFactory.GetElectricMachineSystemType().GetElement(electricMachineData.ElectricMachine),
+ GetADC(electricMachineData.ADC),
+ Get25GearRatio(electricMachineData.RatioPerGear)
+ );
+ }
+
+ private XElement Get25GearRatio(double[] gearRatios)
+ {
+ if (gearRatios == null)
+ return null;
+
+ var results = new List<XElement>();
+ for (int i = 0; i < gearRatios.Length; i++) {
+ results.Add(new XElement(_vif + XMLNames.Gear_Ratio, new XAttribute(XMLNames.ElectricMachine_P2_5GearRatios_Gear_Attr, i + 1),
+ gearRatios[i].ToXMLFormat(3)));
+ }
+
+ return new XElement(_vif + XMLNames.ElectricMachine_P2_5GearRatios, results);
+ }
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricMotorTorqueLimitsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricMotorTorqueLimitsType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..e7e4fc4ac42e911cf9b3c0385545df423a6ddd6b
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricMotorTorqueLimitsType.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public class VIFElectricMotorTorqueLimitsType : AbstractVIFXmlType, IXmlTypeWriter
+ {
+ public VIFElectricMotorTorqueLimitsType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var elTorqueLimits = inputData.JobInputData.Vehicle.ElectricMotorTorqueLimits;
+ if (elTorqueLimits == null || elTorqueLimits.Count == 0)
+ return null;
+
+ var electricMachine = new List<XElement>();
+ foreach (var entry in elTorqueLimits) {
+ electricMachine.Add(new XElement(_v24 + XMLNames.Component_ElectricMachine,
+ new XElement(_v24 + XMLNames.ElectricMachine_Position, entry.Key.ToXmlFormat()),
+ GetVoltageLevels(entry.Value)));
+ }
+
+ var xmlType = inputData.JobInputData.Vehicle.VehicleType == VectoSimulationJobType.SerialHybridVehicle
+ ? "ElectricMachineTorqueLimitsSerialHybridType"
+ : "ElectricMachineTorqueLimitsType";
+ return new XElement(_vif + XMLNames.ElectricMotorTorqueLimits,
+ new XAttribute(_xsi + XMLNames.XSIType, xmlType),
+ new XAttribute("xmlns", _v24),
+ electricMachine);
+ }
+
+ private List<XElement> GetVoltageLevels(List<Tuple<Volt, TableData>> voltageLevels)
+ {
+ var voltageEntries = new List<XElement>();
+ foreach (var voltageLevel in voltageLevels)
+ {
+ var voltage = voltageLevel.Item1;
+ var maxTorqueCurveEntries = new List<XElement>();
+ for (int i = 0; i < voltageLevel.Item2.Rows.Count; i++) {
+
+ var row = voltageLevel.Item2.Rows[i];
+ var outShaftSpeed = row[XMLNames.MaxTorqueCurve_OutShaftSpeed];
+ var maxTorque = row[XMLNames.MaxTorqueCurve_MaxTorque];
+ var minTorque = row[XMLNames.MaxTorqueCurve_MinTorque];
+
+ var element = new XElement(_v23 + XMLNames.MaxTorqueCurve_Entry,
+ new XAttribute(XMLNames.MaxTorqueCurve_OutShaftSpeed, outShaftSpeed),
+ new XAttribute(XMLNames.MaxTorqueCurve_MaxTorque, maxTorque),
+ new XAttribute(XMLNames.MaxTorqueCurve_MinTorque, minTorque)
+ );
+
+ maxTorqueCurveEntries.Add(element);
+ }
+
+ voltageEntries.Add( new XElement(_v24 + XMLNames.ElectricMachine_VoltageLevel,
+ new XElement(_v24 + XMLNames.VoltageLevel_Voltage, voltage.ToXMLFormat(0)),
+ new XElement(_v24 + XMLNames.MaxTorqueCurve, maxTorqueCurveEntries)));
+
+ }
+
+ return voltageEntries;
+ }
+
+ #endregion
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFEngineType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFEngineType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..6258d8454e3eceefcb5458013fb604aa85137271
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFEngineType.cs
@@ -0,0 +1,82 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.Reader.ComponentData;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public class VIFEngineType : AbstractVIFXmlType, IXmlTypeWriter
+ {
+ public VIFEngineType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var engine = inputData.JobInputData.Vehicle.Components.EngineInputData;
+ if (engine == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Component_Engine,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "EngineDataVIFType"),
+ new XElement(_vif + XMLNames.Component_Manufacturer, engine.Manufacturer),
+ new XElement(_vif + XMLNames.Component_Model, engine.Model),
+ new XElement(_vif + XMLNames.Component_CertificationNumber, engine.CertificationNumber),
+ new XElement(_vif + XMLNames.Component_Date, XmlConvert.ToString(engine.Date, XmlDateTimeSerializationMode.Utc)),
+ new XElement(_vif + XMLNames.Component_AppVersion, engine.AppVersion),
+ new XElement(_vif + XMLNames.Engine_Displacement,
+ engine.Displacement.ConvertToCubicCentiMeter().ToXMLFormat(0)),
+ new XElement(_vif + XMLNames.Engine_RatedSpeed, engine.RatedSpeedDeclared.AsRPM.ToXMLFormat(0)),
+ new XElement(_vif + XMLNames.Engine_RatedPower, engine.RatedPowerDeclared.ToXMLFormat(0)),
+ new XElement(_vif + XMLNames.Engine_MaxTorque, engine.MaxTorqueDeclared.ToXMLFormat(0)),
+ new XElement(
+ _vif + XMLNames.Engine_WHRType,
+ new XElement(_vif + XMLNames.Engine_WHR_MechanicalOutputICE, (engine.WHRType & WHRType.MechanicalOutputICE) != 0),
+ new XElement(_vif + XMLNames.Engine_WHR_MechanicalOutputIDrivetrain, (engine.WHRType & WHRType.MechanicalOutputDrivetrain) != 0),
+ new XElement(_vif + XMLNames.Engine_WHR_ElectricalOutput, (engine.WHRType & WHRType.ElectricalOutput) != 0)
+ ),
+ GetEngineModes(engine.EngineModes))
+ );
+ }
+
+ private List<XElement> GetEngineModes(IList<IEngineModeDeclarationInputData> engineModes)
+ {
+ var modes = new List<XElement>();
+ foreach (var mode in engineModes)
+ {
+ modes.Add(
+ new XElement(
+ _vif + XMLNames.Engine_FuelModes,
+ new XElement(_vif + XMLNames.Engine_IdlingSpeed, mode.IdleSpeed.AsRPM.ToXMLFormat(0)),
+ new XElement(
+ _vif + XMLNames.Engine_FullLoadAndDragCurve,
+ FullLoadCurveReader.Create(mode.FullLoadCurve, true).FullLoadEntries.Select(
+ x => new XElement(
+ _vif + XMLNames.Engine_FullLoadCurve_Entry,
+ new XAttribute(XMLNames.Engine_EngineFullLoadCurve_EngineSpeed_Attr, x.EngineSpeed.AsRPM.ToXMLFormat(2)),
+ new XAttribute(XMLNames.Engine_FullLoadCurve_MaxTorque_Attr, x.TorqueFullLoad.ToXMLFormat(2)),
+ new XAttribute(XMLNames.Engine_FullLoadCurve_DragTorque_Attr, x.TorqueDrag.ToXMLFormat(2)))
+ )),
+ new XElement(
+ _vif + "Fuels",
+ mode.Fuels.Select(x => new XElement(_vif + XMLNames.Engine_FuelType, x.FuelType.ToXMLFormat())))
+ )
+ );
+ }
+
+ return modes;
+ }
+
+
+
+ #endregion
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFIepcType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFIepcType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..9000b5e8459dda8e056c5eb0297d2c52e5813c75
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFIepcType.cs
@@ -0,0 +1,209 @@
+using System.Collections.Generic;
+using System.Data;
+using System.Xml;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public class VIFIepcType : AbstractVIFXmlType, IXmlTypeWriter
+ {
+ public VIFIepcType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var iepc = inputData.JobInputData.Vehicle.Components.IEPC;
+ if (iepc == null)
+ return null;
+
+ var xmlIepc = iepc as AbstractCommonComponentType;
+ if (xmlIepc == null) {
+ throw new VectoException("IEPC requires input to be in XML format");
+ }
+
+ var certificationMethod = xmlIepc.XMLSource
+ .SelectSingleNode(XMLHelper.QueryLocalName(XMLNames.Component_CertificationMethod))?.InnerText;
+
+ return new XElement(_vif + XMLNames.Component_IEPC,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "IEPCMeasuredDataDeclarationType"),
+ new XElement(_vif + XMLNames.Component_Manufacturer, iepc.Manufacturer),
+ new XElement(_vif + XMLNames.Component_Model, iepc.Model),
+ new XElement(_vif + XMLNames.Component_CertificationNumber, iepc.CertificationNumber),
+ new XElement(_vif + XMLNames.Component_Date, XmlConvert.ToString(iepc.Date, XmlDateTimeSerializationMode.Utc)),
+ new XElement(_vif + XMLNames.Component_AppVersion, iepc.AppVersion),
+ new XElement(_vif + XMLNames.ElectricMachine_ElectricMachineType, iepc.ElectricMachineType.ToString()),
+ new XElement(_vif + XMLNames.Component_CertificationMethod, certificationMethod),
+ new XElement(_vif + XMLNames.ElectricMachine_R85RatedPower, iepc.R85RatedPower.ToXMLFormat(0)),
+ new XElement(_vif + XMLNames.ElectricMachine_RotationalInertia, iepc.Inertia.ToXMLFormat(2)),
+ new XElement(_vif + XMLNames.IEPC_DifferentialIncluded, iepc.DifferentialIncluded),
+ new XElement(_vif + XMLNames.IEPC_DesignTypeWheelMotor, iepc.DesignTypeWheelMotor),
+ iepc.NrOfDesignTypeWheelMotorMeasured == null
+ ? null
+ : new XElement(_vif + XMLNames.IEPC_NrOfDesignTypeWheelMotorMeasured, iepc.NrOfDesignTypeWheelMotorMeasured.Value),
+ GetGears(iepc.Gears),
+ GetVoltageLevels(iepc.VoltageLevels),
+ GetDragCurves(iepc.DragCurves),
+ GetConditioning(iepc.Conditioning)
+ )
+ );
+ }
+
+ #endregion
+
+
+ private XElement GetGears(IList<IGearEntry> gearsData)
+ {
+ var gears = new List<XElement>();
+
+ foreach (var gearEntry in gearsData) {
+
+ var currentGear = new XElement(_vif + XMLNames.Gear_EntryName,
+ new XAttribute("number", gearEntry.GearNumber.ToString()),
+ new XElement(_vif + XMLNames.GearRatio_Ratio, gearEntry.Ratio.ToXMLFormat(3)),
+ gearEntry.MaxOutputShaftTorque == null
+ ? null
+ : new XElement(_vif + XMLNames.Gear_MaxOutputShaftTorque, gearEntry.MaxOutputShaftTorque.ToXMLFormat(0)),
+
+ gearEntry.MaxOutputShaftSpeed == null
+ ? null
+ : new XElement(_vif + XMLNames.Gear_MaxOutputShaftSpeed, gearEntry.MaxOutputShaftSpeed.AsRPM.ToXMLFormat(0))
+ );
+ gears.Add(currentGear);
+ }
+
+ return new XElement(_vif + XMLNames.Gearbox_Gears,
+ new XAttribute(_xsi + XMLNames.XSIType, "IEPCGearsDeclarationType"),
+ gears);
+ }
+
+
+ private IList<XElement> GetVoltageLevels(IList<IElectricMotorVoltageLevel> voltageData)
+ {
+ var voltageLevels = new List<XElement>();
+
+ foreach (var voltageEntry in voltageData) {
+
+ var voltage = new XElement(_vif + XMLNames.ElectricMachine_VoltageLevel,
+ new XElement(_vif + XMLNames.VoltageLevel_Voltage, voltageEntry.VoltageLevel.ToXMLFormat(0)),
+ new XElement(_vif + XMLNames.ElectricMachine_ContinuousTorque, voltageEntry.ContinuousTorque.ToXMLFormat(2)),
+ new XElement(_vif + XMLNames.ElectricMachine_TestSpeedContinuousTorque, voltageEntry.ContinuousTorqueSpeed.ToXMLFormat(2)),
+ new XElement(_vif + XMLNames.ElectricMachine_OverloadTorque, voltageEntry.OverloadTorque.ToXMLFormat(2)),
+ new XElement(_vif + XMLNames.ElectricMachine_TestSpeedOverloadTorque, voltageEntry.OverloadTestSpeed.ToXMLFormat(2)),
+ new XElement(_vif + XMLNames.ElectricMachine_OverloadDuration, voltageEntry.OverloadTime.ToXMLFormat(2)),
+ GetMaxTorqueCurve(voltageEntry.FullLoadCurve),
+ GetPowerMap(voltageEntry.PowerMap)
+ );
+
+ voltageLevels.Add(voltage);
+ }
+
+ return voltageLevels;
+ }
+
+
+ private XElement GetMaxTorqueCurve(DataTable maxTorqueData)
+ {
+ var maxTorqueCurveEntries = new List<XElement>();
+
+ for (int r = 0; r < maxTorqueData.Rows.Count; r++) {
+ var row = maxTorqueData.Rows[r];
+ var outShaftSpeed = row[XMLNames.MaxTorqueCurve_OutShaftSpeed];
+ var maxTorque = row[XMLNames.MaxTorqueCurve_MaxTorque];
+ var minTorque = row[XMLNames.MaxTorqueCurve_MinTorque];
+
+ var element = new XElement(_v23 + XMLNames.MaxTorqueCurve_Entry,
+ new XAttribute(XMLNames.MaxTorqueCurve_OutShaftSpeed, outShaftSpeed),
+ new XAttribute(XMLNames.MaxTorqueCurve_MaxTorque, maxTorque),
+ new XAttribute(XMLNames.MaxTorqueCurve_MinTorque, minTorque)
+ );
+
+ maxTorqueCurveEntries.Add(element);
+ }
+
+ return new XElement(_vif + XMLNames.MaxTorqueCurve, maxTorqueCurveEntries);
+ }
+
+ private List<XElement> GetPowerMap(IList<IElectricMotorPowerMap> powerMapData)
+ {
+ var powerMaps = new List<XElement>();
+
+ foreach (var powerMapEntry in powerMapData) {
+
+ var entries = new List<XElement>();
+ for (int r = 0; r < powerMapEntry.PowerMap.Rows.Count; r++) {
+ var outShaftSpeed = powerMapEntry.PowerMap.Rows[r][XMLNames.PowerMap_OutShaftSpeed].ToString().ToDouble();
+ var torque = powerMapEntry.PowerMap.Rows[r][XMLNames.PowerMap_Torque].ToString().ToDouble();
+ var electricPower = powerMapEntry.PowerMap.Rows[r][XMLNames.PowerMap_ElectricPower].ToString().ToDouble();
+
+ var entry = new XElement(_vif + XMLNames.PowerMap_Entry,
+ new XAttribute(XMLNames.PowerMap_OutShaftSpeed, outShaftSpeed.ToXMLFormat(2)),
+ new XAttribute(XMLNames.PowerMap_Torque, torque.ToXMLFormat(2)),
+ new XAttribute(XMLNames.PowerMap_ElectricPower, electricPower.ToXMLFormat(2)));
+ entries.Add(entry);
+ }
+
+ var powerEntry = new XElement(_vif + XMLNames.PowerMap,
+ new XAttribute("gear", powerMapEntry.Gear),
+ entries);
+
+ powerMaps.Add(powerEntry);
+ }
+
+ return powerMaps;
+ }
+
+ private IList<XElement> GetDragCurves(IList<IDragCurve> dragCurves)
+ {
+ var result = new List<XElement>();
+
+ foreach (var dragCurve in dragCurves) {
+ var entries = new List<XElement>();
+ for (int r = 0; r < dragCurve.DragCurve.Rows.Count; r++) {
+ var outShaftSpeed = dragCurve.DragCurve.Rows[r][XMLNames.DragCurve_OutShaftSpeed].ToString().ToDouble();
+ var dragTorque = dragCurve.DragCurve.Rows[r][XMLNames.DragCurve_DragTorque].ToString().ToDouble();
+
+ var entry = new XElement(_vif + XMLNames.DragCurve_Entry,
+ new XAttribute(XMLNames.DragCurve_OutShaftSpeed, outShaftSpeed.ToXMLFormat(2)),
+ new XAttribute(XMLNames.DragCurve_DragTorque, dragTorque.ToXMLFormat(2)));
+
+ entries.Add(entry);
+ }
+
+ result.Add(new XElement(_vif + XMLNames.DragCurve,
+ new XAttribute(XMLNames.DragCurve_Gear, dragCurve.Gear.Value),
+ entries));
+ }
+
+ return result;
+ }
+
+ private XElement GetConditioning(DataTable iepcData)
+ {
+ if (iepcData == null)
+ return null;
+
+ var entries = new List<XElement>();
+ for (int r = 0; r < iepcData.Rows.Count; r++) {
+
+ var coolantTempInLet = iepcData.Rows[r][XMLNames.Conditioning_CoolantTempInlet];
+ var coolingPower = iepcData.Rows[r][XMLNames.Conditioning_CoolingPower];
+
+ entries.Add(new XElement(_vif + XMLNames.Conditioning_Entry,
+ new XAttribute(XMLNames.Conditioning_CoolantTempInlet, coolantTempInLet),
+ new XAttribute(XMLNames.Conditioning_CoolingPower, coolingPower)));
+ }
+
+ return new XElement(_vif + XMLNames.Conditioning, entries);
+ }
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFRetarderType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFRetarderType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..0754d15218f0ae7404fb5329d27b60dfd72bf7ef
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFRetarderType.cs
@@ -0,0 +1,43 @@
+using System.Xml;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public class VIFRetarderType : AbstractVIFXmlType, IXmlTypeWriter
+ {
+ public VIFRetarderType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var retarder = inputData.JobInputData.Vehicle.Components.RetarderInputData;
+ if (retarder == null || retarder.Type.IsOneOf(RetarderType.EngineRetarder, RetarderType.None,
+ RetarderType.LossesIncludedInTransmission))
+ return null;
+
+ return new XElement(_vif + XMLNames.Component_Retarder,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "RetarderDataVIFType"),
+ new XElement(_vif + XMLNames.Component_Manufacturer, retarder.Manufacturer),
+ new XElement(_vif + XMLNames.Component_Model, retarder.Model),
+ new XElement(_vif + XMLNames.Component_CertificationMethod, retarder.CertificationMethod.ToXMLFormat()),
+ retarder.CertificationMethod == CertificationMethod.StandardValues
+ ? null
+ : new XElement(_vif + XMLNames.Report_Component_CertificationNumber,
+ retarder.CertificationNumber),
+ new XElement(_vif + XMLNames.Component_Date,
+ XmlConvert.ToString(retarder.Date, XmlDateTimeSerializationMode.Utc)),
+ new XElement(_vif + XMLNames.Component_AppVersion, retarder.AppVersion),
+ new XElement(_vif + XMLNames.Vehicle_RetarderRatio, retarder.Ratio.ToXMLFormat(3))
+ ));
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFTorqueConverterType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFTorqueConverterType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..715819fe9ed699dc44d11d4e5c581b3f85835fcb
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFTorqueConverterType.cs
@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Xml;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore.InputData.Reader.ComponentData;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public class VIFTorqueConverterType : AbstractVIFXmlType, IXmlTypeWriter
+ {
+ public VIFTorqueConverterType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var torque = inputData.JobInputData.Vehicle.Components.TorqueConverterInputData;
+ if (torque == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Component_TorqueConverter,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "TorqueConverterDataVIFType"),
+ new XElement(_vif + XMLNames.Component_Manufacturer, torque.Manufacturer),
+ new XElement(_vif + XMLNames.Component_Model, torque.Model),
+ new XElement(_vif + XMLNames.Component_CertificationMethod,
+ torque.CertificationMethod.ToXMLFormat()),
+ torque.CertificationMethod == CertificationMethod.StandardValues
+ ? null
+ : new XElement(_vif + XMLNames.Report_Component_CertificationNumber,
+ torque.CertificationNumber),
+ new XElement(_vif + XMLNames.Component_Date,
+ XmlConvert.ToString(torque.Date, XmlDateTimeSerializationMode.Utc)),
+ new XElement(_vif + XMLNames.Component_AppVersion, torque.AppVersion)
+ ));
+ }
+
+ #endregion
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFTorqueLimitsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFTorqueLimitsType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..f665a33df79ae19bf7ceb4cae383d0b3de2537e4
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFTorqueLimitsType.cs
@@ -0,0 +1,37 @@
+using System.Linq;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public class VIFTorqueLimitsType : AbstractVIFXmlType, IXmlTypeWriter
+ {
+ public VIFTorqueLimitsType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ if (inputData.JobInputData.Vehicle.TorqueLimits == null ||
+ inputData.JobInputData.Vehicle.TorqueLimits.Count == 0)
+ return null;
+
+ var torqueLimits = inputData.JobInputData.Vehicle.TorqueLimits;
+
+ return new XElement(_vif + XMLNames.Vehicle_TorqueLimits,
+ new XAttribute(_xsi + XMLNames.XSIType, "TorqueLimitsType"),
+ new XAttribute("xmlns", _v20.NamespaceName),
+ torqueLimits
+ .OrderBy(x => x.Gear)
+ .Select(entry => new XElement(_v20 + XMLNames.Vehicle_TorqueLimits_Entry,
+ new XAttribute(XMLNames.Vehicle_TorqueLimits_Entry_Gear_Attr, entry.Gear),
+ new XAttribute(XMLNames.Vehicle_TorqueLimits_Entry_MaxTorque_Attr, entry.MaxTorque.ToXMLFormat(0))
+ )
+ ));
+ }
+
+ #endregion
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFTransmissionType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFTransmissionType.cs
new file mode 100644
index 0000000000000000000000000000000000000000..fee5ab2a148c1aba8a73dc86f58270e1fbab1c69
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFTransmissionType.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components
+{
+ public class VIFTransmissionType : AbstractVIFXmlType, IXmlTypeWriter
+ {
+ public VIFTransmissionType(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ #region Implementation of IXmlTypeWriter
+
+ public XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var transmission = inputData.JobInputData.Vehicle.Components.GearboxInputData;
+ if (transmission == null)
+ return null;
+
+ return new XElement(_vif + XMLNames.Component_Transmission,
+ new XElement(_vif + XMLNames.ComponentDataWrapper,
+ new XAttribute(_xsi + XMLNames.XSIType, "TransmissionDataVIFType"),
+ new XElement(_vif + XMLNames.Component_Manufacturer, transmission.Manufacturer),
+ new XElement(_vif + XMLNames.Component_Model, transmission.Model),
+ new XElement(_vif + XMLNames.Component_Gearbox_CertificationMethod,
+ transmission.CertificationMethod.ToXMLFormat()),
+ transmission.CertificationMethod == CertificationMethod.StandardValues
+ ? null
+ : new XElement(_vif + XMLNames.Component_CertificationNumber, transmission.CertificationNumber),
+ new XElement(_vif + XMLNames.Component_Date,
+ XmlConvert.ToString(transmission.Date, XmlDateTimeSerializationMode.Utc)),
+ new XElement(_vif + XMLNames.Component_AppVersion, transmission.AppVersion),
+ new XElement(_vif + XMLNames.Gearbox_TransmissionType, transmission.Type.ToXMLFormat()),
+ new XElement(_vif + XMLNames.Gearbox_Gears,
+ new XAttribute(_xsi + XMLNames.XSIType, "TransmissionGearsVIFType"),
+ transmission.Gears.Select(
+ x => new XElement(
+ _vif + XMLNames.Gearbox_Gears_Gear,
+ new XAttribute(XMLNames.Gearbox_Gear_GearNumber_Attr, x.Gear),
+ new XElement(_vif + XMLNames.Gearbox_Gear_Ratio, x.Ratio.ToXMLFormat(3)),
+ x.MaxTorque != null
+ ? new XElement(_vif + XMLNames.Gearbox_Gears_MaxTorque, x.MaxTorque.ToXMLFormat(0))
+ : null,
+ x.MaxInputSpeed != null
+ ? new XElement(_vif + XMLNames.Gearbox_Gear_MaxSpeed,
+ x.MaxInputSpeed.AsRPM.ToXMLFormat(0))
+ : null)
+ )
+ )
+ )
+ );
+ }
+
+ #endregion
+ }
+
+
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryVehicleParameterGroup.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryVehicleParameterGroup.cs
new file mode 100644
index 0000000000000000000000000000000000000000..50e17b93cde088fa13f76c63fba670a5f51b93f8
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryVehicleParameterGroup.cs
@@ -0,0 +1,337 @@
+using System.Collections.Generic;
+using System.Xml;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1
+{
+
+ public class PrimaryBusGeneralParameterGroup : AbstractVIFGroupWriter
+ {
+ public PrimaryBusGeneralParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractVIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var vehicle = inputData.JobInputData.Vehicle;
+
+ var result = new List<XElement>
+ {
+ new XElement(_vif + XMLNames.Component_Manufacturer, vehicle.Manufacturer),
+ new XElement(_vif + XMLNames.Component_ManufacturerAddress, vehicle.ManufacturerAddress),
+ new XElement(_vif + XMLNames.Component_Model, vehicle.Model),
+ new XElement(_vif + XMLNames.Vehicle_VIN, vehicle.VIN),
+ new XElement(_vif + XMLNames.Component_Date, XmlConvert.ToString(vehicle.Date, XmlDateTimeSerializationMode.Utc)),
+ };
+
+ return result;
+ }
+
+ #endregion
+ }
+
+ public class PrimaryBusChassisParameterGroup : AbstractVIFGroupWriter
+ {
+ public PrimaryBusChassisParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractVIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var vehicle = inputData.JobInputData.Vehicle;
+
+ var result = new List<XElement>
+ {
+ new XElement(_vif + XMLNames.Vehicle_LegislativeCategory, vehicle.LegislativeClass.ToXMLFormat()),
+ new XElement(_vif + XMLNames.ChassisConfiguration, vehicle.VehicleCategory.ToXMLFormat()),
+ new XElement(_vif + XMLNames.Vehicle_AxleConfiguration, vehicle.AxleConfiguration.ToXMLFormat()),
+ new XElement(_vif + XMLNames.Vehicle_Articulated, vehicle.Articulated),
+ new XElement(_vif + XMLNames.TPMLM, vehicle.GrossVehicleMassRating.ToXMLFormat(0)),
+ };
+
+ return result;
+ }
+
+ #endregion
+ }
+
+ public class PrimaryBusRetarderParameterGroup : AbstractVIFGroupWriter
+ {
+ public PrimaryBusRetarderParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractVIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var vehicle = inputData.JobInputData.Vehicle;
+ var result = new List<XElement>
+ {
+ new XElement(_vif + XMLNames.Vehicle_RetarderType, vehicle.Components.RetarderInputData.Type.ToXMLFormat()),
+ vehicle.Components.RetarderInputData.Type.IsDedicatedComponent()
+ ? new XElement(_vif + XMLNames.Vehicle_RetarderRatio, vehicle.Components.RetarderInputData?.Ratio.ToXMLFormat(3))
+ : null,
+ };
+ return result;
+ }
+
+ #endregion
+ }
+
+ public class PrimaryBusXeVParameterGroup : AbstractVIFGroupWriter
+ {
+ public PrimaryBusXeVParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractVIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var vehicle = inputData.JobInputData.Vehicle;
+
+ var result = new List<XElement> {
+ new XElement(_vif + XMLNames.Vehicle_OvcHev, vehicle.OvcHev),
+ vehicle.OvcHev
+ ? new XElement(_vif + XMLNames.Vehicle_MaxChargingPower, vehicle.MaxChargingPower.ToXMLFormat(0))
+ : null,
+ };
+ return result;
+ }
+
+ #endregion
+ }
+
+
+ public class ConventionalVIFVehicleParameterGroup : AbstractVIFGroupWriter
+ {
+ public ConventionalVIFVehicleParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractVIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var vehicle = inputData.JobInputData.Vehicle;
+
+ var result = new List<XElement>();
+ result.AddRange(_vifReportFactory.GetPrimaryBusGeneralParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusChassisParameterGroup().GetElements(inputData));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_IdlingSpeed, vehicle.EngineIdleSpeed.AsRPM.ToXMLFormat(0)));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_RetarderType, vehicle.Components.RetarderInputData.Type.ToXMLFormat()));
+ if (vehicle.Components.RetarderInputData.Type.IsDedicatedComponent()) {
+ result.Add(new XElement(_vif + XMLNames.Vehicle_RetarderRatio,
+ vehicle.Components.RetarderInputData?.Ratio.ToXMLFormat(3)));
+ }
+ result.Add(new XElement(_vif + XMLNames.Vehicle_AngledriveType, vehicle.Components.AngledriveInputData.Type.ToXMLFormat()));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_ZeroEmissionVehicle, vehicle.ZeroEmissionVehicle));
+ result.Add(_vifReportFactory.GetConventionalADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS));
+ result.Add(_vifReportFactory.GetTorqueLimitsType().GetElement(inputData));
+
+ return result;
+ }
+
+ #endregion
+ }
+
+
+ public class HevIepcSVehicleParameterGroup : AbstractVIFGroupWriter
+ {
+ public HevIepcSVehicleParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractVIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var vehicle = inputData.JobInputData.Vehicle;
+
+ var result = new List<XElement>();
+ result.AddRange(_vifReportFactory.GetPrimaryBusGeneralParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusChassisParameterGroup().GetElements(inputData));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_IdlingSpeed, vehicle.EngineIdleSpeed.AsRPM.ToXMLFormat(0)));
+ result.AddRange(_vifReportFactory.GetPrimaryBusRetarderParameterGroup().GetElements(inputData));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_AngledriveType, (vehicle.Components.AngledriveInputData?.Type ?? AngledriveType.None).ToXMLFormat()));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_ZeroEmissionVehicle, vehicle.ZeroEmissionVehicle));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_ArchitectureID, vehicle.ArchitectureID.GetLabel()));
+ result.AddRange(_vifReportFactory.GetPrimaryBusXevParameterGroup().GetElements(inputData));
+ result.Add(_vifReportFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS));
+ var electricMotorTorque = _vifReportFactory.GetElectricMotorTorqueLimitsType().GetElement(inputData);
+ if(electricMotorTorque != null)
+ result.Add(electricMotorTorque);
+
+ return result;
+ }
+
+ #endregion
+ }
+
+ public class HevSxVehicleParameterGroup : AbstractVIFGroupWriter
+ {
+ public HevSxVehicleParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractVIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var vehicle = inputData.JobInputData.Vehicle;
+
+ var result = new List<XElement>();
+ result.AddRange(_vifReportFactory.GetPrimaryBusGeneralParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusChassisParameterGroup().GetElements(inputData));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_IdlingSpeed, vehicle.EngineIdleSpeed.AsRPM.ToXMLFormat(0)));
+ result.AddRange(_vifReportFactory.GetPrimaryBusRetarderParameterGroup().GetElements(inputData));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_AngledriveType, (vehicle.Components.AngledriveInputData?.Type ?? AngledriveType.None).ToXMLFormat()));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_ZeroEmissionVehicle, vehicle.ZeroEmissionVehicle));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_ArchitectureID, vehicle.ArchitectureID.GetLabel()));
+ result.AddRange(_vifReportFactory.GetPrimaryBusXevParameterGroup().GetElements(inputData));
+ result.Add(_vifReportFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS));
+ var electricMotorTorque = _vifReportFactory.GetElectricMotorTorqueLimitsType().GetElement(inputData);
+ if (electricMotorTorque != null)
+ result.Add(electricMotorTorque);
+
+ return result;
+ }
+
+ #endregion
+ }
+
+ public class IepcVehicleParameterGroup : AbstractVIFGroupWriter
+ {
+ public IepcVehicleParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractVIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var vehicle = inputData.JobInputData.Vehicle;
+
+ var result = new List<XElement>();
+ result.AddRange(_vifReportFactory.GetPrimaryBusGeneralParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusChassisParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusRetarderParameterGroup().GetElements(inputData));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_AngledriveType, vehicle.Components.AngledriveInputData.Type.ToXMLFormat()));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_ZeroEmissionVehicle, vehicle.ZeroEmissionVehicle));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_ArchitectureID, vehicle.ArchitectureID.GetLabel()));
+ result.AddRange(_vifReportFactory.GetPrimaryBusXevParameterGroup().GetElements(inputData));
+ result.Add(_vifReportFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS));
+
+ return result;
+ }
+
+ #endregion
+ }
+
+ public class PevExVehicleParameterGroup : AbstractVIFGroupWriter
+ {
+ public PevExVehicleParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractVIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var vehicle = inputData.JobInputData.Vehicle;
+
+ var result = new List<XElement>();
+ result.AddRange(_vifReportFactory.GetPrimaryBusGeneralParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusChassisParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusRetarderParameterGroup().GetElements(inputData));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_AngledriveType, (vehicle.Components.AngledriveInputData?.Type ?? AngledriveType.None).ToXMLFormat()));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_ZeroEmissionVehicle, vehicle.ZeroEmissionVehicle));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_ArchitectureID, vehicle.ArchitectureID.GetLabel()));
+ result.AddRange(_vifReportFactory.GetPrimaryBusXevParameterGroup().GetElements(inputData));
+ result.Add(_vifReportFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS));
+ var motorTorqueLimits = _vifReportFactory.GetElectricMotorTorqueLimitsType().GetElement(inputData);
+ if(motorTorqueLimits != null)
+ result.Add(motorTorqueLimits);
+
+ return result;
+ }
+
+ #endregion
+ }
+
+ public class PevIEPCVehicleParameterGroup : AbstractVIFGroupWriter
+ {
+ public PevIEPCVehicleParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractVIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var vehicle = inputData.JobInputData.Vehicle;
+
+ var result = new List<XElement>();
+ result.AddRange(_vifReportFactory.GetPrimaryBusGeneralParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusChassisParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusRetarderParameterGroup().GetElements(inputData));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_AngledriveType, (vehicle.Components.AngledriveInputData?.Type ?? AngledriveType.None).ToXMLFormat()));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_ZeroEmissionVehicle, vehicle.ZeroEmissionVehicle));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_ArchitectureID, vehicle.ArchitectureID.GetLabel()));
+ result.AddRange(_vifReportFactory.GetPrimaryBusXevParameterGroup().GetElements(inputData));
+ result.Add(_vifReportFactory.GetIEPCADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS));
+ var motorTorqueLimits = _vifReportFactory.GetElectricMotorTorqueLimitsType().GetElement(inputData);
+ if (motorTorqueLimits != null)
+ result.Add(motorTorqueLimits);
+
+ return result;
+ }
+
+ #endregion
+ }
+
+ public class HevPxVehicleParameterGroup : AbstractVIFGroupWriter
+ {
+ public HevPxVehicleParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractVIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var vehicle = inputData.JobInputData.Vehicle;
+
+ var result = new List<XElement>();
+
+ result.AddRange(_vifReportFactory.GetPrimaryBusGeneralParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusChassisParameterGroup().GetElements(inputData));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_IdlingSpeed, vehicle.EngineIdleSpeed.AsRPM.ToXMLFormat(0)));
+ result.AddRange(_vifReportFactory.GetPrimaryBusRetarderParameterGroup().GetElements(inputData));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_AngledriveType, vehicle.Components.AngledriveInputData.Type.ToXMLFormat()));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_ZeroEmissionVehicle, vehicle.ZeroEmissionVehicle));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_ArchitectureID, vehicle.ArchitectureID.GetLabel()));
+ result.AddRange(_vifReportFactory.GetPrimaryBusXevParameterGroup().GetElements(inputData));
+ result.Add(_vifReportFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS));
+ result.Add(_vifReportFactory.GetTorqueLimitsType().GetElement(inputData));
+ result.Add(_vifReportFactory.GetElectricMotorTorqueLimitsType().GetElement(inputData));
+ result.Add(_vifReportFactory.GetBoostingLimitationsType().GetElement(inputData));
+
+ return result;
+ }
+
+ #endregion
+ }
+
+ public class ExemptedVehicleParameterGroup : AbstractVIFGroupWriter
+ {
+ public ExemptedVehicleParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of AbstractVIFGroupWriter
+
+ public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+ {
+ var vehicle = inputData.JobInputData.Vehicle;
+
+ var result = new List<XElement>();
+
+ result.AddRange(_vifReportFactory.GetPrimaryBusGeneralParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusChassisParameterGroup().GetElements(inputData));
+ result.Add(new XElement(_vif + XMLNames.Vehicle_ZeroEmissionVehicle, vehicle.ZeroEmissionVehicle));
+ result.Add(new XElement(_vif + "SumNetPower", XMLHelper.ValueAsUnit(vehicle.MaxNetPower1, "W")));
+ result.Add(new XElement(_vif + "Technology", vehicle.ExemptedTechnology));
+
+ return result;
+ }
+
+ #endregion
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryVehicleWriter.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryVehicleWriter.cs
new file mode 100644
index 0000000000000000000000000000000000000000..1b838f10fc15bb077ca2badd50018dabefc9080f
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryVehicleWriter.cs
@@ -0,0 +1,264 @@
+using System.Xml.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1
+{
+ public abstract class VehicleWriter : IXmlTypeWriter
+ {
+ protected readonly IVIFReportFactory _vifReportFactory;
+
+ protected XNamespace _vif = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1";
+ protected XNamespace _xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
+
+ protected VehicleWriter(IVIFReportFactory vifReportFactory)
+ {
+ _vifReportFactory = vifReportFactory;
+ }
+
+
+ #region Implementation of IXmlTypeWriter
+
+ public abstract XElement GetElement(IDeclarationInputDataProvider inputData);
+
+ #endregion
+ }
+
+
+ public class ConventionalVehicleType : VehicleWriter
+ {
+ public ConventionalVehicleType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var vehicleData = _vifReportFactory.GetConventionalVehicleGroup().GetElements(inputData);
+ vehicleData.Add(_vifReportFactory.GetConventionalComponentType().GetElement(inputData));
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "ConventionalVehicleVIFType"),
+ vehicleData);
+ }
+
+ #endregion
+ }
+
+
+ public class HevIepcSVehicleType : VehicleWriter
+ {
+ public HevIepcSVehicleType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var vehicleData = _vifReportFactory.GetHevIepcSVehicleParameterGroup().GetElements(inputData);
+ vehicleData.Add(_vifReportFactory.GetHevIepcSComponentVIFType().GetElement(inputData));
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "HEV-IEPC-S_VehicleVIFType"),
+ vehicleData);
+ }
+
+ #endregion
+ }
+
+
+ public class HevPxVehicleType : VehicleWriter
+ {
+ public HevPxVehicleType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+
+ var vehicleData = _vifReportFactory.GetHevPxVehicleParameterGroup().GetElements(inputData);
+ vehicleData.Add(_vifReportFactory.GetHevPxComponentVIFType().GetElement(inputData));
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "HEV-Px_VehicleVIFType"),
+ vehicleData);
+ }
+
+ #endregion
+ }
+
+
+ public class HevS2VehicleType : VehicleWriter
+ {
+ public HevS2VehicleType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var vehicleData = _vifReportFactory.GetHevSxVehicleParameterGroup().GetElements(inputData);
+ vehicleData.Add(_vifReportFactory.GetHevS2ComponentVIFType().GetElement(inputData));
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "HEV-Sx_VehicleVIFType"),
+ vehicleData);
+ }
+
+ #endregion
+ }
+
+
+ public class HevS3VehicleType : VehicleWriter
+ {
+ public HevS3VehicleType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var vehicleData = _vifReportFactory.GetHevSxVehicleParameterGroup().GetElements(inputData);
+ vehicleData.Add(_vifReportFactory.GetHevS3ComponentVIFType().GetElement(inputData));
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "HEV-Sx_VehicleVIFType"),
+ vehicleData);
+ }
+
+ #endregion
+ }
+
+
+ public class HevS4VehicleType : VehicleWriter
+ {
+ public HevS4VehicleType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var vehicleData = _vifReportFactory.GetHevSxVehicleParameterGroup().GetElements(inputData);
+ vehicleData.Add(_vifReportFactory.GetHevS4ComponentVIFType().GetElement(inputData));
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "HEV-Sx_VehicleVIFType"),
+ vehicleData);
+ }
+
+ #endregion
+ }
+
+ public class IepcVehicleType : VehicleWriter
+ {
+ public IepcVehicleType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var vehicleData = _vifReportFactory.GetIepcVehicleParameterGroup().GetElements(inputData);
+ vehicleData.Add(_vifReportFactory.GetPevIEPCComponentVIFType().GetElement(inputData));
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "IEPC_VehicleVIFType"),
+ vehicleData);
+ }
+
+ #endregion
+ }
+
+
+ public class PevE2VehicleType : VehicleWriter
+ {
+ public PevE2VehicleType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var vehicleData = _vifReportFactory.GetPevExVehicleParmeterGroup().GetElements(inputData);
+ vehicleData.Add(_vifReportFactory.GetPevE2ComponentVIFType().GetElement(inputData));
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "PEV_Ex_VehicleVIFType"),
+ vehicleData);
+ }
+
+ #endregion
+ }
+
+ public class PevE3VehicleType : VehicleWriter
+ {
+ public PevE3VehicleType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var vehicleData = _vifReportFactory.GetPevExVehicleParmeterGroup().GetElements(inputData);
+ vehicleData.Add(_vifReportFactory.GetPevE3ComponentVIFType().GetElement(inputData));
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "PEV_Ex_VehicleVIFType"),
+ vehicleData);
+ }
+
+ #endregion
+ }
+
+ public class PevE4VehicleType : VehicleWriter
+ {
+ public PevE4VehicleType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var vehicleData = _vifReportFactory.GetPevExVehicleParmeterGroup().GetElements(inputData);
+ vehicleData.Add(_vifReportFactory.GetPevE4ComponentVIFType().GetElement(inputData));
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "PEV_Ex_VehicleVIFType"),
+ vehicleData);
+ }
+
+ #endregion
+ }
+
+ public class PevIEPCVehicleType : VehicleWriter
+ {
+ public PevIEPCVehicleType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var vehicleData = _vifReportFactory.GetPevIEPCVehicleParmeterGroup().GetElements(inputData);
+ vehicleData.Add(_vifReportFactory.GetPevIEPCComponentVIFType().GetElement(inputData));
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "IEPC_VehicleVIFType"),
+ vehicleData);
+ }
+
+ #endregion
+ }
+
+ public class ExemptedVehicleType : VehicleWriter
+ {
+ public ExemptedVehicleType(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+
+ #region Overrides of VehicleWriter
+
+ public override XElement GetElement(IDeclarationInputDataProvider inputData)
+ {
+ var vehicleData = _vifReportFactory.GetExemptedVehicleParameterGroup().GetElements(inputData);
+ //vehicleData.Add(_vifReportFactory.GetPevIEPCComponentVIFType().GetElement(inputData));
+
+ return new XElement(_vif + XMLNames.Component_Vehicle,
+ new XAttribute(_xsi + XMLNames.XSIType, "Exempted_VehicleVIFType"),
+ vehicleData);
+ }
+
+ #endregion
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VIFNinjectModule.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VIFNinjectModule.cs
new file mode 100644
index 0000000000000000000000000000000000000000..da2414c8c771d3d37b6e1b0e03fda5f2ad073eb9
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VIFNinjectModule.cs
@@ -0,0 +1,503 @@
+using Ninject.Activation;
+using Ninject.Extensions.ContextPreservation;
+using Ninject.Extensions.Factory;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.InterimComponents;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.VIFReport;
+using TUGraz.VectoCore.Utils.Ninject;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1
+{
+ internal class VIFNinjectModule : MRFNinjectModule
+ {
+ #region Overrides of NinjectModule
+
+ public override void Load()
+ {
+ LoadModule<ContextPreservationModule>();
+
+ Bind<IVIFReportInterimFactory>().ToFactory(() => new CombineArgumentsToNameInstanceProvider(nameCombinationMethod,
+ 6, 6,
+ typeof(IVIFReportInterimFactory).GetMethod(nameof(IVIFReportInterimFactory.GetInterimVIFReport)) )).InSingletonScope();
+
+ Bind<IVIFReportFactory>().ToFactory(() => new CombineArgumentsToNameInstanceProvider(nameCombinationMethod,
+ 6, 6, typeof(IVIFReportFactory).GetMethod(nameof(IVIFReportFactory.GetVIFReport))
+ )).InSingletonScope();
+
+
+ #region Primary Vehicle Information File Reports
+
+ Bind<IXMLVehicleInformationFile>().To<Conventional_PrimaryBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.ConventionalVehicle,
+ ArchitectureID.UNKNOWN,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLVehicleInformationFile>().To<HEV_Px_PrimaryBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.ParallelHybridVehicle,
+ ArchitectureID.UNKNOWN,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLVehicleInformationFile>().To<HEV_S2_PrimaryBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S2,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLVehicleInformationFile>().To<HEV_S3_PrimaryBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S3,
+ false,
+ false,
+ false)));
+ Bind<IXMLVehicleInformationFile>().To<HEV_S4_PrimaryBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S4,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLVehicleInformationFile>().To<HEV_IEPC_S_PrimaryBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S_IEPC,
+ false,
+ true,
+ false)));
+
+ Bind<IXMLVehicleInformationFile>().To<PEV_E2_PrimaryBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.BatteryElectricVehicle,
+ ArchitectureID.E2,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLVehicleInformationFile>().To<PEV_E3_PrimaryBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.BatteryElectricVehicle,
+ ArchitectureID.E3,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLVehicleInformationFile>().To<PEV_E4_PrimaryBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.BatteryElectricVehicle,
+ ArchitectureID.E4,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLVehicleInformationFile>().To<PEV_IEPC_PrimaryBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.BatteryElectricVehicle,
+ ArchitectureID.E_IEPC,
+ false,
+ true,
+ false)));
+
+ Bind<IXMLVehicleInformationFile>().To<Exempted_PrimaryBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.ConventionalVehicle,
+ ArchitectureID.UNKNOWN,
+ true,
+ false,
+ false)));
+
+ #endregion
+
+ #region Complete(d) Primary Vehicle Information File Reports
+
+ // -- Reports
+
+ Bind<IXMLMultistepIntermediateReport>().To<Conventional_CompletedBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.ConventionalVehicle,
+ ArchitectureID.UNKNOWN,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLMultistepIntermediateReport>().To<HEV_CompletedBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.ParallelHybridVehicle,
+ ArchitectureID.UNKNOWN,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLMultistepIntermediateReport>().To<HEV_CompletedBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S_IEPC,
+ false,
+ true,
+ false)));
+
+ Bind<IXMLMultistepIntermediateReport>().To<HEV_CompletedBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S2,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLMultistepIntermediateReport>().To<HEV_CompletedBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S3,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLMultistepIntermediateReport>().To<HEV_CompletedBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.SerialHybridVehicle,
+ ArchitectureID.S4,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLMultistepIntermediateReport>().To<PEV_CompletedBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.BatteryElectricVehicle,
+ ArchitectureID.E2,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLMultistepIntermediateReport>().To<PEV_CompletedBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.BatteryElectricVehicle,
+ ArchitectureID.E3,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLMultistepIntermediateReport>().To<PEV_CompletedBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.BatteryElectricVehicle,
+ ArchitectureID.E4,
+ false,
+ false,
+ false)));
+
+ Bind<IXMLMultistepIntermediateReport>().To<IEPC_CompletedBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.BatteryElectricVehicle,
+ ArchitectureID.UNKNOWN,
+ false,
+ true,
+ false)));
+
+ Bind<IXMLMultistepIntermediateReport>().To<Exempted_CompletedBus_VIF>().Named(nameCombinationMethod.Invoke(
+ ToParams(VehicleCategoryHelper.PrimaryBus,
+ VectoSimulationJobType.ConventionalVehicle,
+ ArchitectureID.UNKNOWN,
+ true,
+ false,
+ false)));
+
+ // -- Vehicle type writers
+
+ Bind<IXmlMultistepTypeWriter>().To<ConventionalInterimVehicleType>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetConventionalVehicleType());
+
+ Bind<IXmlMultistepTypeWriter>().To<HEVInterimVehicleType>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetHEVVehicleType());
+
+ Bind<IXmlMultistepTypeWriter>().To<PEVInterimVehicleType>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetPEVVehicleType());
+
+ Bind<IXmlMultistepTypeWriter>().To<IEPCInterimVehicleType>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetIEPCVehicleType());
+
+
+ Bind<IXmlMultistepTypeWriter>().To<ExemptedInterimVehicleType>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetExemptedVehicleType());
+
+ // -- Components type writers
+
+ Bind<IReportMultistepCompletedBusTypeWriter>().To<ConventionalComponentsInterimVIFType>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetConventionalInterimComponentsType());
+
+ Bind<IReportMultistepCompletedBusTypeWriter>().To<XEVComponentsInterimVIFType>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetxEVInterimComponentsType());
+
+ // -- ADAS type writers
+
+ Bind<IVIFFAdasType>().To<VIFCompletedConventionalAdasType>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetConventionalInterimADASType());
+
+ Bind<IVIFFAdasType>().To<VIFCompletedHEVAdasType>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetHEVInterimADASType());
+
+ Bind<IVIFFAdasType>().To<VIFCompletedPEVAdasType>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetPEVInterimADASType());
+
+ Bind<IVIFFAdasType>().To<VIFCompletedIEPCAdasType>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetIEPCInterimADASType());
+
+
+ // -- Airdrag type writers
+
+ Bind<IReportMultistepCompletedBusTypeWriter>().To<AirdragInterimType>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetInterimAirdragType());
+
+ // -- Aux type writers
+
+ Bind<IReportMultistepCompletedBusTypeWriter>().To<ConventionalInterimAuxiliaryType>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetInterimConventionalAuxiliariesType());
+
+ Bind<IReportMultistepCompletedBusTypeWriter>().To<XEVInterimAuxiliaryType>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetInterimxEVAuxiliariesType());
+
+ // -- Parameter Groups
+
+ Bind<IReportMultistepCompletedBusOutputGroup>().To<CompletedBusGeneralParametersGroup>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetCompletedBusGeneralParametersGroup());
+
+ Bind<IReportMultistepCompletedBusOutputGroup>().To<GetCompletedBusParametersGroup>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetCompletedBusParametersGroup());
+
+ Bind<IReportMultistepCompletedBusOutputGroup>().To<CompletedBusPassengerCountGroup>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetCompletedBusPassengerCountGroup());
+
+ Bind<IReportMultistepCompletedBusOutputGroup>().To<CompletedBusDimensionsGroup>().When(AccessedViaInterimVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportInterimFactory f) => f.GetCompletedBusDimensionsGroup());
+
+ #endregion
+
+ #region VehicleTypes
+
+ Bind<IXmlTypeWriter>().To<ConventionalVehicleType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetConventionalVehicleType());
+
+ Bind<IXmlTypeWriter>().To<HevIepcSVehicleType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevIepcSVehicleType());
+
+ Bind<IXmlTypeWriter>().To<HevPxVehicleType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevPxVehicleType());
+
+ Bind<IXmlTypeWriter>().To<HevS2VehicleType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevS2VehicleType());
+
+ Bind<IXmlTypeWriter>().To<HevS3VehicleType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevS3VehicleType());
+
+ Bind<IXmlTypeWriter>().To<HevS4VehicleType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevS4VehicleType());
+
+ Bind<IXmlTypeWriter>().To<IepcVehicleType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetIepcVehicleType());
+
+ Bind<IXmlTypeWriter>().To<PevE2VehicleType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPevE2VehicleType());
+
+ Bind<IXmlTypeWriter>().To<PevE3VehicleType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPevE3VehicleType());
+
+ Bind<IXmlTypeWriter>().To<PevE4VehicleType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPevE4VehicleType());
+
+ Bind<IXmlTypeWriter>().To<PevIEPCVehicleType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPevIEPCVehicleType());
+
+ Bind<IXmlTypeWriter>().To<ExemptedVehicleType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetExemptedVehicleType());
+
+ #endregion
+
+
+ #region Component Group
+
+ Bind<IXmlTypeWriter>().To<ConventionalComponentVIFType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetConventionalComponentType());
+
+ Bind<IXmlTypeWriter>().To<HevIepcSComponentVIFType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevIepcSComponentVIFType());
+
+ Bind<IXmlTypeWriter>().To<HevPxComponentVIFType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevPxComponentVIFType());
+
+ Bind<IXmlTypeWriter>().To<HevS2ComponentVIFType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevS2ComponentVIFType());
+
+ Bind<IXmlTypeWriter>().To<HevS3ComponentVIFType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevS3ComponentVIFType());
+
+ Bind<IXmlTypeWriter>().To<HevS4ComponentVIFType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevS4ComponentVIFType());
+
+ Bind<IXmlTypeWriter>().To<PevE2ComponentVIFType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPevE2ComponentVIFType());
+
+ Bind<IXmlTypeWriter>().To<PevE3ComponentVIFType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPevE3ComponentVIFType());
+
+ Bind<IXmlTypeWriter>().To<PevE4ComponentVIFType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPevE4ComponentVIFType());
+
+ Bind<IXmlTypeWriter>().To<IepcComponentVIFType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPevIEPCComponentVIFType());
+
+ #endregion
+
+ #region Vehicle Group
+
+ Bind<IReportOutputGroup>().To<ConventionalVIFVehicleParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetConventionalVehicleGroup());
+
+ Bind<IReportOutputGroup>().To<PrimaryBusGeneralParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPrimaryBusGeneralParameterGroup());
+
+ Bind<IReportOutputGroup>().To<PrimaryBusChassisParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPrimaryBusChassisParameterGroup());
+
+ Bind<IReportOutputGroup>().To<PrimaryBusRetarderParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPrimaryBusRetarderParameterGroup());
+
+ Bind<IReportOutputGroup>().To<PrimaryBusXeVParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPrimaryBusXevParameterGroup());
+
+ Bind<IReportOutputGroup>().To<HevIepcSVehicleParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevIepcSVehicleParameterGroup());
+
+ Bind<IReportOutputGroup>().To<HevSxVehicleParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevSxVehicleParameterGroup());
+
+ Bind<IReportOutputGroup>().To<IepcVehicleParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetIepcVehicleParameterGroup());
+
+ Bind<IReportOutputGroup>().To<PevExVehicleParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPevExVehicleParmeterGroup());
+
+ Bind<IReportOutputGroup>().To<PevIEPCVehicleParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPevIEPCVehicleParmeterGroup());
+
+ Bind<IReportOutputGroup>().To<HevPxVehicleParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevPxVehicleParameterGroup());
+
+ Bind<IReportOutputGroup>().To<ExemptedVehicleParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetExemptedVehicleParameterGroup());
+
+ #endregion
+
+
+ #region Components
+
+ Bind<IVIFFAdasType>().To<VIFConventionalAdasType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetConventionalADASType());
+
+ Bind<IVIFFAdasType>().To<VIFHEVAdasType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHEVADASType());
+
+ Bind<IVIFFAdasType>().To<VIFPEVAdasType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPEVADASType());
+
+ Bind<IVIFFAdasType>().To<VIFIEPCAdasType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetIEPCADASType());
+
+ Bind<IXmlTypeWriter>().To<VIFAngleDriveType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetAngelDriveType());
+
+ Bind<IXmlTypeWriter>().To<VIFAuxiliaryType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetAuxiliaryType());
+
+ Bind<IXmlTypeWriter>().To<VIFAuxiliaryHevSType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetAuxiliaryHevSType());
+
+ Bind<IXmlTypeWriter>().To<VIFAuxiliaryIEPC_SType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetAuxiliaryIEPC_SType());
+
+ Bind<IXmlTypeWriter>().To<VIFAuxiliaryHevPType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetAuxiliaryHevPType());
+
+ Bind<IXmlTypeWriter>().To<VIFAuxiliaryIEPCType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetAuxiliaryIEPCType());
+
+ Bind<IXmlTypeWriter>().To<VIFAuxiliaryPEVType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetAuxiliaryPEVType());
+
+ Bind<IXmlTypeWriter>().To<VIFAxlegearType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetAxlegearType());
+
+ Bind<IXmlTypeWriter>().To<VIFRetarderType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetRetarderType());
+
+ Bind<IXmlTypeWriter>().To<VIFAxleWheelsType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetAxleWheelsType());
+
+ Bind<IXmlTypeWriter>().To<VIFBoostingLimitationsType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetBoostingLimitationsType());
+
+ Bind<IXmlTypeWriter>().To<VIFElectricEnergyStorageType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetElectricEnergyStorageType());
+
+ Bind<IXmlTypeWriter>().To<VIFElectricMachineGENType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetElectricMachineGENType());
+
+ Bind<IXmlElectricMachineSystemType>().To<XmlElectricMachineSystemMeasuredType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetElectricMachineSystemType());
+
+ Bind<IXmlTypeWriter>().To<VIFElectricMachineType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetElectricMachineType());
+
+ Bind<IXmlTypeWriter>().To<VIFElectricMotorTorqueLimitsType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetElectricMotorTorqueLimitsType());
+
+ Bind<IXmlTypeWriter>().To<VIFEngineType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetEngineType());
+
+ Bind<IXmlTypeWriter>().To<VIFTorqueConverterType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetTorqueConvertType());
+
+ Bind<IXmlTypeWriter>().To<VIFIepcType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetIepcType());
+
+ Bind<IXmlTypeWriter>().To<VIFTorqueLimitsType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetTorqueLimitsType());
+
+ Bind<IXmlTypeWriter>().To<VIFTransmissionType>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetTransmissionType());
+
+ #endregion
+ }
+
+
+ private bool AccessedViaVIFFactory(IRequest request)
+ {
+ if (request.ParentRequest == null)
+ {
+ return false;
+ }
+ return typeof(IVIFReportFactory).IsAssignableFrom(request.ParentRequest.Service);
+ }
+
+
+ private bool AccessedViaInterimVIFFactory(IRequest request)
+ {
+ if (request.ParentRequest == null) {
+ return false;
+ }
+ return typeof(IVIFReportInterimFactory).IsAssignableFrom(request.ParentRequest.Service);
+ }
+
+ #endregion
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleInformationFile/VehicleInformationFile_Interim.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleInformationFile/VehicleInformationFile_Interim.cs
new file mode 100644
index 0000000000000000000000000000000000000000..287f6703d2d5e8d2b4c0664a1155444856328523
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleInformationFile/VehicleInformationFile_Interim.cs
@@ -0,0 +1,307 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using System.Xml.Linq;
+using TUGraz.VectoCommon.Hashing;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.Utils;
+using TUGraz.VectoHashing;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.VIFReport
+{
+ public abstract class AbstractVehicleInformationFileCompleted : IXMLMultistepIntermediateReport
+ {
+ protected XNamespace VIF = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1";
+
+ protected XNamespace xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
+ protected XNamespace di = "http://www.w3.org/2000/09/xmldsig#";
+
+ protected IPrimaryVehicleInformationInputDataProvider _primaryVehicleInputData;
+ protected IList<IManufacturingStageInputData> _manufacturingStageInputData;
+ protected IManufacturingStageInputData _consolidatedInputData;
+ protected IVehicleDeclarationInputData _vehicleInputData;
+
+ protected XElement _primaryVehicle;
+ protected List<XElement> _manufacturingStages;
+ protected List<XAttribute> _namespaceAttributes;
+
+ protected readonly IVIFReportInterimFactory _vifFactory;
+ protected IMultistageVIFInputData _inputData;
+
+ protected AbstractVehicleInformationFileCompleted(IVIFReportInterimFactory vifReportFactory)
+ {
+ _manufacturingStages = new List<XElement>();
+ _namespaceAttributes = new List<XAttribute>();
+
+ _vifFactory = vifReportFactory;
+ }
+
+ #region Implementation of IXMLVehicleInformationFile
+
+
+ public void Initialize(VectoRunData modelData)
+ {
+ //InitializeVehicleData(modelData.MultistageVIFInputData);
+
+ _primaryVehicleInputData = modelData.MultistageVIFInputData.MultistageJobInputData.JobInputData.PrimaryVehicle;
+ _manufacturingStageInputData = modelData.MultistageVIFInputData.MultistageJobInputData.JobInputData.ManufacturingStages;
+ _consolidatedInputData = modelData.MultistageVIFInputData.MultistageJobInputData.JobInputData.ConsolidateManufacturingStage;
+ _vehicleInputData = modelData.MultistageVIFInputData.VehicleInputData;
+
+ _inputData = modelData.MultistageVIFInputData;
+
+ SetInputXMLData(_primaryVehicleInputData.Vehicle.XMLSource);
+ }
+
+ private void SetInputXMLData(XmlNode primeVehicleNode)
+ {
+ var nodes = GetDocumentNodes(primeVehicleNode);
+ var documentNode = GetDocumentNode(nodes);
+ SetXmlNamespaceAttributes(nodes);
+
+ var xDocument = XElement.Parse(documentNode.InnerXml);
+ foreach (var xElement in xDocument.Descendants()) {
+ if (xElement.Name.LocalName == XMLNames.Bus_PrimaryVehicle)
+ _primaryVehicle = xElement;
+ else if (xElement.Name.LocalName == XMLNames.ManufacturingStep)
+ _manufacturingStages.Add(xElement);
+ }
+
+ if (_manufacturingStages.Count == 0)
+ _manufacturingStages = null;
+ }
+
+ private List<XmlNode> GetDocumentNodes(XmlNode primeVehicleNode)
+ {
+ var nodes = new List<XmlNode>();
+ NodeParentSearch(primeVehicleNode, nodes);
+ return nodes;
+ }
+
+ private XmlNode GetDocumentNode(List<XmlNode> nodes)
+ {
+ if (nodes == null || nodes.Count == 0)
+ return null;
+
+ foreach (var node in nodes) {
+ if (node.NodeType == XmlNodeType.Document)
+ return node;
+ }
+ return null;
+ }
+
+ private void SetXmlNamespaceAttributes(List<XmlNode> nodes)
+ {
+ if (nodes == null || nodes.Count == 0)
+ return;
+ XmlAttributeCollection namespaceAttributes = null;
+ foreach (var node in nodes) {
+ if (node.LocalName == XMLNames.VectoOutputMultistep) {
+ namespaceAttributes = node.Attributes;
+ break;
+ }
+ }
+
+ if (namespaceAttributes == null || namespaceAttributes.Count == 0)
+ return;
+
+ foreach (XmlAttribute attribute in namespaceAttributes) {
+ if (string.IsNullOrEmpty(attribute.Prefix))
+ _namespaceAttributes.Add(new XAttribute(attribute.LocalName, attribute.Value));
+ else if (attribute.Prefix == "xmlns")
+ _namespaceAttributes.Add(new XAttribute(XNamespace.Xmlns + attribute.LocalName, attribute.Value));
+ else if (attribute.Prefix == "xsi")
+ _namespaceAttributes.Add(new XAttribute(xsi + attribute.LocalName, attribute.Value));
+ }
+ }
+
+ private void NodeParentSearch(XmlNode currentNode, List<XmlNode> nodes)
+ {
+ if (currentNode?.ParentNode == null || nodes == null)
+ return;
+
+ nodes.Add(currentNode.ParentNode);
+ NodeParentSearch(currentNode.ParentNode, nodes);
+ }
+
+ public XDocument Report { get; protected set; }
+
+ public void GenerateReport()
+ {
+ var retVal = new XDocument();
+ retVal.Add(
+ new XElement(VIF + XMLNames.VectoOutputMultistep,
+ _namespaceAttributes,
+ _primaryVehicle,
+ _manufacturingStages,
+ GenerateInputManufacturingStage()
+ )
+ );
+ Report = retVal;
+ }
+
+ #endregion
+
+ protected abstract XElement GenerateInputManufacturingStage();
+ }
+
+ // ----------------------------------
+
+ internal abstract class VehicleInformationFile_InterimStep : AbstractVehicleInformationFileCompleted
+ {
+ protected VehicleInformationFile_InterimStep(IVIFReportInterimFactory vifFactory) : base(vifFactory) { }
+
+ protected override XElement GenerateInputManufacturingStage()
+ {
+ var multistageId = $"{VectoComponents.VectoManufacturingStep.HashIdPrefix()}{GetGUID()}";
+ var vehicleId = $"{VectoComponents.Vehicle.HashIdPrefix()}{GetGUID()}";
+
+ var stage = new XElement(VIF + XMLNames.ManufacturingStep,
+ new XAttribute(XMLNames.ManufacturingStep_StepCount, GetStageNumber()),
+ new XAttribute(XNamespace.Xmlns + "xsi", xsi),
+ new XElement(VIF + XMLNames.Report_DataWrap,
+ new XAttribute(xsi + XMLNames.Attr_Type, "BusManufacturingStepDataType"),
+ new XAttribute(XMLNames.Component_ID_Attr, multistageId),
+ GetHashPreviousStepElement(),
+ GetVehicleElement(),
+ XMLHelper.GetApplicationInfo(VIF)));
+
+ var sigXElement = GetSignatureElement(stage);
+ stage.LastNode.Parent.Add(sigXElement);
+ return stage;
+ }
+
+ protected abstract XElement GetVehicleElement();
+
+ private XElement GetHashPreviousStepElement()
+ {
+ DigestData digitData;
+ if (_manufacturingStageInputData == null || _manufacturingStageInputData.Count == 0) {
+ digitData = _primaryVehicleInputData.VehicleSignatureHash;
+ } else {
+ digitData = _manufacturingStageInputData.Last().Signature;
+ }
+
+ return new XElement(VIF + "HashPreviousStep",
+ digitData.ToXML(di));
+ }
+
+ private XElement GetSignatureElement(XElement stage)
+ {
+ var stream = new MemoryStream();
+ var w = new XmlTextWriter(stream, Encoding.UTF8);
+ stage.WriteTo(w);
+ w.Flush();
+ stream.Seek(0, SeekOrigin.Begin);
+
+ return new XElement(VIF + XMLNames.DI_Signature,
+ VectoHash.Load(stream).ComputeXmlHash
+ (VectoHash.DefaultCanonicalizationMethod, VectoHash.DefaultDigestMethod)
+ );
+ }
+
+ private int GetStageNumber()
+ {
+ if (_manufacturingStageInputData == null || _manufacturingStageInputData.Count == 0)
+ return 2;
+
+ return _manufacturingStageInputData.Last().StepCount + 1;
+ }
+
+ protected string GetGUID()
+ {
+ return Guid.NewGuid().ToString("n").Substring(0, 20);
+ }
+ }
+
+ // ----------------------------------
+
+ internal class Conventional_CompletedBus_VIF : VehicleInformationFile_InterimStep
+ {
+ public Conventional_CompletedBus_VIF(IVIFReportInterimFactory vifFactory) : base(vifFactory) { }
+
+
+ #region Overrides of VehicleInformationFile_InterimStep
+
+ protected override XElement GetVehicleElement()
+ {
+ return _vifFactory.GetConventionalVehicleType().GetElement(_inputData);
+ }
+
+ #endregion
+ }
+
+ // ----------------------------------
+
+ internal class HEV_CompletedBus_VIF : VehicleInformationFile_InterimStep
+ {
+ public HEV_CompletedBus_VIF(IVIFReportInterimFactory vifFactory) : base(vifFactory) { }
+
+
+ #region Overrides of VehicleInformationFile_InterimStep
+
+ protected override XElement GetVehicleElement()
+ {
+ return _vifFactory.GetHEVVehicleType().GetElement(_inputData);
+ }
+
+ #endregion
+ }
+
+ // ----------------------------------
+
+ internal class PEV_CompletedBus_VIF : VehicleInformationFile_InterimStep
+ {
+ public PEV_CompletedBus_VIF(IVIFReportInterimFactory vifFactory) : base(vifFactory) { }
+
+
+ #region Overrides of VehicleInformationFile_InterimStep
+
+ protected override XElement GetVehicleElement()
+ {
+ return _vifFactory.GetPEVVehicleType().GetElement(_inputData);
+ }
+
+ #endregion
+ }
+
+ // ----------------------------------
+
+ internal class IEPC_CompletedBus_VIF : VehicleInformationFile_InterimStep
+ {
+ public IEPC_CompletedBus_VIF(IVIFReportInterimFactory vifFactory) : base(vifFactory) { }
+
+
+ #region Overrides of VehicleInformationFile_InterimStep
+
+ protected override XElement GetVehicleElement()
+ {
+ return _vifFactory.GetIEPCVehicleType().GetElement(_inputData);
+ }
+
+ #endregion
+ }
+
+ // ----------------------------------
+
+ internal class Exempted_CompletedBus_VIF : VehicleInformationFile_InterimStep
+ {
+ public Exempted_CompletedBus_VIF(IVIFReportInterimFactory vifFactory) : base(vifFactory) { }
+
+
+ #region Overrides of VehicleInformationFile_InterimStep
+
+ protected override XElement GetVehicleElement()
+ {
+ return _vifFactory.GetExemptedVehicleType().GetElement(_inputData);
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleInformationFile/VehicleInformationFile_Primary.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleInformationFile/VehicleInformationFile_Primary.cs
new file mode 100644
index 0000000000000000000000000000000000000000..9ab107c7e8db4d9b64912670f38fda2ba5d17e01
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleInformationFile/VehicleInformationFile_Primary.cs
@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TUGraz.VectoCommon.InputData;
+
+namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.VIFReport
+{
+ internal abstract class VehicleInformationFile_PrimaryStep : AbstractVehicleInformationFile
+ {
+ private string _outputDataType;
+
+ public VehicleInformationFile_PrimaryStep(IVIFReportFactory vifFactory) : base(vifFactory)
+ {
+ _tns = VIF;
+ }
+
+ #region Overrides of AbstractVIFReport
+
+ public override string OutputDataType => _outputDataType;
+
+
+
+ #endregion
+ }
+
+ internal class Conventional_PrimaryBus_VIF : VehicleInformationFile_PrimaryStep
+ {
+ public Conventional_PrimaryBus_VIF(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ protected override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _vifFactory.GetConventionalVehicleType().GetElement(inputData);
+ }
+ }
+
+ internal class HEV_Px_PrimaryBus_VIF : VehicleInformationFile_PrimaryStep
+ {
+ public HEV_Px_PrimaryBus_VIF(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ protected override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _vifFactory.GetHevPxVehicleType().GetElement(inputData);
+ }
+ }
+
+ internal class HEV_S2_PrimaryBus_VIF : VehicleInformationFile_PrimaryStep
+ {
+ public HEV_S2_PrimaryBus_VIF(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ protected override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _vifFactory.GetHevS2VehicleType().GetElement(inputData);
+ }
+ }
+
+ internal class HEV_S3_PrimaryBus_VIF : VehicleInformationFile_PrimaryStep
+ {
+ public HEV_S3_PrimaryBus_VIF(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ protected override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _vifFactory.GetHevS3VehicleType().GetElement(inputData);
+ }
+ }
+
+ internal class HEV_S4_PrimaryBus_VIF : VehicleInformationFile_PrimaryStep
+ {
+ public HEV_S4_PrimaryBus_VIF(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ protected override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _vifFactory.GetHevS4VehicleType().GetElement(inputData);
+ }
+ }
+
+ internal class HEV_IEPC_S_PrimaryBus_VIF : VehicleInformationFile_PrimaryStep
+ {
+ public HEV_IEPC_S_PrimaryBus_VIF(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ protected override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _vifFactory.GetHevIepcSVehicleType().GetElement(inputData);
+ }
+ }
+
+ internal class PEV_E2_PrimaryBus_VIF : VehicleInformationFile_PrimaryStep
+ {
+ public PEV_E2_PrimaryBus_VIF(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ protected override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _vifFactory.GetPevE2VehicleType().GetElement(inputData);
+ }
+ }
+
+ internal class PEV_E3_PrimaryBus_VIF : VehicleInformationFile_PrimaryStep
+ {
+ public PEV_E3_PrimaryBus_VIF(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ protected override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _vifFactory.GetPevE3VehicleType().GetElement(inputData);
+ }
+ }
+
+ internal class PEV_E4_PrimaryBus_VIF : VehicleInformationFile_PrimaryStep
+ {
+ public PEV_E4_PrimaryBus_VIF(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ protected override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _vifFactory.GetPevE4VehicleType().GetElement(inputData);
+ }
+ }
+
+ internal class PEV_IEPC_PrimaryBus_VIF : VehicleInformationFile_PrimaryStep
+ {
+ public PEV_IEPC_PrimaryBus_VIF(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ protected override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _vifFactory.GetPevIEPCVehicleType().GetElement(inputData);
+ }
+ }
+
+ internal class Exempted_PrimaryBus_VIF : VehicleInformationFile_PrimaryStep
+ {
+ public Exempted_PrimaryBus_VIF(IVIFReportFactory vifFactory) : base(vifFactory) { }
+
+ protected override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+ {
+ Vehicle = _vifFactory.GetExemptedVehicleType().GetElement(inputData);
+ }
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLExemptedPrimaryBusVehicleReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLExemptedPrimaryBusVehicleReport.cs
index 5529ff1f3722a86225c7160cf69337ba8e29935c..091296243658f607321b5a0de2fec571b44952c6 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLExemptedPrimaryBusVehicleReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLExemptedPrimaryBusVehicleReport.cs
@@ -20,7 +20,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
VehiclePart.Add(
new XAttribute(xsi + XMLNames.Attr_Type, "VehicleExemptedPrimaryBusType"),
new XElement(tns + XMLNames.ManufacturerPrimaryVehicle, modelData.VehicleData.Manufacturer),
- new XElement(tns + XMLNames.ManufacturerAddressPrimaryVehicle, modelData.VehicleData.ManufacturerAddress),
+ new XElement(tns + XMLNames.ManufacturerAddress, modelData.VehicleData.ManufacturerAddress),
new XElement(tns + XMLNames.Component_Model, modelData.VehicleData.ModelName),
new XElement(tns + XMLNames.Vehicle_VIN, modelData.VehicleData.VIN),
new XElement(tns + XMLNames.Component_Date, XmlConvert.ToString(modelData.VehicleData.Date, XmlDateTimeSerializationMode.Utc)),
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
index 79123dbdb9a98ce15cb4ede01a00e544e05c7356..8014f54f467732810739382b03926e1f6967addc 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
@@ -64,7 +64,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
}
}
- public class XMLMultistageBusReport: IXMLMultistageReport
+ public class XMLMultistageBusReport: IXMLMultistepIntermediateReport
{
protected XNamespace tns = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1";
protected XNamespace di = "http://www.w3.org/2000/09/xmldsig#";
@@ -89,6 +89,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
public XMLMultistageBusReport()
{
+ throw new VectoException("do not use anymore!");
_manufacturingStages = new List<XElement>();
_namespaceAttributes = new List<XAttribute>();
}
@@ -217,7 +218,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
private XElement GenerateInputManufacturingStage()
{
var multistageId = $"{VectoComponents.VectoManufacturingStep.HashIdPrefix()}{GetGUID()}";
- var vehicleId = $"{VectoComponents.Vehicle.HashIdPrefix()}{GetGUID()}";
+ var vehicleId = $"{VectoComponents.VectoInterimVehicleInformation.HashIdPrefix()}{GetGUID()}";
var stage = new XElement(tns + XMLNames.ManufacturingStep,
new XAttribute(XMLNames.ManufacturingStep_StepCount, GetStageNumber()),
@@ -327,7 +328,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
return new XElement(
v24 + XMLNames.Vehicle_ADAS,
- new XAttribute(xsi + "type", "ADAS_Conventional_Type"),
+ new XAttribute(xsi + XMLNames.XSIType, "ADAS_Conventional_Type"),
new XElement(v24 + XMLNames.Vehicle_ADAS_EngineStopStart, adasData.EngineStopStart),
new XElement(v24 + XMLNames.Vehicle_ADAS_EcoRollWithoutEngineStop, adasData.EcoRoll.WithoutEngineStop()),
new XElement(v24 + XMLNames.Vehicle_ADAS_EcoRollWithEngineStopStart, adasData.EcoRoll.WithEngineStop()),
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs
index be8dd7cabebc8a34ac752292d369fee5821ee3c5..4f07df1870f816006c89b9af2d5d1bd18b8683fe 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs
@@ -25,7 +25,7 @@ using TUGraz.VectoHashing;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile
{
- public class XMLPrimaryBusVehicleReport : IXMLPrimaryVehicleReport
+ public class XMLPrimaryBusVehicleReport : IXMLVehicleInformationFile
{
public XNamespace Tns => tns;
protected XNamespace tns = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1";
@@ -47,6 +47,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
public XMLPrimaryBusVehicleReport()
{
+ throw new NotImplementedException("use new implementation...");
VehiclePart = new XElement(tns + XMLNames.Component_Vehicle);
Results = new XElement(tns + XMLNames.Report_Results);
}
@@ -80,12 +81,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
{
var results = new XElement(Results);
results.AddFirst(new XElement(tns + XMLNames.Report_Result_Status, _allSuccess ? "success" : "error"));
- var vehicleId = $"{VectoComponents.Vehicle.HashIdPrefix()}{GetGUID()}";
+ var vehicleId = $"{VectoComponents.VectoPrimaryVehicleInformation.HashIdPrefix()}{GetGUID()}";
var primaryVehicle = new XElement(tns + XMLNames.Bus_PrimaryVehicle,
new XElement(tns + XMLNames.Report_DataWrap,
new XAttribute(XMLNames.Component_ID_Attr, vehicleId),
- new XAttribute(xsi + "type", "PrimaryVehicleDataType"),
+ new XAttribute(xsi + XMLNames.XSIType, "PrimaryVehicleDataType"),
new XAttribute("xmlns", tns),
VehiclePart,
InputDataIntegrity,
@@ -132,9 +133,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
public virtual void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
VehiclePart.Add(
- new XAttribute(xsi + "type", "ConventionalVehicleVIFType"),
+ new XAttribute(xsi + XMLNames.XSIType, "ConventionalVehicleVIFType"),
new XElement(tns + XMLNames.ManufacturerPrimaryVehicle, modelData.VehicleData.Manufacturer),
- new XElement(tns + XMLNames.ManufacturerAddressPrimaryVehicle, modelData.VehicleData.ManufacturerAddress),
+ new XElement(tns + XMLNames.ManufacturerAddress, modelData.VehicleData.ManufacturerAddress),
new XElement(tns + XMLNames.Component_Model, modelData.VehicleData.ModelName),
new XElement(tns + XMLNames.Vehicle_VIN, modelData.VehicleData.VIN),
new XElement(tns + XMLNames.Component_Date, XmlConvert.ToString(modelData.VehicleData.Date, XmlDateTimeSerializationMode.Utc)),
@@ -166,7 +167,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
return new XElement(
tns + XMLNames.Vehicle_ADAS,
new XAttribute(
- xsi + "type",
+ xsi + XMLNames.XSIType,
$"{adasData.InputData.XMLSource.SchemaInfo.SchemaType.QualifiedName.Name}"),
new XAttribute("xmlns", ns),
XElement.Parse(adasData.InputData.XMLSource.OuterXml).Elements()
@@ -186,7 +187,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
return new XElement(
tns + XMLNames.Vehicle_TorqueLimits,
new XAttribute(
- xsi + "type", $"{tcLimits.SchemaInfo.SchemaType.QualifiedName.Name}"),
+ xsi + XMLNames.XSIType, $"{tcLimits.SchemaInfo.SchemaType.QualifiedName.Name}"),
new XAttribute("xmlns", ns.NamespaceName),
XElement.Parse(tcLimits.OuterXml).Elements()
);
@@ -196,7 +197,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
{
return new XElement(
tns + XMLNames.Vehicle_Components,
- new XAttribute(xsi + "type", "Vehicle_Conventional_ComponentsVIFType"),
+ new XAttribute(xsi + XMLNames.XSIType, "Vehicle_Conventional_ComponentsVIFType"),
GetEngineDescription(modelData.EngineData, fuelModes),
GetGearboxDescription(modelData.GearboxData),
GetTorqueConverterDescription(modelData.GearboxData.TorqueConverterData),
@@ -214,7 +215,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
return new XElement(tns + XMLNames.Component_TorqueConverter,
new XElement(tns + XMLNames.Report_DataWrap,
- new XAttribute(xsi + "type", "TorqueConverterDataVIFType"),
+ new XAttribute(xsi + XMLNames.XSIType, "TorqueConverterDataVIFType"),
GetCommonDescription(torqueConverter),
new XElement(tns + XMLNames.Component_AppVersion, torqueConverter.AppVersion)
));
@@ -228,7 +229,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
return new XElement(tns + XMLNames.Component_AxleWheels,
new XElement(tns + XMLNames.Report_DataWrap,
- new XAttribute(xsi + "type", "AxleWheelsDataVIFType"),
+ new XAttribute(xsi + XMLNames.XSIType, "AxleWheelsDataVIFType"),
new XElement(tns + XMLNames.AxleWheels_Axles,
GetAxlesNodes(axlesNodes)
)));
@@ -243,8 +244,8 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
var axleNumber = axleNode.Attributes[XMLNames.AxleWheels_Axles_Axle_AxleNumber_Attr].Value;
var axle = new XElement(tns + XMLNames.AxleWheels_Axles_Axle,
new XAttribute(XMLNames.AxleWheels_Axles_Axle_AxleNumber_Attr, axleNumber),
- new XAttribute(XNamespace.Xmlns + "v2.0", v20),
- new XAttribute(xsi + "type", "v2.0:AxleDataDeclarationType"),
+ //new XAttribute(XNamespace.Xmlns + "v2.0", v20),
+ new XAttribute(xsi + XMLNames.XSIType, "AxleDataDeclarationType"),
XElement.Parse(axleNode.OuterXml.Replace("xsi:type=\"TyreDataDeclarationType\"", "xsi:type=\"v2.0:TyreDataDeclarationType\"")).Elements());
axles.Add(axle);
@@ -265,7 +266,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
var result = new XElement(tns + XMLNames.Component_Auxiliaries,
new XElement(tns + XMLNames.ComponentDataWrapper,
- new XAttribute(xsi + "type", "AuxiliaryDataVIFType"),
+ new XAttribute(xsi + XMLNames.XSIType, "AUX_Conventional_PrimaryBusType"),
//new XAttribute("xmlns", tns.NamespaceName), //automically created
new XElement(tns + XMLNames.BusAux_Fan, new XElement(tns + XMLNames.BusAux_Technology, aux.FanTechnology)),
GetSteeringPumpElement(aux.SteeringPumpTechnology),
@@ -415,7 +416,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
new XElement(tns + XMLNames.Gearbox_TransmissionType, gearboxData.Type.ToXMLFormat()),
new XElement(
tns + XMLNames.Gearbox_Gears,
- new XAttribute(xsi + "type", "TransmissionGearsVIFType"),
+ new XAttribute(xsi + XMLNames.XSIType, "TransmissionGearsVIFType"),
gearboxData.Gears.Select(
x =>
new XElement(
@@ -468,11 +469,11 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
new XElement(
tns + XMLNames.Engine_WHRType,
new XElement(
- v23 + XMLNames.Engine_WHR_MechanicalOutputICE, (engineData.WHRType & WHRType.MechanicalOutputICE) != 0),
+ tns + XMLNames.Engine_WHR_MechanicalOutputICE, (engineData.WHRType & WHRType.MechanicalOutputICE) != 0),
new XElement(
- v23 + XMLNames.Engine_WHR_MechanicalOutputIDrivetrain,
+ tns + XMLNames.Engine_WHR_MechanicalOutputIDrivetrain,
(engineData.WHRType & WHRType.MechanicalOutputDrivetrain) != 0),
- new XElement(v23 + XMLNames.Engine_WHR_ElectricalOutput, (engineData.WHRType & WHRType.ElectricalOutput) != 0)
+ new XElement(tns + XMLNames.Engine_WHR_ElectricalOutput, (engineData.WHRType & WHRType.ElectricalOutput) != 0)
),
fuels
);
@@ -486,7 +487,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
tns + elementName,
new XElement(
tns + XMLNames.ComponentDataWrapper,
- new XAttribute(xsi + "type", dataType),
+ new XAttribute(xsi + XMLNames.XSIType, dataType),
commonElements,
specificElements));
}
@@ -544,7 +545,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
new XAttribute(
XMLNames.Report_Result_Status_Attr,
resultEntry.Status == VectoRun.Status.Success ? "success" : "error"),
- new XElement(tns + XMLNames.Report_Vehicle_VehicleGroup, resultEntry.VehicleClass.GetClassNumber()),
+ new XElement(tns + XMLNames.Report_Results_PrimaryVehicleSubgroup, resultEntry.VehicleClass.GetClassNumber()),
new XElement(tns + XMLNames.Report_Result_Mission, resultEntry.Mission.ToXMLFormat()),
new XElement(
tns + XMLNames.Report_ResultEntry_SimulationParameters,
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/AbstractComponentWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/AbstractComponentWriter.cs
index c5734c20a941ecc764680d429908ef1f1866004a..d7aa6efde1c45ed942b7f75c650cd841d6ef6968 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/AbstractComponentWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/AbstractComponentWriter.cs
@@ -162,7 +162,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering.Writer
{
var xsns = Writer.RegisterNamespace(XMLDefinitions.XML_SCHEMA_NAMESPACE);
return new XAttribute(
- xsns + "type", $"{Writer.GetNSPrefix(ComponentDataNamespace.NamespaceName)}:{XMLDataType}");
+ xsns + XMLNames.XSIType, $"{Writer.GetNSPrefix(ComponentDataNamespace.NamespaceName)}:{XMLDataType}");
}
public virtual object[] WriteXML(IAdvancedDriverAssistantSystemsEngineering inputData)
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/XMLEngineeringWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/XMLEngineeringWriter.cs
index 7a264233edcb4550215c763921976fdbc3a37e38..dd0542a3e98f2369cc732aede44e81f4da7c271f 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/XMLEngineeringWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/XMLEngineeringWriter.cs
@@ -114,7 +114,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Engineering
new XElement(
v10Inp + XMLNames.VectoComponentEngineering,
new XAttribute(
- xsns + "type", $"{GetNSPrefix(v10Def.NamespaceName)}:VectoComponentEngineeringType"),
+ xsns + XMLNames.XSIType, $"{GetNSPrefix(v10Def.NamespaceName)}:VectoComponentEngineeringType"),
GetNamespaceAttributes(),
GetSchemaLocations(),
new XElement(
diff --git a/VectoCore/VectoCore/OutputData/XML/GroupWriter/Declaration/Vehicle/CompletedBus/CompletedBusDimensionsWriter.cs b/VectoCore/VectoCore/OutputData/XML/GroupWriter/Declaration/Vehicle/CompletedBus/CompletedBusDimensionsWriter.cs
index b5e32a7a021ee7eb94a07d0b2439e7d55c4de491..f859fc1bf2953cef3cf42fac0f948dcfa27e52fa 100644
--- a/VectoCore/VectoCore/OutputData/XML/GroupWriter/Declaration/Vehicle/CompletedBus/CompletedBusDimensionsWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/GroupWriter/Declaration/Vehicle/CompletedBus/CompletedBusDimensionsWriter.cs
@@ -18,10 +18,10 @@ namespace TUGraz.VectoCore.OutputData.XML.GroupWriter.Declaration.Vehicle.Comple
return new XElement[] {
new XElement(writerNamespace + XMLNames.Bus_HeightIntegratedBody,
vehicle.Height.ConvertToMilliMeter()),
- new XElement(writerNamespace + XMLNames.Bus_VehicleLength, vehicle.Length.ConvertToMilliMeter()),
- new XElement(writerNamespace + XMLNames.Bus_VehicleWidth, vehicle.Width.ConvertToMilliMeter()),
+ new XElement(writerNamespace + XMLNames.Bus_VehicleLength, vehicle.Length.ConvertToMilliMeter().ToXMLFormat(0)),
+ new XElement(writerNamespace + XMLNames.Bus_VehicleWidth, vehicle.Width.ConvertToMilliMeter().ToXMLFormat(0)),
new XElement(writerNamespace + XMLNames.Bus_EntranceHeight,
- vehicle.EntranceHeight.ConvertToMilliMeter())
+ vehicle.EntranceHeight.ConvertToMilliMeter().ToXMLFormat(0))
};
}
diff --git a/VectoCore/VectoCore/OutputData/XML/GroupWriter/XMLGroupWriterNinjectModule.cs b/VectoCore/VectoCore/OutputData/XML/GroupWriter/XMLGroupWriterNinjectModule.cs
index 8b46e43aa233bfcba2c95f6a080357daa2e20ff7..084c13b344a0414f3707190a63d4f11e788af428 100644
--- a/VectoCore/VectoCore/OutputData/XML/GroupWriter/XMLGroupWriterNinjectModule.cs
+++ b/VectoCore/VectoCore/OutputData/XML/GroupWriter/XMLGroupWriterNinjectModule.cs
@@ -22,7 +22,7 @@ namespace TUGraz.VectoCore.OutputData.XML.GroupWriter
Bind<IGroupWriterFactory>().ToFactory(() => new UseFirstTwoArgumentsAsInstanceProvider(1, false)).InSingletonScope();
///Vehicle V2_10_2
- var v2102 = XMLDeclarationNamespaces.v2_10_2;
+ var v2102 = XMLDeclarationNamespaces.V24;
Bind<IVehicleDeclarationGroupWriter>().To<CompletedBusGeneralParametersWriterV2_10_2>().InSingletonScope().
Named(GetName(GroupNames.Vehicle_CompletedBus_GeneralParametersSequenceGroup, v2102));
Bind<IVehicleDeclarationGroupWriter>().To<CompletedBusParametersWriterV2_10_2>().InSingletonScope().
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationNamespaces.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationNamespaces.cs
index fb74d2980b0303cad5bb2489ef9e8534637d76f8..888ff037c5950917b4320435ab026a098f2f991c 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationNamespaces.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationNamespaces.cs
@@ -13,14 +13,15 @@ namespace TUGraz.VectoCore.OutputData.XML
public static readonly XNamespace Xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
public static readonly XNamespace Tns = "urn:tugraz:ivt:VectoAPI:DeclarationInput";
public static readonly XNamespace Tns_v20 = Tns.NamespaceName + ":v2.0";
- public static readonly XNamespace V26 = DeclarationDefinition + ":DEV:v2.6";
+ //public static readonly XNamespace V26 = DeclarationDefinition + ":DEV:v2.6";
public static readonly XNamespace V21 = DeclarationDefinition + ":v2.1";
- public static readonly XNamespace V23 = DeclarationDefinition + ":DEV:v2.3";
+ public static readonly XNamespace V23 = DeclarationDefinition + ":v2.3";
+ public static readonly XNamespace V24 = DeclarationDefinition + ":v2.4";
public static readonly XNamespace V20 = DeclarationDefinition + ":v2.0";
public static readonly XNamespace V10 = DeclarationDefinition + ":v1.0";
- public static readonly XNamespace V28 = DeclarationDefinition + ":DEV:v2.8";
- public static readonly XNamespace v2_10_1 = DeclarationDefinition + ":DEV:v2.10.1";
- public static readonly XNamespace v2_10_2 = DeclarationDefinition + ":DEV:v2.10.2";
+ //public static readonly XNamespace V28 = DeclarationDefinition + ":DEV:v2.8";
+ //public static readonly XNamespace v2_10_1 = DeclarationDefinition + ":DEV:v2.10.1";
+ //public static readonly XNamespace v2_10_2 = DeclarationDefinition + ":DEV:v2.10.2";
public static readonly XNamespace Di = "http://www.w3.org/2000/09/xmldsig#";
public static readonly string DeclarationRootNamespace = "urn:tugraz:ivt:VectoAPI:DeclarationJob";
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
index ed6af0412015bae50442c23a3c8fb3801b84c359..7cdfff60bd38a6f915d12d5c40b02d17e4f05aac 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
@@ -255,12 +255,12 @@ namespace TUGraz.VectoCore.OutputData.XML
protected virtual void InstantiateReports(VectoRunData modelData)
{
- if (modelData.Exempted) {
- ManufacturerRpt = new XMLManufacturerReportExemptedTruck();
- } else {
- ManufacturerRpt = new XMLManufacturerReportTruck();
- }
- CustomerRpt = new XMLCustomerReport();
+ //if (modelData.Exempted) {
+ // ManufacturerRpt = new XMLManufacturerReportExemptedTruck();
+ //} else {
+ // ManufacturerRpt = new XMLManufacturerReportTruck();
+ //}
+ //CustomerRpt = new XMLCustomerReport();
}
private static IDictionary<Tuple<MissionType, LoadingType>, double> ZeroWeighting =>
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs
index f2539057dd8619c6bdd39c0050cde81745120ed2..5c4f366dd67215160f704204ca4c0f908e10da1a 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportCompletedVehicle.cs
@@ -13,16 +13,12 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport;
namespace TUGraz.VectoCore.OutputData.XML {
public class XMLDeclarationReportCompletedVehicle : XMLDeclarationReport
{
- public XMLDeclarationReportCompletedVehicle(IReportWriter writer, bool writePIF = false) : base(writer) { }
+ public XMLDeclarationReportCompletedVehicle(IReportWriter writer) : base(writer) { }
public IPrimaryVehicleInformationInputDataProvider PrimaryVehicleReportInputData { get; set; }
#region Overrides of XMLDeclarationReport
- protected override void DoStoreResult(ResultEntry entry, VectoRunData runData, IModalDataContainer modData)
- {
- //base.DoStoreResult(entry, runData, modData);
- }
protected override void InstantiateReports(VectoRunData modelData)
{
@@ -107,13 +103,5 @@ namespace TUGraz.VectoCore.OutputData.XML {
}
}
- #region Overrides of XMLDeclarationReport
-
- protected override void WriteResult(ResultEntry result)
- {
- base.WriteResult(result);
- }
-
- #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportFactory.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportFactory.cs
index 8d17afdcd5b81951e14a8ef34a79365a2a00e515..5a8a22ed9f09560c9752f5d7e6326216b9535b57 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportFactory.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportFactory.cs
@@ -28,7 +28,7 @@ namespace TUGraz.VectoCore.OutputData.XML
public IDeclarationReport CreateReport(IInputDataProvider input, IOutputDataWriter outputWriter)
{
switch (input) {
- case IMultistageBusInputDataProvider multistageBusInputDataProvider:
+ case IMultistepBusInputDataProvider multistageBusInputDataProvider:
break;
case ISingleBusInputDataProvider singleBusInputDataProvider:
return new XMLDeclarationReport(outputWriter);
@@ -64,7 +64,7 @@ namespace TUGraz.VectoCore.OutputData.XML
{
if (multistageVifInputData.VehicleInputData == null)
{
- var reportCompleted = new XMLDeclarationReportCompletedVehicle(outputDataWriter, true)
+ var reportCompleted = new XMLDeclarationReportCompletedVehicle(outputDataWriter)
{
PrimaryVehicleReportInputData = multistageVifInputData.MultistageJobInputData.JobInputData.PrimaryVehicle,
};
@@ -89,14 +89,12 @@ namespace TUGraz.VectoCore.OutputData.XML
switch (declarationInputDataProvider.JobInputData.Vehicle.VehicleCategory)
{
case VehicleCategory.HeavyBusCompletedVehicle:
- return new XMLDeclarationReportCompletedVehicle(outputDataWriter,
- declarationInputDataProvider.JobInputData.Vehicle.VehicleCategory == VehicleCategory.HeavyBusPrimaryVehicle)
+ return new XMLDeclarationReportCompletedVehicle(outputDataWriter)
{
PrimaryVehicleReportInputData = declarationInputDataProvider.PrimaryVehicleData,
};
case VehicleCategory.HeavyBusPrimaryVehicle:
- return new XMLDeclarationReportPrimaryVehicle(outputDataWriter,
- declarationInputDataProvider.JobInputData.Vehicle.VehicleCategory == VehicleCategory.HeavyBusPrimaryVehicle);
+ return new XMLDeclarationReportPrimaryVehicle(outputDataWriter);
default:
break;
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportMultistageBusVehicle.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportMultistageBusVehicle.cs
index c2ba05703732a8c25a4d0f5e6a8123828388ab17..f43b744104bccdb232a27443433523775c2fc887 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportMultistageBusVehicle.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportMultistageBusVehicle.cs
@@ -3,19 +3,25 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile;
namespace TUGraz.VectoCore.OutputData.XML
{
+ /// <summary>
+ /// Create VIF of an interim (or the complete(d) step
+ /// </summary>
public class XMLDeclarationReportMultistageBusVehicle : XMLDeclarationReport
{
- private IXMLMultistageReport _multistageBusReport;
+ protected IXMLMultistepIntermediateReport _multistageBusReport;
public XMLDeclarationReportMultistageBusVehicle(IReportWriter writer)
: base(writer)
{
+ throw new NotImplementedException();
+ //throw new VectoException("Used here");
//_multistageBusReport = new XMLMultistageBusReport();
}
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs
index 36bdb48f59d0c32501569a67a651132268576c30..633400763537d0101d3e3f0f1c055f6bf28720e4 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs
@@ -10,16 +10,16 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile;
namespace TUGraz.VectoCore.OutputData.XML {
public class XMLDeclarationReportPrimaryVehicle : XMLDeclarationReport
{
- protected IXMLPrimaryVehicleReport PrimaryReport;
+ protected IXMLVehicleInformationFile VehicleInformationFile;
- public XMLDeclarationReportPrimaryVehicle(IReportWriter writer, bool writePIF = false) : base(writer)
+ public XMLDeclarationReportPrimaryVehicle(IReportWriter writer) : base(writer)
{
}
public override XDocument CustomerReport => null;
- public override XDocument PrimaryVehicleReport => PrimaryReport?.Report;
+ public override XDocument PrimaryVehicleReport => VehicleInformationFile?.Report;
#region Overrides of XMLDeclarationReport
@@ -29,12 +29,12 @@ namespace TUGraz.VectoCore.OutputData.XML {
if (modelData.Exempted) {
ManufacturerRpt = new XMLManufacturerReportExeptedPrimaryBus();
CustomerRpt = new XMLCustomerReportExemptedPrimaryBus();
- PrimaryReport = new XMLExemptedPrimaryBusVehicleReport();
+ VehicleInformationFile = new XMLExemptedPrimaryBusVehicleReport();
} else {
ManufacturerRpt = new XMLManufacturerReportPrimaryBus();
CustomerRpt = new XMLCustomerReport();
- PrimaryReport = new XMLPrimaryBusVehicleReport();
+ VehicleInformationFile = new XMLPrimaryBusVehicleReport();
}
@@ -43,7 +43,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
public override void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
base.InitializeReport(modelData, fuelModes);
- PrimaryReport.Initialize(modelData,fuelModes);
+ VehicleInformationFile.Initialize(modelData,fuelModes);
}
@@ -51,7 +51,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
protected override void WriteResult(ResultEntry result)
{
base.WriteResult(result);
- PrimaryReport.WriteResult(result);
+ VehicleInformationFile.WriteResult(result);
}
protected override void GenerateReports()
@@ -59,7 +59,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
ManufacturerRpt.GenerateReport();
var fullReportHash = GetSignature(ManufacturerRpt.Report);
CustomerRpt.GenerateReport(fullReportHash);
- PrimaryReport.GenerateReport(fullReportHash);
+ VehicleInformationFile.GenerateReport(fullReportHash);
}
@@ -67,7 +67,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
protected override void OutputReports()
{
Writer.WriteReport(ReportType.DeclarationReportManufacturerXML, ManufacturerRpt.Report);
- Writer.WriteReport(ReportType.DeclarationReportPrimaryVehicleXML, PrimaryReport.Report);
+ Writer.WriteReport(ReportType.DeclarationReportPrimaryVehicleXML, VehicleInformationFile.Report);
}
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs
index 98ebbacb9b6abe8cd10bccdce0599f4905a066d0..e6946487e5b81f3441a5caa39e36d89be7204f4e 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs
@@ -1,33 +1,32 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using TUGraz.VectoCommon.Exceptions;
-using TUGraz.VectoCommon.InputData;
-using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Interfaces;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
-using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9;
-using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9.CIFWriter;
-using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport;
-using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1;
namespace TUGraz.VectoCore.OutputData.XML
{
+ /// <summary>
+ /// Create MRF and VIF for primary bus
+ /// </summary>
public class XMLDeclarationReportPrimaryVehicle_09 : XMLDeclarationReportPrimaryVehicle
{
- private readonly ICustomerInformationFileFactory _cifFactory;
- private readonly IManufacturerReportFactory _mrfFactory;
+ private readonly IManufacturerReportFactory _mrfFactory;
+ private readonly IVIFReportFactory _vifFactory;
public XMLDeclarationReportPrimaryVehicle_09(IReportWriter writer,
IManufacturerReportFactory mrfFactory,
ICustomerInformationFileFactory cifFactory,
- bool writePIF = false) : base(writer, writePIF)
+ IVIFReportFactory vifFactory) : base(writer)
{
_mrfFactory = mrfFactory;
- _cifFactory = cifFactory;
+ //_cifFactory = cifFactory;
+ _vifFactory = vifFactory;
}
@@ -40,20 +39,56 @@ namespace TUGraz.VectoCore.OutputData.XML
var ihpc =
vehicleData.Components?.ElectricMachines?.Entries?.Count(e => e.ElectricMachine.IHPCType != "None") > 0;
- if (modelData.Exempted) {
- PrimaryReport = new XMLExemptedPrimaryBusVehicleReport();
- }
- PrimaryReport = new XMLPrimaryBusVehicleReport();
-
- //PrimaryRpt = _vifFactory.GetVIF(vehicleData.VehicleCategory,
- // vehicleData.VehicleType,
- // vehicleData.ArchitectureID,
- // vehicleData.ExemptedVehicle,
- // iepc,
- // ihpc);
+ ManufacturerRpt = _mrfFactory.GetManufacturerReport(vehicleData.VehicleCategory,
+ vehicleData.VehicleType,
+ vehicleData.ArchitectureID,
+ vehicleData.ExemptedVehicle,
+ iepc,
+ ihpc);
+ VehicleInformationFile = _vifFactory.GetVIFReport(vehicleData.VehicleCategory,
+ vehicleData.VehicleType,
+ vehicleData.ArchitectureID,
+ vehicleData.ExemptedVehicle,
+ iepc,
+ ihpc);
- ManufacturerRpt = _mrfFactory.GetManufacturerReport(vehicleData.VehicleCategory,
+
+ }
+
+ }
+
+ // --------------------------------------------------
+
+ /// <summary>
+ /// Create VIF of an interim (or the complete(d) step
+ /// </summary>
+ public class XMLDeclarationReportInterimVehicle_09 : XMLDeclarationReport
+ {
+ protected readonly IVIFReportFactory _vifFactory;
+
+ protected IXMLMultistepIntermediateReport MultistepIntermediateBusReport;
+ protected readonly IVIFReportInterimFactory _interimFactory;
+
+ public XMLDeclarationReportInterimVehicle_09(IReportWriter writer,
+ IManufacturerReportFactory mrfFactory,
+ ICustomerInformationFileFactory cifFactory,
+ IVIFReportFactory vifFactory, IVIFReportInterimFactory interimFactory) : base(writer)
+ {
+ _vifFactory = vifFactory;
+ _interimFactory = interimFactory;
+ }
+
+ #region Overrides of XMLDeclarationReport
+
+ protected override void InstantiateReports(VectoRunData modelData)
+ {
+ var vehicleData = modelData.VehicleData.InputData;
+ var iepc = vehicleData.Components?.IEPC != null;
+ var ihpc =
+ vehicleData.Components?.ElectricMachines?.Entries?.Count(e => e.ElectricMachine.IHPCType != "None") > 0;
+
+ MultistepIntermediateBusReport = _interimFactory.GetInterimVIFReport(vehicleData.VehicleCategory,
vehicleData.VehicleType,
vehicleData.ArchitectureID,
vehicleData.ExemptedVehicle,
@@ -61,31 +96,91 @@ namespace TUGraz.VectoCore.OutputData.XML
ihpc);
}
- protected override void DoStoreResult(ResultEntry entry, VectoRunData runData, IModalDataContainer modData)
+ #endregion
+
+ public override void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
+ {
+ //_multistageBusReport =
+ // modelData.Exempted ? new XMLMultistageExemptedBusReport() : new XMLMultistageBusReport();
+
+ InstantiateReports(modelData);
+
+ MultistepIntermediateBusReport.Initialize(modelData);
+ }
+
+ protected override void GenerateReports()
{
- base.DoStoreResult(entry, runData, modData);
+ MultistepIntermediateBusReport.GenerateReport();
}
+ protected override void OutputReports()
+ {
+ Writer.WriteReport(ReportType.DeclarationReportMultistageVehicleXML, MultistepIntermediateBusReport.Report);
+ }
+
+ protected override void DoStoreResult(ResultEntry entry, VectoRunData runData, IModalDataContainer modData)
+ {
+ throw new NotSupportedException();
+ }
protected override void WriteResult(ResultEntry result)
{
+ throw new NotSupportedException();
+ }
+ }
- //if (Mockup)
- //{
- // (ManufacturerRpt as IXMLMockupReport).WriteMockupResult(result);
- // (CustomerRpt as IXMLMockupReport).WriteMockupResult(result);
+ // --------------------------------------------------
- //}
- //else
- //{
- base.WriteResult(result);
- //}
+ /// <summary>
+ /// Create MRF and CIF of the complete(d) step
+ /// </summary>
+ public class XMLDeclarationReportCompletedVehicle_09 : XMLDeclarationReportCompletedVehicle
+ {
+ protected readonly ICustomerInformationFileFactory _cifFactory;
+ protected readonly IManufacturerReportFactory _mrfFactory;
+
+ public XMLDeclarationReportCompletedVehicle_09(IReportWriter writer, IManufacturerReportFactory mrfFactory,
+ ICustomerInformationFileFactory cifFactory,
+ IVIFReportFactory vifFactory) : base(writer)
+ {
+ _cifFactory = cifFactory;
+ _mrfFactory = mrfFactory;
}
+ #region Overrides of XMLDeclarationReportCompletedVehicle
- }
+ protected override void InstantiateReports(VectoRunData modelData)
+ {
+ var inputData = modelData.InputData as IXMLMultistageInputDataProvider;
+ var primaryVehicle = inputData.JobInputData.PrimaryVehicle.Vehicle;
+
+ var ihpc = (primaryVehicle.Components?.ElectricMachines?.Entries)?.Count(electric => electric.ElectricMachine.IHPCType != "None") > 0;
+ var iepc = (primaryVehicle.Components?.IEPC != null);
+ ManufacturerRpt = _mrfFactory.GetManufacturerReport(
+ inputData.JobInputData.ConsolidateManufacturingStage.Vehicle.VehicleCategory,
+ inputData.JobInputData.JobType,
+ primaryVehicle.ArchitectureID,
+ primaryVehicle.ExemptedVehicle,
+ iepc,
+ ihpc);
+
+ CustomerRpt = _cifFactory.GetCustomerReport(
+ inputData.JobInputData.ConsolidateManufacturingStage.Vehicle.VehicleCategory,
+ inputData.JobInputData.JobType,
+ primaryVehicle.ArchitectureID,
+ primaryVehicle.ExemptedVehicle,
+ iepc,
+ ihpc);
+
+ }
+ #endregion
+ }
+ // --------------------------------------------------
+ /// <summary>
+ /// Create MRF and CIF for lorries
+ /// </summary>
public class XMLDeclarationReport09 : XMLDeclarationReport
{
private readonly IManufacturerReportFactory _mrfFactory;
diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUX/PTO-tech.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/PTO-tech.csv
index 687cdb2df1cc6c11be2ba3e51d2f7c93820cfb41..56cf0fdd160f380f5edcf66bd9ff0eacc8c3c08a 100644
--- a/VectoCore/VectoCore/Resources/Declaration/VAUX/PTO-tech.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/VAUX/PTO-tech.csv
@@ -1,12 +1,13 @@
-Technology, Power Loss
-None,0
-"only one engaged gearwheel above oil level", 0
-"only the drive shaft of the PTO - shift claw, synchronizer, sliding gearwheel",50
-only the drive shaft of the PTO - multi-disc clutch,1000
-"only the drive shaft of the PTO - multi-disc clutch, oil pump",2000
-"drive shaft and/or up to 2 gear wheels - shift claw, synchronizer, sliding gearwheel",300
-drive shaft and/or up to 2 gear wheels - multi-disc clutch,1500
-"drive shaft and/or up to 2 gear wheels - multi-disc clutch, oil pump",3000
-"drive shaft and/or more than 2 gear wheels - shift claw, synchronizer, sliding gearwheel",600
-drive shaft and/or more than 2 gear wheels - multi-disc clutch,2000
-"drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump",4000
\ No newline at end of file
+Technology , Power Loss, Torque Loss
+None , 0 , 0
+only one engaged gearwheel above oil level , 0 , 0
+"only the drive shaft of the PTO - shift claw, synchronizer, sliding gearwheel" , 50 , 0.4
+only the drive shaft of the PTO - multi-disc clutch , 350 , 2.8
+"only the drive shaft of the PTO - multi-disc clutch, oil pump" , 3000 , 23.9
+"drive shaft and/or up to 2 gear wheels - shift claw, synchronizer, sliding gearwheel" , 150 , 1.2
+drive shaft and/or up to 2 gear wheels - multi-disc clutch , 400 , 3.2
+"drive shaft and/or up to 2 gear wheels - multi-disc clutch, oil pump" , 3050 , 24.3
+"drive shaft and/or more than 2 gear wheels - shift claw, synchronizer, sliding gearwheel", 200 , 1.6
+drive shaft and/or more than 2 gear wheels - multi-disc clutch , 450 , 3.6
+"drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump" , 3100 , 24.7
+"PTO which includes 1 or more additional gearmesh(es), without disconnect clutch" , 1500 , 11.9
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3.xsd
index e481bf041853dacee5803ee4a328bdce78a79658..47167d0774d45b9d70babb5d93fe8c6eee169b3b 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3.xsd
@@ -5,10 +5,11 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
-<!--
+ <!--
Changelog:
03.02.2022: First official version uploaded to CITnet
04.04.2022: Changes in 'TyreDimensionType': remove space between tyre design code and rim diameter (205/70 R15, 205/80 R15)
+ 01.06.2022: Change type of WHTC Correction factors, CFRegPer, BFColdHot: constraint > 0.0
-->
<xs:complexType name="AbstractADCDataDeclarationType" abstract="true">
<xs:complexContent>
@@ -928,27 +929,27 @@ Changelog:
</xs:complexType>
<xs:complexType name="EngineFuelType">
<xs:sequence>
- <xs:element name="WHTCUrban" type="v1.0:EngineWHTCType">
+ <xs:element name="WHTCUrban" type="v2.3:EngineWHTCType">
<xs:annotation>
<xs:documentation>P109 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="WHTCRural" type="v1.0:EngineWHTCType">
+ <xs:element name="WHTCRural" type="v2.3:EngineWHTCType">
<xs:annotation>
<xs:documentation>P110 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="WHTCMotorway" type="v1.0:EngineWHTCType">
+ <xs:element name="WHTCMotorway" type="v2.3:EngineWHTCType">
<xs:annotation>
<xs:documentation>P111 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="BFColdHot" type="v1.0:EngineColdHotBalancingFactorType">
+ <xs:element name="BFColdHot" type="v2.3:EngineColdHotBalancingFactorType">
<xs:annotation>
<xs:documentation>P159 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="CFRegPer" type="v1.0:EngineCFRegPerType">
+ <xs:element name="CFRegPer" type="v2.3:EngineCFRegPerType">
<xs:annotation>
<xs:documentation>P192 [-]</xs:documentation>
</xs:annotation>
@@ -1852,6 +1853,49 @@ Changelog:
<xs:enumeration value="RM"/>
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="EngineWHTCType">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Engine">109</vectoParam:parameterId>
+ <vectoParam:parameterId component="Engine">110</vectoParam:parameterId>
+ <vectoParam:parameterId component="Engine">111</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ <xs:documentation>P109 - [-]</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="v1.0:Double4">
+ <xs:minInclusive value="0.0000"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="EngineCFRegPerType">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Engine">192</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:restriction base="v1.0:Double4">
+ <xs:minInclusive value="0.0000"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="EngineColdHotBalancingFactorType">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Engine">159</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ <xs:documentation>P159 - [-]</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="v1.0:Double4">
+ <xs:minInclusive value="0.0000"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="GearboxTransmissionTypeType">
<xs:annotation>
<xs:appinfo>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
index fe687e0866f327d861ca4d522ec47e0b1f78173e..8246076603eae78661a433f46a373f28d48a27d0 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
@@ -405,6 +405,11 @@ Changelog:
<xs:sequence>
<xs:group ref="v2.4:BusAuxPneumaticSystemGen_Conventional_SequenceGroup"/>
<xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+ <xs:element name="PneumaticSCRReagentDosing" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P316 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -567,6 +572,11 @@ Changelog:
<xs:sequence>
<xs:group ref="v2.4:BusAuxPneumaticSystemGen_HEV-Px_SequenceGroup"/>
<xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+ <xs:element name="PneumaticSCRReagentDosing" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P316 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -728,6 +738,11 @@ Changelog:
<xs:sequence>
<xs:group ref="v2.4:BusAuxPneumaticSystemGen_HEV-S_SequenceGroup"/>
<xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+ <xs:element name="PneumaticSCRReagentDosing" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P316 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -3202,11 +3217,6 @@ Changelog:
</xs:restriction>
</xs:simpleType>
</xs:element>
- <xs:element name="PneumaticSCRReagentDosing" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P316 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
</xs:sequence>
</xs:group>
<xs:group name="BusAuxPneumaticSystemGen_Conventional_SequenceGroup">
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd
index daba540457c05317245ab0bc8fe1dc8d765797a8..6ed442ddd8568e9d2bfa9743123d3ce1b51da9e5 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9" xmlns:dd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.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" targetNamespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
@@ -7,110 +7,533 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaLocation="VectoDeclarationDefinitions.2.4.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9" schemaLocation="VectoOutputManufacturer.0.9.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
- <xs:element name="VectoOutput">
- <xs:annotation>
- <xs:documentation>Comment describing your root element</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:complexType name="AbstractVectoCustomerOutputType"/>
<xs:complexType name="ConventionalLorryOutputType">
- <xs:sequence>
- <xs:element name="Vehicle" type="Conventional_LorryVehicleType"/>
- <xs:element name="Results" type="ResultsType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="Conventional_LorryVehicleType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV_Px_LorryOutputType">
- <xs:sequence>
- <xs:element name="Vehicle" type="HEV_Px_IHPC_LorryVehicleType"/>
- <xs:element name="Results" type="ResultsType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="HEV_Px_IHPC_LorryVehicleType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV_S2_LorryOutputType">
- <xs:sequence>
- <xs:element name="Vehicle" type="HEV_S2_LorryVehicleType"/>
- <xs:element name="Results" type="ResultsType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="HEV_S2_LorryVehicleType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV_S3_LorryOutputType">
- <xs:sequence>
- <xs:element name="Vehicle" type="HEV_S3_LorryVehicleType"/>
- <xs:element name="Results" type="ResultsType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="HEV_S3_LorryVehicleType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV_S4_LorryOutputType">
- <xs:sequence>
- <xs:element name="Vehicle" type="HEV_S4_LorryVehicleType"/>
- <xs:element name="Results" type="ResultsType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="HEV_S4_LorryVehicleType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV_IEPC_S_LorryOutputType">
- <xs:sequence>
- <xs:element name="Vehicle" type="HEV_IEPC_S_LorryVehicleType"/>
- <xs:element name="Results" type="ResultsType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="HEV_IEPC_S_LorryVehicleType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="PEV_E2_LorryOutputType">
- <xs:sequence>
- <xs:element name="Vehicle" type="PEV_E2_LorryVehicleType"/>
- <xs:element name="Results" type="ResultsType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="PEV_E2_LorryVehicleType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="PEV_E3_LorryOutputType">
- <xs:sequence>
- <xs:element name="Vehicle" type="PEV_E3_LorryVehicleType"/>
- <xs:element name="Results" type="ResultsType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="PEV_E3_LorryVehicleType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="PEV_E4_LorryOutputType">
- <xs:sequence>
- <xs:element name="Vehicle" type="PEV_E4_LorryVehicleType"/>
- <xs:element name="Results" type="ResultsType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="PEV_E4_LorryVehicleType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="PEV_IEPC_LorryOutputType">
- <xs:sequence>
- <xs:element name="Vehicle" type="PEV_IEPC_LorryVehicleType"/>
- <xs:element name="Results" type="ResultsType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="PEV_IEPC_LorryVehicleType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="Conventional_CompletedBusOutputType">
- <xs:sequence>
- <xs:element name="Vehicle" type="Conventional_CompletedBusVehicleType"/>
- <xs:element name="Results" type="ResultsType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="Abstract_Conventional_CompltededBusVehicleType"/>
+ <xs:element name="InputDataSignaturePrimaryVehicle" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignaturePrimaryVehicle" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV_CompletedBusOutputType">
- <xs:sequence>
- <xs:element name="Vehicle" type="HEV_CompletedBusVehicleType"/>
- <xs:element name="Results" type="ResultsType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="Abstract_HEV_CompletedBusVehicleType"/>
+ <xs:element name="InputDataSignaturePrimaryVehicle" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignaturePrimaryVehicle" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="PEV_CompletedBusOutputType">
- <xs:sequence>
- <xs:element name="Vehicle" type="PEV_CompletedBusVehicleType"/>
- <xs:element name="Results" type="ResultsType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="Abstract_PEV_CompletedBusVehicleType"/>
+ <xs:element name="InputDataSignaturePrimaryVehicle" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignaturePrimaryVehicle" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="Exempted_LorryOutputType">
- <xs:sequence>
- <xs:element name="Vehicle" type="Exempted_LorryVehicleType"/>
- <xs:element name="Results" type="ResultsType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="Exempted_LorryVehicleType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="Exempted_CompletedBusOutputType">
- <xs:sequence>
- <xs:element name="Vehicle" type="Exempted_CompletedBusVehicleType"/>
- <xs:element name="Results" type="ResultsType"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="out:AbstractVectoOutputCustomerDataType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="Exempted_CompletedBusVehicleType"/>
+ <xs:element name="InputDataSignaturePrimaryVehicle" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignaturePrimaryVehicle" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType">
+ <xs:annotation>
+ <xs:documentation>II.3</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Results" type="ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
+ <!--Vehicle Types-->
<xs:complexType name="Conventional_LorryVehicleType">
<xs:sequence>
<xs:group ref="GeneralVehicleSequenceGroup"/>
<xs:group ref="LorryGeneralVehicleSequenceGroup"/>
- <xs:group ref="Conventional_LorryVehicleSequenceGroup"/>
- <xs:element name="ADAS" type="mrf:ConventionalADASType"/>
+ <xs:group ref="WHR_DualFuelSequenceGroup"/>
+ <xs:element name="ADAS" type="ConventionalADASType"/>
<xs:group ref="EngineGroup"/>
<xs:group ref="TransmissionGroup"/>
<xs:element name="Retarder" type="xs:boolean"/>
@@ -122,7 +545,7 @@
<xs:complexType name="HEV_Px_IHPC_LorryVehicleType">
<xs:sequence>
<xs:group ref="HEV_LorryVehicleTypeGroup"/>
- <xs:element name="ADAS" type="mrf:HEVADASType"/>
+ <xs:element name="ADAS" type="HEVADASType"/>
<xs:group ref="EngineGroup"/>
<xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/>
@@ -136,7 +559,7 @@
<xs:complexType name="HEV_S2_LorryVehicleType">
<xs:sequence>
<xs:group ref="HEV_LorryVehicleTypeGroup"/>
- <xs:element name="ADAS" type="mrf:HEVADASType"/>
+ <xs:element name="ADAS" type="HEVADASType"/>
<xs:group ref="EngineGroup"/>
<xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/>
@@ -150,10 +573,11 @@
<xs:complexType name="HEV_S3_LorryVehicleType">
<xs:sequence>
<xs:group ref="HEV_LorryVehicleTypeGroup"/>
- <xs:element name="ADAS" type="mrf:HEVADASType"/>
+ <xs:element name="ADAS" type="HEVADASType"/>
<xs:group ref="EngineGroup"/>
<xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/>
+ <xs:element name="NrOfGears" type="xs:int"/>
<xs:element name="Retarder"/>
<xs:element name="AxleRatio"/>
<xs:group ref="AxleWheelsGroup"/>
@@ -163,10 +587,11 @@
<xs:complexType name="HEV_S4_LorryVehicleType">
<xs:sequence>
<xs:group ref="HEV_LorryVehicleTypeGroup"/>
- <xs:element name="ADAS" type="mrf:HEVADASType"/>
+ <xs:element name="ADAS" type="HEVADASType"/>
<xs:group ref="EngineGroup"/>
<xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/>
+ <xs:element name="NrOfGears" type="xs:int"/>
<xs:group ref="AxleWheelsGroup"/>
<xs:group ref="LorryAuxGroup"/>
</xs:sequence>
@@ -174,10 +599,11 @@
<xs:complexType name="HEV_IEPC_S_LorryVehicleType">
<xs:sequence>
<xs:group ref="HEV_LorryVehicleTypeGroup"/>
- <xs:element name="ADAS" type="mrf:HEVADASType"/>
+ <xs:element name="ADAS" type="HEVADASType"/>
<xs:group ref="EngineGroup"/>
<xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/>
+ <xs:element name="NrOfGears" type="xs:int"/>
<xs:element name="Retarder"/>
<xs:element name="AxleRatio" minOccurs="0"/>
<xs:group ref="AxleWheelsGroup"/>
@@ -187,7 +613,7 @@
<xs:complexType name="PEV_E2_LorryVehicleType">
<xs:sequence>
<xs:group ref="PEV_LorryVehicleTypeGroup"/>
- <xs:element name="ADAS" type="mrf:PEVADASType"/>
+ <xs:element name="ADAS" type="PEVADASType"/>
<xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/>
<xs:group ref="TransmissionGroup"/>
@@ -200,9 +626,10 @@
<xs:complexType name="PEV_E3_LorryVehicleType">
<xs:sequence>
<xs:group ref="PEV_LorryVehicleTypeGroup"/>
- <xs:element name="ADAS" type="mrf:PEVADASType"/>
+ <xs:element name="ADAS" type="PEVADASType"/>
<xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/>
+ <xs:element name="NrOfGears" type="xs:int"/>
<xs:element name="Retarder"/>
<xs:element name="AxleRatio"/>
<xs:group ref="AxleWheelsGroup"/>
@@ -212,9 +639,10 @@
<xs:complexType name="PEV_E4_LorryVehicleType">
<xs:sequence>
<xs:group ref="PEV_LorryVehicleTypeGroup"/>
- <xs:element name="ADAS" type="mrf:PEVADASType"/>
+ <xs:element name="ADAS" type="PEVADASType"/>
<xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/>
+ <xs:element name="NrOfGears" type="xs:int"/>
<xs:group ref="AxleWheelsGroup"/>
<xs:group ref="LorryAuxGroup"/>
</xs:sequence>
@@ -222,9 +650,10 @@
<xs:complexType name="PEV_IEPC_LorryVehicleType">
<xs:sequence>
<xs:group ref="PEV_LorryVehicleTypeGroup"/>
- <xs:element name="ADAS" type="mrf:PEVADASType"/>
+ <xs:element name="ADAS" type="PEVADASType"/>
<xs:group ref="ElectricMachineGroup"/>
<xs:group ref="REESSGroup"/>
+ <xs:element name="NrOfGears" type="xs:int"/>
<xs:element name="Retarder"/>
<xs:element name="AxleRatio" minOccurs="0"/>
<xs:group ref="AxleWheelsGroup"/>
@@ -232,30 +661,187 @@
</xs:sequence>
</xs:complexType>
<xs:complexType name="Conventional_CompletedBusVehicleType">
- <xs:sequence>
- <xs:group ref="CompletedBusVehicleTypeGroup"/>
- <xs:element name="ADAS" type="mrf:ConventionalADASType"/>
- <xs:group ref="CompletedBusAuxGroup"/>
- </xs:sequence>
+ <xs:complexContent>
+ <xs:extension base="Abstract_Conventional_CompltededBusVehicleType">
+ <xs:sequence>
+ <xs:group ref="ConventionalCompletedBusVehicleTypeGroup"/>
+ <xs:element name="ADAS" type="ConventionalADASType"/>
+ <xs:group ref="EngineGroup"/>
+ <xs:group ref="TransmissionGroup"/>
+ <xs:element name="Retarder" type="xs:boolean"/>
+ <xs:element name="AxleRatio" type="v1.0:AxlegearRatioType"/>
+ <xs:group ref="AxleWheelsGroup"/>
+ <xs:group ref="ConventionalCompletedBusAuxGroup"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
- <xs:complexType name="HEV_CompletedBusVehicleType">
- <xs:sequence>
- <xs:group ref="CompletedBusVehicleTypeGroup"/>
- <xs:element name="ADAS" type="mrf:HEVADASType"/>
- <xs:group ref="CompletedBusAuxGroup"/>
- </xs:sequence>
+ <xs:complexType name="HEV_Px_IHPC_CompletedBusVehicleType">
+ <xs:complexContent>
+ <xs:extension base="Abstract_HEV_CompletedBusVehicleType">
+ <xs:sequence>
+ <xs:group ref="HEVCompletedBusVehicleTypeGroup"/>
+ <xs:group ref="HEV_CompletedBusArchitectureGroup"/>
+ <xs:element name="ADAS" type="HEVADASType"/>
+ <xs:group ref="EngineGroup"/>
+ <xs:group ref="ElectricMachineGroup"/>
+ <xs:group ref="REESSGroup"/>
+ <xs:group ref="TransmissionGroup"/>
+ <xs:element name="Retarder" type="xs:boolean"/>
+ <xs:element name="AxleRatio" type="v1.0:AxlegearRatioType"/>
+ <xs:group ref="AxleWheelsGroup"/>
+ <xs:group ref="HEV_Px_IHPC_CompletedBusAuxGroup"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
- <xs:complexType name="PEV_CompletedBusVehicleType">
- <xs:sequence>
- <xs:group ref="CompletedBusVehicleTypeGroup"/>
- <xs:element name="ADAS" type="mrf:PEVADASType"/>
- <xs:group ref="CompletedBusAuxGroup"/>
- </xs:sequence>
+ <xs:complexType name="HEV_S2_CompletedBusVehicleType">
+ <xs:complexContent>
+ <xs:extension base="Abstract_HEV_CompletedBusVehicleType">
+ <xs:sequence>
+ <xs:group ref="HEVCompletedBusVehicleTypeGroup"/>
+ <xs:group ref="HEV_CompletedBusArchitectureGroup"/>
+ <xs:element name="ADAS" type="HEVADASType"/>
+ <xs:group ref="EngineGroup"/>
+ <xs:group ref="ElectricMachineGroup"/>
+ <xs:group ref="REESSGroup"/>
+ <xs:group ref="TransmissionGroup"/>
+ <xs:element name="Retarder" type="xs:boolean"/>
+ <xs:element name="AxleRatio" type="v1.0:AxlegearRatioType"/>
+ <xs:group ref="AxleWheelsGroup"/>
+ <xs:group ref="HEV_Sx_CompletedBusAuxGroup"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="HEV_S3_CompletedBusVehicleType">
+ <xs:complexContent>
+ <xs:extension base="Abstract_HEV_CompletedBusVehicleType">
+ <xs:sequence>
+ <xs:group ref="HEVCompletedBusVehicleTypeGroup"/>
+ <xs:group ref="HEV_CompletedBusArchitectureGroup"/>
+ <xs:element name="ADAS" type="HEVADASType"/>
+ <xs:group ref="EngineGroup"/>
+ <xs:group ref="ElectricMachineGroup"/>
+ <xs:group ref="REESSGroup"/>
+ <xs:element name="NrOfGears" type="xs:int"/>
+ <xs:element name="Retarder" type="xs:boolean"/>
+ <xs:element name="AxleRatio" type="v1.0:AxlegearRatioType"/>
+ <xs:group ref="AxleWheelsGroup"/>
+ <xs:group ref="HEV_Sx_CompletedBusAuxGroup"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="HEV_S4_CompletedBusVehicleType">
+ <xs:complexContent>
+ <xs:extension base="Abstract_HEV_CompletedBusVehicleType">
+ <xs:sequence>
+ <xs:group ref="HEVCompletedBusVehicleTypeGroup"/>
+ <xs:group ref="HEV_CompletedBusArchitectureGroup"/>
+ <xs:element name="ADAS" type="HEVADASType"/>
+ <xs:group ref="EngineGroup"/>
+ <xs:group ref="ElectricMachineGroup"/>
+ <xs:group ref="REESSGroup"/>
+ <xs:element name="NrOfGears" type="xs:int"/>
+ <xs:group ref="AxleWheelsGroup"/>
+ <xs:group ref="HEV_Sx_CompletedBusAuxGroup"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="HEV_IEPC-S_CompletedBusVehicleType">
+ <xs:complexContent>
+ <xs:extension base="Abstract_HEV_CompletedBusVehicleType">
+ <xs:sequence>
+ <xs:group ref="HEVCompletedBusVehicleTypeGroup"/>
+ <xs:group ref="HEV_CompletedBusArchitectureGroup"/>
+ <xs:element name="ADAS" type="HEVADASType"/>
+ <xs:group ref="EngineGroup"/>
+ <xs:group ref="ElectricMachineGroup"/>
+ <xs:group ref="REESSGroup"/>
+ <xs:element name="NrOfGears" type="xs:int"/>
+ <xs:element name="Retarder" type="xs:boolean"/>
+ <xs:element name="AxleRatio" type="v1.0:AxlegearRatioType" minOccurs="0"/>
+ <xs:group ref="AxleWheelsGroup"/>
+ <xs:group ref="HEV_Sx_CompletedBusAuxGroup"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="PEV_E2_CompletedBusVehicleType">
+ <xs:complexContent>
+ <xs:extension base="Abstract_PEV_CompletedBusVehicleType">
+ <xs:sequence>
+ <xs:group ref="PEVCompletedBusVehicleTypeGroup"/>
+ <xs:group ref="PEV_CompletedBusArchitectureGroup"/>
+ <xs:element name="ADAS" type="PEVADASType"/>
+ <xs:group ref="ElectricMachineGroup"/>
+ <xs:group ref="REESSGroup"/>
+ <xs:group ref="TransmissionGroup"/>
+ <xs:element name="Retarder" type="xs:boolean"/>
+ <xs:element name="AxleRatio" type="v1.0:AxlegearRatioType"/>
+ <xs:group ref="AxleWheelsGroup"/>
+ <xs:group ref="PEV_CompletedBusAuxGroup"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="PEV_E3_CompletedBusVehicleType">
+ <xs:complexContent>
+ <xs:extension base="Abstract_PEV_CompletedBusVehicleType">
+ <xs:sequence>
+ <xs:group ref="PEVCompletedBusVehicleTypeGroup"/>
+ <xs:group ref="PEV_CompletedBusArchitectureGroup"/>
+ <xs:element name="ADAS" type="PEVADASType"/>
+ <xs:group ref="ElectricMachineGroup"/>
+ <xs:group ref="REESSGroup"/>
+ <xs:element name="NrOfGears" type="xs:int"/>
+ <xs:element name="Retarder" type="xs:boolean"/>
+ <xs:element name="AxleRatio" type="v1.0:AxlegearRatioType"/>
+ <xs:group ref="AxleWheelsGroup"/>
+ <xs:group ref="PEV_CompletedBusAuxGroup"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="PEV_E4_CompletedBusVehicleType">
+ <xs:complexContent>
+ <xs:extension base="Abstract_PEV_CompletedBusVehicleType">
+ <xs:sequence>
+ <xs:group ref="PEVCompletedBusVehicleTypeGroup"/>
+ <xs:group ref="PEV_CompletedBusArchitectureGroup"/>
+ <xs:element name="ADAS" type="PEVADASType"/>
+ <xs:group ref="ElectricMachineGroup"/>
+ <xs:group ref="REESSGroup"/>
+ <xs:element name="NrOfGears" type="xs:int"/>
+ <xs:group ref="AxleWheelsGroup"/>
+ <xs:group ref="PEV_CompletedBusAuxGroup"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="PEV_IEPC_CompletedBusVehicleType">
+ <xs:complexContent>
+ <xs:extension base="Abstract_PEV_CompletedBusVehicleType">
+ <xs:sequence>
+ <xs:group ref="PEVCompletedBusVehicleTypeGroup"/>
+ <xs:group ref="PEV_CompletedBusArchitectureGroup"/>
+ <xs:element name="ADAS" type="PEVADASType"/>
+ <xs:group ref="ElectricMachineGroup"/>
+ <xs:group ref="REESSGroup"/>
+ <xs:element name="NrOfGears" type="xs:int"/>
+ <xs:element name="Retarder" type="xs:boolean"/>
+ <xs:element name="AxleRatio" type="v1.0:AxlegearRatioType" minOccurs="0"/>
+ <xs:group ref="AxleWheelsGroup"/>
+ <xs:group ref="PEV_CompletedBusAuxGroup"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="Exempted_LorryVehicleType">
<xs:sequence>
<xs:group ref="GeneralVehicleSequenceGroup"/>
- <xs:element name="VehicleGroupCO2"/>
<xs:element name="Manufacturer"/>
<xs:element name="ManufacturerAddress"/>
<xs:element name="Model"/>
@@ -267,37 +853,19 @@
</xs:complexType>
<xs:complexType name="Exempted_CompletedBusVehicleType">
<xs:sequence>
- <xs:group ref="GeneralVehicleSequenceGroup"/>
- <xs:sequence>
- <xs:element name="Manufacturers">
- <xs:complexType>
- <xs:sequence maxOccurs="unbounded">
- <xs:element name="Step">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Manufacturer"/>
- <xs:element name="ManufacturerAddress"/>
- </xs:sequence>
- <xs:attribute name="stepCount" type="xs:int"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:sequence>
- <xs:element name="CorrectedActualMass"/>
- <xs:element name="ZeroEmissionVehicle"/>
- <xs:element name="HybridElectricHDV"/>
- <xs:element name="ClassBus"/>
- <xs:element name="TotalNumberOfPassengers"/>
- </xs:sequence>
+ <xs:group ref="ExemptedCompletedBusVehicleTypeGroup"/>
</xs:sequence>
</xs:complexType>
+ <xs:simpleType name="RatedPowerType">
+ <xs:restriction base="xs:int"/>
+ </xs:simpleType>
+ <xs:simpleType name="LegislativeCategoryType">
+ <xs:union memberTypes="v2.4:LegislativeCategoryHeavyLorryDeclarationType v2.4:LegislativeCategoryMediumLorryDeclarationType v2.4:LegislativeCategoryPrimaryBusDeclarationType"/>
+ </xs:simpleType>
<xs:group name="GeneralVehicleSequenceGroup">
<xs:sequence>
<xs:element name="VIN" type="v1.0:VINType"/>
- <xs:element name="VehicleCategory" type="mrf:LegislativeCategoryType"/>
+ <xs:element name="VehicleCategory" type="LegislativeCategoryType"/>
<xs:element name="AxleConfiguration" type="v1.0:VehicleAxleConfigurationDeclarationType"/>
<xs:element name="TechnicalPermissibleMaximumLadenMass">
<xs:complexType>
@@ -309,11 +877,11 @@
</xs:complexType>
</xs:element>
<xs:element name="VehicleGroup" type="xs:string"/>
+ <xs:element name="VehicleGroupCO2" type="xs:string"/>
</xs:sequence>
</xs:group>
<xs:group name="LorryGeneralVehicleSequenceGroup">
<xs:sequence>
- <xs:element name="VehicleGroupCO2"/>
<xs:element name="Manufacturer" type="v1.0:ManufacturerType"/>
<xs:element name="ManufacturerAddress" type="v1.0:ManufacturerAddressType"/>
<xs:element name="Model" type="v1.0:ModelType"/>
@@ -333,7 +901,7 @@
<xs:element name="HybridElectricHDV" type="v1.0:HybridElectricHDVType"/>
</xs:sequence>
</xs:group>
- <xs:group name="Conventional_LorryVehicleSequenceGroup">
+ <xs:group name="WHR_DualFuelSequenceGroup">
<xs:sequence>
<xs:element name="WasteHeatRecovery" type="xs:boolean"/>
<xs:element name="DualFuelVehicle" type="xs:boolean"/>
@@ -341,14 +909,14 @@
</xs:group>
<xs:group name="HEV_VehicleSequenceGroup">
<xs:sequence>
- <xs:group ref="Conventional_LorryVehicleSequenceGroup"/>
+ <xs:group ref="WHR_DualFuelSequenceGroup"/>
<xs:element name="HEVArchitecture"/>
<xs:element name="OffVehicleChargingCapability" type="xs:boolean"/>
<xs:element name="OffVehicleChargingMaxPower" minOccurs="0">
<xs:complexType>
<xs:simpleContent>
- <xs:extension base="xs:int">
- <xs:attribute name="unit" type="out:PowerUnitType" use="required"/>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="PowerUnitType" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
@@ -359,7 +927,15 @@
<xs:sequence>
<xs:element name="PEVArchitecture"/>
<xs:element name="OffVehicleChargingCapability"/>
- <xs:element name="OffVehicleChargingMaxPower" minOccurs="0"/>
+ <xs:element name="OffVehicleChargingMaxPower" minOccurs="0">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="PowerUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
</xs:group>
<xs:group name="HEV_LorryVehicleTypeGroup">
@@ -369,14 +945,133 @@
<xs:group ref="HEV_VehicleSequenceGroup"/>
</xs:sequence>
</xs:group>
- <xs:group name="PEV_LorryVehicleTypeGroup">
+ <xs:group name="PEV_LorryVehicleTypeGroup">
+ <xs:sequence>
+ <xs:group ref="GeneralVehicleSequenceGroup"/>
+ <xs:group ref="LorryGeneralVehicleSequenceGroup"/>
+ <xs:group ref="PEV_VehicleSequenceGroup"/>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="ConventionalCompletedBusVehicleTypeGroup">
+ <xs:sequence>
+ <xs:group ref="GeneralVehicleSequenceGroup"/>
+ <xs:sequence>
+ <xs:element name="Manufacturers">
+ <xs:complexType>
+ <xs:sequence maxOccurs="unbounded">
+ <xs:element name="Step">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Manufacturer"/>
+ <xs:element name="ManufacturerAddress"/>
+ </xs:sequence>
+ <xs:attribute name="stepCount" type="xs:int"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:element name="Model" type="xs:string"/>
+ <xs:sequence>
+ <xs:element name="CorrectedActualMass">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="out:MassUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
+ <xs:element name="HybridElectricHDV" type="xs:boolean"/>
+ <xs:group ref="WHR_DualFuelSequenceGroup"/>
+ <xs:element name="ClassBus" type="xs:string"/>
+ <xs:element name="TotalNumberOfPassengers" type="xs:int"/>
+ <xs:element name="VehicleTypeApprovalNumber" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="HEVCompletedBusVehicleTypeGroup">
+ <xs:sequence>
+ <xs:group ref="GeneralVehicleSequenceGroup"/>
+ <xs:sequence>
+ <xs:element name="Manufacturers">
+ <xs:complexType>
+ <xs:sequence maxOccurs="unbounded">
+ <xs:element name="Step">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Manufacturer"/>
+ <xs:element name="ManufacturerAddress"/>
+ </xs:sequence>
+ <xs:attribute name="stepCount" type="xs:int"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:element name="Model" type="xs:string"/>
+ <xs:sequence>
+ <xs:element name="CorrectedActualMass">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="out:MassUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
+ <xs:element name="HybridElectricHDV" type="xs:boolean"/>
+ <xs:group ref="WHR_DualFuelSequenceGroup"/>
+ <xs:element name="ClassBus" type="xs:string"/>
+ <xs:element name="TotalNumberOfPassengers" type="xs:int"/>
+ <xs:element name="VehicleTypeApprovalNumber" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="PEVCompletedBusVehicleTypeGroup">
<xs:sequence>
<xs:group ref="GeneralVehicleSequenceGroup"/>
- <xs:group ref="LorryGeneralVehicleSequenceGroup"/>
- <xs:group ref="PEV_VehicleSequenceGroup"/>
+ <xs:sequence>
+ <xs:element name="Manufacturers">
+ <xs:complexType>
+ <xs:sequence maxOccurs="unbounded">
+ <xs:element name="Step">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Manufacturer"/>
+ <xs:element name="ManufacturerAddress"/>
+ </xs:sequence>
+ <xs:attribute name="stepCount" type="xs:int"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:element name="Model" type="xs:string"/>
+ <xs:sequence>
+ <xs:element name="CorrectedActualMass">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="out:MassUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
+ <xs:element name="HybridElectricHDV" type="xs:boolean"/>
+ <xs:element name="ClassBus" type="xs:string"/>
+ <xs:element name="TotalNumberOfPassengers" type="xs:int"/>
+ <xs:element name="VehicleTypeApprovalNumber" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
</xs:sequence>
</xs:group>
- <xs:group name="CompletedBusVehicleTypeGroup">
+ <xs:group name="ExemptedCompletedBusVehicleTypeGroup">
<xs:sequence>
<xs:group ref="GeneralVehicleSequenceGroup"/>
<xs:sequence>
@@ -396,16 +1091,30 @@
</xs:complexType>
</xs:element>
</xs:sequence>
+ <xs:element name="Model" type="xs:string"/>
<xs:sequence>
- <xs:element name="CorrectedActualMass"/>
- <xs:element name="ZeroEmissionVehicle"/>
- <xs:element name="HybridElectricHDV"/>
- <xs:element name="ClassBus"/>
- <xs:element name="TotalNumberOfPassengers"/>
- <xs:element name="VehicleTypeApprovalNumber" minOccurs="0"/>
+ <xs:element name="CorrectedActualMass">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="out:MassUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
+ <xs:element name="HybridElectricHDV" type="xs:boolean"/>
+ <xs:element name="ClassBus" type="xs:string"/>
+ <xs:element name="TotalNumberOfPassengers" type="xs:int"/>
+ <xs:element name="VehicleTypeApprovalNumber" type="xs:string" minOccurs="0"/>
</xs:sequence>
</xs:sequence>
</xs:group>
+ <xs:complexType name="EngineCapacityType">
+ <xs:simpleContent>
+ <xs:extension base="xs:double"/>
+ </xs:simpleContent>
+ </xs:complexType>
<xs:group name="EngineGroup">
<xs:sequence>
<xs:element name="EngineRatedPower">
@@ -420,7 +1129,7 @@
<xs:element name="EngineCapacity">
<xs:complexType>
<xs:simpleContent>
- <xs:extension base="mrf:EngineCapacityType">
+ <xs:extension base="EngineCapacityType">
<xs:attribute name="unit" type="out:VolumeUnitType" use="required"/>
</xs:extension>
</xs:simpleContent>
@@ -437,8 +1146,8 @@
</xs:group>
<xs:group name="TransmissionGroup">
<xs:sequence>
- <xs:element name="TransmissionValues"/>
- <xs:element name="TransmissionType" type="v1.0:GearboxTransmissionTypeType"/>
+ <xs:element name="TransmissionValues" type="xs:string"/>
+ <xs:element name="TransmissionType" type="v2.3:GearboxTransmissionTypeType"/>
<xs:element name="NrOfGears" type="xs:int"/>
</xs:sequence>
</xs:group>
@@ -449,7 +1158,7 @@
<xs:complexType>
<xs:sequence>
<xs:element name="TyreDimension" type="v2.3:TyreDimensionType"/>
- <xs:element name="FuelEfficiencyClass"/>
+ <xs:element name="FuelEfficiencyClass" type="xs:string"/>
<xs:element name="TyreCertificationNumber" type="v1.0:CertificationNumberType"/>
</xs:sequence>
<xs:attribute name="axleNumber"/>
@@ -462,7 +1171,7 @@
<xs:element name="TotalRatedPropulsionPower">
<xs:complexType>
<xs:simpleContent>
- <xs:extension base="mrf:RatedPowerType">
+ <xs:extension base="RatedPowerType">
<xs:attribute name="unit" type="out:PowerUnitType" use="required"/>
</xs:extension>
</xs:simpleContent>
@@ -474,7 +1183,7 @@
<xs:element name="VoltageLevel" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
- <xs:element name="MaxContinuousPropulsionPower" type="mrf:RatedPowerType"/>
+ <xs:element name="MaxContinuousPropulsionPower" type="RatedPowerType"/>
</xs:sequence>
<xs:attribute name="voltage"/>
</xs:complexType>
@@ -490,7 +1199,7 @@
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:int">
- <xs:attribute name="unit" type="out:StorageCapacityUnitType" use="required"/>
+ <xs:attribute name="unit" type="EnergyUnitType" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
@@ -499,7 +1208,7 @@
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:int">
- <xs:attribute name="unit" type="out:StorageCapacityUnitType" use="required"/>
+ <xs:attribute name="unit" type="EnergyUnitType" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
@@ -511,14 +1220,224 @@
<xs:element name="SteeringPumpTechnology" type="v2.4:AuxSPTechnologyLorryType"/>
</xs:sequence>
</xs:group>
- <xs:group name="CompletedBusAuxGroup">
+ <xs:group name="ConventionalCompletedBusAuxGroup">
+ <xs:sequence>
+ <xs:element name="SteeringPump">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Technology" type="v2.4:AuxSPTechnologyLorryType" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ElectricSystem">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="AlternatorTechnology"/>
+ <xs:sequence minOccurs="0">
+ <xs:element name="MaxAlternatorPower">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="PowerUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ElectricStorageCapacity">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="EnergyUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="PneumaticSystem">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SmartCompressionSystem" type="xs:boolean"/>
+ <xs:element name="SmartRegenerationSystem" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="HVAC">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SystemConfiguration" type="xs:int"/>
+ <xs:element name="AuxiliaryHeaterPower">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="PowerUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="DoubleGlazing" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="HEV_Px_IHPC_CompletedBusAuxGroup">
+ <xs:sequence>
+ <xs:element name="SteeringPump">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Technology" type="v2.4:AuxSPTechnologyLorryType" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ElectricSystem">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="AlternatorTechnology"/>
+ <xs:sequence minOccurs="0">
+ <xs:element name="MaxAlternatorPower">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="PowerUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ElectricStorageCapacity">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="EnergyUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="PneumaticSystem">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SmartCompressionSystem" type="xs:boolean"/>
+ <xs:element name="SmartRegenerationSystem" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="HVAC">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SystemConfiguration" type="xs:int"/>
+ <xs:element name="AuxiliaryHeaterPower">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="PowerUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="DoubleGlazing" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="HEV_Sx_CompletedBusAuxGroup">
+ <xs:sequence>
+ <xs:element name="SteeringPump">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Technology" type="v2.4:AuxSPTechnologyLorryType" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ElectricSystem">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="AlternatorTechnology"/>
+ <xs:sequence minOccurs="0">
+ <xs:element name="MaxAlternatorPower">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="PowerUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ElectricStorageCapacity">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="EnergyUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="PneumaticSystem">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SmartRegenerationSystem" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="HVAC">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SystemConfiguration" type="xs:int"/>
+ <xs:element name="AuxiliaryHeaterPower">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="PowerUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="DoubleGlazing" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="PEV_CompletedBusAuxGroup">
<xs:sequence>
+ <xs:element name="SteeringPump">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Technology" type="v2.4:AuxSPTechnologyLorryType" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="PneumaticSystem">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SmartRegenerationSystem" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="HVAC">
<xs:complexType>
<xs:sequence>
- <xs:element name="SystemConfiguration"/>
- <xs:element name="AuxiliaryHeaterPower"/>
- <xs:element name="DoubleGlazing"/>
+ <xs:element name="SystemConfiguration" type="xs:int"/>
+ <xs:element name="AuxiliaryHeaterPower">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="PowerUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="DoubleGlazing" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -836,6 +1755,17 @@
<xs:enumeration value="km"/>
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="PowerUnitType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="kW"/>
+ <xs:enumeration value="W"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="EnergyUnitType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="kWh"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="EnergyConsumptionUnitType">
<xs:restriction base="xs:string">
<xs:enumeration value="kWh/km"/>
@@ -950,10 +1880,59 @@
</xs:sequence>
</xs:group>
<xs:complexType name="AbstractResultSummaryType" abstract="true"/>
+ <xs:complexType name="ResultSummaryConventionalType">
+ <xs:complexContent>
+ <xs:extension base="AbstractResultSummaryType">
+ <xs:sequence>
+ <xs:choice>
+ <xs:element name="AveragePayload">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="MassUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AveragePassengerCount" type="xs:double"/>
+ </xs:choice>
+ <xs:element name="Fuel" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="FuelConsumption" type="FuelConsumptionType" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>I.2.3.1 - I.2.3.12 / #69</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="type" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CO2" type="CO2Type" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>I.2.3.13 - I.2.3.16 / #68</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
<xs:complexType name="ResultSummaryOCVHEVType">
<xs:complexContent>
<xs:extension base="AbstractResultSummaryType">
<xs:sequence>
+ <xs:choice>
+ <xs:element name="AveragePayload">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="MassUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AveragePassengerCount" type="xs:double"/>
+ </xs:choice>
<xs:element name="Fuel" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
@@ -981,6 +1960,18 @@
<xs:complexContent>
<xs:extension base="AbstractResultSummaryType">
<xs:sequence>
+ <xs:choice>
+ <xs:element name="AveragePayload">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="MassUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="AveragePassengerCount" type="xs:double"/>
+ </xs:choice>
<xs:element name="ElectricEnergy" type="ElectricEnergyType"/>
<xs:sequence minOccurs="0">
<xs:element name="FC_ZEV_AuxHeater">
@@ -1012,34 +2003,77 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="ResultSummaryConventionalType">
- <xs:complexContent>
- <xs:extension base="AbstractResultSummaryType">
- <xs:sequence>
- <xs:element name="Fuel" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="FuelConsumption" type="FuelConsumptionType" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>I.2.3.1 - I.2.3.12 / #69</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="type" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="CO2" type="CO2Type" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>I.2.3.13 - I.2.3.16 / #68</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:complexType name="ResultSummaryNonOCVHEVType">
<xs:complexContent>
<xs:extension base="ResultSummaryConventionalType"/>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="ConventionalADASType">
+ <xs:sequence>
+ <xs:group ref="ConventionalADASGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="HEVADASType">
+ <xs:sequence>
+ <xs:group ref="HEVADASGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="PEVADASType">
+ <xs:sequence>
+ <xs:group ref="PEVADASGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+ <!--ADAS-->
+ <xs:group name="ConventionalADASGroup">
+ <xs:sequence>
+ <xs:element name="EngineStopStart" type="xs:boolean"/>
+ <xs:element name="EcoRollWithoutEngineStopStart" type="xs:boolean"/>
+ <xs:element name="EcoRollWithEngineStopStart" type="xs:boolean"/>
+ <xs:element name="PredictiveCruiseControl" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="HEVADASGroup">
+ <xs:sequence>
+ <xs:element name="EngineStopStart" type="xs:boolean"/>
+ <xs:element name="PredictiveCruiseControl" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="PEVADASGroup">
+ <xs:sequence>
+ <xs:element name="PredictiveCruiseControl" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="HEV_CompletedBusArchitectureGroup">
+ <xs:sequence>
+ <xs:element name="HEVArchitecture" type="xs:string"/>
+ <xs:element name="OffVehicleChargingCapability" type="xs:boolean"/>
+ <xs:element name="OffVehicleChargingMaxPower" minOccurs="0">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="PowerUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="PEV_CompletedBusArchitectureGroup">
+ <xs:sequence>
+ <xs:element name="PEVArchitecture" type="xs:string"/>
+ <xs:element name="OffVehicleChargingCapability" type="xs:boolean"/>
+ <xs:element name="OffVehicleChargingMaxPower" minOccurs="0">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="PowerUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:group>
+ <xs:complexType name="Abstract_Conventional_CompltededBusVehicleType" abstract="true"/>
+ <xs:complexType name="Abstract_HEV_CompletedBusVehicleType" abstract="true"/>
+ <xs:complexType name="Abstract_PEV_CompletedBusVehicleType" abstract="true"/>
</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
index 25f7a38d2d25e2f14a3a19e87d919f60cabfc7d4..fcffb1566a4937edf7e4a89afaa23592b21f5ff7 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
@@ -13,6 +13,7 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7" schemaLocation="VectoOutputCustomer.0.7.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7.1" schemaLocation="VectoOutputCustomer.0.7.1.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.8" schemaLocation="VectoOutputCustomer.0.8.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9" schemaLocation="VectoOutputCustomer.0.9.xsd"/>
<xs:element name="VectoCustomerInformation" type="tns:VectoCustomerInformationType"/>
<xs:complexType name="VectoCustomerInformationType">
<xs:sequence>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd
index d9f3f89655a9e8b0a360e77825b5aa7815abea28..acdf3198d1e19d5688ca73b449bd1ca44e3f29b4 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:dd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.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" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9" elementFormDefault="qualified" attributeFormDefault="unqualified">
<!-- Imports_______________________________________________ -->
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
@@ -10,269 +10,731 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
<!-- End imports___________________________________________ -->
- <xs:element name="VectoOutput" type="mrf:AbstractVectoManufacturerOutputType">
- <xs:annotation>
- <xs:documentation>Comment describing your root element</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:complexType name="AbstractVectoManufacturerOutputType" abstract="true"/>
<xs:complexType name="ConventionalLorryManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:Conventional-LorryVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>II.2.5</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>II.2.5</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV-Px_IHPCLorryManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-Px_IHPC-LorryVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV-S2_LorryManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-S2-LorryVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV-S3_LorryManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-S3-LorryVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV-S4_LorryManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-S4-LorryVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV-IEPC-S_LorryManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-IEPC-S-LorryVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="PEV-E2_LorryManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-E2-LorryVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="PEV-E3_LorryManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-E3-LorryVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="PEV-E4_LorryManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-E4-LorryVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="PEV-IEPC_LorryManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-IEPC-LorryVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="ConventionalPrimaryBusManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:Conventional-PrimaryBus-VehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV-Px_IHPCPrimaryBusManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-Px_IHPC-PrimaryBus-VehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV-S2_PrimaryBusManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-S2-PrimaryBus-VehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV-S3_PrimaryBusManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-S3-PrimaryBus-VehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV-S4_PrimaryBusManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-S4-PrimaryBus-VehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="HEV-IEPC-S_PrimaryBusManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-IEPC-S-PrimaryBus-VehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="PEV-E2_PrimaryBusManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-E2-PrimaryBus-VehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="PEV-E3_PrimaryBusManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-E3-PrimaryBus-VehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="PEV-E4_PrimaryBusManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-E4-PrimaryBus-VehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="PEV-IEPC_PrimaryBusManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-IEPC-PrimaryBus-VehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="ConventionalCompletedBusManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:Conventional-CompletedBusVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="HEVCompletedBusManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:HEV-CompletedBusVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="PEVCompletedBusManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:PEV-CompletedBusVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="ExemptedLorryManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:Exempted-LorryVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="ExemptedPrimaryBusManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:Exempted-PrimaryBusVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="ExemptedCompletedBusManufacturerOutputDataType">
<xs:complexContent>
- <xs:extension base="mrf:AbstractVectoManufacturerOutputType">
+ <xs:extension base="out:AbstractVectoOutputManufacturerDataType">
<xs:sequence>
<xs:element name="Vehicle" type="mrf:Exempted-CompletedBusVehicleOutputType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
<xs:element name="Results" type="mrf:ResultsType"/>
+ <xs:element name="ApplicationInformation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SimulationToolVersion" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>I.3.1.1 / #70</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>I.3.1.2 / #71</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
+ <xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -306,6 +768,16 @@
<xs:documentation>1.1.7.Vehicle group (Annex 1)</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="VehicleGroupCO2">
+ <xs:annotation>
+ <xs:documentation>1.1.7a (Sub)group for CO2 standards</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
</xs:sequence>
</xs:group>
<xs:group name="OffVehicleChargingGroup">
@@ -314,7 +786,15 @@
</xs:annotation>
<xs:sequence>
<xs:element name="OffVehicleChargingCapability" type="xs:boolean"/>
- <xs:element name="OffVehicleChargingMaxPower" type="xs:int" minOccurs="0"/>
+ <xs:element name="OffVehicleChargingMaxPower" minOccurs="0">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="mrf:PowerUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
</xs:group>
<xs:group name="ManufacturerGroup">
@@ -349,16 +829,6 @@
<xs:sequence>
<xs:group ref="mrf:ManufacturerGroup"/>
<xs:group ref="mrf:GeneralVehicleOutputGroup"/>
- <xs:element name="CO2StandardGroup" minOccurs="0">
- <xs:annotation>
- <xs:documentation>1.1.7a (Sub)group for CO2 standards</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:minLength value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
<xs:element name="CorrectedActualMass" type="v1.0:VehicleCurbMassChassisType">
<xs:annotation>
<xs:documentation>1.1.8 Corrected actual mass [kg]</xs:documentation>
@@ -463,7 +933,7 @@
<xs:complexType name="HEV-Px_IHPC-LorryVehicleOutputType">
<xs:sequence>
<xs:group ref="mrf:HEV-LorryVehicleOutputTypeGroup"/>
- <xs:element name="EngineTorqueLimitations" type="mrf:EngineTorqueLimitsType"/>
+ <xs:element name="EngineTorqueLimitations" type="mrf:EngineTorqueLimitsType" minOccurs="0"/>
<xs:element name="Components" type="mrf:HEV-Px_IHPC-LorryComponentsType"/>
</xs:sequence>
</xs:complexType>
@@ -518,12 +988,14 @@
<xs:complexType name="Conventional-PrimaryBus-VehicleOutputType">
<xs:sequence>
<xs:group ref="mrf:Conventional-PrimaryBus-VehicleOutputTypeGroup"/>
+ <xs:element name="EngineTorqueLimitations" type="mrf:EngineTorqueLimitsType" minOccurs="0"/>
<xs:element name="Components" type="mrf:Conventional-PrimaryBusComponentsType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="HEV-Px_IHPC-PrimaryBus-VehicleOutputType">
<xs:sequence>
<xs:group ref="mrf:HEV-PrimaryBus-VehicleOutputTypeGroup"/>
+ <xs:element name="EngineTorqueLimitations" type="mrf:EngineTorqueLimitsType" minOccurs="0"/>
<xs:element name="Components" type="mrf:HEV-Px_IHPC-PrimaryBusComponentsType"/>
</xs:sequence>
</xs:complexType>
@@ -597,6 +1069,7 @@
<xs:complexType>
<xs:sequence>
<xs:element name="AirDrag" type="mrf:AirdragType"/>
+ <xs:element name="Auxiliaries" type="mrf:HEVCompletedBusAuxOutputType"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -610,6 +1083,7 @@
<xs:complexType>
<xs:sequence>
<xs:element name="AirDrag" type="mrf:AirdragType"/>
+ <xs:element name="Auxiliaries" type="mrf:PEVCompletedBusAuxOutputType"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -657,7 +1131,7 @@
<xs:element name="Transmission" type="mrf:TransmissionType"/>
<xs:element name="TorqueConverter" type="mrf:TorqueConverterType" minOccurs="0"/>
<xs:element name="Angledrive" type="mrf:AngledriveType" minOccurs="0"/>
- <xs:element name="Retarder" type="mrf:RetarderType" minOccurs="0"/>
+ <xs:element name="Retarder" type="mrf:RetarderType"/>
<xs:element name="Axlegear" type="mrf:AxleGearType"/>
<xs:element name="AxleWheels" type="mrf:AxleWheelsType"/>
<xs:element name="Auxiliaries" type="mrf:ConventionalLorryAuxOutputType"/>
@@ -672,7 +1146,7 @@
<xs:element name="Transmission" type="mrf:TransmissionType"/>
<xs:element name="TorqueConverter" type="mrf:TorqueConverterType" minOccurs="0"/>
<xs:element name="Angledrive" type="mrf:AngledriveType" minOccurs="0"/>
- <xs:element name="Retarder" type="mrf:RetarderType" minOccurs="0"/>
+ <xs:element name="Retarder" type="mrf:RetarderType"/>
<xs:element name="Axlegear" type="mrf:AxleGearType"/>
<xs:element name="AxleWheels" type="mrf:AxleWheelsType"/>
<xs:element name="Auxiliaries" type="mrf:HEVLorryAuxOutputType"/>
@@ -687,7 +1161,7 @@
<xs:element name="Transmission" type="mrf:TransmissionType"/>
<xs:element name="TorqueConverter" type="mrf:TorqueConverterType" minOccurs="0"/>
<xs:element name="Angledrive" type="mrf:AngledriveType" minOccurs="0"/>
- <xs:element name="Retarder" type="mrf:RetarderType" minOccurs="0"/>
+ <xs:element name="Retarder" type="mrf:RetarderType"/>
<xs:element name="Axlegear" type="mrf:AxleGearType"/>
<xs:element name="AxleWheels" type="mrf:AxleWheelsType"/>
<xs:element name="Auxiliaries" type="mrf:HEVLorryAuxOutputType"/>
@@ -699,7 +1173,7 @@
<xs:element name="Engine" type="mrf:EngineOutputType"/>
<xs:element name="ElectricMachines" type="mrf:xEV-ElectricMachinesType"/>
<xs:element name="REESSSpecifications" type="mrf:REESSSpecificationsType"/>
- <xs:element name="Retarder" type="mrf:RetarderType" minOccurs="0"/>
+ <xs:element name="Retarder" type="mrf:RetarderType"/>
<xs:element name="Axlegear" type="mrf:AxleGearType"/>
<xs:element name="AxleWheels" type="mrf:AxleWheelsType"/>
<xs:element name="Auxiliaries" type="mrf:HEVLorryAuxOutputType"/>
@@ -735,7 +1209,7 @@
<xs:element name="REESSSpecifications" type="mrf:REESSSpecificationsType"/>
<xs:element name="Transmission" type="mrf:TransmissionType"/>
<xs:element name="TorqueConverter" type="mrf:TorqueConverterType" minOccurs="0"/>
- <xs:element name="Retarder" type="mrf:RetarderType" minOccurs="0"/>
+ <xs:element name="Retarder" type="mrf:RetarderType"/>
<xs:element name="Axlegear" type="mrf:AxleGearType"/>
<xs:element name="AxleWheels" type="mrf:AxleWheelsType"/>
<xs:element name="Auxiliaries" type="mrf:PEVLorryAuxOutputType"/>
@@ -746,7 +1220,7 @@
<xs:sequence>
<xs:element name="ElectricMachines" type="mrf:xEV-ElectricMachinesType"/>
<xs:element name="REESSSpecifications" type="mrf:REESSSpecificationsType"/>
- <xs:element name="Retarder" type="mrf:RetarderType" minOccurs="0"/>
+ <xs:element name="Retarder" type="mrf:RetarderType"/>
<xs:element name="Axlegear" type="mrf:AxleGearType"/>
<xs:element name="AxleWheels" type="mrf:AxleWheelsType"/>
<xs:element name="Auxiliaries" type="mrf:PEVLorryAuxOutputType"/>
@@ -905,14 +1379,14 @@
<xs:complexType name="AbstractREESSType" abstract="true"/>
<xs:complexType name="REESSSpecificationsType">
<xs:sequence>
- <xs:sequence>
+ <xs:choice>
<xs:sequence maxOccurs="unbounded">
<xs:element name="Battery" type="mrf:BatteryType"/>
</xs:sequence>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element name="SuperCap" type="mrf:CapacitorType"/>
+ <xs:sequence>
+ <xs:element name="Capacitor" type="mrf:CapacitorType"/>
</xs:sequence>
- </xs:sequence>
+ </xs:choice>
</xs:sequence>
</xs:complexType>
<xs:complexType name="CapacitorType">
@@ -941,9 +1415,25 @@
<xs:sequence>
<xs:group ref="mrf:ComponentCommonOutputGroup"/>
<xs:element name="NominalVoltage" type="xs:int"/>
- <xs:element name="TotalStorageCapacity" type="xs:int"/>
- <xs:element name="TotalUsableCapacityInSimulation" type="xs:int"/>
- <xs:element name="CertificationMethod"/>
+ <xs:element name="TotalStorageCapacity">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="mrf:EnergyUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="TotalUsableCapacityInSimulation">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:int">
+ <xs:attribute name="unit" type="mrf:EnergyUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CertificationMethod" type="xs:string"/>
</xs:sequence>
</xs:group>
<!--Auxiliaries-->
@@ -1039,6 +1529,7 @@
<xs:element name="DoubleGlazing" type="xs:boolean"/>
<xs:element name="AdjustableAuxiliaryHeater" type="xs:boolean"/>
<xs:element name="SeparateAirDistributionDucts" type="xs:boolean"/>
+ <xs:element name="AuxiliaryHeaterPower" type="xs:int"/>
</xs:sequence>
</xs:group>
<xs:group name="PrimaryBusHVACGroup">
@@ -1086,13 +1577,13 @@
<xs:group name="ElectricMachineGroup">
<xs:sequence>
<xs:group ref="mrf:ComponentCommonOutputGroup"/>
- <xs:element name="ElectricMachineType"/>
- <xs:element name="CertificationMethod"/>
+ <xs:element name="ElectricMachineType" type="xs:string"/>
+ <xs:element name="CertificationMethod" type="xs:string"/>
</xs:sequence>
</xs:group>
<xs:group name="ElectricMachinePowerGroup">
<xs:sequence>
- <xs:element name="RatedPower"/>
+ <xs:element name="RatedPower" type="mrf:RatedPowerType"/>
<xs:element name="VoltageLevels">
<xs:complexType>
<xs:sequence>
@@ -1116,12 +1607,10 @@
<xs:element name="NrOfGears" type="xs:int"/>
<xs:element name="LowestTotalTransmissionRatio" type="v1.0:Double3"/>
<xs:element name="DifferentialIncluded" type="xs:boolean"/>
- <xs:element name="CertificationMethod"/>
+ <xs:element name="DesignTypeWheelMotor" type="xs:boolean"/>
+ <xs:element name="CertificationMethod" type="xs:string"/>
</xs:sequence>
</xs:group>
- <xs:group name="EngineTorqueLimitationsGroup">
- <xs:sequence/>
- </xs:group>
<!--Axles-->
<xs:complexType name="AxleGearType">
<xs:sequence>
@@ -1190,22 +1679,23 @@
<xs:complexType name="TorqueConverterType">
<xs:sequence>
<xs:group ref="mrf:ComponentCommonOutputGroup"/>
- <xs:element name="CertificationMethod"/>
+ <xs:element name="CertificationMethod" type="xs:string"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="RetarderType">
<xs:sequence>
- <xs:group ref="mrf:ComponentCommonOutputGroup"/>
- <xs:element name="CertificationMethod"/>
+ <xs:element name="RetarderType" type="xs:string"/>
+ <xs:group ref="mrf:ComponentCommonOutputGroup" minOccurs="0"/>
+ <xs:element name="CertificationMethod" type="xs:string" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="TransmissionType">
<xs:sequence>
<xs:group ref="mrf:ComponentCommonOutputGroup"/>
- <xs:element name="Type" type="v1.0:GearboxTransmissionTypeType"/>
+ <xs:element name="CertificationMethod" type="xs:string"/>
+ <xs:element name="Type" type="v2.3:GearboxTransmissionTypeType"/>
<xs:element name="NrOfGears" type="xs:int"/>
<xs:element name="FinalGearRatio" type="v1.0:GearboxGearRatioType"/>
- <xs:element name="RetarderType" type="v1.0:RetarderTypeType"/>
<xs:element name="PowerTakeOff" type="xs:boolean" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
@@ -1216,6 +1706,7 @@
<xs:simpleContent>
<xs:extension base="xs:int">
<xs:attribute name="Gear" type="xs:int" use="required"/>
+ <xs:attribute name="unit" type="mrf:PercentType" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
@@ -1382,7 +1873,6 @@
<!-- <xs:element name="CompressorRatio" type="v1.0:Double3"/> -->
<xs:element name="SmartRegenerationSystem" type="xs:boolean"/>
<xs:element name="AirsuspensionControl" type="mrf:AirsuspensionControlType"/>
- <xs:element name="ReagentDosing" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="HVACSystemType">
@@ -1427,7 +1917,7 @@
<xs:complexType name="ADCType">
<xs:sequence>
<xs:group ref="mrf:ComponentCommonOutputGroup"/>
- <xs:element name="CertificationMethod"/>
+ <xs:element name="CertificationMethod" type="xs:string"/>
<xs:element name="Ratio" type="v1.0:AngledriveRatioType"/>
</xs:sequence>
</xs:complexType>
@@ -1542,12 +2032,12 @@
</xs:simpleType>
</xs:attribute>
</xs:complexType>
- <xs:complexType name="ResultSuccessOCVHEVType">
+ <xs:complexType name="ResultSuccessOVCHEVType">
<xs:complexContent>
<xs:extension base="mrf:AbstractResultType">
<xs:sequence>
<xs:group ref="mrf:ResultSuccessSimulationParametersGroup"/>
- <xs:element name="OCVMode" minOccurs="2" maxOccurs="2">
+ <xs:element name="OVCMode" minOccurs="2" maxOccurs="2">
<xs:complexType>
<xs:sequence>
<xs:element name="VehiclePerformance" type="mrf:VehiclePerformanceType"/>
@@ -1702,6 +2192,7 @@
</xs:annotation>
</xs:element>
<xs:element name="SimulationParameters" type="mrf:SimulationParametersType"/>
+ <xs:element name="VehicleGroup" type="xs:string"/>
<xs:element name="Error" type="xs:string"/>
<xs:element name="ErrorDetails" type="xs:string"/>
</xs:sequence>
@@ -1795,6 +2286,11 @@
<xs:enumeration value="W"/>
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="EnergyUnitType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="kWh"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="SpeedUnitType">
<xs:restriction base="xs:token">
<xs:enumeration value="km/h"/>
@@ -1897,7 +2393,7 @@
</xs:restriction>
</xs:simpleType>
</xs:element>
- <xs:element name="GearshiftCount" type="xs:int" minOccurs="0">
+ <xs:element name="GearshiftCount" type="xs:int">
<xs:annotation>
<xs:documentation>I.2.2.7 / #66</xs:documentation>
</xs:annotation>
@@ -2005,7 +2501,7 @@
</xs:restriction>
</xs:simpleType>
</xs:element>
- <xs:element name="GearshiftCount" type="xs:int" minOccurs="0">
+ <xs:element name="GearshiftCount" type="xs:int">
<xs:annotation>
<xs:documentation>I.2.2.7 / #66</xs:documentation>
</xs:annotation>
@@ -2116,6 +2612,7 @@
</xs:complexType>
</xs:element>
<xs:element name="SimulationParameters" type="mrf:SimulationParametersType"/>
+ <xs:element name="PrimaryVehicleSubgroup" type="xs:string" minOccurs="0"/>
</xs:sequence>
</xs:group>
<xs:complexType name="EnergyConsumptionType">
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
index be5f35c199845233d0656aa3c6cbfffe0ba0ba83..3113d85b0fc963438773259e8b7e93436e3ecf2b 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xmlns:mrf0.5="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.5" xmlns:mrf0.6="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.6" xmlns:mrf0.7="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" xmlns:mrf0.8="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:ns1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:DEV:v0.9.1" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xmlns:mrf0.5="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.5" xmlns:mrf0.6="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.6" xmlns:mrf0.7="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" xmlns:mrf0.8="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:ns1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:DEV:v0.9.1" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
<!--
This is a convienience file that imports the schema for all supported versions of manufacturer records file and all supported declaration definitions
@@ -12,6 +12,7 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" schemaLocation="VectoOutputManufacturer.0.7.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7.1" schemaLocation="VectoOutputManufacturer.0.7.1.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" schemaLocation="VectoOutputManufacturer.0.8.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9" schemaLocation="VectoOutputManufacturer.0.9.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
<xs:element name="VectoOutput" type="mrf:VectoOutputManufacturerType">
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
index 6dea0c1d8e45b014bc41b809df7860e23ec84a8f..45a8d9ef3c0822452696d24e5d6ec15067e2fd18 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
@@ -8,6 +8,40 @@
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaLocation="VectoDeclarationDefinitions.2.4.xsd"/>
+ <xs:complexType name="ElectricMachineSystemMaxTorqueEntryType">
+ <xs:attribute name="outShaftSpeed" type="v2.3:OutShaftSpeedType" use="required">
+ <xs:annotation>
+ <xs:documentation>P468 - [rpm]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="maxTorque" type="v2.3:maxTorqueType" use="required">
+ <xs:annotation>
+ <xs:documentation>P469 - [Nm]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="minTorque" type="v2.3:minTorqueType" use="required">
+ <xs:annotation>
+ <xs:documentation>P470 - [Nm]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ <xs:complexType name="ElectricMachineSystemPowerMapEntryType">
+ <xs:attribute name="outShaftSpeed" type="v2.3:OutShaftSpeedType" use="required">
+ <xs:annotation>
+ <xs:documentation>P473 - [rpm]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="torque" type="v2.3:PowerMapTorqueType" use="required">
+ <xs:annotation>
+ <xs:documentation>P474 - [Nm]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="electricPower" type="v2.3:PowerMapElectricPowerType" use="required">
+ <xs:annotation>
+ <xs:documentation>P475 - [W]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
<xs:element name="VectoMockResults">
<xs:complexType>
<xs:sequence>
@@ -20,20 +54,194 @@
<xs:documentation>Comment describing your root element</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:complexType name="Abstract_AUX_HEV-P_PrimaryBusDeclarationType" abstract="true"/>
+ <xs:complexType name="Abstract_AUX_HEV-S_PrimaryBusDeclarationType" abstract="true"/>
+ <xs:complexType name="Abstract_AUX_IEPC_PrimaryBusDeclarationType" abstract="true"/>
+ <xs:complexType name="Abstract_AUX_PEV_PrimaryBusDeclarationType" abstract="true"/>
+ <xs:group name="BusAuxElectricSystemSupplySequenceGroup">
+ <xs:sequence>
+ <xs:element name="SmartAlternator" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="RatedCurrent">
+ <xs:annotation>
+ <xs:documentation>P295 - [A]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ <xs:minExclusive value="0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="RatedVoltage">
+ <xs:annotation>
+ <xs:documentation>P296 - [V]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ <xs:enumeration value="12"/>
+ <xs:enumeration value="24"/>
+ <xs:enumeration value="48"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Battery" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="BatteryTechnology">
+ <xs:annotation>
+ <xs:documentation>P296 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="lead-acid battery – conventional"/>
+ <xs:enumeration value="lead-acid battery – AGM"/>
+ <xs:enumeration value="lead-acid battery – gel"/>
+ <xs:enumeration value="li-ion battery - high power"/>
+ <xs:enumeration value="li-ion battery - high energy"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="RatedCapacity" type="xs:integer">
+ <xs:annotation>
+ <xs:documentation>P299 - [Ah]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="NominalVoltage">
+ <xs:annotation>
+ <xs:documentation>P298 - [V]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ <xs:enumeration value="12"/>
+ <xs:enumeration value="24"/>
+ <xs:enumeration value="48"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Capacitor" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="CapacitorTechnology">
+ <xs:annotation>
+ <xs:documentation>P300 - [-]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="with DCDC converter"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="RatedCapacitance">
+ <xs:annotation>
+ <xs:documentation>P301 - [F]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ <xs:minExclusive value="0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="RatedVoltage">
+ <xs:annotation>
+ <xs:documentation>P302 - [V]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ <xs:minExclusive value="0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:group>
+ <xs:complexType name="AbstractADCDataDeclarationType" abstract="true"/>
<xs:complexType name="AbstractAngledriveDataVIFType" abstract="true"/>
<xs:complexType name="AbstractAuxiliaryDataVIFType" abstract="true"/>
<xs:complexType name="AbstractAxlegearDataVIFType" abstract="true"/>
<xs:complexType name="AbstractAxleWheelsComponentVIFType" abstract="true"/>
<xs:complexType name="AbstractAxleWheelsDataVIFType" abstract="true"/>
+ <xs:complexType name="AbstractBatterySystemDataType" abstract="true">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractREESSDataType"/>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="AbstractCapacitorSystemDataType" abstract="true"/>
+ <xs:complexType name="AbstractElectricMachineSystemDataType" abstract="true"/>
+ <xs:complexType name="AbstractElectricMachineSystemVoltageLevelType" abstract="true"/>
<xs:complexType name="AbstractEngineDataVIFType" abstract="true"/>
+ <xs:complexType name="AbstractIEPCGearsDeclarationType" abstract="true"/>
<xs:complexType name="AbstractManufacturingStepDataType" abstract="true">
<xs:attribute name="id" type="xs:NCName" use="required"/>
</xs:complexType>
<xs:complexType name="AbstractPrimaryVehicleType" abstract="true"/>
+ <xs:complexType name="AbstractREESSDataType" abstract="true"/>
<xs:complexType name="AbstractTorqueConverterDataVIFType" abstract="true"/>
<xs:complexType name="AbstractTransmissionDataVIFType" abstract="true"/>
<xs:complexType name="AbstractTransmissionGearsVIFType" abstract="true"/>
- <xs:complexType name="AbstractVehicleComponentsVIFType" abstract="true"/>
+ <xs:complexType name="AbstractVehicleComponentsConventionalVIFType" abstract="true"/>
+ <xs:complexType name="AbstractVehicleComponentsHEV_Px_VIFType" abstract="true"/>
+ <xs:complexType name="AbstractVehicleComponentsHEV_Sx_VIFType" abstract="true"/>
+ <xs:complexType name="AbstractVehicleComponentsIEPC_S_VIFType" abstract="true"/>
+ <xs:complexType name="AbstractVehicleComponentsIEPC_VIFType" abstract="true"/>
+ <xs:complexType name="AbstractVehicleComponentsPEV_Ex_VIFType" abstract="true"/>
+ <xs:complexType name="AbstractVIFIEPCDataType" abstract="true"/>
+ <xs:complexType name="ADCComponentDeclarationType">
+ <xs:sequence>
+ <xs:element name="Data" type="vif:AbstractADCDataDeclarationType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ADCDataDeclarationType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractADCDataDeclarationType">
+ <xs:sequence>
+ <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+ <xs:annotation>
+ <xs:documentation>P220 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Model" type="v1.0:ModelType">
+ <xs:annotation>
+ <xs:documentation>P221 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+ <xs:annotation>
+ <xs:documentation>P265 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>P223 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AppVersion" type="v1.0:AppVersionType">
+ <xs:annotation>
+ <xs:documentation>P224 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Ratio" type="v1.0:AngledriveRatioType">
+ <xs:annotation>
+ <xs:documentation>P176 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationMethod" type="v1.0:AngledriveCertificationOptionType">
+ <xs:annotation>
+ <xs:documentation>P258 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
<xs:complexType name="AngledriveDataVIFType">
<xs:complexContent>
<xs:extension base="vif:AbstractAngledriveDataVIFType">
@@ -68,7 +276,46 @@
<xs:documentation>P224</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Ratio"/>
+ <xs:element name="Ratio" type="xs:double"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="RetarderDataVIFType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractRetarderVIFDataType">
+ <xs:sequence>
+ <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+ <xs:annotation>
+ <xs:documentation>P220</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Model" type="v1.0:ModelType">
+ <xs:annotation>
+ <xs:documentation>P221</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationMethod" type="v1.0:AngledriveCertificationOptionType">
+ <xs:annotation>
+ <xs:documentation>P258 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P265</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>P223</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AppVersion" type="v1.0:AppVersionType">
+ <xs:annotation>
+ <xs:documentation>P224</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="RetarderRatio" type="xs:double"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -92,12 +339,7 @@
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="AuxiliaryComponentVIFType">
- <xs:sequence>
- <xs:element name="Data" type="vif:AbstractAuxiliaryDataVIFType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="AuxiliaryDataVIFType">
+ <xs:complexType name="AUX_Conventional_PrimaryBusType">
<xs:complexContent>
<xs:extension base="vif:AbstractAuxiliaryDataVIFType">
<xs:sequence>
@@ -301,71 +543,220 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="AxlegearComponentVIFType">
- <xs:sequence>
- <xs:element name="Data" type="vif:AbstractAxlegearDataVIFType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="AxlegearDataVIFType">
+ <xs:complexType name="AUX_HEV-P_PrimaryBusType">
<xs:complexContent>
- <xs:extension base="vif:AbstractAxlegearDataVIFType">
+ <xs:extension base="vif:Abstract_AUX_HEV-P_PrimaryBusDeclarationType">
<xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P215</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P216</xs:documentation>
- </xs:annotation>
+ <xs:element name="Fan">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Technology" type="v2.4:AuxFanTechnologyPrimaryBusType">
+ <xs:annotation>
+ <xs:documentation>P181 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
</xs:element>
- <xs:element name="CertificationMethod" type="v1.0:AxlegearCertificationOptionType">
- <xs:annotation>
- <xs:documentation>P256 - [-]</xs:documentation>
- </xs:annotation>
+ <xs:element name="SteeringPump">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Technology" maxOccurs="4">
+ <xs:annotation>
+ <xs:documentation>P182 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="v2.4:AuxSPTechnologyPrimaryBusType">
+ <xs:attribute name="axleNumber" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="1"/>
+ <xs:maxInclusive value="4"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
</xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P264</xs:documentation>
- </xs:annotation>
+ <xs:element name="ElectricSystem">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="AlternatorTechnology" type="v2.4:AlternatorTechnology_HEV_Type">
+ <xs:annotation>
+ <xs:documentation>P294 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:group ref="vif:BusAuxElectricSystemSupplySequenceGroup" minOccurs="0"/>
+ <xs:element name="SupplyFromHEVPossible" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P303 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
</xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P218</xs:documentation>
- </xs:annotation>
+ <xs:element name="PneumaticSystem">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:group ref="vif:BusAuxPneumaticSystemGen_HEV-Px_SequenceGroup"/>
+ <xs:group ref="vif:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
- <xs:annotation>
- <xs:documentation>P219</xs:documentation>
- </xs:annotation>
+ <xs:element name="HVAC">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="AdjustableCoolantThermostat" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P324 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="EngineWasteGasHeatExchanger" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P326 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
</xs:element>
- <xs:element name="LineType"/>
- <xs:element name="Ratio"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="AxleWheelsComponentVIFType">
+ <xs:complexType name="AUX_HEV-S_PrimaryBusType">
<xs:complexContent>
- <xs:extension base="vif:AbstractAxleWheelsComponentVIFType">
+ <xs:extension base="vif:Abstract_AUX_HEV-S_PrimaryBusDeclarationType">
<xs:sequence>
- <xs:element name="Data" type="vif:AbstractAxleWheelsDataVIFType"/>
+ <xs:element name="Fan">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Technology" type="v2.4:AuxFanTechnologyPrimaryBusType">
+ <xs:annotation>
+ <xs:documentation>P181 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="SteeringPump">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Technology" maxOccurs="4">
+ <xs:annotation>
+ <xs:documentation>P182 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="v2.4:AuxSPTechnology_HEV-S_PrimaryBusType">
+ <xs:attribute name="axleNumber" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="1"/>
+ <xs:maxInclusive value="4"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ElectricSystem">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="AlternatorTechnology" type="v2.4:AlternatorTechnology_HEV-S_Type">
+ <xs:annotation>
+ <xs:documentation>P294 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="SupplyFromHEVPossible" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P303 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="PneumaticSystem">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:group ref="vif:BusAuxPneumaticSystemGen_HEV-S_SequenceGroup"/>
+ <xs:group ref="vif:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="HVAC">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="AdjustableCoolantThermostat" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P324 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="EngineWasteGasHeatExchanger" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P326 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="AxleWheelsDataVIFType">
- <xs:annotation>
- <xs:documentation>Axles & Wheels Component</xs:documentation>
- </xs:annotation>
+ <xs:complexType name="AUX_IEPC_PrimaryBusType">
<xs:complexContent>
- <xs:extension base="vif:AbstractAxleWheelsDataVIFType">
+ <xs:extension base="vif:Abstract_AUX_IEPC_PrimaryBusDeclarationType">
<xs:sequence>
- <xs:element name="Axles">
+ <xs:element name="SteeringPump">
<xs:complexType>
<xs:sequence>
- <xs:element name="Axle" type="v2.0:AbstractAxleDataDeclarationType" minOccurs="2" maxOccurs="4"/>
+ <xs:element name="Technology" maxOccurs="4">
+ <xs:annotation>
+ <xs:documentation>P182 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="v2.4:AuxSPTechnology_PEV_PrimaryBusType">
+ <xs:attribute name="axleNumber" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="1"/>
+ <xs:maxInclusive value="4"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="PneumaticSystem">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:group ref="vif:BusAuxPneumaticSystemGen_IEPC_SequenceGroup"/>
+ <xs:group ref="vif:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="HVAC">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="AdjustableCoolantThermostat" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P324 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -373,1273 +764,1220 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="BusManufacturingStepDataType">
+ <xs:complexType name="AUX_PEV_PrimaryBusType">
<xs:complexContent>
- <xs:extension base="vif:AbstractManufacturingStepDataType">
+ <xs:extension base="vif:Abstract_AUX_PEV_PrimaryBusDeclarationType">
<xs:sequence>
- <xs:element name="HashPreviousStep" type="v1.0:SignatureType"/>
- <xs:element name="Vehicle" type="v2.4:AbstractCompletedBusVehicleType"/>
- <xs:element name="ApplicationInformation" type="vif:ApplicationInformationPrimaryVehicleType"/>
+ <xs:element name="SteeringPump">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Technology" maxOccurs="4">
+ <xs:annotation>
+ <xs:documentation>P182</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="v2.4:AuxSPTechnology_PEV_PrimaryBusType">
+ <xs:attribute name="axleNumber" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="1"/>
+ <xs:maxInclusive value="4"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="PneumaticSystem">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:group ref="vif:BusAuxPneumaticSystemGen_PEV_SequenceGroup"/>
+ <xs:group ref="vif:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="HVAC">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="AdjustableCoolantThermostat" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P324 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="CO2Type">
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="vif:CO2UnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
+ <xs:complexType name="AuxiliaryComponentVIFType">
+ <xs:sequence>
+ <xs:element name="Data" type="vif:AbstractAuxiliaryDataVIFType"/>
+ </xs:sequence>
</xs:complexType>
- <xs:complexType name="EngineComponentVIFType">
+ <xs:complexType name="AxlegearComponentVIFType">
<xs:sequence>
- <xs:element name="Data" type="vif:AbstractEngineDataVIFType"/>
+ <xs:element name="Data" type="vif:AbstractAxlegearDataVIFType"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="EngineDataVIFType">
+ <xs:complexType name="AxlegearDataVIFType">
<xs:complexContent>
- <xs:extension base="vif:AbstractEngineDataVIFType">
+ <xs:extension base="vif:AbstractAxlegearDataVIFType">
<xs:sequence>
<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
<xs:annotation>
- <xs:documentation>P200</xs:documentation>
+ <xs:documentation>P215</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Model" type="v1.0:ModelType">
<xs:annotation>
- <xs:documentation>P201</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
- <xs:annotation>
- <xs:documentation>P261</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P203</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
- <xs:annotation>
- <xs:documentation>P204</xs:documentation>
+ <xs:documentation>P216</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Displacement" type="v1.0:EngineDisplacementType" nillable="false">
+ <xs:element name="CertificationMethod" type="v1.0:AxlegearCertificationOptionType">
<xs:annotation>
- <xs:documentation>P061 - [cm³]</xs:documentation>
+ <xs:documentation>P256 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="RatedSpeed" type="v1.0:EngineDeclaredSpeedType">
+ <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0">
<xs:annotation>
- <xs:documentation>P249 - [1/min]</xs:documentation>
+ <xs:documentation>P264</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="RatedPower" type="v1.0:EngineRatedPower">
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
<xs:annotation>
- <xs:documentation>P250 - [W]</xs:documentation>
+ <xs:documentation>P218</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="MaxEngineTorque" type="v1.0:EngineMaxTorque">
+ <xs:element name="AppVersion" type="v1.0:AppVersionType">
<xs:annotation>
- <xs:documentation>P259 - [Nm]</xs:documentation>
+ <xs:documentation>P219</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="WHRType" type="v2.3:WHRTypeType"/>
- <xs:element name="Mode" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"/>
- <xs:element name="FullLoadAndDragCurve">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Entry" type="v1.0:FullLoadAndDragCurveEntryType" minOccurs="2" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Fuels">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="FuelType" type="v1.0:FuelTypeType" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="LineType"/>
+ <xs:element name="Ratio"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="EnergyConsumptionType">
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="vif:EnergyConsumptionUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="ManufacturingStepType">
- <xs:sequence>
- <xs:element name="Data" type="vif:AbstractManufacturingStepDataType"/>
- <xs:element name="Signature" type="v1.0:SignatureType"/>
- </xs:sequence>
- <xs:attribute name="stepCount" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minInclusive value="2"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="PrimaryVehicleDataType">
- <xs:complexContent>
- <xs:extension base="out:AbstractPrimaryVehicleDataPIFType">
- <xs:sequence>
- <xs:element name="Vehicle" type="vif:AbstractPrimaryVehicleType"/>
- <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
- <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType"/>
- <xs:element name="Results" type="vif:ResultsPrimaryVehicleType"/>
- <xs:element name="ApplicationInformation" type="vif:ApplicationInformationPrimaryVehicleType"/>
- </xs:sequence>
- <xs:attribute name="id" use="required"/>
+ <xs:complexType name="AxleWheelsComponentVIFType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractAxleWheelsComponentVIFType">
+ <xs:sequence>
+ <xs:element name="Data" type="vif:AbstractAxleWheelsDataVIFType"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="PrimaryVehicleType">
- <xs:sequence>
- <xs:element name="Data" type="vif:PrimaryVehicleDataType"/>
- <xs:element name="Signature" type="v1.0:SignatureType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="ResultPrimaryVehicleType">
- <xs:sequence>
- <xs:element name="VehicleGroup">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:minLength value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="Mission" type="vif:MissionTypeType">
- <xs:annotation>
- <xs:documentation>I.2.1.1 / #56</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="SimulationParameters" type="vif:SimulationParametersType"/>
- <xs:choice>
+ <xs:complexType name="AxleWheelsDataVIFType">
+ <xs:annotation>
+ <xs:documentation>Axles & Wheels Component</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractAxleWheelsDataVIFType">
<xs:sequence>
- <xs:element name="Fuel" maxOccurs="unbounded">
+ <xs:element name="Axles">
<xs:complexType>
<xs:sequence>
- <xs:element name="EnergyConsumption" type="vif:EnergyConsumptionType" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>I.2.3.1 - I.2.3.12 / #69</xs:documentation>
- </xs:annotation>
- </xs:element>
+ <xs:element name="Axle" type="v2.0:AbstractAxleDataDeclarationType" minOccurs="2" maxOccurs="4"/>
</xs:sequence>
- <xs:attribute name="type" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
- <xs:element name="CO2" type="vif:CO2Type" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>I.2.3.13 - I.2.3.16 / #68</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:sequence>
- <xs:element name="Error" type="xs:string"/>
- <xs:element name="ErrorDetails" type="xs:string"/>
</xs:sequence>
- </xs:choice>
- </xs:sequence>
- <xs:attribute name="status" use="required"/>
- </xs:complexType>
- <xs:complexType name="ResultsPrimaryVehicleType">
- <xs:sequence>
- <xs:element name="Status"/>
- <xs:choice>
- <xs:element name="Result" type="vif:ResultPrimaryVehicleType" maxOccurs="unbounded"/>
- <xs:element name="ExemptedVehicle">
- <xs:complexType/>
- </xs:element>
- </xs:choice>
- </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
- <xs:complexType name="SimulationParametersType">
- <xs:sequence>
- <xs:element name="TotalVehicleMass">
- <xs:annotation>
- <xs:documentation>I.2.1.4 / #59</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="vif:MassUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="Payload">
- <xs:annotation>
- <xs:documentation>I.2.1.2 / #57</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="vif:MassUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="PassengerCount">
- <xs:simpleType>
- <xs:restriction base="xs:double">
- <xs:minExclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="FuelMode" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="dual fuel mode"/>
- <xs:enumeration value="single fuel mode"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
+ <xs:complexType name="BatterySystemCurrentLimitsEntryType">
+ <xs:attribute name="SoC" type="v2.3:BatterySoCType" use="required">
+ <xs:annotation>
+ <xs:documentation>P529 - [%]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="maxChargingCurrent" type="v2.3:BatteryMaxCurrentType" use="required">
+ <xs:annotation>
+ <xs:documentation>P530 - [A]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="maxDischargingCurrent" type="v2.3:BatteryMaxCurrentType" use="required">
+ <xs:annotation>
+ <xs:documentation>P531 - [A]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:complexType>
- <xs:complexType name="TorqueConverterDataVIFType">
+ <xs:complexType name="BatterySystemDataType">
<xs:complexContent>
- <xs:extension base="vif:AbstractTorqueConverterDataVIFType">
+ <xs:extension base="vif:AbstractBatterySystemDataType">
<xs:sequence>
<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P205</xs:documentation>
- </xs:annotation>
+ <!-- <xs:annotation>
+ <xs:documentation>P511 - [-]</xs:documentation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="BatterySystem">511</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ </xs:annotation> -->
</xs:element>
<xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P206</xs:documentation>
- </xs:annotation>
+ <!-- <xs:annotation>
+ <xs:documentation>P512 - [-]</xs:documentation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="BatterySystem">512</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ </xs:annotation> -->
</xs:element>
- <xs:element name="CertificationMethod" type="v1.0:TorqueConverterCertificationOptionType">
+ <xs:element name="CertificationMethod" type="v2.3:CertificationMethodType">
<xs:annotation>
- <xs:documentation>P254 - [-]</xs:documentation>
+ <xs:documentation>P516 - enum</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0">
<xs:annotation>
- <xs:documentation>P262</xs:documentation>
+ <xs:documentation>P513 - [-]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="BatterySystem">513</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
</xs:element>
<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
<xs:annotation>
- <xs:documentation>P208</xs:documentation>
+ <xs:documentation>P514 - [-]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="BatterySystem">514</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
</xs:element>
<xs:element name="AppVersion" type="v1.0:AppVersionType">
<xs:annotation>
- <xs:documentation>P209</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Characteristics" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Entry" type="v1.0:TorqueConverterCharacteristicsEntryType" minOccurs="2" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="TorqueConverterVIFType">
- <xs:sequence>
- <xs:element name="Data" type="vif:AbstractTorqueConverterDataVIFType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="TransmissionComponentVIFType">
- <xs:sequence>
- <xs:element name="Data" type="vif:AbstractTransmissionDataVIFType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="TransmissionDataVIFType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractTransmissionDataVIFType">
- <xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P205</xs:documentation>
+ <xs:documentation>P515 - [-]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="BatterySystem">515</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
+ <xs:element name="BatteryType" type="v2.3:BatteryTypeType">
<xs:annotation>
- <xs:documentation>P206</xs:documentation>
+ <xs:documentation>P517 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="MainCertificationMethod" type="v1.0:GearboxCertificationOptionType">
+ <xs:element name="RatedCapacity">
<xs:annotation>
- <xs:documentation>P254 - [-]</xs:documentation>
+ <xs:documentation>P518 - [Ah]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="BatterySystem">518</vectoParam:parameterId>
+ <vectoParam:unit>Ah</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="v1.0:Double2">
+ <xs:minExclusive value="0.00"/>
+ </xs:restriction>
+ </xs:simpleType>
</xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0">
+ <xs:element name="ConnectorsSubsystemsIncluded" type="xs:boolean">
<xs:annotation>
- <xs:documentation>P262</xs:documentation>
+ <xs:documentation>P519 - bool</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="BatterySystem">519</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:element name="JunctionboxIncluded" type="xs:boolean">
<xs:annotation>
- <xs:documentation>P208</xs:documentation>
+ <xs:documentation>P520 - bool</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="BatterySystem">520</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
+ <xs:element name="TestingTemperature" type="xs:int" minOccurs="0">
<xs:annotation>
- <xs:documentation>P209</xs:documentation>
+ <xs:documentation>P521 - [°C]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="BatterySystem">521</vectoParam:parameterId>
+ <vectoParam:unit>°C</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="TransmissionType"/>
- <xs:element name="Gears" type="vif:AbstractTransmissionGearsVIFType"/>
+ <xs:element name="OCV">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Entry" type="vif:BatterySystemOCVEntryType" minOccurs="2" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CurrentLimits">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Entry" type="vif:BatterySystemCurrentLimitsEntryType" minOccurs="2" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="TransmissionGearVIFType">
+ <xs:complexType name="BatterySystemInternalResistanceEntryType">
+ <xs:attribute name="SoC" type="v2.3:BatterySoCType" use="required">
+ <xs:annotation>
+ <xs:documentation>P524 - [%]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="R_2" type="v2.3:InternalResistanceType" use="required">
+ <xs:annotation>
+ <xs:documentation>P525 - [mOhm]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="R_10" type="v2.3:InternalResistanceType" use="required">
+ <xs:annotation>
+ <xs:documentation>P526 - [mOhm]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="R_20" type="v2.3:InternalResistanceType" use="required">
+ <xs:annotation>
+ <xs:documentation>P527 - [mOhm]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="R_120" type="v2.3:InternalResistanceType">
+ <xs:annotation>
+ <xs:documentation>P528 - [mOhm]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ <xs:complexType name="BatterySystemOCVEntryType">
+ <xs:attribute name="SoC" type="v2.3:BatterySoCType" use="required">
+ <xs:annotation>
+ <xs:documentation>P522 - [%]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="OCV" type="v2.3:BatteryOCVType" use="required">
+ <xs:annotation>
+ <xs:documentation>P523 - [V]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ <xs:complexType name="BusManufacturingStepDataType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractManufacturingStepDataType">
+ <xs:sequence>
+ <xs:element name="HashPreviousStep" type="v1.0:SignatureType"/>
+ <xs:element name="Vehicle" type="v2.4:AbstractCompletedBusVehicleType"/>
+ <xs:element name="ApplicationInformation" type="vif:ApplicationInformationPrimaryVehicleType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:group name="BusAuxPneumaticSystemConsumerSequenceGroup">
<xs:sequence>
- <xs:element name="Ratio"/>
- <xs:element name="MaxTorque" type="v1.0:GearboxGearMaxTorqueType" minOccurs="0">
+ <xs:element name="SmartRegenerationSystem" type="xs:boolean">
<xs:annotation>
- <xs:documentation>P157 - [Nm]</xs:documentation>
+ <xs:documentation>P312 - bool</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="MaxSpeed" type="v1.0:GearboxGearMaxSpeedType" minOccurs="0">
+ <xs:element name="AirsuspensionControl">
<xs:annotation>
- <xs:documentation>P194 - [1/min]</xs:documentation>
+ <xs:documentation>P315 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="mechanically"/>
+ <xs:enumeration value="electronically"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="PneumaticSCRReagentDosing" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P316 - bool</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
- <xs:attribute name="number" use="required"/>
- </xs:complexType>
- <xs:complexType name="TransmissionGearsVIFType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractTransmissionGearsVIFType">
- <xs:sequence>
- <xs:element name="Gear" type="vif:TransmissionGearVIFType" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="VectoOutputMultistepType">
+ </xs:group>
+ <xs:group name="BusAuxPneumaticSystemGen_HEV-Px_SequenceGroup">
<xs:sequence>
- <xs:element name="PrimaryVehicle" type="vif:PrimaryVehicleType"/>
- <xs:element name="ManufacturingStep" type="vif:ManufacturingStepType" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="SizeOfAirSupply" type="v2.4:PneumaticSystemTechnologyType">
+ <xs:annotation>
+ <xs:documentation>P309 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CompressorDrive">
+ <xs:annotation>
+ <xs:documentation>P310 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="mechanically"/>
+ <xs:enumeration value="electrically"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="Clutch" type="v2.4:PneumaticSystemClutchTypeType">
+ <xs:annotation>
+ <xs:documentation>P311 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CompressorRatio">
+ <xs:annotation>
+ <xs:documentation>P314 - [-]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="v1.0:Double3">
+ <xs:minInclusive value="0.000"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="SmartCompressionSystem" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P313 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
</xs:sequence>
- </xs:complexType>
- <!--Components-->
- <xs:complexType name="Vehicle_Conventional_ComponentsVIFType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractVehicleComponentsVIFType">
- <xs:sequence>
- <xs:element name="Engine" type="vif:EngineComponentVIFType"/>
- <xs:element name="Transmission" type="vif:TransmissionComponentVIFType"/>
- <xs:element name="TorqueConverter" type="vif:TorqueConverterVIFType" minOccurs="0"/>
- <xs:element name="Angledrive" type="vif:AngledriveVIFType" minOccurs="0"/>
- <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
- <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
- <xs:element name="Auxiliaries" type="vif:AuxiliaryComponentVIFType"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="Vehicle_HEV-Px_ComponentsVIFType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractVehicleComponentsVIFType">
- <xs:sequence>
- <xs:element name="Engine" type="vif:EngineComponentVIFType"/>
- <xs:element name="IEPC" type="vif:IEPCType"/>
- <xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
- <xs:element name="ElectricMachineGEN" type="vif:ElectricMachineGENType"/>
- <xs:element name="ElectricMachine" type="vif:ElectricMachineType"/>
- <xs:element name="Transmission" type="vif:TransmissionComponentVIFType"/>
- <xs:element name="TorqueConverter" type="vif:TorqueConverterVIFType" minOccurs="0"/>
- <xs:element name="Angledrive" type="vif:AngledriveVIFType" minOccurs="0"/>
- <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
- <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
- <xs:element name="Auxiliaries" type="vif:HEV-P_PrimaryAuxiliariesVIFType"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="Vehicle_HEV-IEPC-S_ComponentsVIFType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractVehicleComponentsVIFType">
- <xs:sequence>
- <xs:element name="Engine" type="vif:EngineComponentVIFType"/>
- <xs:element name="ElectricMachineGEN" type="vif:ElectricMachineGENType"/>
- <xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
- <xs:element name="IEPC" type="vif:IEPCType"/>
- <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType" minOccurs="0"/>
- <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
- <xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="Vehicle-IEPC_ComponentsVIFType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractVehicleComponentsVIFType">
- <xs:sequence>
- <xs:element name="IEPC" type="vif:IEPCType"/>
- <xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
- <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType" minOccurs="0"/>
- <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
- <xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="Vehicle_HEV-S2_ComponentsVIFType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractVehicleComponentsVIFType">
- <xs:sequence>
- <xs:group ref="vif:Vehicle_HEV-Sx_ComponentsVIFTypeSequenceGroup"/>
- <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType" minOccurs="0"/>
- <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
- <xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="Vehicle_HEV-S3_ComponentsVIFType">
+ </xs:group>
+ <xs:group name="BusAuxPneumaticSystemGen_IEPC_SequenceGroup">
+ <xs:sequence>
+ <xs:element name="CompressorDrive">
+ <xs:annotation>
+ <xs:documentation>P310 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="electrically"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="BusAuxPneumaticSystemGen_PEV_SequenceGroup">
+ <xs:sequence>
+ <xs:element name="CompressorDrive">
+ <xs:annotation>
+ <xs:documentation>P310 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="electrically"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="BusAuxPneumaticSystemGen_HEV-S_SequenceGroup">
+ <xs:sequence>
+ <xs:element name="SizeOfAirSupply" type="v2.4:PneumaticSystemTechnologyType">
+ <xs:annotation>
+ <xs:documentation>P309 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CompressorDrive">
+ <xs:annotation>
+ <xs:documentation>P310 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="mechanically"/>
+ <xs:enumeration value="electrically"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="Clutch" type="v2.4:PneumaticSystemClutchTypeType">
+ <xs:annotation>
+ <xs:documentation>P311 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CompressorRatio">
+ <xs:annotation>
+ <xs:documentation>P314 - [-]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="v1.0:Double3">
+ <xs:minInclusive value="0.000"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:group>
+ <xs:complexType name="CapacitorSystemDataType">
<xs:complexContent>
- <xs:extension base="vif:AbstractVehicleComponentsVIFType">
+ <xs:extension base="vif:AbstractCapacitorSystemDataType">
<xs:sequence>
- <xs:group ref="vif:Vehicle_HEV-Sx_ComponentsVIFTypeSequenceGroup"/>
- <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType" minOccurs="0"/>
- <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
- <xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="Vehicle_HEV-S4_ComponentsVIFType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractVehicleComponentsVIFType">
- <xs:sequence>
- <xs:group ref="vif:Vehicle_HEV-Sx_ComponentsVIFTypeSequenceGroup"/>
- <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
- <xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="Vehicle_PEV-E2_ComponentsVIFType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractVehicleComponentsVIFType">
- <xs:sequence>
- <xs:element name="ElectricMachine" type="vif:ElectricMachineType"/>
- <xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
- <xs:element name="Transmission" type="vif:TransmissionComponentVIFType"/>
- <xs:element name="TorqueConverter" type="vif:TorqueConverterVIFType" minOccurs="0"/>
- <xs:element name="Angledrive" type="vif:AngledriveVIFType" minOccurs="0"/>
- <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
- <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
- <xs:element name="Auxiliaries" type="vif:PEV_PrimaryAuxiliairesVIFType"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="Vehicle_PEV-E3_ComponentsVIFType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractVehicleComponentsVIFType">
- <xs:sequence>
- <xs:element name="ElectricMachine" type="vif:ElectricMachineType"/>
- <xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
- <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
- <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
- <xs:element name="Auxiliaries" type="vif:PEV_PrimaryAuxiliairesVIFType"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="Vehicle_PEV-E4_ComponentsVIFType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractVehicleComponentsVIFType">
- <xs:sequence>
- <xs:element name="ElectricMachine" type="vif:ElectricMachineType"/>
- <xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
- <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
- <xs:element name="Auxiliaries" type="vif:PEV_PrimaryAuxiliairesVIFType"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <!--VehicleVIFType-->
- <xs:complexType name="VehicleExemptedPrimaryBusType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractPrimaryVehicleType">
- <xs:sequence>
- <xs:element name="ManufacturerPrimaryVehicle" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P235 / I.1.1.1 / #14</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ManufacturerAddressPrimaryVehicle" type="v1.0:ManufacturerAddressType">
+ <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
<xs:annotation>
- <xs:documentation>P252 / I.1.1.1 / #14</xs:documentation>
+ <xs:documentation>P532 - [-]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="CapacitorSystem">532</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
</xs:element>
<xs:element name="Model" type="v1.0:ModelType">
<xs:annotation>
- <xs:documentation>P236 / I.1.1.2</xs:documentation>
+ <xs:documentation>P533 - [-]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="CapacitorSystem">533</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="VIN" type="v1.0:VINType">
+ <xs:element name="CertificationMethod" type="v2.3:CertificationMethodType">
<xs:annotation>
- <xs:documentation>P238 / I.1.1.3 / #1</xs:documentation>
+ <xs:documentation>P537 - enum</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="CapacitorSystem">537</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone"/>
- <xs:element name="LegislativeCategory">
+ <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0">
<xs:annotation>
- <xs:documentation>P251 / I.1.1.4 / #10</xs:documentation>
+ <xs:documentation>P534 - [-]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="CapacitorSystem">534</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:minLength value="1"/>
- </xs:restriction>
- </xs:simpleType>
</xs:element>
- <xs:element name="ChassisConfiguration" type="v2.4:ChassisConfigurationPrimaryBusDeclarationType">
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
<xs:annotation>
- <xs:documentation>P036 - enum</xs:documentation>
+ <xs:documentation>P535 - [-]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="CapacitorSystem">535</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="AxleConfiguration" type="v2.4:AxleConfigurationPrimaryBusLorryDeclarationType">
+ <xs:element name="AppVersion" type="v1.0:AppVersionType">
<xs:annotation>
- <xs:documentation>P037 - enum</xs:documentation>
+ <xs:documentation>P536 - [-]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="CapacitorSystem">536</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="Articulated" type="xs:boolean"/>
- <xs:element name="TechnicalPermissibleMaximumLadenMass">
+ <xs:element name="Capacitance" type="v2.3:CapacitanceType">
<xs:annotation>
- <xs:documentation>P041 / I.1.1.6 / #12</xs:documentation>
+ <xs:documentation>P538 - [F]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="CapacitorSystem">538</vectoParam:parameterId>
+ <vectoParam:unit>F</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="out:MassUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
</xs:element>
- <xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+ <xs:element name="InternalResistance" type="v2.3:InternalResistanceType">
<xs:annotation>
- <xs:documentation>P269 / I.1.1.10</xs:documentation>
+ <xs:documentation>P539 - [mOhm]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="CapacitorSystem">539</vectoParam:parameterId>
+ <vectoParam:unit>mOhm</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="SumNetPower">
+ <xs:element name="MinVoltage" type="v2.3:CapacitorVoltageType">
<xs:annotation>
- <xs:documentation>P277</xs:documentation>
+ <xs:documentation>P540 - [V]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="CapacitorSystem">540</vectoParam:parameterId>
+ <vectoParam:unit>V</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="out:PowerUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
</xs:element>
- <xs:element name="Technology">
+ <xs:element name="MaxVoltage" type="v2.3:CapacitorVoltageType">
<xs:annotation>
- <xs:documentation>P332 - enum</xs:documentation>
+ <xs:documentation>P541 - [V]</xs:documentation>
</xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="HEV Article 9 exempted"/>
- <xs:enumeration value="PEV Article 9 exempted"/>
- <xs:enumeration value="HV Article 9 exempted"/>
- <xs:enumeration value="Fuel cell vehicle"/>
- <xs:enumeration value="H2 ICE"/>
- <xs:enumeration value="Dual fuel vehicle Article 9 exempted"/>
- <xs:enumeration value="In-motion charging Article 9 exempted"/>
- <xs:enumeration value="Other technology Article 9 exempted"/>
- </xs:restriction>
- </xs:simpleType>
</xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="ConventionalVehicleVIFType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractPrimaryVehicleType">
- <xs:sequence>
- <xs:element name="ManufacturerPrimaryVehicle" type="v1.0:ManufacturerType"/>
- <xs:element name="ManufacturerAddressPrimaryVehicle" type="v1.0:ManufacturerAddressType"/>
- <xs:element name="Model" type="v1.0:ModelType"/>
- <xs:element name="VIN" type="v1.0:VINType"/>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone"/>
- <xs:element name="LegislativeCategory" type="xs:string">
+ <xs:element name="MaxChargingCurrent" type="v2.3:CapacitorMaxCurrentType">
<xs:annotation>
- <xs:documentation>P251 - [-]</xs:documentation>
+ <xs:documentation>P542 - [A]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="ChassisConfiguration" type="v2.4:ChassisConfigurationPrimaryBusDeclarationType"/>
- <xs:element name="AxleConfiguration" type="v2.4:AxleConfigurationPrimaryBusLorryDeclarationType"/>
- <xs:element name="Articulated" type="xs:boolean"/>
- <xs:element name="TechnicalPermissibleMaximumLadenMass" type="v1.0:VehicleGrossVehicleMassType"/>
- <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"/>
- <xs:element name="RetarderType" type="v1.0:RetarderTypeType"/>
- <xs:element name="RetarderRatio" type="v1.0:RetarderRatioType" minOccurs="0">
+ <xs:element name="MaxDischargingCurrent" type="v2.3:CapacitorMaxCurrentType">
<xs:annotation>
- <xs:documentation>P053 - [-]</xs:documentation>
+ <xs:documentation>P543 - [A]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
+ <xs:element name="TestingTemperature" type="xs:int" minOccurs="0">
<xs:annotation>
- <xs:documentation>P180 - enum</xs:documentation>
+ <xs:documentation>P544 - [°C]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="CapacitorSystem">544</vectoParam:parameterId>
+ <vectoParam:unit>°C</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
- <xs:element name="ADAS" type="v2.1:AbstractAdvancedDriverAssistantSystemsType"/>
- <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
- <xs:element name="Components" type="vif:AbstractVehicleComponentsVIFType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="HEV-IEPC-S_VehicleVIFType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractPrimaryVehicleType">
- <xs:sequence>
- <xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
- <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType">
- <xs:annotation>
- <xs:documentation>P198 - [1/min]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:group ref="v2.4:Vehicle_RetarderSequenceGroup"/>
- <xs:group ref="vif:Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup"/>
- <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
- <xs:annotation>
- <xs:documentation>P180 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ZeroEmissionVehicle" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P269 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ArchitectureID" type="v2.4:ArchitectureID_HEV-IEPC-S_Type">
- <xs:annotation>
- <xs:documentation>P400 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:group ref="vif:Vehicle_PrimaryBus_xEV_ParametersSequenceGroup"/>
- <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/>
- <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
- <xs:element name="Components" type="v2.4:Abstract_Components_HEV-IEPC-S_PrimaryBusDeclarationType"/>
- </xs:sequence>
+ <xs:complexType name="CO2Type">
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="vif:CO2UnitType" use="required"/>
</xs:extension>
- </xs:complexContent>
+ </xs:simpleContent>
</xs:complexType>
- <xs:complexType name="HEV-Sx_VehicleVIFType">
+ <xs:complexType name="ConventionalVehicleVIFType">
<xs:complexContent>
<xs:extension base="vif:AbstractPrimaryVehicleType">
<xs:sequence>
<xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
- <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType">
- <xs:annotation>
- <xs:documentation>P198 - [1/min]</xs:documentation>
- </xs:annotation>
- </xs:element>
+ <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"/>
<xs:group ref="vif:Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup"/>
<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
<xs:annotation>
<xs:documentation>P180 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="ZeroEmissionVehicle" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P269 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ArchitectureID" type="v2.4:ArchitectureID_HEV-Sx_Type">
- <xs:annotation>
- <xs:documentation>P400 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:group ref="vif:Vehicle_PrimaryBus_xEV_ParametersSequenceGroup"/>
- <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/>
- <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsSerialHybridDeclarationType" minOccurs="0"/>
- <xs:element name="Components" type="v2.4:Abstract_Components_HEV-Sx_PrimaryBusDeclarationType"/>
+ <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
+ <xs:element name="ADAS" type="v2.4:Abstract_ADAS_ConventionalType"/>
+ <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
+ <xs:element name="Components" type="vif:AbstractVehicleComponentsConventionalVIFType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="HEV-Px_VehicleVIFType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractPrimaryVehicleType">
- <xs:sequence>
- <xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
- <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType">
- <xs:annotation>
- <xs:documentation>P198 - [1/min]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:group ref="vif:Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup"/>
- <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
+ <xs:complexType name="ElectricEnergyStorageType">
+ <xs:choice>
+ <xs:element name="Capacitor" type="vif:REESSCapacitorType"/>
+ <xs:element name="Battery" type="vif:REESSBatteryType" maxOccurs="unbounded"/>
+ </xs:choice>
+ </xs:complexType>
+ <xs:complexType name="ElectricMachineSystemConditioningEntryType">
+ <xs:attribute name="coolantTempInlet" type="v2.3:CoolantTempInletType" use="required">
+ <xs:annotation>
+ <xs:documentation>P476 - [°C]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="coolingPower" type="v2.3:CoolingPowerType" use="required">
+ <xs:annotation>
+ <xs:documentation>P477 - [W]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ <xs:complexType name="ElectricMachineSystemDragTorqueEntryType">
+ <xs:attribute name="outShaftSpeed" type="v2.3:OutShaftSpeedType" use="required">
+ <xs:annotation>
+ <xs:documentation>P471 - [rpm]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="dragTorque" type="v2.3:DragTorqueType" use="required">
+ <xs:annotation>
+ <xs:documentation>P472 - [Nm]</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ <xs:complexType name="ElectricMachineGENType">
+ <xs:sequence>
+ <xs:element name="PowertrainPosition" type="v2.4:PowertrainPositionGENType">
+ <xs:annotation>
+ <xs:documentation>P403 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Count">
+ <xs:annotation>
+ <xs:documentation>P404 - [-]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="ElectricMachineSystem" type="vif:ElectricMachineSystemComponentDeclarationType"/>
+ <xs:element name="ADC" type="vif:ADCComponentDeclarationType" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ElectricMachineSystemComponentDeclarationType">
+ <xs:sequence>
+ <xs:element name="Data" type="vif:AbstractElectricMachineSystemDataType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ElectricMachineSystemMaxTorqueCurveType">
+ <xs:sequence>
+ <xs:element name="Entry" type="vif:ElectricMachineSystemMaxTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ElectricMachineSystemDataDeclarationType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractElectricMachineSystemDataType">
+ <xs:sequence>
+ <xs:group ref="vif:ElectricMachineSystemCommonParametersSequenceGroup"/>
+ <xs:group ref="vif:ElectricMachineSystemPowerRatingsSequenceGroup"/>
+ <xs:element name="DcDcConverterIncluded" type="xs:boolean">
<xs:annotation>
- <xs:documentation>P180 - enum</xs:documentation>
+ <xs:documentation>P465 - bool</xs:documentation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="ElectricMachine">465</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+ <xs:element name="IHPCType" type="v2.3:IHPCTypeType">
<xs:annotation>
- <xs:documentation>P269 - bool</xs:documentation>
+ <xs:documentation>P466 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="ArchitectureID" type="v2.4:ArchitectureID_HEV-Px_Type">
- <xs:annotation>
- <xs:documentation>P400 - enum</xs:documentation>
- </xs:annotation>
+ <xs:element name="VoltageLevel" type="vif:ElectricMachineSystemVoltageLevelMeasuredType" maxOccurs="unbounded"/>
+ <xs:element name="DragCurve">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Entry" type="vif:ElectricMachineSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Conditioning" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Entry" type="vif:ElectricMachineSystemConditioningEntryType" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:element>
- <xs:group ref="vif:Vehicle_PrimaryBus_xEV_ParametersSequenceGroup"/>
- <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/>
- <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
- <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
- <xs:element name="BoostingLimitations" type="v2.4:AbstractBoostingLimitationsDeclarationType" minOccurs="0"/>
- <xs:element name="Components" type="v2.4:Abstract_Components_HEV-Px_PrimaryBusDeclarationType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="IEPC_VehicleVIFType">
+ <xs:complexType name="ElectricMachineSystemVoltageLevelMeasuredType">
<xs:complexContent>
- <xs:extension base="vif:AbstractPrimaryVehicleType">
+ <xs:extension base="v2.3:AbstractElectricMachineSystemVoltageLevelType">
<xs:sequence>
- <xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
- <xs:group ref="vif:Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup"/>
- <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
+ <xs:element name="Voltage" type="v2.3:VoltageLevelVoltageType" minOccurs="0">
<xs:annotation>
- <xs:documentation>P180 - enum</xs:documentation>
+ <xs:documentation>P467 - [V]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+ <xs:element name="ContinuousTorque" type="v2.3:MaxTorqueType">
<xs:annotation>
- <xs:documentation>P269 - bool</xs:documentation>
+ <xs:documentation>P459 - [Nm]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="ArchitectureID" type="v2.4:ArchitectureID_IEPC_Type">
+ <xs:element name="TestSpeedContinuousTorque" type="v2.3:TestSpeedType">
<xs:annotation>
- <xs:documentation>P400 - enum</xs:documentation>
+ <xs:documentation>P460 - [1/min]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:group ref="vif:Vehicle_PrimaryBus_xEV_ParametersSequenceGroup"/>
- <xs:element name="ADAS" type="v2.4:Abstract_ADAS_IEPCType"/>
- <xs:element name="Components" type="v2.4:Abstract_Components_IEPC_PrimaryBusDeclarationType"/>
+ <xs:element name="OverloadTorque" type="v2.3:MaxTorqueType">
+ <xs:annotation>
+ <xs:documentation>P461 - [Nm]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="TestSpeedOverloadTorque" type="v2.3:TestSpeedType">
+ <xs:annotation>
+ <xs:documentation>P462 - [1/min]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
+ <xs:annotation>
+ <xs:documentation>P463 - [s]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="MaxTorqueCurve" type="vif:ElectricMachineSystemMaxTorqueCurveType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="PEV_VehicleVIFType">
+ <xs:complexType name="ElectricMachineSystemVoltageLevelStandardValuesType">
<xs:complexContent>
- <xs:extension base="vif:PrimaryVehicleDataType">
+ <xs:extension base="v2.3:AbstractElectricMachineSystemVoltageLevelType">
<xs:sequence>
- <xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
- <xs:group ref="vif:Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup"/>
- <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
+ <xs:element name="ContinuousTorque" type="v2.3:MaxTorqueType">
<xs:annotation>
- <xs:documentation>P180 - enum</xs:documentation>
+ <xs:documentation>P459 - [Nm]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+ <xs:element name="TestSpeedContinuousTorque" type="v2.3:TestSpeedType">
<xs:annotation>
- <xs:documentation>P269 - bool</xs:documentation>
+ <xs:documentation>P460 - [1/min]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="ArchitectureID" type="v2.4:ArchitectureID_PEV_Type">
+ <xs:element name="OverloadTorque" type="v2.3:MaxTorqueType">
<xs:annotation>
- <xs:documentation>P400 - enum</xs:documentation>
+ <xs:documentation>P461 - [Nm]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:group ref="vif:Vehicle_PrimaryBus_xEV_ParametersSequenceGroup"/>
- <xs:element name="ADAS" type="v2.4:Abstract_ADAS_PEVType"/>
- <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
- <xs:element name="Components" type="v2.4:Abstract_Components_PEV_PrimaryBusDeclarationType"/>
+ <xs:element name="TestSpeedOverloadTorque" type="v2.3:TestSpeedType">
+ <xs:annotation>
+ <xs:documentation>P462 - [1/min]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
+ <xs:annotation>
+ <xs:documentation>P463 - [s]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="MaxTorqueCurve">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Entry" type="vif:ElectricMachineSystemMaxTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="PowerMap">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Entry" type="vif:ElectricMachineSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:simpleType name="CO2UnitType">
- <xs:restriction base="xs:string">
- <xs:enumeration value="g/km"/>
- <xs:enumeration value="g/t-km"/>
- <xs:enumeration value="g/p-km"/>
- <xs:enumeration value="g/m³-km"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="EnergyConsumptionUnitType">
- <xs:restriction base="xs:string">
- <xs:enumeration value="MJ/km"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="MassUnitType">
- <xs:restriction base="xs:token">
- <xs:enumeration value="kg"/>
- <xs:enumeration value="t"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="MissionTypeType">
- <xs:restriction base="xs:token">
- <xs:enumeration value="Long Haul EMS"/>
- <xs:enumeration value="Long Haul"/>
- <xs:enumeration value="Regional Delivery EMS"/>
- <xs:enumeration value="Regional Delivery"/>
- <xs:enumeration value="Urban Delivery"/>
- <xs:enumeration value="Municipal Utility"/>
- <xs:enumeration value="Construction"/>
- <xs:enumeration value="Heavy Urban"/>
- <xs:enumeration value="Urban"/>
- <xs:enumeration value="Suburban"/>
- <xs:enumeration value="Interurban"/>
- <xs:enumeration value="Coach"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:group name="Vehicle_PrimaryBusParametersSequenceGroup">
+ <xs:complexType name="ElectricMachineSystemType">
<xs:sequence>
- <xs:group ref="vif:Vehicle_PrimaryBusGeneralParametersSequence"/>
- <xs:group ref="vif:Vehicle_PrimaryBusChassisBusParameters"/>
+ <xs:element name="Data" type="vif:AbstractElectricMachineSystemDataType"/>
</xs:sequence>
- </xs:group>
- <xs:group name="Vehicle_PrimaryBusGeneralParametersSequence">
+ </xs:complexType>
+ <xs:complexType name="ElectricMachineType">
<xs:sequence>
- <xs:element name="ManufacturerAddress" type="v1.0:ManufacturerAddressType">
+ <xs:element name="PowertrainPosition" type="v2.4:PowertrainPositionDriveType">
<xs:annotation>
- <xs:documentation>P252 - [-]</xs:documentation>
+ <xs:documentation>P403 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
+ <xs:element name="Count">
<xs:annotation>
- <xs:documentation>P236 - [-]</xs:documentation>
+ <xs:documentation>P404 - [-]</xs:documentation>
</xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
</xs:element>
- <xs:element name="VIN" type="v1.0:VINType">
+ <xs:element name="ElectricMachineSystem" type="vif:ElectricMachineSystemComponentDeclarationType"/>
+ <xs:element name="ADC" type="vif:ADCComponentDeclarationType" minOccurs="0"/>
+ <xs:element name="P2.5GearRatios" minOccurs="0">
<xs:annotation>
- <xs:documentation>P238 - [-]</xs:documentation>
+ <xs:documentation>P407 - [-]</xs:documentation>
</xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Ratio" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="v1.0:Double3">
+ <xs:attribute name="gear" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
</xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="EnergyConsumptionType">
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="vif:EnergyConsumptionUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ <xs:complexType name="EngineComponentVIFType">
+ <xs:sequence>
+ <xs:element name="Data" type="vif:AbstractEngineDataVIFType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="WHRTypeType">
+ <xs:sequence>
+ <xs:element name="MechanicalOutputICE" type="xs:boolean">
<xs:annotation>
- <xs:documentation>P239 - [-]</xs:documentation>
+ <xs:documentation>P335 - bool</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P235 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:group>
- <xs:group name="Vehicle_PrimaryBusChassisBusParameters">
- <xs:sequence>
- <xs:sequence>
- <xs:element name="LegislativeCategory" type="v2.4:LegislativeCategoryPrimaryBusDeclarationType">
- <xs:annotation>
- <xs:documentation>P251 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ChassisConfiguration" type="v2.4:ChassisConfigurationPrimaryBusDeclarationType">
- <xs:annotation>
- <xs:documentation>P036 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AxleConfiguration" type="v2.4:AxleConfigurationPrimaryBusLorryDeclarationType">
- <xs:annotation>
- <xs:documentation>P037 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Articulated" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P281 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="TechnicalPermissibleMaximumLadenMass" type="v1.0:VehicleGrossVehicleMassType">
- <xs:annotation>
- <xs:documentation>P041 - [kg]</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:sequence>
- </xs:group>
- <xs:group name="Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup">
- <xs:sequence>
- <xs:sequence>
- <xs:element name="RetarderType" type="v2.4:RetarderTypeType">
- <xs:annotation>
- <xs:documentation>P052 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="RetarderRatio" type="v1.0:RetarderRatioType" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P053 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:sequence>
- </xs:group>
- <xs:group name="Vehicle_PrimaryBus_xEV_ParametersSequenceGroup">
- <xs:sequence>
- <xs:sequence>
- <xs:element name="OvcHev" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P401 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MaxChargingPower" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P402 - [W]</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minExclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:sequence>
- </xs:group>
- <xs:complexType name="HEV-S_PrimaryAuxiliariesVIFType">
- <xs:sequence>
- <xs:element name="Data" type="vif:Abstract_AUX_HEV-S_PrimaryBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="HEV-P_PrimaryAuxiliariesVIFType">
- <xs:sequence>
- <xs:element name="Data" type="vif:Abstract_AUX_HEV-P_PrimaryBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="PEV_PrimaryAuxiliairesVIFType">
- <xs:sequence>
- <xs:element name="Data" type="vif:Abstract_AUX_PEV_PrimaryBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="IEPC_PrimaryAuxiliairesVIFType">
- <xs:sequence>
- <xs:element name="Data" type="vif:Abstract_AUX_IEPC_PrimaryBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="ElectricMachineGENType">
- <xs:sequence>
- <xs:element name="PowertrainPosition" type="v2.4:PowertrainPositionGENType">
+ <xs:element name="MechanicalOutputDrivetrain" type="xs:boolean">
<xs:annotation>
- <xs:documentation>P403 - enum</xs:documentation>
+ <xs:documentation>P336 - bool</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Count">
+ <xs:element name="ElectricalOutput" type="xs:boolean">
<xs:annotation>
- <xs:documentation>P404 - [-]</xs:documentation>
+ <xs:documentation>P337 - bool</xs:documentation>
</xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minInclusive value="1"/>
- </xs:restriction>
- </xs:simpleType>
</xs:element>
- <xs:element name="ADC" type="vif:ADCComponentDeclarationType" minOccurs="0"/>
- <xs:element name="ElectricMachineSystem" type="vif:ElectricMachineSystemType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="ElectricEnergyStorageType">
- <xs:choice>
- <xs:element name="Capacitor" type="vif:REESSCapacitorType"/>
- <xs:element name="Battery" type="vif:REESSBatteryType" maxOccurs="unbounded"/>
- </xs:choice>
- </xs:complexType>
- <xs:complexType name="REESSCapacitorType">
- <xs:sequence>
- <xs:element name="Data" type="vif:AbstractCapacitorSystemDataType"/>
- <xs:element name="Signature" type="v2.0:SignatureType"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="AbstractCapacitorSystemDataType" abstract="true">
- <xs:complexContent>
- <xs:extension base="vif:AbstractREESSDataType"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="AbstractREESSDataType" abstract="true">
- <xs:complexContent>
- <xs:extension base="v1.0:VectoSimulationComponent"/>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="CapacitorSystemDataType">
+ <xs:complexType name="EngineDataVIFType">
<xs:complexContent>
- <xs:extension base="vif:AbstractCapacitorSystemDataType">
+ <xs:extension base="vif:AbstractEngineDataVIFType">
<xs:sequence>
<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
<xs:annotation>
- <xs:documentation>P532 - [-]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="CapacitorSystem">532</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P200</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Model" type="v1.0:ModelType">
<xs:annotation>
- <xs:documentation>P533 - [-]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="CapacitorSystem">533</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P201</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
<xs:annotation>
- <xs:documentation>P534 - [-]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="CapacitorSystem">534</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P261</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
<xs:annotation>
- <xs:documentation>P535 - [-]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="CapacitorSystem">535</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P203</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="AppVersion" type="v1.0:AppVersionType">
<xs:annotation>
- <xs:documentation>P536 - [-]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="CapacitorSystem">536</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P204</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="CertificationMethod" type="v2.3:CertificationMethodType">
+ <xs:element name="Displacement" type="v1.0:EngineDisplacementType" nillable="false">
<xs:annotation>
- <xs:documentation>P537 - enum</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="CapacitorSystem">537</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P061 - [cm³]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Capacitance" type="v2.3:CapacitanceType">
+ <xs:element name="RatedSpeed" type="v1.0:EngineDeclaredSpeedType">
<xs:annotation>
- <xs:documentation>P538 - [F]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="CapacitorSystem">538</vectoParam:parameterId>
- <vectoParam:unit>F</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P249 - [1/min]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="InternalResistance" type="v2.3:InternalResistanceType">
+ <xs:element name="RatedPower" type="v1.0:EngineRatedPower">
<xs:annotation>
- <xs:documentation>P539 - [mOhm]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="CapacitorSystem">539</vectoParam:parameterId>
- <vectoParam:unit>mOhm</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P250 - [W]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="MinVoltage" type="v2.3:CapacitorVoltageType">
+ <xs:element name="MaxEngineTorque" type="v1.0:EngineMaxTorque">
<xs:annotation>
- <xs:documentation>P540 - [V]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="CapacitorSystem">540</vectoParam:parameterId>
- <vectoParam:unit>V</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P259 - [Nm]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="MaxVoltage" type="v2.3:CapacitorVoltageType">
+ <xs:element name="WHRType" type="vif:WHRTypeType"/>
+ <xs:element name="Mode" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"/>
+ <xs:element name="FullLoadAndDragCurve">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Entry" type="v1.0:FullLoadAndDragCurveEntryType" minOccurs="2" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Fuels">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="FuelType" type="v1.0:FuelTypeType" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="HEV-IEPC-S_VehicleVIFType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractPrimaryVehicleType">
+ <xs:sequence>
+ <xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
+ <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType">
<xs:annotation>
- <xs:documentation>P541 - [V]</xs:documentation>
+ <xs:documentation>P198 - [1/min]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="MaxChargingCurrent" type="v2.3:CapacitorMaxCurrentType">
+ <xs:group ref="vif:Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup"/>
+ <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
<xs:annotation>
- <xs:documentation>P542 - [A]</xs:documentation>
+ <xs:documentation>P180 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="MaxDischargingCurrent" type="v2.3:CapacitorMaxCurrentType">
+ <xs:element name="ZeroEmissionVehicle" type="xs:boolean">
<xs:annotation>
- <xs:documentation>P543 - [A]</xs:documentation>
+ <xs:documentation>P269 - bool</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="TestingTemperature" type="xs:int" minOccurs="0">
+ <xs:element name="ArchitectureID" type="v2.4:ArchitectureID_HEV-IEPC-S_Type">
<xs:annotation>
- <xs:documentation>P544 - [°C]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="CapacitorSystem">544</vectoParam:parameterId>
- <vectoParam:unit>°C</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P400 - enum</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:group ref="vif:Vehicle_PrimaryBus_xEV_ParametersSequenceGroup"/>
+ <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/>
+ <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
+ <xs:element name="Components" type="vif:AbstractVehicleComponentsIEPC_S_VIFType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="BatterySystemDataType">
+ <xs:complexType name="HEV-P_PrimaryAuxiliariesVIFType">
+ <xs:sequence>
+ <xs:element name="Data" type="vif:Abstract_AUX_HEV-P_PrimaryBusDeclarationType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="HEV-Px_VehicleVIFType">
<xs:complexContent>
- <xs:extension base="v2.3:AbstractBatterySystemDataType">
+ <xs:extension base="vif:AbstractPrimaryVehicleType">
<xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <!-- <xs:annotation>
- <xs:documentation>P511 - [-]</xs:documentation>
- <xs:appinfo>
- <vectoParam:description>
- <vectoParam:parameterId component="BatterySystem">511</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description>
- </xs:appinfo>
- </xs:annotation> -->
+ <xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
+ <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType">
+ <xs:annotation>
+ <xs:documentation>P198 - [1/min]</xs:documentation>
+ </xs:annotation>
</xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <!-- <xs:annotation>
- <xs:documentation>P512 - [-]</xs:documentation>
- <xs:appinfo>
- <vectoParam:description>
- <vectoParam:parameterId component="BatterySystem">512</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description>
- </xs:appinfo>
- </xs:annotation> -->
+ <xs:group ref="vif:Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup"/>
+ <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
+ <xs:annotation>
+ <xs:documentation>P180 - enum</xs:documentation>
+ </xs:annotation>
</xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+ <xs:element name="ZeroEmissionVehicle" type="xs:boolean">
<xs:annotation>
- <xs:documentation>P513 - [-]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="BatterySystem">513</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P269 - bool</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:element name="ArchitectureID" type="v2.4:ArchitectureID_HEV-Px_Type">
<xs:annotation>
- <xs:documentation>P514 - [-]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="BatterySystem">514</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P400 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
+ <xs:group ref="vif:Vehicle_PrimaryBus_xEV_ParametersSequenceGroup"/>
+ <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/>
+ <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
+ <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
+ <xs:element name="BoostingLimitations" type="v2.4:AbstractBoostingLimitationsDeclarationType" minOccurs="0"/>
+ <xs:element name="Components" type="vif:AbstractVehicleComponentsHEV_Px_VIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="HEV-S_PrimaryAuxiliariesVIFType">
+ <xs:sequence>
+ <xs:element name="Data" type="vif:Abstract_AUX_HEV-S_PrimaryBusDeclarationType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="HEV-Sx_VehicleVIFType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractPrimaryVehicleType">
+ <xs:sequence>
+ <xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
+ <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType">
<xs:annotation>
- <xs:documentation>P515 - [-]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="BatterySystem">515</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P198 - [1/min]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="CertificationMethod" type="v2.3:CertificationMethodType">
+ <xs:group ref="vif:Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup"/>
+ <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
<xs:annotation>
- <xs:documentation>P516 - enum</xs:documentation>
+ <xs:documentation>P180 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="BatteryType" type="v2.3:BatteryTypeType">
+ <xs:element name="ZeroEmissionVehicle" type="xs:boolean">
<xs:annotation>
- <xs:documentation>P517 - enum</xs:documentation>
+ <xs:documentation>P269 - bool</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="RatedCapacity">
+ <xs:element name="ArchitectureID" type="v2.4:ArchitectureID_HEV-Sx_Type">
<xs:annotation>
- <xs:documentation>P518 - [Ah]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="BatterySystem">518</vectoParam:parameterId>
- <vectoParam:unit>Ah</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P400 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:group ref="vif:Vehicle_PrimaryBus_xEV_ParametersSequenceGroup"/>
+ <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/>
+ <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsSerialHybridDeclarationType" minOccurs="0"/>
+ <xs:element name="Components" type="vif:AbstractVehicleComponentsHEV_Sx_VIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="IEPC_PrimaryAuxiliairesVIFType">
+ <xs:sequence>
+ <xs:element name="Data" type="vif:Abstract_AUX_IEPC_PrimaryBusDeclarationType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="IEPC_VehicleVIFType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractPrimaryVehicleType">
+ <xs:sequence>
+ <xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
+ <xs:group ref="vif:Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup"/>
+ <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
+ <xs:annotation>
+ <xs:documentation>P180 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P269 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ArchitectureID" type="v2.4:ArchitectureID_IEPC_Type">
+ <xs:annotation>
+ <xs:documentation>P400 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:group ref="vif:Vehicle_PrimaryBus_xEV_ParametersSequenceGroup"/>
+ <xs:element name="ADAS" type="v2.4:Abstract_ADAS_IEPCType"/>
+ <xs:element name="Components" type="vif:AbstractVehicleComponentsIEPC_VIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="IEPCGearDeclarationType">
+ <xs:sequence>
+ <xs:element name="Ratio" type="v1.0:GearboxGearRatioType">
+ <xs:annotation>
+ <xs:documentation>P497 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="MaxOutShaftTorque" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P498 - [Nm]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minExclusive value="0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="MaxOutShaftSpeed" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P499 - [1/min]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minExclusive value="0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="number" type="v1.0:GearboxGearNumberType" use="required">
+ <xs:annotation>
+ <xs:documentation>P496 - [-]</xs:documentation>
+ <xs:appinfo>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ <xs:complexType name="IEPCGearsDeclarationType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractIEPCGearsDeclarationType">
+ <xs:sequence>
+ <xs:element name="Gear" type="vif:IEPCGearDeclarationType" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="IEPCMeasuredDataDeclarationType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractVIFIEPCDataType">
+ <xs:sequence>
+ <xs:group ref="vif:IEPCCommonParametersSequenceGroup"/>
+ <xs:element name="CertificationMethod">
+ <xs:annotation>
+ <xs:documentation>P484 - enum</xs:documentation>
</xs:annotation>
<xs:simpleType>
- <xs:restriction base="v1.0:Double2">
- <xs:minExclusive value="0.00"/>
+ <xs:restriction base="v2.3:IEPCCertificationMethodType">
+ <xs:enumeration value="Measured for complete component"/>
+ <xs:enumeration value="Measured for EM and standard values for other components"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
- <xs:element name="ConnectorsSubsystemsIncluded" type="xs:boolean">
+ <xs:group ref="vif:IEPCPowerRatingsSequenceGroup"/>
+ <xs:element name="DifferentialIncluded" type="xs:boolean">
<xs:annotation>
- <xs:documentation>P519 - bool</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="BatterySystem">519</vectoParam:parameterId>
+ <xs:documentation>P493 - bool</xs:documentation>
+ <!-- <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="IEPC">493</vectoParam:parameterId>
<vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ </vectoParam:description>
+ </xs:appinfo> -->
</xs:annotation>
</xs:element>
- <xs:element name="JunctionboxIncluded" type="xs:boolean">
+ <xs:element name="DesignTypeWheelMotor" type="xs:boolean">
<xs:annotation>
- <xs:documentation>P520 - bool</xs:documentation>
+ <xs:documentation>P494 - bool</xs:documentation>
<xs:appinfo>
<!-- <vectoParam:description>
- <vectoParam:parameterId component="BatterySystem">520</vectoParam:parameterId>
+ <vectoParam:parameterId component="IEPC">494</vectoParam:parameterId>
<vectoParam:unit>-</vectoParam:unit>
</vectoParam:description> -->
</xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="TestingTemperature" type="xs:int" minOccurs="0">
+ <xs:element name="NrOfDesignTypeWheelMotorMeasured" type="v2.3:NrOfDesignTypeWheelMotorMeasuredType" minOccurs="0">
<xs:annotation>
- <xs:documentation>P521 - [°C]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="BatterySystem">521</vectoParam:parameterId>
- <vectoParam:unit>°C</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P495 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="OCV">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Entry" type="vif:BatterySystemOCVEntryType" minOccurs="2" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="InternalResistance">
+ <xs:element name="Gears" type="vif:AbstractIEPCGearsDeclarationType"/>
+ <xs:element name="VoltageLevel" type="vif:IEPCSystemVoltageLevelMeasuredType" minOccurs="2" maxOccurs="unbounded"/>
+ <xs:element name="DragCurve" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
- <xs:element name="Entry" type="vif:BatterySystemInternalResistanceEntryType" minOccurs="2" maxOccurs="unbounded"/>
+ <xs:element name="Entry" type="vif:IEPCSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
</xs:sequence>
+ <xs:attribute name="gear" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:complexType>
</xs:element>
- <xs:element name="CurrentLimits">
+ <xs:element name="Conditioning" minOccurs="0">
<xs:complexType>
<xs:sequence>
- <xs:element name="Entry" type="vif:BatterySystemCurrentLimitsEntryType" minOccurs="2" maxOccurs="unbounded"/>
+ <xs:element name="Entry" type="vif:IEPCSystemConditioningEntryType"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -1647,67 +1985,172 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="BatterySystemCurrentLimitsEntryType">
- <xs:attribute name="SoC" type="v2.3:BatterySoCType" use="required">
- <xs:annotation>
- <xs:documentation>P529 - [%]</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="maxChargingCurrent" type="v2.3:BatteryMaxCurrentType" use="required">
+ <xs:complexType name="IEPCSystemConditioningEntryType">
+ <xs:attribute name="coolantTempInlet" type="v2.3:CoolantTempInletType" use="required">
<xs:annotation>
- <xs:documentation>P530 - [A]</xs:documentation>
+ <xs:documentation>P509 - [°C]</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="maxDischargingCurrent" type="v2.3:BatteryMaxCurrentType" use="required">
+ <xs:attribute name="coolingPower" type="v2.3:CoolingPowerType" use="required">
<xs:annotation>
- <xs:documentation>P531 - [A]</xs:documentation>
+ <xs:documentation>P510 - [W]</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
- <xs:complexType name="BatterySystemInternalResistanceEntryType">
- <xs:attribute name="SoC" type="v2.3:BatterySoCType" use="required">
- <xs:annotation>
- <xs:documentation>P524 - [%]</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="R_2" type="v2.3:InternalResistanceType" use="required">
+ <xs:complexType name="IEPCSystemDragTorqueEntryType">
+ <xs:attribute name="outShaftSpeed" type="v2.3:OutShaftSpeedType" use="required">
<xs:annotation>
- <xs:documentation>P525 - [mOhm]</xs:documentation>
+ <xs:documentation>P504 - [rpm]</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="R_10" type="v2.3:InternalResistanceType" use="required">
+ <xs:attribute name="dragTorque" type="v2.3:DragTorqueType" use="required">
<xs:annotation>
- <xs:documentation>P526 - [mOhm]</xs:documentation>
+ <xs:documentation>P505 - [Nm]</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="R_20" type="v2.3:InternalResistanceType" use="required">
- <xs:annotation>
- <xs:documentation>P527 - [mOhm]</xs:documentation>
- </xs:annotation>
+ </xs:complexType>
+ <xs:complexType name="IEPCSystemVoltageLevelMeasuredType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractElectricMachineSystemVoltageLevelType">
+ <xs:sequence>
+ <xs:element name="Voltage" type="v2.3:VoltageLevelVoltageType">
+ <xs:annotation>
+ <xs:documentation>P500 - [V]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ContinuousTorque" type="v2.3:MaxTorqueType">
+ <xs:annotation>
+ <xs:documentation>P487 - [Nm]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="TestSpeedContinuousTorque" type="v2.3:TestSpeedType">
+ <xs:annotation>
+ <xs:documentation>P488 - [1/min]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="OverloadTorque" type="v2.3:MaxTorqueType">
+ <xs:annotation>
+ <xs:documentation>P489 - [Nm]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="TestSpeedOverloadTorque" type="v2.3:TestSpeedType">
+ <xs:annotation>
+ <xs:documentation>P490 - [1/min]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
+ <xs:annotation>
+ <xs:documentation>P491 - [s]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="MaxTorqueCurve" type="v2.3:ElectricMachineSystemMaxTorqueCurveType"/>
+ <xs:element name="PowerMap" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Entry" type="v2.3:IEPCSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="gear" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="IEPCType">
+ <xs:sequence>
+ <xs:element name="Data" type="vif:AbstractVIFIEPCDataType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ManufacturingStepType">
+ <xs:sequence>
+ <xs:element name="Data" type="vif:AbstractManufacturingStepDataType"/>
+ <xs:element name="Signature" type="v1.0:SignatureType"/>
+ </xs:sequence>
+ <xs:attribute name="stepCount" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="2"/>
+ </xs:restriction>
+ </xs:simpleType>
</xs:attribute>
- <xs:attribute name="R_120" type="v2.3:InternalResistanceType">
+ </xs:complexType>
+ <xs:complexType name="TorqueConverterCharacteristicsEntryType">
+ <xs:attribute name="speedRatio" type="v1.0:TorqueConverterSpeedRatioType" use="required">
<xs:annotation>
- <xs:documentation>P528 - [mOhm]</xs:documentation>
+ <xs:documentation>P099 - [-]</xs:documentation>
</xs:annotation>
</xs:attribute>
- </xs:complexType>
- <xs:complexType name="BatterySystemOCVEntryType">
- <xs:attribute name="SoC" type="v2.3:BatterySoCType" use="required">
+ <xs:attribute name="torqueRatio" type="v1.0:TorqueConverterTorqueRatioType" use="required">
<xs:annotation>
- <xs:documentation>P522 - [%]</xs:documentation>
+ <xs:documentation>P100 - [-]</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="OCV" type="v2.3:BatteryOCVType" use="required">
+ <xs:attribute name="inputTorqueRef" type="v1.0:TorqueConverterInputTorqueRefType" use="required">
<xs:annotation>
- <xs:documentation>P523 - [V]</xs:documentation>
+ <xs:documentation>P101 - [-]</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
- <xs:complexType name="AbstractBatterySystemDataType" abstract="true">
+ <xs:complexType name="PEV_Ex_VehicleVIFType">
<xs:complexContent>
- <xs:extension base="vif:AbstractREESSDataType"/>
+ <xs:extension base="vif:AbstractPrimaryVehicleType">
+ <xs:sequence>
+ <xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
+ <xs:group ref="vif:Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup"/>
+ <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
+ <xs:annotation>
+ <xs:documentation>P180 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P269 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ArchitectureID" type="v2.4:ArchitectureID_PEV_Type">
+ <xs:annotation>
+ <xs:documentation>P400 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:group ref="vif:Vehicle_PrimaryBus_xEV_ParametersSequenceGroup"/>
+ <xs:element name="ADAS" type="v2.4:Abstract_ADAS_PEVType"/>
+ <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
+ <xs:element name="Components" type="vif:AbstractVehicleComponentsPEV_Ex_VIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="PEV_PrimaryAuxiliairesVIFType">
+ <xs:sequence>
+ <xs:element name="Data" type="vif:Abstract_AUX_PEV_PrimaryBusDeclarationType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="PrimaryVehicleDataType">
+ <xs:complexContent>
+ <xs:extension base="out:AbstractPrimaryVehicleDataPIFType">
+ <xs:sequence>
+ <xs:element name="Vehicle" type="vif:AbstractPrimaryVehicleType"/>
+ <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
+ <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType"/>
+ <xs:element name="Results" type="vif:ResultsPrimaryVehicleType"/>
+ <xs:element name="ApplicationInformation" type="vif:ApplicationInformationPrimaryVehicleType"/>
+ </xs:sequence>
+ <xs:attribute name="id" use="required"/>
+ </xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="PrimaryVehicleType">
+ <xs:sequence>
+ <xs:element name="Data" type="vif:PrimaryVehicleDataType"/>
+ <xs:element name="Signature" type="v1.0:SignatureType"/>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="REESSBatteryType">
<xs:sequence>
<xs:element name="StringID">
@@ -1724,7 +2167,6 @@
<xs:complexType>
<xs:sequence>
<xs:element name="Data" type="vif:AbstractBatterySystemDataType"/>
- <xs:element name="Signature" type="v2.0:SignatureType"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -1754,411 +2196,449 @@
</xs:sequence>
</xs:sequence>
</xs:complexType>
- <xs:group name="IEPCCommonParametersSequenceGroup">
+ <xs:complexType name="REESSCapacitorType">
<xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+ <xs:element name="Data" type="vif:AbstractCapacitorSystemDataType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ResultPrimaryVehicleType">
+ <xs:sequence>
+ <xs:element name="PrimaryVehicleSubgroup">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="Mission" type="vif:MissionTypeType">
<xs:annotation>
- <xs:documentation>P478 - [-]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="IEPC">478</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>I.2.1.1 / #56</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
+ <xs:element name="SimulationParameters" type="vif:SimulationParametersType"/>
+ <xs:choice>
+ <xs:group ref="vif:ResultPrimaryVehicleGroup"/>
+ <xs:element name="OVCMode" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:group ref="vif:ResultPrimaryVehicleGroup"/>
+ </xs:sequence>
+ <xs:attribute name="type" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:sequence>
+ <xs:element name="Error" type="xs:string"/>
+ <xs:element name="ErrorDetails" type="xs:string"/>
+ </xs:sequence>
+ </xs:choice>
+ </xs:sequence>
+ <xs:attribute name="status" use="required"/>
+ </xs:complexType>
+ <xs:complexType name="ResultsPrimaryVehicleType">
+ <xs:sequence>
+ <xs:element name="Status"/>
+ <xs:choice>
+ <xs:element name="Result" type="vif:ResultPrimaryVehicleType" maxOccurs="unbounded"/>
+ <xs:element name="ExemptedVehicle">
+ <xs:complexType/>
+ </xs:element>
+ </xs:choice>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="SimulationParametersType">
+ <xs:sequence>
+ <xs:element name="TotalVehicleMass">
<xs:annotation>
- <xs:documentation>P479 - [-]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="IEPC">479</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>I.2.1.4 / #59</xs:documentation>
</xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="vif:MassUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
</xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+ <xs:element name="Payload">
<xs:annotation>
- <xs:documentation>P480 - [-]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="IEPC">480</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>I.2.1.2 / #57</xs:documentation>
</xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="vif:MassUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
</xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P481 - [-]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="IEPC">481</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
- <xs:annotation>
- <xs:documentation>P482 - [-]</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="IEPC">482</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="ElectricMachineType" type="v2.3:ElectricMachineTypeType">
- <xs:annotation>
- <xs:documentation>P483 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:group>
- <xs:group name="IEPCPowerRatingsSequenceGroup">
- <xs:sequence>
- <xs:element name="R85RatedPower" type="v2.3:R85RatedPowerType">
- <xs:annotation>
- <xs:documentation>P485 - [W]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="RotationalInertia" type="v2.3:RotationalInertiaType">
- <xs:annotation>
- <xs:documentation>P486 [ kgm2]</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:group>
- <xs:complexType name="IEPCGearDeclarationType">
- <xs:sequence>
- <xs:element name="Ratio" type="v1.0:GearboxGearRatioType">
- <xs:annotation>
- <xs:documentation>P497 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MaxOutShaftTorque" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P498 - [Nm]</xs:documentation>
- </xs:annotation>
+ <xs:element name="PassengerCount">
<xs:simpleType>
- <xs:restriction base="xs:int">
+ <xs:restriction base="xs:double">
<xs:minExclusive value="0"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
- <xs:element name="MaxOutShaftSpeed" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P499 - [1/min]</xs:documentation>
- </xs:annotation>
+ <xs:element name="FuelMode" minOccurs="0">
<xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minExclusive value="0"/>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="dual fuel mode"/>
+ <xs:enumeration value="single fuel mode"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
- <xs:attribute name="number" type="v1.0:GearboxGearNumberType" use="required">
- <xs:annotation>
- <xs:documentation>P496 - [-]</xs:documentation>
- <xs:appinfo>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="AbstractIEPCGearsDeclarationType" abstract="true"/>
- <xs:complexType name="IEPCGearsDeclarationType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractIEPCGearsDeclarationType">
- <xs:sequence>
- <xs:element name="Gear" type="vif:IEPCGearDeclarationType" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
</xs:complexType>
- <xs:complexType name="AbstractElectricMachineSystemVoltageLevelType" abstract="true"/>
- <xs:complexType name="IEPCSystemVoltageLevelMeasuredType">
+ <xs:complexType name="TorqueConverterDataVIFType">
<xs:complexContent>
- <xs:extension base="vif:AbstractElectricMachineSystemVoltageLevelType">
+ <xs:extension base="vif:AbstractTorqueConverterDataVIFType">
<xs:sequence>
- <xs:element name="Voltage" type="v2.3:VoltageLevelVoltageType">
+ <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
<xs:annotation>
- <xs:documentation>P500 - [V]</xs:documentation>
+ <xs:documentation>P205</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="ContinuousTorque" type="v2.3:MaxTorqueType">
+ <xs:element name="Model" type="v1.0:ModelType">
<xs:annotation>
- <xs:documentation>P487 - [Nm]</xs:documentation>
+ <xs:documentation>P206</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="TestSpeedContinuousTorque" type="v2.3:TestSpeedType">
+ <xs:element name="CertificationMethod" type="v1.0:TorqueConverterCertificationOptionType">
<xs:annotation>
- <xs:documentation>P488 - [1/min]</xs:documentation>
+ <xs:documentation>P254 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="OverloadTorque" type="v2.3:MaxTorqueType">
+ <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0">
<xs:annotation>
- <xs:documentation>P489 - [Nm]</xs:documentation>
+ <xs:documentation>P262</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="TestSpeedOverloadTorque" type="v2.3:TestSpeedType">
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
<xs:annotation>
- <xs:documentation>P490 - [1/min]</xs:documentation>
+ <xs:documentation>P208</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
+ <xs:element name="AppVersion" type="v1.0:AppVersionType">
<xs:annotation>
- <xs:documentation>P491 - [s]</xs:documentation>
+ <xs:documentation>P209</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="MaxTorqueCurve" type="v2.3:ElectricMachineSystemMaxTorqueCurveType"/>
- <xs:element name="PowerMap" maxOccurs="unbounded">
+ <xs:element name="Characteristics" minOccurs="0">
<xs:complexType>
<xs:sequence>
- <xs:element name="Entry" type="v2.3:IEPCSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+ <xs:element name="Entry" type="vif:TorqueConverterCharacteristicsEntryType" minOccurs="2" maxOccurs="unbounded"/>
</xs:sequence>
- <xs:attribute name="gear" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minInclusive value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="IEPCSystemDragTorqueEntryType">
- <xs:attribute name="outShaftSpeed" type="v2.3:OutShaftSpeedType" use="required">
- <xs:annotation>
- <xs:documentation>P504 - [rpm]</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="dragTorque" type="v2.3:DragTorqueType" use="required">
- <xs:annotation>
- <xs:documentation>P505 - [Nm]</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="IEPCSystemConditioningEntryType">
- <xs:attribute name="coolantTempInlet" type="v2.3:CoolantTempInletType" use="required">
- <xs:annotation>
- <xs:documentation>P509 - [°C]</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="coolingPower" type="v2.3:CoolingPowerType" use="required">
- <xs:annotation>
- <xs:documentation>P510 - [W]</xs:documentation>
- </xs:annotation>
- </xs:attribute>
+ <xs:complexType name="TorqueConverterVIFType">
+ <xs:sequence>
+ <xs:element name="Data" type="vif:AbstractTorqueConverterDataVIFType"/>
+ </xs:sequence>
</xs:complexType>
- <xs:complexType name="AbstractVIFIEPCDataType" abstract="true"/>
- <xs:complexType name="IEPCType">
+ <xs:complexType name="TransmissionComponentVIFType">
<xs:sequence>
- <xs:element name="Data" type="vif:AbstractVIFIEPCDataType"/>
- <xs:element name="Signature" type="v2.0:SignatureType"/>
+ <xs:element name="Data" type="vif:AbstractTransmissionDataVIFType"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="IEPCMeasuredDataDeclarationType">
+ <xs:complexType name="TransmissionDataVIFType">
<xs:complexContent>
- <xs:extension base="vif:AbstractVIFIEPCDataType">
+ <xs:extension base="vif:AbstractTransmissionDataVIFType">
<xs:sequence>
- <xs:group ref="vif:IEPCCommonParametersSequenceGroup"/>
- <xs:element name="CertificationMethod">
+ <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
<xs:annotation>
- <xs:documentation>P484 - enum</xs:documentation>
+ <xs:documentation>P205</xs:documentation>
</xs:annotation>
- <xs:simpleType>
- <xs:restriction base="v2.3:IEPCCertificationMethodType">
- <xs:enumeration value="Measured for complete component"/>
- <xs:enumeration value="Measured for EM and standard values for other components"/>
- </xs:restriction>
- </xs:simpleType>
</xs:element>
- <xs:group ref="vif:IEPCPowerRatingsSequenceGroup"/>
- <xs:element name="DifferentialIncluded" type="xs:boolean">
+ <xs:element name="Model" type="v1.0:ModelType">
<xs:annotation>
- <xs:documentation>P493 - bool</xs:documentation>
- <!-- <xs:appinfo>
- <vectoParam:description>
- <vectoParam:parameterId component="IEPC">493</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description>
- </xs:appinfo> -->
+ <xs:documentation>P206</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="DesignTypeWheelMotor" type="xs:boolean">
+ <xs:element name="MainCertificationMethod" type="v1.0:GearboxCertificationOptionType">
<xs:annotation>
- <xs:documentation>P494 - bool</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="IEPC">494</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
+ <xs:documentation>P254 - [-]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="NrOfDesignTypeWheelMotorMeasured" type="v2.3:NrOfDesignTypeWheelMotorMeasuredType" minOccurs="0">
+ <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0">
<xs:annotation>
- <xs:documentation>P495 - enum</xs:documentation>
+ <xs:documentation>P262</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Gears" type="vif:AbstractIEPCGearsDeclarationType"/>
- <xs:element name="VoltageLevel" type="vif:IEPCSystemVoltageLevelMeasuredType" minOccurs="2" maxOccurs="unbounded"/>
- <xs:element name="DragCurve" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Entry" type="vif:IEPCSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="gear" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minInclusive value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>P208</xs:documentation>
+ </xs:annotation>
</xs:element>
- <xs:element name="Conditioning" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Entry" type="vif:IEPCSystemConditioningEntryType"/>
- </xs:sequence>
- </xs:complexType>
+ <xs:element name="AppVersion" type="v1.0:AppVersionType">
+ <xs:annotation>
+ <xs:documentation>P209</xs:documentation>
+ </xs:annotation>
</xs:element>
+ <xs:element name="TransmissionType"/>
+ <xs:element name="Gears" type="vif:AbstractTransmissionGearsVIFType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="ElectricMachineSystemComponentDeclarationType">
- <xs:sequence>
- <xs:element name="Data" type="vif:AbstractElectricMachineSystemDataType"/>
- <xs:element name="Signature" type="v2.0:SignatureType"/>
- </xs:sequence>
+ <xs:complexType name="TransmissionGearsVIFType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractTransmissionGearsVIFType">
+ <xs:sequence>
+ <xs:element name="Gear" type="vif:TransmissionGearVIFType" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
- <xs:complexType name="ElectricMachineType">
+ <xs:complexType name="TransmissionGearVIFType">
<xs:sequence>
- <xs:element name="Count">
+ <xs:element name="Ratio"/>
+ <xs:element name="MaxTorque" type="v1.0:GearboxGearMaxTorqueType" minOccurs="0">
<xs:annotation>
- <xs:documentation>P404 - [-]</xs:documentation>
+ <xs:documentation>P157 - [Nm]</xs:documentation>
</xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minInclusive value="1"/>
- </xs:restriction>
- </xs:simpleType>
</xs:element>
- <xs:element name="ElectricMachineSystem" type="vif:ElectricMachineSystemComponentDeclarationType"/>
- <xs:element name="ADC" type="vif:ADCComponentDeclarationType" minOccurs="0"/>
- <xs:element name="P2.5GearRatios" minOccurs="0">
+ <xs:element name="MaxSpeed" type="v1.0:GearboxGearMaxSpeedType" minOccurs="0">
<xs:annotation>
- <xs:documentation>P407 - [-]</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Ratio" maxOccurs="unbounded">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="v1.0:Double3">
- <xs:attribute name="gear" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="PowertrainPosition" type="v2.4:PowertrainPositionDriveType">
- <xs:annotation>
- <xs:documentation>P403 - enum</xs:documentation>
+ <xs:documentation>P194 - [1/min]</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
+ <xs:attribute name="number" use="required"/>
</xs:complexType>
- <xs:group name="Vehicle_HEV-Sx_ComponentsVIFTypeSequenceGroup">
- <xs:sequence>
- <xs:element name="Engine" type="vif:EngineComponentVIFType"/>
- <xs:element name="ElectricMachineGEN" type="vif:ElectricMachineGENType"/>
- <xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
- <xs:element name="ElectricMachine" type="vif:ElectricMachineType"/>
- </xs:sequence>
- </xs:group>
- <xs:complexType name="ElectricMachineSystemType">
+ <xs:complexType name="VectoOutputMultistepType">
<xs:sequence>
- <xs:element name="Data" type="v2.3:AbstractElectricMachineSystemDataType"/>
- <xs:element name="Signature" type="v2.0:SignatureType"/>
+ <xs:element name="PrimaryVehicle" type="vif:PrimaryVehicleType"/>
+ <xs:element name="ManufacturingStep" type="vif:ManufacturingStepType" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="ADCComponentDeclarationType">
- <xs:sequence>
- <xs:element name="Data" type="vif:AbstractADCDataDeclarationType"/>
- <xs:element name="Signature" type="v2.0:SignatureType"/>
- </xs:sequence>
+ <xs:complexType name="Vehicle_Conventional_ComponentsVIFType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractVehicleComponentsConventionalVIFType">
+ <xs:sequence>
+ <xs:element name="Engine" type="vif:EngineComponentVIFType"/>
+ <xs:element name="Transmission" type="vif:TransmissionComponentVIFType"/>
+ <xs:element name="TorqueConverter" type="vif:TorqueConverterVIFType" minOccurs="0"/>
+ <xs:element name="Angledrive" type="vif:AngledriveVIFType" minOccurs="0"/>
+ <xs:element name="Retarder" type="vif:RetarderVIFType" minOccurs="0"/>
+ <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
+ <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+ <xs:element name="Auxiliaries" type="vif:AuxiliaryComponentVIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
- <xs:complexType name="AbstractADCDataDeclarationType" abstract="true">
+ <xs:complexType name="Vehicle_HEV-IEPC-S_ComponentsVIFType">
<xs:complexContent>
- <xs:extension base="v1.0:AbstractAngledriveDataDeclarationType"/>
+ <xs:extension base="vif:AbstractVehicleComponentsIEPC_S_VIFType">
+ <xs:sequence>
+ <xs:element name="Engine" type="vif:EngineComponentVIFType"/>
+ <xs:element name="ElectricMachineGEN" type="vif:ElectricMachineGENType"/>
+ <xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
+ <xs:element name="IEPC" type="vif:IEPCType"/>
+ <xs:element name="Retarder" type="vif:RetarderVIFType" minOccurs="0"/>
+ <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType" minOccurs="0"/>
+ <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+ <xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
+ </xs:sequence>
+ </xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="ADCDataDeclarationType">
+ <xs:complexType name="Vehicle_HEV-Px_ComponentsVIFType">
<xs:complexContent>
- <xs:extension base="vif:AbstractADCDataDeclarationType">
+ <xs:extension base="vif:AbstractVehicleComponentsHEV_Px_VIFType">
<xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P220 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P221 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
- <xs:annotation>
- <xs:documentation>P265 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P223 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
+ <xs:element name="Engine" type="vif:EngineComponentVIFType"/>
+ <xs:element name="ElectricMachine" type="vif:ElectricMachineType"/>
+ <xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
+ <xs:element name="Transmission" type="vif:TransmissionComponentVIFType"/>
+ <xs:element name="TorqueConverter" type="vif:TorqueConverterVIFType" minOccurs="0"/>
+ <xs:element name="Angledrive" type="vif:AngledriveVIFType" minOccurs="0"/>
+ <xs:element name="Retarder" type="vif:RetarderVIFType" minOccurs="0"/>
+ <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
+ <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+ <xs:element name="Auxiliaries" type="vif:HEV-P_PrimaryAuxiliariesVIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="Vehicle_HEV-S2_ComponentsVIFType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractVehicleComponentsHEV_Sx_VIFType">
+ <xs:sequence>
+ <xs:group ref="vif:Vehicle_HEV-Sx_ComponentsVIFTypeSequenceGroup"/>
+ <xs:element name="Transmission" type="vif:TransmissionComponentVIFType"/>
+ <xs:element name="TorqueConverter" type="vif:TorqueConverterVIFType" minOccurs="0"/>
+ <xs:element name="Angledrive" type="vif:AngledriveVIFType" minOccurs="0"/>
+ <xs:element name="Retarder" type="vif:RetarderVIFType" minOccurs="0"/>
+ <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
+ <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+ <xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="Vehicle_HEV-S3_ComponentsVIFType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractVehicleComponentsHEV_Sx_VIFType">
+ <xs:sequence>
+ <xs:group ref="vif:Vehicle_HEV-Sx_ComponentsVIFTypeSequenceGroup"/>
+ <xs:element name="Retarder" type="vif:RetarderVIFType" minOccurs="0"/>
+ <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
+ <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+ <xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="Vehicle_HEV-S4_ComponentsVIFType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractVehicleComponentsHEV_Sx_VIFType">
+ <xs:sequence>
+ <xs:group ref="vif:Vehicle_HEV-Sx_ComponentsVIFTypeSequenceGroup"/>
+ <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+ <xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="Vehicle_PEV-E2_ComponentsVIFType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractVehicleComponentsPEV_Ex_VIFType">
+ <xs:sequence>
+ <xs:element name="ElectricMachine" type="vif:ElectricMachineType"/>
+ <xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
+ <xs:element name="Transmission" type="vif:TransmissionComponentVIFType"/>
+ <xs:element name="TorqueConverter" type="vif:TorqueConverterVIFType" minOccurs="0"/>
+ <xs:element name="Angledrive" type="vif:AngledriveVIFType" minOccurs="0"/>
+ <xs:element name="Retarder" type="vif:RetarderVIFType" minOccurs="0"/>
+ <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
+ <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+ <xs:element name="Auxiliaries" type="vif:PEV_PrimaryAuxiliairesVIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="Vehicle_PEV-E3_ComponentsVIFType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractVehicleComponentsPEV_Ex_VIFType">
+ <xs:sequence>
+ <xs:element name="ElectricMachine" type="vif:ElectricMachineType"/>
+ <xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
+ <xs:element name="Retarder" type="vif:RetarderVIFType" minOccurs="0"/>
+ <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
+ <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+ <xs:element name="Auxiliaries" type="vif:PEV_PrimaryAuxiliairesVIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="Vehicle_PEV-E4_ComponentsVIFType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractVehicleComponentsPEV_Ex_VIFType">
+ <xs:sequence>
+ <xs:element name="ElectricMachine" type="vif:ElectricMachineType"/>
+ <xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
+ <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+ <xs:element name="Auxiliaries" type="vif:PEV_PrimaryAuxiliairesVIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="Vehicle_PEV-IEPC_ComponentsVIFType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractVehicleComponentsIEPC_VIFType">
+ <xs:sequence>
+ <xs:element name="IEPC" type="vif:IEPCType"/>
+ <xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
+ <xs:element name="Retarder" type="vif:RetarderVIFType" minOccurs="0"/>
+ <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType" minOccurs="0"/>
+ <xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+ <xs:element name="Auxiliaries" type="vif:IEPC_PrimaryAuxiliairesVIFType"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="Exempted_VehicleVIFType">
+ <xs:complexContent>
+ <xs:extension base="vif:AbstractPrimaryVehicleType">
+ <xs:sequence>
+ <xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
+ <xs:element name="ZeroEmissionVehicle" type="xs:boolean">
<xs:annotation>
- <xs:documentation>P224 - [-]</xs:documentation>
+ <xs:documentation>P269 / I.1.1.10</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Ratio" type="v1.0:AngledriveRatioType">
+ <xs:element name="SumNetPower">
<xs:annotation>
- <xs:documentation>P176 - [-]</xs:documentation>
+ <xs:documentation>P277</xs:documentation>
</xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:double">
+ <xs:attribute name="unit" type="out:PowerUnitType" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
</xs:element>
- <xs:element name="CertificationMethod" type="v1.0:AngledriveCertificationOptionType">
+ <xs:element name="Technology">
<xs:annotation>
- <xs:documentation>P258 - enum</xs:documentation>
+ <xs:documentation>P332 - enum</xs:documentation>
</xs:annotation>
- </xs:element>
- <xs:element name="TorqueLossMap">
- <xs:complexType>
- <xs:sequence minOccurs="4" maxOccurs="unbounded">
- <xs:element name="Entry" type="v2.0:AngledriveLossMapEntryType"/>
- </xs:sequence>
- </xs:complexType>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="HEV Article 9 exempted"/>
+ <xs:enumeration value="PEV Article 9 exempted"/>
+ <xs:enumeration value="HV Article 9 exempted"/>
+ <xs:enumeration value="Fuel cell vehicle"/>
+ <xs:enumeration value="H2 ICE"/>
+ <xs:enumeration value="Dual fuel vehicle Article 9 exempted"/>
+ <xs:enumeration value="In-motion charging Article 9 exempted"/>
+ <xs:enumeration value="Other technology Article 9 exempted"/>
+ </xs:restriction>
+ </xs:simpleType>
</xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="AbstractElectricMachineSystemDataType" abstract="true">
- <xs:complexContent>
- <xs:extension base="v1.0:VectoSimulationComponent"/>
- </xs:complexContent>
- </xs:complexType>
+ <xs:simpleType name="CO2UnitType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="g/km"/>
+ <xs:enumeration value="g/t-km"/>
+ <xs:enumeration value="g/p-km"/>
+ <xs:enumeration value="g/m³-km"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="EnergyConsumptionUnitType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="MJ/km"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="MassUnitType">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="kg"/>
+ <xs:enumeration value="t"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="MissionTypeType">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="Long Haul EMS"/>
+ <xs:enumeration value="Long Haul"/>
+ <xs:enumeration value="Regional Delivery EMS"/>
+ <xs:enumeration value="Regional Delivery"/>
+ <xs:enumeration value="Urban Delivery"/>
+ <xs:enumeration value="Municipal Utility"/>
+ <xs:enumeration value="Construction"/>
+ <xs:enumeration value="Heavy Urban"/>
+ <xs:enumeration value="Urban"/>
+ <xs:enumeration value="Suburban"/>
+ <xs:enumeration value="Interurban"/>
+ <xs:enumeration value="Coach"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:group name="ElectricMachineSystemCommonParametersSequenceGroup">
<xs:sequence>
<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
@@ -2183,7 +2663,18 @@
</xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+ <xs:element name="CertificationMethod" type="v2.3:CertificationMethodType">
+ <xs:annotation>
+ <xs:documentation>P456 - enum</xs:documentation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="ElectricMachine">456</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0">
<xs:annotation>
<xs:documentation>P452 - [-]</xs:documentation>
<xs:appinfo>
@@ -2229,408 +2720,242 @@
</xs:element>
</xs:sequence>
</xs:group>
- <xs:complexType name="ElectricMachineSystemIHPCMeasuredDataDeclarationType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractElectricMachineSystemDataType">
- <xs:sequence>
- <xs:group ref="vif:ElectricMachineSystemCommonParametersSequenceGroup"/>
- <xs:element name="CertificationMethod">
- <xs:annotation>
- <xs:documentation>P456 - enum</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="ElectricMachine">456</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="v2.3:CertificationMethodType">
- <xs:enumeration value="Measured"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:group ref="v2.3:ElectricMachineSystemPowerRatingsSequenceGroup"/>
- <xs:element name="DcDcConverterIncluded" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P465 - bool</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="ElectricMachine">465</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="IHPCType">
- <xs:annotation>
- <xs:documentation>P466 - enum</xs:documentation>
- <xs:appinfo>
- <!-- <vectoParam:description>
- <vectoParam:parameterId component="ElectricMachine">466</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description> -->
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="v2.3:IHPCTypeType">
- <xs:enumeration value="IHPC Type 1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="VoltageLevel" type="v2.3:ElectricMachineSystemIHPCVoltageLevelMeasuredType" minOccurs="2" maxOccurs="unbounded"/>
- <xs:element name="DragCurve">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Entry" type="v2.3:ElectricMachineSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Conditioning" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Entry" type="v2.3:ElectricMachineSystemConditioningEntryType" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="ElectricMachineSystemIHPCVoltageLevelMeasuredType">
- <xs:complexContent>
- <xs:extension base="vif:AbstractElectricMachineSystemVoltageLevelType">
- <xs:sequence>
- <xs:element name="Voltage" type="v2.3:VoltageLevelVoltageType">
- <xs:annotation>
- <xs:documentation>P467 - [V]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ContinuousTorque" type="v2.3:MaxTorqueType">
- <xs:annotation>
- <xs:documentation>P459 - [Nm]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="TestSpeedContinuousTorque" type="v2.3:TestSpeedType">
- <xs:annotation>
- <xs:documentation>P460 - [1/min]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="OverloadTorque" type="v2.3:MaxTorqueType">
- <xs:annotation>
- <xs:documentation>P461 - [Nm]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="TestSpeedOverloadTorque" type="v2.3:TestSpeedType">
- <xs:annotation>
- <xs:documentation>P462 - [1/min]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
- <xs:annotation>
- <xs:documentation>P463 - [s]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MaxTorqueCurve">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Entry" type="v2.3:ElectricMachineSystemMaxTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="PowerMap" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Entry" type="v2.3:ElectricMachineSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="gear" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minInclusive value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="Abstract_AUX_HEV-P_PrimaryBusDeclarationType" abstract="true"/>
- <xs:complexType name="Abstract_AUX_HEV-S_PrimaryBusDeclarationType" abstract="true"/>
- <xs:complexType name="Abstract_AUX_IEPC_PrimaryBusDeclarationType" abstract="true"/>
- <xs:complexType name="Abstract_AUX_PEV_PrimaryBusDeclarationType" abstract="true"/>
- <xs:complexType name="AUX_PEV_PrimaryBusType">
- <xs:complexContent>
- <xs:extension base="vif:Abstract_AUX_PEV_PrimaryBusDeclarationType">
- <xs:sequence>
- <xs:element name="SteeringPump">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Technology" maxOccurs="4">
- <xs:annotation>
- <xs:documentation>P182</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="v2.4:AuxSPTechnology_PEV_PrimaryBusType">
- <xs:attribute name="axleNumber" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minInclusive value="1"/>
- <xs:maxInclusive value="4"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="PneumaticSystem">
- <xs:complexType>
- <xs:sequence>
- <xs:group ref="v2.4:BusAuxPneumaticSystemGen_PEV_SequenceGroup"/>
- <xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="HVAC">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="AdjustableCoolantThermostat" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P324 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="AUX_IEPC_PrimaryBusType">
- <xs:complexContent>
- <xs:extension base="v2.4:Abstract_AUX_IEPC_PrimaryBusDeclarationType">
- <xs:sequence>
- <xs:element name="SteeringPump">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Technology" maxOccurs="4">
- <xs:annotation>
- <xs:documentation>P182 - enum</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="v2.4:AuxSPTechnology_PEV_PrimaryBusType">
- <xs:attribute name="axleNumber" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minInclusive value="1"/>
- <xs:maxInclusive value="4"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="PneumaticSystem">
- <xs:complexType>
- <xs:sequence>
- <xs:group ref="v2.4:BusAuxPneumaticSystemGen_IEPC_SequenceGroup"/>
- <xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="HVAC">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="AdjustableCoolantThermostat" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P324 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="AUX_HEV-S_PrimaryBusType">
- <xs:complexContent>
- <xs:extension base="v2.4:Abstract_AUX_HEV-S_PrimaryBusDeclarationType">
- <xs:sequence>
- <xs:element name="Fan">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Technology" type="v2.4:AuxFanTechnologyPrimaryBusType">
- <xs:annotation>
- <xs:documentation>P181 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="SteeringPump">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Technology" maxOccurs="4">
- <xs:annotation>
- <xs:documentation>P182 - enum</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="v2.4:AuxSPTechnology_HEV-S_PrimaryBusType">
- <xs:attribute name="axleNumber" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minInclusive value="1"/>
- <xs:maxInclusive value="4"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="ElectricSystem">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="AlternatorTechnology" type="v2.4:AlternatorTechnology_HEV-S_Type">
- <xs:annotation>
- <xs:documentation>P294 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="SupplyFromHEVPossible" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P303 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="PneumaticSystem">
- <xs:complexType>
- <xs:sequence>
- <xs:group ref="v2.4:BusAuxPneumaticSystemGen_HEV-S_SequenceGroup"/>
- <xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="HVAC">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="AdjustableCoolantThermostat" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P324 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="EngineWasteGasHeatExchanger" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P326 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="AUX_HEV-P_PrimaryBusType">
- <xs:complexContent>
- <xs:extension base="v2.4:Abstract_AUX_HEV-P_PrimaryBusDeclarationType">
- <xs:sequence>
- <xs:element name="Fan">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Technology" type="v2.4:AuxFanTechnologyPrimaryBusType">
- <xs:annotation>
- <xs:documentation>P181 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="SteeringPump">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Technology" maxOccurs="4">
- <xs:annotation>
- <xs:documentation>P182 - enum</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="v2.4:AuxSPTechnologyPrimaryBusType">
- <xs:attribute name="axleNumber" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minInclusive value="1"/>
- <xs:maxInclusive value="4"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="ElectricSystem">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="AlternatorTechnology" type="v2.4:AlternatorTechnology_HEV_Type">
- <xs:annotation>
- <xs:documentation>P294 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:group ref="v2.4:BusAuxElectricSystemSupplySequenceGroup" minOccurs="0"/>
- <xs:element name="SupplyFromHEVPossible" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P303 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="PneumaticSystem">
- <xs:complexType>
- <xs:sequence>
- <xs:group ref="v2.4:BusAuxPneumaticSystemGen_HEV-Px_SequenceGroup"/>
- <xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="HVAC">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="AdjustableCoolantThermostat" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P324 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="EngineWasteGasHeatExchanger" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P326 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
+ <xs:group name="ElectricMachineSystemPowerRatingsSequenceGroup">
+ <xs:sequence>
+ <xs:element name="R85RatedPower" type="v2.3:R85RatedPowerType">
+ <xs:annotation>
+ <xs:documentation>P457 - [W]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="RotationalInertia" type="v2.3:RotationalInertiaType">
+ <xs:annotation>
+ <xs:documentation>P458 - [kgm²]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="IEPCCommonParametersSequenceGroup">
+ <xs:sequence>
+ <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+ <xs:annotation>
+ <xs:documentation>P478 - [-]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="IEPC">478</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Model" type="v1.0:ModelType">
+ <xs:annotation>
+ <xs:documentation>P479 - [-]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="IEPC">479</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+ <xs:annotation>
+ <xs:documentation>P480 - [-]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="IEPC">480</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>P481 - [-]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="IEPC">481</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AppVersion" type="v1.0:AppVersionType">
+ <xs:annotation>
+ <xs:documentation>P482 - [-]</xs:documentation>
+ <xs:appinfo>
+ <!-- <vectoParam:description>
+ <vectoParam:parameterId component="IEPC">482</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description> -->
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ElectricMachineType" type="v2.3:ElectricMachineTypeType">
+ <xs:annotation>
+ <xs:documentation>P483 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="IEPCPowerRatingsSequenceGroup">
+ <xs:sequence>
+ <xs:element name="R85RatedPower" type="v2.3:R85RatedPowerType">
+ <xs:annotation>
+ <xs:documentation>P485 - [W]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="RotationalInertia" type="v2.3:RotationalInertiaType">
+ <xs:annotation>
+ <xs:documentation>P486 [ kgm2]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="Vehicle_HEV-Sx_ComponentsVIFTypeSequenceGroup">
+ <xs:sequence>
+ <xs:element name="Engine" type="vif:EngineComponentVIFType"/>
+ <xs:element name="ElectricMachineGEN" type="vif:ElectricMachineGENType"/>
+ <xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
+ <xs:element name="ElectricMachine" type="vif:ElectricMachineType"/>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup">
+ <xs:sequence>
+ <xs:sequence>
+ <xs:element name="RetarderType" type="v2.4:RetarderTypeType">
+ <xs:annotation>
+ <xs:documentation>P052 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="RetarderRatio" type="v1.0:RetarderRatioType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P053 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="Vehicle_PrimaryBus_xEV_ParametersSequenceGroup">
+ <xs:sequence>
+ <xs:sequence>
+ <xs:element name="OvcHev" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P401 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="MaxChargingPower" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>P402 - [W]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minExclusive value="0"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="Vehicle_PrimaryBusChassisBusParameters">
+ <xs:sequence>
+ <xs:sequence>
+ <xs:element name="LegislativeCategory" type="v2.4:LegislativeCategoryPrimaryBusDeclarationType">
+ <xs:annotation>
+ <xs:documentation>P251 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ChassisConfiguration" type="v2.4:ChassisConfigurationPrimaryBusDeclarationType">
+ <xs:annotation>
+ <xs:documentation>P036 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AxleConfiguration" type="v2.4:AxleConfigurationPrimaryBusLorryDeclarationType">
+ <xs:annotation>
+ <xs:documentation>P037 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Articulated" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P281 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="TechnicalPermissibleMaximumLadenMass" type="v1.0:VehicleGrossVehicleMassType">
+ <xs:annotation>
+ <xs:documentation>P041 - [kg]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="Vehicle_PrimaryBusGeneralParametersSequence">
+ <xs:sequence>
+ <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+ <xs:annotation>
+ <xs:documentation>P235 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ManufacturerAddress" type="v1.0:ManufacturerAddressType">
+ <xs:annotation>
+ <xs:documentation>P252 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Model" type="v1.0:ModelType">
+ <xs:annotation>
+ <xs:documentation>P236 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="VIN" type="v1.0:VINType">
+ <xs:annotation>
+ <xs:documentation>P238 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+ <xs:annotation>
+ <xs:documentation>P239 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:group>
+ <xs:group name="Vehicle_PrimaryBusParametersSequenceGroup">
+ <xs:sequence>
+ <xs:group ref="vif:Vehicle_PrimaryBusGeneralParametersSequence"/>
+ <xs:group ref="vif:Vehicle_PrimaryBusChassisBusParameters"/>
+ </xs:sequence>
+ </xs:group>
+ <!--Components-->
+ <!--VehicleVIFType-->
+ <xs:group name="ResultPrimaryVehicleGroup">
+ <xs:sequence>
+ <xs:element name="Fuel" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="EnergyConsumption" type="vif:EnergyConsumptionType" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>I.2.3.1 - I.2.3.12 / #69</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="type" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ElectricEnergyConsumption" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="EnergyConsumption" type="vif:EnergyConsumptionType" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>I.2.3.1 - I.2.3.12 / #69</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:group>
+ <xs:complexType name="RetarderVIFType">
+ <xs:sequence>
+ <xs:element name="Data" type="vif:AbstractRetarderVIFDataType"/>
+ </xs:sequence>
</xs:complexType>
+ <xs:complexType name="AbstractRetarderVIFDataType"/>
</xs:schema>
diff --git a/VectoCore/VectoCore/Utils/ProviderExtensions.cs b/VectoCore/VectoCore/Utils/ProviderExtensions.cs
index a18d4ebe90c01f69073a171bc5df91c19ee64a62..f41c29ba56725e221222f14bd92cae002e0b46b6 100644
--- a/VectoCore/VectoCore/Utils/ProviderExtensions.cs
+++ b/VectoCore/VectoCore/Utils/ProviderExtensions.cs
@@ -53,6 +53,19 @@ namespace TUGraz.VectoCore.Utils
}
}
+ public static void AddAuxiliariesSerialHybrid(this CombustionEngine engine, IVehicleContainer container,
+ VectoRunData data)
+ {
+ // aux --> engine
+ if (data.BusAuxiliaries != null) {
+ engine.Connect(PowertrainBuilder.CreateAdvancedAuxiliaries(data, container).Port());
+ } else {
+ if (data.Aux != null) {
+ engine.Connect(PowertrainBuilder.CreateAuxiliariesSerialHybrid(data, container).Port());
+ }
+ }
+ }
+
public static IDriver AddComponent(this IDrivingCycleInProvider prev, IDriver next)
{
prev.InPort().Connect(next.OutPort());
diff --git a/VectoCore/VectoCore/Utils/SearchAlgorithm.cs b/VectoCore/VectoCore/Utils/SearchAlgorithm.cs
index d821eaf669d44e01054d220d36b619588a79c13d..4fe1b3ca9cd1ed8a31de51b052ff2632001cc252 100644
--- a/VectoCore/VectoCore/Utils/SearchAlgorithm.cs
+++ b/VectoCore/VectoCore/Utils/SearchAlgorithm.cs
@@ -178,7 +178,6 @@ namespace TUGraz.VectoCore.Utils
//iterationCount += 100;
log.Debug("LineSearch could not find an operating point.");
log.Error("Exceeded max iterations when searching for operating point!");
- log.Error("debug: {0}", debug);
WriteSearch(debug, "LineSearch.csv");
throw new VectoSearchFailedException("Failed to find operating point! points: {0}", debug.LocalData.Select(d => d.b).Join());
@@ -295,7 +294,6 @@ namespace TUGraz.VectoCore.Utils
log.Debug("InterpolateSearch could not find an operating point.");
#if DEBUG
log.Error("InterpolateSearch exceeded max iterations when searching for operating point!");
- log.Error("debug: {0}", debug);
#endif
WriteSearch(debug, "InterpolateSearch.csv");
throw new VectoSearchFailedException("Failed to find operating point! points: {0}", debug.LocalData.Select(d => d.b).Join());
diff --git a/VectoCore/VectoCore/Utils/XMLHelper.cs b/VectoCore/VectoCore/Utils/XMLHelper.cs
index a7133d9961c777826359b3224394dacf1de192b7..c774e82a75e96ed03a93d36f9d74ca81f17a560d 100644
--- a/VectoCore/VectoCore/Utils/XMLHelper.cs
+++ b/VectoCore/VectoCore/Utils/XMLHelper.cs
@@ -97,6 +97,18 @@ namespace TUGraz.VectoCore.Utils
throw new NotImplementedException($"unknown unit '{unit}'");
}
+ public static object[] ValueAsUnit(this WattSecond energy, string unit, uint? decimals = 0)
+ {
+ switch (unit) {
+ case "kWh":
+ return GetValueAsUnit(energy?.ConvertToKiloWattHour(), unit, decimals);
+ case "Wh":
+ return GetValueAsUnit(energy?.ConvertToWattHour(), unit, decimals);
+ }
+
+ throw new NotImplementedException($"unknown unit '{unit}'");
+ }
+
public static object[] ValueAsUnit(this AmpereSecond capacity, string unit, uint? decimals = 0)
{
switch (unit)
@@ -159,7 +171,7 @@ namespace TUGraz.VectoCore.Utils
throw new NotImplementedException($"unknown unit '{unit}'");
}
- public static object[] ValueAsUnit(double value, string unit, uint? decimals)
+ public static object[] ValueAsUnit(this double value, string unit, uint? decimals)
{
switch (unit) {
case "%": return GetValueAsUnit(value * 100, unit, decimals);
@@ -167,7 +179,7 @@ namespace TUGraz.VectoCore.Utils
}
}
- private static object[] GetValueAsUnit(double? value, string unit, uint? decimals)
+ private static object[] GetValueAsUnit(this double? value, string unit, uint? decimals)
{
if (value == null) {
return new object[0];
@@ -348,5 +360,24 @@ namespace TUGraz.VectoCore.Utils
xElement.Name = xName;
return xElement;
}
+
+ public static XElement GetApplicationInfo(XNamespace ns)
+ {
+ var versionNumber = VectoSimulationCore.VersionNumber;
+#if CERTIFICATION_RELEASE
+ // add nothing to version number
+#else
+ versionNumber += " !!NOT FOR CERTIFICATION!!";
+#endif
+ return new XElement(ns + XMLNames.Report_ApplicationInfo_ApplicationInformation,
+ new XElement(ns + XMLNames.Report_ApplicationInfo_SimulationToolVersion, versionNumber),
+ new XElement(ns + XMLNames.Report_ApplicationInfo_Date,
+ XmlConvert.ToString(DateTime.Now, XmlDateTimeSerializationMode.Utc)));
+ }
+
+ public static string GetGUID()
+ {
+ return Guid.NewGuid().ToString("n").Substring(0, 20);
+ }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
index 09a94a6622c2ba3aa597b866a8bf2a1ba38dbe59..dc25f14bac8a3b6ba085644e39775aedbe589fe7 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
@@ -9,6 +9,7 @@ using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.InputData.Reader.DataObjectAdapter;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory;
+using TUGraz.VectoCore.Models.SimulationComponent.Impl;
using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoCore.Tests.FileIO
@@ -148,9 +149,10 @@ namespace TUGraz.VectoCore.Tests.FileIO
var emData = daa.CreateElectricMachines(inputProvider.ElectricMachines, null, null).First().Item2;
- Assert.AreEqual(26, emData.DragCurve.Lookup(2000.RPMtoRad()).Value());
+ Assert.AreEqual(26, emData.DragCurveLookup(2000.RPMtoRad(), 0u).Value());
var em = emData.EfficiencyData;
+ var gear = new GearshiftPosition(0);
Assert.AreEqual(-334.2300, em.FullLoadDriveTorque(400.SI<Volt>(), 2000.RPMtoRad()).Value());
Assert.AreEqual(-396.076, em.FullLoadDriveTorque(600.SI<Volt>(), 2000.RPMtoRad()).Value());
@@ -162,17 +164,17 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual(370.153, em.FullGenerationTorque(500.SI<Volt>(), 2000.RPMtoRad()).Value());
Assert.AreEqual(388.1145, em.FullGenerationTorque(550.SI<Volt>(), 2000.RPMtoRad()).Value());
- Assert.AreEqual(-101.70072, em.EfficiencyMapLookupTorque(400.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>()).Value(), 1e-3);
- Assert.AreEqual(-25000, em.LookupElectricPower(400.SI<Volt>(), 2000.RPMtoRad(), -101.70072.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-1);
+ Assert.AreEqual(-101.70072, em.EfficiencyMapLookupTorque(400.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>(), gear).Value(), 1e-3);
+ Assert.AreEqual(-25000, em.LookupElectricPower(400.SI<Volt>(), 2000.RPMtoRad(), -101.70072.SI<NewtonMeter>(), gear).ElectricalPower.Value(), 1e-1);
- Assert.AreEqual(-114.51788, em.EfficiencyMapLookupTorque(600.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>()).Value(), 1e-3);
- Assert.AreEqual(-25000, em.LookupElectricPower(600.SI<Volt>(), 2000.RPMtoRad(), -114.51788.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-1);
+ Assert.AreEqual(-114.51788, em.EfficiencyMapLookupTorque(600.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>(), gear).Value(), 1e-3);
+ Assert.AreEqual(-25000, em.LookupElectricPower(600.SI<Volt>(), 2000.RPMtoRad(), -114.51788.SI<NewtonMeter>(), gear).ElectricalPower.Value(), 1e-1);
- Assert.AreEqual(-107.772009, em.EfficiencyMapLookupTorque(500.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>()).Value(), 1e-3);
- Assert.AreEqual(-25000, em.LookupElectricPower(500.SI<Volt>(), 2000.RPMtoRad(), -107.772009.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-1);
+ Assert.AreEqual(-107.772009, em.EfficiencyMapLookupTorque(500.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>(), gear).Value(), 1e-3);
+ Assert.AreEqual(-25000, em.LookupElectricPower(500.SI<Volt>(), 2000.RPMtoRad(), -107.772009.SI<NewtonMeter>(), gear).ElectricalPower.Value(), 1e-1);
- Assert.AreEqual(-111.053784, em.EfficiencyMapLookupTorque(550.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>()).Value(), 1e-3);
- Assert.AreEqual(-25000, em.LookupElectricPower(550.SI<Volt>(), 2000.RPMtoRad(), -111.053784.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-1);
+ Assert.AreEqual(-111.053784, em.EfficiencyMapLookupTorque(550.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>(), gear).Value(), 1e-3);
+ Assert.AreEqual(-25000, em.LookupElectricPower(550.SI<Volt>(), 2000.RPMtoRad(), -111.053784.SI<NewtonMeter>(), gear).ElectricalPower.Value(), 1e-1);
}
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
index 254f26e1a44cae413eeeffe9f1b0ab56c13f5430..961d558002a4affa912700e40c3766feb61aa804 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using System;
using System.Collections.Generic;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -505,6 +506,110 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual(true, busAux.HVACAux.AdjustableCoolantThermostat);
Assert.AreEqual(true, busAux.HVACAux.EngineWasteGasHeatExchanger);
}
+
+ [TestCase()]
+ public void JSON_Read_IEPC()
+ {
+ var inputProvider = new JSONComponentInputData(@"TestData\BatteryElectric\IEPC\GenericIEPC.viepc", null);
+ var iepcData = (IIEPCEngineeringInputData)inputProvider.IEPC;
+
+ Assert.AreEqual("3", iepcData.AppVersion);
+ Assert.AreEqual(DateTime.MinValue, iepcData.Date);
+
+ Assert.AreEqual(false, iepcData.SavedInDeclarationMode);
+ Assert.AreEqual("Generic IEPC", iepcData.Model);
+ Assert.AreEqual(0.15.SI<KilogramSquareMeter>(), iepcData.Inertia);
+ Assert.AreEqual(false, iepcData.DifferentialIncluded);
+ Assert.AreEqual(false, iepcData.DesignTypeWheelMotor);
+ Assert.AreEqual(1, iepcData.NrOfDesignTypeWheelMotorMeasured);
+ Assert.AreEqual(0.9, iepcData.OverloadRecoveryFactor);
+
+ TestIEPCGears(iepcData.Gears);
+ TestIEPCVoltageLevel(iepcData.VoltageLevels);
+ TestDragCurve(iepcData.DragCurves);
+ }
+
+ private void TestDragCurve(IList<IDragCurve> dragCurvesData)
+ {
+ Assert.AreEqual(3, dragCurvesData.Count);
+
+ var dragCurve = dragCurvesData[0];
+ Assert.AreEqual(1, dragCurve.Gear);
+ Assert.IsNotNull(dragCurve.DragCurve);
+
+ dragCurve = dragCurvesData[1];
+ Assert.AreEqual(2, dragCurve.Gear);
+ Assert.IsNotNull(dragCurve.DragCurve);
+
+ dragCurve = dragCurvesData[2];
+ Assert.AreEqual(3, dragCurve.Gear);
+ Assert.IsNotNull(dragCurve.DragCurve);
+ }
+
+ private void TestIEPCGears(IList<IGearEntry> gears)
+ {
+ Assert.AreEqual(3, gears.Count);
+
+ var gear = gears[0];
+ Assert.AreEqual(1, gear.GearNumber);
+ Assert.AreEqual(3.2, gear.Ratio);
+ Assert.AreEqual(10000.SI<NewtonMeter>(), gear.MaxOutputShaftTorque);
+ Assert.AreEqual(5000.SI<PerSecond>(), gear.MaxOutputShaftSpeed);
+
+ gear = gears[1];
+ Assert.AreEqual(2, gear.GearNumber);
+ Assert.AreEqual(1.6, gear.Ratio);
+ Assert.AreEqual(10000.SI<NewtonMeter>(), gear.MaxOutputShaftTorque);
+ Assert.AreEqual(5000.SI<PerSecond>(), gear.MaxOutputShaftSpeed);
+
+ gear = gears[2];
+ Assert.AreEqual(3, gear.GearNumber);
+ Assert.AreEqual(1.6, gear.Ratio);
+ Assert.AreEqual(10000.SI<NewtonMeter>(), gear.MaxOutputShaftTorque);
+ Assert.AreEqual(5000.SI<PerSecond>(), gear.MaxOutputShaftSpeed);
+ }
+
+ private void TestIEPCVoltageLevel(IList<IElectricMotorVoltageLevel> voltageLevels)
+ {
+ Assert.AreEqual(2, voltageLevels.Count);
+
+ var voltageLevel = voltageLevels[0];
+ Assert.AreEqual(400.SI<Volt>(), voltageLevel.VoltageLevel);
+ Assert.AreEqual(200.SI<NewtonMeter>(), voltageLevel.ContinuousTorque);
+ Assert.AreEqual(2000.RPMtoRad(), voltageLevel.ContinuousTorqueSpeed);
+ Assert.AreEqual(500.SI<NewtonMeter>(), voltageLevel.OverloadTorque);
+ Assert.AreEqual(2000.RPMtoRad(), voltageLevel.OverloadTestSpeed);
+ Assert.AreEqual(60.SI<Second>(), voltageLevel.OverloadTime);
+ Assert.IsNotNull(voltageLevel.FullLoadCurve);
+ TestPowerMap(voltageLevel.PowerMap);
+
+ voltageLevel = voltageLevels[1];
+ Assert.AreEqual(800.SI<Volt>(), voltageLevel.VoltageLevel);
+ Assert.AreEqual(200.SI<NewtonMeter>(), voltageLevel.ContinuousTorque);
+ Assert.AreEqual(2000.RPMtoRad(), voltageLevel.ContinuousTorqueSpeed);
+ Assert.AreEqual(500.SI<NewtonMeter>(), voltageLevel.OverloadTorque);
+ Assert.AreEqual(2000.RPMtoRad(), voltageLevel.OverloadTestSpeed);
+ Assert.AreEqual(60.SI<Second>(), voltageLevel.OverloadTime);
+ Assert.IsNotNull(voltageLevel.FullLoadCurve);
+ TestPowerMap(voltageLevel.PowerMap);
+ }
+
+ private void TestPowerMap(IList<IElectricMotorPowerMap> powerMapData)
+ {
+ Assert.AreEqual(3, powerMapData.Count);
+
+ var powerMap = powerMapData[0];
+ Assert.AreEqual(1, powerMap.Gear);
+ Assert.IsNotNull(powerMap.PowerMap);
+
+ powerMap = powerMapData[1];
+ Assert.AreEqual(2, powerMap.Gear);
+ Assert.IsNotNull(powerMap.PowerMap);
+
+ powerMap = powerMapData[2];
+ Assert.AreEqual(3, powerMap.Gear);
+ Assert.IsNotNull(powerMap.PowerMap);
+ }
}
public class MockDriverTestInputData : IDriverEngineeringInputData {
diff --git a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
index 4b3029ff706da714b6f01886453b350f3acb3c5d..2e5f23646ed8fcf336334f0c19781d8df5efb3f1 100644
--- a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
@@ -28,7 +28,6 @@ using TUGraz.VectoCore.OutputData.FileIO;
using TUGraz.VectoCore.Tests.Models.SimulationComponentData;
using TUGraz.VectoCore.Tests.Utils;
using TUGraz.VectoCore.Utils;
-using static System.Formats.Asn1.AsnWriter;
using ElectricSystem = TUGraz.VectoCore.Models.SimulationComponent.ElectricSystem;
@@ -56,6 +55,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
protected const string BEV_E2_APTS_Job = @"TestData\BatteryElectric\GenericVehicleB2_AT\BEV_B2_Group5LH_rl_APTS.vecto";
protected const string BEV_E2_APTP_Job = @"TestData\BatteryElectric\GenericVehicleB2_AT\BEV_B2_Group5LH_rl_APTP.vecto";
+ protected const string BEV_E2_3Speed_PTO_Job = @"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG_3speed_PTO.vecto";
public const string MotorFile = @"TestData\BatteryElectric\GenericVehicleB4\GenericEMotor_125kW_485Nm.vem";
public const string BatFile = @"TestData\BatteryElectric\GenericVehicleB4\GenericBattery_243kWh_750V.vbat";
@@ -697,6 +697,17 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
TestCase(BEV_E2_APTP_Job, 5, TestName = "PEV E2 APT-P Job Suburban"),
TestCase(BEV_E2_APTP_Job, 6, TestName = "PEV E2 APT-P Job Interurban"),
TestCase(BEV_E2_APTP_Job, 7, TestName = "PEV E2 APT-P Job Coach"),
+
+ TestCase(BEV_E2_3Speed_PTO_Job, 0, TestName = "PEV E2 3speed PTO Job LongHaul"),
+ TestCase(BEV_E2_3Speed_PTO_Job, 1, TestName = "PEV E2 3speed PTO Job Coach"),
+ TestCase(BEV_E2_3Speed_PTO_Job, 2, TestName = "PEV E2 3speed PTO Job Construction"),
+ TestCase(BEV_E2_3Speed_PTO_Job, 3, TestName = "PEV E2 3speed PTO Job HeavyUrban"),
+ TestCase(BEV_E2_3Speed_PTO_Job, 4, TestName = "PEV E2 3speed PTO Job Interurban"),
+ TestCase(BEV_E2_3Speed_PTO_Job, 5, TestName = "PEV E2 3speed PTO Job MunicipalUtility"),
+ TestCase(BEV_E2_3Speed_PTO_Job, 6, TestName = "PEV E2 3speed PTO Job RegionalDelivery"),
+ TestCase(BEV_E2_3Speed_PTO_Job, 7, TestName = "PEV E2 3speed PTO Job Suburban"),
+ TestCase(BEV_E2_3Speed_PTO_Job, 8, TestName = "PEV E2 3speed PTO Job Urban"),
+ TestCase(BEV_E2_3Speed_PTO_Job, 9, TestName = "PEV E2 3speed PTO Job UrbanDelivery"),
]
public void B2PEVRunJob(string jobFile, int cycleIdx)
{
diff --git a/VectoCore/VectoCoreTest/Integration/BatteryElectric/IEPCTest.cs b/VectoCore/VectoCoreTest/Integration/BatteryElectric/IEPCTest.cs
new file mode 100644
index 0000000000000000000000000000000000000000..25a139f168341497a35b9ea3e61cfeb6cce49a76
--- /dev/null
+++ b/VectoCore/VectoCoreTest/Integration/BatteryElectric/IEPCTest.cs
@@ -0,0 +1,196 @@
+using System.IO;
+using System.Linq;
+using NUnit.Framework;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.InputData.FileIO.JSON;
+using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.Models.Simulation.Impl;
+using TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory;
+using TUGraz.VectoCore.OutputData;
+using TUGraz.VectoCore.OutputData.FileIO;
+using TUGraz.VectoCore.Tests.Utils;
+
+namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
+{
+ [TestFixture]
+ [Parallelizable(ParallelScope.All)]
+ public class IEPCTest
+ {
+
+ protected const string IEPC_Gbx3Speed = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx3Speed\IEPC_ENG_Gbx3.vecto";
+
+ protected const string IEPC_Gbx3Speed_drag = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx3Speed\IEPC_ENG_Gbx3_drag.vecto";
+
+ protected const string IEPC_Gbx3SpeedAxle = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx3Speed+Axle\IEPC_ENG_Gbx3Axl.vecto";
+
+ protected const string IEPC_Gbx3SpeedWhl1 = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx3Speed-Whl1\IEPC_ENG_Gbx3Whl1.vecto";
+
+ protected const string IEPC_Gbx3SpeedWhl2 = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx3Speed-Whl2\IEPC_ENG_Gbx3Whl2.vecto";
+
+ protected const string IEPC_Gbx1Speed = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx1Speed\IEPC_ENG_Gbx1.vecto";
+
+ protected const string IEPC_Gbx1SpeedAxl = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx1Speed+Axle\IEPC_ENG_Gbx1Axl.vecto";
+
+ protected const string IEPC_Gbx1SpeedWhl1 = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx1Speed-Whl1\IEPC_ENG_Gbx1Whl1.vecto";
+
+ protected const string IEPC_Gbx1SpeedWhl2 = @"TestData\BatteryElectric\GenericIEPC\IEPC_Gbx1Speed-Whl2\IEPC_ENG_Gbx1Whl2.vecto";
+
+
+ [OneTimeSetUp]
+ public void RunBeforeAnyTests()
+ {
+ Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
+ }
+
+
+ private GraphWriter GetGraphWriter(ModalResultField[] yFields)
+ {
+ var graphWriter = new GraphWriter();
+ //#if TRACE
+ graphWriter.Enable();
+
+ //#else
+ //graphWriter.Disable();
+ //#endif
+
+
+ var Yfields = new[] {
+ ModalResultField.v_act, ModalResultField.altitude, ModalResultField.acc, ModalResultField.Gear,
+ ModalResultField.REESSStateOfCharge,
+ }.Concat(yFields).ToArray();
+ graphWriter.Xfields = new[] { ModalResultField.dist };
+ graphWriter.Yfields = yFields;
+ graphWriter.Series1Label = "BEV";
+ graphWriter.PlotIgnitionState = true;
+
+ return graphWriter;
+ }
+
+
+ [TestCase(IEPC_Gbx3Speed, 0, TestName = "IEPC Gbx 3speed Job LH"),
+ TestCase(IEPC_Gbx3Speed, 1, TestName = "IEPC Gbx 3speed Job Coach"),
+ TestCase(IEPC_Gbx3Speed, 2, TestName = "IEPC Gbx 3speed Job CO"),
+ TestCase(IEPC_Gbx3Speed, 3, TestName = "IEPC Gbx 3speed Job HU"),
+ TestCase(IEPC_Gbx3Speed, 4, TestName = "IEPC Gbx 3speed Job IU"),
+ TestCase(IEPC_Gbx3Speed, 5, TestName = "IEPC Gbx 3speed Job RD"),
+ TestCase(IEPC_Gbx3Speed, 6, TestName = "IEPC Gbx 3speed Job SU"),
+ TestCase(IEPC_Gbx3Speed, 7, TestName = "IEPC Gbx 3speed Job U"),
+ TestCase(IEPC_Gbx3Speed, 8, TestName = "IEPC Gbx 3speed Job UD"),
+
+ TestCase(IEPC_Gbx3Speed_drag, 0, TestName = "IEPC Gbx 3speed sep dragCurves Job LH"),
+ TestCase(IEPC_Gbx3Speed_drag, 1, TestName = "IEPC Gbx 3speed sep dragCurves Job Coach"),
+ TestCase(IEPC_Gbx3Speed_drag, 2, TestName = "IEPC Gbx 3speed sep dragCurves Job CO"),
+ TestCase(IEPC_Gbx3Speed_drag, 3, TestName = "IEPC Gbx 3speed sep dragCurves Job HU"),
+ TestCase(IEPC_Gbx3Speed_drag, 4, TestName = "IEPC Gbx 3speed sep dragCurves Job IU"),
+ TestCase(IEPC_Gbx3Speed_drag, 5, TestName = "IEPC Gbx 3speed sep dragCurves Job RD"),
+ TestCase(IEPC_Gbx3Speed_drag, 6, TestName = "IEPC Gbx 3speed sep dragCurves Job SU"),
+ TestCase(IEPC_Gbx3Speed_drag, 7, TestName = "IEPC Gbx 3speed sep dragCurves Job U"),
+ TestCase(IEPC_Gbx3Speed_drag, 8, TestName = "IEPC Gbx 3speed sep dragCurves Job UD"),
+
+ TestCase(IEPC_Gbx3SpeedAxle, 0, TestName = "IEPC Gbx 3speed + Axle Job LH"),
+ TestCase(IEPC_Gbx3SpeedAxle, 1, TestName = "IEPC Gbx 3speed + Axle Job Coach"),
+ TestCase(IEPC_Gbx3SpeedAxle, 2, TestName = "IEPC Gbx 3speed + Axle Job CO"),
+ TestCase(IEPC_Gbx3SpeedAxle, 3, TestName = "IEPC Gbx 3speed + Axle Job HU"),
+ TestCase(IEPC_Gbx3SpeedAxle, 4, TestName = "IEPC Gbx 3speed + Axle Job IU"),
+ TestCase(IEPC_Gbx3SpeedAxle, 5, TestName = "IEPC Gbx 3speed + Axle Job RD"),
+ TestCase(IEPC_Gbx3SpeedAxle, 6, TestName = "IEPC Gbx 3speed + Axle Job SU"),
+ TestCase(IEPC_Gbx3SpeedAxle, 7, TestName = "IEPC Gbx 3speed + Axle Job U"),
+ TestCase(IEPC_Gbx3SpeedAxle, 8, TestName = "IEPC Gbx 3speed + Axle Job UD"),
+
+ TestCase(IEPC_Gbx3SpeedWhl1, 0, TestName = "IEPC Gbx 3speed DTWheel-1 Job LH"),
+ TestCase(IEPC_Gbx3SpeedWhl1, 1, TestName = "IEPC Gbx 3speed DTWheel-1 Job Coach"),
+ TestCase(IEPC_Gbx3SpeedWhl1, 2, TestName = "IEPC Gbx 3speed DTWheel-1 Job CO"),
+ TestCase(IEPC_Gbx3SpeedWhl1, 3, TestName = "IEPC Gbx 3speed DTWheel-1 Job HU"),
+ TestCase(IEPC_Gbx3SpeedWhl1, 4, TestName = "IEPC Gbx 3speed DTWheel-1 Job IU"),
+ TestCase(IEPC_Gbx3SpeedWhl1, 5, TestName = "IEPC Gbx 3speed DTWheel-1 Job RD"),
+ TestCase(IEPC_Gbx3SpeedWhl1, 6, TestName = "IEPC Gbx 3speed DTWheel-1 Job SU"),
+ TestCase(IEPC_Gbx3SpeedWhl1, 7, TestName = "IEPC Gbx 3speed DTWheel-1 Job U"),
+ TestCase(IEPC_Gbx3SpeedWhl1, 8, TestName = "IEPC Gbx 3speed DTWheel-1 Job UD"),
+
+ TestCase(IEPC_Gbx3SpeedWhl2, 0, TestName = "IEPC Gbx 3speed DTWheel-2 Job LH"),
+ TestCase(IEPC_Gbx3SpeedWhl2, 1, TestName = "IEPC Gbx 3speed DTWheel-2 Job Coach"),
+ TestCase(IEPC_Gbx3SpeedWhl2, 2, TestName = "IEPC Gbx 3speed DTWheel-2 Job CO"),
+ TestCase(IEPC_Gbx3SpeedWhl2, 3, TestName = "IEPC Gbx 3speed DTWheel-2 Job HU"),
+ TestCase(IEPC_Gbx3SpeedWhl2, 4, TestName = "IEPC Gbx 3speed DTWheel-2 Job IU"),
+ TestCase(IEPC_Gbx3SpeedWhl2, 5, TestName = "IEPC Gbx 3speed DTWheel-2 Job RD"),
+ TestCase(IEPC_Gbx3SpeedWhl2, 6, TestName = "IEPC Gbx 3speed DTWheel-2 Job SU"),
+ TestCase(IEPC_Gbx3SpeedWhl2, 7, TestName = "IEPC Gbx 3speed DTWheel-2 Job U"),
+ TestCase(IEPC_Gbx3SpeedWhl2, 8, TestName = "IEPC Gbx 3speed DTWheel-2 Job UD"),
+
+ TestCase(IEPC_Gbx1Speed, 0, TestName = "IEPC Gbx 1speed Job LH"),
+ TestCase(IEPC_Gbx1Speed, 1, TestName = "IEPC Gbx 1speed Job Coach"),
+ TestCase(IEPC_Gbx1Speed, 2, TestName = "IEPC Gbx 1speed Job CO"),
+ TestCase(IEPC_Gbx1Speed, 3, TestName = "IEPC Gbx 1speed Job HU"),
+ TestCase(IEPC_Gbx1Speed, 4, TestName = "IEPC Gbx 1speed Job IU"),
+ TestCase(IEPC_Gbx1Speed, 5, TestName = "IEPC Gbx 1speed Job RD"),
+ TestCase(IEPC_Gbx1Speed, 6, TestName = "IEPC Gbx 1speed Job SU"),
+ TestCase(IEPC_Gbx1Speed, 7, TestName = "IEPC Gbx 1speed Job U"),
+ TestCase(IEPC_Gbx1Speed, 8, TestName = "IEPC Gbx 1speed Job UD"),
+
+ TestCase(IEPC_Gbx1SpeedAxl, 0, TestName = "IEPC Gbx 1speed + Axle Job LH"),
+ TestCase(IEPC_Gbx1SpeedAxl, 1, TestName = "IEPC Gbx 1speed + Axle Job Coach"),
+ TestCase(IEPC_Gbx1SpeedAxl, 2, TestName = "IEPC Gbx 1speed + Axle Job CO"),
+ TestCase(IEPC_Gbx1SpeedAxl, 3, TestName = "IEPC Gbx 1speed + Axle Job HU"),
+ TestCase(IEPC_Gbx1SpeedAxl, 4, TestName = "IEPC Gbx 1speed + Axle Job IU"),
+ TestCase(IEPC_Gbx1SpeedAxl, 5, TestName = "IEPC Gbx 1speed + Axle Job RD"),
+ TestCase(IEPC_Gbx1SpeedAxl, 6, TestName = "IEPC Gbx 1speed + Axle Job SU"),
+ TestCase(IEPC_Gbx1SpeedAxl, 7, TestName = "IEPC Gbx 1speed + Axle Job U"),
+ TestCase(IEPC_Gbx1SpeedAxl, 8, TestName = "IEPC Gbx 1speed + Axle Job UD"),
+
+ TestCase(IEPC_Gbx1SpeedWhl1, 0, TestName = "IEPC Gbx 1speed DTWheel-1 Job LH"),
+ TestCase(IEPC_Gbx1SpeedWhl1, 1, TestName = "IEPC Gbx 1speed DTWheel-1 Job Coach"),
+ TestCase(IEPC_Gbx1SpeedWhl1, 2, TestName = "IEPC Gbx 1speed DTWheel-1 Job CO"),
+ TestCase(IEPC_Gbx1SpeedWhl1, 3, TestName = "IEPC Gbx 1speed DTWheel-1 Job HU"),
+ TestCase(IEPC_Gbx1SpeedWhl1, 4, TestName = "IEPC Gbx 1speed DTWheel-1 Job IU"),
+ TestCase(IEPC_Gbx1SpeedWhl1, 5, TestName = "IEPC Gbx 1speed DTWheel-1 Job RD"),
+ TestCase(IEPC_Gbx1SpeedWhl1, 6, TestName = "IEPC Gbx 1speed DTWheel-1 Job SU"),
+ TestCase(IEPC_Gbx1SpeedWhl1, 7, TestName = "IEPC Gbx 1speed DTWheel-1 Job U"),
+ TestCase(IEPC_Gbx1SpeedWhl1, 8, TestName = "IEPC Gbx 1speed DTWheel-1 Job UD"),
+
+ TestCase(IEPC_Gbx1SpeedWhl2, 0, TestName = "IEPC Gbx 1speed DTWheel-2 Job LH"),
+ TestCase(IEPC_Gbx1SpeedWhl2, 1, TestName = "IEPC Gbx 1speed DTWheel-2 Job Coach"),
+ TestCase(IEPC_Gbx1SpeedWhl2, 2, TestName = "IEPC Gbx 1speed DTWheel-2 Job CO"),
+ TestCase(IEPC_Gbx1SpeedWhl2, 3, TestName = "IEPC Gbx 1speed DTWheel-2 Job HU"),
+ TestCase(IEPC_Gbx1SpeedWhl2, 4, TestName = "IEPC Gbx 1speed DTWheel-2 Job IU"),
+ TestCase(IEPC_Gbx1SpeedWhl2, 5, TestName = "IEPC Gbx 1speed DTWheel-2 Job RD"),
+ TestCase(IEPC_Gbx1SpeedWhl2, 6, TestName = "IEPC Gbx 1speed DTWheel-2 Job SU"),
+ TestCase(IEPC_Gbx1SpeedWhl2, 7, TestName = "IEPC Gbx 1speed DTWheel-2 Job U"),
+ TestCase(IEPC_Gbx1SpeedWhl2, 8, TestName = "IEPC Gbx 1speed DTWheel-2 Job UD"),
+ ]
+ public void IEPCRunJob(string jobFile, int cycleIdx)
+ {
+ var inputProvider = JSONInputDataFactory.ReadJsonJob(jobFile);
+
+ var writer = new FileOutputWriter(jobFile);
+ var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Engineering, inputProvider, writer);
+ factory.Validate = false;
+ factory.WriteModalResults = true;
+
+
+ var sumContainer = new SummaryDataContainer(writer);
+ var jobContainer = new JobContainer(sumContainer);
+
+ factory.SumData = sumContainer;
+
+ if (cycleIdx < 0) {
+ jobContainer.AddRuns(factory);
+ jobContainer.Execute();
+ jobContainer.WaitFinished();
+ Assert.IsTrue(jobContainer.GetProgress().All(x => x.Value.Success));
+ } else {
+ var run = factory.SimulationRuns().ToArray()[cycleIdx];
+
+ Assert.NotNull(run);
+
+ var pt = run.GetContainer();
+
+ Assert.NotNull(pt);
+
+ run.Run();
+ Assert.IsTrue(run.FinishedWithoutErrors);
+
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
index 10d60457677f5bf33ae339c44a6a02f14e3c875a..89d4ec1ba88ee917619b4da93016e88f5f48ba8b 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
@@ -882,7 +882,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
genericDriver.LookAheadCoasting.LookAheadDistanceFactor);
Assert.AreEqual(genericDriver.LookAheadCoasting, specificDriver.LookAheadCoasting);
- Assert.AreEqual(true, genericDriver.OverSpeed.Enabled);
+ Assert.AreEqual(false, genericDriver.OverSpeed.Enabled);
Assert.AreEqual(DeclarationData.Driver.OverSpeed.MinSpeed, genericDriver.OverSpeed.MinSpeed);
Assert.AreEqual(DeclarationData.Driver.OverSpeed.AllowedOverSpeed, genericDriver.OverSpeed.OverSpeed);
Assert.AreEqual(genericDriver.OverSpeed, specificDriver.OverSpeed);
@@ -1195,7 +1195,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
//var inputData = new MockCompletedBusInputData(XmlReader.Create(PifFile_33_34), modified);
//var inputData = new MockCompletedBusInputData(modified);
- var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, new XMLDeclarationVIFInputData(completedVif as IMultistageBusInputDataProvider, null), writer, validate: false);
+ var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, new XMLDeclarationVIFInputData(completedVif as IMultistepBusInputDataProvider, null), writer, validate: false);
factory.WriteModalResults = true;
//var factory = new SimulatorFactory(ExecutionMode.Declaration, new XMLDeclarationVIFInputData(completedVif as IMultistageBusInputDataProvider, null), writer) {
// WriteModalResults = true,
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs
index 94680546595ba7afb050b49556765f26cdff55e3..23ae50dff9a49887968ceecd4551e61bd024ebf4 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs
@@ -123,7 +123,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
//}, messageContains: "Input parameter 'separate air distribution ducts' has to be set to 'true' for vehicle group ");
}
- private IMultistageBusInputDataProvider GetModifiedXML(string vifPrimary, string completedJob, BusHVACSystemConfiguration? hvacConfig, bool separateDucts)
+ private IMultistepBusInputDataProvider GetModifiedXML(string vifPrimary, string completedJob, BusHVACSystemConfiguration? hvacConfig, bool separateDucts)
{
var vifDataProvider = _xmlInputReader.Create(XmlReader.Create(vifPrimary));
//var completeDataProvider = _xmlInputReader.CreateDeclaration(comple);
@@ -140,7 +140,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
var completeDataProvider = _xmlInputReader.CreateDeclaration(modified);
- var inputData = new XMLDeclarationVIFInputData(vifDataProvider as IMultistageBusInputDataProvider, completeDataProvider.JobInputData.Vehicle);
+ var inputData = new XMLDeclarationVIFInputData(vifDataProvider as IMultistepBusInputDataProvider, completeDataProvider.JobInputData.Vehicle);
var filename = Guid.NewGuid().ToString().Substring(0, 20);
var writer = new FileOutputVIFWriter(filename, 0);
@@ -157,13 +157,13 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
var completedVif = _xmlInputReader.CreateDeclaration(XmlReader.Create(new StringReader(completedVifXML.OuterXml)));
File.Delete(writer.XMLMultistageReportFileName);
- return completedVif as IMultistageBusInputDataProvider;
+ return completedVif as IMultistepBusInputDataProvider;
}
}
- public class MockCompletedBusInputData : IInputDataProvider, IMultistageBusInputDataProvider
+ public class MockCompletedBusInputData : IInputDataProvider, IMultistepBusInputDataProvider
{
- private IMultistageBusInputDataProvider input;
+ private IMultistepBusInputDataProvider input;
public MockCompletedBusInputData(XmlReader vif)
{
@@ -171,7 +171,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
var _xmlInputReader = kernel.Get<IXMLInputDataReader>();
- input = _xmlInputReader.CreateDeclaration(vif) as IMultistageBusInputDataProvider;
+ input = _xmlInputReader.CreateDeclaration(vif) as IMultistepBusInputDataProvider;
//JobName = Vehicle.VIN;
}
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/IEPC_S_Test.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/IEPC_S_Test.cs
new file mode 100644
index 0000000000000000000000000000000000000000..9be86c7f4ae801d4e5ceb4b161ead890f9717c0b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/IEPC_S_Test.cs
@@ -0,0 +1,195 @@
+using System.IO;
+using System.Linq;
+using NUnit.Framework;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.InputData.FileIO.JSON;
+using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.Models.Simulation.Impl;
+using TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory;
+using TUGraz.VectoCore.OutputData;
+using TUGraz.VectoCore.OutputData.FileIO;
+using TUGraz.VectoCore.Tests.Utils;
+
+namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
+{
+ [TestFixture]
+ [Parallelizable(ParallelScope.All)]
+ public class IEPC_S_Test
+ {
+
+ protected const string IEPC_S_Gbx3Speed = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx3Speed\IEPC-S_ENG_Gbx3.vecto";
+
+ protected const string IEPC_S_Gbx3Speed_drag = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx3Speed\IEPC-S_ENG_Gbx3_drag.vecto";
+
+ protected const string IEPC_S_Gbx3SpeedAxle = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx3Speed+Axle\IEPC-S_ENG_Gbx3Axl.vecto";
+
+ protected const string IEPC_S_Gbx3SpeedWhl1 = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx3Speed-Whl1\IEPC-S_ENG_Gbx3Whl1.vecto";
+
+ protected const string IEPC_S_Gbx3SpeedWhl2 = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx3Speed-Whl2\IEPC-S_ENG_Gbx3Whl2.vecto";
+
+ protected const string IEPC_S_Gbx1Speed = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx1Speed\IEPC-S_ENG_Gbx1.vecto";
+
+ protected const string IEPC_S_Gbx1SpeedAxl = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx1Speed+Axle\IEPC-S_ENG_Gbx1Axl.vecto";
+
+ protected const string IEPC_S_Gbx1SpeedWhl1 = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx1Speed-Whl1\IEPC-S_ENG_Gbx1Whl1.vecto";
+
+ protected const string IEPC_S_Gbx1SpeedWhl2 = @"TestData\Hybrids\GenericIEPC-S\IEPC-S_Gbx1Speed-Whl2\IEPC-S_ENG_Gbx1Whl2.vecto";
+
+
+ [OneTimeSetUp]
+ public void RunBeforeAnyTests()
+ {
+ Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
+ }
+
+
+ private GraphWriter GetGraphWriter(ModalResultField[] yFields)
+ {
+ var graphWriter = new GraphWriter();
+ //#if TRACE
+ graphWriter.Enable();
+
+ //#else
+ //graphWriter.Disable();
+ //#endif
+
+
+ var Yfields = new[] {
+ ModalResultField.v_act, ModalResultField.altitude, ModalResultField.acc, ModalResultField.Gear,
+ ModalResultField.REESSStateOfCharge,
+ }.Concat(yFields).ToArray();
+ graphWriter.Xfields = new[] { ModalResultField.dist };
+ graphWriter.Yfields = yFields;
+ graphWriter.Series1Label = "BEV";
+ graphWriter.PlotIgnitionState = true;
+
+ return graphWriter;
+ }
+
+
+ [TestCase(IEPC_S_Gbx3Speed, 0, TestName = "IEPC-S Gbx 3speed Job LH"),
+ TestCase(IEPC_S_Gbx3Speed, 1, TestName = "IEPC-S Gbx 3speed Job Coach"),
+ TestCase(IEPC_S_Gbx3Speed, 2, TestName = "IEPC-S Gbx 3speed Job CO"),
+ TestCase(IEPC_S_Gbx3Speed, 3, TestName = "IEPC-S Gbx 3speed Job HU"),
+ TestCase(IEPC_S_Gbx3Speed, 4, TestName = "IEPC-S Gbx 3speed Job IU"),
+ TestCase(IEPC_S_Gbx3Speed, 5, TestName = "IEPC-S Gbx 3speed Job RD"),
+ TestCase(IEPC_S_Gbx3Speed, 6, TestName = "IEPC-S Gbx 3speed Job SU"),
+ TestCase(IEPC_S_Gbx3Speed, 7, TestName = "IEPC-S Gbx 3speed Job U"),
+ TestCase(IEPC_S_Gbx3Speed, 8, TestName = "IEPC-S Gbx 3speed Job UD"),
+
+ TestCase(IEPC_S_Gbx3Speed_drag, 0, TestName = "IEPC-S Gbx 3speed sep dragCurves Job LH"),
+ TestCase(IEPC_S_Gbx3Speed_drag, 1, TestName = "IEPC-S Gbx 3speed sep dragCurves Job Coach"),
+ TestCase(IEPC_S_Gbx3Speed_drag, 2, TestName = "IEPC-S Gbx 3speed sep dragCurves Job CO"),
+ TestCase(IEPC_S_Gbx3Speed_drag, 3, TestName = "IEPC-S Gbx 3speed sep dragCurves Job HU"),
+ TestCase(IEPC_S_Gbx3Speed_drag, 4, TestName = "IEPC-S Gbx 3speed sep dragCurves Job IU"),
+ TestCase(IEPC_S_Gbx3Speed_drag, 5, TestName = "IEPC-S Gbx 3speed sep dragCurves Job RD"),
+ TestCase(IEPC_S_Gbx3Speed_drag, 6, TestName = "IEPC-S Gbx 3speed sep dragCurves Job SU"),
+ TestCase(IEPC_S_Gbx3Speed_drag, 7, TestName = "IEPC-S Gbx 3speed sep dragCurves Job U"),
+ TestCase(IEPC_S_Gbx3Speed_drag, 8, TestName = "IEPC-S Gbx 3speed sep dragCurves Job UD"),
+
+ TestCase(IEPC_S_Gbx3SpeedAxle, 0, TestName = "IEPC-S Gbx 3speed + Axle Job LH"),
+ TestCase(IEPC_S_Gbx3SpeedAxle, 1, TestName = "IEPC-S Gbx 3speed + Axle Job Coach"),
+ TestCase(IEPC_S_Gbx3SpeedAxle, 2, TestName = "IEPC-S Gbx 3speed + Axle Job CO"),
+ TestCase(IEPC_S_Gbx3SpeedAxle, 3, TestName = "IEPC-S Gbx 3speed + Axle Job HU"),
+ TestCase(IEPC_S_Gbx3SpeedAxle, 4, TestName = "IEPC-S Gbx 3speed + Axle Job IU"),
+ TestCase(IEPC_S_Gbx3SpeedAxle, 5, TestName = "IEPC-S Gbx 3speed + Axle Job RD"),
+ TestCase(IEPC_S_Gbx3SpeedAxle, 6, TestName = "IEPC-S Gbx 3speed + Axle Job SU"),
+ TestCase(IEPC_S_Gbx3SpeedAxle, 7, TestName = "IEPC-S Gbx 3speed + Axle Job U"),
+ TestCase(IEPC_S_Gbx3SpeedAxle, 8, TestName = "IEPC-S Gbx 3speed + Axle Job UD"),
+
+ TestCase(IEPC_S_Gbx3SpeedWhl1, 0, TestName = "IEPC-S Gbx 3speed DTWheel-1 Job LH"),
+ TestCase(IEPC_S_Gbx3SpeedWhl1, 1, TestName = "IEPC-S Gbx 3speed DTWheel-1 Job Coach"),
+ TestCase(IEPC_S_Gbx3SpeedWhl1, 2, TestName = "IEPC-S Gbx 3speed DTWheel-1 Job CO"),
+ TestCase(IEPC_S_Gbx3SpeedWhl1, 3, TestName = "IEPC-S Gbx 3speed DTWheel-1 Job HU"),
+ TestCase(IEPC_S_Gbx3SpeedWhl1, 4, TestName = "IEPC-S Gbx 3speed DTWheel-1 Job IU"),
+ TestCase(IEPC_S_Gbx3SpeedWhl1, 5, TestName = "IEPC-S Gbx 3speed DTWheel-1 Job RD"),
+ TestCase(IEPC_S_Gbx3SpeedWhl1, 6, TestName = "IEPC-S Gbx 3speed DTWheel-1 Job SU"),
+ TestCase(IEPC_S_Gbx3SpeedWhl1, 7, TestName = "IEPC-S Gbx 3speed DTWheel-1 Job U"),
+ TestCase(IEPC_S_Gbx3SpeedWhl1, 8, TestName = "IEPC-S Gbx 3speed DTWheel-1 Job UD"),
+
+ TestCase(IEPC_S_Gbx3SpeedWhl2, 0, TestName = "IEPC-S Gbx 3speed DTWheel-2 Job LH"),
+ TestCase(IEPC_S_Gbx3SpeedWhl2, 1, TestName = "IEPC-S Gbx 3speed DTWheel-2 Job Coach"),
+ TestCase(IEPC_S_Gbx3SpeedWhl2, 2, TestName = "IEPC-S Gbx 3speed DTWheel-2 Job CO"),
+ TestCase(IEPC_S_Gbx3SpeedWhl2, 3, TestName = "IEPC-S Gbx 3speed DTWheel-2 Job HU"),
+ TestCase(IEPC_S_Gbx3SpeedWhl2, 4, TestName = "IEPC-S Gbx 3speed DTWheel-2 Job IU"),
+ TestCase(IEPC_S_Gbx3SpeedWhl2, 5, TestName = "IEPC-S Gbx 3speed DTWheel-2 Job RD"),
+ TestCase(IEPC_S_Gbx3SpeedWhl2, 6, TestName = "IEPC-S Gbx 3speed DTWheel-2 Job SU"),
+ TestCase(IEPC_S_Gbx3SpeedWhl2, 7, TestName = "IEPC-S Gbx 3speed DTWheel-2 Job U"),
+ TestCase(IEPC_S_Gbx3SpeedWhl2, 8, TestName = "IEPC-S Gbx 3speed DTWheel-2 Job UD"),
+
+ TestCase(IEPC_S_Gbx1Speed, 0, TestName = "IEPC-S Gbx 1speed Job LH"),
+ TestCase(IEPC_S_Gbx1Speed, 1, TestName = "IEPC-S Gbx 1speed Job Coach"),
+ TestCase(IEPC_S_Gbx1Speed, 2, TestName = "IEPC-S Gbx 1speed Job CO"),
+ TestCase(IEPC_S_Gbx1Speed, 3, TestName = "IEPC-S Gbx 1speed Job HU"),
+ TestCase(IEPC_S_Gbx1Speed, 4, TestName = "IEPC-S Gbx 1speed Job IU"),
+ TestCase(IEPC_S_Gbx1Speed, 5, TestName = "IEPC-S Gbx 1speed Job RD"),
+ TestCase(IEPC_S_Gbx1Speed, 6, TestName = "IEPC-S Gbx 1speed Job SU"),
+ TestCase(IEPC_S_Gbx1Speed, 7, TestName = "IEPC-S Gbx 1speed Job U"),
+ TestCase(IEPC_S_Gbx1Speed, 8, TestName = "IEPC-S Gbx 1speed Job UD"),
+
+ TestCase(IEPC_S_Gbx1SpeedAxl, 0, TestName = "IEPC-S Gbx 1speed + Axle Job LH"),
+ TestCase(IEPC_S_Gbx1SpeedAxl, 1, TestName = "IEPC-S Gbx 1speed + Axle Job Coach"),
+ TestCase(IEPC_S_Gbx1SpeedAxl, 2, TestName = "IEPC-S Gbx 1speed + Axle Job CO"),
+ TestCase(IEPC_S_Gbx1SpeedAxl, 3, TestName = "IEPC-S Gbx 1speed + Axle Job HU"),
+ TestCase(IEPC_S_Gbx1SpeedAxl, 4, TestName = "IEPC-S Gbx 1speed + Axle Job IU"),
+ TestCase(IEPC_S_Gbx1SpeedAxl, 5, TestName = "IEPC-S Gbx 1speed + Axle Job RD"),
+ TestCase(IEPC_S_Gbx1SpeedAxl, 6, TestName = "IEPC-S Gbx 1speed + Axle Job SU"),
+ TestCase(IEPC_S_Gbx1SpeedAxl, 7, TestName = "IEPC-S Gbx 1speed + Axle Job U"),
+ TestCase(IEPC_S_Gbx1SpeedAxl, 8, TestName = "IEPC-S Gbx 1speed + Axle Job UD"),
+
+ TestCase(IEPC_S_Gbx1SpeedWhl1, 0, TestName = "IEPC-S Gbx 1speed DTWheel-1 Job LH"),
+ TestCase(IEPC_S_Gbx1SpeedWhl1, 1, TestName = "IEPC-S Gbx 1speed DTWheel-1 Job Coach"),
+ TestCase(IEPC_S_Gbx1SpeedWhl1, 2, TestName = "IEPC-S Gbx 1speed DTWheel-1 Job CO"),
+ TestCase(IEPC_S_Gbx1SpeedWhl1, 3, TestName = "IEPC-S Gbx 1speed DTWheel-1 Job HU"),
+ TestCase(IEPC_S_Gbx1SpeedWhl1, 4, TestName = "IEPC-S Gbx 1speed DTWheel-1 Job IU"),
+ TestCase(IEPC_S_Gbx1SpeedWhl1, 5, TestName = "IEPC-S Gbx 1speed DTWheel-1 Job RD"),
+ TestCase(IEPC_S_Gbx1SpeedWhl1, 6, TestName = "IEPC-S Gbx 1speed DTWheel-1 Job SU"),
+ TestCase(IEPC_S_Gbx1SpeedWhl1, 7, TestName = "IEPC-S Gbx 1speed DTWheel-1 Job U"),
+ TestCase(IEPC_S_Gbx1SpeedWhl1, 8, TestName = "IEPC-S Gbx 1speed DTWheel-1 Job UD"),
+
+ TestCase(IEPC_S_Gbx1SpeedWhl2, 0, TestName = "IEPC-S Gbx 1speed DTWheel-2 Job LH"),
+ TestCase(IEPC_S_Gbx1SpeedWhl2, 1, TestName = "IEPC-S Gbx 1speed DTWheel-2 Job Coach"),
+ TestCase(IEPC_S_Gbx1SpeedWhl2, 2, TestName = "IEPC-S Gbx 1speed DTWheel-2 Job CO"),
+ TestCase(IEPC_S_Gbx1SpeedWhl2, 3, TestName = "IEPC-S Gbx 1speed DTWheel-2 Job HU"),
+ TestCase(IEPC_S_Gbx1SpeedWhl2, 4, TestName = "IEPC-S Gbx 1speed DTWheel-2 Job IU"),
+ TestCase(IEPC_S_Gbx1SpeedWhl2, 5, TestName = "IEPC-S Gbx 1speed DTWheel-2 Job RD"),
+ TestCase(IEPC_S_Gbx1SpeedWhl2, 6, TestName = "IEPC-S Gbx 1speed DTWheel-2 Job SU"),
+ TestCase(IEPC_S_Gbx1SpeedWhl2, 7, TestName = "IEPC-S Gbx 1speed DTWheel-2 Job U"),
+ TestCase(IEPC_S_Gbx1SpeedWhl2, 8, TestName = "IEPC-S Gbx 1speed DTWheel-2 Job UD"),
+ ]
+ public void IEPCRunJob(string jobFile, int cycleIdx)
+ {
+ var inputProvider = JSONInputDataFactory.ReadJsonJob(jobFile);
+
+ var writer = new FileOutputWriter(jobFile);
+ var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Engineering, inputProvider, writer);
+ factory.Validate = false;
+ factory.WriteModalResults = true;
+
+
+ var sumContainer = new SummaryDataContainer(writer);
+ var jobContainer = new JobContainer(sumContainer);
+
+ factory.SumData = sumContainer;
+
+ if (cycleIdx < 0) {
+ jobContainer.AddRuns(factory);
+ jobContainer.Execute();
+ jobContainer.WaitFinished();
+ Assert.IsTrue(jobContainer.GetProgress().All(x => x.Value.Success));
+ } else {
+ var run = factory.SimulationRuns().ToArray()[cycleIdx];
+
+ Assert.NotNull(run);
+
+ var pt = run.GetContainer();
+
+ Assert.NotNull(pt);
+
+ run.Run();
+ Assert.IsTrue(run.FinishedWithoutErrors);
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/IHPCTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/IHPCTest.cs
new file mode 100644
index 0000000000000000000000000000000000000000..12eca7ad53330cdb05e87f2796ec4137ce84cc8b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/IHPCTest.cs
@@ -0,0 +1,94 @@
+using System.IO;
+using System.Linq;
+using NUnit.Framework;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.InputData.FileIO.JSON;
+using TUGraz.VectoCore.InputData.Reader.Impl;
+using TUGraz.VectoCore.Models.Simulation.Impl;
+using TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory;
+using TUGraz.VectoCore.OutputData;
+using TUGraz.VectoCore.OutputData.FileIO;
+
+namespace TUGraz.VectoCore.Tests.Integration.Hybrid;
+
+[TestFixture]
+[Parallelizable(ParallelScope.All)]
+public class IHPCTest
+{
+ [OneTimeSetUp]
+ public void RunBeforeAnyTests()
+ {
+ Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
+ //InitGraphWriter();
+ }
+
+ public const string IHPCTEst_12speed = @"TestData\Hybrids\GenericIHPC\12SpeedGbx\IHPC Group 5.vecto";
+
+ public const string IHPCTEst_6speed = @"TestData\Hybrids\GenericIHPC\6SpeedGbx\IHPC Group 5.vecto";
+
+ [
+ TestCase(IHPCTEst_12speed, 0, TestName = "IHPC 12spd Group 5 DriveCycle LongHaul"),
+ TestCase(IHPCTEst_12speed, 1, TestName = "IHPC 12spd Group 5 DriveCycle Coach"),
+ TestCase(IHPCTEst_12speed, 2, TestName = "IHPC 12spd Group 5 DriveCycle Construction"),
+ TestCase(IHPCTEst_12speed, 3, TestName = "IHPC 12spd Group 5 DriveCycle HeavyUrban"),
+ TestCase(IHPCTEst_12speed, 4, TestName = "IHPC 12spd Group 5 DriveCycle Interurban"),
+ TestCase(IHPCTEst_12speed, 5, TestName = "IHPC 12spd Group 5 DriveCycle MunicipalUtility"),
+ TestCase(IHPCTEst_12speed, 6, TestName = "IHPC 12spd Group 5 DriveCycle RegionalDelivery"),
+ TestCase(IHPCTEst_12speed, 7, TestName = "IHPC 12spd Group 5 DriveCycle Suburban"),
+ TestCase(IHPCTEst_12speed, 8, TestName = "IHPC 12spd Group 5 DriveCycle Urban"),
+ TestCase(IHPCTEst_12speed, 9, TestName = "IHPC 12spd Group 5 DriveCycle UrbanDelivery"),
+
+ TestCase(IHPCTEst_6speed, 0, TestName = "IHPC 6spd Group 5 DriveCycle LongHaul"),
+ TestCase(IHPCTEst_6speed, 1, TestName = "IHPC 6spd Group 5 DriveCycle Coach"),
+ TestCase(IHPCTEst_6speed, 2, TestName = "IHPC 6spd Group 5 DriveCycle Construction"),
+ TestCase(IHPCTEst_6speed, 3, TestName = "IHPC 6spd Group 5 DriveCycle HeavyUrban"),
+ TestCase(IHPCTEst_6speed, 4, TestName = "IHPC 6spd Group 5 DriveCycle Interurban"),
+ TestCase(IHPCTEst_6speed, 5, TestName = "IHPC 6spd Group 5 DriveCycle MunicipalUtility"),
+ TestCase(IHPCTEst_6speed, 6, TestName = "IHPC 6spd Group 5 DriveCycle RegionalDelivery"),
+ TestCase(IHPCTEst_6speed, 7, TestName = "IHPC 6spd Group 5 DriveCycle Suburban"),
+ TestCase(IHPCTEst_6speed, 8, TestName = "IHPC 6spd Group 5 DriveCycle Urban"),
+ TestCase(IHPCTEst_6speed, 9, TestName = "IHPC 6spd Group 5 DriveCycle UrbanDelivery"),
+ ]
+ public void P2HybridGroup5DriveCycle(string jobFile, int cycleIdx)
+ { RunHybridJob(jobFile, cycleIdx); }
+
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ public void RunHybridJob(string jobFile, int cycleIdx, int? startDistance = null)
+ {
+ var inputProvider = JSONInputDataFactory.ReadJsonJob(jobFile);
+
+ var writer = new FileOutputWriter(jobFile);
+ var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Engineering, inputProvider, writer);
+ factory.Validate = false;
+ factory.WriteModalResults = true;
+
+ var sumContainer = new SummaryDataContainer(writer);
+ var jobContainer = new JobContainer(sumContainer);
+
+ factory.SumData = sumContainer;
+
+ var run = factory.SimulationRuns().ToArray()[cycleIdx];
+
+ if (startDistance != null) {
+ //(run.GetContainer().BatteryInfo as Battery).PreviousState.StateOfCharge = 0.317781;
+ (run.GetContainer().RunData.Cycle as DrivingCycleProxy).Entries = run.GetContainer().RunData.Cycle
+ .Entries.Where(x => x.Distance >= startDistance.Value).ToList();
+ //run.GetContainer().MileageCounter.Distance = startDistance;
+ //run.GetContainer().DrivingCycleInfo.CycleStartDistance = startDistance;
+ }
+
+ Assert.NotNull(run);
+
+ var pt = run.GetContainer();
+
+ Assert.NotNull(pt);
+
+ run.Run();
+ Assert.IsTrue(run.FinishedWithoutErrors);
+
+ //jobContainer.AddRuns(factory);
+ //jobContainer.Execute();
+ //jobContainer.WaitFinished();
+ //Assert.IsTrue(jobContainer.GetProgress().All(x => x.Value.Success));
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
index 61e790c8f0188195b11e842ea5cfb6fdd8dd5098..2f6c82d6805506cfcd7a12c0d28ed21409a90d83 100644
--- a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
@@ -1900,6 +1900,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
})).ToDictionary(k => k.Item1 + 1, v => v.Item2),
Inertia = 0.SI<KilogramSquareMeter>(),
TractionInterruption = 1.SI<Second>(),
+ Type = GearboxType.AMT
};
}
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
index 88a7e03cb65b1991ad29587ab0d8fa23960625a4..8a6f72a615e5c2fbcbc15c96d537d798105d47dd 100644
--- a/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
@@ -49,6 +49,13 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
public const string EngineFile = @"TestData\Hybrids\GenericVehicle_Sx\Group2_6l.veng";
+ public const string SerialHybrid_S2_3Speed_Job = @"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2_3speed.vecto";
+ public const string SerialHybrid_S2_12Speed_Job = @"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2.vecto";
+ public const string SerialHybrid_S2_APTN_Job = @"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto";
+ public const string SerialHybrid_S2_APTS_Job = @"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTS.vecto";
+ public const string SerialHybrid_S2_APTP_Job = @"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTP.vecto";
+
+ public const string SerialHybrid_S2_3Speed_PTO_Job = @"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2_3speed_PTO.vecto";
public const bool PlotGraphs = true;
@@ -60,56 +67,65 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
// - - - - - - - - - - - - - - - - - - - - - - - - -
[
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2_3speed.vecto", 0, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, LongHaul"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2_3speed.vecto", 1, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, RegionalDelivery"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2_3speed.vecto", 2, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, UrbanDelivery"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2_3speed.vecto", 3, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, Construction"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2_3speed.vecto", 4, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, Urban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2_3speed.vecto", 5, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, Suburban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2_3speed.vecto", 6, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, Interurban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2_3speed.vecto", 7, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, Coach"),
+ TestCase(SerialHybrid_S2_3Speed_Job, 0, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, LongHaul"),
+ TestCase(SerialHybrid_S2_3Speed_Job, 1, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, RegionalDelivery"),
+ TestCase(SerialHybrid_S2_3Speed_Job, 2, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, UrbanDelivery"),
+ TestCase(SerialHybrid_S2_3Speed_Job, 3, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, Construction"),
+ TestCase(SerialHybrid_S2_3Speed_Job, 4, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, Urban"),
+ TestCase(SerialHybrid_S2_3Speed_Job, 5, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, Suburban"),
+ TestCase(SerialHybrid_S2_3Speed_Job, 6, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, Interurban"),
+ TestCase(SerialHybrid_S2_3Speed_Job, 7, TestName = "Generic Serial Hybrid S2 AMT 3Speed Job, Coach"),
]
[
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2.vecto", 0, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, LongHaul"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2.vecto", 1, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, RegionalDelivery"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2.vecto", 2, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, UrbanDelivery"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2.vecto", 3, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, Construction"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2.vecto", 4, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, Urban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2.vecto", 5, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, Suburban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2.vecto", 6, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, Interurban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2.vecto", 7, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, Coach"),
+ TestCase(SerialHybrid_S2_12Speed_Job, 0, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, LongHaul"),
+ TestCase(SerialHybrid_S2_12Speed_Job, 1, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, RegionalDelivery"),
+ TestCase(SerialHybrid_S2_12Speed_Job, 2, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, UrbanDelivery"),
+ TestCase(SerialHybrid_S2_12Speed_Job, 3, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, Construction"),
+ TestCase(SerialHybrid_S2_12Speed_Job, 4, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, Urban"),
+ TestCase(SerialHybrid_S2_12Speed_Job, 5, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, Suburban"),
+ TestCase(SerialHybrid_S2_12Speed_Job, 6, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, Interurban"),
+ TestCase(SerialHybrid_S2_12Speed_Job, 7, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, Coach"),
]
[
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 0, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, LongHaul"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 1, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, RegionalDelivery"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 2, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, UrbanDelivery"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 3, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Construction"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 4, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Urban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 5, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Suburban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 6, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Interurban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 7, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Coach"),
+ TestCase(SerialHybrid_S2_APTN_Job, 0, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, LongHaul"),
+ TestCase(SerialHybrid_S2_APTN_Job, 1, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, RegionalDelivery"),
+ TestCase(SerialHybrid_S2_APTN_Job, 2, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, UrbanDelivery"),
+ TestCase(SerialHybrid_S2_APTN_Job, 3, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Construction"),
+ TestCase(SerialHybrid_S2_APTN_Job, 4, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Urban"),
+ TestCase(SerialHybrid_S2_APTN_Job, 5, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Suburban"),
+ TestCase(SerialHybrid_S2_APTN_Job, 6, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Interurban"),
+ TestCase(SerialHybrid_S2_APTN_Job, 7, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Coach"),
]
[
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTS.vecto", 0, TestName = "Generic Serial Hybrid S2 APT-S Job, LongHaul"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTS.vecto", 1, TestName = "Generic Serial Hybrid S2 APT-S Job, RegionalDelivery"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTS.vecto", 2, TestName = "Generic Serial Hybrid S2 APT-S Job, UrbanDelivery"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTS.vecto", 3, TestName = "Generic Serial Hybrid S2 APT-S Job, Construction"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTS.vecto", 4, TestName = "Generic Serial Hybrid S2 APT-S Job, Urban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTS.vecto", 5, TestName = "Generic Serial Hybrid S2 APT-S Job, Suburban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTS.vecto", 6, TestName = "Generic Serial Hybrid S2 APT-S Job, Interurban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTS.vecto", 7, TestName = "Generic Serial Hybrid S2 APT-S Job, Coach"),
+ TestCase(SerialHybrid_S2_APTS_Job, 0, TestName = "Generic Serial Hybrid S2 APT-S Job, LongHaul"),
+ TestCase(SerialHybrid_S2_APTS_Job, 1, TestName = "Generic Serial Hybrid S2 APT-S Job, RegionalDelivery"),
+ TestCase(SerialHybrid_S2_APTS_Job, 2, TestName = "Generic Serial Hybrid S2 APT-S Job, UrbanDelivery"),
+ TestCase(SerialHybrid_S2_APTS_Job, 3, TestName = "Generic Serial Hybrid S2 APT-S Job, Construction"),
+ TestCase(SerialHybrid_S2_APTS_Job, 4, TestName = "Generic Serial Hybrid S2 APT-S Job, Urban"),
+ TestCase(SerialHybrid_S2_APTS_Job, 5, TestName = "Generic Serial Hybrid S2 APT-S Job, Suburban"),
+ TestCase(SerialHybrid_S2_APTS_Job, 6, TestName = "Generic Serial Hybrid S2 APT-S Job, Interurban"),
+ TestCase(SerialHybrid_S2_APTS_Job, 7, TestName = "Generic Serial Hybrid S2 APT-S Job, Coach"),
]
[
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTP.vecto", 0, TestName = "Generic Serial Hybrid S2 APT-P Job, LongHaul"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTP.vecto", 1, TestName = "Generic Serial Hybrid S2 APT-P Job, RegionalDelivery"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTP.vecto", 2, TestName = "Generic Serial Hybrid S2 APT-P Job, UrbanDelivery"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTP.vecto", 3, TestName = "Generic Serial Hybrid S2 APT-P Job, Construction"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTP.vecto", 4, TestName = "Generic Serial Hybrid S2 APT-P Job, Urban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTP.vecto", 5, TestName = "Generic Serial Hybrid S2 APT-P Job, Suburban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTP.vecto", 6, TestName = "Generic Serial Hybrid S2 APT-P Job, Interurban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_AT\HEV_S2_Group5LH_rl_APTP.vecto", 7, TestName = "Generic Serial Hybrid S2 APT-P Job, Coach"),
+ TestCase(SerialHybrid_S2_APTP_Job, 0, TestName = "Generic Serial Hybrid S2 APT-P Job, LongHaul"),
+ TestCase(SerialHybrid_S2_APTP_Job, 1, TestName = "Generic Serial Hybrid S2 APT-P Job, RegionalDelivery"),
+ TestCase(SerialHybrid_S2_APTP_Job, 2, TestName = "Generic Serial Hybrid S2 APT-P Job, UrbanDelivery"),
+ TestCase(SerialHybrid_S2_APTP_Job, 3, TestName = "Generic Serial Hybrid S2 APT-P Job, Construction"),
+ TestCase(SerialHybrid_S2_APTP_Job, 4, TestName = "Generic Serial Hybrid S2 APT-P Job, Urban"),
+ TestCase(SerialHybrid_S2_APTP_Job, 5, TestName = "Generic Serial Hybrid S2 APT-P Job, Suburban"),
+ TestCase(SerialHybrid_S2_APTP_Job, 6, TestName = "Generic Serial Hybrid S2 APT-P Job, Interurban"),
+ TestCase(SerialHybrid_S2_APTP_Job, 7, TestName = "Generic Serial Hybrid S2 APT-P Job, Coach"),
+ ]
+ [
+ TestCase(SerialHybrid_S2_3Speed_PTO_Job, 0, TestName = "Generic Serial Hybrid S2 AMT 3Speed PTO Job, LongHaul"),
+ TestCase(SerialHybrid_S2_3Speed_PTO_Job, 1, TestName = "Generic Serial Hybrid S2 AMT 3Speed PTO Job, RegionalDelivery"),
+ TestCase(SerialHybrid_S2_3Speed_PTO_Job, 2, TestName = "Generic Serial Hybrid S2 AMT 3Speed PTO Job, UrbanDelivery"),
+ TestCase(SerialHybrid_S2_3Speed_PTO_Job, 3, TestName = "Generic Serial Hybrid S2 AMT 3Speed PTO Job, Construction"),
+ TestCase(SerialHybrid_S2_3Speed_PTO_Job, 4, TestName = "Generic Serial Hybrid S2 AMT 3Speed PTO Job, Urban"),
+ TestCase(SerialHybrid_S2_3Speed_PTO_Job, 5, TestName = "Generic Serial Hybrid S2 AMT 3Speed PTO Job, Suburban"),
+ TestCase(SerialHybrid_S2_3Speed_PTO_Job, 6, TestName = "Generic Serial Hybrid S2 AMT 3Speed PTO Job, Interurban"),
+ TestCase(SerialHybrid_S2_3Speed_PTO_Job, 7, TestName = "Generic Serial Hybrid S2 AMT 3Speed PTO Job, Coach"),
]
-
[
TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2_WHR.vecto", 1, TestName = "Generic Serial Hybrid S2 AMT WHR 12speed Job, RegionalDelivery"),
]
@@ -348,7 +364,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
[
TestCase(30, 0.7, 0, TestName = "S4 Serial Hybrid DriveOff 30km/h SoC: 0.7, level"),
TestCase(80, 0.7, 0, TestName = "S4 Serial Hybrid DriveOff 80km/h SoC: 0.7, level"),
- TestCase(30, 0.22, 0, TestName = "S4 Serial Hybrid DriveOff 30km/h SoC: 0.22, level")
+ TestCase(30, 0.22, 0, TestName = "S4 Serial Hybrid DriveOff 30km/h SoC: 0.22, level"),
+ TestCase(80, 0.22, 0, TestName = "S4 Serial Hybrid DriveOff 80km/h SoC: 0.22, level"),
]
public void S4HybridDriveOff(double vmax, double initialSoC, double slope)
{
diff --git a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
index 205d21d0d2055490f61d03b937268fe307c37588..b838571b733cce9626a5221b24c602d32b8c7833 100644
--- a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
@@ -82,7 +82,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
var vehicle = inputDataProvider.JobInputData.Vehicle;
var vifReader = XmlReader.Create(vifFilename);
- var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistageBusInputDataProvider;
+ var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
var numberOfManufacturingStages = vifDataProvider?.JobInputData.ManufacturingStages?.Count ?? 0;
var writer = new FileOutputVIFWriter(vifResult, numberOfManufacturingStages);
@@ -122,7 +122,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
var vehicle = inputDataProvider.JobInputData.Vehicle;
var vifReader = XmlReader.Create(vifFilename);
- var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistageBusInputDataProvider;
+ var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
var numberOfManufacturingStages = vifDataProvider?.JobInputData.ManufacturingStages?.Count ?? 0;
var writer = new FileOutputVIFWriter(vifResult, numberOfManufacturingStages);
@@ -158,7 +158,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
private void TestNewVifData(string filePath)
{
var vifReader = XmlReader.Create(filePath);
- var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistageBusInputDataProvider;
+ var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
Assert.AreEqual(3, vifDataProvider.JobInputData.ManufacturingStages.Count());
TestVifStage2Data(vifDataProvider.JobInputData.ManufacturingStages[0]);
@@ -326,7 +326,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
TestSimulationMultistageVehicle(VIFInputFileGroup41, InputFilePathGroup41, 1);
var vifReader = XmlReader.Create(_generatedVIFFilepath);
- var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistageBusInputDataProvider;
+ var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
var inputData = new XMLDeclarationVIFInputData(vifDataProvider, null);
var writer = new MockDeclarationWriter("vif_vehicle-sample_test.xml");
@@ -352,7 +352,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
TestSimulationMultistageVehicle(VIFExemptedPrimaryBus, ExepmtedCompletedBusInput, 1);
var vifReader = XmlReader.Create(_generatedVIFFilepath);
- var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistageBusInputDataProvider;
+ var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
var inputData = new XMLDeclarationVIFInputData(vifDataProvider, null);
var writer = new FileOutputWriter("vif_vehicle-sample_test.xml");
@@ -451,7 +451,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
private void ValidateVIFData(string vifFilePath)
{
var vifReader = XmlReader.Create(vifFilePath);
- var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistageBusInputDataProvider;
+ var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
var res = vifDataProvider.JobInputData.PrimaryVehicle;
TestVehicleData(res.Vehicle);
@@ -767,7 +767,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
results.Add(new XElement(tns + XMLNames.Report_Result_Result,
new XAttribute(XMLNames.Report_Result_Status_Attr, "success"),
- new XElement(tns + XMLNames.Report_Vehicle_VehicleGroup, "P31SD"),
+ new XElement(tns + XMLNames.Report_Results_PrimaryVehicleSubgroup, "P31SD"),
new XElement(tns + XMLNames.Report_Result_Mission, "Heavy Urban"),
new XElement(tns +
XMLNames.Report_ResultEntry_SimulationParameters,
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/BusDeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/BusDeclarationDataTest.cs
new file mode 100644
index 0000000000000000000000000000000000000000..efce6d6a22350be1dfc6637581d663e391219306
--- /dev/null
+++ b/VectoCore/VectoCoreTest/Models/Declaration/BusDeclarationDataTest.cs
@@ -0,0 +1,87 @@
+using NUnit.Framework;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.Declaration;
+
+namespace TUGraz.VectoCore.Tests.Models.Declaration;
+
+[TestFixture]
+[Parallelizable(ParallelScope.All)]
+public class BusDeclarationDataTest
+{
+
+ protected CompletedBusSegments segments;
+
+ [OneTimeSetUp]
+ public void RunBeforeTest()
+ {
+ segments = new CompletedBusSegments();
+ }
+
+ [TestCase(2, false, VehicleCode.CE, RegistrationClass.I, false, null, null, VehicleClass.Class31a, 0.0),
+ TestCase(2, false, VehicleCode.CE, RegistrationClass.I, true, null, null, VehicleClass.Class31b1, 1.0),
+ TestCase(2, false, VehicleCode.CE, RegistrationClass.II, true, null, null, VehicleClass.Class31b2, 1.0),
+ TestCase(2, false, VehicleCode.CF, RegistrationClass.I, null, null, null, VehicleClass.Class31c, 0.0),
+ TestCase(2, false, VehicleCode.CI, RegistrationClass.I, null, null, null, VehicleClass.Class31d, 0.0),
+ TestCase(2, false, VehicleCode.CJ, RegistrationClass.I, null, null, null, VehicleClass.Class31e, 0.0),
+ TestCase(2, false, VehicleCode.CA, RegistrationClass.II, null, null, null, VehicleClass.Class32a, 0.0),
+ TestCase(2, false, VehicleCode.CA, RegistrationClass.II_III, null, null, 3.0, VehicleClass.Class32b, 0.0),
+ TestCase(2, false, VehicleCode.CA, RegistrationClass.II_III, null, null, 3.2, VehicleClass.Class32c, 0.0),
+ TestCase(2, false, VehicleCode.CA, RegistrationClass.III, null, null, null, VehicleClass.Class32d, 0.0),
+ TestCase(2, false, VehicleCode.CB, RegistrationClass.II, null, 5, null, VehicleClass.Class32e, 0.0),
+ TestCase(2, false, VehicleCode.CB, RegistrationClass.II, null, 10, null, VehicleClass.Class32f, 0.0),
+ TestCase(3, false, VehicleCode.CE, RegistrationClass.I, false, null, null, VehicleClass.Class33a, 0.0),
+ TestCase(3, false, VehicleCode.CE, RegistrationClass.I, true, null, null, VehicleClass.Class33b1, 1.25),
+ TestCase(3, false, VehicleCode.CE, RegistrationClass.II, true, null, null, VehicleClass.Class33b2, 1.25),
+ TestCase(3, false, VehicleCode.CF, RegistrationClass.I, null, null, null, VehicleClass.Class33c, 0.0),
+ TestCase(3, false, VehicleCode.CI, RegistrationClass.I, null, null, null, VehicleClass.Class33d, 0.0),
+ TestCase(3, false, VehicleCode.CJ, RegistrationClass.I, null, null, null, VehicleClass.Class33e, 0.0),
+ TestCase(3, false, VehicleCode.CA, RegistrationClass.II, null, null, null, VehicleClass.Class34a, 0.0),
+ TestCase(3, false, VehicleCode.CA, RegistrationClass.II_III, null, null, 3.0, VehicleClass.Class34b, 0.0),
+ TestCase(3, false, VehicleCode.CA, RegistrationClass.II_III, null, null, 3.2, VehicleClass.Class34c, 0.0),
+ TestCase(3, false, VehicleCode.CA, RegistrationClass.III, null, null, null, VehicleClass.Class34d, 0.0),
+ TestCase(3, false, VehicleCode.CB, RegistrationClass.II, null, 5, null, VehicleClass.Class34e, 0.0),
+ TestCase(3, false, VehicleCode.CB, RegistrationClass.II, null, 10, null, VehicleClass.Class34f, 0.0),
+ TestCase(3, true, VehicleCode.CG, RegistrationClass.I, false, null, null, VehicleClass.Class35a, 0.0),
+ TestCase(3, true, VehicleCode.CG, RegistrationClass.I, true, null, null, VehicleClass.Class35b1, 1.0),
+ TestCase(3, true, VehicleCode.CG, RegistrationClass.II, true, null, null, VehicleClass.Class35b2, 1.0),
+ TestCase(3, true, VehicleCode.CH, RegistrationClass.I, null, null, null, VehicleClass.Class35c, 0.0),
+ TestCase(3, true, VehicleCode.CC, RegistrationClass.II, null, null, null, VehicleClass.Class36a, 0.0),
+ TestCase(3, true, VehicleCode.CC, RegistrationClass.II_III, null, null, 3.0, VehicleClass.Class36b, 0.0),
+ TestCase(3, true, VehicleCode.CC, RegistrationClass.II_III, null, null, 3.2, VehicleClass.Class36c, 0.0),
+ TestCase(3, true, VehicleCode.CC, RegistrationClass.III, null, null, null, VehicleClass.Class36d, 0.0),
+ TestCase(3, true, VehicleCode.CD, RegistrationClass.II, null, 5, null, VehicleClass.Class36e, 0.0),
+ TestCase(3, true, VehicleCode.CD, RegistrationClass.II, null, 10, null, VehicleClass.Class36f, 0.0),
+ TestCase(4, false, VehicleCode.CE, RegistrationClass.I, false, null, null, VehicleClass.Class37a, 0.0),
+ TestCase(4, false, VehicleCode.CE, RegistrationClass.I, true, null, null, VehicleClass.Class37b1, 1.25),
+ TestCase(4, false, VehicleCode.CE, RegistrationClass.II, true, null, null, VehicleClass.Class37b2, 1.25),
+ TestCase(4, false, VehicleCode.CF, RegistrationClass.I, null, null, null, VehicleClass.Class37c, 0.0),
+ TestCase(4, false, VehicleCode.CI, RegistrationClass.I, null, null, null, VehicleClass.Class37d, 0.0),
+ TestCase(4, false, VehicleCode.CJ, RegistrationClass.I, null, null, null, VehicleClass.Class37e, 0.0),
+ TestCase(4, false, VehicleCode.CA, RegistrationClass.II, null, null, null, VehicleClass.Class38a, 0.0),
+ TestCase(4, false, VehicleCode.CA, RegistrationClass.II_III, null, null, 3.0, VehicleClass.Class38b, 0.0),
+ TestCase(4, false, VehicleCode.CA, RegistrationClass.II_III, null, null, 3.2, VehicleClass.Class38c, 0.0),
+ TestCase(4, false, VehicleCode.CA, RegistrationClass.III, null, null, null, VehicleClass.Class38d, 0.0),
+ TestCase(4, false, VehicleCode.CB, RegistrationClass.II, null, 5, null, VehicleClass.Class38e, 0.0),
+ TestCase(4, false, VehicleCode.CB, RegistrationClass.II, null, 10, null, VehicleClass.Class38f, 0.0),
+ TestCase(4, true, VehicleCode.CG, RegistrationClass.I, false, null, null, VehicleClass.Class39a, 0.0),
+ TestCase(4, true, VehicleCode.CG, RegistrationClass.I, true, null, null, VehicleClass.Class39b1, 1.25),
+ TestCase(4, true, VehicleCode.CG, RegistrationClass.II, true, null, null, VehicleClass.Class39b2, 1.25),
+ TestCase(4, true, VehicleCode.CH, RegistrationClass.I, null, null, null, VehicleClass.Class39c, 0.0),
+ TestCase(4, true, VehicleCode.CC, RegistrationClass.II, null, null, null, VehicleClass.Class40a, 0.0),
+ TestCase(4, true, VehicleCode.CC, RegistrationClass.II_III, null, null, 3.0, VehicleClass.Class40b, 0.0),
+ TestCase(4, true, VehicleCode.CC, RegistrationClass.II_III, null, null, 3.2, VehicleClass.Class40c, 0.0),
+ TestCase(4, true, VehicleCode.CC, RegistrationClass.III, null, null, null, VehicleClass.Class40d, 0.0),
+ TestCase(4, true, VehicleCode.CD, RegistrationClass.II, null, 5, null, VehicleClass.Class40e, 0.0),
+ TestCase(4, true, VehicleCode.CD, RegistrationClass.II, null, 10, null, VehicleClass.Class40f, 0.0),
+ ]
+ public void TestDrivetrainCorrectionLengthDrivetrain(int numAxles, bool articulated, VehicleCode vc, RegistrationClass regCode, bool? lowEntry, int? passCntLow, double? height,
+ VehicleClass expecteClass, double expectedLength)
+ {
+ var semgent = segments.Lookup(numAxles, vc, regCode, passCntLow, height?.SI<Meter>(), lowEntry);
+ Assert.AreEqual(semgent.VehicleClass, expecteClass);
+
+ var len = DeclarationData.BusAuxiliaries.CorrectionLengthDrivetrainVolume(vc, lowEntry, numAxles, articulated);
+ Assert.AreEqual(expectedLength, len.Value());
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
index b9a879cade91ac8ed597c404028e856d094fb63a..9693e144ff62a8a0d1bd9a5a3e7256eeaa8c7bdc 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
@@ -334,14 +334,15 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
}
[TestCase("only the drive shaft of the PTO - shift claw, synchronizer, sliding gearwheel", 50),
- TestCase("only the drive shaft of the PTO - multi-disc clutch", 1000),
- TestCase("only the drive shaft of the PTO - multi-disc clutch, oil pump", 2000),
- TestCase("drive shaft and/or up to 2 gear wheels - shift claw, synchronizer, sliding gearwheel", 300),
- TestCase("drive shaft and/or up to 2 gear wheels - multi-disc clutch", 1500),
- TestCase("drive shaft and/or up to 2 gear wheels - multi-disc clutch, oil pump", 3000),
- TestCase("drive shaft and/or more than 2 gear wheels - shift claw, synchronizer, sliding gearwheel", 600),
- TestCase("drive shaft and/or more than 2 gear wheels - multi-disc clutch", 2000),
- TestCase("drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump", 4000),
+ TestCase("only the drive shaft of the PTO - multi-disc clutch", 350),
+ TestCase("only the drive shaft of the PTO - multi-disc clutch, oil pump", 3000),
+ TestCase("drive shaft and/or up to 2 gear wheels - shift claw, synchronizer, sliding gearwheel", 150),
+ TestCase("drive shaft and/or up to 2 gear wheels - multi-disc clutch", 400),
+ TestCase("drive shaft and/or up to 2 gear wheels - multi-disc clutch, oil pump", 3050),
+ TestCase("drive shaft and/or more than 2 gear wheels - shift claw, synchronizer, sliding gearwheel", 200),
+ TestCase("drive shaft and/or more than 2 gear wheels - multi-disc clutch", 450),
+ TestCase("drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump", 3100),
+ TestCase("PTO which includes 1 or more additional gearmesh(es), without disconnect clutch", 1500),
TestCase("only one engaged gearwheel above oil level", 0)]
public void AuxPTOTransmissionTest(string technology, double value)
{
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
index 478489c4b6ff93a123bf0a4b9f484dc8d7f362d6..2347bc503caef67d8a8ae02ee3b425dd1095b561 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
@@ -277,8 +277,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
};
// call builder (actual test)
- var builder = new PowertrainBuilder(new MockModalDataContainer());
- builder.Build(data);
+ PowertrainBuilder.Build(data, new MockModalDataContainer());
}
/// <summary>
@@ -363,8 +362,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
};
// call builder (actual test)
- var builder = new PowertrainBuilder(new MockModalDataContainer());
- var jobContainer = builder.Build(data);
+ var jobContainer = PowertrainBuilder.Build(data, new MockModalDataContainer());
}
private static void RunJob(string jobFile, string expectedModFile, string actualModFile, string expectedSumFile,
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs
index 12d8e72d65ace7fc3f5cd9ac6c147646a35303f0..b96aef018182cfa4c73e2b2fb20758362f1e9b8c 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs
@@ -78,10 +78,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var reader = new EngineeringModeVectoRunDataFactory(engineeringProvider);
var runData = reader.NextRun().First();
- var writer = new MockModalDataContainer();
- var builder = new PowertrainBuilder(writer);
-
- var powerTrain = builder.Build(runData) as VehicleContainer;
+ var powerTrain = PowertrainBuilder.Build(runData, new MockModalDataContainer()) as VehicleContainer;
Assert.NotNull(powerTrain);
Assert.IsInstanceOf<IVehicleContainer>(powerTrain);
@@ -108,10 +105,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
if (!shouldFail) {
var runData = reader.NextRun().First();
- var writer = new MockModalDataContainer();
- var builder = new PowertrainBuilder(writer);
-
- var powerTrain = builder.Build(runData) as VehicleContainer;
+ var powerTrain = PowertrainBuilder.Build(runData, new MockModalDataContainer()) as VehicleContainer;
Assert.NotNull(powerTrain);
Assert.IsInstanceOf<IVehicleContainer>(powerTrain);
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
index 9f02660a5851fb2b012a36c113b346332e61c4d4..479abf518325f8a4b02b3f643f04f50443ead14a 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
@@ -179,8 +179,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
};
// call builder (actual test)
- var builder = new PowertrainBuilder(new MockModalDataContainer());
- var jobContainer = builder.Build(data);
+ var jobContainer = PowertrainBuilder.Build(data, new MockModalDataContainer(), container => {});
}
/// <summary>
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
index c37ea78d34b6c9858bba4ed31d4aba8877c84403..54b39cac2af7e6a28bf466e94d368b1e169f621d 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
@@ -196,10 +196,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
protected virtual Dictionary<MeterPerSecond, Radian> SimulationRunPreprocessingEcoRoll(IVectoRun run)
{
var data = run.GetContainer().RunData;
- var modData = new ModalDataContainer(data, null, null);
- var builder = new PowertrainBuilder(modData);
var simpleContainer = new SimplePowertrainContainer(data);
- builder.BuildSimplePowertrain(data, simpleContainer);
+ PowertrainBuilder.BuildSimplePowertrain(data, simpleContainer);
var tmp = new Dictionary<MeterPerSecond, Radian>();
var preprocessor = new PCCEcoRollEngineStopPreprocessor(simpleContainer, tmp, 50.KMPHtoMeterPerSecond(), 90.KMPHtoMeterPerSecond());
@@ -220,10 +218,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
protected virtual PCCSegments SimulationRunPreprocessingPCCSegments(IVectoRun run)
{
var data = run.GetContainer().RunData;
- var modData = new ModalDataContainer(data, null, null);
- var builder = new PowertrainBuilder(modData);
var simpleContainer = new SimplePowertrainContainer(data);
- builder.BuildSimplePowertrain(data, simpleContainer);
+ PowertrainBuilder.BuildSimplePowertrain(data, simpleContainer);
var tmp = new PCCSegments();
var preprocessor = new PCCSegmentPreprocessor(simpleContainer, tmp, data.DriverData.PCC);
@@ -292,10 +288,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
protected virtual VelocityRollingLookup SimulationRunPreprocessingVelocityTractionInterruption(IVectoRun run)
{
var data = run.GetContainer().RunData;
- var modData = new ModalDataContainer(data, null, null);
- var builder = new PowertrainBuilder(modData);
var simpleContainer = new SimplePowertrainContainer(data);
- builder.BuildSimplePowertrain(data, simpleContainer);
+ PowertrainBuilder.BuildSimplePowertrain(data, simpleContainer);
var tmp = new VelocityRollingLookup();
var preprocessor = new VelocitySpeedGearshiftPreprocessor(tmp, 1.SI<Second>(), simpleContainer, minGradient: -12, maxGradient: 12);
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
index 25c891c1ed8069b4ed71593edbace5cce9ad0924..ec64ea8f114a8446b7f2bdb1c97d3966ee2a09f0 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
@@ -66,11 +66,11 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
Assert.AreEqual(334.23 * count, -emModelData.EfficiencyData.VoltageLevels.First().FullLoadCurve.FullLoadDriveTorque(2000.RPMtoRad()).Value(), 1e-3);
Assert.AreEqual(-334.23 * count, -emModelData.EfficiencyData.VoltageLevels.First().FullLoadCurve.FullGenerationTorque(2000.RPMtoRad()).Value(), 1e-3);
- Assert.AreEqual(30 * count, emModelData.DragCurve.Lookup(2500.RPMtoRad()).Value(), 1e-3);
+ Assert.AreEqual(30 * count, emModelData.DragCurveLookup(2500.RPMtoRad(), 0u).Value(), 1e-3);
Assert.AreEqual(-14579 * count,
- emModelData.EfficiencyData.VoltageLevels.First().EfficiencyMap
- .LookupElectricPower(190.99.RPMtoRad(), (-500 * count).SI<NewtonMeter>(), false).ElectricalPower.Value(),
+ emModelData.EfficiencyData.VoltageLevels.First()
+ .LookupElectricPower(190.99.RPMtoRad(), (-500 * count).SI<NewtonMeter>(), 0, false).ElectricalPower.Value(),
1e-3);
@@ -316,7 +316,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var response = motor.Request(absTime, dt, torque.SI<NewtonMeter>(), speed.RPMtoRad());
Assert.IsInstanceOf<ResponseSuccess>(response);
- var dragTorque = data.First().Item2.DragCurve.Lookup(speed.RPMtoRad());
+ var dragTorque = data.First().Item2.DragCurveLookup(speed.RPMtoRad(), 0u);
var enginePower = speed.RPMtoRad() * (torque.SI<NewtonMeter>() + dragTorque);
var motorMechPower = dragTorque * speed.RPMtoRad();
Assert.AreEqual(enginePower.Value(), response.Engine.PowerRequest.Value(), 1e-6);
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxShiftLossesTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxShiftLossesTest.cs
index 7a6effc7294c31c01f926f235fc983d7cb6702f9..d4a644e7d245f58498663aef32b3ccfd12b378d0 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxShiftLossesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxShiftLossesTest.cs
@@ -94,7 +94,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var absTime = 20.SI<Second>();
var dt = 0.5.SI<Second>();
var response = gbx.Request(absTime, dt, 0.SI<NewtonMeter>(), preShiftRpm.RPMtoRad());
- axleGear.Request(absTime, dt, 0.SI<NewtonMeter>(), preShiftRpm.RPMtoRad());
+ axleGear.Request(absTime, dt, 0.SI<NewtonMeter>(), preShiftRpm.RPMtoRad(), false);
Assert.IsInstanceOf<ResponseSuccess>(response);
@@ -144,7 +144,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var absTime = 20.SI<Second>();
var dt = 0.5.SI<Second>();
var response = gbx.Request(absTime, dt, 0.SI<NewtonMeter>(), preShiftRpm.RPMtoRad());
- axleGear.Request(absTime, dt, 0.SI<NewtonMeter>(), preShiftRpm.RPMtoRad());
+ axleGear.Request(absTime, dt, 0.SI<NewtonMeter>(), preShiftRpm.RPMtoRad(), false);
Assert.IsInstanceOf<ResponseSuccess>(response);
@@ -167,7 +167,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
engine.CommitSimulationStep(absTime, dt, modData);
var shiftLoss1 = (Watt)modData[ModalResultField.P_gbx_shift_loss] * dt;
Assert.AreEqual(expectedShiftLossEnergy * splitFactor, shiftLoss1.Value(), 1e-3);
- axleGear.Request(absTime, dt, 0.SI<NewtonMeter>(), preShiftRpm.RPMtoRad());
+ axleGear.Request(absTime, dt, 0.SI<NewtonMeter>(), preShiftRpm.RPMtoRad(), false);
absTime += dt;
dt = 0.5.SI<Second>();
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
index b7c34f69cb5eebedd9ac93bcedc4536d19edeb25..94f1b6fbde457003cf2fb1f6f496172a9a9db82b 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
@@ -137,7 +137,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var PvD = power.SI<Watt>();
var torqueToWheels = Formulas.PowerToTorque(PvD, angSpeed);
- axleGear.Request(absTime, dt, torqueToWheels, angSpeed);
+ axleGear.Request(absTime, dt, torqueToWheels, angSpeed, false);
var loss = expectedLoss.SI<Watt>();
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/GenericBattery_243kWh.vbatr b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/GenericBattery_243kWh.vbatr
new file mode 100644
index 0000000000000000000000000000000000000000..953f417ac43d9bc1432971034d22d3ab15d5e1a2
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/GenericBattery_243kWh.vbatr
@@ -0,0 +1,3 @@
+SoC, Ri
+0, 0.04
+100, 0.04
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/GenericBattery_243kWh.vbatv b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/GenericBattery_243kWh.vbatv
new file mode 100644
index 0000000000000000000000000000000000000000..28376e3632a1a24d0631665c19822b66f0310257
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/GenericBattery_243kWh.vbatv
@@ -0,0 +1,12 @@
+SOC, V
+0, 673.5
+10, 700.2
+20, 715.4
+30, 723.6
+40, 727.7
+50, 730.0
+60, 731.6
+70, 733.8
+80, 737.1
+90, 742.2
+100, 750.2
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/GenericBattery_243kWh_750V.vbat b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/GenericBattery_243kWh_750V.vbat
new file mode 100644
index 0000000000000000000000000000000000000000..381fba7f96c98f97dac07cd5ce5fcbd03711f2ec
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/GenericBattery_243kWh_750V.vbat
@@ -0,0 +1,18 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic Battery",
+ "InternalResistanceCurve": "GenericBattery_243kWh.vbatr",
+ "SOC_min": 10,
+ "SOC_max": 90,
+ "MaxCurrentMap": "MaxCurrent.vimax",
+ "Capacity": 324,
+ "SoCCurve": "GenericBattery_243kWh.vbatv"
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/MaxCurrent.vimax
new file mode 100644
index 0000000000000000000000000000000000000000..adf28fb9b5ced83296d2634fc6727e2d1b82357e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/MaxCurrent.vimax
@@ -0,0 +1,3 @@
+SOC, I_charge, I_discharge
+0, 1620, 1620
+100, 1620, 1620
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/ShiftParameters.vtcu b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/ShiftParameters.vtcu
new file mode 100644
index 0000000000000000000000000000000000000000..a26e0e50f9e03240a8ddf18d296b8edbcda8bdcb
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/ShiftParameters.vtcu
@@ -0,0 +1,14 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T15:52:04.0766564Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "Rating_current_gear": 0.995,
+ "RatioEarlyUpshiftFC" : 24,
+ "RatioEarlyDownshiftFC" : 24
+
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/Truck.vacc b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/Truck.vacc
new file mode 100644
index 0000000000000000000000000000000000000000..54e77864874d21d67e8f8d69a97b35c5c6031749
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/Common/Truck.vacc
@@ -0,0 +1,6 @@
+v [km/h],acc [m/s²],dec [m/s²]
+0,1,-1
+25,1,-1
+50,0.642857143,-1
+60,0.5,-0.5
+120,0.5,-0.5
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..6e4c104a21b4bf31fa7bc80e95c8c53d69437d5f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": true,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 12.276
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 13860.59,
+ "ContinuousTorqueSpeed": 166.99,
+ "OverloadTorque": 16517.20,
+ "OverloadTorqueSpeed": 166.01,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1Axl_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Axl.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 15015.63,
+ "ContinuousTorqueSpeed": 168.62,
+ "OverloadTorque": 17325.73,
+ "OverloadTorqueSpeed": 170.17,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1Axl_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Axl.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1Axl_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..3ecc37bf709586789c7718efe3864b38a702ea37
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1Axl.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_ENG_Gbx1Axl.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_ENG_Gbx1Axl.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..e19150c83618395c69db102b100b2b5f86454850
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_ENG_Gbx1Axl.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx1Axl.vveh",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_drag.viepcd b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..07eb40e197c27c23aea5f69c3200e3b799688102
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -37.45
+3.37 , -38.62
+33.71 , -49.58
+67.42 , -61.71
+101.12 , -73.85
+134.83 , -86.11
+168.54 , -98.24
+202.25 , -110.38
+235.96 , -122.51
+269.67 , -134.65
+303.37 , -146.91
+337.08 , -159.04
+370.79 , -171.18
+404.50 , -183.31
+438.21 , -195.45
+471.92 , -207.71
+505.62 , -219.84
+539.33 , -231.98
+573.04 , -244.11
+606.75 , -256.24
+640.46 , -268.51
+674.17 , -280.64
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/GenericIEPC_Gbx1Whl1.viepc b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/GenericIEPC_Gbx1Whl1.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..5b924aea7e507dab781c6727c70efd7ef3105ee9
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/GenericIEPC_Gbx1Whl1.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 12.276
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 6930.29,
+ "ContinuousTorqueSpeed": 166.99,
+ "OverloadTorque": 8258.60,
+ "OverloadTorqueSpeed": 166.01,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1Whl1_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl1.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 7507.82,
+ "ContinuousTorqueSpeed": 168.62,
+ "OverloadTorque": 8662.87,
+ "OverloadTorqueSpeed": 170.17,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1Whl1_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl1.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1Whl1_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..bfe9e793fdb6c0629e8d938b4375baa36eb15063
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1Whl1.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_ENG_Gbx1Whl1.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_ENG_Gbx1Whl1.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..6cc64ff5def0f1da6b0d8886c28e8766af675975
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_ENG_Gbx1Whl1.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx1Whl1.vveh",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..b5980ac32ff2f44452666e544ce91c462f5c5a7f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -9785.31 , 0.00
+0.00 , -9296.05 , 0.00
+0.00 , -8806.78 , 0.00
+0.00 , -8317.52 , 0.00
+0.00 , -7828.25 , 0.00
+0.00 , -7338.98 , 0.00
+0.00 , -6849.72 , -0.07
+0.00 , -6360.45 , -0.33
+0.00 , -5871.19 , -0.49
+0.00 , -5381.92 , -0.60
+0.00 , -4892.66 , -0.66
+0.00 , -4403.39 , -0.69
+0.00 , -3914.12 , -0.70
+0.00 , -3424.86 , -0.67
+0.00 , -2935.59 , -0.63
+0.00 , -2446.33 , -0.57
+0.00 , -1957.06 , -0.48
+0.00 , -1467.80 , -0.38
+0.00 , -978.53 , -0.27
+0.00 , -489.27 , -0.13
+0.00 , -97.85 , -0.01
+0.00 , 86.63 , 0.06
+0.00 , 433.14 , 0.28
+0.00 , 866.29 , 0.56
+0.00 , 1299.43 , 0.85
+0.00 , 1732.57 , 1.15
+0.00 , 2165.72 , 1.47
+0.00 , 2598.86 , 1.79
+0.00 , 3032.00 , 2.12
+0.00 , 3465.15 , 2.47
+0.00 , 3898.29 , 2.82
+0.00 , 4331.43 , 3.19
+0.00 , 4764.58 , 3.56
+0.00 , 5197.72 , 3.94
+0.00 , 5630.86 , 4.33
+0.00 , 6064.01 , 4.74
+0.00 , 6497.15 , 5.15
+0.00 , 6930.29 , 5.57
+0.00 , 7363.44 , 6.00
+0.00 , 7796.58 , 6.43
+0.00 , 8229.72 , 6.88
+0.00 , 8662.87 , 7.34
+3.37 , -9785.31 , 0.00
+3.37 , -9296.05 , 0.00
+3.37 , -8806.78 , 0.00
+3.37 , -8317.52 , 0.00
+3.37 , -7828.25 , 0.00
+3.37 , -7338.98 , 0.00
+3.37 , -6849.72 , -0.25
+3.37 , -6360.45 , -0.42
+3.37 , -5871.19 , -0.52
+3.37 , -5381.92 , -0.58
+3.37 , -4892.66 , -0.61
+3.37 , -4403.39 , -0.62
+3.37 , -3914.12 , -0.61
+3.37 , -3424.86 , -0.58
+3.37 , -2935.59 , -0.53
+3.37 , -2446.33 , -0.47
+3.37 , -1957.06 , -0.40
+3.37 , -1467.80 , -0.31
+3.37 , -978.53 , -0.22
+3.37 , -489.27 , -0.11
+3.37 , -97.85 , -0.01
+3.37 , 86.63 , 0.05
+3.37 , 433.14 , 0.21
+3.37 , 866.29 , 0.43
+3.37 , 1299.43 , 0.65
+3.37 , 1732.57 , 0.88
+3.37 , 2165.72 , 1.11
+3.37 , 2598.86 , 1.36
+3.37 , 3032.00 , 1.61
+3.37 , 3465.15 , 1.87
+3.37 , 3898.29 , 2.13
+3.37 , 4331.43 , 2.40
+3.37 , 4764.58 , 2.68
+3.37 , 5197.72 , 2.97
+3.37 , 5630.86 , 3.26
+3.37 , 6064.01 , 3.56
+3.37 , 6497.15 , 3.86
+3.37 , 6930.29 , 4.18
+3.37 , 7363.44 , 4.50
+3.37 , 7796.58 , 4.82
+3.37 , 8229.72 , 5.15
+3.37 , 8662.87 , 5.49
+33.71 , -9785.31 , -29.05
+33.71 , -9296.05 , -27.68
+33.71 , -8806.78 , -26.31
+33.71 , -8317.52 , -24.92
+33.71 , -7828.25 , -23.53
+33.71 , -7338.98 , -22.12
+33.71 , -6849.72 , -20.71
+33.71 , -6360.45 , -19.28
+33.71 , -5871.19 , -17.85
+33.71 , -5381.92 , -16.41
+33.71 , -4892.66 , -14.95
+33.71 , -4403.39 , -13.49
+33.71 , -3914.12 , -12.02
+33.71 , -3424.86 , -10.53
+33.71 , -2935.59 , -9.04
+33.71 , -2446.33 , -7.54
+33.71 , -1957.06 , -6.03
+33.71 , -1467.80 , -4.51
+33.71 , -978.53 , -2.98
+33.71 , -489.27 , -1.44
+33.71 , -97.85 , -0.18
+33.71 , 86.63 , 0.45
+33.71 , 433.14 , 1.84
+33.71 , 866.29 , 3.58
+33.71 , 1299.43 , 5.33
+33.71 , 1732.57 , 7.09
+33.71 , 2165.72 , 8.85
+33.71 , 2598.86 , 10.63
+33.71 , 3032.00 , 12.42
+33.71 , 3465.15 , 14.21
+33.71 , 3898.29 , 16.02
+33.71 , 4331.43 , 17.84
+33.71 , 4764.58 , 19.66
+33.71 , 5197.72 , 21.49
+33.71 , 5630.86 , 23.34
+33.71 , 6064.01 , 25.19
+33.71 , 6497.15 , 27.05
+33.71 , 6930.29 , 28.93
+33.71 , 7363.44 , 30.81
+33.71 , 7796.58 , 32.70
+33.71 , 8229.72 , 34.60
+33.71 , 8662.87 , 36.50
+67.42 , -9785.31 , -60.28
+67.42 , -9296.05 , -57.37
+67.42 , -8806.78 , -54.44
+67.42 , -8317.52 , -51.49
+67.42 , -7828.25 , -48.54
+67.42 , -7338.98 , -45.58
+67.42 , -6849.72 , -42.60
+67.42 , -6360.45 , -39.61
+67.42 , -5871.19 , -36.61
+67.42 , -5381.92 , -33.60
+67.42 , -4892.66 , -30.58
+67.42 , -4403.39 , -27.55
+67.42 , -3914.12 , -24.51
+67.42 , -3424.86 , -21.45
+67.42 , -2935.59 , -18.38
+67.42 , -2446.33 , -15.31
+67.42 , -1957.06 , -12.22
+67.42 , -1467.80 , -9.12
+67.42 , -978.53 , -6.00
+67.42 , -489.27 , -2.88
+67.42 , -97.85 , -0.33
+67.42 , 86.63 , 0.92
+67.42 , 433.14 , 3.68
+67.42 , 866.29 , 7.11
+67.42 , 1299.43 , 10.56
+67.42 , 1732.57 , 14.01
+67.42 , 2165.72 , 17.48
+67.42 , 2598.86 , 20.96
+67.42 , 3032.00 , 24.45
+67.42 , 3465.15 , 27.95
+67.42 , 3898.29 , 31.47
+67.42 , 4331.43 , 34.99
+67.42 , 4764.58 , 38.53
+67.42 , 5197.72 , 42.08
+67.42 , 5630.86 , 45.64
+67.42 , 6064.01 , 49.21
+67.42 , 6497.15 , 52.79
+67.42 , 6930.29 , 56.38
+67.42 , 7363.44 , 59.99
+67.42 , 7796.58 , 63.60
+67.42 , 8229.72 , 67.23
+67.42 , 8662.87 , 70.87
+101.12 , -9785.31 , -91.22
+101.12 , -9296.05 , -86.77
+101.12 , -8806.78 , -82.31
+101.12 , -8317.52 , -77.84
+101.12 , -7828.25 , -73.35
+101.12 , -7338.98 , -68.84
+101.12 , -6849.72 , -64.32
+101.12 , -6360.45 , -59.79
+101.12 , -5871.19 , -55.24
+101.12 , -5381.92 , -50.68
+101.12 , -4892.66 , -46.11
+101.12 , -4403.39 , -41.51
+101.12 , -3914.12 , -36.91
+101.12 , -3424.86 , -32.29
+101.12 , -2935.59 , -27.66
+101.12 , -2446.33 , -23.01
+101.12 , -1957.06 , -18.35
+101.12 , -1467.80 , -13.67
+101.12 , -978.53 , -8.98
+101.12 , -489.27 , -4.27
+101.12 , -97.85 , -0.39
+101.12 , 86.63 , 1.43
+101.12 , 433.14 , 5.56
+101.12 , 866.29 , 10.69
+101.12 , 1299.43 , 15.84
+101.12 , 1732.57 , 21.00
+101.12 , 2165.72 , 26.17
+101.12 , 2598.86 , 31.36
+101.12 , 3032.00 , 36.56
+101.12 , 3465.15 , 41.77
+101.12 , 3898.29 , 47.01
+101.12 , 4331.43 , 52.25
+101.12 , 4764.58 , 57.51
+101.12 , 5197.72 , 62.79
+101.12 , 5630.86 , 68.08
+101.12 , 6064.01 , 73.38
+101.12 , 6497.15 , 78.70
+101.12 , 6930.29 , 84.03
+101.12 , 7363.44 , 89.38
+101.12 , 7796.58 , 94.74
+101.12 , 8229.72 , 100.12
+101.12 , 8662.87 , 105.51
+134.83 , -9785.31 , -121.86
+134.83 , -9296.05 , -115.91
+134.83 , -8806.78 , -109.94
+134.83 , -8317.52 , -103.95
+134.83 , -7828.25 , -97.94
+134.83 , -7338.98 , -91.91
+134.83 , -6849.72 , -85.87
+134.83 , -6360.45 , -79.81
+134.83 , -5871.19 , -73.73
+134.83 , -5381.92 , -67.63
+134.83 , -4892.66 , -61.51
+134.83 , -4403.39 , -55.37
+134.83 , -3914.12 , -49.21
+134.83 , -3424.86 , -43.04
+134.83 , -2935.59 , -36.85
+134.83 , -2446.33 , -30.64
+134.83 , -1957.06 , -24.41
+134.83 , -1467.80 , -18.16
+134.83 , -978.53 , -11.89
+134.83 , -489.27 , -5.59
+134.83 , -97.85 , -0.32
+134.83 , 86.63 , 1.99
+134.83 , 433.14 , 7.50
+134.83 , 866.29 , 14.34
+134.83 , 1299.43 , 21.19
+134.83 , 1732.57 , 28.05
+134.83 , 2165.72 , 34.94
+134.83 , 2598.86 , 41.84
+134.83 , 3032.00 , 48.76
+134.83 , 3465.15 , 55.70
+134.83 , 3898.29 , 62.66
+134.83 , 4331.43 , 69.63
+134.83 , 4764.58 , 76.63
+134.83 , 5197.72 , 83.65
+134.83 , 5630.86 , 90.68
+134.83 , 6064.01 , 97.73
+134.83 , 6497.15 , 104.80
+134.83 , 6930.29 , 111.90
+134.83 , 7363.44 , 119.00
+134.83 , 7796.58 , 126.13
+134.83 , 8229.72 , 133.28
+134.83 , 8662.87 , 140.44
+168.54 , -9785.31 , -152.18
+168.54 , -9296.05 , -144.75
+168.54 , -8806.78 , -137.29
+168.54 , -8317.52 , -129.81
+168.54 , -7828.25 , -122.31
+168.54 , -7338.98 , -114.78
+168.54 , -6849.72 , -107.23
+168.54 , -6360.45 , -99.65
+168.54 , -5871.19 , -92.05
+168.54 , -5381.92 , -84.42
+168.54 , -4892.66 , -76.77
+168.54 , -4403.39 , -69.10
+168.54 , -3914.12 , -61.41
+168.54 , -3424.86 , -53.69
+168.54 , -2935.59 , -45.94
+168.54 , -2446.33 , -38.17
+168.54 , -1957.06 , -30.38
+168.54 , -1467.80 , -22.57
+168.54 , -978.53 , -14.72
+168.54 , -489.27 , -6.84
+168.54 , -97.85 , 0.00
+168.54 , 86.63 , 2.61
+168.54 , 433.14 , 9.52
+168.54 , 866.29 , 18.06
+168.54 , 1299.43 , 26.62
+168.54 , 1732.57 , 35.19
+168.54 , 2165.72 , 43.79
+168.54 , 2598.86 , 52.42
+168.54 , 3032.00 , 61.07
+168.54 , 3465.15 , 69.74
+168.54 , 3898.29 , 78.43
+168.54 , 4331.43 , 87.15
+168.54 , 4764.58 , 95.90
+168.54 , 5197.72 , 104.67
+168.54 , 5630.86 , 113.46
+168.54 , 6064.01 , 122.28
+168.54 , 6497.15 , 131.12
+168.54 , 6930.29 , 139.99
+168.54 , 7363.44 , 148.88
+168.54 , 7796.58 , 157.79
+168.54 , 8229.72 , 166.73
+168.54 , 8662.87 , 175.69
+202.25 , -9785.31 , -182.19
+202.25 , -9296.05 , -173.29
+202.25 , -8806.78 , -164.37
+202.25 , -8317.52 , -155.42
+202.25 , -7828.25 , -146.44
+202.25 , -7338.98 , -137.42
+202.25 , -6849.72 , -128.38
+202.25 , -6360.45 , -119.30
+202.25 , -5871.19 , -110.20
+202.25 , -5381.92 , -101.06
+202.25 , -4892.66 , -91.89
+202.25 , -4403.39 , -82.70
+202.25 , -3914.12 , -73.47
+202.25 , -3424.86 , -64.21
+202.25 , -2935.59 , -54.93
+202.25 , -2446.33 , -45.61
+202.25 , -1957.06 , -36.26
+202.25 , -1467.80 , -26.87
+202.25 , -978.53 , -17.46
+202.25 , -489.27 , -7.98
+202.25 , -97.85 , 0.00
+202.25 , 86.63 , 3.29
+202.25 , 433.14 , 11.62
+202.25 , 866.29 , 21.88
+202.25 , 1299.43 , 32.14
+202.25 , 1732.57 , 42.44
+202.25 , 2165.72 , 52.76
+202.25 , 2598.86 , 63.11
+202.25 , 3032.00 , 73.49
+202.25 , 3465.15 , 83.91
+202.25 , 3898.29 , 94.35
+202.25 , 4331.43 , 104.82
+202.25 , 4764.58 , 115.33
+202.25 , 5197.72 , 125.87
+202.25 , 5630.86 , 136.43
+202.25 , 6064.01 , 147.03
+202.25 , 6497.15 , 157.66
+202.25 , 6930.29 , 168.32
+202.25 , 7363.44 , 179.01
+202.25 , 7796.58 , 189.74
+202.25 , 8229.72 , 200.49
+202.25 , 8662.87 , 211.27
+235.96 , -9785.31 , -211.85
+235.96 , -9296.05 , -201.52
+235.96 , -8806.78 , -191.16
+235.96 , -8317.52 , -180.75
+235.96 , -7828.25 , -170.31
+235.96 , -7338.98 , -159.83
+235.96 , -6849.72 , -149.31
+235.96 , -6360.45 , -138.75
+235.96 , -5871.19 , -128.16
+235.96 , -5381.92 , -117.52
+235.96 , -4892.66 , -106.85
+235.96 , -4403.39 , -96.14
+235.96 , -3914.12 , -85.39
+235.96 , -3424.86 , -74.61
+235.96 , -2935.59 , -63.78
+235.96 , -2446.33 , -52.92
+235.96 , -1957.06 , -42.02
+235.96 , -1467.80 , -31.07
+235.96 , -978.53 , -20.08
+235.96 , -489.27 , -9.00
+235.96 , -97.85 , 0.00
+235.96 , 86.63 , 4.05
+235.96 , 433.14 , 13.82
+235.96 , 866.29 , 25.80
+235.96 , 1299.43 , 37.78
+235.96 , 1732.57 , 49.79
+235.96 , 2165.72 , 61.84
+235.96 , 2598.86 , 73.93
+235.96 , 3032.00 , 86.05
+235.96 , 3465.15 , 98.22
+235.96 , 3898.29 , 110.42
+235.96 , 4331.43 , 122.66
+235.96 , 4764.58 , 134.94
+235.96 , 5197.72 , 147.26
+235.96 , 5630.86 , 159.61
+235.96 , 6064.01 , 172.01
+235.96 , 6497.15 , 184.44
+235.96 , 6930.29 , 196.92
+235.96 , 7363.44 , 209.43
+235.96 , 7796.58 , 221.98
+235.96 , 8229.72 , 234.57
+235.96 , 8662.87 , 247.19
+269.67 , -9785.31 , -241.15
+269.67 , -9296.05 , -229.41
+269.67 , -8806.78 , -217.63
+269.67 , -8317.52 , -205.79
+269.67 , -7828.25 , -193.91
+269.67 , -7338.98 , -181.98
+269.67 , -6849.72 , -170.01
+269.67 , -6360.45 , -157.99
+269.67 , -5871.19 , -145.91
+269.67 , -5381.92 , -133.80
+269.67 , -4892.66 , -121.63
+269.67 , -4403.39 , -109.42
+269.67 , -3914.12 , -97.16
+269.67 , -3424.86 , -84.85
+269.67 , -2935.59 , -72.50
+269.67 , -2446.33 , -60.10
+269.67 , -1957.06 , -47.65
+269.67 , -1467.80 , -35.14
+269.67 , -978.53 , -22.57
+269.67 , -489.27 , -9.88
+269.67 , -97.85 , 0.00
+269.67 , 86.63 , 4.88
+269.67 , 433.14 , 16.13
+269.67 , 866.29 , 29.83
+269.67 , 1299.43 , 43.53
+269.67 , 1732.57 , 57.27
+269.67 , 2165.72 , 71.06
+269.67 , 2598.86 , 84.89
+269.67 , 3032.00 , 98.76
+269.67 , 3465.15 , 112.68
+269.67 , 3898.29 , 126.65
+269.67 , 4331.43 , 140.67
+269.67 , 4764.58 , 154.74
+269.67 , 5197.72 , 168.85
+269.67 , 5630.86 , 183.01
+269.67 , 6064.01 , 197.22
+269.67 , 6497.15 , 211.48
+269.67 , 6930.29 , 225.78
+269.67 , 7363.44 , 240.13
+269.67 , 7796.58 , 254.53
+269.67 , 8229.72 , 268.97
+269.67 , 8662.87 , 283.46
+303.37 , -9785.31 , -270.09
+303.37 , -9296.05 , -256.96
+303.37 , -8806.78 , -243.78
+303.37 , -8317.52 , -230.53
+303.37 , -7828.25 , -217.23
+303.37 , -7338.98 , -203.87
+303.37 , -6849.72 , -190.46
+303.37 , -6360.45 , -176.98
+303.37 , -5871.19 , -163.45
+303.37 , -5381.92 , -149.87
+303.37 , -4892.66 , -136.22
+303.37 , -4403.39 , -122.52
+303.37 , -3914.12 , -108.76
+303.37 , -3424.86 , -94.94
+303.37 , -2935.59 , -81.06
+303.37 , -2446.33 , -67.13
+303.37 , -1957.06 , -53.13
+303.37 , -1467.80 , -39.07
+303.37 , -978.53 , -24.92
+303.37 , -489.27 , -10.59
+303.37 , -97.85 , 0.00
+303.37 , 86.63 , 5.80
+303.37 , 433.14 , 18.55
+303.37 , 866.29 , 33.99
+303.37 , 1299.43 , 49.42
+303.37 , 1732.57 , 64.90
+303.37 , 2165.72 , 80.42
+303.37 , 2598.86 , 96.00
+303.37 , 3032.00 , 111.63
+303.37 , 3465.15 , 127.32
+303.37 , 3898.29 , 143.07
+303.37 , 4331.43 , 158.88
+303.37 , 4764.58 , 174.74
+303.37 , 5197.72 , 190.66
+303.37 , 5630.86 , 206.64
+303.37 , 6064.01 , 222.68
+303.37 , 6497.15 , 238.77
+303.37 , 6930.29 , 254.92
+303.37 , 7363.44 , 271.13
+303.37 , 7796.58 , 287.40
+303.37 , 8229.72 , 303.72
+303.37 , 8662.87 , 320.10
+337.08 , -9785.31 , -298.63
+337.08 , -9296.05 , -284.14
+337.08 , -8806.78 , -269.58
+337.08 , -8317.52 , -254.95
+337.08 , -7828.25 , -240.25
+337.08 , -7338.98 , -225.48
+337.08 , -6849.72 , -210.64
+337.08 , -6360.45 , -195.74
+337.08 , -5871.19 , -180.76
+337.08 , -5381.92 , -165.71
+337.08 , -4892.66 , -150.60
+337.08 , -4403.39 , -135.42
+337.08 , -3914.12 , -120.16
+337.08 , -3424.86 , -104.84
+337.08 , -2935.59 , -89.45
+337.08 , -2446.33 , -73.99
+337.08 , -1957.06 , -58.45
+337.08 , -1467.80 , -42.83
+337.08 , -978.53 , -27.10
+337.08 , -489.27 , -11.12
+337.08 , -97.85 , 0.00
+337.08 , 86.63 , 6.80
+337.08 , 433.14 , 21.10
+337.08 , 866.29 , 38.29
+337.08 , 1299.43 , 55.46
+337.08 , 1732.57 , 72.67
+337.08 , 2165.72 , 89.94
+337.08 , 2598.86 , 107.27
+337.08 , 3032.00 , 124.67
+337.08 , 3465.15 , 142.14
+337.08 , 3898.29 , 159.68
+337.08 , 4331.43 , 177.29
+337.08 , 4764.58 , 194.96
+337.08 , 5197.72 , 212.70
+337.08 , 5630.86 , 230.52
+337.08 , 6064.01 , 248.40
+337.08 , 6497.15 , 266.35
+337.08 , 6930.29 , 284.37
+337.08 , 7363.44 , 302.45
+337.08 , 7796.58 , 320.61
+337.08 , 8229.72 , 338.83
+337.08 , 8662.87 , 357.12
+370.79 , -9785.31 , -326.77
+370.79 , -9296.05 , -310.94
+370.79 , -8806.78 , -295.03
+370.79 , -8317.52 , -279.03
+370.79 , -7828.25 , -262.95
+370.79 , -7338.98 , -246.79
+370.79 , -6849.72 , -230.55
+370.79 , -6360.45 , -214.22
+370.79 , -5871.19 , -197.81
+370.79 , -5381.92 , -181.33
+370.79 , -4892.66 , -164.76
+370.79 , -4403.39 , -148.10
+370.79 , -3914.12 , -131.37
+370.79 , -3424.86 , -114.55
+370.79 , -2935.59 , -97.65
+370.79 , -2446.33 , -80.67
+370.79 , -1957.06 , -63.59
+370.79 , -1467.80 , -46.42
+370.79 , -978.53 , -29.10
+370.79 , -489.27 , -11.41
+370.79 , -97.85 , 0.00
+370.79 , 86.63 , 7.90
+370.79 , 433.14 , 23.79
+370.79 , 866.29 , 42.74
+370.79 , 1299.43 , 61.65
+370.79 , 1732.57 , 80.61
+370.79 , 2165.72 , 99.63
+370.79 , 2598.86 , 118.73
+370.79 , 3032.00 , 137.91
+370.79 , 3465.15 , 157.16
+370.79 , 3898.29 , 176.50
+370.79 , 4331.43 , 195.91
+370.79 , 4764.58 , 215.41
+370.79 , 5197.72 , 234.99
+370.79 , 5630.86 , 254.65
+370.79 , 6064.01 , 274.39
+370.79 , 6497.15 , 294.21
+370.79 , 6930.29 , 314.12
+370.79 , 7363.44 , 334.10
+370.79 , 7796.58 , 354.16
+370.79 , 8229.72 , 374.31
+370.79 , 8662.87 , 394.53
+404.50 , -9785.31 , -354.49
+404.50 , -9296.05 , -337.34
+404.50 , -8806.78 , -320.10
+404.50 , -8317.52 , -302.75
+404.50 , -7828.25 , -285.32
+404.50 , -7338.98 , -267.78
+404.50 , -6849.72 , -250.15
+404.50 , -6360.45 , -232.43
+404.50 , -5871.19 , -214.60
+404.50 , -5381.92 , -196.69
+404.50 , -4892.66 , -178.67
+404.50 , -4403.39 , -160.56
+404.50 , -3914.12 , -142.36
+404.50 , -3424.86 , -124.05
+404.50 , -2935.59 , -105.65
+404.50 , -2446.33 , -87.15
+404.50 , -1957.06 , -68.54
+404.50 , -1467.80 , -49.80
+404.50 , -978.53 , -30.89
+404.50 , -489.27 , -11.43
+404.50 , -97.85 , 0.00
+404.50 , 86.63 , 9.08
+404.50 , 433.14 , 26.62
+404.50 , 866.29 , 47.35
+404.50 , 1299.43 , 68.02
+404.50 , 1732.57 , 88.72
+404.50 , 2165.72 , 109.51
+404.50 , 2598.86 , 130.38
+404.50 , 3032.00 , 151.34
+404.50 , 3465.15 , 172.39
+404.50 , 3898.29 , 193.53
+404.50 , 4331.43 , 214.77
+404.50 , 4764.58 , 236.11
+404.50 , 5197.72 , 257.53
+404.50 , 5630.86 , 279.05
+404.50 , 6064.01 , 300.67
+404.50 , 6497.15 , 322.38
+404.50 , 6930.29 , 344.19
+404.50 , 7363.44 , 366.08
+404.50 , 7796.58 , 388.08
+404.50 , 8229.72 , 410.16
+404.50 , 8662.87 , 432.34
+438.21 , -9785.31 , -381.77
+438.21 , -9296.05 , -363.33
+438.21 , -8806.78 , -344.77
+438.21 , -8317.52 , -326.11
+438.21 , -7828.25 , -307.33
+438.21 , -7338.98 , -288.45
+438.21 , -6849.72 , -269.45
+438.21 , -6360.45 , -250.33
+438.21 , -5871.19 , -231.11
+438.21 , -5381.92 , -211.78
+438.21 , -4892.66 , -192.34
+438.21 , -4403.39 , -172.78
+438.21 , -3914.12 , -153.11
+438.21 , -3424.86 , -133.33
+438.21 , -2935.59 , -113.43
+438.21 , -2446.33 , -93.42
+438.21 , -1957.06 , -73.27
+438.21 , -1467.80 , -52.98
+438.21 , -978.53 , -32.45
+438.21 , -489.27 , -11.12
+438.21 , -97.85 , 0.00
+438.21 , 86.63 , 10.37
+438.21 , 433.14 , 29.60
+438.21 , 866.29 , 52.14
+438.21 , 1299.43 , 74.56
+438.21 , 1732.57 , 97.03
+438.21 , 2165.72 , 119.58
+438.21 , 2598.86 , 142.23
+438.21 , 3032.00 , 164.98
+438.21 , 3465.15 , 187.84
+438.21 , 3898.29 , 210.80
+438.21 , 4331.43 , 233.87
+438.21 , 4764.58 , 257.05
+438.21 , 5197.72 , 280.34
+438.21 , 5630.86 , 303.74
+438.21 , 6064.01 , 327.25
+438.21 , 6497.15 , 350.87
+438.21 , 6930.29 , 374.59
+438.21 , 7363.44 , 398.42
+438.21 , 7796.58 , 422.36
+438.21 , 8229.72 , 446.41
+438.21 , 8662.87 , 470.57
+471.92 , -9785.31 , -408.59
+471.92 , -9296.05 , -388.88
+471.92 , -8806.78 , -369.04
+471.92 , -8317.52 , -349.08
+471.92 , -7828.25 , -328.98
+471.92 , -7338.98 , -308.76
+471.92 , -6849.72 , -288.41
+471.92 , -6360.45 , -267.93
+471.92 , -5871.19 , -247.32
+471.92 , -5381.92 , -226.59
+471.92 , -4892.66 , -205.73
+471.92 , -4403.39 , -184.73
+471.92 , -3914.12 , -163.61
+471.92 , -3424.86 , -142.36
+471.92 , -2935.59 , -120.97
+471.92 , -2446.33 , -99.45
+471.92 , -1957.06 , -77.77
+471.92 , -1467.80 , -55.91
+471.92 , -978.53 , -33.75
+471.92 , -489.27 , -10.40
+471.92 , -97.85 , 0.00
+471.92 , 86.63 , 11.76
+471.92 , 433.14 , 32.74
+471.92 , 866.29 , 57.10
+471.92 , 1299.43 , 81.29
+471.92 , 1732.57 , 105.53
+471.92 , 2165.72 , 129.86
+471.92 , 2598.86 , 154.29
+471.92 , 3032.00 , 178.85
+471.92 , 3465.15 , 203.52
+471.92 , 3898.29 , 228.31
+471.92 , 4331.43 , 253.23
+471.92 , 4764.58 , 278.27
+471.92 , 5197.72 , 303.44
+471.92 , 5630.86 , 328.73
+471.92 , 6064.01 , 354.14
+471.92 , 6497.15 , 379.68
+471.92 , 6930.29 , 405.34
+471.92 , 7363.44 , 431.13
+471.92 , 7796.58 , 457.03
+471.92 , 8229.72 , 483.07
+471.92 , 8662.87 , 509.22
+505.62 , -9785.31 , -434.93
+505.62 , -9296.05 , -413.98
+505.62 , -8806.78 , -392.88
+505.62 , -8317.52 , -371.64
+505.62 , -7828.25 , -350.25
+505.62 , -7338.98 , -328.71
+505.62 , -6849.72 , -307.03
+505.62 , -6360.45 , -285.20
+505.62 , -5871.19 , -263.22
+505.62 , -5381.92 , -241.10
+505.62 , -4892.66 , -218.83
+505.62 , -4403.39 , -196.41
+505.62 , -3914.12 , -173.85
+505.62 , -3424.86 , -151.13
+505.62 , -2935.59 , -128.26
+505.62 , -2446.33 , -105.23
+505.62 , -1957.06 , -82.02
+505.62 , -1467.80 , -58.59
+505.62 , -978.53 , -34.77
+505.62 , -489.27 , -9.14
+505.62 , -97.85 , 0.00
+505.62 , 86.63 , 13.25
+505.62 , 433.14 , 36.05
+505.62 , 866.29 , 62.25
+505.62 , 1299.43 , 88.23
+505.62 , 1732.57 , 114.25
+505.62 , 2165.72 , 140.36
+505.62 , 2598.86 , 166.59
+505.62 , 3032.00 , 192.95
+505.62 , 3465.15 , 219.45
+505.62 , 3898.29 , 246.08
+505.62 , 4331.43 , 272.86
+505.62 , 4764.58 , 299.77
+505.62 , 5197.72 , 326.82
+505.62 , 5630.86 , 354.02
+505.62 , 6064.01 , 381.35
+505.62 , 6497.15 , 408.83
+505.62 , 6930.29 , 436.45
+505.62 , 7363.44 , 464.20
+505.62 , 7796.58 , 492.10
+505.62 , 8229.72 , 520.14
+505.62 , 8662.87 , 548.31
+539.33 , -9785.31 , -460.78
+539.33 , -9296.05 , -438.62
+539.33 , -8806.78 , -416.28
+539.33 , -8317.52 , -393.78
+539.33 , -7828.25 , -371.11
+539.33 , -7338.98 , -348.28
+539.33 , -6849.72 , -325.28
+539.33 , -6360.45 , -302.11
+539.33 , -5871.19 , -278.78
+539.33 , -5381.92 , -255.29
+539.33 , -4892.66 , -231.62
+539.33 , -4403.39 , -207.79
+539.33 , -3914.12 , -183.79
+539.33 , -3424.86 , -159.62
+539.33 , -2935.59 , -135.27
+539.33 , -2446.33 , -110.74
+539.33 , -1957.06 , -85.99
+539.33 , -1467.80 , -60.98
+539.33 , -978.53 , -35.47
+539.33 , -489.27 , -7.05
+539.33 , -97.85 , 0.00
+539.33 , 86.63 , 14.84
+539.33 , 433.14 , 39.53
+539.33 , 866.29 , 67.60
+539.33 , 1299.43 , 95.38
+539.33 , 1732.57 , 123.18
+539.33 , 2165.72 , 151.09
+539.33 , 2598.86 , 179.12
+539.33 , 3032.00 , 207.30
+539.33 , 3465.15 , 235.63
+539.33 , 3898.29 , 264.12
+539.33 , 4331.43 , 292.76
+539.33 , 4764.58 , 321.56
+539.33 , 5197.72 , 350.51
+539.33 , 5630.86 , 379.63
+539.33 , 6064.01 , 408.90
+539.33 , 6497.15 , 438.33
+539.33 , 6930.29 , 467.92
+539.33 , 7363.44 , 497.67
+539.33 , 7796.58 , 527.57
+539.33 , 8229.72 , 557.64
+539.33 , 8662.87 , 587.85
+573.04 , -9785.31 , -486.12
+573.04 , -9296.05 , -462.76
+573.04 , -8806.78 , -439.22
+573.04 , -8317.52 , -415.48
+573.04 , -7828.25 , -391.56
+573.04 , -7338.98 , -367.45
+573.04 , -6849.72 , -343.15
+573.04 , -6360.45 , -318.67
+573.04 , -5871.19 , -294.00
+573.04 , -5381.92 , -269.14
+573.04 , -4892.66 , -244.09
+573.04 , -4403.39 , -218.86
+573.04 , -3914.12 , -193.44
+573.04 , -3424.86 , -167.82
+573.04 , -2935.59 , -142.00
+573.04 , -2446.33 , -115.96
+573.04 , -1957.06 , -89.67
+573.04 , -1467.80 , -63.06
+573.04 , -978.53 , -35.80
+573.04 , -489.27 , -3.22
+573.04 , -97.85 , 0.00
+573.04 , 86.63 , 16.54
+573.04 , 433.14 , 43.18
+573.04 , 866.29 , 73.16
+573.04 , 1299.43 , 102.75
+573.04 , 1732.57 , 132.35
+573.04 , 2165.72 , 162.06
+573.04 , 2598.86 , 191.91
+573.04 , 3032.00 , 221.91
+573.04 , 3465.15 , 252.09
+573.04 , 3898.29 , 282.44
+573.04 , 4331.43 , 312.96
+573.04 , 4764.58 , 343.65
+573.04 , 5197.72 , 374.52
+573.04 , 5630.86 , 405.57
+573.04 , 6064.01 , 436.80
+573.04 , 6497.15 , 468.20
+573.04 , 6930.29 , 499.78
+573.04 , 7363.44 , 531.53
+573.04 , 7796.58 , 563.46
+573.04 , 8229.72 , 595.57
+573.04 , 8662.87 , 627.85
+606.75 , -9785.31 , -510.93
+606.75 , -9296.05 , -486.40
+606.75 , -8806.78 , -461.67
+606.75 , -8317.52 , -436.72
+606.75 , -7828.25 , -411.56
+606.75 , -7338.98 , -386.20
+606.75 , -6849.72 , -360.62
+606.75 , -6360.45 , -334.84
+606.75 , -5871.19 , -308.84
+606.75 , -5381.92 , -282.64
+606.75 , -4892.66 , -256.22
+606.75 , -4403.39 , -229.60
+606.75 , -3914.12 , -202.76
+606.75 , -3424.86 , -175.70
+606.75 , -2935.59 , -148.41
+606.75 , -2446.33 , -120.87
+606.75 , -1957.06 , -93.04
+606.75 , -1467.80 , -64.80
+606.75 , -978.53 , -35.73
+606.75 , -489.27 , 0.00
+606.75 , -97.85 , 0.00
+606.75 , 86.63 , 18.35
+606.75 , 433.14 , 47.02
+606.75 , 866.29 , 78.93
+606.75 , 1299.43 , 110.35
+606.75 , 1732.57 , 141.76
+606.75 , 2165.72 , 173.28
+606.75 , 2598.86 , 204.95
+606.75 , 3032.00 , 236.80
+606.75 , 3465.15 , 268.83
+606.75 , 3898.29 , 301.04
+606.75 , 4331.43 , 333.46
+606.75 , 4764.58 , 366.06
+606.75 , 5197.72 , 398.86
+606.75 , 5630.86 , 431.86
+606.75 , 6064.01 , 465.05
+606.75 , 6497.15 , 498.44
+606.75 , 6930.29 , 532.03
+606.75 , 7363.44 , 565.81
+606.75 , 7796.58 , 599.79
+606.75 , 8229.72 , 633.96
+606.75 , 8662.87 , 668.33
+640.46 , -9785.31 , -535.19
+640.46 , -9296.05 , -509.52
+640.46 , -8806.78 , -483.62
+640.46 , -8317.52 , -457.48
+640.46 , -7828.25 , -431.11
+640.46 , -7338.98 , -404.51
+640.46 , -6849.72 , -377.67
+640.46 , -6360.45 , -350.60
+640.46 , -5871.19 , -323.30
+640.46 , -5381.92 , -295.76
+640.46 , -4892.66 , -267.99
+640.46 , -4403.39 , -239.99
+640.46 , -3914.12 , -211.74
+640.46 , -3424.86 , -183.24
+640.46 , -2935.59 , -154.48
+640.46 , -2446.33 , -125.44
+640.46 , -1957.06 , -96.05
+640.46 , -1467.80 , -66.18
+640.46 , -978.53 , -35.19
+640.46 , -489.27 , 0.00
+640.46 , -97.85 , 0.00
+640.46 , 86.63 , 20.27
+640.46 , 433.14 , 51.05
+640.46 , 866.29 , 84.92
+640.46 , 1299.43 , 118.19
+640.46 , 1732.57 , 151.42
+640.46 , 2165.72 , 184.76
+640.46 , 2598.86 , 218.27
+640.46 , 3032.00 , 251.96
+640.46 , 3465.15 , 285.86
+640.46 , 3898.29 , 319.96
+640.46 , 4331.43 , 354.27
+640.46 , 4764.58 , 388.80
+640.46 , 5197.72 , 423.54
+640.46 , 5630.86 , 458.50
+640.46 , 6064.01 , 493.68
+640.46 , 6497.15 , 529.07
+640.46 , 6930.29 , 564.68
+640.46 , 7363.44 , 600.51
+640.46 , 7796.58 , 636.55
+640.46 , 8229.72 , 672.81
+640.46 , 8662.87 , 709.28
+674.17 , -9785.31 , -558.87
+674.17 , -9296.05 , -532.09
+674.17 , -8806.78 , -505.05
+674.17 , -8317.52 , -477.75
+674.17 , -7828.25 , -450.19
+674.17 , -7338.98 , -422.37
+674.17 , -6849.72 , -394.29
+674.17 , -6360.45 , -365.95
+674.17 , -5871.19 , -337.36
+674.17 , -5381.92 , -308.50
+674.17 , -4892.66 , -279.38
+674.17 , -4403.39 , -250.00
+674.17 , -3914.12 , -220.35
+674.17 , -3424.86 , -190.43
+674.17 , -2935.59 , -160.20
+674.17 , -2446.33 , -129.65
+674.17 , -1957.06 , -98.70
+674.17 , -1467.80 , -67.15
+674.17 , -978.53 , -34.12
+674.17 , -489.27 , 0.00
+674.17 , -97.85 , 0.00
+674.17 , 86.63 , 22.30
+674.17 , 433.14 , 55.27
+674.17 , 866.29 , 91.14
+674.17 , 1299.43 , 126.27
+674.17 , 1732.57 , 161.34
+674.17 , 2165.72 , 196.52
+674.17 , 2598.86 , 231.87
+674.17 , 3032.00 , 267.42
+674.17 , 3465.15 , 303.19
+674.17 , 3898.29 , 339.18
+674.17 , 4331.43 , 375.41
+674.17 , 4764.58 , 411.87
+674.17 , 5197.72 , 448.57
+674.17 , 5630.86 , 485.51
+674.17 , 6064.01 , 522.68
+674.17 , 6497.15 , 560.09
+674.17 , 6930.29 , 597.75
+674.17 , 7363.44 , 635.63
+674.17 , 7796.58 , 673.76
+674.17 , 8229.72 , 712.12
+674.17 , 8662.87 , 750.73
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..cf325529f23837579dfd10ebea1c609e97a60f77
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 8662.87 , -9785.31
+3.34 , 8662.87 , -9785.31
+33.72 , 8662.87 , -9785.31
+67.45 , 8662.87 , -9785.31
+101.09 , 8662.87 , -9785.31
+134.82 , 8662.87 , -9785.31
+168.54 , 8662.87 , -9785.31
+202.26 , 7219.06 , -8154.43
+235.99 , 6187.71 , -6989.45
+269.63 , 5414.29 , -6115.82
+303.36 , 4812.74 , -5436.33
+337.08 , 4331.43 , -4892.66
+370.80 , 3937.68 , -4447.88
+404.53 , 3609.53 , -4077.21
+438.17 , 3331.85 , -3763.56
+471.90 , 3093.91 , -3494.79
+505.62 , 2887.62 , -3261.77
+539.35 , 2707.20 , -3057.98
+573.07 , 2547.92 , -2878.06
+606.71 , 2406.31 , -2718.10
+640.44 , 2279.72 , -2575.10
+674.16 , 2165.72 , -2446.33
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..cf325529f23837579dfd10ebea1c609e97a60f77
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 8662.87 , -9785.31
+3.34 , 8662.87 , -9785.31
+33.72 , 8662.87 , -9785.31
+67.45 , 8662.87 , -9785.31
+101.09 , 8662.87 , -9785.31
+134.82 , 8662.87 , -9785.31
+168.54 , 8662.87 , -9785.31
+202.26 , 7219.06 , -8154.43
+235.99 , 6187.71 , -6989.45
+269.63 , 5414.29 , -6115.82
+303.36 , 4812.74 , -5436.33
+337.08 , 4331.43 , -4892.66
+370.80 , 3937.68 , -4447.88
+404.53 , 3609.53 , -4077.21
+438.17 , 3331.85 , -3763.56
+471.90 , 3093.91 , -3494.79
+505.62 , 2887.62 , -3261.77
+539.35 , 2707.20 , -3057.98
+573.07 , 2547.92 , -2878.06
+606.71 , 2406.31 , -2718.10
+640.44 , 2279.72 , -2575.10
+674.16 , 2165.72 , -2446.33
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_drag.viepcd b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..02b9cfdf04fa8e9596deed86f2453d35136592f2
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -18.72
+3.37 , -19.31
+33.71 , -24.79
+67.42 , -30.86
+101.12 , -36.92
+134.83 , -43.06
+168.54 , -49.12
+202.25 , -55.19
+235.96 , -61.26
+269.67 , -67.32
+303.37 , -73.46
+337.08 , -79.52
+370.79 , -85.59
+404.50 , -91.66
+438.21 , -97.72
+471.92 , -103.85
+505.62 , -109.92
+539.33 , -115.99
+573.04 , -122.06
+606.75 , -128.12
+640.46 , -134.25
+674.17 , -140.32
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/GenericIEPC_Gbx1Whl2.viepc b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/GenericIEPC_Gbx1Whl2.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..77bb834401f33bc4b2a25ae51ca8f4a67a6b6d51
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/GenericIEPC_Gbx1Whl2.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 2,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 12.276
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 13860.59,
+ "ContinuousTorqueSpeed": 166.99,
+ "OverloadTorque": 16517.20,
+ "OverloadTorqueSpeed": 166.01,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1Whl2_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl2.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 15015.63,
+ "ContinuousTorqueSpeed": 168.62,
+ "OverloadTorque": 17325.73,
+ "OverloadTorqueSpeed": 170.17,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1Whl2_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl2.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1Whl2_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..d24e3cc1fb92ddfdcc8135e45d96e4c10c58e6e2
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1Whl2.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_ENG_Gbx1Whl2.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_ENG_Gbx1Whl2.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..588039a710bb50e1812a6280716bfd2d173aa006
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_ENG_Gbx1Whl2.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx1Whl2.vveh",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_drag.viepcd b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..07eb40e197c27c23aea5f69c3200e3b799688102
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -37.45
+3.37 , -38.62
+33.71 , -49.58
+67.42 , -61.71
+101.12 , -73.85
+134.83 , -86.11
+168.54 , -98.24
+202.25 , -110.38
+235.96 , -122.51
+269.67 , -134.65
+303.37 , -146.91
+337.08 , -159.04
+370.79 , -171.18
+404.50 , -183.31
+438.21 , -195.45
+471.92 , -207.71
+505.62 , -219.84
+539.33 , -231.98
+573.04 , -244.11
+606.75 , -256.24
+640.46 , -268.51
+674.17 , -280.64
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/Axle_4x2_Tractor.vtlm b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/Axle_4x2_Tractor.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..e11cbf7cdde175e06ab8f6a0b79d46b84b3e0c1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/Axle_4x2_Tractor.vtlm
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/Axlegear.vgbx b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/Axlegear.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..8c4b5d9467fc9de8c168253de67633e521e24a0f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/Axlegear.vgbx
@@ -0,0 +1,33 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-11-03T14:19:09.9858299Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "3_speed_AMT",
+ "Inertia": 0.0,
+ "TracInt": 0.8,
+ "Gears": [
+ {
+ "Ratio": 2.64,
+ "LossMap": "Axle_4x2_Tractor.vtlm"
+ }
+ ],
+ "TqReserve": 0.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.22222222222222,
+ "StartAcc": 0.8,
+ "GearboxType": "AMT",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAfterUpshiftDelay": 6.0,
+ "UpshiftAfterDownshiftDelay": 6.0,
+ "UpshiftMinAcceleration": 0.1,
+ "PowershiftShiftTime": 0.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/GenericIEPC_Gbx1.viepc b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/GenericIEPC_Gbx1.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..8fcddfd0904b8b3f8c53039ee4aa55372733a70b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/GenericIEPC_Gbx1.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 4.65
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 5412.60,
+ "ContinuousTorqueSpeed": 440.86,
+ "OverloadTorque": 6450.02,
+ "OverloadTorqueSpeed": 438.28,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 5863.65,
+ "ContinuousTorqueSpeed": 445.16,
+ "OverloadTorque": 6765.75,
+ "OverloadTorqueSpeed": 449.25,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..304087ef77a7bc0228d3cc739fd662c7b0c325c6
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_ENG_Gbx1.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_ENG_Gbx1.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..cbac5f5b98ffd3ea3898e10e3c21a2bdefb0fd8b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_ENG_Gbx1.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx1.vveh",
+ "GearboxFile": "Axlegear.vgbx",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..e4be1e22ede233c40afa5a00eeb1292d2cad8f78
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -7190.72 , 0.00
+0.00 , -6831.19 , 0.00
+0.00 , -6471.65 , 0.00
+0.00 , -6112.11 , 0.00
+0.00 , -5752.58 , 0.00
+0.00 , -5393.04 , 0.00
+0.00 , -5033.51 , -0.13
+0.00 , -4673.97 , -0.66
+0.00 , -4314.43 , -0.98
+0.00 , -3954.90 , -1.19
+0.00 , -3595.36 , -1.32
+0.00 , -3235.82 , -1.38
+0.00 , -2876.29 , -1.39
+0.00 , -2516.75 , -1.35
+0.00 , -2157.22 , -1.26
+0.00 , -1797.68 , -1.13
+0.00 , -1438.14 , -0.97
+0.00 , -1078.61 , -0.77
+0.00 , -719.07 , -0.53
+0.00 , -359.54 , -0.27
+0.00 , -71.91 , -0.02
+0.00 , 67.66 , 0.13
+0.00 , 338.29 , 0.56
+0.00 , 676.58 , 1.12
+0.00 , 1014.86 , 1.70
+0.00 , 1353.15 , 2.31
+0.00 , 1691.44 , 2.93
+0.00 , 2029.73 , 3.58
+0.00 , 2368.01 , 4.25
+0.00 , 2706.30 , 4.93
+0.00 , 3044.59 , 5.64
+0.00 , 3382.88 , 6.37
+0.00 , 3721.16 , 7.12
+0.00 , 4059.45 , 7.88
+0.00 , 4397.74 , 8.67
+0.00 , 4736.03 , 9.47
+0.00 , 5074.31 , 10.29
+0.00 , 5412.60 , 11.13
+0.00 , 5750.89 , 11.99
+0.00 , 6089.18 , 12.87
+0.00 , 6427.46 , 13.76
+0.00 , 6765.75 , 14.67
+8.90 , -7190.72 , 0.00
+8.90 , -6831.19 , 0.00
+8.90 , -6471.65 , 0.00
+8.90 , -6112.11 , 0.00
+8.90 , -5752.58 , 0.00
+8.90 , -5393.04 , 0.00
+8.90 , -5033.51 , -0.50
+8.90 , -4673.97 , -0.84
+8.90 , -4314.43 , -1.04
+8.90 , -3954.90 , -1.16
+8.90 , -3595.36 , -1.22
+8.90 , -3235.82 , -1.24
+8.90 , -2876.29 , -1.21
+8.90 , -2516.75 , -1.15
+8.90 , -2157.22 , -1.06
+8.90 , -1797.68 , -0.94
+8.90 , -1438.14 , -0.80
+8.90 , -1078.61 , -0.62
+8.90 , -719.07 , -0.43
+8.90 , -359.54 , -0.21
+8.90 , -71.91 , -0.02
+8.90 , 67.66 , 0.10
+8.90 , 338.29 , 0.43
+8.90 , 676.58 , 0.85
+8.90 , 1014.86 , 1.30
+8.90 , 1353.15 , 1.75
+8.90 , 1691.44 , 2.23
+8.90 , 2029.73 , 2.71
+8.90 , 2368.01 , 3.21
+8.90 , 2706.30 , 3.73
+8.90 , 3044.59 , 4.26
+8.90 , 3382.88 , 4.80
+8.90 , 3721.16 , 5.36
+8.90 , 4059.45 , 5.93
+8.90 , 4397.74 , 6.52
+8.90 , 4736.03 , 7.12
+8.90 , 5074.31 , 7.73
+8.90 , 5412.60 , 8.35
+8.90 , 5750.89 , 8.99
+8.90 , 6089.18 , 9.64
+8.90 , 6427.46 , 10.30
+8.90 , 6765.75 , 10.98
+88.99 , -7190.72 , -58.10
+88.99 , -6831.19 , -55.37
+88.99 , -6471.65 , -52.62
+88.99 , -6112.11 , -49.85
+88.99 , -5752.58 , -47.06
+88.99 , -5393.04 , -44.25
+88.99 , -5033.51 , -41.42
+88.99 , -4673.97 , -38.57
+88.99 , -4314.43 , -35.70
+88.99 , -3954.90 , -32.81
+88.99 , -3595.36 , -29.90
+88.99 , -3235.82 , -26.98
+88.99 , -2876.29 , -24.03
+88.99 , -2516.75 , -21.07
+88.99 , -2157.22 , -18.08
+88.99 , -1797.68 , -15.08
+88.99 , -1438.14 , -12.06
+88.99 , -1078.61 , -9.02
+88.99 , -719.07 , -5.96
+88.99 , -359.54 , -2.88
+88.99 , -71.91 , -0.37
+88.99 , 67.66 , 0.90
+88.99 , 338.29 , 3.68
+88.99 , 676.58 , 7.16
+88.99 , 1014.86 , 10.66
+88.99 , 1353.15 , 14.17
+88.99 , 1691.44 , 17.71
+88.99 , 2029.73 , 21.26
+88.99 , 2368.01 , 24.84
+88.99 , 2706.30 , 28.43
+88.99 , 3044.59 , 32.04
+88.99 , 3382.88 , 35.67
+88.99 , 3721.16 , 39.32
+88.99 , 4059.45 , 42.99
+88.99 , 4397.74 , 46.68
+88.99 , 4736.03 , 50.38
+88.99 , 5074.31 , 54.11
+88.99 , 5412.60 , 57.85
+88.99 , 5750.89 , 61.61
+88.99 , 6089.18 , 65.39
+88.99 , 6427.46 , 69.19
+88.99 , 6765.75 , 73.01
+177.98 , -7190.72 , -120.57
+177.98 , -6831.19 , -114.73
+177.98 , -6471.65 , -108.87
+177.98 , -6112.11 , -102.99
+177.98 , -5752.58 , -97.08
+177.98 , -5393.04 , -91.15
+177.98 , -5033.51 , -85.20
+177.98 , -4673.97 , -79.23
+177.98 , -4314.43 , -73.23
+177.98 , -3954.90 , -67.21
+177.98 , -3595.36 , -61.17
+177.98 , -3235.82 , -55.10
+177.98 , -2876.29 , -49.01
+177.98 , -2516.75 , -42.90
+177.98 , -2157.22 , -36.77
+177.98 , -1797.68 , -30.61
+177.98 , -1438.14 , -24.43
+177.98 , -1078.61 , -18.23
+177.98 , -719.07 , -12.01
+177.98 , -359.54 , -5.76
+177.98 , -71.91 , -0.66
+177.98 , 67.66 , 1.84
+177.98 , 338.29 , 7.35
+177.98 , 676.58 , 14.22
+177.98 , 1014.86 , 21.11
+177.98 , 1353.15 , 28.02
+177.98 , 1691.44 , 34.96
+177.98 , 2029.73 , 41.92
+177.98 , 2368.01 , 48.90
+177.98 , 2706.30 , 55.90
+177.98 , 3044.59 , 62.93
+177.98 , 3382.88 , 69.98
+177.98 , 3721.16 , 77.05
+177.98 , 4059.45 , 84.15
+177.98 , 4397.74 , 91.27
+177.98 , 4736.03 , 98.41
+177.98 , 5074.31 , 105.58
+177.98 , 5412.60 , 112.76
+177.98 , 5750.89 , 119.97
+177.98 , 6089.18 , 127.21
+177.98 , 6427.46 , 134.46
+177.98 , 6765.75 , 141.74
+266.97 , -7190.72 , -182.44
+266.97 , -6831.19 , -173.55
+266.97 , -6471.65 , -164.62
+266.97 , -6112.11 , -155.67
+266.97 , -5752.58 , -146.69
+266.97 , -5393.04 , -137.68
+266.97 , -5033.51 , -128.65
+266.97 , -4673.97 , -119.58
+266.97 , -4314.43 , -110.49
+266.97 , -3954.90 , -101.36
+266.97 , -3595.36 , -92.21
+266.97 , -3235.82 , -83.03
+266.97 , -2876.29 , -73.82
+266.97 , -2516.75 , -64.58
+266.97 , -2157.22 , -55.31
+266.97 , -1797.68 , -46.02
+266.97 , -1438.14 , -36.70
+266.97 , -1078.61 , -27.34
+266.97 , -719.07 , -17.96
+266.97 , -359.54 , -8.54
+266.97 , -71.91 , -0.79
+266.97 , 67.66 , 2.86
+266.97 , 338.29 , 11.12
+266.97 , 676.58 , 21.39
+266.97 , 1014.86 , 31.68
+266.97 , 1353.15 , 41.99
+266.97 , 1691.44 , 52.34
+266.97 , 2029.73 , 62.71
+266.97 , 2368.01 , 73.12
+266.97 , 2706.30 , 83.55
+266.97 , 3044.59 , 94.01
+266.97 , 3382.88 , 104.50
+266.97 , 3721.16 , 115.02
+266.97 , 4059.45 , 125.57
+266.97 , 4397.74 , 136.15
+266.97 , 4736.03 , 146.76
+266.97 , 5074.31 , 157.40
+266.97 , 5412.60 , 168.06
+266.97 , 5750.89 , 178.76
+266.97 , 6089.18 , 189.48
+266.97 , 6427.46 , 200.23
+266.97 , 6765.75 , 211.02
+355.96 , -7190.72 , -243.71
+355.96 , -6831.19 , -231.81
+355.96 , -6471.65 , -219.87
+355.96 , -6112.11 , -207.89
+355.96 , -5752.58 , -195.88
+355.96 , -5393.04 , -183.83
+355.96 , -5033.51 , -171.74
+355.96 , -4673.97 , -159.61
+355.96 , -4314.43 , -147.45
+355.96 , -3954.90 , -135.25
+355.96 , -3595.36 , -123.01
+355.96 , -3235.82 , -110.74
+355.96 , -2876.29 , -98.43
+355.96 , -2516.75 , -86.08
+355.96 , -2157.22 , -73.70
+355.96 , -1797.68 , -61.27
+355.96 , -1438.14 , -48.82
+355.96 , -1078.61 , -36.32
+355.96 , -719.07 , -23.78
+355.96 , -359.54 , -11.19
+355.96 , -71.91 , -0.63
+355.96 , 67.66 , 3.98
+355.96 , 338.29 , 15.01
+355.96 , 676.58 , 28.68
+355.96 , 1014.86 , 42.37
+355.96 , 1353.15 , 56.10
+355.96 , 1691.44 , 69.87
+355.96 , 2029.73 , 83.67
+355.96 , 2368.01 , 97.52
+355.96 , 2706.30 , 111.40
+355.96 , 3044.59 , 125.31
+355.96 , 3382.88 , 139.27
+355.96 , 3721.16 , 153.26
+355.96 , 4059.45 , 167.29
+355.96 , 4397.74 , 181.36
+355.96 , 4736.03 , 195.46
+355.96 , 5074.31 , 209.61
+355.96 , 5412.60 , 223.79
+355.96 , 5750.89 , 238.01
+355.96 , 6089.18 , 252.26
+355.96 , 6427.46 , 266.56
+355.96 , 6765.75 , 280.89
+444.95 , -7190.72 , -304.37
+444.95 , -6831.19 , -289.50
+444.95 , -6471.65 , -274.59
+444.95 , -6112.11 , -259.63
+444.95 , -5752.58 , -244.61
+444.95 , -5393.04 , -229.56
+444.95 , -5033.51 , -214.45
+444.95 , -4673.97 , -199.30
+444.95 , -4314.43 , -184.10
+444.95 , -3954.90 , -168.85
+444.95 , -3595.36 , -153.55
+444.95 , -3235.82 , -138.20
+444.95 , -2876.29 , -122.81
+444.95 , -2516.75 , -107.37
+444.95 , -2157.22 , -91.88
+444.95 , -1797.68 , -76.35
+444.95 , -1438.14 , -60.76
+444.95 , -1078.61 , -45.13
+444.95 , -719.07 , -29.44
+444.95 , -359.54 , -13.67
+444.95 , -71.91 , 0.00
+444.95 , 67.66 , 5.21
+444.95 , 338.29 , 19.04
+444.95 , 676.58 , 36.13
+444.95 , 1014.86 , 53.24
+444.95 , 1353.15 , 70.39
+444.95 , 1691.44 , 87.59
+444.95 , 2029.73 , 104.83
+444.95 , 2368.01 , 122.13
+444.95 , 2706.30 , 139.47
+444.95 , 3044.59 , 156.87
+444.95 , 3382.88 , 174.31
+444.95 , 3721.16 , 191.80
+444.95 , 4059.45 , 209.33
+444.95 , 4397.74 , 226.92
+444.95 , 4736.03 , 244.56
+444.95 , 5074.31 , 262.24
+444.95 , 5412.60 , 279.97
+444.95 , 5750.89 , 297.76
+444.95 , 6089.18 , 315.58
+444.95 , 6427.46 , 333.46
+444.95 , 6765.75 , 351.39
+533.94 , -7190.72 , -364.37
+533.94 , -6831.19 , -346.59
+533.94 , -6471.65 , -328.74
+533.94 , -6112.11 , -310.84
+533.94 , -5752.58 , -292.87
+533.94 , -5393.04 , -274.84
+533.94 , -5033.51 , -256.75
+533.94 , -4673.97 , -238.60
+533.94 , -4314.43 , -220.39
+533.94 , -3954.90 , -202.12
+533.94 , -3595.36 , -183.79
+533.94 , -3235.82 , -165.40
+533.94 , -2876.29 , -146.94
+533.94 , -2516.75 , -128.43
+533.94 , -2157.22 , -109.85
+533.94 , -1797.68 , -91.21
+533.94 , -1438.14 , -72.51
+533.94 , -1078.61 , -53.75
+533.94 , -719.07 , -34.91
+533.94 , -359.54 , -15.95
+533.94 , -71.91 , 0.00
+533.94 , 67.66 , 6.58
+533.94 , 338.29 , 23.25
+533.94 , 676.58 , 43.76
+533.94 , 1014.86 , 64.29
+533.94 , 1353.15 , 84.87
+533.94 , 1691.44 , 105.52
+533.94 , 2029.73 , 126.22
+533.94 , 2368.01 , 146.98
+533.94 , 2706.30 , 167.81
+533.94 , 3044.59 , 188.70
+533.94 , 3382.88 , 209.65
+533.94 , 3721.16 , 230.66
+533.94 , 4059.45 , 251.73
+533.94 , 4397.74 , 272.87
+533.94 , 4736.03 , 294.07
+533.94 , 5074.31 , 315.33
+533.94 , 5412.60 , 336.65
+533.94 , 5750.89 , 358.03
+533.94 , 6089.18 , 379.47
+533.94 , 6427.46 , 400.98
+533.94 , 6765.75 , 422.54
+622.93 , -7190.72 , -423.69
+622.93 , -6831.19 , -403.04
+622.93 , -6471.65 , -382.31
+622.93 , -6112.11 , -361.50
+622.93 , -5752.58 , -340.62
+622.93 , -5393.04 , -319.66
+622.93 , -5033.51 , -298.62
+622.93 , -4673.97 , -277.51
+622.93 , -4314.43 , -256.31
+622.93 , -3954.90 , -235.05
+622.93 , -3595.36 , -213.70
+622.93 , -3235.82 , -192.28
+622.93 , -2876.29 , -170.79
+622.93 , -2516.75 , -149.21
+622.93 , -2157.22 , -127.57
+622.93 , -1797.68 , -105.84
+622.93 , -1438.14 , -84.03
+622.93 , -1078.61 , -62.14
+622.93 , -719.07 , -40.16
+622.93 , -359.54 , -18.00
+622.93 , -71.91 , 0.00
+622.93 , 67.66 , 8.09
+622.93 , 338.29 , 27.64
+622.93 , 676.58 , 51.59
+622.93 , 1014.86 , 75.56
+622.93 , 1353.15 , 99.58
+622.93 , 1691.44 , 123.68
+622.93 , 2029.73 , 147.86
+622.93 , 2368.01 , 172.10
+622.93 , 2706.30 , 196.43
+622.93 , 3044.59 , 220.84
+622.93 , 3382.88 , 245.32
+622.93 , 3721.16 , 269.88
+622.93 , 4059.45 , 294.51
+622.93 , 4397.74 , 319.23
+622.93 , 4736.03 , 344.02
+622.93 , 5074.31 , 368.89
+622.93 , 5412.60 , 393.83
+622.93 , 5750.89 , 418.85
+622.93 , 6089.18 , 443.95
+622.93 , 6427.46 , 469.13
+622.93 , 6765.75 , 494.38
+711.92 , -7190.72 , -482.31
+711.92 , -6831.19 , -458.83
+711.92 , -6471.65 , -435.26
+711.92 , -6112.11 , -411.59
+711.92 , -5752.58 , -387.83
+711.92 , -5393.04 , -363.97
+711.92 , -5033.51 , -340.02
+711.92 , -4673.97 , -315.97
+711.92 , -4314.43 , -291.83
+711.92 , -3954.90 , -267.59
+711.92 , -3595.36 , -243.26
+711.92 , -3235.82 , -218.84
+711.92 , -2876.29 , -194.32
+711.92 , -2516.75 , -169.71
+711.92 , -2157.22 , -145.00
+711.92 , -1797.68 , -120.19
+711.92 , -1438.14 , -95.29
+711.92 , -1078.61 , -70.28
+711.92 , -719.07 , -45.14
+711.92 , -359.54 , -19.76
+711.92 , -71.91 , 0.00
+711.92 , 67.66 , 9.76
+711.92 , 338.29 , 32.25
+711.92 , 676.58 , 59.66
+711.92 , 1014.86 , 87.07
+711.92 , 1353.15 , 114.55
+711.92 , 1691.44 , 142.11
+711.92 , 2029.73 , 169.77
+711.92 , 2368.01 , 197.52
+711.92 , 2706.30 , 225.37
+711.92 , 3044.59 , 253.31
+711.92 , 3382.88 , 281.34
+711.92 , 3721.16 , 309.47
+711.92 , 4059.45 , 337.70
+711.92 , 4397.74 , 366.02
+711.92 , 4736.03 , 394.44
+711.92 , 5074.31 , 422.95
+711.92 , 5412.60 , 451.56
+711.92 , 5750.89 , 480.26
+711.92 , 6089.18 , 509.05
+711.92 , 6427.46 , 537.94
+711.92 , 6765.75 , 566.93
+800.91 , -7190.72 , -540.17
+800.91 , -6831.19 , -513.92
+800.91 , -6471.65 , -487.55
+800.91 , -6112.11 , -461.06
+800.91 , -5752.58 , -434.46
+800.91 , -5393.04 , -407.75
+800.91 , -5033.51 , -380.92
+800.91 , -4673.97 , -353.97
+800.91 , -4314.43 , -326.91
+800.91 , -3954.90 , -299.73
+800.91 , -3595.36 , -272.44
+800.91 , -3235.82 , -245.03
+800.91 , -2876.29 , -217.51
+800.91 , -2516.75 , -189.87
+800.91 , -2157.22 , -162.12
+800.91 , -1797.68 , -134.25
+800.91 , -1438.14 , -106.26
+800.91 , -1078.61 , -78.13
+800.91 , -719.07 , -49.84
+800.91 , -359.54 , -21.19
+800.91 , -71.91 , 0.00
+800.91 , 67.66 , 11.59
+800.91 , 338.29 , 37.10
+800.91 , 676.58 , 67.98
+800.91 , 1014.86 , 98.85
+800.91 , 1353.15 , 129.79
+800.91 , 1691.44 , 160.84
+800.91 , 2029.73 , 191.99
+800.91 , 2368.01 , 223.26
+800.91 , 2706.30 , 254.64
+800.91 , 3044.59 , 286.14
+800.91 , 3382.88 , 317.75
+800.91 , 3721.16 , 349.48
+800.91 , 4059.45 , 381.32
+800.91 , 4397.74 , 413.28
+800.91 , 4736.03 , 445.36
+800.91 , 5074.31 , 477.54
+800.91 , 5412.60 , 509.85
+800.91 , 5750.89 , 542.27
+800.91 , 6089.18 , 574.80
+800.91 , 6427.46 , 607.45
+800.91 , 6765.75 , 640.21
+889.90 , -7190.72 , -597.26
+889.90 , -6831.19 , -568.28
+889.90 , -6471.65 , -539.16
+889.90 , -6112.11 , -509.90
+889.90 , -5752.58 , -480.50
+889.90 , -5393.04 , -450.96
+889.90 , -5033.51 , -421.28
+889.90 , -4673.97 , -391.47
+889.90 , -4314.43 , -361.52
+889.90 , -3954.90 , -331.43
+889.90 , -3595.36 , -301.20
+889.90 , -3235.82 , -270.83
+889.90 , -2876.29 , -240.33
+889.90 , -2516.75 , -209.68
+889.90 , -2157.22 , -178.90
+889.90 , -1797.68 , -147.97
+889.90 , -1438.14 , -116.90
+889.90 , -1078.61 , -85.66
+889.90 , -719.07 , -54.21
+889.90 , -359.54 , -22.23
+889.90 , -71.91 , 0.00
+889.90 , 67.66 , 13.60
+889.90 , 338.29 , 42.20
+889.90 , 676.58 , 76.58
+889.90 , 1014.86 , 110.92
+889.90 , 1353.15 , 145.34
+889.90 , 1691.44 , 179.88
+889.90 , 2029.73 , 214.55
+889.90 , 2368.01 , 249.35
+889.90 , 2706.30 , 284.29
+889.90 , 3044.59 , 319.36
+889.90 , 3382.88 , 354.57
+889.90 , 3721.16 , 389.92
+889.90 , 4059.45 , 425.41
+889.90 , 4397.74 , 461.03
+889.90 , 4736.03 , 496.79
+889.90 , 5074.31 , 532.69
+889.90 , 5412.60 , 568.73
+889.90 , 5750.89 , 604.90
+889.90 , 6089.18 , 641.21
+889.90 , 6427.46 , 677.66
+889.90 , 6765.75 , 714.24
+978.89 , -7190.72 , -653.54
+978.89 , -6831.19 , -621.88
+978.89 , -6471.65 , -590.05
+978.89 , -6112.11 , -558.06
+978.89 , -5752.58 , -525.90
+978.89 , -5393.04 , -493.58
+978.89 , -5033.51 , -461.09
+978.89 , -4673.97 , -428.44
+978.89 , -4314.43 , -395.63
+978.89 , -3954.90 , -362.65
+978.89 , -3595.36 , -329.51
+978.89 , -3235.82 , -296.21
+978.89 , -2876.29 , -262.74
+978.89 , -2516.75 , -229.11
+978.89 , -2157.22 , -195.31
+978.89 , -1797.68 , -161.34
+978.89 , -1438.14 , -127.18
+978.89 , -1078.61 , -92.83
+978.89 , -719.07 , -58.20
+978.89 , -359.54 , -22.82
+978.89 , -71.91 , 0.00
+978.89 , 67.66 , 15.79
+978.89 , 338.29 , 47.58
+978.89 , 676.58 , 85.48
+978.89 , 1014.86 , 123.30
+978.89 , 1353.15 , 161.22
+978.89 , 1691.44 , 199.26
+978.89 , 2029.73 , 237.46
+978.89 , 2368.01 , 275.81
+978.89 , 2706.30 , 314.32
+978.89 , 3044.59 , 352.99
+978.89 , 3382.88 , 391.83
+978.89 , 3721.16 , 430.82
+978.89 , 4059.45 , 469.98
+978.89 , 4397.74 , 509.30
+978.89 , 4736.03 , 548.78
+978.89 , 5074.31 , 588.42
+978.89 , 5412.60 , 628.23
+978.89 , 5750.89 , 668.20
+978.89 , 6089.18 , 708.32
+978.89 , 6427.46 , 748.61
+978.89 , 6765.75 , 789.06
+1067.88 , -7190.72 , -708.97
+1067.88 , -6831.19 , -674.68
+1067.88 , -6471.65 , -640.19
+1067.88 , -6112.11 , -605.51
+1067.88 , -5752.58 , -570.63
+1067.88 , -5393.04 , -535.56
+1067.88 , -5033.51 , -500.30
+1067.88 , -4673.97 , -464.85
+1067.88 , -4314.43 , -429.21
+1067.88 , -3954.90 , -393.37
+1067.88 , -3595.36 , -357.35
+1067.88 , -3235.82 , -321.13
+1067.88 , -2876.29 , -284.71
+1067.88 , -2516.75 , -248.11
+1067.88 , -2157.22 , -211.31
+1067.88 , -1797.68 , -174.30
+1067.88 , -1438.14 , -137.08
+1067.88 , -1078.61 , -99.61
+1067.88 , -719.07 , -61.78
+1067.88 , -359.54 , -22.86
+1067.88 , -71.91 , 0.00
+1067.88 , 67.66 , 18.17
+1067.88 , 338.29 , 53.24
+1067.88 , 676.58 , 94.71
+1067.88 , 1014.86 , 136.03
+1067.88 , 1353.15 , 177.45
+1067.88 , 1691.44 , 219.01
+1067.88 , 2029.73 , 260.75
+1067.88 , 2368.01 , 302.67
+1067.88 , 2706.30 , 344.78
+1067.88 , 3044.59 , 387.07
+1067.88 , 3382.88 , 429.54
+1067.88 , 3721.16 , 472.21
+1067.88 , 4059.45 , 515.06
+1067.88 , 4397.74 , 558.11
+1067.88 , 4736.03 , 601.34
+1067.88 , 5074.31 , 644.76
+1067.88 , 5412.60 , 688.37
+1067.88 , 5750.89 , 732.17
+1067.88 , 6089.18 , 776.15
+1067.88 , 6427.46 , 820.33
+1067.88 , 6765.75 , 864.69
+1156.87 , -7190.72 , -763.53
+1156.87 , -6831.19 , -726.65
+1156.87 , -6471.65 , -689.55
+1156.87 , -6112.11 , -652.22
+1156.87 , -5752.58 , -614.67
+1156.87 , -5393.04 , -576.89
+1156.87 , -5033.51 , -538.89
+1156.87 , -4673.97 , -500.67
+1156.87 , -4314.43 , -462.22
+1156.87 , -3954.90 , -423.56
+1156.87 , -3595.36 , -384.67
+1156.87 , -3235.82 , -345.56
+1156.87 , -2876.29 , -306.22
+1156.87 , -2516.75 , -266.66
+1156.87 , -2157.22 , -226.86
+1156.87 , -1797.68 , -186.83
+1156.87 , -1438.14 , -146.54
+1156.87 , -1078.61 , -105.95
+1156.87 , -719.07 , -64.90
+1156.87 , -359.54 , -22.24
+1156.87 , -71.91 , 0.00
+1156.87 , 67.66 , 20.74
+1156.87 , 338.29 , 59.20
+1156.87 , 676.58 , 104.27
+1156.87 , 1014.86 , 149.12
+1156.87 , 1353.15 , 194.05
+1156.87 , 1691.44 , 239.16
+1156.87 , 2029.73 , 284.45
+1156.87 , 2368.01 , 329.96
+1156.87 , 2706.30 , 375.67
+1156.87 , 3044.59 , 421.60
+1156.87 , 3382.88 , 467.75
+1156.87 , 3721.16 , 514.11
+1156.87 , 4059.45 , 560.69
+1156.87 , 4397.74 , 607.48
+1156.87 , 4736.03 , 654.50
+1156.87 , 5074.31 , 701.73
+1156.87 , 5412.60 , 749.18
+1156.87 , 5750.89 , 796.84
+1156.87 , 6089.18 , 844.73
+1156.87 , 6427.46 , 892.83
+1156.87 , 6765.75 , 941.14
+1245.86 , -7190.72 , -817.17
+1245.86 , -6831.19 , -777.76
+1245.86 , -6471.65 , -738.08
+1245.86 , -6112.11 , -698.15
+1245.86 , -5752.58 , -657.96
+1245.86 , -5393.04 , -617.52
+1245.86 , -5033.51 , -576.82
+1245.86 , -4673.97 , -535.86
+1245.86 , -4314.43 , -494.65
+1245.86 , -3954.90 , -453.18
+1245.86 , -3595.36 , -411.45
+1245.86 , -3235.82 , -369.47
+1245.86 , -2876.29 , -327.22
+1245.86 , -2516.75 , -284.72
+1245.86 , -2157.22 , -241.95
+1245.86 , -1797.68 , -198.90
+1245.86 , -1438.14 , -155.54
+1245.86 , -1078.61 , -111.82
+1245.86 , -719.07 , -67.51
+1245.86 , -359.54 , -20.80
+1245.86 , -71.91 , 0.00
+1245.86 , 67.66 , 23.52
+1245.86 , 338.29 , 65.48
+1245.86 , 676.58 , 114.20
+1245.86 , 1014.86 , 162.59
+1245.86 , 1353.15 , 211.06
+1245.86 , 1691.44 , 259.72
+1245.86 , 2029.73 , 308.59
+1245.86 , 2368.01 , 357.69
+1245.86 , 2706.30 , 407.04
+1245.86 , 3044.59 , 456.62
+1245.86 , 3382.88 , 506.46
+1245.86 , 3721.16 , 556.54
+1245.86 , 4059.45 , 606.87
+1245.86 , 4397.74 , 657.45
+1245.86 , 4736.03 , 708.28
+1245.86 , 5074.31 , 759.35
+1245.86 , 5412.60 , 810.68
+1245.86 , 5750.89 , 862.25
+1245.86 , 6089.18 , 914.07
+1245.86 , 6427.46 , 966.13
+1245.86 , 6765.75 , 1018.44
+1334.85 , -7190.72 , -869.86
+1334.85 , -6831.19 , -827.96
+1334.85 , -6471.65 , -785.77
+1334.85 , -6112.11 , -743.28
+1334.85 , -5752.58 , -700.50
+1334.85 , -5393.04 , -657.42
+1334.85 , -5033.51 , -614.05
+1334.85 , -4673.97 , -570.39
+1334.85 , -4314.43 , -526.44
+1334.85 , -3954.90 , -482.19
+1334.85 , -3595.36 , -437.65
+1334.85 , -3235.82 , -392.82
+1334.85 , -2876.29 , -347.69
+1334.85 , -2516.75 , -302.26
+1334.85 , -2157.22 , -256.52
+1334.85 , -1797.68 , -210.46
+1334.85 , -1438.14 , -164.04
+1334.85 , -1078.61 , -117.17
+1334.85 , -719.07 , -69.54
+1334.85 , -359.54 , -18.27
+1334.85 , -71.91 , 0.00
+1334.85 , 67.66 , 26.49
+1334.85 , 338.29 , 72.10
+1334.85 , 676.58 , 124.50
+1334.85 , 1014.86 , 176.46
+1334.85 , 1353.15 , 228.49
+1334.85 , 1691.44 , 280.71
+1334.85 , 2029.73 , 333.18
+1334.85 , 2368.01 , 385.90
+1334.85 , 2706.30 , 438.89
+1334.85 , 3044.59 , 492.16
+1334.85 , 3382.88 , 545.71
+1334.85 , 3721.16 , 599.54
+1334.85 , 4059.45 , 653.64
+1334.85 , 4397.74 , 708.03
+1334.85 , 4736.03 , 762.71
+1334.85 , 5074.31 , 817.66
+1334.85 , 5412.60 , 872.89
+1334.85 , 5750.89 , 928.41
+1334.85 , 6089.18 , 984.20
+1334.85 , 6427.46 , 1040.27
+1334.85 , 6765.75 , 1096.63
+1423.84 , -7190.72 , -921.56
+1423.84 , -6831.19 , -877.23
+1423.84 , -6471.65 , -832.56
+1423.84 , -6112.11 , -787.56
+1423.84 , -5752.58 , -742.22
+1423.84 , -5393.04 , -696.56
+1423.84 , -5033.51 , -650.56
+1423.84 , -4673.97 , -604.23
+1423.84 , -4314.43 , -557.56
+1423.84 , -3954.90 , -510.57
+1423.84 , -3595.36 , -463.24
+1423.84 , -3235.82 , -415.58
+1423.84 , -2876.29 , -367.58
+1423.84 , -2516.75 , -319.24
+1423.84 , -2157.22 , -270.55
+1423.84 , -1797.68 , -221.48
+1423.84 , -1438.14 , -171.99
+1423.84 , -1078.61 , -121.95
+1423.84 , -719.07 , -70.93
+1423.84 , -359.54 , -14.10
+1423.84 , -71.91 , 0.00
+1423.84 , 67.66 , 29.68
+1423.84 , 338.29 , 79.05
+1423.84 , 676.58 , 135.20
+1423.84 , 1014.86 , 190.76
+1423.84 , 1353.15 , 246.36
+1423.84 , 1691.44 , 302.17
+1423.84 , 2029.73 , 358.24
+1423.84 , 2368.01 , 414.60
+1423.84 , 2706.30 , 471.27
+1423.84 , 3044.59 , 528.24
+1423.84 , 3382.88 , 585.52
+1423.84 , 3721.16 , 643.12
+1423.84 , 4059.45 , 701.03
+1423.84 , 4397.74 , 759.26
+1423.84 , 4736.03 , 817.80
+1423.84 , 5074.31 , 876.66
+1423.84 , 5412.60 , 935.84
+1423.84 , 5750.89 , 995.34
+1423.84 , 6089.18 , 1055.15
+1423.84 , 6427.46 , 1115.27
+1423.84 , 6765.75 , 1175.71
+1512.83 , -7190.72 , -972.24
+1512.83 , -6831.19 , -925.52
+1512.83 , -6471.65 , -878.43
+1512.83 , -6112.11 , -830.96
+1512.83 , -5752.58 , -783.11
+1512.83 , -5393.04 , -734.89
+1512.83 , -5033.51 , -686.30
+1512.83 , -4673.97 , -637.33
+1512.83 , -4314.43 , -587.99
+1512.83 , -3954.90 , -538.28
+1512.83 , -3595.36 , -488.19
+1512.83 , -3235.82 , -437.72
+1512.83 , -2876.29 , -386.87
+1512.83 , -2516.75 , -335.63
+1512.83 , -2157.22 , -283.99
+1512.83 , -1797.68 , -231.92
+1512.83 , -1438.14 , -179.35
+1512.83 , -1078.61 , -126.12
+1512.83 , -719.07 , -71.60
+1512.83 , -359.54 , -6.45
+1512.83 , -71.91 , 0.00
+1512.83 , 67.66 , 33.08
+1512.83 , 338.29 , 86.37
+1512.83 , 676.58 , 146.31
+1512.83 , 1014.86 , 205.50
+1512.83 , 1353.15 , 264.70
+1512.83 , 1691.44 , 324.11
+1512.83 , 2029.73 , 383.81
+1512.83 , 2368.01 , 443.83
+1512.83 , 2706.30 , 504.18
+1512.83 , 3044.59 , 564.87
+1512.83 , 3382.88 , 625.91
+1512.83 , 3721.16 , 687.30
+1512.83 , 4059.45 , 749.05
+1512.83 , 4397.74 , 811.14
+1512.83 , 4736.03 , 873.59
+1512.83 , 5074.31 , 936.40
+1512.83 , 5412.60 , 999.56
+1512.83 , 5750.89 , 1063.07
+1512.83 , 6089.18 , 1126.93
+1512.83 , 6427.46 , 1191.14
+1512.83 , 6765.75 , 1255.71
+1601.82 , -7190.72 , -1021.86
+1601.82 , -6831.19 , -972.81
+1601.82 , -6471.65 , -923.33
+1601.82 , -6112.11 , -873.44
+1601.82 , -5752.58 , -823.13
+1601.82 , -5393.04 , -772.39
+1601.82 , -5033.51 , -721.24
+1601.82 , -4673.97 , -669.67
+1601.82 , -4314.43 , -617.68
+1601.82 , -3954.90 , -565.27
+1601.82 , -3595.36 , -512.45
+1601.82 , -3235.82 , -459.19
+1601.82 , -2876.29 , -405.51
+1601.82 , -2516.75 , -351.39
+1601.82 , -2157.22 , -296.81
+1601.82 , -1797.68 , -241.73
+1601.82 , -1438.14 , -186.07
+1601.82 , -1078.61 , -129.61
+1601.82 , -719.07 , -71.46
+1601.82 , -359.54 , 0.00
+1601.82 , -71.91 , 0.00
+1601.82 , 67.66 , 36.70
+1601.82 , 338.29 , 94.04
+1601.82 , 676.58 , 157.85
+1601.82 , 1014.86 , 220.70
+1601.82 , 1353.15 , 283.52
+1601.82 , 1691.44 , 346.56
+1601.82 , 2029.73 , 409.90
+1601.82 , 2368.01 , 473.59
+1601.82 , 2706.30 , 537.65
+1601.82 , 3044.59 , 602.09
+1601.82 , 3382.88 , 666.91
+1601.82 , 3721.16 , 732.12
+1601.82 , 4059.45 , 797.72
+1601.82 , 4397.74 , 863.72
+1601.82 , 4736.03 , 930.10
+1601.82 , 5074.31 , 996.88
+1601.82 , 5412.60 , 1064.05
+1601.82 , 5750.89 , 1131.62
+1601.82 , 6089.18 , 1199.57
+1601.82 , 6427.46 , 1267.92
+1601.82 , 6765.75 , 1336.65
+1690.81 , -7190.72 , -1070.37
+1690.81 , -6831.19 , -1019.04
+1690.81 , -6471.65 , -967.24
+1690.81 , -6112.11 , -914.96
+1690.81 , -5752.58 , -862.23
+1690.81 , -5393.04 , -809.02
+1690.81 , -5033.51 , -755.35
+1690.81 , -4673.97 , -701.21
+1690.81 , -4314.43 , -646.60
+1690.81 , -3954.90 , -591.53
+1690.81 , -3595.36 , -535.99
+1690.81 , -3235.82 , -479.97
+1690.81 , -2876.29 , -423.47
+1690.81 , -2516.75 , -366.48
+1690.81 , -2157.22 , -308.96
+1690.81 , -1797.68 , -250.88
+1690.81 , -1438.14 , -192.11
+1690.81 , -1078.61 , -132.36
+1690.81 , -719.07 , -70.38
+1690.81 , -359.54 , 0.00
+1690.81 , -71.91 , 0.00
+1690.81 , 67.66 , 40.53
+1690.81 , 338.29 , 102.10
+1690.81 , 676.58 , 169.83
+1690.81 , 1014.86 , 236.37
+1690.81 , 1353.15 , 302.84
+1690.81 , 1691.44 , 369.53
+1690.81 , 2029.73 , 436.54
+1690.81 , 2368.01 , 503.92
+1690.81 , 2706.30 , 571.71
+1690.81 , 3044.59 , 639.91
+1690.81 , 3382.88 , 708.54
+1690.81 , 3721.16 , 777.59
+1690.81 , 4059.45 , 847.08
+1690.81 , 4397.74 , 917.00
+1690.81 , 4736.03 , 987.35
+1690.81 , 5074.31 , 1058.14
+1690.81 , 5412.60 , 1129.36
+1690.81 , 5750.89 , 1201.01
+1690.81 , 6089.18 , 1273.09
+1690.81 , 6427.46 , 1345.61
+1690.81 , 6765.75 , 1418.56
+1779.80 , -7190.72 , -1117.74
+1779.80 , -6831.19 , -1064.18
+1779.80 , -6471.65 , -1010.10
+1779.80 , -6112.11 , -955.49
+1779.80 , -5752.58 , -900.37
+1779.80 , -5393.04 , -844.73
+1779.80 , -5033.51 , -788.58
+1779.80 , -4673.97 , -731.90
+1779.80 , -4314.43 , -674.71
+1779.80 , -3954.90 , -617.00
+1779.80 , -3595.36 , -558.77
+1779.80 , -3235.82 , -500.01
+1779.80 , -2876.29 , -440.71
+1779.80 , -2516.75 , -380.85
+1779.80 , -2157.22 , -320.40
+1779.80 , -1797.68 , -259.31
+1779.80 , -1438.14 , -197.41
+1779.80 , -1078.61 , -134.30
+1779.80 , -719.07 , -68.24
+1779.80 , -359.54 , 0.00
+1779.80 , -71.91 , 0.00
+1779.80 , 67.66 , 44.59
+1779.80 , 338.29 , 110.53
+1779.80 , 676.58 , 182.27
+1779.80 , 1014.86 , 252.55
+1779.80 , 1353.15 , 322.69
+1779.80 , 1691.44 , 393.04
+1779.80 , 2029.73 , 463.74
+1779.80 , 2368.01 , 534.84
+1779.80 , 2706.30 , 606.37
+1779.80 , 3044.59 , 678.37
+1779.80 , 3382.88 , 750.82
+1779.80 , 3721.16 , 823.74
+1779.80 , 4059.45 , 897.14
+1779.80 , 4397.74 , 971.01
+1779.80 , 4736.03 , 1045.36
+1779.80 , 5074.31 , 1120.19
+1779.80 , 5412.60 , 1195.49
+1779.80 , 5750.89 , 1271.27
+1779.80 , 6089.18 , 1347.52
+1779.80 , 6427.46 , 1424.25
+1779.80 , 6765.75 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..14358b02ff657904b67a1a81913128b0ff6bad78
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 6765.75 , -7190.72
+8.82 , 6765.75 , -7190.72
+89.03 , 6765.75 , -7190.72
+178.06 , 6765.75 , -7190.72
+266.88 , 6765.75 , -7190.72
+355.91 , 6765.75 , -7190.72
+444.95 , 6765.75 , -7190.72
+533.98 , 5638.13 , -5992.27
+623.01 , 4832.64 , -5136.19
+711.83 , 4228.59 , -4494.20
+800.86 , 3758.78 , -3994.88
+889.89 , 3382.88 , -3595.36
+978.92 , 3075.35 , -3268.52
+1067.96 , 2819.06 , -2996.13
+1156.77 , 2602.20 , -2765.65
+1245.81 , 2416.37 , -2568.14
+1334.84 , 2255.25 , -2396.91
+1423.87 , 2114.34 , -2247.15
+1512.90 , 1989.94 , -2114.94
+1601.72 , 1879.34 , -1997.39
+1690.75 , 1780.47 , -1892.31
+1779.78 , 1691.44 , -1797.68
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..14358b02ff657904b67a1a81913128b0ff6bad78
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 6765.75 , -7190.72
+8.82 , 6765.75 , -7190.72
+89.03 , 6765.75 , -7190.72
+178.06 , 6765.75 , -7190.72
+266.88 , 6765.75 , -7190.72
+355.91 , 6765.75 , -7190.72
+444.95 , 6765.75 , -7190.72
+533.98 , 5638.13 , -5992.27
+623.01 , 4832.64 , -5136.19
+711.83 , 4228.59 , -4494.20
+800.86 , 3758.78 , -3994.88
+889.89 , 3382.88 , -3595.36
+978.92 , 3075.35 , -3268.52
+1067.96 , 2819.06 , -2996.13
+1156.77 , 2602.20 , -2765.65
+1245.81 , 2416.37 , -2568.14
+1334.84 , 2255.25 , -2396.91
+1423.87 , 2114.34 , -2247.15
+1512.90 , 1989.94 , -2114.94
+1601.72 , 1879.34 , -1997.39
+1690.75 , 1780.47 , -1892.31
+1779.78 , 1691.44 , -1797.68
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_drag.viepcd b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..ffb4883b312afeed23be5a96783b2b92e3c03bed
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_Gbx1_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -13.76
+8.90 , -14.19
+88.99 , -18.22
+177.98 , -22.67
+266.97 , -27.13
+355.96 , -31.64
+444.95 , -36.10
+533.94 , -40.56
+622.93 , -45.01
+711.92 , -49.47
+800.91 , -53.98
+889.90 , -58.44
+978.89 , -62.89
+1067.88 , -67.35
+1156.87 , -71.81
+1245.86 , -76.32
+1334.85 , -80.78
+1423.84 , -85.23
+1512.83 , -89.69
+1601.82 , -94.15
+1690.81 , -98.66
+1779.80 , -103.11
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/GenericIEPC_Gbx3Axl.viepc b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/GenericIEPC_Gbx3Axl.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..960168f579fdda05ed04d0089c7fb128803c6922
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/GenericIEPC_Gbx3Axl.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": true,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 21.9384
+ },
+ {
+ "Ratio": 12.276
+ },
+ {
+ "Ratio": 7.2336
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3Axl_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Axl_1.viepco",
+ "2": "IEPC_Gbx3Axl_2.viepco",
+ "3": "IEPC_Gbx3Axl_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3Axl_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Axl_1.viepco",
+ "2": "IEPC_Gbx3Axl_2.viepco",
+ "3": "IEPC_Gbx3Axl_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3Axl_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..3bf156969e9b30846e6765fca601a6e3cc99b35b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3Axl.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_ENG_Gbx3Axl.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_ENG_Gbx3Axl.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..18db3d71b4ebdaa1349292d4d437a40c9a80f158
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_ENG_Gbx3Axl.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx3Axl.vveh",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_1.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..6661444505d1f80e1b7ccf4680f069a1394f3e8d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -35338.92 , 0.00
+0.00 , -33571.97 , 0.00
+0.00 , -31805.03 , 0.00
+0.00 , -30038.08 , 0.00
+0.00 , -28271.13 , 0.00
+0.00 , -26504.19 , 0.00
+0.00 , -24737.24 , -0.13
+0.00 , -22970.30 , -0.66
+0.00 , -21203.35 , -0.98
+0.00 , -19436.40 , -1.19
+0.00 , -17669.46 , -1.32
+0.00 , -15902.51 , -1.38
+0.00 , -14135.57 , -1.39
+0.00 , -12368.62 , -1.35
+0.00 , -10601.68 , -1.26
+0.00 , -8834.73 , -1.13
+0.00 , -7067.78 , -0.97
+0.00 , -5300.84 , -0.77
+0.00 , -3533.89 , -0.53
+0.00 , -1766.95 , -0.27
+0.00 , -353.39 , -0.02
+0.00 , 306.44 , 0.13
+0.00 , 1532.18 , 0.56
+0.00 , 3064.36 , 1.12
+0.00 , 4596.53 , 1.70
+0.00 , 6128.71 , 2.31
+0.00 , 7660.89 , 2.93
+0.00 , 9193.07 , 3.58
+0.00 , 10725.24 , 4.25
+0.00 , 12257.42 , 4.93
+0.00 , 13789.60 , 5.64
+0.00 , 15321.78 , 6.37
+0.00 , 16853.96 , 7.12
+0.00 , 18386.13 , 7.88
+0.00 , 19918.31 , 8.67
+0.00 , 21450.49 , 9.47
+0.00 , 22982.67 , 10.29
+0.00 , 24514.85 , 11.13
+0.00 , 26047.02 , 11.99
+0.00 , 27579.20 , 12.87
+0.00 , 29111.38 , 13.76
+0.00 , 30643.56 , 14.67
+1.89 , -35338.92 , 0.00
+1.89 , -33571.97 , 0.00
+1.89 , -31805.03 , 0.00
+1.89 , -30038.08 , 0.00
+1.89 , -28271.13 , 0.00
+1.89 , -26504.19 , 0.00
+1.89 , -24737.24 , -0.50
+1.89 , -22970.30 , -0.84
+1.89 , -21203.35 , -1.04
+1.89 , -19436.40 , -1.16
+1.89 , -17669.46 , -1.22
+1.89 , -15902.51 , -1.24
+1.89 , -14135.57 , -1.21
+1.89 , -12368.62 , -1.15
+1.89 , -10601.68 , -1.06
+1.89 , -8834.73 , -0.94
+1.89 , -7067.78 , -0.80
+1.89 , -5300.84 , -0.62
+1.89 , -3533.89 , -0.43
+1.89 , -1766.95 , -0.21
+1.89 , -353.39 , -0.02
+1.89 , 306.44 , 0.10
+1.89 , 1532.18 , 0.43
+1.89 , 3064.36 , 0.85
+1.89 , 4596.53 , 1.30
+1.89 , 6128.71 , 1.75
+1.89 , 7660.89 , 2.23
+1.89 , 9193.07 , 2.71
+1.89 , 10725.24 , 3.21
+1.89 , 12257.42 , 3.73
+1.89 , 13789.60 , 4.26
+1.89 , 15321.78 , 4.80
+1.89 , 16853.96 , 5.36
+1.89 , 18386.13 , 5.93
+1.89 , 19918.31 , 6.52
+1.89 , 21450.49 , 7.12
+1.89 , 22982.67 , 7.73
+1.89 , 24514.85 , 8.35
+1.89 , 26047.02 , 8.99
+1.89 , 27579.20 , 9.64
+1.89 , 29111.38 , 10.30
+1.89 , 30643.56 , 10.98
+18.86 , -35338.92 , -58.10
+18.86 , -33571.97 , -55.37
+18.86 , -31805.03 , -52.62
+18.86 , -30038.08 , -49.85
+18.86 , -28271.13 , -47.06
+18.86 , -26504.19 , -44.25
+18.86 , -24737.24 , -41.42
+18.86 , -22970.30 , -38.57
+18.86 , -21203.35 , -35.70
+18.86 , -19436.40 , -32.81
+18.86 , -17669.46 , -29.90
+18.86 , -15902.51 , -26.98
+18.86 , -14135.57 , -24.03
+18.86 , -12368.62 , -21.07
+18.86 , -10601.68 , -18.08
+18.86 , -8834.73 , -15.08
+18.86 , -7067.78 , -12.06
+18.86 , -5300.84 , -9.02
+18.86 , -3533.89 , -5.96
+18.86 , -1766.95 , -2.88
+18.86 , -353.39 , -0.37
+18.86 , 306.44 , 0.90
+18.86 , 1532.18 , 3.68
+18.86 , 3064.36 , 7.16
+18.86 , 4596.53 , 10.66
+18.86 , 6128.71 , 14.17
+18.86 , 7660.89 , 17.71
+18.86 , 9193.07 , 21.26
+18.86 , 10725.24 , 24.84
+18.86 , 12257.42 , 28.43
+18.86 , 13789.60 , 32.04
+18.86 , 15321.78 , 35.67
+18.86 , 16853.96 , 39.32
+18.86 , 18386.13 , 42.99
+18.86 , 19918.31 , 46.68
+18.86 , 21450.49 , 50.38
+18.86 , 22982.67 , 54.11
+18.86 , 24514.85 , 57.85
+18.86 , 26047.02 , 61.61
+18.86 , 27579.20 , 65.39
+18.86 , 29111.38 , 69.19
+18.86 , 30643.56 , 73.01
+37.72 , -35338.92 , -120.57
+37.72 , -33571.97 , -114.73
+37.72 , -31805.03 , -108.87
+37.72 , -30038.08 , -102.99
+37.72 , -28271.13 , -97.08
+37.72 , -26504.19 , -91.15
+37.72 , -24737.24 , -85.20
+37.72 , -22970.30 , -79.23
+37.72 , -21203.35 , -73.23
+37.72 , -19436.40 , -67.21
+37.72 , -17669.46 , -61.17
+37.72 , -15902.51 , -55.10
+37.72 , -14135.57 , -49.01
+37.72 , -12368.62 , -42.90
+37.72 , -10601.68 , -36.77
+37.72 , -8834.73 , -30.61
+37.72 , -7067.78 , -24.43
+37.72 , -5300.84 , -18.23
+37.72 , -3533.89 , -12.01
+37.72 , -1766.95 , -5.76
+37.72 , -353.39 , -0.66
+37.72 , 306.44 , 1.84
+37.72 , 1532.18 , 7.35
+37.72 , 3064.36 , 14.22
+37.72 , 4596.53 , 21.11
+37.72 , 6128.71 , 28.02
+37.72 , 7660.89 , 34.96
+37.72 , 9193.07 , 41.92
+37.72 , 10725.24 , 48.90
+37.72 , 12257.42 , 55.90
+37.72 , 13789.60 , 62.93
+37.72 , 15321.78 , 69.98
+37.72 , 16853.96 , 77.05
+37.72 , 18386.13 , 84.15
+37.72 , 19918.31 , 91.27
+37.72 , 21450.49 , 98.41
+37.72 , 22982.67 , 105.58
+37.72 , 24514.85 , 112.76
+37.72 , 26047.02 , 119.97
+37.72 , 27579.20 , 127.21
+37.72 , 29111.38 , 134.46
+37.72 , 30643.56 , 141.74
+56.59 , -35338.92 , -182.44
+56.59 , -33571.97 , -173.55
+56.59 , -31805.03 , -164.62
+56.59 , -30038.08 , -155.67
+56.59 , -28271.13 , -146.69
+56.59 , -26504.19 , -137.68
+56.59 , -24737.24 , -128.65
+56.59 , -22970.30 , -119.58
+56.59 , -21203.35 , -110.49
+56.59 , -19436.40 , -101.36
+56.59 , -17669.46 , -92.21
+56.59 , -15902.51 , -83.03
+56.59 , -14135.57 , -73.82
+56.59 , -12368.62 , -64.58
+56.59 , -10601.68 , -55.31
+56.59 , -8834.73 , -46.02
+56.59 , -7067.78 , -36.70
+56.59 , -5300.84 , -27.34
+56.59 , -3533.89 , -17.96
+56.59 , -1766.95 , -8.54
+56.59 , -353.39 , -0.79
+56.59 , 306.44 , 2.86
+56.59 , 1532.18 , 11.12
+56.59 , 3064.36 , 21.39
+56.59 , 4596.53 , 31.68
+56.59 , 6128.71 , 41.99
+56.59 , 7660.89 , 52.34
+56.59 , 9193.07 , 62.71
+56.59 , 10725.24 , 73.12
+56.59 , 12257.42 , 83.55
+56.59 , 13789.60 , 94.01
+56.59 , 15321.78 , 104.50
+56.59 , 16853.96 , 115.02
+56.59 , 18386.13 , 125.57
+56.59 , 19918.31 , 136.15
+56.59 , 21450.49 , 146.76
+56.59 , 22982.67 , 157.40
+56.59 , 24514.85 , 168.06
+56.59 , 26047.02 , 178.76
+56.59 , 27579.20 , 189.48
+56.59 , 29111.38 , 200.23
+56.59 , 30643.56 , 211.02
+75.45 , -35338.92 , -243.71
+75.45 , -33571.97 , -231.81
+75.45 , -31805.03 , -219.87
+75.45 , -30038.08 , -207.89
+75.45 , -28271.13 , -195.88
+75.45 , -26504.19 , -183.83
+75.45 , -24737.24 , -171.74
+75.45 , -22970.30 , -159.61
+75.45 , -21203.35 , -147.45
+75.45 , -19436.40 , -135.25
+75.45 , -17669.46 , -123.01
+75.45 , -15902.51 , -110.74
+75.45 , -14135.57 , -98.43
+75.45 , -12368.62 , -86.08
+75.45 , -10601.68 , -73.70
+75.45 , -8834.73 , -61.27
+75.45 , -7067.78 , -48.82
+75.45 , -5300.84 , -36.32
+75.45 , -3533.89 , -23.78
+75.45 , -1766.95 , -11.19
+75.45 , -353.39 , -0.63
+75.45 , 306.44 , 3.98
+75.45 , 1532.18 , 15.01
+75.45 , 3064.36 , 28.68
+75.45 , 4596.53 , 42.37
+75.45 , 6128.71 , 56.10
+75.45 , 7660.89 , 69.87
+75.45 , 9193.07 , 83.67
+75.45 , 10725.24 , 97.52
+75.45 , 12257.42 , 111.40
+75.45 , 13789.60 , 125.31
+75.45 , 15321.78 , 139.27
+75.45 , 16853.96 , 153.26
+75.45 , 18386.13 , 167.29
+75.45 , 19918.31 , 181.36
+75.45 , 21450.49 , 195.46
+75.45 , 22982.67 , 209.61
+75.45 , 24514.85 , 223.79
+75.45 , 26047.02 , 238.01
+75.45 , 27579.20 , 252.26
+75.45 , 29111.38 , 266.56
+75.45 , 30643.56 , 280.89
+94.31 , -35338.92 , -304.37
+94.31 , -33571.97 , -289.50
+94.31 , -31805.03 , -274.59
+94.31 , -30038.08 , -259.63
+94.31 , -28271.13 , -244.61
+94.31 , -26504.19 , -229.56
+94.31 , -24737.24 , -214.45
+94.31 , -22970.30 , -199.30
+94.31 , -21203.35 , -184.10
+94.31 , -19436.40 , -168.85
+94.31 , -17669.46 , -153.55
+94.31 , -15902.51 , -138.20
+94.31 , -14135.57 , -122.81
+94.31 , -12368.62 , -107.37
+94.31 , -10601.68 , -91.88
+94.31 , -8834.73 , -76.35
+94.31 , -7067.78 , -60.76
+94.31 , -5300.84 , -45.13
+94.31 , -3533.89 , -29.44
+94.31 , -1766.95 , -13.67
+94.31 , -353.39 , 0.00
+94.31 , 306.44 , 5.21
+94.31 , 1532.18 , 19.04
+94.31 , 3064.36 , 36.13
+94.31 , 4596.53 , 53.24
+94.31 , 6128.71 , 70.39
+94.31 , 7660.89 , 87.59
+94.31 , 9193.07 , 104.83
+94.31 , 10725.24 , 122.13
+94.31 , 12257.42 , 139.47
+94.31 , 13789.60 , 156.87
+94.31 , 15321.78 , 174.31
+94.31 , 16853.96 , 191.80
+94.31 , 18386.13 , 209.33
+94.31 , 19918.31 , 226.92
+94.31 , 21450.49 , 244.56
+94.31 , 22982.67 , 262.24
+94.31 , 24514.85 , 279.97
+94.31 , 26047.02 , 297.76
+94.31 , 27579.20 , 315.58
+94.31 , 29111.38 , 333.46
+94.31 , 30643.56 , 351.39
+113.17 , -35338.92 , -364.37
+113.17 , -33571.97 , -346.59
+113.17 , -31805.03 , -328.74
+113.17 , -30038.08 , -310.84
+113.17 , -28271.13 , -292.87
+113.17 , -26504.19 , -274.84
+113.17 , -24737.24 , -256.75
+113.17 , -22970.30 , -238.60
+113.17 , -21203.35 , -220.39
+113.17 , -19436.40 , -202.12
+113.17 , -17669.46 , -183.79
+113.17 , -15902.51 , -165.40
+113.17 , -14135.57 , -146.94
+113.17 , -12368.62 , -128.43
+113.17 , -10601.68 , -109.85
+113.17 , -8834.73 , -91.21
+113.17 , -7067.78 , -72.51
+113.17 , -5300.84 , -53.75
+113.17 , -3533.89 , -34.91
+113.17 , -1766.95 , -15.95
+113.17 , -353.39 , 0.00
+113.17 , 306.44 , 6.58
+113.17 , 1532.18 , 23.25
+113.17 , 3064.36 , 43.76
+113.17 , 4596.53 , 64.29
+113.17 , 6128.71 , 84.87
+113.17 , 7660.89 , 105.52
+113.17 , 9193.07 , 126.22
+113.17 , 10725.24 , 146.98
+113.17 , 12257.42 , 167.81
+113.17 , 13789.60 , 188.70
+113.17 , 15321.78 , 209.65
+113.17 , 16853.96 , 230.66
+113.17 , 18386.13 , 251.73
+113.17 , 19918.31 , 272.87
+113.17 , 21450.49 , 294.07
+113.17 , 22982.67 , 315.33
+113.17 , 24514.85 , 336.65
+113.17 , 26047.02 , 358.03
+113.17 , 27579.20 , 379.47
+113.17 , 29111.38 , 400.98
+113.17 , 30643.56 , 422.54
+132.03 , -35338.92 , -423.69
+132.03 , -33571.97 , -403.04
+132.03 , -31805.03 , -382.31
+132.03 , -30038.08 , -361.50
+132.03 , -28271.13 , -340.62
+132.03 , -26504.19 , -319.66
+132.03 , -24737.24 , -298.62
+132.03 , -22970.30 , -277.51
+132.03 , -21203.35 , -256.31
+132.03 , -19436.40 , -235.05
+132.03 , -17669.46 , -213.70
+132.03 , -15902.51 , -192.28
+132.03 , -14135.57 , -170.79
+132.03 , -12368.62 , -149.21
+132.03 , -10601.68 , -127.57
+132.03 , -8834.73 , -105.84
+132.03 , -7067.78 , -84.03
+132.03 , -5300.84 , -62.14
+132.03 , -3533.89 , -40.16
+132.03 , -1766.95 , -18.00
+132.03 , -353.39 , 0.00
+132.03 , 306.44 , 8.09
+132.03 , 1532.18 , 27.64
+132.03 , 3064.36 , 51.59
+132.03 , 4596.53 , 75.56
+132.03 , 6128.71 , 99.58
+132.03 , 7660.89 , 123.68
+132.03 , 9193.07 , 147.86
+132.03 , 10725.24 , 172.10
+132.03 , 12257.42 , 196.43
+132.03 , 13789.60 , 220.84
+132.03 , 15321.78 , 245.32
+132.03 , 16853.96 , 269.88
+132.03 , 18386.13 , 294.51
+132.03 , 19918.31 , 319.23
+132.03 , 21450.49 , 344.02
+132.03 , 22982.67 , 368.89
+132.03 , 24514.85 , 393.83
+132.03 , 26047.02 , 418.85
+132.03 , 27579.20 , 443.95
+132.03 , 29111.38 , 469.13
+132.03 , 30643.56 , 494.38
+150.90 , -35338.92 , -482.31
+150.90 , -33571.97 , -458.83
+150.90 , -31805.03 , -435.26
+150.90 , -30038.08 , -411.59
+150.90 , -28271.13 , -387.83
+150.90 , -26504.19 , -363.97
+150.90 , -24737.24 , -340.02
+150.90 , -22970.30 , -315.97
+150.90 , -21203.35 , -291.83
+150.90 , -19436.40 , -267.59
+150.90 , -17669.46 , -243.26
+150.90 , -15902.51 , -218.84
+150.90 , -14135.57 , -194.32
+150.90 , -12368.62 , -169.71
+150.90 , -10601.68 , -145.00
+150.90 , -8834.73 , -120.19
+150.90 , -7067.78 , -95.29
+150.90 , -5300.84 , -70.28
+150.90 , -3533.89 , -45.14
+150.90 , -1766.95 , -19.76
+150.90 , -353.39 , 0.00
+150.90 , 306.44 , 9.76
+150.90 , 1532.18 , 32.25
+150.90 , 3064.36 , 59.66
+150.90 , 4596.53 , 87.07
+150.90 , 6128.71 , 114.55
+150.90 , 7660.89 , 142.11
+150.90 , 9193.07 , 169.77
+150.90 , 10725.24 , 197.52
+150.90 , 12257.42 , 225.37
+150.90 , 13789.60 , 253.31
+150.90 , 15321.78 , 281.34
+150.90 , 16853.96 , 309.47
+150.90 , 18386.13 , 337.70
+150.90 , 19918.31 , 366.02
+150.90 , 21450.49 , 394.44
+150.90 , 22982.67 , 422.95
+150.90 , 24514.85 , 451.56
+150.90 , 26047.02 , 480.26
+150.90 , 27579.20 , 509.05
+150.90 , 29111.38 , 537.94
+150.90 , 30643.56 , 566.93
+169.76 , -35338.92 , -540.17
+169.76 , -33571.97 , -513.92
+169.76 , -31805.03 , -487.55
+169.76 , -30038.08 , -461.06
+169.76 , -28271.13 , -434.46
+169.76 , -26504.19 , -407.75
+169.76 , -24737.24 , -380.92
+169.76 , -22970.30 , -353.97
+169.76 , -21203.35 , -326.91
+169.76 , -19436.40 , -299.73
+169.76 , -17669.46 , -272.44
+169.76 , -15902.51 , -245.03
+169.76 , -14135.57 , -217.51
+169.76 , -12368.62 , -189.87
+169.76 , -10601.68 , -162.12
+169.76 , -8834.73 , -134.25
+169.76 , -7067.78 , -106.26
+169.76 , -5300.84 , -78.13
+169.76 , -3533.89 , -49.84
+169.76 , -1766.95 , -21.19
+169.76 , -353.39 , 0.00
+169.76 , 306.44 , 11.59
+169.76 , 1532.18 , 37.10
+169.76 , 3064.36 , 67.98
+169.76 , 4596.53 , 98.85
+169.76 , 6128.71 , 129.79
+169.76 , 7660.89 , 160.84
+169.76 , 9193.07 , 191.99
+169.76 , 10725.24 , 223.26
+169.76 , 12257.42 , 254.64
+169.76 , 13789.60 , 286.14
+169.76 , 15321.78 , 317.75
+169.76 , 16853.96 , 349.48
+169.76 , 18386.13 , 381.32
+169.76 , 19918.31 , 413.28
+169.76 , 21450.49 , 445.36
+169.76 , 22982.67 , 477.54
+169.76 , 24514.85 , 509.85
+169.76 , 26047.02 , 542.27
+169.76 , 27579.20 , 574.80
+169.76 , 29111.38 , 607.45
+169.76 , 30643.56 , 640.21
+188.62 , -35338.92 , -597.26
+188.62 , -33571.97 , -568.28
+188.62 , -31805.03 , -539.16
+188.62 , -30038.08 , -509.90
+188.62 , -28271.13 , -480.50
+188.62 , -26504.19 , -450.96
+188.62 , -24737.24 , -421.28
+188.62 , -22970.30 , -391.47
+188.62 , -21203.35 , -361.52
+188.62 , -19436.40 , -331.43
+188.62 , -17669.46 , -301.20
+188.62 , -15902.51 , -270.83
+188.62 , -14135.57 , -240.33
+188.62 , -12368.62 , -209.68
+188.62 , -10601.68 , -178.90
+188.62 , -8834.73 , -147.97
+188.62 , -7067.78 , -116.90
+188.62 , -5300.84 , -85.66
+188.62 , -3533.89 , -54.21
+188.62 , -1766.95 , -22.23
+188.62 , -353.39 , 0.00
+188.62 , 306.44 , 13.60
+188.62 , 1532.18 , 42.20
+188.62 , 3064.36 , 76.58
+188.62 , 4596.53 , 110.92
+188.62 , 6128.71 , 145.34
+188.62 , 7660.89 , 179.88
+188.62 , 9193.07 , 214.55
+188.62 , 10725.24 , 249.35
+188.62 , 12257.42 , 284.29
+188.62 , 13789.60 , 319.36
+188.62 , 15321.78 , 354.57
+188.62 , 16853.96 , 389.92
+188.62 , 18386.13 , 425.41
+188.62 , 19918.31 , 461.03
+188.62 , 21450.49 , 496.79
+188.62 , 22982.67 , 532.69
+188.62 , 24514.85 , 568.73
+188.62 , 26047.02 , 604.90
+188.62 , 27579.20 , 641.21
+188.62 , 29111.38 , 677.66
+188.62 , 30643.56 , 714.24
+207.48 , -35338.92 , -653.54
+207.48 , -33571.97 , -621.88
+207.48 , -31805.03 , -590.05
+207.48 , -30038.08 , -558.06
+207.48 , -28271.13 , -525.90
+207.48 , -26504.19 , -493.58
+207.48 , -24737.24 , -461.09
+207.48 , -22970.30 , -428.44
+207.48 , -21203.35 , -395.63
+207.48 , -19436.40 , -362.65
+207.48 , -17669.46 , -329.51
+207.48 , -15902.51 , -296.21
+207.48 , -14135.57 , -262.74
+207.48 , -12368.62 , -229.11
+207.48 , -10601.68 , -195.31
+207.48 , -8834.73 , -161.34
+207.48 , -7067.78 , -127.18
+207.48 , -5300.84 , -92.83
+207.48 , -3533.89 , -58.20
+207.48 , -1766.95 , -22.82
+207.48 , -353.39 , 0.00
+207.48 , 306.44 , 15.79
+207.48 , 1532.18 , 47.58
+207.48 , 3064.36 , 85.48
+207.48 , 4596.53 , 123.30
+207.48 , 6128.71 , 161.22
+207.48 , 7660.89 , 199.26
+207.48 , 9193.07 , 237.46
+207.48 , 10725.24 , 275.81
+207.48 , 12257.42 , 314.32
+207.48 , 13789.60 , 352.99
+207.48 , 15321.78 , 391.83
+207.48 , 16853.96 , 430.82
+207.48 , 18386.13 , 469.98
+207.48 , 19918.31 , 509.30
+207.48 , 21450.49 , 548.78
+207.48 , 22982.67 , 588.42
+207.48 , 24514.85 , 628.23
+207.48 , 26047.02 , 668.20
+207.48 , 27579.20 , 708.32
+207.48 , 29111.38 , 748.61
+207.48 , 30643.56 , 789.06
+226.34 , -35338.92 , -708.97
+226.34 , -33571.97 , -674.68
+226.34 , -31805.03 , -640.19
+226.34 , -30038.08 , -605.51
+226.34 , -28271.13 , -570.63
+226.34 , -26504.19 , -535.56
+226.34 , -24737.24 , -500.30
+226.34 , -22970.30 , -464.85
+226.34 , -21203.35 , -429.21
+226.34 , -19436.40 , -393.37
+226.34 , -17669.46 , -357.35
+226.34 , -15902.51 , -321.13
+226.34 , -14135.57 , -284.71
+226.34 , -12368.62 , -248.11
+226.34 , -10601.68 , -211.31
+226.34 , -8834.73 , -174.30
+226.34 , -7067.78 , -137.08
+226.34 , -5300.84 , -99.61
+226.34 , -3533.89 , -61.78
+226.34 , -1766.95 , -22.86
+226.34 , -353.39 , 0.00
+226.34 , 306.44 , 18.17
+226.34 , 1532.18 , 53.24
+226.34 , 3064.36 , 94.71
+226.34 , 4596.53 , 136.03
+226.34 , 6128.71 , 177.45
+226.34 , 7660.89 , 219.01
+226.34 , 9193.07 , 260.75
+226.34 , 10725.24 , 302.67
+226.34 , 12257.42 , 344.78
+226.34 , 13789.60 , 387.07
+226.34 , 15321.78 , 429.54
+226.34 , 16853.96 , 472.21
+226.34 , 18386.13 , 515.06
+226.34 , 19918.31 , 558.11
+226.34 , 21450.49 , 601.34
+226.34 , 22982.67 , 644.76
+226.34 , 24514.85 , 688.37
+226.34 , 26047.02 , 732.17
+226.34 , 27579.20 , 776.15
+226.34 , 29111.38 , 820.33
+226.34 , 30643.56 , 864.69
+245.21 , -35338.92 , -763.53
+245.21 , -33571.97 , -726.65
+245.21 , -31805.03 , -689.55
+245.21 , -30038.08 , -652.22
+245.21 , -28271.13 , -614.67
+245.21 , -26504.19 , -576.89
+245.21 , -24737.24 , -538.89
+245.21 , -22970.30 , -500.67
+245.21 , -21203.35 , -462.22
+245.21 , -19436.40 , -423.56
+245.21 , -17669.46 , -384.67
+245.21 , -15902.51 , -345.56
+245.21 , -14135.57 , -306.22
+245.21 , -12368.62 , -266.66
+245.21 , -10601.68 , -226.86
+245.21 , -8834.73 , -186.83
+245.21 , -7067.78 , -146.54
+245.21 , -5300.84 , -105.95
+245.21 , -3533.89 , -64.90
+245.21 , -1766.95 , -22.24
+245.21 , -353.39 , 0.00
+245.21 , 306.44 , 20.74
+245.21 , 1532.18 , 59.20
+245.21 , 3064.36 , 104.27
+245.21 , 4596.53 , 149.12
+245.21 , 6128.71 , 194.05
+245.21 , 7660.89 , 239.16
+245.21 , 9193.07 , 284.45
+245.21 , 10725.24 , 329.96
+245.21 , 12257.42 , 375.67
+245.21 , 13789.60 , 421.60
+245.21 , 15321.78 , 467.75
+245.21 , 16853.96 , 514.11
+245.21 , 18386.13 , 560.69
+245.21 , 19918.31 , 607.48
+245.21 , 21450.49 , 654.50
+245.21 , 22982.67 , 701.73
+245.21 , 24514.85 , 749.18
+245.21 , 26047.02 , 796.84
+245.21 , 27579.20 , 844.73
+245.21 , 29111.38 , 892.83
+245.21 , 30643.56 , 941.14
+264.07 , -35338.92 , -817.17
+264.07 , -33571.97 , -777.76
+264.07 , -31805.03 , -738.08
+264.07 , -30038.08 , -698.15
+264.07 , -28271.13 , -657.96
+264.07 , -26504.19 , -617.52
+264.07 , -24737.24 , -576.82
+264.07 , -22970.30 , -535.86
+264.07 , -21203.35 , -494.65
+264.07 , -19436.40 , -453.18
+264.07 , -17669.46 , -411.45
+264.07 , -15902.51 , -369.47
+264.07 , -14135.57 , -327.22
+264.07 , -12368.62 , -284.72
+264.07 , -10601.68 , -241.95
+264.07 , -8834.73 , -198.90
+264.07 , -7067.78 , -155.54
+264.07 , -5300.84 , -111.82
+264.07 , -3533.89 , -67.51
+264.07 , -1766.95 , -20.80
+264.07 , -353.39 , 0.00
+264.07 , 306.44 , 23.52
+264.07 , 1532.18 , 65.48
+264.07 , 3064.36 , 114.20
+264.07 , 4596.53 , 162.59
+264.07 , 6128.71 , 211.06
+264.07 , 7660.89 , 259.72
+264.07 , 9193.07 , 308.59
+264.07 , 10725.24 , 357.69
+264.07 , 12257.42 , 407.04
+264.07 , 13789.60 , 456.62
+264.07 , 15321.78 , 506.46
+264.07 , 16853.96 , 556.54
+264.07 , 18386.13 , 606.87
+264.07 , 19918.31 , 657.45
+264.07 , 21450.49 , 708.28
+264.07 , 22982.67 , 759.35
+264.07 , 24514.85 , 810.68
+264.07 , 26047.02 , 862.25
+264.07 , 27579.20 , 914.07
+264.07 , 29111.38 , 966.13
+264.07 , 30643.56 , 1018.44
+282.93 , -35338.92 , -869.86
+282.93 , -33571.97 , -827.96
+282.93 , -31805.03 , -785.77
+282.93 , -30038.08 , -743.28
+282.93 , -28271.13 , -700.50
+282.93 , -26504.19 , -657.42
+282.93 , -24737.24 , -614.05
+282.93 , -22970.30 , -570.39
+282.93 , -21203.35 , -526.44
+282.93 , -19436.40 , -482.19
+282.93 , -17669.46 , -437.65
+282.93 , -15902.51 , -392.82
+282.93 , -14135.57 , -347.69
+282.93 , -12368.62 , -302.26
+282.93 , -10601.68 , -256.52
+282.93 , -8834.73 , -210.46
+282.93 , -7067.78 , -164.04
+282.93 , -5300.84 , -117.17
+282.93 , -3533.89 , -69.54
+282.93 , -1766.95 , -18.27
+282.93 , -353.39 , 0.00
+282.93 , 306.44 , 26.49
+282.93 , 1532.18 , 72.10
+282.93 , 3064.36 , 124.50
+282.93 , 4596.53 , 176.46
+282.93 , 6128.71 , 228.49
+282.93 , 7660.89 , 280.71
+282.93 , 9193.07 , 333.18
+282.93 , 10725.24 , 385.90
+282.93 , 12257.42 , 438.89
+282.93 , 13789.60 , 492.16
+282.93 , 15321.78 , 545.71
+282.93 , 16853.96 , 599.54
+282.93 , 18386.13 , 653.64
+282.93 , 19918.31 , 708.03
+282.93 , 21450.49 , 762.71
+282.93 , 22982.67 , 817.66
+282.93 , 24514.85 , 872.89
+282.93 , 26047.02 , 928.41
+282.93 , 27579.20 , 984.20
+282.93 , 29111.38 , 1040.27
+282.93 , 30643.56 , 1096.63
+301.79 , -35338.92 , -921.56
+301.79 , -33571.97 , -877.23
+301.79 , -31805.03 , -832.56
+301.79 , -30038.08 , -787.56
+301.79 , -28271.13 , -742.22
+301.79 , -26504.19 , -696.56
+301.79 , -24737.24 , -650.56
+301.79 , -22970.30 , -604.23
+301.79 , -21203.35 , -557.56
+301.79 , -19436.40 , -510.57
+301.79 , -17669.46 , -463.24
+301.79 , -15902.51 , -415.58
+301.79 , -14135.57 , -367.58
+301.79 , -12368.62 , -319.24
+301.79 , -10601.68 , -270.55
+301.79 , -8834.73 , -221.48
+301.79 , -7067.78 , -171.99
+301.79 , -5300.84 , -121.95
+301.79 , -3533.89 , -70.93
+301.79 , -1766.95 , -14.10
+301.79 , -353.39 , 0.00
+301.79 , 306.44 , 29.68
+301.79 , 1532.18 , 79.05
+301.79 , 3064.36 , 135.20
+301.79 , 4596.53 , 190.76
+301.79 , 6128.71 , 246.36
+301.79 , 7660.89 , 302.17
+301.79 , 9193.07 , 358.24
+301.79 , 10725.24 , 414.60
+301.79 , 12257.42 , 471.27
+301.79 , 13789.60 , 528.24
+301.79 , 15321.78 , 585.52
+301.79 , 16853.96 , 643.12
+301.79 , 18386.13 , 701.03
+301.79 , 19918.31 , 759.26
+301.79 , 21450.49 , 817.80
+301.79 , 22982.67 , 876.66
+301.79 , 24514.85 , 935.84
+301.79 , 26047.02 , 995.34
+301.79 , 27579.20 , 1055.15
+301.79 , 29111.38 , 1115.27
+301.79 , 30643.56 , 1175.71
+320.65 , -35338.92 , -972.24
+320.65 , -33571.97 , -925.52
+320.65 , -31805.03 , -878.43
+320.65 , -30038.08 , -830.96
+320.65 , -28271.13 , -783.11
+320.65 , -26504.19 , -734.89
+320.65 , -24737.24 , -686.30
+320.65 , -22970.30 , -637.33
+320.65 , -21203.35 , -587.99
+320.65 , -19436.40 , -538.28
+320.65 , -17669.46 , -488.19
+320.65 , -15902.51 , -437.72
+320.65 , -14135.57 , -386.87
+320.65 , -12368.62 , -335.63
+320.65 , -10601.68 , -283.99
+320.65 , -8834.73 , -231.92
+320.65 , -7067.78 , -179.35
+320.65 , -5300.84 , -126.12
+320.65 , -3533.89 , -71.60
+320.65 , -1766.95 , -6.45
+320.65 , -353.39 , 0.00
+320.65 , 306.44 , 33.08
+320.65 , 1532.18 , 86.37
+320.65 , 3064.36 , 146.31
+320.65 , 4596.53 , 205.50
+320.65 , 6128.71 , 264.70
+320.65 , 7660.89 , 324.11
+320.65 , 9193.07 , 383.81
+320.65 , 10725.24 , 443.83
+320.65 , 12257.42 , 504.18
+320.65 , 13789.60 , 564.87
+320.65 , 15321.78 , 625.91
+320.65 , 16853.96 , 687.30
+320.65 , 18386.13 , 749.05
+320.65 , 19918.31 , 811.14
+320.65 , 21450.49 , 873.59
+320.65 , 22982.67 , 936.40
+320.65 , 24514.85 , 999.56
+320.65 , 26047.02 , 1063.07
+320.65 , 27579.20 , 1126.93
+320.65 , 29111.38 , 1191.14
+320.65 , 30643.56 , 1255.71
+339.52 , -35338.92 , -1021.86
+339.52 , -33571.97 , -972.81
+339.52 , -31805.03 , -923.33
+339.52 , -30038.08 , -873.44
+339.52 , -28271.13 , -823.13
+339.52 , -26504.19 , -772.39
+339.52 , -24737.24 , -721.24
+339.52 , -22970.30 , -669.67
+339.52 , -21203.35 , -617.68
+339.52 , -19436.40 , -565.27
+339.52 , -17669.46 , -512.45
+339.52 , -15902.51 , -459.19
+339.52 , -14135.57 , -405.51
+339.52 , -12368.62 , -351.39
+339.52 , -10601.68 , -296.81
+339.52 , -8834.73 , -241.73
+339.52 , -7067.78 , -186.07
+339.52 , -5300.84 , -129.61
+339.52 , -3533.89 , -71.46
+339.52 , -1766.95 , 0.00
+339.52 , -353.39 , 0.00
+339.52 , 306.44 , 36.70
+339.52 , 1532.18 , 94.04
+339.52 , 3064.36 , 157.85
+339.52 , 4596.53 , 220.70
+339.52 , 6128.71 , 283.52
+339.52 , 7660.89 , 346.56
+339.52 , 9193.07 , 409.90
+339.52 , 10725.24 , 473.59
+339.52 , 12257.42 , 537.65
+339.52 , 13789.60 , 602.09
+339.52 , 15321.78 , 666.91
+339.52 , 16853.96 , 732.12
+339.52 , 18386.13 , 797.72
+339.52 , 19918.31 , 863.72
+339.52 , 21450.49 , 930.10
+339.52 , 22982.67 , 996.88
+339.52 , 24514.85 , 1064.05
+339.52 , 26047.02 , 1131.62
+339.52 , 27579.20 , 1199.57
+339.52 , 29111.38 , 1267.92
+339.52 , 30643.56 , 1336.65
+358.38 , -35338.92 , -1070.37
+358.38 , -33571.97 , -1019.04
+358.38 , -31805.03 , -967.24
+358.38 , -30038.08 , -914.96
+358.38 , -28271.13 , -862.23
+358.38 , -26504.19 , -809.02
+358.38 , -24737.24 , -755.35
+358.38 , -22970.30 , -701.21
+358.38 , -21203.35 , -646.60
+358.38 , -19436.40 , -591.53
+358.38 , -17669.46 , -535.99
+358.38 , -15902.51 , -479.97
+358.38 , -14135.57 , -423.47
+358.38 , -12368.62 , -366.48
+358.38 , -10601.68 , -308.96
+358.38 , -8834.73 , -250.88
+358.38 , -7067.78 , -192.11
+358.38 , -5300.84 , -132.36
+358.38 , -3533.89 , -70.38
+358.38 , -1766.95 , 0.00
+358.38 , -353.39 , 0.00
+358.38 , 306.44 , 40.53
+358.38 , 1532.18 , 102.10
+358.38 , 3064.36 , 169.83
+358.38 , 4596.53 , 236.37
+358.38 , 6128.71 , 302.84
+358.38 , 7660.89 , 369.53
+358.38 , 9193.07 , 436.54
+358.38 , 10725.24 , 503.92
+358.38 , 12257.42 , 571.71
+358.38 , 13789.60 , 639.91
+358.38 , 15321.78 , 708.54
+358.38 , 16853.96 , 777.59
+358.38 , 18386.13 , 847.08
+358.38 , 19918.31 , 917.00
+358.38 , 21450.49 , 987.35
+358.38 , 22982.67 , 1058.14
+358.38 , 24514.85 , 1129.36
+358.38 , 26047.02 , 1201.01
+358.38 , 27579.20 , 1273.09
+358.38 , 29111.38 , 1345.61
+358.38 , 30643.56 , 1418.56
+377.24 , -35338.92 , -1117.74
+377.24 , -33571.97 , -1064.18
+377.24 , -31805.03 , -1010.10
+377.24 , -30038.08 , -955.49
+377.24 , -28271.13 , -900.37
+377.24 , -26504.19 , -844.73
+377.24 , -24737.24 , -788.58
+377.24 , -22970.30 , -731.90
+377.24 , -21203.35 , -674.71
+377.24 , -19436.40 , -617.00
+377.24 , -17669.46 , -558.77
+377.24 , -15902.51 , -500.01
+377.24 , -14135.57 , -440.71
+377.24 , -12368.62 , -380.85
+377.24 , -10601.68 , -320.40
+377.24 , -8834.73 , -259.31
+377.24 , -7067.78 , -197.41
+377.24 , -5300.84 , -134.30
+377.24 , -3533.89 , -68.24
+377.24 , -1766.95 , 0.00
+377.24 , -353.39 , 0.00
+377.24 , 306.44 , 44.59
+377.24 , 1532.18 , 110.53
+377.24 , 3064.36 , 182.27
+377.24 , 4596.53 , 252.55
+377.24 , 6128.71 , 322.69
+377.24 , 7660.89 , 393.04
+377.24 , 9193.07 , 463.74
+377.24 , 10725.24 , 534.84
+377.24 , 12257.42 , 606.37
+377.24 , 13789.60 , 678.37
+377.24 , 15321.78 , 750.82
+377.24 , 16853.96 , 823.74
+377.24 , 18386.13 , 897.14
+377.24 , 19918.31 , 971.01
+377.24 , 21450.49 , 1045.36
+377.24 , 22982.67 , 1120.19
+377.24 , 24514.85 , 1195.49
+377.24 , 26047.02 , 1271.27
+377.24 , 27579.20 , 1347.52
+377.24 , 29111.38 , 1424.25
+377.24 , 30643.56 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_2.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_3.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..07feb55aeb84a3946955f362d5131493fe83d565
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -11414.26 , 0.00
+0.00 , -10843.55 , 0.00
+0.00 , -10272.84 , 0.00
+0.00 , -9702.12 , 0.00
+0.00 , -9131.41 , 0.00
+0.00 , -8560.70 , 0.00
+0.00 , -7989.99 , -0.13
+0.00 , -7419.27 , -0.66
+0.00 , -6848.56 , -0.98
+0.00 , -6277.85 , -1.19
+0.00 , -5707.13 , -1.32
+0.00 , -5136.42 , -1.38
+0.00 , -4565.71 , -1.39
+0.00 , -3994.99 , -1.35
+0.00 , -3424.28 , -1.26
+0.00 , -2853.57 , -1.13
+0.00 , -2282.85 , -0.97
+0.00 , -1712.14 , -0.77
+0.00 , -1141.43 , -0.53
+0.00 , -570.71 , -0.27
+0.00 , -114.14 , -0.02
+0.00 , 103.14 , 0.13
+0.00 , 515.72 , 0.56
+0.00 , 1031.44 , 1.12
+0.00 , 1547.16 , 1.70
+0.00 , 2062.88 , 2.31
+0.00 , 2578.60 , 2.93
+0.00 , 3094.32 , 3.58
+0.00 , 3610.04 , 4.25
+0.00 , 4125.76 , 4.93
+0.00 , 4641.48 , 5.64
+0.00 , 5157.20 , 6.37
+0.00 , 5672.91 , 7.12
+0.00 , 6188.63 , 7.88
+0.00 , 6704.35 , 8.67
+0.00 , 7220.07 , 9.47
+0.00 , 7735.79 , 10.29
+0.00 , 8251.51 , 11.13
+0.00 , 8767.23 , 11.99
+0.00 , 9282.95 , 12.87
+0.00 , 9798.67 , 13.76
+0.00 , 10314.39 , 14.67
+5.72 , -11414.26 , 0.00
+5.72 , -10843.55 , 0.00
+5.72 , -10272.84 , 0.00
+5.72 , -9702.12 , 0.00
+5.72 , -9131.41 , 0.00
+5.72 , -8560.70 , 0.00
+5.72 , -7989.99 , -0.50
+5.72 , -7419.27 , -0.84
+5.72 , -6848.56 , -1.04
+5.72 , -6277.85 , -1.16
+5.72 , -5707.13 , -1.22
+5.72 , -5136.42 , -1.24
+5.72 , -4565.71 , -1.21
+5.72 , -3994.99 , -1.15
+5.72 , -3424.28 , -1.06
+5.72 , -2853.57 , -0.94
+5.72 , -2282.85 , -0.80
+5.72 , -1712.14 , -0.62
+5.72 , -1141.43 , -0.43
+5.72 , -570.71 , -0.21
+5.72 , -114.14 , -0.02
+5.72 , 103.14 , 0.10
+5.72 , 515.72 , 0.43
+5.72 , 1031.44 , 0.85
+5.72 , 1547.16 , 1.30
+5.72 , 2062.88 , 1.75
+5.72 , 2578.60 , 2.23
+5.72 , 3094.32 , 2.71
+5.72 , 3610.04 , 3.21
+5.72 , 4125.76 , 3.73
+5.72 , 4641.48 , 4.26
+5.72 , 5157.20 , 4.80
+5.72 , 5672.91 , 5.36
+5.72 , 6188.63 , 5.93
+5.72 , 6704.35 , 6.52
+5.72 , 7220.07 , 7.12
+5.72 , 7735.79 , 7.73
+5.72 , 8251.51 , 8.35
+5.72 , 8767.23 , 8.99
+5.72 , 9282.95 , 9.64
+5.72 , 9798.67 , 10.30
+5.72 , 10314.39 , 10.98
+57.21 , -11414.26 , -58.10
+57.21 , -10843.55 , -55.37
+57.21 , -10272.84 , -52.62
+57.21 , -9702.12 , -49.85
+57.21 , -9131.41 , -47.06
+57.21 , -8560.70 , -44.25
+57.21 , -7989.99 , -41.42
+57.21 , -7419.27 , -38.57
+57.21 , -6848.56 , -35.70
+57.21 , -6277.85 , -32.81
+57.21 , -5707.13 , -29.90
+57.21 , -5136.42 , -26.98
+57.21 , -4565.71 , -24.03
+57.21 , -3994.99 , -21.07
+57.21 , -3424.28 , -18.08
+57.21 , -2853.57 , -15.08
+57.21 , -2282.85 , -12.06
+57.21 , -1712.14 , -9.02
+57.21 , -1141.43 , -5.96
+57.21 , -570.71 , -2.88
+57.21 , -114.14 , -0.37
+57.21 , 103.14 , 0.90
+57.21 , 515.72 , 3.68
+57.21 , 1031.44 , 7.16
+57.21 , 1547.16 , 10.66
+57.21 , 2062.88 , 14.17
+57.21 , 2578.60 , 17.71
+57.21 , 3094.32 , 21.26
+57.21 , 3610.04 , 24.84
+57.21 , 4125.76 , 28.43
+57.21 , 4641.48 , 32.04
+57.21 , 5157.20 , 35.67
+57.21 , 5672.91 , 39.32
+57.21 , 6188.63 , 42.99
+57.21 , 6704.35 , 46.68
+57.21 , 7220.07 , 50.38
+57.21 , 7735.79 , 54.11
+57.21 , 8251.51 , 57.85
+57.21 , 8767.23 , 61.61
+57.21 , 9282.95 , 65.39
+57.21 , 9798.67 , 69.19
+57.21 , 10314.39 , 73.01
+114.41 , -11414.26 , -120.57
+114.41 , -10843.55 , -114.73
+114.41 , -10272.84 , -108.87
+114.41 , -9702.12 , -102.99
+114.41 , -9131.41 , -97.08
+114.41 , -8560.70 , -91.15
+114.41 , -7989.99 , -85.20
+114.41 , -7419.27 , -79.23
+114.41 , -6848.56 , -73.23
+114.41 , -6277.85 , -67.21
+114.41 , -5707.13 , -61.17
+114.41 , -5136.42 , -55.10
+114.41 , -4565.71 , -49.01
+114.41 , -3994.99 , -42.90
+114.41 , -3424.28 , -36.77
+114.41 , -2853.57 , -30.61
+114.41 , -2282.85 , -24.43
+114.41 , -1712.14 , -18.23
+114.41 , -1141.43 , -12.01
+114.41 , -570.71 , -5.76
+114.41 , -114.14 , -0.66
+114.41 , 103.14 , 1.84
+114.41 , 515.72 , 7.35
+114.41 , 1031.44 , 14.22
+114.41 , 1547.16 , 21.11
+114.41 , 2062.88 , 28.02
+114.41 , 2578.60 , 34.96
+114.41 , 3094.32 , 41.92
+114.41 , 3610.04 , 48.90
+114.41 , 4125.76 , 55.90
+114.41 , 4641.48 , 62.93
+114.41 , 5157.20 , 69.98
+114.41 , 5672.91 , 77.05
+114.41 , 6188.63 , 84.15
+114.41 , 6704.35 , 91.27
+114.41 , 7220.07 , 98.41
+114.41 , 7735.79 , 105.58
+114.41 , 8251.51 , 112.76
+114.41 , 8767.23 , 119.97
+114.41 , 9282.95 , 127.21
+114.41 , 9798.67 , 134.46
+114.41 , 10314.39 , 141.74
+171.62 , -11414.26 , -182.44
+171.62 , -10843.55 , -173.55
+171.62 , -10272.84 , -164.62
+171.62 , -9702.12 , -155.67
+171.62 , -9131.41 , -146.69
+171.62 , -8560.70 , -137.68
+171.62 , -7989.99 , -128.65
+171.62 , -7419.27 , -119.58
+171.62 , -6848.56 , -110.49
+171.62 , -6277.85 , -101.36
+171.62 , -5707.13 , -92.21
+171.62 , -5136.42 , -83.03
+171.62 , -4565.71 , -73.82
+171.62 , -3994.99 , -64.58
+171.62 , -3424.28 , -55.31
+171.62 , -2853.57 , -46.02
+171.62 , -2282.85 , -36.70
+171.62 , -1712.14 , -27.34
+171.62 , -1141.43 , -17.96
+171.62 , -570.71 , -8.54
+171.62 , -114.14 , -0.79
+171.62 , 103.14 , 2.86
+171.62 , 515.72 , 11.12
+171.62 , 1031.44 , 21.39
+171.62 , 1547.16 , 31.68
+171.62 , 2062.88 , 41.99
+171.62 , 2578.60 , 52.34
+171.62 , 3094.32 , 62.71
+171.62 , 3610.04 , 73.12
+171.62 , 4125.76 , 83.55
+171.62 , 4641.48 , 94.01
+171.62 , 5157.20 , 104.50
+171.62 , 5672.91 , 115.02
+171.62 , 6188.63 , 125.57
+171.62 , 6704.35 , 136.15
+171.62 , 7220.07 , 146.76
+171.62 , 7735.79 , 157.40
+171.62 , 8251.51 , 168.06
+171.62 , 8767.23 , 178.76
+171.62 , 9282.95 , 189.48
+171.62 , 9798.67 , 200.23
+171.62 , 10314.39 , 211.02
+228.82 , -11414.26 , -243.71
+228.82 , -10843.55 , -231.81
+228.82 , -10272.84 , -219.87
+228.82 , -9702.12 , -207.89
+228.82 , -9131.41 , -195.88
+228.82 , -8560.70 , -183.83
+228.82 , -7989.99 , -171.74
+228.82 , -7419.27 , -159.61
+228.82 , -6848.56 , -147.45
+228.82 , -6277.85 , -135.25
+228.82 , -5707.13 , -123.01
+228.82 , -5136.42 , -110.74
+228.82 , -4565.71 , -98.43
+228.82 , -3994.99 , -86.08
+228.82 , -3424.28 , -73.70
+228.82 , -2853.57 , -61.27
+228.82 , -2282.85 , -48.82
+228.82 , -1712.14 , -36.32
+228.82 , -1141.43 , -23.78
+228.82 , -570.71 , -11.19
+228.82 , -114.14 , -0.63
+228.82 , 103.14 , 3.98
+228.82 , 515.72 , 15.01
+228.82 , 1031.44 , 28.68
+228.82 , 1547.16 , 42.37
+228.82 , 2062.88 , 56.10
+228.82 , 2578.60 , 69.87
+228.82 , 3094.32 , 83.67
+228.82 , 3610.04 , 97.52
+228.82 , 4125.76 , 111.40
+228.82 , 4641.48 , 125.31
+228.82 , 5157.20 , 139.27
+228.82 , 5672.91 , 153.26
+228.82 , 6188.63 , 167.29
+228.82 , 6704.35 , 181.36
+228.82 , 7220.07 , 195.46
+228.82 , 7735.79 , 209.61
+228.82 , 8251.51 , 223.79
+228.82 , 8767.23 , 238.01
+228.82 , 9282.95 , 252.26
+228.82 , 9798.67 , 266.56
+228.82 , 10314.39 , 280.89
+286.03 , -11414.26 , -304.37
+286.03 , -10843.55 , -289.50
+286.03 , -10272.84 , -274.59
+286.03 , -9702.12 , -259.63
+286.03 , -9131.41 , -244.61
+286.03 , -8560.70 , -229.56
+286.03 , -7989.99 , -214.45
+286.03 , -7419.27 , -199.30
+286.03 , -6848.56 , -184.10
+286.03 , -6277.85 , -168.85
+286.03 , -5707.13 , -153.55
+286.03 , -5136.42 , -138.20
+286.03 , -4565.71 , -122.81
+286.03 , -3994.99 , -107.37
+286.03 , -3424.28 , -91.88
+286.03 , -2853.57 , -76.35
+286.03 , -2282.85 , -60.76
+286.03 , -1712.14 , -45.13
+286.03 , -1141.43 , -29.44
+286.03 , -570.71 , -13.67
+286.03 , -114.14 , 0.00
+286.03 , 103.14 , 5.21
+286.03 , 515.72 , 19.04
+286.03 , 1031.44 , 36.13
+286.03 , 1547.16 , 53.24
+286.03 , 2062.88 , 70.39
+286.03 , 2578.60 , 87.59
+286.03 , 3094.32 , 104.83
+286.03 , 3610.04 , 122.13
+286.03 , 4125.76 , 139.47
+286.03 , 4641.48 , 156.87
+286.03 , 5157.20 , 174.31
+286.03 , 5672.91 , 191.80
+286.03 , 6188.63 , 209.33
+286.03 , 6704.35 , 226.92
+286.03 , 7220.07 , 244.56
+286.03 , 7735.79 , 262.24
+286.03 , 8251.51 , 279.97
+286.03 , 8767.23 , 297.76
+286.03 , 9282.95 , 315.58
+286.03 , 9798.67 , 333.46
+286.03 , 10314.39 , 351.39
+343.23 , -11414.26 , -364.37
+343.23 , -10843.55 , -346.59
+343.23 , -10272.84 , -328.74
+343.23 , -9702.12 , -310.84
+343.23 , -9131.41 , -292.87
+343.23 , -8560.70 , -274.84
+343.23 , -7989.99 , -256.75
+343.23 , -7419.27 , -238.60
+343.23 , -6848.56 , -220.39
+343.23 , -6277.85 , -202.12
+343.23 , -5707.13 , -183.79
+343.23 , -5136.42 , -165.40
+343.23 , -4565.71 , -146.94
+343.23 , -3994.99 , -128.43
+343.23 , -3424.28 , -109.85
+343.23 , -2853.57 , -91.21
+343.23 , -2282.85 , -72.51
+343.23 , -1712.14 , -53.75
+343.23 , -1141.43 , -34.91
+343.23 , -570.71 , -15.95
+343.23 , -114.14 , 0.00
+343.23 , 103.14 , 6.58
+343.23 , 515.72 , 23.25
+343.23 , 1031.44 , 43.76
+343.23 , 1547.16 , 64.29
+343.23 , 2062.88 , 84.87
+343.23 , 2578.60 , 105.52
+343.23 , 3094.32 , 126.22
+343.23 , 3610.04 , 146.98
+343.23 , 4125.76 , 167.81
+343.23 , 4641.48 , 188.70
+343.23 , 5157.20 , 209.65
+343.23 , 5672.91 , 230.66
+343.23 , 6188.63 , 251.73
+343.23 , 6704.35 , 272.87
+343.23 , 7220.07 , 294.07
+343.23 , 7735.79 , 315.33
+343.23 , 8251.51 , 336.65
+343.23 , 8767.23 , 358.03
+343.23 , 9282.95 , 379.47
+343.23 , 9798.67 , 400.98
+343.23 , 10314.39 , 422.54
+400.44 , -11414.26 , -423.69
+400.44 , -10843.55 , -403.04
+400.44 , -10272.84 , -382.31
+400.44 , -9702.12 , -361.50
+400.44 , -9131.41 , -340.62
+400.44 , -8560.70 , -319.66
+400.44 , -7989.99 , -298.62
+400.44 , -7419.27 , -277.51
+400.44 , -6848.56 , -256.31
+400.44 , -6277.85 , -235.05
+400.44 , -5707.13 , -213.70
+400.44 , -5136.42 , -192.28
+400.44 , -4565.71 , -170.79
+400.44 , -3994.99 , -149.21
+400.44 , -3424.28 , -127.57
+400.44 , -2853.57 , -105.84
+400.44 , -2282.85 , -84.03
+400.44 , -1712.14 , -62.14
+400.44 , -1141.43 , -40.16
+400.44 , -570.71 , -18.00
+400.44 , -114.14 , 0.00
+400.44 , 103.14 , 8.09
+400.44 , 515.72 , 27.64
+400.44 , 1031.44 , 51.59
+400.44 , 1547.16 , 75.56
+400.44 , 2062.88 , 99.58
+400.44 , 2578.60 , 123.68
+400.44 , 3094.32 , 147.86
+400.44 , 3610.04 , 172.10
+400.44 , 4125.76 , 196.43
+400.44 , 4641.48 , 220.84
+400.44 , 5157.20 , 245.32
+400.44 , 5672.91 , 269.88
+400.44 , 6188.63 , 294.51
+400.44 , 6704.35 , 319.23
+400.44 , 7220.07 , 344.02
+400.44 , 7735.79 , 368.89
+400.44 , 8251.51 , 393.83
+400.44 , 8767.23 , 418.85
+400.44 , 9282.95 , 443.95
+400.44 , 9798.67 , 469.13
+400.44 , 10314.39 , 494.38
+457.64 , -11414.26 , -482.31
+457.64 , -10843.55 , -458.83
+457.64 , -10272.84 , -435.26
+457.64 , -9702.12 , -411.59
+457.64 , -9131.41 , -387.83
+457.64 , -8560.70 , -363.97
+457.64 , -7989.99 , -340.02
+457.64 , -7419.27 , -315.97
+457.64 , -6848.56 , -291.83
+457.64 , -6277.85 , -267.59
+457.64 , -5707.13 , -243.26
+457.64 , -5136.42 , -218.84
+457.64 , -4565.71 , -194.32
+457.64 , -3994.99 , -169.71
+457.64 , -3424.28 , -145.00
+457.64 , -2853.57 , -120.19
+457.64 , -2282.85 , -95.29
+457.64 , -1712.14 , -70.28
+457.64 , -1141.43 , -45.14
+457.64 , -570.71 , -19.76
+457.64 , -114.14 , 0.00
+457.64 , 103.14 , 9.76
+457.64 , 515.72 , 32.25
+457.64 , 1031.44 , 59.66
+457.64 , 1547.16 , 87.07
+457.64 , 2062.88 , 114.55
+457.64 , 2578.60 , 142.11
+457.64 , 3094.32 , 169.77
+457.64 , 3610.04 , 197.52
+457.64 , 4125.76 , 225.37
+457.64 , 4641.48 , 253.31
+457.64 , 5157.20 , 281.34
+457.64 , 5672.91 , 309.47
+457.64 , 6188.63 , 337.70
+457.64 , 6704.35 , 366.02
+457.64 , 7220.07 , 394.44
+457.64 , 7735.79 , 422.95
+457.64 , 8251.51 , 451.56
+457.64 , 8767.23 , 480.26
+457.64 , 9282.95 , 509.05
+457.64 , 9798.67 , 537.94
+457.64 , 10314.39 , 566.93
+514.85 , -11414.26 , -540.17
+514.85 , -10843.55 , -513.92
+514.85 , -10272.84 , -487.55
+514.85 , -9702.12 , -461.06
+514.85 , -9131.41 , -434.46
+514.85 , -8560.70 , -407.75
+514.85 , -7989.99 , -380.92
+514.85 , -7419.27 , -353.97
+514.85 , -6848.56 , -326.91
+514.85 , -6277.85 , -299.73
+514.85 , -5707.13 , -272.44
+514.85 , -5136.42 , -245.03
+514.85 , -4565.71 , -217.51
+514.85 , -3994.99 , -189.87
+514.85 , -3424.28 , -162.12
+514.85 , -2853.57 , -134.25
+514.85 , -2282.85 , -106.26
+514.85 , -1712.14 , -78.13
+514.85 , -1141.43 , -49.84
+514.85 , -570.71 , -21.19
+514.85 , -114.14 , 0.00
+514.85 , 103.14 , 11.59
+514.85 , 515.72 , 37.10
+514.85 , 1031.44 , 67.98
+514.85 , 1547.16 , 98.85
+514.85 , 2062.88 , 129.79
+514.85 , 2578.60 , 160.84
+514.85 , 3094.32 , 191.99
+514.85 , 3610.04 , 223.26
+514.85 , 4125.76 , 254.64
+514.85 , 4641.48 , 286.14
+514.85 , 5157.20 , 317.75
+514.85 , 5672.91 , 349.48
+514.85 , 6188.63 , 381.32
+514.85 , 6704.35 , 413.28
+514.85 , 7220.07 , 445.36
+514.85 , 7735.79 , 477.54
+514.85 , 8251.51 , 509.85
+514.85 , 8767.23 , 542.27
+514.85 , 9282.95 , 574.80
+514.85 , 9798.67 , 607.45
+514.85 , 10314.39 , 640.21
+572.06 , -11414.26 , -597.26
+572.06 , -10843.55 , -568.28
+572.06 , -10272.84 , -539.16
+572.06 , -9702.12 , -509.90
+572.06 , -9131.41 , -480.50
+572.06 , -8560.70 , -450.96
+572.06 , -7989.99 , -421.28
+572.06 , -7419.27 , -391.47
+572.06 , -6848.56 , -361.52
+572.06 , -6277.85 , -331.43
+572.06 , -5707.13 , -301.20
+572.06 , -5136.42 , -270.83
+572.06 , -4565.71 , -240.33
+572.06 , -3994.99 , -209.68
+572.06 , -3424.28 , -178.90
+572.06 , -2853.57 , -147.97
+572.06 , -2282.85 , -116.90
+572.06 , -1712.14 , -85.66
+572.06 , -1141.43 , -54.21
+572.06 , -570.71 , -22.23
+572.06 , -114.14 , 0.00
+572.06 , 103.14 , 13.60
+572.06 , 515.72 , 42.20
+572.06 , 1031.44 , 76.58
+572.06 , 1547.16 , 110.92
+572.06 , 2062.88 , 145.34
+572.06 , 2578.60 , 179.88
+572.06 , 3094.32 , 214.55
+572.06 , 3610.04 , 249.35
+572.06 , 4125.76 , 284.29
+572.06 , 4641.48 , 319.36
+572.06 , 5157.20 , 354.57
+572.06 , 5672.91 , 389.92
+572.06 , 6188.63 , 425.41
+572.06 , 6704.35 , 461.03
+572.06 , 7220.07 , 496.79
+572.06 , 7735.79 , 532.69
+572.06 , 8251.51 , 568.73
+572.06 , 8767.23 , 604.90
+572.06 , 9282.95 , 641.21
+572.06 , 9798.67 , 677.66
+572.06 , 10314.39 , 714.24
+629.26 , -11414.26 , -653.54
+629.26 , -10843.55 , -621.88
+629.26 , -10272.84 , -590.05
+629.26 , -9702.12 , -558.06
+629.26 , -9131.41 , -525.90
+629.26 , -8560.70 , -493.58
+629.26 , -7989.99 , -461.09
+629.26 , -7419.27 , -428.44
+629.26 , -6848.56 , -395.63
+629.26 , -6277.85 , -362.65
+629.26 , -5707.13 , -329.51
+629.26 , -5136.42 , -296.21
+629.26 , -4565.71 , -262.74
+629.26 , -3994.99 , -229.11
+629.26 , -3424.28 , -195.31
+629.26 , -2853.57 , -161.34
+629.26 , -2282.85 , -127.18
+629.26 , -1712.14 , -92.83
+629.26 , -1141.43 , -58.20
+629.26 , -570.71 , -22.82
+629.26 , -114.14 , 0.00
+629.26 , 103.14 , 15.79
+629.26 , 515.72 , 47.58
+629.26 , 1031.44 , 85.48
+629.26 , 1547.16 , 123.30
+629.26 , 2062.88 , 161.22
+629.26 , 2578.60 , 199.26
+629.26 , 3094.32 , 237.46
+629.26 , 3610.04 , 275.81
+629.26 , 4125.76 , 314.32
+629.26 , 4641.48 , 352.99
+629.26 , 5157.20 , 391.83
+629.26 , 5672.91 , 430.82
+629.26 , 6188.63 , 469.98
+629.26 , 6704.35 , 509.30
+629.26 , 7220.07 , 548.78
+629.26 , 7735.79 , 588.42
+629.26 , 8251.51 , 628.23
+629.26 , 8767.23 , 668.20
+629.26 , 9282.95 , 708.32
+629.26 , 9798.67 , 748.61
+629.26 , 10314.39 , 789.06
+686.47 , -11414.26 , -708.97
+686.47 , -10843.55 , -674.68
+686.47 , -10272.84 , -640.19
+686.47 , -9702.12 , -605.51
+686.47 , -9131.41 , -570.63
+686.47 , -8560.70 , -535.56
+686.47 , -7989.99 , -500.30
+686.47 , -7419.27 , -464.85
+686.47 , -6848.56 , -429.21
+686.47 , -6277.85 , -393.37
+686.47 , -5707.13 , -357.35
+686.47 , -5136.42 , -321.13
+686.47 , -4565.71 , -284.71
+686.47 , -3994.99 , -248.11
+686.47 , -3424.28 , -211.31
+686.47 , -2853.57 , -174.30
+686.47 , -2282.85 , -137.08
+686.47 , -1712.14 , -99.61
+686.47 , -1141.43 , -61.78
+686.47 , -570.71 , -22.86
+686.47 , -114.14 , 0.00
+686.47 , 103.14 , 18.17
+686.47 , 515.72 , 53.24
+686.47 , 1031.44 , 94.71
+686.47 , 1547.16 , 136.03
+686.47 , 2062.88 , 177.45
+686.47 , 2578.60 , 219.01
+686.47 , 3094.32 , 260.75
+686.47 , 3610.04 , 302.67
+686.47 , 4125.76 , 344.78
+686.47 , 4641.48 , 387.07
+686.47 , 5157.20 , 429.54
+686.47 , 5672.91 , 472.21
+686.47 , 6188.63 , 515.06
+686.47 , 6704.35 , 558.11
+686.47 , 7220.07 , 601.34
+686.47 , 7735.79 , 644.76
+686.47 , 8251.51 , 688.37
+686.47 , 8767.23 , 732.17
+686.47 , 9282.95 , 776.15
+686.47 , 9798.67 , 820.33
+686.47 , 10314.39 , 864.69
+743.67 , -11414.26 , -763.53
+743.67 , -10843.55 , -726.65
+743.67 , -10272.84 , -689.55
+743.67 , -9702.12 , -652.22
+743.67 , -9131.41 , -614.67
+743.67 , -8560.70 , -576.89
+743.67 , -7989.99 , -538.89
+743.67 , -7419.27 , -500.67
+743.67 , -6848.56 , -462.22
+743.67 , -6277.85 , -423.56
+743.67 , -5707.13 , -384.67
+743.67 , -5136.42 , -345.56
+743.67 , -4565.71 , -306.22
+743.67 , -3994.99 , -266.66
+743.67 , -3424.28 , -226.86
+743.67 , -2853.57 , -186.83
+743.67 , -2282.85 , -146.54
+743.67 , -1712.14 , -105.95
+743.67 , -1141.43 , -64.90
+743.67 , -570.71 , -22.24
+743.67 , -114.14 , 0.00
+743.67 , 103.14 , 20.74
+743.67 , 515.72 , 59.20
+743.67 , 1031.44 , 104.27
+743.67 , 1547.16 , 149.12
+743.67 , 2062.88 , 194.05
+743.67 , 2578.60 , 239.16
+743.67 , 3094.32 , 284.45
+743.67 , 3610.04 , 329.96
+743.67 , 4125.76 , 375.67
+743.67 , 4641.48 , 421.60
+743.67 , 5157.20 , 467.75
+743.67 , 5672.91 , 514.11
+743.67 , 6188.63 , 560.69
+743.67 , 6704.35 , 607.48
+743.67 , 7220.07 , 654.50
+743.67 , 7735.79 , 701.73
+743.67 , 8251.51 , 749.18
+743.67 , 8767.23 , 796.84
+743.67 , 9282.95 , 844.73
+743.67 , 9798.67 , 892.83
+743.67 , 10314.39 , 941.14
+800.88 , -11414.26 , -817.17
+800.88 , -10843.55 , -777.76
+800.88 , -10272.84 , -738.08
+800.88 , -9702.12 , -698.15
+800.88 , -9131.41 , -657.96
+800.88 , -8560.70 , -617.52
+800.88 , -7989.99 , -576.82
+800.88 , -7419.27 , -535.86
+800.88 , -6848.56 , -494.65
+800.88 , -6277.85 , -453.18
+800.88 , -5707.13 , -411.45
+800.88 , -5136.42 , -369.47
+800.88 , -4565.71 , -327.22
+800.88 , -3994.99 , -284.72
+800.88 , -3424.28 , -241.95
+800.88 , -2853.57 , -198.90
+800.88 , -2282.85 , -155.54
+800.88 , -1712.14 , -111.82
+800.88 , -1141.43 , -67.51
+800.88 , -570.71 , -20.80
+800.88 , -114.14 , 0.00
+800.88 , 103.14 , 23.52
+800.88 , 515.72 , 65.48
+800.88 , 1031.44 , 114.20
+800.88 , 1547.16 , 162.59
+800.88 , 2062.88 , 211.06
+800.88 , 2578.60 , 259.72
+800.88 , 3094.32 , 308.59
+800.88 , 3610.04 , 357.69
+800.88 , 4125.76 , 407.04
+800.88 , 4641.48 , 456.62
+800.88 , 5157.20 , 506.46
+800.88 , 5672.91 , 556.54
+800.88 , 6188.63 , 606.87
+800.88 , 6704.35 , 657.45
+800.88 , 7220.07 , 708.28
+800.88 , 7735.79 , 759.35
+800.88 , 8251.51 , 810.68
+800.88 , 8767.23 , 862.25
+800.88 , 9282.95 , 914.07
+800.88 , 9798.67 , 966.13
+800.88 , 10314.39 , 1018.44
+858.08 , -11414.26 , -869.86
+858.08 , -10843.55 , -827.96
+858.08 , -10272.84 , -785.77
+858.08 , -9702.12 , -743.28
+858.08 , -9131.41 , -700.50
+858.08 , -8560.70 , -657.42
+858.08 , -7989.99 , -614.05
+858.08 , -7419.27 , -570.39
+858.08 , -6848.56 , -526.44
+858.08 , -6277.85 , -482.19
+858.08 , -5707.13 , -437.65
+858.08 , -5136.42 , -392.82
+858.08 , -4565.71 , -347.69
+858.08 , -3994.99 , -302.26
+858.08 , -3424.28 , -256.52
+858.08 , -2853.57 , -210.46
+858.08 , -2282.85 , -164.04
+858.08 , -1712.14 , -117.17
+858.08 , -1141.43 , -69.54
+858.08 , -570.71 , -18.27
+858.08 , -114.14 , 0.00
+858.08 , 103.14 , 26.49
+858.08 , 515.72 , 72.10
+858.08 , 1031.44 , 124.50
+858.08 , 1547.16 , 176.46
+858.08 , 2062.88 , 228.49
+858.08 , 2578.60 , 280.71
+858.08 , 3094.32 , 333.18
+858.08 , 3610.04 , 385.90
+858.08 , 4125.76 , 438.89
+858.08 , 4641.48 , 492.16
+858.08 , 5157.20 , 545.71
+858.08 , 5672.91 , 599.54
+858.08 , 6188.63 , 653.64
+858.08 , 6704.35 , 708.03
+858.08 , 7220.07 , 762.71
+858.08 , 7735.79 , 817.66
+858.08 , 8251.51 , 872.89
+858.08 , 8767.23 , 928.41
+858.08 , 9282.95 , 984.20
+858.08 , 9798.67 , 1040.27
+858.08 , 10314.39 , 1096.63
+915.29 , -11414.26 , -921.56
+915.29 , -10843.55 , -877.23
+915.29 , -10272.84 , -832.56
+915.29 , -9702.12 , -787.56
+915.29 , -9131.41 , -742.22
+915.29 , -8560.70 , -696.56
+915.29 , -7989.99 , -650.56
+915.29 , -7419.27 , -604.23
+915.29 , -6848.56 , -557.56
+915.29 , -6277.85 , -510.57
+915.29 , -5707.13 , -463.24
+915.29 , -5136.42 , -415.58
+915.29 , -4565.71 , -367.58
+915.29 , -3994.99 , -319.24
+915.29 , -3424.28 , -270.55
+915.29 , -2853.57 , -221.48
+915.29 , -2282.85 , -171.99
+915.29 , -1712.14 , -121.95
+915.29 , -1141.43 , -70.93
+915.29 , -570.71 , -14.10
+915.29 , -114.14 , 0.00
+915.29 , 103.14 , 29.68
+915.29 , 515.72 , 79.05
+915.29 , 1031.44 , 135.20
+915.29 , 1547.16 , 190.76
+915.29 , 2062.88 , 246.36
+915.29 , 2578.60 , 302.17
+915.29 , 3094.32 , 358.24
+915.29 , 3610.04 , 414.60
+915.29 , 4125.76 , 471.27
+915.29 , 4641.48 , 528.24
+915.29 , 5157.20 , 585.52
+915.29 , 5672.91 , 643.12
+915.29 , 6188.63 , 701.03
+915.29 , 6704.35 , 759.26
+915.29 , 7220.07 , 817.80
+915.29 , 7735.79 , 876.66
+915.29 , 8251.51 , 935.84
+915.29 , 8767.23 , 995.34
+915.29 , 9282.95 , 1055.15
+915.29 , 9798.67 , 1115.27
+915.29 , 10314.39 , 1175.71
+972.50 , -11414.26 , -972.24
+972.50 , -10843.55 , -925.52
+972.50 , -10272.84 , -878.43
+972.50 , -9702.12 , -830.96
+972.50 , -9131.41 , -783.11
+972.50 , -8560.70 , -734.89
+972.50 , -7989.99 , -686.30
+972.50 , -7419.27 , -637.33
+972.50 , -6848.56 , -587.99
+972.50 , -6277.85 , -538.28
+972.50 , -5707.13 , -488.19
+972.50 , -5136.42 , -437.72
+972.50 , -4565.71 , -386.87
+972.50 , -3994.99 , -335.63
+972.50 , -3424.28 , -283.99
+972.50 , -2853.57 , -231.92
+972.50 , -2282.85 , -179.35
+972.50 , -1712.14 , -126.12
+972.50 , -1141.43 , -71.60
+972.50 , -570.71 , -6.45
+972.50 , -114.14 , 0.00
+972.50 , 103.14 , 33.08
+972.50 , 515.72 , 86.37
+972.50 , 1031.44 , 146.31
+972.50 , 1547.16 , 205.50
+972.50 , 2062.88 , 264.70
+972.50 , 2578.60 , 324.11
+972.50 , 3094.32 , 383.81
+972.50 , 3610.04 , 443.83
+972.50 , 4125.76 , 504.18
+972.50 , 4641.48 , 564.87
+972.50 , 5157.20 , 625.91
+972.50 , 5672.91 , 687.30
+972.50 , 6188.63 , 749.05
+972.50 , 6704.35 , 811.14
+972.50 , 7220.07 , 873.59
+972.50 , 7735.79 , 936.40
+972.50 , 8251.51 , 999.56
+972.50 , 8767.23 , 1063.07
+972.50 , 9282.95 , 1126.93
+972.50 , 9798.67 , 1191.14
+972.50 , 10314.39 , 1255.71
+1029.70 , -11414.26 , -1021.86
+1029.70 , -10843.55 , -972.81
+1029.70 , -10272.84 , -923.33
+1029.70 , -9702.12 , -873.44
+1029.70 , -9131.41 , -823.13
+1029.70 , -8560.70 , -772.39
+1029.70 , -7989.99 , -721.24
+1029.70 , -7419.27 , -669.67
+1029.70 , -6848.56 , -617.68
+1029.70 , -6277.85 , -565.27
+1029.70 , -5707.13 , -512.45
+1029.70 , -5136.42 , -459.19
+1029.70 , -4565.71 , -405.51
+1029.70 , -3994.99 , -351.39
+1029.70 , -3424.28 , -296.81
+1029.70 , -2853.57 , -241.73
+1029.70 , -2282.85 , -186.07
+1029.70 , -1712.14 , -129.61
+1029.70 , -1141.43 , -71.46
+1029.70 , -570.71 , 0.00
+1029.70 , -114.14 , 0.00
+1029.70 , 103.14 , 36.70
+1029.70 , 515.72 , 94.04
+1029.70 , 1031.44 , 157.85
+1029.70 , 1547.16 , 220.70
+1029.70 , 2062.88 , 283.52
+1029.70 , 2578.60 , 346.56
+1029.70 , 3094.32 , 409.90
+1029.70 , 3610.04 , 473.59
+1029.70 , 4125.76 , 537.65
+1029.70 , 4641.48 , 602.09
+1029.70 , 5157.20 , 666.91
+1029.70 , 5672.91 , 732.12
+1029.70 , 6188.63 , 797.72
+1029.70 , 6704.35 , 863.72
+1029.70 , 7220.07 , 930.10
+1029.70 , 7735.79 , 996.88
+1029.70 , 8251.51 , 1064.05
+1029.70 , 8767.23 , 1131.62
+1029.70 , 9282.95 , 1199.57
+1029.70 , 9798.67 , 1267.92
+1029.70 , 10314.39 , 1336.65
+1086.91 , -11414.26 , -1070.37
+1086.91 , -10843.55 , -1019.04
+1086.91 , -10272.84 , -967.24
+1086.91 , -9702.12 , -914.96
+1086.91 , -9131.41 , -862.23
+1086.91 , -8560.70 , -809.02
+1086.91 , -7989.99 , -755.35
+1086.91 , -7419.27 , -701.21
+1086.91 , -6848.56 , -646.60
+1086.91 , -6277.85 , -591.53
+1086.91 , -5707.13 , -535.99
+1086.91 , -5136.42 , -479.97
+1086.91 , -4565.71 , -423.47
+1086.91 , -3994.99 , -366.48
+1086.91 , -3424.28 , -308.96
+1086.91 , -2853.57 , -250.88
+1086.91 , -2282.85 , -192.11
+1086.91 , -1712.14 , -132.36
+1086.91 , -1141.43 , -70.38
+1086.91 , -570.71 , 0.00
+1086.91 , -114.14 , 0.00
+1086.91 , 103.14 , 40.53
+1086.91 , 515.72 , 102.10
+1086.91 , 1031.44 , 169.83
+1086.91 , 1547.16 , 236.37
+1086.91 , 2062.88 , 302.84
+1086.91 , 2578.60 , 369.53
+1086.91 , 3094.32 , 436.54
+1086.91 , 3610.04 , 503.92
+1086.91 , 4125.76 , 571.71
+1086.91 , 4641.48 , 639.91
+1086.91 , 5157.20 , 708.54
+1086.91 , 5672.91 , 777.59
+1086.91 , 6188.63 , 847.08
+1086.91 , 6704.35 , 917.00
+1086.91 , 7220.07 , 987.35
+1086.91 , 7735.79 , 1058.14
+1086.91 , 8251.51 , 1129.36
+1086.91 , 8767.23 , 1201.01
+1086.91 , 9282.95 , 1273.09
+1086.91 , 9798.67 , 1345.61
+1086.91 , 10314.39 , 1418.56
+1144.11 , -11414.26 , -1117.74
+1144.11 , -10843.55 , -1064.18
+1144.11 , -10272.84 , -1010.10
+1144.11 , -9702.12 , -955.49
+1144.11 , -9131.41 , -900.37
+1144.11 , -8560.70 , -844.73
+1144.11 , -7989.99 , -788.58
+1144.11 , -7419.27 , -731.90
+1144.11 , -6848.56 , -674.71
+1144.11 , -6277.85 , -617.00
+1144.11 , -5707.13 , -558.77
+1144.11 , -5136.42 , -500.01
+1144.11 , -4565.71 , -440.71
+1144.11 , -3994.99 , -380.85
+1144.11 , -3424.28 , -320.40
+1144.11 , -2853.57 , -259.31
+1144.11 , -2282.85 , -197.41
+1144.11 , -1712.14 , -134.30
+1144.11 , -1141.43 , -68.24
+1144.11 , -570.71 , 0.00
+1144.11 , -114.14 , 0.00
+1144.11 , 103.14 , 44.59
+1144.11 , 515.72 , 110.53
+1144.11 , 1031.44 , 182.27
+1144.11 , 1547.16 , 252.55
+1144.11 , 2062.88 , 322.69
+1144.11 , 2578.60 , 393.04
+1144.11 , 3094.32 , 463.74
+1144.11 , 3610.04 , 534.84
+1144.11 , 4125.76 , 606.37
+1144.11 , 4641.48 , 678.37
+1144.11 , 5157.20 , 750.82
+1144.11 , 5672.91 , 823.74
+1144.11 , 6188.63 , 897.14
+1144.11 , 6704.35 , 971.01
+1144.11 , 7220.07 , 1045.36
+1144.11 , 7735.79 , 1120.19
+1144.11 , 8251.51 , 1195.49
+1144.11 , 8767.23 , 1271.27
+1144.11 , 9282.95 , 1347.52
+1144.11 , 9798.67 , 1424.25
+1144.11 , 10314.39 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_drag.viepcd b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..a46cb34e6831d05626e67324b6a261bde045c857
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_Gbx3Axl_drag.viepcd
@@ -0,0 +1,24 @@
+n_out , T_drag_out
+0.00 , -21.84
+5.72 , -22.52
+57.21 , -28.92
+114.41 , -35.99
+171.62 , -43.07
+228.82 , -50.22
+286.03 , -57.30
+343.23 , -64.38
+400.44 , -71.45
+457.65 , -78.53
+514.85 , -85.68
+572.06 , -92.76
+629.26 , -99.84
+686.47 , -106.91
+743.67 , -113.99
+800.88 , -121.14
+858.08 , -128.22
+915.29 , -135.30
+972.50 , -142.37
+1029.70 , -149.45
+1086.91 , -156.60
+1144.11 , -163.68
+
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..100936bf6a5a357b12e1f3c23c4e10d762325c19
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 21.9384
+ },
+ {
+ "Ratio": 12.276
+ },
+ {
+ "Ratio": 7.2336
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3Whl1_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl1_1.viepco",
+ "2": "IEPC_Gbx3Whl1_2.viepco",
+ "3": "IEPC_Gbx3Whl1_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3Whl1_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl1_1.viepco",
+ "2": "IEPC_Gbx3Whl1_2.viepco",
+ "3": "IEPC_Gbx3Whl1_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3Whl1_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..3ca2ea6a86b60aca80b60c4736ccc0708437997a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3Whl1.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..9690d09aa289af9262fcbb00b8ec99eadcce93bf
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx3Whl1.vveh",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_1.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..7d9dd773ee374dc7a818143da159de20d758b556
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -17669.46 , 0.00
+0.00 , -16785.99 , 0.00
+0.00 , -15902.51 , 0.00
+0.00 , -15019.04 , 0.00
+0.00 , -14135.57 , 0.00
+0.00 , -13252.09 , 0.00
+0.00 , -12368.62 , -0.07
+0.00 , -11485.15 , -0.33
+0.00 , -10601.68 , -0.49
+0.00 , -9718.20 , -0.60
+0.00 , -8834.73 , -0.66
+0.00 , -7951.26 , -0.69
+0.00 , -7067.78 , -0.70
+0.00 , -6184.31 , -0.67
+0.00 , -5300.84 , -0.63
+0.00 , -4417.36 , -0.57
+0.00 , -3533.89 , -0.48
+0.00 , -2650.42 , -0.38
+0.00 , -1766.95 , -0.27
+0.00 , -883.47 , -0.13
+0.00 , -176.69 , -0.01
+0.00 , 153.22 , 0.06
+0.00 , 766.09 , 0.28
+0.00 , 1532.18 , 0.56
+0.00 , 2298.27 , 0.85
+0.00 , 3064.36 , 1.15
+0.00 , 3830.44 , 1.47
+0.00 , 4596.53 , 1.79
+0.00 , 5362.62 , 2.12
+0.00 , 6128.71 , 2.47
+0.00 , 6894.80 , 2.82
+0.00 , 7660.89 , 3.19
+0.00 , 8426.98 , 3.56
+0.00 , 9193.07 , 3.94
+0.00 , 9959.16 , 4.33
+0.00 , 10725.24 , 4.74
+0.00 , 11491.33 , 5.15
+0.00 , 12257.42 , 5.57
+0.00 , 13023.51 , 6.00
+0.00 , 13789.60 , 6.43
+0.00 , 14555.69 , 6.88
+0.00 , 15321.78 , 7.34
+1.89 , -17669.46 , 0.00
+1.89 , -16785.99 , 0.00
+1.89 , -15902.51 , 0.00
+1.89 , -15019.04 , 0.00
+1.89 , -14135.57 , 0.00
+1.89 , -13252.09 , 0.00
+1.89 , -12368.62 , -0.25
+1.89 , -11485.15 , -0.42
+1.89 , -10601.68 , -0.52
+1.89 , -9718.20 , -0.58
+1.89 , -8834.73 , -0.61
+1.89 , -7951.26 , -0.62
+1.89 , -7067.78 , -0.61
+1.89 , -6184.31 , -0.58
+1.89 , -5300.84 , -0.53
+1.89 , -4417.36 , -0.47
+1.89 , -3533.89 , -0.40
+1.89 , -2650.42 , -0.31
+1.89 , -1766.95 , -0.22
+1.89 , -883.47 , -0.11
+1.89 , -176.69 , -0.01
+1.89 , 153.22 , 0.05
+1.89 , 766.09 , 0.21
+1.89 , 1532.18 , 0.43
+1.89 , 2298.27 , 0.65
+1.89 , 3064.36 , 0.88
+1.89 , 3830.44 , 1.11
+1.89 , 4596.53 , 1.36
+1.89 , 5362.62 , 1.61
+1.89 , 6128.71 , 1.87
+1.89 , 6894.80 , 2.13
+1.89 , 7660.89 , 2.40
+1.89 , 8426.98 , 2.68
+1.89 , 9193.07 , 2.97
+1.89 , 9959.16 , 3.26
+1.89 , 10725.24 , 3.56
+1.89 , 11491.33 , 3.86
+1.89 , 12257.42 , 4.18
+1.89 , 13023.51 , 4.50
+1.89 , 13789.60 , 4.82
+1.89 , 14555.69 , 5.15
+1.89 , 15321.78 , 5.49
+18.86 , -17669.46 , -29.05
+18.86 , -16785.99 , -27.68
+18.86 , -15902.51 , -26.31
+18.86 , -15019.04 , -24.92
+18.86 , -14135.57 , -23.53
+18.86 , -13252.09 , -22.12
+18.86 , -12368.62 , -20.71
+18.86 , -11485.15 , -19.28
+18.86 , -10601.68 , -17.85
+18.86 , -9718.20 , -16.41
+18.86 , -8834.73 , -14.95
+18.86 , -7951.26 , -13.49
+18.86 , -7067.78 , -12.02
+18.86 , -6184.31 , -10.53
+18.86 , -5300.84 , -9.04
+18.86 , -4417.36 , -7.54
+18.86 , -3533.89 , -6.03
+18.86 , -2650.42 , -4.51
+18.86 , -1766.95 , -2.98
+18.86 , -883.47 , -1.44
+18.86 , -176.69 , -0.18
+18.86 , 153.22 , 0.45
+18.86 , 766.09 , 1.84
+18.86 , 1532.18 , 3.58
+18.86 , 2298.27 , 5.33
+18.86 , 3064.36 , 7.09
+18.86 , 3830.44 , 8.85
+18.86 , 4596.53 , 10.63
+18.86 , 5362.62 , 12.42
+18.86 , 6128.71 , 14.21
+18.86 , 6894.80 , 16.02
+18.86 , 7660.89 , 17.84
+18.86 , 8426.98 , 19.66
+18.86 , 9193.07 , 21.49
+18.86 , 9959.16 , 23.34
+18.86 , 10725.24 , 25.19
+18.86 , 11491.33 , 27.05
+18.86 , 12257.42 , 28.93
+18.86 , 13023.51 , 30.81
+18.86 , 13789.60 , 32.70
+18.86 , 14555.69 , 34.60
+18.86 , 15321.78 , 36.50
+37.72 , -17669.46 , -60.28
+37.72 , -16785.99 , -57.37
+37.72 , -15902.51 , -54.44
+37.72 , -15019.04 , -51.49
+37.72 , -14135.57 , -48.54
+37.72 , -13252.09 , -45.58
+37.72 , -12368.62 , -42.60
+37.72 , -11485.15 , -39.61
+37.72 , -10601.68 , -36.61
+37.72 , -9718.20 , -33.60
+37.72 , -8834.73 , -30.58
+37.72 , -7951.26 , -27.55
+37.72 , -7067.78 , -24.51
+37.72 , -6184.31 , -21.45
+37.72 , -5300.84 , -18.38
+37.72 , -4417.36 , -15.31
+37.72 , -3533.89 , -12.22
+37.72 , -2650.42 , -9.12
+37.72 , -1766.95 , -6.00
+37.72 , -883.47 , -2.88
+37.72 , -176.69 , -0.33
+37.72 , 153.22 , 0.92
+37.72 , 766.09 , 3.68
+37.72 , 1532.18 , 7.11
+37.72 , 2298.27 , 10.56
+37.72 , 3064.36 , 14.01
+37.72 , 3830.44 , 17.48
+37.72 , 4596.53 , 20.96
+37.72 , 5362.62 , 24.45
+37.72 , 6128.71 , 27.95
+37.72 , 6894.80 , 31.47
+37.72 , 7660.89 , 34.99
+37.72 , 8426.98 , 38.53
+37.72 , 9193.07 , 42.08
+37.72 , 9959.16 , 45.64
+37.72 , 10725.24 , 49.21
+37.72 , 11491.33 , 52.79
+37.72 , 12257.42 , 56.38
+37.72 , 13023.51 , 59.99
+37.72 , 13789.60 , 63.60
+37.72 , 14555.69 , 67.23
+37.72 , 15321.78 , 70.87
+56.59 , -17669.46 , -91.22
+56.59 , -16785.99 , -86.77
+56.59 , -15902.51 , -82.31
+56.59 , -15019.04 , -77.84
+56.59 , -14135.57 , -73.35
+56.59 , -13252.09 , -68.84
+56.59 , -12368.62 , -64.32
+56.59 , -11485.15 , -59.79
+56.59 , -10601.68 , -55.24
+56.59 , -9718.20 , -50.68
+56.59 , -8834.73 , -46.11
+56.59 , -7951.26 , -41.51
+56.59 , -7067.78 , -36.91
+56.59 , -6184.31 , -32.29
+56.59 , -5300.84 , -27.66
+56.59 , -4417.36 , -23.01
+56.59 , -3533.89 , -18.35
+56.59 , -2650.42 , -13.67
+56.59 , -1766.95 , -8.98
+56.59 , -883.47 , -4.27
+56.59 , -176.69 , -0.39
+56.59 , 153.22 , 1.43
+56.59 , 766.09 , 5.56
+56.59 , 1532.18 , 10.69
+56.59 , 2298.27 , 15.84
+56.59 , 3064.36 , 21.00
+56.59 , 3830.44 , 26.17
+56.59 , 4596.53 , 31.36
+56.59 , 5362.62 , 36.56
+56.59 , 6128.71 , 41.77
+56.59 , 6894.80 , 47.01
+56.59 , 7660.89 , 52.25
+56.59 , 8426.98 , 57.51
+56.59 , 9193.07 , 62.79
+56.59 , 9959.16 , 68.08
+56.59 , 10725.24 , 73.38
+56.59 , 11491.33 , 78.70
+56.59 , 12257.42 , 84.03
+56.59 , 13023.51 , 89.38
+56.59 , 13789.60 , 94.74
+56.59 , 14555.69 , 100.12
+56.59 , 15321.78 , 105.51
+75.45 , -17669.46 , -121.86
+75.45 , -16785.99 , -115.91
+75.45 , -15902.51 , -109.94
+75.45 , -15019.04 , -103.95
+75.45 , -14135.57 , -97.94
+75.45 , -13252.09 , -91.91
+75.45 , -12368.62 , -85.87
+75.45 , -11485.15 , -79.81
+75.45 , -10601.68 , -73.73
+75.45 , -9718.20 , -67.63
+75.45 , -8834.73 , -61.51
+75.45 , -7951.26 , -55.37
+75.45 , -7067.78 , -49.21
+75.45 , -6184.31 , -43.04
+75.45 , -5300.84 , -36.85
+75.45 , -4417.36 , -30.64
+75.45 , -3533.89 , -24.41
+75.45 , -2650.42 , -18.16
+75.45 , -1766.95 , -11.89
+75.45 , -883.47 , -5.59
+75.45 , -176.69 , -0.32
+75.45 , 153.22 , 1.99
+75.45 , 766.09 , 7.50
+75.45 , 1532.18 , 14.34
+75.45 , 2298.27 , 21.19
+75.45 , 3064.36 , 28.05
+75.45 , 3830.44 , 34.94
+75.45 , 4596.53 , 41.84
+75.45 , 5362.62 , 48.76
+75.45 , 6128.71 , 55.70
+75.45 , 6894.80 , 62.66
+75.45 , 7660.89 , 69.63
+75.45 , 8426.98 , 76.63
+75.45 , 9193.07 , 83.65
+75.45 , 9959.16 , 90.68
+75.45 , 10725.24 , 97.73
+75.45 , 11491.33 , 104.80
+75.45 , 12257.42 , 111.90
+75.45 , 13023.51 , 119.00
+75.45 , 13789.60 , 126.13
+75.45 , 14555.69 , 133.28
+75.45 , 15321.78 , 140.44
+94.31 , -17669.46 , -152.18
+94.31 , -16785.99 , -144.75
+94.31 , -15902.51 , -137.29
+94.31 , -15019.04 , -129.81
+94.31 , -14135.57 , -122.31
+94.31 , -13252.09 , -114.78
+94.31 , -12368.62 , -107.23
+94.31 , -11485.15 , -99.65
+94.31 , -10601.68 , -92.05
+94.31 , -9718.20 , -84.42
+94.31 , -8834.73 , -76.77
+94.31 , -7951.26 , -69.10
+94.31 , -7067.78 , -61.41
+94.31 , -6184.31 , -53.69
+94.31 , -5300.84 , -45.94
+94.31 , -4417.36 , -38.17
+94.31 , -3533.89 , -30.38
+94.31 , -2650.42 , -22.57
+94.31 , -1766.95 , -14.72
+94.31 , -883.47 , -6.84
+94.31 , -176.69 , 0.00
+94.31 , 153.22 , 2.61
+94.31 , 766.09 , 9.52
+94.31 , 1532.18 , 18.06
+94.31 , 2298.27 , 26.62
+94.31 , 3064.36 , 35.19
+94.31 , 3830.44 , 43.79
+94.31 , 4596.53 , 52.42
+94.31 , 5362.62 , 61.07
+94.31 , 6128.71 , 69.74
+94.31 , 6894.80 , 78.43
+94.31 , 7660.89 , 87.15
+94.31 , 8426.98 , 95.90
+94.31 , 9193.07 , 104.67
+94.31 , 9959.16 , 113.46
+94.31 , 10725.24 , 122.28
+94.31 , 11491.33 , 131.12
+94.31 , 12257.42 , 139.99
+94.31 , 13023.51 , 148.88
+94.31 , 13789.60 , 157.79
+94.31 , 14555.69 , 166.73
+94.31 , 15321.78 , 175.69
+113.17 , -17669.46 , -182.19
+113.17 , -16785.99 , -173.29
+113.17 , -15902.51 , -164.37
+113.17 , -15019.04 , -155.42
+113.17 , -14135.57 , -146.44
+113.17 , -13252.09 , -137.42
+113.17 , -12368.62 , -128.38
+113.17 , -11485.15 , -119.30
+113.17 , -10601.68 , -110.20
+113.17 , -9718.20 , -101.06
+113.17 , -8834.73 , -91.89
+113.17 , -7951.26 , -82.70
+113.17 , -7067.78 , -73.47
+113.17 , -6184.31 , -64.21
+113.17 , -5300.84 , -54.93
+113.17 , -4417.36 , -45.61
+113.17 , -3533.89 , -36.26
+113.17 , -2650.42 , -26.87
+113.17 , -1766.95 , -17.46
+113.17 , -883.47 , -7.98
+113.17 , -176.69 , 0.00
+113.17 , 153.22 , 3.29
+113.17 , 766.09 , 11.62
+113.17 , 1532.18 , 21.88
+113.17 , 2298.27 , 32.14
+113.17 , 3064.36 , 42.44
+113.17 , 3830.44 , 52.76
+113.17 , 4596.53 , 63.11
+113.17 , 5362.62 , 73.49
+113.17 , 6128.71 , 83.91
+113.17 , 6894.80 , 94.35
+113.17 , 7660.89 , 104.82
+113.17 , 8426.98 , 115.33
+113.17 , 9193.07 , 125.87
+113.17 , 9959.16 , 136.43
+113.17 , 10725.24 , 147.03
+113.17 , 11491.33 , 157.66
+113.17 , 12257.42 , 168.32
+113.17 , 13023.51 , 179.01
+113.17 , 13789.60 , 189.74
+113.17 , 14555.69 , 200.49
+113.17 , 15321.78 , 211.27
+132.03 , -17669.46 , -211.85
+132.03 , -16785.99 , -201.52
+132.03 , -15902.51 , -191.16
+132.03 , -15019.04 , -180.75
+132.03 , -14135.57 , -170.31
+132.03 , -13252.09 , -159.83
+132.03 , -12368.62 , -149.31
+132.03 , -11485.15 , -138.75
+132.03 , -10601.68 , -128.16
+132.03 , -9718.20 , -117.52
+132.03 , -8834.73 , -106.85
+132.03 , -7951.26 , -96.14
+132.03 , -7067.78 , -85.39
+132.03 , -6184.31 , -74.61
+132.03 , -5300.84 , -63.78
+132.03 , -4417.36 , -52.92
+132.03 , -3533.89 , -42.02
+132.03 , -2650.42 , -31.07
+132.03 , -1766.95 , -20.08
+132.03 , -883.47 , -9.00
+132.03 , -176.69 , 0.00
+132.03 , 153.22 , 4.05
+132.03 , 766.09 , 13.82
+132.03 , 1532.18 , 25.80
+132.03 , 2298.27 , 37.78
+132.03 , 3064.36 , 49.79
+132.03 , 3830.44 , 61.84
+132.03 , 4596.53 , 73.93
+132.03 , 5362.62 , 86.05
+132.03 , 6128.71 , 98.22
+132.03 , 6894.80 , 110.42
+132.03 , 7660.89 , 122.66
+132.03 , 8426.98 , 134.94
+132.03 , 9193.07 , 147.26
+132.03 , 9959.16 , 159.61
+132.03 , 10725.24 , 172.01
+132.03 , 11491.33 , 184.44
+132.03 , 12257.42 , 196.92
+132.03 , 13023.51 , 209.43
+132.03 , 13789.60 , 221.98
+132.03 , 14555.69 , 234.57
+132.03 , 15321.78 , 247.19
+150.90 , -17669.46 , -241.15
+150.90 , -16785.99 , -229.41
+150.90 , -15902.51 , -217.63
+150.90 , -15019.04 , -205.79
+150.90 , -14135.57 , -193.91
+150.90 , -13252.09 , -181.98
+150.90 , -12368.62 , -170.01
+150.90 , -11485.15 , -157.99
+150.90 , -10601.68 , -145.91
+150.90 , -9718.20 , -133.80
+150.90 , -8834.73 , -121.63
+150.90 , -7951.26 , -109.42
+150.90 , -7067.78 , -97.16
+150.90 , -6184.31 , -84.85
+150.90 , -5300.84 , -72.50
+150.90 , -4417.36 , -60.10
+150.90 , -3533.89 , -47.65
+150.90 , -2650.42 , -35.14
+150.90 , -1766.95 , -22.57
+150.90 , -883.47 , -9.88
+150.90 , -176.69 , 0.00
+150.90 , 153.22 , 4.88
+150.90 , 766.09 , 16.13
+150.90 , 1532.18 , 29.83
+150.90 , 2298.27 , 43.53
+150.90 , 3064.36 , 57.27
+150.90 , 3830.44 , 71.06
+150.90 , 4596.53 , 84.89
+150.90 , 5362.62 , 98.76
+150.90 , 6128.71 , 112.68
+150.90 , 6894.80 , 126.65
+150.90 , 7660.89 , 140.67
+150.90 , 8426.98 , 154.74
+150.90 , 9193.07 , 168.85
+150.90 , 9959.16 , 183.01
+150.90 , 10725.24 , 197.22
+150.90 , 11491.33 , 211.48
+150.90 , 12257.42 , 225.78
+150.90 , 13023.51 , 240.13
+150.90 , 13789.60 , 254.53
+150.90 , 14555.69 , 268.97
+150.90 , 15321.78 , 283.46
+169.76 , -17669.46 , -270.09
+169.76 , -16785.99 , -256.96
+169.76 , -15902.51 , -243.78
+169.76 , -15019.04 , -230.53
+169.76 , -14135.57 , -217.23
+169.76 , -13252.09 , -203.87
+169.76 , -12368.62 , -190.46
+169.76 , -11485.15 , -176.98
+169.76 , -10601.68 , -163.45
+169.76 , -9718.20 , -149.87
+169.76 , -8834.73 , -136.22
+169.76 , -7951.26 , -122.52
+169.76 , -7067.78 , -108.76
+169.76 , -6184.31 , -94.94
+169.76 , -5300.84 , -81.06
+169.76 , -4417.36 , -67.13
+169.76 , -3533.89 , -53.13
+169.76 , -2650.42 , -39.07
+169.76 , -1766.95 , -24.92
+169.76 , -883.47 , -10.59
+169.76 , -176.69 , 0.00
+169.76 , 153.22 , 5.80
+169.76 , 766.09 , 18.55
+169.76 , 1532.18 , 33.99
+169.76 , 2298.27 , 49.42
+169.76 , 3064.36 , 64.90
+169.76 , 3830.44 , 80.42
+169.76 , 4596.53 , 96.00
+169.76 , 5362.62 , 111.63
+169.76 , 6128.71 , 127.32
+169.76 , 6894.80 , 143.07
+169.76 , 7660.89 , 158.88
+169.76 , 8426.98 , 174.74
+169.76 , 9193.07 , 190.66
+169.76 , 9959.16 , 206.64
+169.76 , 10725.24 , 222.68
+169.76 , 11491.33 , 238.77
+169.76 , 12257.42 , 254.92
+169.76 , 13023.51 , 271.13
+169.76 , 13789.60 , 287.40
+169.76 , 14555.69 , 303.72
+169.76 , 15321.78 , 320.10
+188.62 , -17669.46 , -298.63
+188.62 , -16785.99 , -284.14
+188.62 , -15902.51 , -269.58
+188.62 , -15019.04 , -254.95
+188.62 , -14135.57 , -240.25
+188.62 , -13252.09 , -225.48
+188.62 , -12368.62 , -210.64
+188.62 , -11485.15 , -195.74
+188.62 , -10601.68 , -180.76
+188.62 , -9718.20 , -165.71
+188.62 , -8834.73 , -150.60
+188.62 , -7951.26 , -135.42
+188.62 , -7067.78 , -120.16
+188.62 , -6184.31 , -104.84
+188.62 , -5300.84 , -89.45
+188.62 , -4417.36 , -73.99
+188.62 , -3533.89 , -58.45
+188.62 , -2650.42 , -42.83
+188.62 , -1766.95 , -27.10
+188.62 , -883.47 , -11.12
+188.62 , -176.69 , 0.00
+188.62 , 153.22 , 6.80
+188.62 , 766.09 , 21.10
+188.62 , 1532.18 , 38.29
+188.62 , 2298.27 , 55.46
+188.62 , 3064.36 , 72.67
+188.62 , 3830.44 , 89.94
+188.62 , 4596.53 , 107.27
+188.62 , 5362.62 , 124.67
+188.62 , 6128.71 , 142.14
+188.62 , 6894.80 , 159.68
+188.62 , 7660.89 , 177.29
+188.62 , 8426.98 , 194.96
+188.62 , 9193.07 , 212.70
+188.62 , 9959.16 , 230.52
+188.62 , 10725.24 , 248.40
+188.62 , 11491.33 , 266.35
+188.62 , 12257.42 , 284.37
+188.62 , 13023.51 , 302.45
+188.62 , 13789.60 , 320.61
+188.62 , 14555.69 , 338.83
+188.62 , 15321.78 , 357.12
+207.48 , -17669.46 , -326.77
+207.48 , -16785.99 , -310.94
+207.48 , -15902.51 , -295.03
+207.48 , -15019.04 , -279.03
+207.48 , -14135.57 , -262.95
+207.48 , -13252.09 , -246.79
+207.48 , -12368.62 , -230.55
+207.48 , -11485.15 , -214.22
+207.48 , -10601.68 , -197.81
+207.48 , -9718.20 , -181.33
+207.48 , -8834.73 , -164.76
+207.48 , -7951.26 , -148.10
+207.48 , -7067.78 , -131.37
+207.48 , -6184.31 , -114.55
+207.48 , -5300.84 , -97.65
+207.48 , -4417.36 , -80.67
+207.48 , -3533.89 , -63.59
+207.48 , -2650.42 , -46.42
+207.48 , -1766.95 , -29.10
+207.48 , -883.47 , -11.41
+207.48 , -176.69 , 0.00
+207.48 , 153.22 , 7.90
+207.48 , 766.09 , 23.79
+207.48 , 1532.18 , 42.74
+207.48 , 2298.27 , 61.65
+207.48 , 3064.36 , 80.61
+207.48 , 3830.44 , 99.63
+207.48 , 4596.53 , 118.73
+207.48 , 5362.62 , 137.91
+207.48 , 6128.71 , 157.16
+207.48 , 6894.80 , 176.50
+207.48 , 7660.89 , 195.91
+207.48 , 8426.98 , 215.41
+207.48 , 9193.07 , 234.99
+207.48 , 9959.16 , 254.65
+207.48 , 10725.24 , 274.39
+207.48 , 11491.33 , 294.21
+207.48 , 12257.42 , 314.12
+207.48 , 13023.51 , 334.10
+207.48 , 13789.60 , 354.16
+207.48 , 14555.69 , 374.31
+207.48 , 15321.78 , 394.53
+226.34 , -17669.46 , -354.49
+226.34 , -16785.99 , -337.34
+226.34 , -15902.51 , -320.10
+226.34 , -15019.04 , -302.75
+226.34 , -14135.57 , -285.32
+226.34 , -13252.09 , -267.78
+226.34 , -12368.62 , -250.15
+226.34 , -11485.15 , -232.43
+226.34 , -10601.68 , -214.60
+226.34 , -9718.20 , -196.69
+226.34 , -8834.73 , -178.67
+226.34 , -7951.26 , -160.56
+226.34 , -7067.78 , -142.36
+226.34 , -6184.31 , -124.05
+226.34 , -5300.84 , -105.65
+226.34 , -4417.36 , -87.15
+226.34 , -3533.89 , -68.54
+226.34 , -2650.42 , -49.80
+226.34 , -1766.95 , -30.89
+226.34 , -883.47 , -11.43
+226.34 , -176.69 , 0.00
+226.34 , 153.22 , 9.08
+226.34 , 766.09 , 26.62
+226.34 , 1532.18 , 47.35
+226.34 , 2298.27 , 68.02
+226.34 , 3064.36 , 88.72
+226.34 , 3830.44 , 109.51
+226.34 , 4596.53 , 130.38
+226.34 , 5362.62 , 151.34
+226.34 , 6128.71 , 172.39
+226.34 , 6894.80 , 193.53
+226.34 , 7660.89 , 214.77
+226.34 , 8426.98 , 236.11
+226.34 , 9193.07 , 257.53
+226.34 , 9959.16 , 279.05
+226.34 , 10725.24 , 300.67
+226.34 , 11491.33 , 322.38
+226.34 , 12257.42 , 344.19
+226.34 , 13023.51 , 366.08
+226.34 , 13789.60 , 388.08
+226.34 , 14555.69 , 410.16
+226.34 , 15321.78 , 432.34
+245.21 , -17669.46 , -381.77
+245.21 , -16785.99 , -363.33
+245.21 , -15902.51 , -344.77
+245.21 , -15019.04 , -326.11
+245.21 , -14135.57 , -307.33
+245.21 , -13252.09 , -288.45
+245.21 , -12368.62 , -269.45
+245.21 , -11485.15 , -250.33
+245.21 , -10601.68 , -231.11
+245.21 , -9718.20 , -211.78
+245.21 , -8834.73 , -192.34
+245.21 , -7951.26 , -172.78
+245.21 , -7067.78 , -153.11
+245.21 , -6184.31 , -133.33
+245.21 , -5300.84 , -113.43
+245.21 , -4417.36 , -93.42
+245.21 , -3533.89 , -73.27
+245.21 , -2650.42 , -52.98
+245.21 , -1766.95 , -32.45
+245.21 , -883.47 , -11.12
+245.21 , -176.69 , 0.00
+245.21 , 153.22 , 10.37
+245.21 , 766.09 , 29.60
+245.21 , 1532.18 , 52.14
+245.21 , 2298.27 , 74.56
+245.21 , 3064.36 , 97.03
+245.21 , 3830.44 , 119.58
+245.21 , 4596.53 , 142.23
+245.21 , 5362.62 , 164.98
+245.21 , 6128.71 , 187.84
+245.21 , 6894.80 , 210.80
+245.21 , 7660.89 , 233.87
+245.21 , 8426.98 , 257.05
+245.21 , 9193.07 , 280.34
+245.21 , 9959.16 , 303.74
+245.21 , 10725.24 , 327.25
+245.21 , 11491.33 , 350.87
+245.21 , 12257.42 , 374.59
+245.21 , 13023.51 , 398.42
+245.21 , 13789.60 , 422.36
+245.21 , 14555.69 , 446.41
+245.21 , 15321.78 , 470.57
+264.07 , -17669.46 , -408.59
+264.07 , -16785.99 , -388.88
+264.07 , -15902.51 , -369.04
+264.07 , -15019.04 , -349.08
+264.07 , -14135.57 , -328.98
+264.07 , -13252.09 , -308.76
+264.07 , -12368.62 , -288.41
+264.07 , -11485.15 , -267.93
+264.07 , -10601.68 , -247.32
+264.07 , -9718.20 , -226.59
+264.07 , -8834.73 , -205.73
+264.07 , -7951.26 , -184.73
+264.07 , -7067.78 , -163.61
+264.07 , -6184.31 , -142.36
+264.07 , -5300.84 , -120.97
+264.07 , -4417.36 , -99.45
+264.07 , -3533.89 , -77.77
+264.07 , -2650.42 , -55.91
+264.07 , -1766.95 , -33.75
+264.07 , -883.47 , -10.40
+264.07 , -176.69 , 0.00
+264.07 , 153.22 , 11.76
+264.07 , 766.09 , 32.74
+264.07 , 1532.18 , 57.10
+264.07 , 2298.27 , 81.29
+264.07 , 3064.36 , 105.53
+264.07 , 3830.44 , 129.86
+264.07 , 4596.53 , 154.29
+264.07 , 5362.62 , 178.85
+264.07 , 6128.71 , 203.52
+264.07 , 6894.80 , 228.31
+264.07 , 7660.89 , 253.23
+264.07 , 8426.98 , 278.27
+264.07 , 9193.07 , 303.44
+264.07 , 9959.16 , 328.73
+264.07 , 10725.24 , 354.14
+264.07 , 11491.33 , 379.68
+264.07 , 12257.42 , 405.34
+264.07 , 13023.51 , 431.13
+264.07 , 13789.60 , 457.03
+264.07 , 14555.69 , 483.07
+264.07 , 15321.78 , 509.22
+282.93 , -17669.46 , -434.93
+282.93 , -16785.99 , -413.98
+282.93 , -15902.51 , -392.88
+282.93 , -15019.04 , -371.64
+282.93 , -14135.57 , -350.25
+282.93 , -13252.09 , -328.71
+282.93 , -12368.62 , -307.03
+282.93 , -11485.15 , -285.20
+282.93 , -10601.68 , -263.22
+282.93 , -9718.20 , -241.10
+282.93 , -8834.73 , -218.83
+282.93 , -7951.26 , -196.41
+282.93 , -7067.78 , -173.85
+282.93 , -6184.31 , -151.13
+282.93 , -5300.84 , -128.26
+282.93 , -4417.36 , -105.23
+282.93 , -3533.89 , -82.02
+282.93 , -2650.42 , -58.59
+282.93 , -1766.95 , -34.77
+282.93 , -883.47 , -9.14
+282.93 , -176.69 , 0.00
+282.93 , 153.22 , 13.25
+282.93 , 766.09 , 36.05
+282.93 , 1532.18 , 62.25
+282.93 , 2298.27 , 88.23
+282.93 , 3064.36 , 114.25
+282.93 , 3830.44 , 140.36
+282.93 , 4596.53 , 166.59
+282.93 , 5362.62 , 192.95
+282.93 , 6128.71 , 219.45
+282.93 , 6894.80 , 246.08
+282.93 , 7660.89 , 272.86
+282.93 , 8426.98 , 299.77
+282.93 , 9193.07 , 326.82
+282.93 , 9959.16 , 354.02
+282.93 , 10725.24 , 381.35
+282.93 , 11491.33 , 408.83
+282.93 , 12257.42 , 436.45
+282.93 , 13023.51 , 464.20
+282.93 , 13789.60 , 492.10
+282.93 , 14555.69 , 520.14
+282.93 , 15321.78 , 548.31
+301.79 , -17669.46 , -460.78
+301.79 , -16785.99 , -438.62
+301.79 , -15902.51 , -416.28
+301.79 , -15019.04 , -393.78
+301.79 , -14135.57 , -371.11
+301.79 , -13252.09 , -348.28
+301.79 , -12368.62 , -325.28
+301.79 , -11485.15 , -302.11
+301.79 , -10601.68 , -278.78
+301.79 , -9718.20 , -255.29
+301.79 , -8834.73 , -231.62
+301.79 , -7951.26 , -207.79
+301.79 , -7067.78 , -183.79
+301.79 , -6184.31 , -159.62
+301.79 , -5300.84 , -135.27
+301.79 , -4417.36 , -110.74
+301.79 , -3533.89 , -85.99
+301.79 , -2650.42 , -60.98
+301.79 , -1766.95 , -35.47
+301.79 , -883.47 , -7.05
+301.79 , -176.69 , 0.00
+301.79 , 153.22 , 14.84
+301.79 , 766.09 , 39.53
+301.79 , 1532.18 , 67.60
+301.79 , 2298.27 , 95.38
+301.79 , 3064.36 , 123.18
+301.79 , 3830.44 , 151.09
+301.79 , 4596.53 , 179.12
+301.79 , 5362.62 , 207.30
+301.79 , 6128.71 , 235.63
+301.79 , 6894.80 , 264.12
+301.79 , 7660.89 , 292.76
+301.79 , 8426.98 , 321.56
+301.79 , 9193.07 , 350.51
+301.79 , 9959.16 , 379.63
+301.79 , 10725.24 , 408.90
+301.79 , 11491.33 , 438.33
+301.79 , 12257.42 , 467.92
+301.79 , 13023.51 , 497.67
+301.79 , 13789.60 , 527.57
+301.79 , 14555.69 , 557.64
+301.79 , 15321.78 , 587.85
+320.65 , -17669.46 , -486.12
+320.65 , -16785.99 , -462.76
+320.65 , -15902.51 , -439.22
+320.65 , -15019.04 , -415.48
+320.65 , -14135.57 , -391.56
+320.65 , -13252.09 , -367.45
+320.65 , -12368.62 , -343.15
+320.65 , -11485.15 , -318.67
+320.65 , -10601.68 , -294.00
+320.65 , -9718.20 , -269.14
+320.65 , -8834.73 , -244.09
+320.65 , -7951.26 , -218.86
+320.65 , -7067.78 , -193.44
+320.65 , -6184.31 , -167.82
+320.65 , -5300.84 , -142.00
+320.65 , -4417.36 , -115.96
+320.65 , -3533.89 , -89.67
+320.65 , -2650.42 , -63.06
+320.65 , -1766.95 , -35.80
+320.65 , -883.47 , -3.22
+320.65 , -176.69 , 0.00
+320.65 , 153.22 , 16.54
+320.65 , 766.09 , 43.18
+320.65 , 1532.18 , 73.16
+320.65 , 2298.27 , 102.75
+320.65 , 3064.36 , 132.35
+320.65 , 3830.44 , 162.06
+320.65 , 4596.53 , 191.91
+320.65 , 5362.62 , 221.91
+320.65 , 6128.71 , 252.09
+320.65 , 6894.80 , 282.44
+320.65 , 7660.89 , 312.96
+320.65 , 8426.98 , 343.65
+320.65 , 9193.07 , 374.52
+320.65 , 9959.16 , 405.57
+320.65 , 10725.24 , 436.80
+320.65 , 11491.33 , 468.20
+320.65 , 12257.42 , 499.78
+320.65 , 13023.51 , 531.53
+320.65 , 13789.60 , 563.46
+320.65 , 14555.69 , 595.57
+320.65 , 15321.78 , 627.85
+339.52 , -17669.46 , -510.93
+339.52 , -16785.99 , -486.40
+339.52 , -15902.51 , -461.67
+339.52 , -15019.04 , -436.72
+339.52 , -14135.57 , -411.56
+339.52 , -13252.09 , -386.20
+339.52 , -12368.62 , -360.62
+339.52 , -11485.15 , -334.84
+339.52 , -10601.68 , -308.84
+339.52 , -9718.20 , -282.64
+339.52 , -8834.73 , -256.22
+339.52 , -7951.26 , -229.60
+339.52 , -7067.78 , -202.76
+339.52 , -6184.31 , -175.70
+339.52 , -5300.84 , -148.41
+339.52 , -4417.36 , -120.87
+339.52 , -3533.89 , -93.04
+339.52 , -2650.42 , -64.80
+339.52 , -1766.95 , -35.73
+339.52 , -883.47 , 0.00
+339.52 , -176.69 , 0.00
+339.52 , 153.22 , 18.35
+339.52 , 766.09 , 47.02
+339.52 , 1532.18 , 78.93
+339.52 , 2298.27 , 110.35
+339.52 , 3064.36 , 141.76
+339.52 , 3830.44 , 173.28
+339.52 , 4596.53 , 204.95
+339.52 , 5362.62 , 236.80
+339.52 , 6128.71 , 268.83
+339.52 , 6894.80 , 301.04
+339.52 , 7660.89 , 333.46
+339.52 , 8426.98 , 366.06
+339.52 , 9193.07 , 398.86
+339.52 , 9959.16 , 431.86
+339.52 , 10725.24 , 465.05
+339.52 , 11491.33 , 498.44
+339.52 , 12257.42 , 532.03
+339.52 , 13023.51 , 565.81
+339.52 , 13789.60 , 599.79
+339.52 , 14555.69 , 633.96
+339.52 , 15321.78 , 668.33
+358.38 , -17669.46 , -535.19
+358.38 , -16785.99 , -509.52
+358.38 , -15902.51 , -483.62
+358.38 , -15019.04 , -457.48
+358.38 , -14135.57 , -431.11
+358.38 , -13252.09 , -404.51
+358.38 , -12368.62 , -377.67
+358.38 , -11485.15 , -350.60
+358.38 , -10601.68 , -323.30
+358.38 , -9718.20 , -295.76
+358.38 , -8834.73 , -267.99
+358.38 , -7951.26 , -239.99
+358.38 , -7067.78 , -211.74
+358.38 , -6184.31 , -183.24
+358.38 , -5300.84 , -154.48
+358.38 , -4417.36 , -125.44
+358.38 , -3533.89 , -96.05
+358.38 , -2650.42 , -66.18
+358.38 , -1766.95 , -35.19
+358.38 , -883.47 , 0.00
+358.38 , -176.69 , 0.00
+358.38 , 153.22 , 20.27
+358.38 , 766.09 , 51.05
+358.38 , 1532.18 , 84.92
+358.38 , 2298.27 , 118.19
+358.38 , 3064.36 , 151.42
+358.38 , 3830.44 , 184.76
+358.38 , 4596.53 , 218.27
+358.38 , 5362.62 , 251.96
+358.38 , 6128.71 , 285.86
+358.38 , 6894.80 , 319.96
+358.38 , 7660.89 , 354.27
+358.38 , 8426.98 , 388.80
+358.38 , 9193.07 , 423.54
+358.38 , 9959.16 , 458.50
+358.38 , 10725.24 , 493.68
+358.38 , 11491.33 , 529.07
+358.38 , 12257.42 , 564.68
+358.38 , 13023.51 , 600.51
+358.38 , 13789.60 , 636.55
+358.38 , 14555.69 , 672.81
+358.38 , 15321.78 , 709.28
+377.24 , -17669.46 , -558.87
+377.24 , -16785.99 , -532.09
+377.24 , -15902.51 , -505.05
+377.24 , -15019.04 , -477.75
+377.24 , -14135.57 , -450.19
+377.24 , -13252.09 , -422.37
+377.24 , -12368.62 , -394.29
+377.24 , -11485.15 , -365.95
+377.24 , -10601.68 , -337.36
+377.24 , -9718.20 , -308.50
+377.24 , -8834.73 , -279.38
+377.24 , -7951.26 , -250.00
+377.24 , -7067.78 , -220.35
+377.24 , -6184.31 , -190.43
+377.24 , -5300.84 , -160.20
+377.24 , -4417.36 , -129.65
+377.24 , -3533.89 , -98.70
+377.24 , -2650.42 , -67.15
+377.24 , -1766.95 , -34.12
+377.24 , -883.47 , 0.00
+377.24 , -176.69 , 0.00
+377.24 , 153.22 , 22.30
+377.24 , 766.09 , 55.27
+377.24 , 1532.18 , 91.14
+377.24 , 2298.27 , 126.27
+377.24 , 3064.36 , 161.34
+377.24 , 3830.44 , 196.52
+377.24 , 4596.53 , 231.87
+377.24 , 5362.62 , 267.42
+377.24 , 6128.71 , 303.19
+377.24 , 6894.80 , 339.18
+377.24 , 7660.89 , 375.41
+377.24 , 8426.98 , 411.87
+377.24 , 9193.07 , 448.57
+377.24 , 9959.16 , 485.51
+377.24 , 10725.24 , 522.68
+377.24 , 11491.33 , 560.09
+377.24 , 12257.42 , 597.75
+377.24 , 13023.51 , 635.63
+377.24 , 13789.60 , 673.76
+377.24 , 14555.69 , 712.12
+377.24 , 15321.78 , 750.73
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_2.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..b5980ac32ff2f44452666e544ce91c462f5c5a7f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -9785.31 , 0.00
+0.00 , -9296.05 , 0.00
+0.00 , -8806.78 , 0.00
+0.00 , -8317.52 , 0.00
+0.00 , -7828.25 , 0.00
+0.00 , -7338.98 , 0.00
+0.00 , -6849.72 , -0.07
+0.00 , -6360.45 , -0.33
+0.00 , -5871.19 , -0.49
+0.00 , -5381.92 , -0.60
+0.00 , -4892.66 , -0.66
+0.00 , -4403.39 , -0.69
+0.00 , -3914.12 , -0.70
+0.00 , -3424.86 , -0.67
+0.00 , -2935.59 , -0.63
+0.00 , -2446.33 , -0.57
+0.00 , -1957.06 , -0.48
+0.00 , -1467.80 , -0.38
+0.00 , -978.53 , -0.27
+0.00 , -489.27 , -0.13
+0.00 , -97.85 , -0.01
+0.00 , 86.63 , 0.06
+0.00 , 433.14 , 0.28
+0.00 , 866.29 , 0.56
+0.00 , 1299.43 , 0.85
+0.00 , 1732.57 , 1.15
+0.00 , 2165.72 , 1.47
+0.00 , 2598.86 , 1.79
+0.00 , 3032.00 , 2.12
+0.00 , 3465.15 , 2.47
+0.00 , 3898.29 , 2.82
+0.00 , 4331.43 , 3.19
+0.00 , 4764.58 , 3.56
+0.00 , 5197.72 , 3.94
+0.00 , 5630.86 , 4.33
+0.00 , 6064.01 , 4.74
+0.00 , 6497.15 , 5.15
+0.00 , 6930.29 , 5.57
+0.00 , 7363.44 , 6.00
+0.00 , 7796.58 , 6.43
+0.00 , 8229.72 , 6.88
+0.00 , 8662.87 , 7.34
+3.37 , -9785.31 , 0.00
+3.37 , -9296.05 , 0.00
+3.37 , -8806.78 , 0.00
+3.37 , -8317.52 , 0.00
+3.37 , -7828.25 , 0.00
+3.37 , -7338.98 , 0.00
+3.37 , -6849.72 , -0.25
+3.37 , -6360.45 , -0.42
+3.37 , -5871.19 , -0.52
+3.37 , -5381.92 , -0.58
+3.37 , -4892.66 , -0.61
+3.37 , -4403.39 , -0.62
+3.37 , -3914.12 , -0.61
+3.37 , -3424.86 , -0.58
+3.37 , -2935.59 , -0.53
+3.37 , -2446.33 , -0.47
+3.37 , -1957.06 , -0.40
+3.37 , -1467.80 , -0.31
+3.37 , -978.53 , -0.22
+3.37 , -489.27 , -0.11
+3.37 , -97.85 , -0.01
+3.37 , 86.63 , 0.05
+3.37 , 433.14 , 0.21
+3.37 , 866.29 , 0.43
+3.37 , 1299.43 , 0.65
+3.37 , 1732.57 , 0.88
+3.37 , 2165.72 , 1.11
+3.37 , 2598.86 , 1.36
+3.37 , 3032.00 , 1.61
+3.37 , 3465.15 , 1.87
+3.37 , 3898.29 , 2.13
+3.37 , 4331.43 , 2.40
+3.37 , 4764.58 , 2.68
+3.37 , 5197.72 , 2.97
+3.37 , 5630.86 , 3.26
+3.37 , 6064.01 , 3.56
+3.37 , 6497.15 , 3.86
+3.37 , 6930.29 , 4.18
+3.37 , 7363.44 , 4.50
+3.37 , 7796.58 , 4.82
+3.37 , 8229.72 , 5.15
+3.37 , 8662.87 , 5.49
+33.71 , -9785.31 , -29.05
+33.71 , -9296.05 , -27.68
+33.71 , -8806.78 , -26.31
+33.71 , -8317.52 , -24.92
+33.71 , -7828.25 , -23.53
+33.71 , -7338.98 , -22.12
+33.71 , -6849.72 , -20.71
+33.71 , -6360.45 , -19.28
+33.71 , -5871.19 , -17.85
+33.71 , -5381.92 , -16.41
+33.71 , -4892.66 , -14.95
+33.71 , -4403.39 , -13.49
+33.71 , -3914.12 , -12.02
+33.71 , -3424.86 , -10.53
+33.71 , -2935.59 , -9.04
+33.71 , -2446.33 , -7.54
+33.71 , -1957.06 , -6.03
+33.71 , -1467.80 , -4.51
+33.71 , -978.53 , -2.98
+33.71 , -489.27 , -1.44
+33.71 , -97.85 , -0.18
+33.71 , 86.63 , 0.45
+33.71 , 433.14 , 1.84
+33.71 , 866.29 , 3.58
+33.71 , 1299.43 , 5.33
+33.71 , 1732.57 , 7.09
+33.71 , 2165.72 , 8.85
+33.71 , 2598.86 , 10.63
+33.71 , 3032.00 , 12.42
+33.71 , 3465.15 , 14.21
+33.71 , 3898.29 , 16.02
+33.71 , 4331.43 , 17.84
+33.71 , 4764.58 , 19.66
+33.71 , 5197.72 , 21.49
+33.71 , 5630.86 , 23.34
+33.71 , 6064.01 , 25.19
+33.71 , 6497.15 , 27.05
+33.71 , 6930.29 , 28.93
+33.71 , 7363.44 , 30.81
+33.71 , 7796.58 , 32.70
+33.71 , 8229.72 , 34.60
+33.71 , 8662.87 , 36.50
+67.42 , -9785.31 , -60.28
+67.42 , -9296.05 , -57.37
+67.42 , -8806.78 , -54.44
+67.42 , -8317.52 , -51.49
+67.42 , -7828.25 , -48.54
+67.42 , -7338.98 , -45.58
+67.42 , -6849.72 , -42.60
+67.42 , -6360.45 , -39.61
+67.42 , -5871.19 , -36.61
+67.42 , -5381.92 , -33.60
+67.42 , -4892.66 , -30.58
+67.42 , -4403.39 , -27.55
+67.42 , -3914.12 , -24.51
+67.42 , -3424.86 , -21.45
+67.42 , -2935.59 , -18.38
+67.42 , -2446.33 , -15.31
+67.42 , -1957.06 , -12.22
+67.42 , -1467.80 , -9.12
+67.42 , -978.53 , -6.00
+67.42 , -489.27 , -2.88
+67.42 , -97.85 , -0.33
+67.42 , 86.63 , 0.92
+67.42 , 433.14 , 3.68
+67.42 , 866.29 , 7.11
+67.42 , 1299.43 , 10.56
+67.42 , 1732.57 , 14.01
+67.42 , 2165.72 , 17.48
+67.42 , 2598.86 , 20.96
+67.42 , 3032.00 , 24.45
+67.42 , 3465.15 , 27.95
+67.42 , 3898.29 , 31.47
+67.42 , 4331.43 , 34.99
+67.42 , 4764.58 , 38.53
+67.42 , 5197.72 , 42.08
+67.42 , 5630.86 , 45.64
+67.42 , 6064.01 , 49.21
+67.42 , 6497.15 , 52.79
+67.42 , 6930.29 , 56.38
+67.42 , 7363.44 , 59.99
+67.42 , 7796.58 , 63.60
+67.42 , 8229.72 , 67.23
+67.42 , 8662.87 , 70.87
+101.12 , -9785.31 , -91.22
+101.12 , -9296.05 , -86.77
+101.12 , -8806.78 , -82.31
+101.12 , -8317.52 , -77.84
+101.12 , -7828.25 , -73.35
+101.12 , -7338.98 , -68.84
+101.12 , -6849.72 , -64.32
+101.12 , -6360.45 , -59.79
+101.12 , -5871.19 , -55.24
+101.12 , -5381.92 , -50.68
+101.12 , -4892.66 , -46.11
+101.12 , -4403.39 , -41.51
+101.12 , -3914.12 , -36.91
+101.12 , -3424.86 , -32.29
+101.12 , -2935.59 , -27.66
+101.12 , -2446.33 , -23.01
+101.12 , -1957.06 , -18.35
+101.12 , -1467.80 , -13.67
+101.12 , -978.53 , -8.98
+101.12 , -489.27 , -4.27
+101.12 , -97.85 , -0.39
+101.12 , 86.63 , 1.43
+101.12 , 433.14 , 5.56
+101.12 , 866.29 , 10.69
+101.12 , 1299.43 , 15.84
+101.12 , 1732.57 , 21.00
+101.12 , 2165.72 , 26.17
+101.12 , 2598.86 , 31.36
+101.12 , 3032.00 , 36.56
+101.12 , 3465.15 , 41.77
+101.12 , 3898.29 , 47.01
+101.12 , 4331.43 , 52.25
+101.12 , 4764.58 , 57.51
+101.12 , 5197.72 , 62.79
+101.12 , 5630.86 , 68.08
+101.12 , 6064.01 , 73.38
+101.12 , 6497.15 , 78.70
+101.12 , 6930.29 , 84.03
+101.12 , 7363.44 , 89.38
+101.12 , 7796.58 , 94.74
+101.12 , 8229.72 , 100.12
+101.12 , 8662.87 , 105.51
+134.83 , -9785.31 , -121.86
+134.83 , -9296.05 , -115.91
+134.83 , -8806.78 , -109.94
+134.83 , -8317.52 , -103.95
+134.83 , -7828.25 , -97.94
+134.83 , -7338.98 , -91.91
+134.83 , -6849.72 , -85.87
+134.83 , -6360.45 , -79.81
+134.83 , -5871.19 , -73.73
+134.83 , -5381.92 , -67.63
+134.83 , -4892.66 , -61.51
+134.83 , -4403.39 , -55.37
+134.83 , -3914.12 , -49.21
+134.83 , -3424.86 , -43.04
+134.83 , -2935.59 , -36.85
+134.83 , -2446.33 , -30.64
+134.83 , -1957.06 , -24.41
+134.83 , -1467.80 , -18.16
+134.83 , -978.53 , -11.89
+134.83 , -489.27 , -5.59
+134.83 , -97.85 , -0.32
+134.83 , 86.63 , 1.99
+134.83 , 433.14 , 7.50
+134.83 , 866.29 , 14.34
+134.83 , 1299.43 , 21.19
+134.83 , 1732.57 , 28.05
+134.83 , 2165.72 , 34.94
+134.83 , 2598.86 , 41.84
+134.83 , 3032.00 , 48.76
+134.83 , 3465.15 , 55.70
+134.83 , 3898.29 , 62.66
+134.83 , 4331.43 , 69.63
+134.83 , 4764.58 , 76.63
+134.83 , 5197.72 , 83.65
+134.83 , 5630.86 , 90.68
+134.83 , 6064.01 , 97.73
+134.83 , 6497.15 , 104.80
+134.83 , 6930.29 , 111.90
+134.83 , 7363.44 , 119.00
+134.83 , 7796.58 , 126.13
+134.83 , 8229.72 , 133.28
+134.83 , 8662.87 , 140.44
+168.54 , -9785.31 , -152.18
+168.54 , -9296.05 , -144.75
+168.54 , -8806.78 , -137.29
+168.54 , -8317.52 , -129.81
+168.54 , -7828.25 , -122.31
+168.54 , -7338.98 , -114.78
+168.54 , -6849.72 , -107.23
+168.54 , -6360.45 , -99.65
+168.54 , -5871.19 , -92.05
+168.54 , -5381.92 , -84.42
+168.54 , -4892.66 , -76.77
+168.54 , -4403.39 , -69.10
+168.54 , -3914.12 , -61.41
+168.54 , -3424.86 , -53.69
+168.54 , -2935.59 , -45.94
+168.54 , -2446.33 , -38.17
+168.54 , -1957.06 , -30.38
+168.54 , -1467.80 , -22.57
+168.54 , -978.53 , -14.72
+168.54 , -489.27 , -6.84
+168.54 , -97.85 , 0.00
+168.54 , 86.63 , 2.61
+168.54 , 433.14 , 9.52
+168.54 , 866.29 , 18.06
+168.54 , 1299.43 , 26.62
+168.54 , 1732.57 , 35.19
+168.54 , 2165.72 , 43.79
+168.54 , 2598.86 , 52.42
+168.54 , 3032.00 , 61.07
+168.54 , 3465.15 , 69.74
+168.54 , 3898.29 , 78.43
+168.54 , 4331.43 , 87.15
+168.54 , 4764.58 , 95.90
+168.54 , 5197.72 , 104.67
+168.54 , 5630.86 , 113.46
+168.54 , 6064.01 , 122.28
+168.54 , 6497.15 , 131.12
+168.54 , 6930.29 , 139.99
+168.54 , 7363.44 , 148.88
+168.54 , 7796.58 , 157.79
+168.54 , 8229.72 , 166.73
+168.54 , 8662.87 , 175.69
+202.25 , -9785.31 , -182.19
+202.25 , -9296.05 , -173.29
+202.25 , -8806.78 , -164.37
+202.25 , -8317.52 , -155.42
+202.25 , -7828.25 , -146.44
+202.25 , -7338.98 , -137.42
+202.25 , -6849.72 , -128.38
+202.25 , -6360.45 , -119.30
+202.25 , -5871.19 , -110.20
+202.25 , -5381.92 , -101.06
+202.25 , -4892.66 , -91.89
+202.25 , -4403.39 , -82.70
+202.25 , -3914.12 , -73.47
+202.25 , -3424.86 , -64.21
+202.25 , -2935.59 , -54.93
+202.25 , -2446.33 , -45.61
+202.25 , -1957.06 , -36.26
+202.25 , -1467.80 , -26.87
+202.25 , -978.53 , -17.46
+202.25 , -489.27 , -7.98
+202.25 , -97.85 , 0.00
+202.25 , 86.63 , 3.29
+202.25 , 433.14 , 11.62
+202.25 , 866.29 , 21.88
+202.25 , 1299.43 , 32.14
+202.25 , 1732.57 , 42.44
+202.25 , 2165.72 , 52.76
+202.25 , 2598.86 , 63.11
+202.25 , 3032.00 , 73.49
+202.25 , 3465.15 , 83.91
+202.25 , 3898.29 , 94.35
+202.25 , 4331.43 , 104.82
+202.25 , 4764.58 , 115.33
+202.25 , 5197.72 , 125.87
+202.25 , 5630.86 , 136.43
+202.25 , 6064.01 , 147.03
+202.25 , 6497.15 , 157.66
+202.25 , 6930.29 , 168.32
+202.25 , 7363.44 , 179.01
+202.25 , 7796.58 , 189.74
+202.25 , 8229.72 , 200.49
+202.25 , 8662.87 , 211.27
+235.96 , -9785.31 , -211.85
+235.96 , -9296.05 , -201.52
+235.96 , -8806.78 , -191.16
+235.96 , -8317.52 , -180.75
+235.96 , -7828.25 , -170.31
+235.96 , -7338.98 , -159.83
+235.96 , -6849.72 , -149.31
+235.96 , -6360.45 , -138.75
+235.96 , -5871.19 , -128.16
+235.96 , -5381.92 , -117.52
+235.96 , -4892.66 , -106.85
+235.96 , -4403.39 , -96.14
+235.96 , -3914.12 , -85.39
+235.96 , -3424.86 , -74.61
+235.96 , -2935.59 , -63.78
+235.96 , -2446.33 , -52.92
+235.96 , -1957.06 , -42.02
+235.96 , -1467.80 , -31.07
+235.96 , -978.53 , -20.08
+235.96 , -489.27 , -9.00
+235.96 , -97.85 , 0.00
+235.96 , 86.63 , 4.05
+235.96 , 433.14 , 13.82
+235.96 , 866.29 , 25.80
+235.96 , 1299.43 , 37.78
+235.96 , 1732.57 , 49.79
+235.96 , 2165.72 , 61.84
+235.96 , 2598.86 , 73.93
+235.96 , 3032.00 , 86.05
+235.96 , 3465.15 , 98.22
+235.96 , 3898.29 , 110.42
+235.96 , 4331.43 , 122.66
+235.96 , 4764.58 , 134.94
+235.96 , 5197.72 , 147.26
+235.96 , 5630.86 , 159.61
+235.96 , 6064.01 , 172.01
+235.96 , 6497.15 , 184.44
+235.96 , 6930.29 , 196.92
+235.96 , 7363.44 , 209.43
+235.96 , 7796.58 , 221.98
+235.96 , 8229.72 , 234.57
+235.96 , 8662.87 , 247.19
+269.67 , -9785.31 , -241.15
+269.67 , -9296.05 , -229.41
+269.67 , -8806.78 , -217.63
+269.67 , -8317.52 , -205.79
+269.67 , -7828.25 , -193.91
+269.67 , -7338.98 , -181.98
+269.67 , -6849.72 , -170.01
+269.67 , -6360.45 , -157.99
+269.67 , -5871.19 , -145.91
+269.67 , -5381.92 , -133.80
+269.67 , -4892.66 , -121.63
+269.67 , -4403.39 , -109.42
+269.67 , -3914.12 , -97.16
+269.67 , -3424.86 , -84.85
+269.67 , -2935.59 , -72.50
+269.67 , -2446.33 , -60.10
+269.67 , -1957.06 , -47.65
+269.67 , -1467.80 , -35.14
+269.67 , -978.53 , -22.57
+269.67 , -489.27 , -9.88
+269.67 , -97.85 , 0.00
+269.67 , 86.63 , 4.88
+269.67 , 433.14 , 16.13
+269.67 , 866.29 , 29.83
+269.67 , 1299.43 , 43.53
+269.67 , 1732.57 , 57.27
+269.67 , 2165.72 , 71.06
+269.67 , 2598.86 , 84.89
+269.67 , 3032.00 , 98.76
+269.67 , 3465.15 , 112.68
+269.67 , 3898.29 , 126.65
+269.67 , 4331.43 , 140.67
+269.67 , 4764.58 , 154.74
+269.67 , 5197.72 , 168.85
+269.67 , 5630.86 , 183.01
+269.67 , 6064.01 , 197.22
+269.67 , 6497.15 , 211.48
+269.67 , 6930.29 , 225.78
+269.67 , 7363.44 , 240.13
+269.67 , 7796.58 , 254.53
+269.67 , 8229.72 , 268.97
+269.67 , 8662.87 , 283.46
+303.37 , -9785.31 , -270.09
+303.37 , -9296.05 , -256.96
+303.37 , -8806.78 , -243.78
+303.37 , -8317.52 , -230.53
+303.37 , -7828.25 , -217.23
+303.37 , -7338.98 , -203.87
+303.37 , -6849.72 , -190.46
+303.37 , -6360.45 , -176.98
+303.37 , -5871.19 , -163.45
+303.37 , -5381.92 , -149.87
+303.37 , -4892.66 , -136.22
+303.37 , -4403.39 , -122.52
+303.37 , -3914.12 , -108.76
+303.37 , -3424.86 , -94.94
+303.37 , -2935.59 , -81.06
+303.37 , -2446.33 , -67.13
+303.37 , -1957.06 , -53.13
+303.37 , -1467.80 , -39.07
+303.37 , -978.53 , -24.92
+303.37 , -489.27 , -10.59
+303.37 , -97.85 , 0.00
+303.37 , 86.63 , 5.80
+303.37 , 433.14 , 18.55
+303.37 , 866.29 , 33.99
+303.37 , 1299.43 , 49.42
+303.37 , 1732.57 , 64.90
+303.37 , 2165.72 , 80.42
+303.37 , 2598.86 , 96.00
+303.37 , 3032.00 , 111.63
+303.37 , 3465.15 , 127.32
+303.37 , 3898.29 , 143.07
+303.37 , 4331.43 , 158.88
+303.37 , 4764.58 , 174.74
+303.37 , 5197.72 , 190.66
+303.37 , 5630.86 , 206.64
+303.37 , 6064.01 , 222.68
+303.37 , 6497.15 , 238.77
+303.37 , 6930.29 , 254.92
+303.37 , 7363.44 , 271.13
+303.37 , 7796.58 , 287.40
+303.37 , 8229.72 , 303.72
+303.37 , 8662.87 , 320.10
+337.08 , -9785.31 , -298.63
+337.08 , -9296.05 , -284.14
+337.08 , -8806.78 , -269.58
+337.08 , -8317.52 , -254.95
+337.08 , -7828.25 , -240.25
+337.08 , -7338.98 , -225.48
+337.08 , -6849.72 , -210.64
+337.08 , -6360.45 , -195.74
+337.08 , -5871.19 , -180.76
+337.08 , -5381.92 , -165.71
+337.08 , -4892.66 , -150.60
+337.08 , -4403.39 , -135.42
+337.08 , -3914.12 , -120.16
+337.08 , -3424.86 , -104.84
+337.08 , -2935.59 , -89.45
+337.08 , -2446.33 , -73.99
+337.08 , -1957.06 , -58.45
+337.08 , -1467.80 , -42.83
+337.08 , -978.53 , -27.10
+337.08 , -489.27 , -11.12
+337.08 , -97.85 , 0.00
+337.08 , 86.63 , 6.80
+337.08 , 433.14 , 21.10
+337.08 , 866.29 , 38.29
+337.08 , 1299.43 , 55.46
+337.08 , 1732.57 , 72.67
+337.08 , 2165.72 , 89.94
+337.08 , 2598.86 , 107.27
+337.08 , 3032.00 , 124.67
+337.08 , 3465.15 , 142.14
+337.08 , 3898.29 , 159.68
+337.08 , 4331.43 , 177.29
+337.08 , 4764.58 , 194.96
+337.08 , 5197.72 , 212.70
+337.08 , 5630.86 , 230.52
+337.08 , 6064.01 , 248.40
+337.08 , 6497.15 , 266.35
+337.08 , 6930.29 , 284.37
+337.08 , 7363.44 , 302.45
+337.08 , 7796.58 , 320.61
+337.08 , 8229.72 , 338.83
+337.08 , 8662.87 , 357.12
+370.79 , -9785.31 , -326.77
+370.79 , -9296.05 , -310.94
+370.79 , -8806.78 , -295.03
+370.79 , -8317.52 , -279.03
+370.79 , -7828.25 , -262.95
+370.79 , -7338.98 , -246.79
+370.79 , -6849.72 , -230.55
+370.79 , -6360.45 , -214.22
+370.79 , -5871.19 , -197.81
+370.79 , -5381.92 , -181.33
+370.79 , -4892.66 , -164.76
+370.79 , -4403.39 , -148.10
+370.79 , -3914.12 , -131.37
+370.79 , -3424.86 , -114.55
+370.79 , -2935.59 , -97.65
+370.79 , -2446.33 , -80.67
+370.79 , -1957.06 , -63.59
+370.79 , -1467.80 , -46.42
+370.79 , -978.53 , -29.10
+370.79 , -489.27 , -11.41
+370.79 , -97.85 , 0.00
+370.79 , 86.63 , 7.90
+370.79 , 433.14 , 23.79
+370.79 , 866.29 , 42.74
+370.79 , 1299.43 , 61.65
+370.79 , 1732.57 , 80.61
+370.79 , 2165.72 , 99.63
+370.79 , 2598.86 , 118.73
+370.79 , 3032.00 , 137.91
+370.79 , 3465.15 , 157.16
+370.79 , 3898.29 , 176.50
+370.79 , 4331.43 , 195.91
+370.79 , 4764.58 , 215.41
+370.79 , 5197.72 , 234.99
+370.79 , 5630.86 , 254.65
+370.79 , 6064.01 , 274.39
+370.79 , 6497.15 , 294.21
+370.79 , 6930.29 , 314.12
+370.79 , 7363.44 , 334.10
+370.79 , 7796.58 , 354.16
+370.79 , 8229.72 , 374.31
+370.79 , 8662.87 , 394.53
+404.50 , -9785.31 , -354.49
+404.50 , -9296.05 , -337.34
+404.50 , -8806.78 , -320.10
+404.50 , -8317.52 , -302.75
+404.50 , -7828.25 , -285.32
+404.50 , -7338.98 , -267.78
+404.50 , -6849.72 , -250.15
+404.50 , -6360.45 , -232.43
+404.50 , -5871.19 , -214.60
+404.50 , -5381.92 , -196.69
+404.50 , -4892.66 , -178.67
+404.50 , -4403.39 , -160.56
+404.50 , -3914.12 , -142.36
+404.50 , -3424.86 , -124.05
+404.50 , -2935.59 , -105.65
+404.50 , -2446.33 , -87.15
+404.50 , -1957.06 , -68.54
+404.50 , -1467.80 , -49.80
+404.50 , -978.53 , -30.89
+404.50 , -489.27 , -11.43
+404.50 , -97.85 , 0.00
+404.50 , 86.63 , 9.08
+404.50 , 433.14 , 26.62
+404.50 , 866.29 , 47.35
+404.50 , 1299.43 , 68.02
+404.50 , 1732.57 , 88.72
+404.50 , 2165.72 , 109.51
+404.50 , 2598.86 , 130.38
+404.50 , 3032.00 , 151.34
+404.50 , 3465.15 , 172.39
+404.50 , 3898.29 , 193.53
+404.50 , 4331.43 , 214.77
+404.50 , 4764.58 , 236.11
+404.50 , 5197.72 , 257.53
+404.50 , 5630.86 , 279.05
+404.50 , 6064.01 , 300.67
+404.50 , 6497.15 , 322.38
+404.50 , 6930.29 , 344.19
+404.50 , 7363.44 , 366.08
+404.50 , 7796.58 , 388.08
+404.50 , 8229.72 , 410.16
+404.50 , 8662.87 , 432.34
+438.21 , -9785.31 , -381.77
+438.21 , -9296.05 , -363.33
+438.21 , -8806.78 , -344.77
+438.21 , -8317.52 , -326.11
+438.21 , -7828.25 , -307.33
+438.21 , -7338.98 , -288.45
+438.21 , -6849.72 , -269.45
+438.21 , -6360.45 , -250.33
+438.21 , -5871.19 , -231.11
+438.21 , -5381.92 , -211.78
+438.21 , -4892.66 , -192.34
+438.21 , -4403.39 , -172.78
+438.21 , -3914.12 , -153.11
+438.21 , -3424.86 , -133.33
+438.21 , -2935.59 , -113.43
+438.21 , -2446.33 , -93.42
+438.21 , -1957.06 , -73.27
+438.21 , -1467.80 , -52.98
+438.21 , -978.53 , -32.45
+438.21 , -489.27 , -11.12
+438.21 , -97.85 , 0.00
+438.21 , 86.63 , 10.37
+438.21 , 433.14 , 29.60
+438.21 , 866.29 , 52.14
+438.21 , 1299.43 , 74.56
+438.21 , 1732.57 , 97.03
+438.21 , 2165.72 , 119.58
+438.21 , 2598.86 , 142.23
+438.21 , 3032.00 , 164.98
+438.21 , 3465.15 , 187.84
+438.21 , 3898.29 , 210.80
+438.21 , 4331.43 , 233.87
+438.21 , 4764.58 , 257.05
+438.21 , 5197.72 , 280.34
+438.21 , 5630.86 , 303.74
+438.21 , 6064.01 , 327.25
+438.21 , 6497.15 , 350.87
+438.21 , 6930.29 , 374.59
+438.21 , 7363.44 , 398.42
+438.21 , 7796.58 , 422.36
+438.21 , 8229.72 , 446.41
+438.21 , 8662.87 , 470.57
+471.92 , -9785.31 , -408.59
+471.92 , -9296.05 , -388.88
+471.92 , -8806.78 , -369.04
+471.92 , -8317.52 , -349.08
+471.92 , -7828.25 , -328.98
+471.92 , -7338.98 , -308.76
+471.92 , -6849.72 , -288.41
+471.92 , -6360.45 , -267.93
+471.92 , -5871.19 , -247.32
+471.92 , -5381.92 , -226.59
+471.92 , -4892.66 , -205.73
+471.92 , -4403.39 , -184.73
+471.92 , -3914.12 , -163.61
+471.92 , -3424.86 , -142.36
+471.92 , -2935.59 , -120.97
+471.92 , -2446.33 , -99.45
+471.92 , -1957.06 , -77.77
+471.92 , -1467.80 , -55.91
+471.92 , -978.53 , -33.75
+471.92 , -489.27 , -10.40
+471.92 , -97.85 , 0.00
+471.92 , 86.63 , 11.76
+471.92 , 433.14 , 32.74
+471.92 , 866.29 , 57.10
+471.92 , 1299.43 , 81.29
+471.92 , 1732.57 , 105.53
+471.92 , 2165.72 , 129.86
+471.92 , 2598.86 , 154.29
+471.92 , 3032.00 , 178.85
+471.92 , 3465.15 , 203.52
+471.92 , 3898.29 , 228.31
+471.92 , 4331.43 , 253.23
+471.92 , 4764.58 , 278.27
+471.92 , 5197.72 , 303.44
+471.92 , 5630.86 , 328.73
+471.92 , 6064.01 , 354.14
+471.92 , 6497.15 , 379.68
+471.92 , 6930.29 , 405.34
+471.92 , 7363.44 , 431.13
+471.92 , 7796.58 , 457.03
+471.92 , 8229.72 , 483.07
+471.92 , 8662.87 , 509.22
+505.62 , -9785.31 , -434.93
+505.62 , -9296.05 , -413.98
+505.62 , -8806.78 , -392.88
+505.62 , -8317.52 , -371.64
+505.62 , -7828.25 , -350.25
+505.62 , -7338.98 , -328.71
+505.62 , -6849.72 , -307.03
+505.62 , -6360.45 , -285.20
+505.62 , -5871.19 , -263.22
+505.62 , -5381.92 , -241.10
+505.62 , -4892.66 , -218.83
+505.62 , -4403.39 , -196.41
+505.62 , -3914.12 , -173.85
+505.62 , -3424.86 , -151.13
+505.62 , -2935.59 , -128.26
+505.62 , -2446.33 , -105.23
+505.62 , -1957.06 , -82.02
+505.62 , -1467.80 , -58.59
+505.62 , -978.53 , -34.77
+505.62 , -489.27 , -9.14
+505.62 , -97.85 , 0.00
+505.62 , 86.63 , 13.25
+505.62 , 433.14 , 36.05
+505.62 , 866.29 , 62.25
+505.62 , 1299.43 , 88.23
+505.62 , 1732.57 , 114.25
+505.62 , 2165.72 , 140.36
+505.62 , 2598.86 , 166.59
+505.62 , 3032.00 , 192.95
+505.62 , 3465.15 , 219.45
+505.62 , 3898.29 , 246.08
+505.62 , 4331.43 , 272.86
+505.62 , 4764.58 , 299.77
+505.62 , 5197.72 , 326.82
+505.62 , 5630.86 , 354.02
+505.62 , 6064.01 , 381.35
+505.62 , 6497.15 , 408.83
+505.62 , 6930.29 , 436.45
+505.62 , 7363.44 , 464.20
+505.62 , 7796.58 , 492.10
+505.62 , 8229.72 , 520.14
+505.62 , 8662.87 , 548.31
+539.33 , -9785.31 , -460.78
+539.33 , -9296.05 , -438.62
+539.33 , -8806.78 , -416.28
+539.33 , -8317.52 , -393.78
+539.33 , -7828.25 , -371.11
+539.33 , -7338.98 , -348.28
+539.33 , -6849.72 , -325.28
+539.33 , -6360.45 , -302.11
+539.33 , -5871.19 , -278.78
+539.33 , -5381.92 , -255.29
+539.33 , -4892.66 , -231.62
+539.33 , -4403.39 , -207.79
+539.33 , -3914.12 , -183.79
+539.33 , -3424.86 , -159.62
+539.33 , -2935.59 , -135.27
+539.33 , -2446.33 , -110.74
+539.33 , -1957.06 , -85.99
+539.33 , -1467.80 , -60.98
+539.33 , -978.53 , -35.47
+539.33 , -489.27 , -7.05
+539.33 , -97.85 , 0.00
+539.33 , 86.63 , 14.84
+539.33 , 433.14 , 39.53
+539.33 , 866.29 , 67.60
+539.33 , 1299.43 , 95.38
+539.33 , 1732.57 , 123.18
+539.33 , 2165.72 , 151.09
+539.33 , 2598.86 , 179.12
+539.33 , 3032.00 , 207.30
+539.33 , 3465.15 , 235.63
+539.33 , 3898.29 , 264.12
+539.33 , 4331.43 , 292.76
+539.33 , 4764.58 , 321.56
+539.33 , 5197.72 , 350.51
+539.33 , 5630.86 , 379.63
+539.33 , 6064.01 , 408.90
+539.33 , 6497.15 , 438.33
+539.33 , 6930.29 , 467.92
+539.33 , 7363.44 , 497.67
+539.33 , 7796.58 , 527.57
+539.33 , 8229.72 , 557.64
+539.33 , 8662.87 , 587.85
+573.04 , -9785.31 , -486.12
+573.04 , -9296.05 , -462.76
+573.04 , -8806.78 , -439.22
+573.04 , -8317.52 , -415.48
+573.04 , -7828.25 , -391.56
+573.04 , -7338.98 , -367.45
+573.04 , -6849.72 , -343.15
+573.04 , -6360.45 , -318.67
+573.04 , -5871.19 , -294.00
+573.04 , -5381.92 , -269.14
+573.04 , -4892.66 , -244.09
+573.04 , -4403.39 , -218.86
+573.04 , -3914.12 , -193.44
+573.04 , -3424.86 , -167.82
+573.04 , -2935.59 , -142.00
+573.04 , -2446.33 , -115.96
+573.04 , -1957.06 , -89.67
+573.04 , -1467.80 , -63.06
+573.04 , -978.53 , -35.80
+573.04 , -489.27 , -3.22
+573.04 , -97.85 , 0.00
+573.04 , 86.63 , 16.54
+573.04 , 433.14 , 43.18
+573.04 , 866.29 , 73.16
+573.04 , 1299.43 , 102.75
+573.04 , 1732.57 , 132.35
+573.04 , 2165.72 , 162.06
+573.04 , 2598.86 , 191.91
+573.04 , 3032.00 , 221.91
+573.04 , 3465.15 , 252.09
+573.04 , 3898.29 , 282.44
+573.04 , 4331.43 , 312.96
+573.04 , 4764.58 , 343.65
+573.04 , 5197.72 , 374.52
+573.04 , 5630.86 , 405.57
+573.04 , 6064.01 , 436.80
+573.04 , 6497.15 , 468.20
+573.04 , 6930.29 , 499.78
+573.04 , 7363.44 , 531.53
+573.04 , 7796.58 , 563.46
+573.04 , 8229.72 , 595.57
+573.04 , 8662.87 , 627.85
+606.75 , -9785.31 , -510.93
+606.75 , -9296.05 , -486.40
+606.75 , -8806.78 , -461.67
+606.75 , -8317.52 , -436.72
+606.75 , -7828.25 , -411.56
+606.75 , -7338.98 , -386.20
+606.75 , -6849.72 , -360.62
+606.75 , -6360.45 , -334.84
+606.75 , -5871.19 , -308.84
+606.75 , -5381.92 , -282.64
+606.75 , -4892.66 , -256.22
+606.75 , -4403.39 , -229.60
+606.75 , -3914.12 , -202.76
+606.75 , -3424.86 , -175.70
+606.75 , -2935.59 , -148.41
+606.75 , -2446.33 , -120.87
+606.75 , -1957.06 , -93.04
+606.75 , -1467.80 , -64.80
+606.75 , -978.53 , -35.73
+606.75 , -489.27 , 0.00
+606.75 , -97.85 , 0.00
+606.75 , 86.63 , 18.35
+606.75 , 433.14 , 47.02
+606.75 , 866.29 , 78.93
+606.75 , 1299.43 , 110.35
+606.75 , 1732.57 , 141.76
+606.75 , 2165.72 , 173.28
+606.75 , 2598.86 , 204.95
+606.75 , 3032.00 , 236.80
+606.75 , 3465.15 , 268.83
+606.75 , 3898.29 , 301.04
+606.75 , 4331.43 , 333.46
+606.75 , 4764.58 , 366.06
+606.75 , 5197.72 , 398.86
+606.75 , 5630.86 , 431.86
+606.75 , 6064.01 , 465.05
+606.75 , 6497.15 , 498.44
+606.75 , 6930.29 , 532.03
+606.75 , 7363.44 , 565.81
+606.75 , 7796.58 , 599.79
+606.75 , 8229.72 , 633.96
+606.75 , 8662.87 , 668.33
+640.46 , -9785.31 , -535.19
+640.46 , -9296.05 , -509.52
+640.46 , -8806.78 , -483.62
+640.46 , -8317.52 , -457.48
+640.46 , -7828.25 , -431.11
+640.46 , -7338.98 , -404.51
+640.46 , -6849.72 , -377.67
+640.46 , -6360.45 , -350.60
+640.46 , -5871.19 , -323.30
+640.46 , -5381.92 , -295.76
+640.46 , -4892.66 , -267.99
+640.46 , -4403.39 , -239.99
+640.46 , -3914.12 , -211.74
+640.46 , -3424.86 , -183.24
+640.46 , -2935.59 , -154.48
+640.46 , -2446.33 , -125.44
+640.46 , -1957.06 , -96.05
+640.46 , -1467.80 , -66.18
+640.46 , -978.53 , -35.19
+640.46 , -489.27 , 0.00
+640.46 , -97.85 , 0.00
+640.46 , 86.63 , 20.27
+640.46 , 433.14 , 51.05
+640.46 , 866.29 , 84.92
+640.46 , 1299.43 , 118.19
+640.46 , 1732.57 , 151.42
+640.46 , 2165.72 , 184.76
+640.46 , 2598.86 , 218.27
+640.46 , 3032.00 , 251.96
+640.46 , 3465.15 , 285.86
+640.46 , 3898.29 , 319.96
+640.46 , 4331.43 , 354.27
+640.46 , 4764.58 , 388.80
+640.46 , 5197.72 , 423.54
+640.46 , 5630.86 , 458.50
+640.46 , 6064.01 , 493.68
+640.46 , 6497.15 , 529.07
+640.46 , 6930.29 , 564.68
+640.46 , 7363.44 , 600.51
+640.46 , 7796.58 , 636.55
+640.46 , 8229.72 , 672.81
+640.46 , 8662.87 , 709.28
+674.17 , -9785.31 , -558.87
+674.17 , -9296.05 , -532.09
+674.17 , -8806.78 , -505.05
+674.17 , -8317.52 , -477.75
+674.17 , -7828.25 , -450.19
+674.17 , -7338.98 , -422.37
+674.17 , -6849.72 , -394.29
+674.17 , -6360.45 , -365.95
+674.17 , -5871.19 , -337.36
+674.17 , -5381.92 , -308.50
+674.17 , -4892.66 , -279.38
+674.17 , -4403.39 , -250.00
+674.17 , -3914.12 , -220.35
+674.17 , -3424.86 , -190.43
+674.17 , -2935.59 , -160.20
+674.17 , -2446.33 , -129.65
+674.17 , -1957.06 , -98.70
+674.17 , -1467.80 , -67.15
+674.17 , -978.53 , -34.12
+674.17 , -489.27 , 0.00
+674.17 , -97.85 , 0.00
+674.17 , 86.63 , 22.30
+674.17 , 433.14 , 55.27
+674.17 , 866.29 , 91.14
+674.17 , 1299.43 , 126.27
+674.17 , 1732.57 , 161.34
+674.17 , 2165.72 , 196.52
+674.17 , 2598.86 , 231.87
+674.17 , 3032.00 , 267.42
+674.17 , 3465.15 , 303.19
+674.17 , 3898.29 , 339.18
+674.17 , 4331.43 , 375.41
+674.17 , 4764.58 , 411.87
+674.17 , 5197.72 , 448.57
+674.17 , 5630.86 , 485.51
+674.17 , 6064.01 , 522.68
+674.17 , 6497.15 , 560.09
+674.17 , 6930.29 , 597.75
+674.17 , 7363.44 , 635.63
+674.17 , 7796.58 , 673.76
+674.17 , 8229.72 , 712.12
+674.17 , 8662.87 , 750.73
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_3.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..55066d31695ad3421b5ce6a0cac2b0ec831c3a20
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -5707.13 , 0.00
+0.00 , -5421.78 , 0.00
+0.00 , -5136.42 , 0.00
+0.00 , -4851.06 , 0.00
+0.00 , -4565.71 , 0.00
+0.00 , -4280.35 , 0.00
+0.00 , -3994.99 , -0.07
+0.00 , -3709.64 , -0.33
+0.00 , -3424.28 , -0.49
+0.00 , -3138.92 , -0.60
+0.00 , -2853.57 , -0.66
+0.00 , -2568.21 , -0.69
+0.00 , -2282.85 , -0.70
+0.00 , -1997.50 , -0.67
+0.00 , -1712.14 , -0.63
+0.00 , -1426.78 , -0.57
+0.00 , -1141.43 , -0.48
+0.00 , -856.07 , -0.38
+0.00 , -570.71 , -0.27
+0.00 , -285.36 , -0.13
+0.00 , -57.07 , -0.01
+0.00 , 51.57 , 0.06
+0.00 , 257.86 , 0.28
+0.00 , 515.72 , 0.56
+0.00 , 773.58 , 0.85
+0.00 , 1031.44 , 1.15
+0.00 , 1289.30 , 1.47
+0.00 , 1547.16 , 1.79
+0.00 , 1805.02 , 2.12
+0.00 , 2062.88 , 2.47
+0.00 , 2320.74 , 2.82
+0.00 , 2578.60 , 3.19
+0.00 , 2836.46 , 3.56
+0.00 , 3094.32 , 3.94
+0.00 , 3352.18 , 4.33
+0.00 , 3610.04 , 4.74
+0.00 , 3867.90 , 5.15
+0.00 , 4125.76 , 5.57
+0.00 , 4383.62 , 6.00
+0.00 , 4641.48 , 6.43
+0.00 , 4899.34 , 6.88
+0.00 , 5157.20 , 7.34
+5.72 , -5707.13 , 0.00
+5.72 , -5421.78 , 0.00
+5.72 , -5136.42 , 0.00
+5.72 , -4851.06 , 0.00
+5.72 , -4565.71 , 0.00
+5.72 , -4280.35 , 0.00
+5.72 , -3994.99 , -0.25
+5.72 , -3709.64 , -0.42
+5.72 , -3424.28 , -0.52
+5.72 , -3138.92 , -0.58
+5.72 , -2853.57 , -0.61
+5.72 , -2568.21 , -0.62
+5.72 , -2282.85 , -0.61
+5.72 , -1997.50 , -0.58
+5.72 , -1712.14 , -0.53
+5.72 , -1426.78 , -0.47
+5.72 , -1141.43 , -0.40
+5.72 , -856.07 , -0.31
+5.72 , -570.71 , -0.22
+5.72 , -285.36 , -0.11
+5.72 , -57.07 , -0.01
+5.72 , 51.57 , 0.05
+5.72 , 257.86 , 0.21
+5.72 , 515.72 , 0.43
+5.72 , 773.58 , 0.65
+5.72 , 1031.44 , 0.88
+5.72 , 1289.30 , 1.11
+5.72 , 1547.16 , 1.36
+5.72 , 1805.02 , 1.61
+5.72 , 2062.88 , 1.87
+5.72 , 2320.74 , 2.13
+5.72 , 2578.60 , 2.40
+5.72 , 2836.46 , 2.68
+5.72 , 3094.32 , 2.97
+5.72 , 3352.18 , 3.26
+5.72 , 3610.04 , 3.56
+5.72 , 3867.90 , 3.86
+5.72 , 4125.76 , 4.18
+5.72 , 4383.62 , 4.50
+5.72 , 4641.48 , 4.82
+5.72 , 4899.34 , 5.15
+5.72 , 5157.20 , 5.49
+57.21 , -5707.13 , -29.05
+57.21 , -5421.78 , -27.68
+57.21 , -5136.42 , -26.31
+57.21 , -4851.06 , -24.92
+57.21 , -4565.71 , -23.53
+57.21 , -4280.35 , -22.12
+57.21 , -3994.99 , -20.71
+57.21 , -3709.64 , -19.28
+57.21 , -3424.28 , -17.85
+57.21 , -3138.92 , -16.41
+57.21 , -2853.57 , -14.95
+57.21 , -2568.21 , -13.49
+57.21 , -2282.85 , -12.02
+57.21 , -1997.50 , -10.53
+57.21 , -1712.14 , -9.04
+57.21 , -1426.78 , -7.54
+57.21 , -1141.43 , -6.03
+57.21 , -856.07 , -4.51
+57.21 , -570.71 , -2.98
+57.21 , -285.36 , -1.44
+57.21 , -57.07 , -0.18
+57.21 , 51.57 , 0.45
+57.21 , 257.86 , 1.84
+57.21 , 515.72 , 3.58
+57.21 , 773.58 , 5.33
+57.21 , 1031.44 , 7.09
+57.21 , 1289.30 , 8.85
+57.21 , 1547.16 , 10.63
+57.21 , 1805.02 , 12.42
+57.21 , 2062.88 , 14.21
+57.21 , 2320.74 , 16.02
+57.21 , 2578.60 , 17.84
+57.21 , 2836.46 , 19.66
+57.21 , 3094.32 , 21.49
+57.21 , 3352.18 , 23.34
+57.21 , 3610.04 , 25.19
+57.21 , 3867.90 , 27.05
+57.21 , 4125.76 , 28.93
+57.21 , 4383.62 , 30.81
+57.21 , 4641.48 , 32.70
+57.21 , 4899.34 , 34.60
+57.21 , 5157.20 , 36.50
+114.41 , -5707.13 , -60.28
+114.41 , -5421.78 , -57.37
+114.41 , -5136.42 , -54.44
+114.41 , -4851.06 , -51.49
+114.41 , -4565.71 , -48.54
+114.41 , -4280.35 , -45.58
+114.41 , -3994.99 , -42.60
+114.41 , -3709.64 , -39.61
+114.41 , -3424.28 , -36.61
+114.41 , -3138.92 , -33.60
+114.41 , -2853.57 , -30.58
+114.41 , -2568.21 , -27.55
+114.41 , -2282.85 , -24.51
+114.41 , -1997.50 , -21.45
+114.41 , -1712.14 , -18.38
+114.41 , -1426.78 , -15.31
+114.41 , -1141.43 , -12.22
+114.41 , -856.07 , -9.12
+114.41 , -570.71 , -6.00
+114.41 , -285.36 , -2.88
+114.41 , -57.07 , -0.33
+114.41 , 51.57 , 0.92
+114.41 , 257.86 , 3.68
+114.41 , 515.72 , 7.11
+114.41 , 773.58 , 10.56
+114.41 , 1031.44 , 14.01
+114.41 , 1289.30 , 17.48
+114.41 , 1547.16 , 20.96
+114.41 , 1805.02 , 24.45
+114.41 , 2062.88 , 27.95
+114.41 , 2320.74 , 31.47
+114.41 , 2578.60 , 34.99
+114.41 , 2836.46 , 38.53
+114.41 , 3094.32 , 42.08
+114.41 , 3352.18 , 45.64
+114.41 , 3610.04 , 49.21
+114.41 , 3867.90 , 52.79
+114.41 , 4125.76 , 56.38
+114.41 , 4383.62 , 59.99
+114.41 , 4641.48 , 63.60
+114.41 , 4899.34 , 67.23
+114.41 , 5157.20 , 70.87
+171.62 , -5707.13 , -91.22
+171.62 , -5421.78 , -86.77
+171.62 , -5136.42 , -82.31
+171.62 , -4851.06 , -77.84
+171.62 , -4565.71 , -73.35
+171.62 , -4280.35 , -68.84
+171.62 , -3994.99 , -64.32
+171.62 , -3709.64 , -59.79
+171.62 , -3424.28 , -55.24
+171.62 , -3138.92 , -50.68
+171.62 , -2853.57 , -46.11
+171.62 , -2568.21 , -41.51
+171.62 , -2282.85 , -36.91
+171.62 , -1997.50 , -32.29
+171.62 , -1712.14 , -27.66
+171.62 , -1426.78 , -23.01
+171.62 , -1141.43 , -18.35
+171.62 , -856.07 , -13.67
+171.62 , -570.71 , -8.98
+171.62 , -285.36 , -4.27
+171.62 , -57.07 , -0.39
+171.62 , 51.57 , 1.43
+171.62 , 257.86 , 5.56
+171.62 , 515.72 , 10.69
+171.62 , 773.58 , 15.84
+171.62 , 1031.44 , 21.00
+171.62 , 1289.30 , 26.17
+171.62 , 1547.16 , 31.36
+171.62 , 1805.02 , 36.56
+171.62 , 2062.88 , 41.77
+171.62 , 2320.74 , 47.01
+171.62 , 2578.60 , 52.25
+171.62 , 2836.46 , 57.51
+171.62 , 3094.32 , 62.79
+171.62 , 3352.18 , 68.08
+171.62 , 3610.04 , 73.38
+171.62 , 3867.90 , 78.70
+171.62 , 4125.76 , 84.03
+171.62 , 4383.62 , 89.38
+171.62 , 4641.48 , 94.74
+171.62 , 4899.34 , 100.12
+171.62 , 5157.20 , 105.51
+228.82 , -5707.13 , -121.86
+228.82 , -5421.78 , -115.91
+228.82 , -5136.42 , -109.94
+228.82 , -4851.06 , -103.95
+228.82 , -4565.71 , -97.94
+228.82 , -4280.35 , -91.91
+228.82 , -3994.99 , -85.87
+228.82 , -3709.64 , -79.81
+228.82 , -3424.28 , -73.73
+228.82 , -3138.92 , -67.63
+228.82 , -2853.57 , -61.51
+228.82 , -2568.21 , -55.37
+228.82 , -2282.85 , -49.21
+228.82 , -1997.50 , -43.04
+228.82 , -1712.14 , -36.85
+228.82 , -1426.78 , -30.64
+228.82 , -1141.43 , -24.41
+228.82 , -856.07 , -18.16
+228.82 , -570.71 , -11.89
+228.82 , -285.36 , -5.59
+228.82 , -57.07 , -0.32
+228.82 , 51.57 , 1.99
+228.82 , 257.86 , 7.50
+228.82 , 515.72 , 14.34
+228.82 , 773.58 , 21.19
+228.82 , 1031.44 , 28.05
+228.82 , 1289.30 , 34.94
+228.82 , 1547.16 , 41.84
+228.82 , 1805.02 , 48.76
+228.82 , 2062.88 , 55.70
+228.82 , 2320.74 , 62.66
+228.82 , 2578.60 , 69.63
+228.82 , 2836.46 , 76.63
+228.82 , 3094.32 , 83.65
+228.82 , 3352.18 , 90.68
+228.82 , 3610.04 , 97.73
+228.82 , 3867.90 , 104.80
+228.82 , 4125.76 , 111.90
+228.82 , 4383.62 , 119.00
+228.82 , 4641.48 , 126.13
+228.82 , 4899.34 , 133.28
+228.82 , 5157.20 , 140.44
+286.03 , -5707.13 , -152.18
+286.03 , -5421.78 , -144.75
+286.03 , -5136.42 , -137.29
+286.03 , -4851.06 , -129.81
+286.03 , -4565.71 , -122.31
+286.03 , -4280.35 , -114.78
+286.03 , -3994.99 , -107.23
+286.03 , -3709.64 , -99.65
+286.03 , -3424.28 , -92.05
+286.03 , -3138.92 , -84.42
+286.03 , -2853.57 , -76.77
+286.03 , -2568.21 , -69.10
+286.03 , -2282.85 , -61.41
+286.03 , -1997.50 , -53.69
+286.03 , -1712.14 , -45.94
+286.03 , -1426.78 , -38.17
+286.03 , -1141.43 , -30.38
+286.03 , -856.07 , -22.57
+286.03 , -570.71 , -14.72
+286.03 , -285.36 , -6.84
+286.03 , -57.07 , 0.00
+286.03 , 51.57 , 2.61
+286.03 , 257.86 , 9.52
+286.03 , 515.72 , 18.06
+286.03 , 773.58 , 26.62
+286.03 , 1031.44 , 35.19
+286.03 , 1289.30 , 43.79
+286.03 , 1547.16 , 52.42
+286.03 , 1805.02 , 61.07
+286.03 , 2062.88 , 69.74
+286.03 , 2320.74 , 78.43
+286.03 , 2578.60 , 87.15
+286.03 , 2836.46 , 95.90
+286.03 , 3094.32 , 104.67
+286.03 , 3352.18 , 113.46
+286.03 , 3610.04 , 122.28
+286.03 , 3867.90 , 131.12
+286.03 , 4125.76 , 139.99
+286.03 , 4383.62 , 148.88
+286.03 , 4641.48 , 157.79
+286.03 , 4899.34 , 166.73
+286.03 , 5157.20 , 175.69
+343.23 , -5707.13 , -182.19
+343.23 , -5421.78 , -173.29
+343.23 , -5136.42 , -164.37
+343.23 , -4851.06 , -155.42
+343.23 , -4565.71 , -146.44
+343.23 , -4280.35 , -137.42
+343.23 , -3994.99 , -128.38
+343.23 , -3709.64 , -119.30
+343.23 , -3424.28 , -110.20
+343.23 , -3138.92 , -101.06
+343.23 , -2853.57 , -91.89
+343.23 , -2568.21 , -82.70
+343.23 , -2282.85 , -73.47
+343.23 , -1997.50 , -64.21
+343.23 , -1712.14 , -54.93
+343.23 , -1426.78 , -45.61
+343.23 , -1141.43 , -36.26
+343.23 , -856.07 , -26.87
+343.23 , -570.71 , -17.46
+343.23 , -285.36 , -7.98
+343.23 , -57.07 , 0.00
+343.23 , 51.57 , 3.29
+343.23 , 257.86 , 11.62
+343.23 , 515.72 , 21.88
+343.23 , 773.58 , 32.14
+343.23 , 1031.44 , 42.44
+343.23 , 1289.30 , 52.76
+343.23 , 1547.16 , 63.11
+343.23 , 1805.02 , 73.49
+343.23 , 2062.88 , 83.91
+343.23 , 2320.74 , 94.35
+343.23 , 2578.60 , 104.82
+343.23 , 2836.46 , 115.33
+343.23 , 3094.32 , 125.87
+343.23 , 3352.18 , 136.43
+343.23 , 3610.04 , 147.03
+343.23 , 3867.90 , 157.66
+343.23 , 4125.76 , 168.32
+343.23 , 4383.62 , 179.01
+343.23 , 4641.48 , 189.74
+343.23 , 4899.34 , 200.49
+343.23 , 5157.20 , 211.27
+400.44 , -5707.13 , -211.85
+400.44 , -5421.78 , -201.52
+400.44 , -5136.42 , -191.16
+400.44 , -4851.06 , -180.75
+400.44 , -4565.71 , -170.31
+400.44 , -4280.35 , -159.83
+400.44 , -3994.99 , -149.31
+400.44 , -3709.64 , -138.75
+400.44 , -3424.28 , -128.16
+400.44 , -3138.92 , -117.52
+400.44 , -2853.57 , -106.85
+400.44 , -2568.21 , -96.14
+400.44 , -2282.85 , -85.39
+400.44 , -1997.50 , -74.61
+400.44 , -1712.14 , -63.78
+400.44 , -1426.78 , -52.92
+400.44 , -1141.43 , -42.02
+400.44 , -856.07 , -31.07
+400.44 , -570.71 , -20.08
+400.44 , -285.36 , -9.00
+400.44 , -57.07 , 0.00
+400.44 , 51.57 , 4.05
+400.44 , 257.86 , 13.82
+400.44 , 515.72 , 25.80
+400.44 , 773.58 , 37.78
+400.44 , 1031.44 , 49.79
+400.44 , 1289.30 , 61.84
+400.44 , 1547.16 , 73.93
+400.44 , 1805.02 , 86.05
+400.44 , 2062.88 , 98.22
+400.44 , 2320.74 , 110.42
+400.44 , 2578.60 , 122.66
+400.44 , 2836.46 , 134.94
+400.44 , 3094.32 , 147.26
+400.44 , 3352.18 , 159.61
+400.44 , 3610.04 , 172.01
+400.44 , 3867.90 , 184.44
+400.44 , 4125.76 , 196.92
+400.44 , 4383.62 , 209.43
+400.44 , 4641.48 , 221.98
+400.44 , 4899.34 , 234.57
+400.44 , 5157.20 , 247.19
+457.64 , -5707.13 , -241.15
+457.64 , -5421.78 , -229.41
+457.64 , -5136.42 , -217.63
+457.64 , -4851.06 , -205.79
+457.64 , -4565.71 , -193.91
+457.64 , -4280.35 , -181.98
+457.64 , -3994.99 , -170.01
+457.64 , -3709.64 , -157.99
+457.64 , -3424.28 , -145.91
+457.64 , -3138.92 , -133.80
+457.64 , -2853.57 , -121.63
+457.64 , -2568.21 , -109.42
+457.64 , -2282.85 , -97.16
+457.64 , -1997.50 , -84.85
+457.64 , -1712.14 , -72.50
+457.64 , -1426.78 , -60.10
+457.64 , -1141.43 , -47.65
+457.64 , -856.07 , -35.14
+457.64 , -570.71 , -22.57
+457.64 , -285.36 , -9.88
+457.64 , -57.07 , 0.00
+457.64 , 51.57 , 4.88
+457.64 , 257.86 , 16.13
+457.64 , 515.72 , 29.83
+457.64 , 773.58 , 43.53
+457.64 , 1031.44 , 57.27
+457.64 , 1289.30 , 71.06
+457.64 , 1547.16 , 84.89
+457.64 , 1805.02 , 98.76
+457.64 , 2062.88 , 112.68
+457.64 , 2320.74 , 126.65
+457.64 , 2578.60 , 140.67
+457.64 , 2836.46 , 154.74
+457.64 , 3094.32 , 168.85
+457.64 , 3352.18 , 183.01
+457.64 , 3610.04 , 197.22
+457.64 , 3867.90 , 211.48
+457.64 , 4125.76 , 225.78
+457.64 , 4383.62 , 240.13
+457.64 , 4641.48 , 254.53
+457.64 , 4899.34 , 268.97
+457.64 , 5157.20 , 283.46
+514.85 , -5707.13 , -270.09
+514.85 , -5421.78 , -256.96
+514.85 , -5136.42 , -243.78
+514.85 , -4851.06 , -230.53
+514.85 , -4565.71 , -217.23
+514.85 , -4280.35 , -203.87
+514.85 , -3994.99 , -190.46
+514.85 , -3709.64 , -176.98
+514.85 , -3424.28 , -163.45
+514.85 , -3138.92 , -149.87
+514.85 , -2853.57 , -136.22
+514.85 , -2568.21 , -122.52
+514.85 , -2282.85 , -108.76
+514.85 , -1997.50 , -94.94
+514.85 , -1712.14 , -81.06
+514.85 , -1426.78 , -67.13
+514.85 , -1141.43 , -53.13
+514.85 , -856.07 , -39.07
+514.85 , -570.71 , -24.92
+514.85 , -285.36 , -10.59
+514.85 , -57.07 , 0.00
+514.85 , 51.57 , 5.80
+514.85 , 257.86 , 18.55
+514.85 , 515.72 , 33.99
+514.85 , 773.58 , 49.42
+514.85 , 1031.44 , 64.90
+514.85 , 1289.30 , 80.42
+514.85 , 1547.16 , 96.00
+514.85 , 1805.02 , 111.63
+514.85 , 2062.88 , 127.32
+514.85 , 2320.74 , 143.07
+514.85 , 2578.60 , 158.88
+514.85 , 2836.46 , 174.74
+514.85 , 3094.32 , 190.66
+514.85 , 3352.18 , 206.64
+514.85 , 3610.04 , 222.68
+514.85 , 3867.90 , 238.77
+514.85 , 4125.76 , 254.92
+514.85 , 4383.62 , 271.13
+514.85 , 4641.48 , 287.40
+514.85 , 4899.34 , 303.72
+514.85 , 5157.20 , 320.10
+572.06 , -5707.13 , -298.63
+572.06 , -5421.78 , -284.14
+572.06 , -5136.42 , -269.58
+572.06 , -4851.06 , -254.95
+572.06 , -4565.71 , -240.25
+572.06 , -4280.35 , -225.48
+572.06 , -3994.99 , -210.64
+572.06 , -3709.64 , -195.74
+572.06 , -3424.28 , -180.76
+572.06 , -3138.92 , -165.71
+572.06 , -2853.57 , -150.60
+572.06 , -2568.21 , -135.42
+572.06 , -2282.85 , -120.16
+572.06 , -1997.50 , -104.84
+572.06 , -1712.14 , -89.45
+572.06 , -1426.78 , -73.99
+572.06 , -1141.43 , -58.45
+572.06 , -856.07 , -42.83
+572.06 , -570.71 , -27.10
+572.06 , -285.36 , -11.12
+572.06 , -57.07 , 0.00
+572.06 , 51.57 , 6.80
+572.06 , 257.86 , 21.10
+572.06 , 515.72 , 38.29
+572.06 , 773.58 , 55.46
+572.06 , 1031.44 , 72.67
+572.06 , 1289.30 , 89.94
+572.06 , 1547.16 , 107.27
+572.06 , 1805.02 , 124.67
+572.06 , 2062.88 , 142.14
+572.06 , 2320.74 , 159.68
+572.06 , 2578.60 , 177.29
+572.06 , 2836.46 , 194.96
+572.06 , 3094.32 , 212.70
+572.06 , 3352.18 , 230.52
+572.06 , 3610.04 , 248.40
+572.06 , 3867.90 , 266.35
+572.06 , 4125.76 , 284.37
+572.06 , 4383.62 , 302.45
+572.06 , 4641.48 , 320.61
+572.06 , 4899.34 , 338.83
+572.06 , 5157.20 , 357.12
+629.26 , -5707.13 , -326.77
+629.26 , -5421.78 , -310.94
+629.26 , -5136.42 , -295.03
+629.26 , -4851.06 , -279.03
+629.26 , -4565.71 , -262.95
+629.26 , -4280.35 , -246.79
+629.26 , -3994.99 , -230.55
+629.26 , -3709.64 , -214.22
+629.26 , -3424.28 , -197.81
+629.26 , -3138.92 , -181.33
+629.26 , -2853.57 , -164.76
+629.26 , -2568.21 , -148.10
+629.26 , -2282.85 , -131.37
+629.26 , -1997.50 , -114.55
+629.26 , -1712.14 , -97.65
+629.26 , -1426.78 , -80.67
+629.26 , -1141.43 , -63.59
+629.26 , -856.07 , -46.42
+629.26 , -570.71 , -29.10
+629.26 , -285.36 , -11.41
+629.26 , -57.07 , 0.00
+629.26 , 51.57 , 7.90
+629.26 , 257.86 , 23.79
+629.26 , 515.72 , 42.74
+629.26 , 773.58 , 61.65
+629.26 , 1031.44 , 80.61
+629.26 , 1289.30 , 99.63
+629.26 , 1547.16 , 118.73
+629.26 , 1805.02 , 137.91
+629.26 , 2062.88 , 157.16
+629.26 , 2320.74 , 176.50
+629.26 , 2578.60 , 195.91
+629.26 , 2836.46 , 215.41
+629.26 , 3094.32 , 234.99
+629.26 , 3352.18 , 254.65
+629.26 , 3610.04 , 274.39
+629.26 , 3867.90 , 294.21
+629.26 , 4125.76 , 314.12
+629.26 , 4383.62 , 334.10
+629.26 , 4641.48 , 354.16
+629.26 , 4899.34 , 374.31
+629.26 , 5157.20 , 394.53
+686.47 , -5707.13 , -354.49
+686.47 , -5421.78 , -337.34
+686.47 , -5136.42 , -320.10
+686.47 , -4851.06 , -302.75
+686.47 , -4565.71 , -285.32
+686.47 , -4280.35 , -267.78
+686.47 , -3994.99 , -250.15
+686.47 , -3709.64 , -232.43
+686.47 , -3424.28 , -214.60
+686.47 , -3138.92 , -196.69
+686.47 , -2853.57 , -178.67
+686.47 , -2568.21 , -160.56
+686.47 , -2282.85 , -142.36
+686.47 , -1997.50 , -124.05
+686.47 , -1712.14 , -105.65
+686.47 , -1426.78 , -87.15
+686.47 , -1141.43 , -68.54
+686.47 , -856.07 , -49.80
+686.47 , -570.71 , -30.89
+686.47 , -285.36 , -11.43
+686.47 , -57.07 , 0.00
+686.47 , 51.57 , 9.08
+686.47 , 257.86 , 26.62
+686.47 , 515.72 , 47.35
+686.47 , 773.58 , 68.02
+686.47 , 1031.44 , 88.72
+686.47 , 1289.30 , 109.51
+686.47 , 1547.16 , 130.38
+686.47 , 1805.02 , 151.34
+686.47 , 2062.88 , 172.39
+686.47 , 2320.74 , 193.53
+686.47 , 2578.60 , 214.77
+686.47 , 2836.46 , 236.11
+686.47 , 3094.32 , 257.53
+686.47 , 3352.18 , 279.05
+686.47 , 3610.04 , 300.67
+686.47 , 3867.90 , 322.38
+686.47 , 4125.76 , 344.19
+686.47 , 4383.62 , 366.08
+686.47 , 4641.48 , 388.08
+686.47 , 4899.34 , 410.16
+686.47 , 5157.20 , 432.34
+743.67 , -5707.13 , -381.77
+743.67 , -5421.78 , -363.33
+743.67 , -5136.42 , -344.77
+743.67 , -4851.06 , -326.11
+743.67 , -4565.71 , -307.33
+743.67 , -4280.35 , -288.45
+743.67 , -3994.99 , -269.45
+743.67 , -3709.64 , -250.33
+743.67 , -3424.28 , -231.11
+743.67 , -3138.92 , -211.78
+743.67 , -2853.57 , -192.34
+743.67 , -2568.21 , -172.78
+743.67 , -2282.85 , -153.11
+743.67 , -1997.50 , -133.33
+743.67 , -1712.14 , -113.43
+743.67 , -1426.78 , -93.42
+743.67 , -1141.43 , -73.27
+743.67 , -856.07 , -52.98
+743.67 , -570.71 , -32.45
+743.67 , -285.36 , -11.12
+743.67 , -57.07 , 0.00
+743.67 , 51.57 , 10.37
+743.67 , 257.86 , 29.60
+743.67 , 515.72 , 52.14
+743.67 , 773.58 , 74.56
+743.67 , 1031.44 , 97.03
+743.67 , 1289.30 , 119.58
+743.67 , 1547.16 , 142.23
+743.67 , 1805.02 , 164.98
+743.67 , 2062.88 , 187.84
+743.67 , 2320.74 , 210.80
+743.67 , 2578.60 , 233.87
+743.67 , 2836.46 , 257.05
+743.67 , 3094.32 , 280.34
+743.67 , 3352.18 , 303.74
+743.67 , 3610.04 , 327.25
+743.67 , 3867.90 , 350.87
+743.67 , 4125.76 , 374.59
+743.67 , 4383.62 , 398.42
+743.67 , 4641.48 , 422.36
+743.67 , 4899.34 , 446.41
+743.67 , 5157.20 , 470.57
+800.88 , -5707.13 , -408.59
+800.88 , -5421.78 , -388.88
+800.88 , -5136.42 , -369.04
+800.88 , -4851.06 , -349.08
+800.88 , -4565.71 , -328.98
+800.88 , -4280.35 , -308.76
+800.88 , -3994.99 , -288.41
+800.88 , -3709.64 , -267.93
+800.88 , -3424.28 , -247.32
+800.88 , -3138.92 , -226.59
+800.88 , -2853.57 , -205.73
+800.88 , -2568.21 , -184.73
+800.88 , -2282.85 , -163.61
+800.88 , -1997.50 , -142.36
+800.88 , -1712.14 , -120.97
+800.88 , -1426.78 , -99.45
+800.88 , -1141.43 , -77.77
+800.88 , -856.07 , -55.91
+800.88 , -570.71 , -33.75
+800.88 , -285.36 , -10.40
+800.88 , -57.07 , 0.00
+800.88 , 51.57 , 11.76
+800.88 , 257.86 , 32.74
+800.88 , 515.72 , 57.10
+800.88 , 773.58 , 81.29
+800.88 , 1031.44 , 105.53
+800.88 , 1289.30 , 129.86
+800.88 , 1547.16 , 154.29
+800.88 , 1805.02 , 178.85
+800.88 , 2062.88 , 203.52
+800.88 , 2320.74 , 228.31
+800.88 , 2578.60 , 253.23
+800.88 , 2836.46 , 278.27
+800.88 , 3094.32 , 303.44
+800.88 , 3352.18 , 328.73
+800.88 , 3610.04 , 354.14
+800.88 , 3867.90 , 379.68
+800.88 , 4125.76 , 405.34
+800.88 , 4383.62 , 431.13
+800.88 , 4641.48 , 457.03
+800.88 , 4899.34 , 483.07
+800.88 , 5157.20 , 509.22
+858.08 , -5707.13 , -434.93
+858.08 , -5421.78 , -413.98
+858.08 , -5136.42 , -392.88
+858.08 , -4851.06 , -371.64
+858.08 , -4565.71 , -350.25
+858.08 , -4280.35 , -328.71
+858.08 , -3994.99 , -307.03
+858.08 , -3709.64 , -285.20
+858.08 , -3424.28 , -263.22
+858.08 , -3138.92 , -241.10
+858.08 , -2853.57 , -218.83
+858.08 , -2568.21 , -196.41
+858.08 , -2282.85 , -173.85
+858.08 , -1997.50 , -151.13
+858.08 , -1712.14 , -128.26
+858.08 , -1426.78 , -105.23
+858.08 , -1141.43 , -82.02
+858.08 , -856.07 , -58.59
+858.08 , -570.71 , -34.77
+858.08 , -285.36 , -9.14
+858.08 , -57.07 , 0.00
+858.08 , 51.57 , 13.25
+858.08 , 257.86 , 36.05
+858.08 , 515.72 , 62.25
+858.08 , 773.58 , 88.23
+858.08 , 1031.44 , 114.25
+858.08 , 1289.30 , 140.36
+858.08 , 1547.16 , 166.59
+858.08 , 1805.02 , 192.95
+858.08 , 2062.88 , 219.45
+858.08 , 2320.74 , 246.08
+858.08 , 2578.60 , 272.86
+858.08 , 2836.46 , 299.77
+858.08 , 3094.32 , 326.82
+858.08 , 3352.18 , 354.02
+858.08 , 3610.04 , 381.35
+858.08 , 3867.90 , 408.83
+858.08 , 4125.76 , 436.45
+858.08 , 4383.62 , 464.20
+858.08 , 4641.48 , 492.10
+858.08 , 4899.34 , 520.14
+858.08 , 5157.20 , 548.31
+915.29 , -5707.13 , -460.78
+915.29 , -5421.78 , -438.62
+915.29 , -5136.42 , -416.28
+915.29 , -4851.06 , -393.78
+915.29 , -4565.71 , -371.11
+915.29 , -4280.35 , -348.28
+915.29 , -3994.99 , -325.28
+915.29 , -3709.64 , -302.11
+915.29 , -3424.28 , -278.78
+915.29 , -3138.92 , -255.29
+915.29 , -2853.57 , -231.62
+915.29 , -2568.21 , -207.79
+915.29 , -2282.85 , -183.79
+915.29 , -1997.50 , -159.62
+915.29 , -1712.14 , -135.27
+915.29 , -1426.78 , -110.74
+915.29 , -1141.43 , -85.99
+915.29 , -856.07 , -60.98
+915.29 , -570.71 , -35.47
+915.29 , -285.36 , -7.05
+915.29 , -57.07 , 0.00
+915.29 , 51.57 , 14.84
+915.29 , 257.86 , 39.53
+915.29 , 515.72 , 67.60
+915.29 , 773.58 , 95.38
+915.29 , 1031.44 , 123.18
+915.29 , 1289.30 , 151.09
+915.29 , 1547.16 , 179.12
+915.29 , 1805.02 , 207.30
+915.29 , 2062.88 , 235.63
+915.29 , 2320.74 , 264.12
+915.29 , 2578.60 , 292.76
+915.29 , 2836.46 , 321.56
+915.29 , 3094.32 , 350.51
+915.29 , 3352.18 , 379.63
+915.29 , 3610.04 , 408.90
+915.29 , 3867.90 , 438.33
+915.29 , 4125.76 , 467.92
+915.29 , 4383.62 , 497.67
+915.29 , 4641.48 , 527.57
+915.29 , 4899.34 , 557.64
+915.29 , 5157.20 , 587.85
+972.50 , -5707.13 , -486.12
+972.50 , -5421.78 , -462.76
+972.50 , -5136.42 , -439.22
+972.50 , -4851.06 , -415.48
+972.50 , -4565.71 , -391.56
+972.50 , -4280.35 , -367.45
+972.50 , -3994.99 , -343.15
+972.50 , -3709.64 , -318.67
+972.50 , -3424.28 , -294.00
+972.50 , -3138.92 , -269.14
+972.50 , -2853.57 , -244.09
+972.50 , -2568.21 , -218.86
+972.50 , -2282.85 , -193.44
+972.50 , -1997.50 , -167.82
+972.50 , -1712.14 , -142.00
+972.50 , -1426.78 , -115.96
+972.50 , -1141.43 , -89.67
+972.50 , -856.07 , -63.06
+972.50 , -570.71 , -35.80
+972.50 , -285.36 , -3.22
+972.50 , -57.07 , 0.00
+972.50 , 51.57 , 16.54
+972.50 , 257.86 , 43.18
+972.50 , 515.72 , 73.16
+972.50 , 773.58 , 102.75
+972.50 , 1031.44 , 132.35
+972.50 , 1289.30 , 162.06
+972.50 , 1547.16 , 191.91
+972.50 , 1805.02 , 221.91
+972.50 , 2062.88 , 252.09
+972.50 , 2320.74 , 282.44
+972.50 , 2578.60 , 312.96
+972.50 , 2836.46 , 343.65
+972.50 , 3094.32 , 374.52
+972.50 , 3352.18 , 405.57
+972.50 , 3610.04 , 436.80
+972.50 , 3867.90 , 468.20
+972.50 , 4125.76 , 499.78
+972.50 , 4383.62 , 531.53
+972.50 , 4641.48 , 563.46
+972.50 , 4899.34 , 595.57
+972.50 , 5157.20 , 627.85
+1029.70 , -5707.13 , -510.93
+1029.70 , -5421.78 , -486.40
+1029.70 , -5136.42 , -461.67
+1029.70 , -4851.06 , -436.72
+1029.70 , -4565.71 , -411.56
+1029.70 , -4280.35 , -386.20
+1029.70 , -3994.99 , -360.62
+1029.70 , -3709.64 , -334.84
+1029.70 , -3424.28 , -308.84
+1029.70 , -3138.92 , -282.64
+1029.70 , -2853.57 , -256.22
+1029.70 , -2568.21 , -229.60
+1029.70 , -2282.85 , -202.76
+1029.70 , -1997.50 , -175.70
+1029.70 , -1712.14 , -148.41
+1029.70 , -1426.78 , -120.87
+1029.70 , -1141.43 , -93.04
+1029.70 , -856.07 , -64.80
+1029.70 , -570.71 , -35.73
+1029.70 , -285.36 , 0.00
+1029.70 , -57.07 , 0.00
+1029.70 , 51.57 , 18.35
+1029.70 , 257.86 , 47.02
+1029.70 , 515.72 , 78.93
+1029.70 , 773.58 , 110.35
+1029.70 , 1031.44 , 141.76
+1029.70 , 1289.30 , 173.28
+1029.70 , 1547.16 , 204.95
+1029.70 , 1805.02 , 236.80
+1029.70 , 2062.88 , 268.83
+1029.70 , 2320.74 , 301.04
+1029.70 , 2578.60 , 333.46
+1029.70 , 2836.46 , 366.06
+1029.70 , 3094.32 , 398.86
+1029.70 , 3352.18 , 431.86
+1029.70 , 3610.04 , 465.05
+1029.70 , 3867.90 , 498.44
+1029.70 , 4125.76 , 532.03
+1029.70 , 4383.62 , 565.81
+1029.70 , 4641.48 , 599.79
+1029.70 , 4899.34 , 633.96
+1029.70 , 5157.20 , 668.33
+1086.91 , -5707.13 , -535.19
+1086.91 , -5421.78 , -509.52
+1086.91 , -5136.42 , -483.62
+1086.91 , -4851.06 , -457.48
+1086.91 , -4565.71 , -431.11
+1086.91 , -4280.35 , -404.51
+1086.91 , -3994.99 , -377.67
+1086.91 , -3709.64 , -350.60
+1086.91 , -3424.28 , -323.30
+1086.91 , -3138.92 , -295.76
+1086.91 , -2853.57 , -267.99
+1086.91 , -2568.21 , -239.99
+1086.91 , -2282.85 , -211.74
+1086.91 , -1997.50 , -183.24
+1086.91 , -1712.14 , -154.48
+1086.91 , -1426.78 , -125.44
+1086.91 , -1141.43 , -96.05
+1086.91 , -856.07 , -66.18
+1086.91 , -570.71 , -35.19
+1086.91 , -285.36 , 0.00
+1086.91 , -57.07 , 0.00
+1086.91 , 51.57 , 20.27
+1086.91 , 257.86 , 51.05
+1086.91 , 515.72 , 84.92
+1086.91 , 773.58 , 118.19
+1086.91 , 1031.44 , 151.42
+1086.91 , 1289.30 , 184.76
+1086.91 , 1547.16 , 218.27
+1086.91 , 1805.02 , 251.96
+1086.91 , 2062.88 , 285.86
+1086.91 , 2320.74 , 319.96
+1086.91 , 2578.60 , 354.27
+1086.91 , 2836.46 , 388.80
+1086.91 , 3094.32 , 423.54
+1086.91 , 3352.18 , 458.50
+1086.91 , 3610.04 , 493.68
+1086.91 , 3867.90 , 529.07
+1086.91 , 4125.76 , 564.68
+1086.91 , 4383.62 , 600.51
+1086.91 , 4641.48 , 636.55
+1086.91 , 4899.34 , 672.81
+1086.91 , 5157.20 , 709.28
+1144.11 , -5707.13 , -558.87
+1144.11 , -5421.78 , -532.09
+1144.11 , -5136.42 , -505.05
+1144.11 , -4851.06 , -477.75
+1144.11 , -4565.71 , -450.19
+1144.11 , -4280.35 , -422.37
+1144.11 , -3994.99 , -394.29
+1144.11 , -3709.64 , -365.95
+1144.11 , -3424.28 , -337.36
+1144.11 , -3138.92 , -308.50
+1144.11 , -2853.57 , -279.38
+1144.11 , -2568.21 , -250.00
+1144.11 , -2282.85 , -220.35
+1144.11 , -1997.50 , -190.43
+1144.11 , -1712.14 , -160.20
+1144.11 , -1426.78 , -129.65
+1144.11 , -1141.43 , -98.70
+1144.11 , -856.07 , -67.15
+1144.11 , -570.71 , -34.12
+1144.11 , -285.36 , 0.00
+1144.11 , -57.07 , 0.00
+1144.11 , 51.57 , 22.30
+1144.11 , 257.86 , 55.27
+1144.11 , 515.72 , 91.14
+1144.11 , 773.58 , 126.27
+1144.11 , 1031.44 , 161.34
+1144.11 , 1289.30 , 196.52
+1144.11 , 1547.16 , 231.87
+1144.11 , 1805.02 , 267.42
+1144.11 , 2062.88 , 303.19
+1144.11 , 2320.74 , 339.18
+1144.11 , 2578.60 , 375.41
+1144.11 , 2836.46 , 411.87
+1144.11 , 3094.32 , 448.57
+1144.11 , 3352.18 , 485.51
+1144.11 , 3610.04 , 522.68
+1144.11 , 3867.90 , 560.09
+1144.11 , 4125.76 , 597.75
+1144.11 , 4383.62 , 635.63
+1144.11 , 4641.48 , 673.76
+1144.11 , 4899.34 , 712.12
+1144.11 , 5157.20 , 750.73
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..3c80c1e20b59f7eb9bf9944d96f50223c180d0ce
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 5157.20 , -5707.13
+5.67 , 5157.20 , -5707.13
+57.23 , 5157.20 , -5707.13
+114.47 , 5157.20 , -5707.13
+171.56 , 5157.20 , -5707.13
+228.79 , 5157.20 , -5707.13
+286.03 , 5157.20 , -5707.13
+343.26 , 4297.66 , -4755.94
+400.49 , 3683.68 , -4076.49
+457.59 , 3223.25 , -3566.96
+514.82 , 2865.13 , -3170.65
+572.05 , 2578.60 , -2853.57
+629.29 , 2344.19 , -2594.16
+686.52 , 2148.83 , -2377.97
+743.61 , 1983.53 , -2195.04
+800.85 , 1841.88 , -2038.28
+858.08 , 1719.07 , -1902.38
+915.31 , 1611.66 , -1783.52
+972.54 , 1516.83 , -1678.58
+1029.64 , 1432.53 , -1585.29
+1086.87 , 1357.17 , -1501.89
+1144.11 , 1289.30 , -1426.78
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..3c80c1e20b59f7eb9bf9944d96f50223c180d0ce
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 5157.20 , -5707.13
+5.67 , 5157.20 , -5707.13
+57.23 , 5157.20 , -5707.13
+114.47 , 5157.20 , -5707.13
+171.56 , 5157.20 , -5707.13
+228.79 , 5157.20 , -5707.13
+286.03 , 5157.20 , -5707.13
+343.26 , 4297.66 , -4755.94
+400.49 , 3683.68 , -4076.49
+457.59 , 3223.25 , -3566.96
+514.82 , 2865.13 , -3170.65
+572.05 , 2578.60 , -2853.57
+629.29 , 2344.19 , -2594.16
+686.52 , 2148.83 , -2377.97
+743.61 , 1983.53 , -2195.04
+800.85 , 1841.88 , -2038.28
+858.08 , 1719.07 , -1902.38
+915.31 , 1611.66 , -1783.52
+972.54 , 1516.83 , -1678.58
+1029.64 , 1432.53 , -1585.29
+1086.87 , 1357.17 , -1501.89
+1144.11 , 1289.30 , -1426.78
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_drag.viepcd b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..620f776f90668e47b3191d74c31059957ef5facb
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -10.92
+5.72 , -11.26
+57.21 , -14.46
+114.41 , -18.00
+171.62 , -21.53
+228.82 , -25.11
+286.03 , -28.65
+343.23 , -32.19
+400.44 , -35.73
+457.65 , -39.27
+514.85 , -42.84
+572.06 , -46.38
+629.26 , -49.92
+686.47 , -53.46
+743.67 , -57.00
+800.88 , -60.57
+858.08 , -64.11
+915.29 , -67.65
+972.50 , -71.19
+1029.70 , -74.73
+1086.91 , -78.30
+1144.11 , -81.84
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/GenericIEPC_Gbx3Whl2.viepc b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/GenericIEPC_Gbx3Whl2.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..47e3bfc6dd49ea605c5f474274d8e24a00f7791a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/GenericIEPC_Gbx3Whl2.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 2,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 21.9384
+ },
+ {
+ "Ratio": 12.276
+ },
+ {
+ "Ratio": 7.2336
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3Whl2_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl2_1.viepco",
+ "2": "IEPC_Gbx3Whl2_2.viepco",
+ "3": "IEPC_Gbx3Whl2_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3Whl2_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl2_1.viepco",
+ "2": "IEPC_Gbx3Whl2_2.viepco",
+ "3": "IEPC_Gbx3Whl2_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3Whl2_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..7ea4e7402ab9fb94f0d1cb78e250176c035e8a9d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3Whl2.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_ENG_Gbx3Whl2.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_ENG_Gbx3Whl2.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..e8e507aeeaae83a7255e425e2b9134ac82860c7f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_ENG_Gbx3Whl2.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx3Whl2.vveh",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_1.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..6661444505d1f80e1b7ccf4680f069a1394f3e8d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -35338.92 , 0.00
+0.00 , -33571.97 , 0.00
+0.00 , -31805.03 , 0.00
+0.00 , -30038.08 , 0.00
+0.00 , -28271.13 , 0.00
+0.00 , -26504.19 , 0.00
+0.00 , -24737.24 , -0.13
+0.00 , -22970.30 , -0.66
+0.00 , -21203.35 , -0.98
+0.00 , -19436.40 , -1.19
+0.00 , -17669.46 , -1.32
+0.00 , -15902.51 , -1.38
+0.00 , -14135.57 , -1.39
+0.00 , -12368.62 , -1.35
+0.00 , -10601.68 , -1.26
+0.00 , -8834.73 , -1.13
+0.00 , -7067.78 , -0.97
+0.00 , -5300.84 , -0.77
+0.00 , -3533.89 , -0.53
+0.00 , -1766.95 , -0.27
+0.00 , -353.39 , -0.02
+0.00 , 306.44 , 0.13
+0.00 , 1532.18 , 0.56
+0.00 , 3064.36 , 1.12
+0.00 , 4596.53 , 1.70
+0.00 , 6128.71 , 2.31
+0.00 , 7660.89 , 2.93
+0.00 , 9193.07 , 3.58
+0.00 , 10725.24 , 4.25
+0.00 , 12257.42 , 4.93
+0.00 , 13789.60 , 5.64
+0.00 , 15321.78 , 6.37
+0.00 , 16853.96 , 7.12
+0.00 , 18386.13 , 7.88
+0.00 , 19918.31 , 8.67
+0.00 , 21450.49 , 9.47
+0.00 , 22982.67 , 10.29
+0.00 , 24514.85 , 11.13
+0.00 , 26047.02 , 11.99
+0.00 , 27579.20 , 12.87
+0.00 , 29111.38 , 13.76
+0.00 , 30643.56 , 14.67
+1.89 , -35338.92 , 0.00
+1.89 , -33571.97 , 0.00
+1.89 , -31805.03 , 0.00
+1.89 , -30038.08 , 0.00
+1.89 , -28271.13 , 0.00
+1.89 , -26504.19 , 0.00
+1.89 , -24737.24 , -0.50
+1.89 , -22970.30 , -0.84
+1.89 , -21203.35 , -1.04
+1.89 , -19436.40 , -1.16
+1.89 , -17669.46 , -1.22
+1.89 , -15902.51 , -1.24
+1.89 , -14135.57 , -1.21
+1.89 , -12368.62 , -1.15
+1.89 , -10601.68 , -1.06
+1.89 , -8834.73 , -0.94
+1.89 , -7067.78 , -0.80
+1.89 , -5300.84 , -0.62
+1.89 , -3533.89 , -0.43
+1.89 , -1766.95 , -0.21
+1.89 , -353.39 , -0.02
+1.89 , 306.44 , 0.10
+1.89 , 1532.18 , 0.43
+1.89 , 3064.36 , 0.85
+1.89 , 4596.53 , 1.30
+1.89 , 6128.71 , 1.75
+1.89 , 7660.89 , 2.23
+1.89 , 9193.07 , 2.71
+1.89 , 10725.24 , 3.21
+1.89 , 12257.42 , 3.73
+1.89 , 13789.60 , 4.26
+1.89 , 15321.78 , 4.80
+1.89 , 16853.96 , 5.36
+1.89 , 18386.13 , 5.93
+1.89 , 19918.31 , 6.52
+1.89 , 21450.49 , 7.12
+1.89 , 22982.67 , 7.73
+1.89 , 24514.85 , 8.35
+1.89 , 26047.02 , 8.99
+1.89 , 27579.20 , 9.64
+1.89 , 29111.38 , 10.30
+1.89 , 30643.56 , 10.98
+18.86 , -35338.92 , -58.10
+18.86 , -33571.97 , -55.37
+18.86 , -31805.03 , -52.62
+18.86 , -30038.08 , -49.85
+18.86 , -28271.13 , -47.06
+18.86 , -26504.19 , -44.25
+18.86 , -24737.24 , -41.42
+18.86 , -22970.30 , -38.57
+18.86 , -21203.35 , -35.70
+18.86 , -19436.40 , -32.81
+18.86 , -17669.46 , -29.90
+18.86 , -15902.51 , -26.98
+18.86 , -14135.57 , -24.03
+18.86 , -12368.62 , -21.07
+18.86 , -10601.68 , -18.08
+18.86 , -8834.73 , -15.08
+18.86 , -7067.78 , -12.06
+18.86 , -5300.84 , -9.02
+18.86 , -3533.89 , -5.96
+18.86 , -1766.95 , -2.88
+18.86 , -353.39 , -0.37
+18.86 , 306.44 , 0.90
+18.86 , 1532.18 , 3.68
+18.86 , 3064.36 , 7.16
+18.86 , 4596.53 , 10.66
+18.86 , 6128.71 , 14.17
+18.86 , 7660.89 , 17.71
+18.86 , 9193.07 , 21.26
+18.86 , 10725.24 , 24.84
+18.86 , 12257.42 , 28.43
+18.86 , 13789.60 , 32.04
+18.86 , 15321.78 , 35.67
+18.86 , 16853.96 , 39.32
+18.86 , 18386.13 , 42.99
+18.86 , 19918.31 , 46.68
+18.86 , 21450.49 , 50.38
+18.86 , 22982.67 , 54.11
+18.86 , 24514.85 , 57.85
+18.86 , 26047.02 , 61.61
+18.86 , 27579.20 , 65.39
+18.86 , 29111.38 , 69.19
+18.86 , 30643.56 , 73.01
+37.72 , -35338.92 , -120.57
+37.72 , -33571.97 , -114.73
+37.72 , -31805.03 , -108.87
+37.72 , -30038.08 , -102.99
+37.72 , -28271.13 , -97.08
+37.72 , -26504.19 , -91.15
+37.72 , -24737.24 , -85.20
+37.72 , -22970.30 , -79.23
+37.72 , -21203.35 , -73.23
+37.72 , -19436.40 , -67.21
+37.72 , -17669.46 , -61.17
+37.72 , -15902.51 , -55.10
+37.72 , -14135.57 , -49.01
+37.72 , -12368.62 , -42.90
+37.72 , -10601.68 , -36.77
+37.72 , -8834.73 , -30.61
+37.72 , -7067.78 , -24.43
+37.72 , -5300.84 , -18.23
+37.72 , -3533.89 , -12.01
+37.72 , -1766.95 , -5.76
+37.72 , -353.39 , -0.66
+37.72 , 306.44 , 1.84
+37.72 , 1532.18 , 7.35
+37.72 , 3064.36 , 14.22
+37.72 , 4596.53 , 21.11
+37.72 , 6128.71 , 28.02
+37.72 , 7660.89 , 34.96
+37.72 , 9193.07 , 41.92
+37.72 , 10725.24 , 48.90
+37.72 , 12257.42 , 55.90
+37.72 , 13789.60 , 62.93
+37.72 , 15321.78 , 69.98
+37.72 , 16853.96 , 77.05
+37.72 , 18386.13 , 84.15
+37.72 , 19918.31 , 91.27
+37.72 , 21450.49 , 98.41
+37.72 , 22982.67 , 105.58
+37.72 , 24514.85 , 112.76
+37.72 , 26047.02 , 119.97
+37.72 , 27579.20 , 127.21
+37.72 , 29111.38 , 134.46
+37.72 , 30643.56 , 141.74
+56.59 , -35338.92 , -182.44
+56.59 , -33571.97 , -173.55
+56.59 , -31805.03 , -164.62
+56.59 , -30038.08 , -155.67
+56.59 , -28271.13 , -146.69
+56.59 , -26504.19 , -137.68
+56.59 , -24737.24 , -128.65
+56.59 , -22970.30 , -119.58
+56.59 , -21203.35 , -110.49
+56.59 , -19436.40 , -101.36
+56.59 , -17669.46 , -92.21
+56.59 , -15902.51 , -83.03
+56.59 , -14135.57 , -73.82
+56.59 , -12368.62 , -64.58
+56.59 , -10601.68 , -55.31
+56.59 , -8834.73 , -46.02
+56.59 , -7067.78 , -36.70
+56.59 , -5300.84 , -27.34
+56.59 , -3533.89 , -17.96
+56.59 , -1766.95 , -8.54
+56.59 , -353.39 , -0.79
+56.59 , 306.44 , 2.86
+56.59 , 1532.18 , 11.12
+56.59 , 3064.36 , 21.39
+56.59 , 4596.53 , 31.68
+56.59 , 6128.71 , 41.99
+56.59 , 7660.89 , 52.34
+56.59 , 9193.07 , 62.71
+56.59 , 10725.24 , 73.12
+56.59 , 12257.42 , 83.55
+56.59 , 13789.60 , 94.01
+56.59 , 15321.78 , 104.50
+56.59 , 16853.96 , 115.02
+56.59 , 18386.13 , 125.57
+56.59 , 19918.31 , 136.15
+56.59 , 21450.49 , 146.76
+56.59 , 22982.67 , 157.40
+56.59 , 24514.85 , 168.06
+56.59 , 26047.02 , 178.76
+56.59 , 27579.20 , 189.48
+56.59 , 29111.38 , 200.23
+56.59 , 30643.56 , 211.02
+75.45 , -35338.92 , -243.71
+75.45 , -33571.97 , -231.81
+75.45 , -31805.03 , -219.87
+75.45 , -30038.08 , -207.89
+75.45 , -28271.13 , -195.88
+75.45 , -26504.19 , -183.83
+75.45 , -24737.24 , -171.74
+75.45 , -22970.30 , -159.61
+75.45 , -21203.35 , -147.45
+75.45 , -19436.40 , -135.25
+75.45 , -17669.46 , -123.01
+75.45 , -15902.51 , -110.74
+75.45 , -14135.57 , -98.43
+75.45 , -12368.62 , -86.08
+75.45 , -10601.68 , -73.70
+75.45 , -8834.73 , -61.27
+75.45 , -7067.78 , -48.82
+75.45 , -5300.84 , -36.32
+75.45 , -3533.89 , -23.78
+75.45 , -1766.95 , -11.19
+75.45 , -353.39 , -0.63
+75.45 , 306.44 , 3.98
+75.45 , 1532.18 , 15.01
+75.45 , 3064.36 , 28.68
+75.45 , 4596.53 , 42.37
+75.45 , 6128.71 , 56.10
+75.45 , 7660.89 , 69.87
+75.45 , 9193.07 , 83.67
+75.45 , 10725.24 , 97.52
+75.45 , 12257.42 , 111.40
+75.45 , 13789.60 , 125.31
+75.45 , 15321.78 , 139.27
+75.45 , 16853.96 , 153.26
+75.45 , 18386.13 , 167.29
+75.45 , 19918.31 , 181.36
+75.45 , 21450.49 , 195.46
+75.45 , 22982.67 , 209.61
+75.45 , 24514.85 , 223.79
+75.45 , 26047.02 , 238.01
+75.45 , 27579.20 , 252.26
+75.45 , 29111.38 , 266.56
+75.45 , 30643.56 , 280.89
+94.31 , -35338.92 , -304.37
+94.31 , -33571.97 , -289.50
+94.31 , -31805.03 , -274.59
+94.31 , -30038.08 , -259.63
+94.31 , -28271.13 , -244.61
+94.31 , -26504.19 , -229.56
+94.31 , -24737.24 , -214.45
+94.31 , -22970.30 , -199.30
+94.31 , -21203.35 , -184.10
+94.31 , -19436.40 , -168.85
+94.31 , -17669.46 , -153.55
+94.31 , -15902.51 , -138.20
+94.31 , -14135.57 , -122.81
+94.31 , -12368.62 , -107.37
+94.31 , -10601.68 , -91.88
+94.31 , -8834.73 , -76.35
+94.31 , -7067.78 , -60.76
+94.31 , -5300.84 , -45.13
+94.31 , -3533.89 , -29.44
+94.31 , -1766.95 , -13.67
+94.31 , -353.39 , 0.00
+94.31 , 306.44 , 5.21
+94.31 , 1532.18 , 19.04
+94.31 , 3064.36 , 36.13
+94.31 , 4596.53 , 53.24
+94.31 , 6128.71 , 70.39
+94.31 , 7660.89 , 87.59
+94.31 , 9193.07 , 104.83
+94.31 , 10725.24 , 122.13
+94.31 , 12257.42 , 139.47
+94.31 , 13789.60 , 156.87
+94.31 , 15321.78 , 174.31
+94.31 , 16853.96 , 191.80
+94.31 , 18386.13 , 209.33
+94.31 , 19918.31 , 226.92
+94.31 , 21450.49 , 244.56
+94.31 , 22982.67 , 262.24
+94.31 , 24514.85 , 279.97
+94.31 , 26047.02 , 297.76
+94.31 , 27579.20 , 315.58
+94.31 , 29111.38 , 333.46
+94.31 , 30643.56 , 351.39
+113.17 , -35338.92 , -364.37
+113.17 , -33571.97 , -346.59
+113.17 , -31805.03 , -328.74
+113.17 , -30038.08 , -310.84
+113.17 , -28271.13 , -292.87
+113.17 , -26504.19 , -274.84
+113.17 , -24737.24 , -256.75
+113.17 , -22970.30 , -238.60
+113.17 , -21203.35 , -220.39
+113.17 , -19436.40 , -202.12
+113.17 , -17669.46 , -183.79
+113.17 , -15902.51 , -165.40
+113.17 , -14135.57 , -146.94
+113.17 , -12368.62 , -128.43
+113.17 , -10601.68 , -109.85
+113.17 , -8834.73 , -91.21
+113.17 , -7067.78 , -72.51
+113.17 , -5300.84 , -53.75
+113.17 , -3533.89 , -34.91
+113.17 , -1766.95 , -15.95
+113.17 , -353.39 , 0.00
+113.17 , 306.44 , 6.58
+113.17 , 1532.18 , 23.25
+113.17 , 3064.36 , 43.76
+113.17 , 4596.53 , 64.29
+113.17 , 6128.71 , 84.87
+113.17 , 7660.89 , 105.52
+113.17 , 9193.07 , 126.22
+113.17 , 10725.24 , 146.98
+113.17 , 12257.42 , 167.81
+113.17 , 13789.60 , 188.70
+113.17 , 15321.78 , 209.65
+113.17 , 16853.96 , 230.66
+113.17 , 18386.13 , 251.73
+113.17 , 19918.31 , 272.87
+113.17 , 21450.49 , 294.07
+113.17 , 22982.67 , 315.33
+113.17 , 24514.85 , 336.65
+113.17 , 26047.02 , 358.03
+113.17 , 27579.20 , 379.47
+113.17 , 29111.38 , 400.98
+113.17 , 30643.56 , 422.54
+132.03 , -35338.92 , -423.69
+132.03 , -33571.97 , -403.04
+132.03 , -31805.03 , -382.31
+132.03 , -30038.08 , -361.50
+132.03 , -28271.13 , -340.62
+132.03 , -26504.19 , -319.66
+132.03 , -24737.24 , -298.62
+132.03 , -22970.30 , -277.51
+132.03 , -21203.35 , -256.31
+132.03 , -19436.40 , -235.05
+132.03 , -17669.46 , -213.70
+132.03 , -15902.51 , -192.28
+132.03 , -14135.57 , -170.79
+132.03 , -12368.62 , -149.21
+132.03 , -10601.68 , -127.57
+132.03 , -8834.73 , -105.84
+132.03 , -7067.78 , -84.03
+132.03 , -5300.84 , -62.14
+132.03 , -3533.89 , -40.16
+132.03 , -1766.95 , -18.00
+132.03 , -353.39 , 0.00
+132.03 , 306.44 , 8.09
+132.03 , 1532.18 , 27.64
+132.03 , 3064.36 , 51.59
+132.03 , 4596.53 , 75.56
+132.03 , 6128.71 , 99.58
+132.03 , 7660.89 , 123.68
+132.03 , 9193.07 , 147.86
+132.03 , 10725.24 , 172.10
+132.03 , 12257.42 , 196.43
+132.03 , 13789.60 , 220.84
+132.03 , 15321.78 , 245.32
+132.03 , 16853.96 , 269.88
+132.03 , 18386.13 , 294.51
+132.03 , 19918.31 , 319.23
+132.03 , 21450.49 , 344.02
+132.03 , 22982.67 , 368.89
+132.03 , 24514.85 , 393.83
+132.03 , 26047.02 , 418.85
+132.03 , 27579.20 , 443.95
+132.03 , 29111.38 , 469.13
+132.03 , 30643.56 , 494.38
+150.90 , -35338.92 , -482.31
+150.90 , -33571.97 , -458.83
+150.90 , -31805.03 , -435.26
+150.90 , -30038.08 , -411.59
+150.90 , -28271.13 , -387.83
+150.90 , -26504.19 , -363.97
+150.90 , -24737.24 , -340.02
+150.90 , -22970.30 , -315.97
+150.90 , -21203.35 , -291.83
+150.90 , -19436.40 , -267.59
+150.90 , -17669.46 , -243.26
+150.90 , -15902.51 , -218.84
+150.90 , -14135.57 , -194.32
+150.90 , -12368.62 , -169.71
+150.90 , -10601.68 , -145.00
+150.90 , -8834.73 , -120.19
+150.90 , -7067.78 , -95.29
+150.90 , -5300.84 , -70.28
+150.90 , -3533.89 , -45.14
+150.90 , -1766.95 , -19.76
+150.90 , -353.39 , 0.00
+150.90 , 306.44 , 9.76
+150.90 , 1532.18 , 32.25
+150.90 , 3064.36 , 59.66
+150.90 , 4596.53 , 87.07
+150.90 , 6128.71 , 114.55
+150.90 , 7660.89 , 142.11
+150.90 , 9193.07 , 169.77
+150.90 , 10725.24 , 197.52
+150.90 , 12257.42 , 225.37
+150.90 , 13789.60 , 253.31
+150.90 , 15321.78 , 281.34
+150.90 , 16853.96 , 309.47
+150.90 , 18386.13 , 337.70
+150.90 , 19918.31 , 366.02
+150.90 , 21450.49 , 394.44
+150.90 , 22982.67 , 422.95
+150.90 , 24514.85 , 451.56
+150.90 , 26047.02 , 480.26
+150.90 , 27579.20 , 509.05
+150.90 , 29111.38 , 537.94
+150.90 , 30643.56 , 566.93
+169.76 , -35338.92 , -540.17
+169.76 , -33571.97 , -513.92
+169.76 , -31805.03 , -487.55
+169.76 , -30038.08 , -461.06
+169.76 , -28271.13 , -434.46
+169.76 , -26504.19 , -407.75
+169.76 , -24737.24 , -380.92
+169.76 , -22970.30 , -353.97
+169.76 , -21203.35 , -326.91
+169.76 , -19436.40 , -299.73
+169.76 , -17669.46 , -272.44
+169.76 , -15902.51 , -245.03
+169.76 , -14135.57 , -217.51
+169.76 , -12368.62 , -189.87
+169.76 , -10601.68 , -162.12
+169.76 , -8834.73 , -134.25
+169.76 , -7067.78 , -106.26
+169.76 , -5300.84 , -78.13
+169.76 , -3533.89 , -49.84
+169.76 , -1766.95 , -21.19
+169.76 , -353.39 , 0.00
+169.76 , 306.44 , 11.59
+169.76 , 1532.18 , 37.10
+169.76 , 3064.36 , 67.98
+169.76 , 4596.53 , 98.85
+169.76 , 6128.71 , 129.79
+169.76 , 7660.89 , 160.84
+169.76 , 9193.07 , 191.99
+169.76 , 10725.24 , 223.26
+169.76 , 12257.42 , 254.64
+169.76 , 13789.60 , 286.14
+169.76 , 15321.78 , 317.75
+169.76 , 16853.96 , 349.48
+169.76 , 18386.13 , 381.32
+169.76 , 19918.31 , 413.28
+169.76 , 21450.49 , 445.36
+169.76 , 22982.67 , 477.54
+169.76 , 24514.85 , 509.85
+169.76 , 26047.02 , 542.27
+169.76 , 27579.20 , 574.80
+169.76 , 29111.38 , 607.45
+169.76 , 30643.56 , 640.21
+188.62 , -35338.92 , -597.26
+188.62 , -33571.97 , -568.28
+188.62 , -31805.03 , -539.16
+188.62 , -30038.08 , -509.90
+188.62 , -28271.13 , -480.50
+188.62 , -26504.19 , -450.96
+188.62 , -24737.24 , -421.28
+188.62 , -22970.30 , -391.47
+188.62 , -21203.35 , -361.52
+188.62 , -19436.40 , -331.43
+188.62 , -17669.46 , -301.20
+188.62 , -15902.51 , -270.83
+188.62 , -14135.57 , -240.33
+188.62 , -12368.62 , -209.68
+188.62 , -10601.68 , -178.90
+188.62 , -8834.73 , -147.97
+188.62 , -7067.78 , -116.90
+188.62 , -5300.84 , -85.66
+188.62 , -3533.89 , -54.21
+188.62 , -1766.95 , -22.23
+188.62 , -353.39 , 0.00
+188.62 , 306.44 , 13.60
+188.62 , 1532.18 , 42.20
+188.62 , 3064.36 , 76.58
+188.62 , 4596.53 , 110.92
+188.62 , 6128.71 , 145.34
+188.62 , 7660.89 , 179.88
+188.62 , 9193.07 , 214.55
+188.62 , 10725.24 , 249.35
+188.62 , 12257.42 , 284.29
+188.62 , 13789.60 , 319.36
+188.62 , 15321.78 , 354.57
+188.62 , 16853.96 , 389.92
+188.62 , 18386.13 , 425.41
+188.62 , 19918.31 , 461.03
+188.62 , 21450.49 , 496.79
+188.62 , 22982.67 , 532.69
+188.62 , 24514.85 , 568.73
+188.62 , 26047.02 , 604.90
+188.62 , 27579.20 , 641.21
+188.62 , 29111.38 , 677.66
+188.62 , 30643.56 , 714.24
+207.48 , -35338.92 , -653.54
+207.48 , -33571.97 , -621.88
+207.48 , -31805.03 , -590.05
+207.48 , -30038.08 , -558.06
+207.48 , -28271.13 , -525.90
+207.48 , -26504.19 , -493.58
+207.48 , -24737.24 , -461.09
+207.48 , -22970.30 , -428.44
+207.48 , -21203.35 , -395.63
+207.48 , -19436.40 , -362.65
+207.48 , -17669.46 , -329.51
+207.48 , -15902.51 , -296.21
+207.48 , -14135.57 , -262.74
+207.48 , -12368.62 , -229.11
+207.48 , -10601.68 , -195.31
+207.48 , -8834.73 , -161.34
+207.48 , -7067.78 , -127.18
+207.48 , -5300.84 , -92.83
+207.48 , -3533.89 , -58.20
+207.48 , -1766.95 , -22.82
+207.48 , -353.39 , 0.00
+207.48 , 306.44 , 15.79
+207.48 , 1532.18 , 47.58
+207.48 , 3064.36 , 85.48
+207.48 , 4596.53 , 123.30
+207.48 , 6128.71 , 161.22
+207.48 , 7660.89 , 199.26
+207.48 , 9193.07 , 237.46
+207.48 , 10725.24 , 275.81
+207.48 , 12257.42 , 314.32
+207.48 , 13789.60 , 352.99
+207.48 , 15321.78 , 391.83
+207.48 , 16853.96 , 430.82
+207.48 , 18386.13 , 469.98
+207.48 , 19918.31 , 509.30
+207.48 , 21450.49 , 548.78
+207.48 , 22982.67 , 588.42
+207.48 , 24514.85 , 628.23
+207.48 , 26047.02 , 668.20
+207.48 , 27579.20 , 708.32
+207.48 , 29111.38 , 748.61
+207.48 , 30643.56 , 789.06
+226.34 , -35338.92 , -708.97
+226.34 , -33571.97 , -674.68
+226.34 , -31805.03 , -640.19
+226.34 , -30038.08 , -605.51
+226.34 , -28271.13 , -570.63
+226.34 , -26504.19 , -535.56
+226.34 , -24737.24 , -500.30
+226.34 , -22970.30 , -464.85
+226.34 , -21203.35 , -429.21
+226.34 , -19436.40 , -393.37
+226.34 , -17669.46 , -357.35
+226.34 , -15902.51 , -321.13
+226.34 , -14135.57 , -284.71
+226.34 , -12368.62 , -248.11
+226.34 , -10601.68 , -211.31
+226.34 , -8834.73 , -174.30
+226.34 , -7067.78 , -137.08
+226.34 , -5300.84 , -99.61
+226.34 , -3533.89 , -61.78
+226.34 , -1766.95 , -22.86
+226.34 , -353.39 , 0.00
+226.34 , 306.44 , 18.17
+226.34 , 1532.18 , 53.24
+226.34 , 3064.36 , 94.71
+226.34 , 4596.53 , 136.03
+226.34 , 6128.71 , 177.45
+226.34 , 7660.89 , 219.01
+226.34 , 9193.07 , 260.75
+226.34 , 10725.24 , 302.67
+226.34 , 12257.42 , 344.78
+226.34 , 13789.60 , 387.07
+226.34 , 15321.78 , 429.54
+226.34 , 16853.96 , 472.21
+226.34 , 18386.13 , 515.06
+226.34 , 19918.31 , 558.11
+226.34 , 21450.49 , 601.34
+226.34 , 22982.67 , 644.76
+226.34 , 24514.85 , 688.37
+226.34 , 26047.02 , 732.17
+226.34 , 27579.20 , 776.15
+226.34 , 29111.38 , 820.33
+226.34 , 30643.56 , 864.69
+245.21 , -35338.92 , -763.53
+245.21 , -33571.97 , -726.65
+245.21 , -31805.03 , -689.55
+245.21 , -30038.08 , -652.22
+245.21 , -28271.13 , -614.67
+245.21 , -26504.19 , -576.89
+245.21 , -24737.24 , -538.89
+245.21 , -22970.30 , -500.67
+245.21 , -21203.35 , -462.22
+245.21 , -19436.40 , -423.56
+245.21 , -17669.46 , -384.67
+245.21 , -15902.51 , -345.56
+245.21 , -14135.57 , -306.22
+245.21 , -12368.62 , -266.66
+245.21 , -10601.68 , -226.86
+245.21 , -8834.73 , -186.83
+245.21 , -7067.78 , -146.54
+245.21 , -5300.84 , -105.95
+245.21 , -3533.89 , -64.90
+245.21 , -1766.95 , -22.24
+245.21 , -353.39 , 0.00
+245.21 , 306.44 , 20.74
+245.21 , 1532.18 , 59.20
+245.21 , 3064.36 , 104.27
+245.21 , 4596.53 , 149.12
+245.21 , 6128.71 , 194.05
+245.21 , 7660.89 , 239.16
+245.21 , 9193.07 , 284.45
+245.21 , 10725.24 , 329.96
+245.21 , 12257.42 , 375.67
+245.21 , 13789.60 , 421.60
+245.21 , 15321.78 , 467.75
+245.21 , 16853.96 , 514.11
+245.21 , 18386.13 , 560.69
+245.21 , 19918.31 , 607.48
+245.21 , 21450.49 , 654.50
+245.21 , 22982.67 , 701.73
+245.21 , 24514.85 , 749.18
+245.21 , 26047.02 , 796.84
+245.21 , 27579.20 , 844.73
+245.21 , 29111.38 , 892.83
+245.21 , 30643.56 , 941.14
+264.07 , -35338.92 , -817.17
+264.07 , -33571.97 , -777.76
+264.07 , -31805.03 , -738.08
+264.07 , -30038.08 , -698.15
+264.07 , -28271.13 , -657.96
+264.07 , -26504.19 , -617.52
+264.07 , -24737.24 , -576.82
+264.07 , -22970.30 , -535.86
+264.07 , -21203.35 , -494.65
+264.07 , -19436.40 , -453.18
+264.07 , -17669.46 , -411.45
+264.07 , -15902.51 , -369.47
+264.07 , -14135.57 , -327.22
+264.07 , -12368.62 , -284.72
+264.07 , -10601.68 , -241.95
+264.07 , -8834.73 , -198.90
+264.07 , -7067.78 , -155.54
+264.07 , -5300.84 , -111.82
+264.07 , -3533.89 , -67.51
+264.07 , -1766.95 , -20.80
+264.07 , -353.39 , 0.00
+264.07 , 306.44 , 23.52
+264.07 , 1532.18 , 65.48
+264.07 , 3064.36 , 114.20
+264.07 , 4596.53 , 162.59
+264.07 , 6128.71 , 211.06
+264.07 , 7660.89 , 259.72
+264.07 , 9193.07 , 308.59
+264.07 , 10725.24 , 357.69
+264.07 , 12257.42 , 407.04
+264.07 , 13789.60 , 456.62
+264.07 , 15321.78 , 506.46
+264.07 , 16853.96 , 556.54
+264.07 , 18386.13 , 606.87
+264.07 , 19918.31 , 657.45
+264.07 , 21450.49 , 708.28
+264.07 , 22982.67 , 759.35
+264.07 , 24514.85 , 810.68
+264.07 , 26047.02 , 862.25
+264.07 , 27579.20 , 914.07
+264.07 , 29111.38 , 966.13
+264.07 , 30643.56 , 1018.44
+282.93 , -35338.92 , -869.86
+282.93 , -33571.97 , -827.96
+282.93 , -31805.03 , -785.77
+282.93 , -30038.08 , -743.28
+282.93 , -28271.13 , -700.50
+282.93 , -26504.19 , -657.42
+282.93 , -24737.24 , -614.05
+282.93 , -22970.30 , -570.39
+282.93 , -21203.35 , -526.44
+282.93 , -19436.40 , -482.19
+282.93 , -17669.46 , -437.65
+282.93 , -15902.51 , -392.82
+282.93 , -14135.57 , -347.69
+282.93 , -12368.62 , -302.26
+282.93 , -10601.68 , -256.52
+282.93 , -8834.73 , -210.46
+282.93 , -7067.78 , -164.04
+282.93 , -5300.84 , -117.17
+282.93 , -3533.89 , -69.54
+282.93 , -1766.95 , -18.27
+282.93 , -353.39 , 0.00
+282.93 , 306.44 , 26.49
+282.93 , 1532.18 , 72.10
+282.93 , 3064.36 , 124.50
+282.93 , 4596.53 , 176.46
+282.93 , 6128.71 , 228.49
+282.93 , 7660.89 , 280.71
+282.93 , 9193.07 , 333.18
+282.93 , 10725.24 , 385.90
+282.93 , 12257.42 , 438.89
+282.93 , 13789.60 , 492.16
+282.93 , 15321.78 , 545.71
+282.93 , 16853.96 , 599.54
+282.93 , 18386.13 , 653.64
+282.93 , 19918.31 , 708.03
+282.93 , 21450.49 , 762.71
+282.93 , 22982.67 , 817.66
+282.93 , 24514.85 , 872.89
+282.93 , 26047.02 , 928.41
+282.93 , 27579.20 , 984.20
+282.93 , 29111.38 , 1040.27
+282.93 , 30643.56 , 1096.63
+301.79 , -35338.92 , -921.56
+301.79 , -33571.97 , -877.23
+301.79 , -31805.03 , -832.56
+301.79 , -30038.08 , -787.56
+301.79 , -28271.13 , -742.22
+301.79 , -26504.19 , -696.56
+301.79 , -24737.24 , -650.56
+301.79 , -22970.30 , -604.23
+301.79 , -21203.35 , -557.56
+301.79 , -19436.40 , -510.57
+301.79 , -17669.46 , -463.24
+301.79 , -15902.51 , -415.58
+301.79 , -14135.57 , -367.58
+301.79 , -12368.62 , -319.24
+301.79 , -10601.68 , -270.55
+301.79 , -8834.73 , -221.48
+301.79 , -7067.78 , -171.99
+301.79 , -5300.84 , -121.95
+301.79 , -3533.89 , -70.93
+301.79 , -1766.95 , -14.10
+301.79 , -353.39 , 0.00
+301.79 , 306.44 , 29.68
+301.79 , 1532.18 , 79.05
+301.79 , 3064.36 , 135.20
+301.79 , 4596.53 , 190.76
+301.79 , 6128.71 , 246.36
+301.79 , 7660.89 , 302.17
+301.79 , 9193.07 , 358.24
+301.79 , 10725.24 , 414.60
+301.79 , 12257.42 , 471.27
+301.79 , 13789.60 , 528.24
+301.79 , 15321.78 , 585.52
+301.79 , 16853.96 , 643.12
+301.79 , 18386.13 , 701.03
+301.79 , 19918.31 , 759.26
+301.79 , 21450.49 , 817.80
+301.79 , 22982.67 , 876.66
+301.79 , 24514.85 , 935.84
+301.79 , 26047.02 , 995.34
+301.79 , 27579.20 , 1055.15
+301.79 , 29111.38 , 1115.27
+301.79 , 30643.56 , 1175.71
+320.65 , -35338.92 , -972.24
+320.65 , -33571.97 , -925.52
+320.65 , -31805.03 , -878.43
+320.65 , -30038.08 , -830.96
+320.65 , -28271.13 , -783.11
+320.65 , -26504.19 , -734.89
+320.65 , -24737.24 , -686.30
+320.65 , -22970.30 , -637.33
+320.65 , -21203.35 , -587.99
+320.65 , -19436.40 , -538.28
+320.65 , -17669.46 , -488.19
+320.65 , -15902.51 , -437.72
+320.65 , -14135.57 , -386.87
+320.65 , -12368.62 , -335.63
+320.65 , -10601.68 , -283.99
+320.65 , -8834.73 , -231.92
+320.65 , -7067.78 , -179.35
+320.65 , -5300.84 , -126.12
+320.65 , -3533.89 , -71.60
+320.65 , -1766.95 , -6.45
+320.65 , -353.39 , 0.00
+320.65 , 306.44 , 33.08
+320.65 , 1532.18 , 86.37
+320.65 , 3064.36 , 146.31
+320.65 , 4596.53 , 205.50
+320.65 , 6128.71 , 264.70
+320.65 , 7660.89 , 324.11
+320.65 , 9193.07 , 383.81
+320.65 , 10725.24 , 443.83
+320.65 , 12257.42 , 504.18
+320.65 , 13789.60 , 564.87
+320.65 , 15321.78 , 625.91
+320.65 , 16853.96 , 687.30
+320.65 , 18386.13 , 749.05
+320.65 , 19918.31 , 811.14
+320.65 , 21450.49 , 873.59
+320.65 , 22982.67 , 936.40
+320.65 , 24514.85 , 999.56
+320.65 , 26047.02 , 1063.07
+320.65 , 27579.20 , 1126.93
+320.65 , 29111.38 , 1191.14
+320.65 , 30643.56 , 1255.71
+339.52 , -35338.92 , -1021.86
+339.52 , -33571.97 , -972.81
+339.52 , -31805.03 , -923.33
+339.52 , -30038.08 , -873.44
+339.52 , -28271.13 , -823.13
+339.52 , -26504.19 , -772.39
+339.52 , -24737.24 , -721.24
+339.52 , -22970.30 , -669.67
+339.52 , -21203.35 , -617.68
+339.52 , -19436.40 , -565.27
+339.52 , -17669.46 , -512.45
+339.52 , -15902.51 , -459.19
+339.52 , -14135.57 , -405.51
+339.52 , -12368.62 , -351.39
+339.52 , -10601.68 , -296.81
+339.52 , -8834.73 , -241.73
+339.52 , -7067.78 , -186.07
+339.52 , -5300.84 , -129.61
+339.52 , -3533.89 , -71.46
+339.52 , -1766.95 , 0.00
+339.52 , -353.39 , 0.00
+339.52 , 306.44 , 36.70
+339.52 , 1532.18 , 94.04
+339.52 , 3064.36 , 157.85
+339.52 , 4596.53 , 220.70
+339.52 , 6128.71 , 283.52
+339.52 , 7660.89 , 346.56
+339.52 , 9193.07 , 409.90
+339.52 , 10725.24 , 473.59
+339.52 , 12257.42 , 537.65
+339.52 , 13789.60 , 602.09
+339.52 , 15321.78 , 666.91
+339.52 , 16853.96 , 732.12
+339.52 , 18386.13 , 797.72
+339.52 , 19918.31 , 863.72
+339.52 , 21450.49 , 930.10
+339.52 , 22982.67 , 996.88
+339.52 , 24514.85 , 1064.05
+339.52 , 26047.02 , 1131.62
+339.52 , 27579.20 , 1199.57
+339.52 , 29111.38 , 1267.92
+339.52 , 30643.56 , 1336.65
+358.38 , -35338.92 , -1070.37
+358.38 , -33571.97 , -1019.04
+358.38 , -31805.03 , -967.24
+358.38 , -30038.08 , -914.96
+358.38 , -28271.13 , -862.23
+358.38 , -26504.19 , -809.02
+358.38 , -24737.24 , -755.35
+358.38 , -22970.30 , -701.21
+358.38 , -21203.35 , -646.60
+358.38 , -19436.40 , -591.53
+358.38 , -17669.46 , -535.99
+358.38 , -15902.51 , -479.97
+358.38 , -14135.57 , -423.47
+358.38 , -12368.62 , -366.48
+358.38 , -10601.68 , -308.96
+358.38 , -8834.73 , -250.88
+358.38 , -7067.78 , -192.11
+358.38 , -5300.84 , -132.36
+358.38 , -3533.89 , -70.38
+358.38 , -1766.95 , 0.00
+358.38 , -353.39 , 0.00
+358.38 , 306.44 , 40.53
+358.38 , 1532.18 , 102.10
+358.38 , 3064.36 , 169.83
+358.38 , 4596.53 , 236.37
+358.38 , 6128.71 , 302.84
+358.38 , 7660.89 , 369.53
+358.38 , 9193.07 , 436.54
+358.38 , 10725.24 , 503.92
+358.38 , 12257.42 , 571.71
+358.38 , 13789.60 , 639.91
+358.38 , 15321.78 , 708.54
+358.38 , 16853.96 , 777.59
+358.38 , 18386.13 , 847.08
+358.38 , 19918.31 , 917.00
+358.38 , 21450.49 , 987.35
+358.38 , 22982.67 , 1058.14
+358.38 , 24514.85 , 1129.36
+358.38 , 26047.02 , 1201.01
+358.38 , 27579.20 , 1273.09
+358.38 , 29111.38 , 1345.61
+358.38 , 30643.56 , 1418.56
+377.24 , -35338.92 , -1117.74
+377.24 , -33571.97 , -1064.18
+377.24 , -31805.03 , -1010.10
+377.24 , -30038.08 , -955.49
+377.24 , -28271.13 , -900.37
+377.24 , -26504.19 , -844.73
+377.24 , -24737.24 , -788.58
+377.24 , -22970.30 , -731.90
+377.24 , -21203.35 , -674.71
+377.24 , -19436.40 , -617.00
+377.24 , -17669.46 , -558.77
+377.24 , -15902.51 , -500.01
+377.24 , -14135.57 , -440.71
+377.24 , -12368.62 , -380.85
+377.24 , -10601.68 , -320.40
+377.24 , -8834.73 , -259.31
+377.24 , -7067.78 , -197.41
+377.24 , -5300.84 , -134.30
+377.24 , -3533.89 , -68.24
+377.24 , -1766.95 , 0.00
+377.24 , -353.39 , 0.00
+377.24 , 306.44 , 44.59
+377.24 , 1532.18 , 110.53
+377.24 , 3064.36 , 182.27
+377.24 , 4596.53 , 252.55
+377.24 , 6128.71 , 322.69
+377.24 , 7660.89 , 393.04
+377.24 , 9193.07 , 463.74
+377.24 , 10725.24 , 534.84
+377.24 , 12257.42 , 606.37
+377.24 , 13789.60 , 678.37
+377.24 , 15321.78 , 750.82
+377.24 , 16853.96 , 823.74
+377.24 , 18386.13 , 897.14
+377.24 , 19918.31 , 971.01
+377.24 , 21450.49 , 1045.36
+377.24 , 22982.67 , 1120.19
+377.24 , 24514.85 , 1195.49
+377.24 , 26047.02 , 1271.27
+377.24 , 27579.20 , 1347.52
+377.24 , 29111.38 , 1424.25
+377.24 , 30643.56 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_2.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_3.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..07feb55aeb84a3946955f362d5131493fe83d565
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -11414.26 , 0.00
+0.00 , -10843.55 , 0.00
+0.00 , -10272.84 , 0.00
+0.00 , -9702.12 , 0.00
+0.00 , -9131.41 , 0.00
+0.00 , -8560.70 , 0.00
+0.00 , -7989.99 , -0.13
+0.00 , -7419.27 , -0.66
+0.00 , -6848.56 , -0.98
+0.00 , -6277.85 , -1.19
+0.00 , -5707.13 , -1.32
+0.00 , -5136.42 , -1.38
+0.00 , -4565.71 , -1.39
+0.00 , -3994.99 , -1.35
+0.00 , -3424.28 , -1.26
+0.00 , -2853.57 , -1.13
+0.00 , -2282.85 , -0.97
+0.00 , -1712.14 , -0.77
+0.00 , -1141.43 , -0.53
+0.00 , -570.71 , -0.27
+0.00 , -114.14 , -0.02
+0.00 , 103.14 , 0.13
+0.00 , 515.72 , 0.56
+0.00 , 1031.44 , 1.12
+0.00 , 1547.16 , 1.70
+0.00 , 2062.88 , 2.31
+0.00 , 2578.60 , 2.93
+0.00 , 3094.32 , 3.58
+0.00 , 3610.04 , 4.25
+0.00 , 4125.76 , 4.93
+0.00 , 4641.48 , 5.64
+0.00 , 5157.20 , 6.37
+0.00 , 5672.91 , 7.12
+0.00 , 6188.63 , 7.88
+0.00 , 6704.35 , 8.67
+0.00 , 7220.07 , 9.47
+0.00 , 7735.79 , 10.29
+0.00 , 8251.51 , 11.13
+0.00 , 8767.23 , 11.99
+0.00 , 9282.95 , 12.87
+0.00 , 9798.67 , 13.76
+0.00 , 10314.39 , 14.67
+5.72 , -11414.26 , 0.00
+5.72 , -10843.55 , 0.00
+5.72 , -10272.84 , 0.00
+5.72 , -9702.12 , 0.00
+5.72 , -9131.41 , 0.00
+5.72 , -8560.70 , 0.00
+5.72 , -7989.99 , -0.50
+5.72 , -7419.27 , -0.84
+5.72 , -6848.56 , -1.04
+5.72 , -6277.85 , -1.16
+5.72 , -5707.13 , -1.22
+5.72 , -5136.42 , -1.24
+5.72 , -4565.71 , -1.21
+5.72 , -3994.99 , -1.15
+5.72 , -3424.28 , -1.06
+5.72 , -2853.57 , -0.94
+5.72 , -2282.85 , -0.80
+5.72 , -1712.14 , -0.62
+5.72 , -1141.43 , -0.43
+5.72 , -570.71 , -0.21
+5.72 , -114.14 , -0.02
+5.72 , 103.14 , 0.10
+5.72 , 515.72 , 0.43
+5.72 , 1031.44 , 0.85
+5.72 , 1547.16 , 1.30
+5.72 , 2062.88 , 1.75
+5.72 , 2578.60 , 2.23
+5.72 , 3094.32 , 2.71
+5.72 , 3610.04 , 3.21
+5.72 , 4125.76 , 3.73
+5.72 , 4641.48 , 4.26
+5.72 , 5157.20 , 4.80
+5.72 , 5672.91 , 5.36
+5.72 , 6188.63 , 5.93
+5.72 , 6704.35 , 6.52
+5.72 , 7220.07 , 7.12
+5.72 , 7735.79 , 7.73
+5.72 , 8251.51 , 8.35
+5.72 , 8767.23 , 8.99
+5.72 , 9282.95 , 9.64
+5.72 , 9798.67 , 10.30
+5.72 , 10314.39 , 10.98
+57.21 , -11414.26 , -58.10
+57.21 , -10843.55 , -55.37
+57.21 , -10272.84 , -52.62
+57.21 , -9702.12 , -49.85
+57.21 , -9131.41 , -47.06
+57.21 , -8560.70 , -44.25
+57.21 , -7989.99 , -41.42
+57.21 , -7419.27 , -38.57
+57.21 , -6848.56 , -35.70
+57.21 , -6277.85 , -32.81
+57.21 , -5707.13 , -29.90
+57.21 , -5136.42 , -26.98
+57.21 , -4565.71 , -24.03
+57.21 , -3994.99 , -21.07
+57.21 , -3424.28 , -18.08
+57.21 , -2853.57 , -15.08
+57.21 , -2282.85 , -12.06
+57.21 , -1712.14 , -9.02
+57.21 , -1141.43 , -5.96
+57.21 , -570.71 , -2.88
+57.21 , -114.14 , -0.37
+57.21 , 103.14 , 0.90
+57.21 , 515.72 , 3.68
+57.21 , 1031.44 , 7.16
+57.21 , 1547.16 , 10.66
+57.21 , 2062.88 , 14.17
+57.21 , 2578.60 , 17.71
+57.21 , 3094.32 , 21.26
+57.21 , 3610.04 , 24.84
+57.21 , 4125.76 , 28.43
+57.21 , 4641.48 , 32.04
+57.21 , 5157.20 , 35.67
+57.21 , 5672.91 , 39.32
+57.21 , 6188.63 , 42.99
+57.21 , 6704.35 , 46.68
+57.21 , 7220.07 , 50.38
+57.21 , 7735.79 , 54.11
+57.21 , 8251.51 , 57.85
+57.21 , 8767.23 , 61.61
+57.21 , 9282.95 , 65.39
+57.21 , 9798.67 , 69.19
+57.21 , 10314.39 , 73.01
+114.41 , -11414.26 , -120.57
+114.41 , -10843.55 , -114.73
+114.41 , -10272.84 , -108.87
+114.41 , -9702.12 , -102.99
+114.41 , -9131.41 , -97.08
+114.41 , -8560.70 , -91.15
+114.41 , -7989.99 , -85.20
+114.41 , -7419.27 , -79.23
+114.41 , -6848.56 , -73.23
+114.41 , -6277.85 , -67.21
+114.41 , -5707.13 , -61.17
+114.41 , -5136.42 , -55.10
+114.41 , -4565.71 , -49.01
+114.41 , -3994.99 , -42.90
+114.41 , -3424.28 , -36.77
+114.41 , -2853.57 , -30.61
+114.41 , -2282.85 , -24.43
+114.41 , -1712.14 , -18.23
+114.41 , -1141.43 , -12.01
+114.41 , -570.71 , -5.76
+114.41 , -114.14 , -0.66
+114.41 , 103.14 , 1.84
+114.41 , 515.72 , 7.35
+114.41 , 1031.44 , 14.22
+114.41 , 1547.16 , 21.11
+114.41 , 2062.88 , 28.02
+114.41 , 2578.60 , 34.96
+114.41 , 3094.32 , 41.92
+114.41 , 3610.04 , 48.90
+114.41 , 4125.76 , 55.90
+114.41 , 4641.48 , 62.93
+114.41 , 5157.20 , 69.98
+114.41 , 5672.91 , 77.05
+114.41 , 6188.63 , 84.15
+114.41 , 6704.35 , 91.27
+114.41 , 7220.07 , 98.41
+114.41 , 7735.79 , 105.58
+114.41 , 8251.51 , 112.76
+114.41 , 8767.23 , 119.97
+114.41 , 9282.95 , 127.21
+114.41 , 9798.67 , 134.46
+114.41 , 10314.39 , 141.74
+171.62 , -11414.26 , -182.44
+171.62 , -10843.55 , -173.55
+171.62 , -10272.84 , -164.62
+171.62 , -9702.12 , -155.67
+171.62 , -9131.41 , -146.69
+171.62 , -8560.70 , -137.68
+171.62 , -7989.99 , -128.65
+171.62 , -7419.27 , -119.58
+171.62 , -6848.56 , -110.49
+171.62 , -6277.85 , -101.36
+171.62 , -5707.13 , -92.21
+171.62 , -5136.42 , -83.03
+171.62 , -4565.71 , -73.82
+171.62 , -3994.99 , -64.58
+171.62 , -3424.28 , -55.31
+171.62 , -2853.57 , -46.02
+171.62 , -2282.85 , -36.70
+171.62 , -1712.14 , -27.34
+171.62 , -1141.43 , -17.96
+171.62 , -570.71 , -8.54
+171.62 , -114.14 , -0.79
+171.62 , 103.14 , 2.86
+171.62 , 515.72 , 11.12
+171.62 , 1031.44 , 21.39
+171.62 , 1547.16 , 31.68
+171.62 , 2062.88 , 41.99
+171.62 , 2578.60 , 52.34
+171.62 , 3094.32 , 62.71
+171.62 , 3610.04 , 73.12
+171.62 , 4125.76 , 83.55
+171.62 , 4641.48 , 94.01
+171.62 , 5157.20 , 104.50
+171.62 , 5672.91 , 115.02
+171.62 , 6188.63 , 125.57
+171.62 , 6704.35 , 136.15
+171.62 , 7220.07 , 146.76
+171.62 , 7735.79 , 157.40
+171.62 , 8251.51 , 168.06
+171.62 , 8767.23 , 178.76
+171.62 , 9282.95 , 189.48
+171.62 , 9798.67 , 200.23
+171.62 , 10314.39 , 211.02
+228.82 , -11414.26 , -243.71
+228.82 , -10843.55 , -231.81
+228.82 , -10272.84 , -219.87
+228.82 , -9702.12 , -207.89
+228.82 , -9131.41 , -195.88
+228.82 , -8560.70 , -183.83
+228.82 , -7989.99 , -171.74
+228.82 , -7419.27 , -159.61
+228.82 , -6848.56 , -147.45
+228.82 , -6277.85 , -135.25
+228.82 , -5707.13 , -123.01
+228.82 , -5136.42 , -110.74
+228.82 , -4565.71 , -98.43
+228.82 , -3994.99 , -86.08
+228.82 , -3424.28 , -73.70
+228.82 , -2853.57 , -61.27
+228.82 , -2282.85 , -48.82
+228.82 , -1712.14 , -36.32
+228.82 , -1141.43 , -23.78
+228.82 , -570.71 , -11.19
+228.82 , -114.14 , -0.63
+228.82 , 103.14 , 3.98
+228.82 , 515.72 , 15.01
+228.82 , 1031.44 , 28.68
+228.82 , 1547.16 , 42.37
+228.82 , 2062.88 , 56.10
+228.82 , 2578.60 , 69.87
+228.82 , 3094.32 , 83.67
+228.82 , 3610.04 , 97.52
+228.82 , 4125.76 , 111.40
+228.82 , 4641.48 , 125.31
+228.82 , 5157.20 , 139.27
+228.82 , 5672.91 , 153.26
+228.82 , 6188.63 , 167.29
+228.82 , 6704.35 , 181.36
+228.82 , 7220.07 , 195.46
+228.82 , 7735.79 , 209.61
+228.82 , 8251.51 , 223.79
+228.82 , 8767.23 , 238.01
+228.82 , 9282.95 , 252.26
+228.82 , 9798.67 , 266.56
+228.82 , 10314.39 , 280.89
+286.03 , -11414.26 , -304.37
+286.03 , -10843.55 , -289.50
+286.03 , -10272.84 , -274.59
+286.03 , -9702.12 , -259.63
+286.03 , -9131.41 , -244.61
+286.03 , -8560.70 , -229.56
+286.03 , -7989.99 , -214.45
+286.03 , -7419.27 , -199.30
+286.03 , -6848.56 , -184.10
+286.03 , -6277.85 , -168.85
+286.03 , -5707.13 , -153.55
+286.03 , -5136.42 , -138.20
+286.03 , -4565.71 , -122.81
+286.03 , -3994.99 , -107.37
+286.03 , -3424.28 , -91.88
+286.03 , -2853.57 , -76.35
+286.03 , -2282.85 , -60.76
+286.03 , -1712.14 , -45.13
+286.03 , -1141.43 , -29.44
+286.03 , -570.71 , -13.67
+286.03 , -114.14 , 0.00
+286.03 , 103.14 , 5.21
+286.03 , 515.72 , 19.04
+286.03 , 1031.44 , 36.13
+286.03 , 1547.16 , 53.24
+286.03 , 2062.88 , 70.39
+286.03 , 2578.60 , 87.59
+286.03 , 3094.32 , 104.83
+286.03 , 3610.04 , 122.13
+286.03 , 4125.76 , 139.47
+286.03 , 4641.48 , 156.87
+286.03 , 5157.20 , 174.31
+286.03 , 5672.91 , 191.80
+286.03 , 6188.63 , 209.33
+286.03 , 6704.35 , 226.92
+286.03 , 7220.07 , 244.56
+286.03 , 7735.79 , 262.24
+286.03 , 8251.51 , 279.97
+286.03 , 8767.23 , 297.76
+286.03 , 9282.95 , 315.58
+286.03 , 9798.67 , 333.46
+286.03 , 10314.39 , 351.39
+343.23 , -11414.26 , -364.37
+343.23 , -10843.55 , -346.59
+343.23 , -10272.84 , -328.74
+343.23 , -9702.12 , -310.84
+343.23 , -9131.41 , -292.87
+343.23 , -8560.70 , -274.84
+343.23 , -7989.99 , -256.75
+343.23 , -7419.27 , -238.60
+343.23 , -6848.56 , -220.39
+343.23 , -6277.85 , -202.12
+343.23 , -5707.13 , -183.79
+343.23 , -5136.42 , -165.40
+343.23 , -4565.71 , -146.94
+343.23 , -3994.99 , -128.43
+343.23 , -3424.28 , -109.85
+343.23 , -2853.57 , -91.21
+343.23 , -2282.85 , -72.51
+343.23 , -1712.14 , -53.75
+343.23 , -1141.43 , -34.91
+343.23 , -570.71 , -15.95
+343.23 , -114.14 , 0.00
+343.23 , 103.14 , 6.58
+343.23 , 515.72 , 23.25
+343.23 , 1031.44 , 43.76
+343.23 , 1547.16 , 64.29
+343.23 , 2062.88 , 84.87
+343.23 , 2578.60 , 105.52
+343.23 , 3094.32 , 126.22
+343.23 , 3610.04 , 146.98
+343.23 , 4125.76 , 167.81
+343.23 , 4641.48 , 188.70
+343.23 , 5157.20 , 209.65
+343.23 , 5672.91 , 230.66
+343.23 , 6188.63 , 251.73
+343.23 , 6704.35 , 272.87
+343.23 , 7220.07 , 294.07
+343.23 , 7735.79 , 315.33
+343.23 , 8251.51 , 336.65
+343.23 , 8767.23 , 358.03
+343.23 , 9282.95 , 379.47
+343.23 , 9798.67 , 400.98
+343.23 , 10314.39 , 422.54
+400.44 , -11414.26 , -423.69
+400.44 , -10843.55 , -403.04
+400.44 , -10272.84 , -382.31
+400.44 , -9702.12 , -361.50
+400.44 , -9131.41 , -340.62
+400.44 , -8560.70 , -319.66
+400.44 , -7989.99 , -298.62
+400.44 , -7419.27 , -277.51
+400.44 , -6848.56 , -256.31
+400.44 , -6277.85 , -235.05
+400.44 , -5707.13 , -213.70
+400.44 , -5136.42 , -192.28
+400.44 , -4565.71 , -170.79
+400.44 , -3994.99 , -149.21
+400.44 , -3424.28 , -127.57
+400.44 , -2853.57 , -105.84
+400.44 , -2282.85 , -84.03
+400.44 , -1712.14 , -62.14
+400.44 , -1141.43 , -40.16
+400.44 , -570.71 , -18.00
+400.44 , -114.14 , 0.00
+400.44 , 103.14 , 8.09
+400.44 , 515.72 , 27.64
+400.44 , 1031.44 , 51.59
+400.44 , 1547.16 , 75.56
+400.44 , 2062.88 , 99.58
+400.44 , 2578.60 , 123.68
+400.44 , 3094.32 , 147.86
+400.44 , 3610.04 , 172.10
+400.44 , 4125.76 , 196.43
+400.44 , 4641.48 , 220.84
+400.44 , 5157.20 , 245.32
+400.44 , 5672.91 , 269.88
+400.44 , 6188.63 , 294.51
+400.44 , 6704.35 , 319.23
+400.44 , 7220.07 , 344.02
+400.44 , 7735.79 , 368.89
+400.44 , 8251.51 , 393.83
+400.44 , 8767.23 , 418.85
+400.44 , 9282.95 , 443.95
+400.44 , 9798.67 , 469.13
+400.44 , 10314.39 , 494.38
+457.64 , -11414.26 , -482.31
+457.64 , -10843.55 , -458.83
+457.64 , -10272.84 , -435.26
+457.64 , -9702.12 , -411.59
+457.64 , -9131.41 , -387.83
+457.64 , -8560.70 , -363.97
+457.64 , -7989.99 , -340.02
+457.64 , -7419.27 , -315.97
+457.64 , -6848.56 , -291.83
+457.64 , -6277.85 , -267.59
+457.64 , -5707.13 , -243.26
+457.64 , -5136.42 , -218.84
+457.64 , -4565.71 , -194.32
+457.64 , -3994.99 , -169.71
+457.64 , -3424.28 , -145.00
+457.64 , -2853.57 , -120.19
+457.64 , -2282.85 , -95.29
+457.64 , -1712.14 , -70.28
+457.64 , -1141.43 , -45.14
+457.64 , -570.71 , -19.76
+457.64 , -114.14 , 0.00
+457.64 , 103.14 , 9.76
+457.64 , 515.72 , 32.25
+457.64 , 1031.44 , 59.66
+457.64 , 1547.16 , 87.07
+457.64 , 2062.88 , 114.55
+457.64 , 2578.60 , 142.11
+457.64 , 3094.32 , 169.77
+457.64 , 3610.04 , 197.52
+457.64 , 4125.76 , 225.37
+457.64 , 4641.48 , 253.31
+457.64 , 5157.20 , 281.34
+457.64 , 5672.91 , 309.47
+457.64 , 6188.63 , 337.70
+457.64 , 6704.35 , 366.02
+457.64 , 7220.07 , 394.44
+457.64 , 7735.79 , 422.95
+457.64 , 8251.51 , 451.56
+457.64 , 8767.23 , 480.26
+457.64 , 9282.95 , 509.05
+457.64 , 9798.67 , 537.94
+457.64 , 10314.39 , 566.93
+514.85 , -11414.26 , -540.17
+514.85 , -10843.55 , -513.92
+514.85 , -10272.84 , -487.55
+514.85 , -9702.12 , -461.06
+514.85 , -9131.41 , -434.46
+514.85 , -8560.70 , -407.75
+514.85 , -7989.99 , -380.92
+514.85 , -7419.27 , -353.97
+514.85 , -6848.56 , -326.91
+514.85 , -6277.85 , -299.73
+514.85 , -5707.13 , -272.44
+514.85 , -5136.42 , -245.03
+514.85 , -4565.71 , -217.51
+514.85 , -3994.99 , -189.87
+514.85 , -3424.28 , -162.12
+514.85 , -2853.57 , -134.25
+514.85 , -2282.85 , -106.26
+514.85 , -1712.14 , -78.13
+514.85 , -1141.43 , -49.84
+514.85 , -570.71 , -21.19
+514.85 , -114.14 , 0.00
+514.85 , 103.14 , 11.59
+514.85 , 515.72 , 37.10
+514.85 , 1031.44 , 67.98
+514.85 , 1547.16 , 98.85
+514.85 , 2062.88 , 129.79
+514.85 , 2578.60 , 160.84
+514.85 , 3094.32 , 191.99
+514.85 , 3610.04 , 223.26
+514.85 , 4125.76 , 254.64
+514.85 , 4641.48 , 286.14
+514.85 , 5157.20 , 317.75
+514.85 , 5672.91 , 349.48
+514.85 , 6188.63 , 381.32
+514.85 , 6704.35 , 413.28
+514.85 , 7220.07 , 445.36
+514.85 , 7735.79 , 477.54
+514.85 , 8251.51 , 509.85
+514.85 , 8767.23 , 542.27
+514.85 , 9282.95 , 574.80
+514.85 , 9798.67 , 607.45
+514.85 , 10314.39 , 640.21
+572.06 , -11414.26 , -597.26
+572.06 , -10843.55 , -568.28
+572.06 , -10272.84 , -539.16
+572.06 , -9702.12 , -509.90
+572.06 , -9131.41 , -480.50
+572.06 , -8560.70 , -450.96
+572.06 , -7989.99 , -421.28
+572.06 , -7419.27 , -391.47
+572.06 , -6848.56 , -361.52
+572.06 , -6277.85 , -331.43
+572.06 , -5707.13 , -301.20
+572.06 , -5136.42 , -270.83
+572.06 , -4565.71 , -240.33
+572.06 , -3994.99 , -209.68
+572.06 , -3424.28 , -178.90
+572.06 , -2853.57 , -147.97
+572.06 , -2282.85 , -116.90
+572.06 , -1712.14 , -85.66
+572.06 , -1141.43 , -54.21
+572.06 , -570.71 , -22.23
+572.06 , -114.14 , 0.00
+572.06 , 103.14 , 13.60
+572.06 , 515.72 , 42.20
+572.06 , 1031.44 , 76.58
+572.06 , 1547.16 , 110.92
+572.06 , 2062.88 , 145.34
+572.06 , 2578.60 , 179.88
+572.06 , 3094.32 , 214.55
+572.06 , 3610.04 , 249.35
+572.06 , 4125.76 , 284.29
+572.06 , 4641.48 , 319.36
+572.06 , 5157.20 , 354.57
+572.06 , 5672.91 , 389.92
+572.06 , 6188.63 , 425.41
+572.06 , 6704.35 , 461.03
+572.06 , 7220.07 , 496.79
+572.06 , 7735.79 , 532.69
+572.06 , 8251.51 , 568.73
+572.06 , 8767.23 , 604.90
+572.06 , 9282.95 , 641.21
+572.06 , 9798.67 , 677.66
+572.06 , 10314.39 , 714.24
+629.26 , -11414.26 , -653.54
+629.26 , -10843.55 , -621.88
+629.26 , -10272.84 , -590.05
+629.26 , -9702.12 , -558.06
+629.26 , -9131.41 , -525.90
+629.26 , -8560.70 , -493.58
+629.26 , -7989.99 , -461.09
+629.26 , -7419.27 , -428.44
+629.26 , -6848.56 , -395.63
+629.26 , -6277.85 , -362.65
+629.26 , -5707.13 , -329.51
+629.26 , -5136.42 , -296.21
+629.26 , -4565.71 , -262.74
+629.26 , -3994.99 , -229.11
+629.26 , -3424.28 , -195.31
+629.26 , -2853.57 , -161.34
+629.26 , -2282.85 , -127.18
+629.26 , -1712.14 , -92.83
+629.26 , -1141.43 , -58.20
+629.26 , -570.71 , -22.82
+629.26 , -114.14 , 0.00
+629.26 , 103.14 , 15.79
+629.26 , 515.72 , 47.58
+629.26 , 1031.44 , 85.48
+629.26 , 1547.16 , 123.30
+629.26 , 2062.88 , 161.22
+629.26 , 2578.60 , 199.26
+629.26 , 3094.32 , 237.46
+629.26 , 3610.04 , 275.81
+629.26 , 4125.76 , 314.32
+629.26 , 4641.48 , 352.99
+629.26 , 5157.20 , 391.83
+629.26 , 5672.91 , 430.82
+629.26 , 6188.63 , 469.98
+629.26 , 6704.35 , 509.30
+629.26 , 7220.07 , 548.78
+629.26 , 7735.79 , 588.42
+629.26 , 8251.51 , 628.23
+629.26 , 8767.23 , 668.20
+629.26 , 9282.95 , 708.32
+629.26 , 9798.67 , 748.61
+629.26 , 10314.39 , 789.06
+686.47 , -11414.26 , -708.97
+686.47 , -10843.55 , -674.68
+686.47 , -10272.84 , -640.19
+686.47 , -9702.12 , -605.51
+686.47 , -9131.41 , -570.63
+686.47 , -8560.70 , -535.56
+686.47 , -7989.99 , -500.30
+686.47 , -7419.27 , -464.85
+686.47 , -6848.56 , -429.21
+686.47 , -6277.85 , -393.37
+686.47 , -5707.13 , -357.35
+686.47 , -5136.42 , -321.13
+686.47 , -4565.71 , -284.71
+686.47 , -3994.99 , -248.11
+686.47 , -3424.28 , -211.31
+686.47 , -2853.57 , -174.30
+686.47 , -2282.85 , -137.08
+686.47 , -1712.14 , -99.61
+686.47 , -1141.43 , -61.78
+686.47 , -570.71 , -22.86
+686.47 , -114.14 , 0.00
+686.47 , 103.14 , 18.17
+686.47 , 515.72 , 53.24
+686.47 , 1031.44 , 94.71
+686.47 , 1547.16 , 136.03
+686.47 , 2062.88 , 177.45
+686.47 , 2578.60 , 219.01
+686.47 , 3094.32 , 260.75
+686.47 , 3610.04 , 302.67
+686.47 , 4125.76 , 344.78
+686.47 , 4641.48 , 387.07
+686.47 , 5157.20 , 429.54
+686.47 , 5672.91 , 472.21
+686.47 , 6188.63 , 515.06
+686.47 , 6704.35 , 558.11
+686.47 , 7220.07 , 601.34
+686.47 , 7735.79 , 644.76
+686.47 , 8251.51 , 688.37
+686.47 , 8767.23 , 732.17
+686.47 , 9282.95 , 776.15
+686.47 , 9798.67 , 820.33
+686.47 , 10314.39 , 864.69
+743.67 , -11414.26 , -763.53
+743.67 , -10843.55 , -726.65
+743.67 , -10272.84 , -689.55
+743.67 , -9702.12 , -652.22
+743.67 , -9131.41 , -614.67
+743.67 , -8560.70 , -576.89
+743.67 , -7989.99 , -538.89
+743.67 , -7419.27 , -500.67
+743.67 , -6848.56 , -462.22
+743.67 , -6277.85 , -423.56
+743.67 , -5707.13 , -384.67
+743.67 , -5136.42 , -345.56
+743.67 , -4565.71 , -306.22
+743.67 , -3994.99 , -266.66
+743.67 , -3424.28 , -226.86
+743.67 , -2853.57 , -186.83
+743.67 , -2282.85 , -146.54
+743.67 , -1712.14 , -105.95
+743.67 , -1141.43 , -64.90
+743.67 , -570.71 , -22.24
+743.67 , -114.14 , 0.00
+743.67 , 103.14 , 20.74
+743.67 , 515.72 , 59.20
+743.67 , 1031.44 , 104.27
+743.67 , 1547.16 , 149.12
+743.67 , 2062.88 , 194.05
+743.67 , 2578.60 , 239.16
+743.67 , 3094.32 , 284.45
+743.67 , 3610.04 , 329.96
+743.67 , 4125.76 , 375.67
+743.67 , 4641.48 , 421.60
+743.67 , 5157.20 , 467.75
+743.67 , 5672.91 , 514.11
+743.67 , 6188.63 , 560.69
+743.67 , 6704.35 , 607.48
+743.67 , 7220.07 , 654.50
+743.67 , 7735.79 , 701.73
+743.67 , 8251.51 , 749.18
+743.67 , 8767.23 , 796.84
+743.67 , 9282.95 , 844.73
+743.67 , 9798.67 , 892.83
+743.67 , 10314.39 , 941.14
+800.88 , -11414.26 , -817.17
+800.88 , -10843.55 , -777.76
+800.88 , -10272.84 , -738.08
+800.88 , -9702.12 , -698.15
+800.88 , -9131.41 , -657.96
+800.88 , -8560.70 , -617.52
+800.88 , -7989.99 , -576.82
+800.88 , -7419.27 , -535.86
+800.88 , -6848.56 , -494.65
+800.88 , -6277.85 , -453.18
+800.88 , -5707.13 , -411.45
+800.88 , -5136.42 , -369.47
+800.88 , -4565.71 , -327.22
+800.88 , -3994.99 , -284.72
+800.88 , -3424.28 , -241.95
+800.88 , -2853.57 , -198.90
+800.88 , -2282.85 , -155.54
+800.88 , -1712.14 , -111.82
+800.88 , -1141.43 , -67.51
+800.88 , -570.71 , -20.80
+800.88 , -114.14 , 0.00
+800.88 , 103.14 , 23.52
+800.88 , 515.72 , 65.48
+800.88 , 1031.44 , 114.20
+800.88 , 1547.16 , 162.59
+800.88 , 2062.88 , 211.06
+800.88 , 2578.60 , 259.72
+800.88 , 3094.32 , 308.59
+800.88 , 3610.04 , 357.69
+800.88 , 4125.76 , 407.04
+800.88 , 4641.48 , 456.62
+800.88 , 5157.20 , 506.46
+800.88 , 5672.91 , 556.54
+800.88 , 6188.63 , 606.87
+800.88 , 6704.35 , 657.45
+800.88 , 7220.07 , 708.28
+800.88 , 7735.79 , 759.35
+800.88 , 8251.51 , 810.68
+800.88 , 8767.23 , 862.25
+800.88 , 9282.95 , 914.07
+800.88 , 9798.67 , 966.13
+800.88 , 10314.39 , 1018.44
+858.08 , -11414.26 , -869.86
+858.08 , -10843.55 , -827.96
+858.08 , -10272.84 , -785.77
+858.08 , -9702.12 , -743.28
+858.08 , -9131.41 , -700.50
+858.08 , -8560.70 , -657.42
+858.08 , -7989.99 , -614.05
+858.08 , -7419.27 , -570.39
+858.08 , -6848.56 , -526.44
+858.08 , -6277.85 , -482.19
+858.08 , -5707.13 , -437.65
+858.08 , -5136.42 , -392.82
+858.08 , -4565.71 , -347.69
+858.08 , -3994.99 , -302.26
+858.08 , -3424.28 , -256.52
+858.08 , -2853.57 , -210.46
+858.08 , -2282.85 , -164.04
+858.08 , -1712.14 , -117.17
+858.08 , -1141.43 , -69.54
+858.08 , -570.71 , -18.27
+858.08 , -114.14 , 0.00
+858.08 , 103.14 , 26.49
+858.08 , 515.72 , 72.10
+858.08 , 1031.44 , 124.50
+858.08 , 1547.16 , 176.46
+858.08 , 2062.88 , 228.49
+858.08 , 2578.60 , 280.71
+858.08 , 3094.32 , 333.18
+858.08 , 3610.04 , 385.90
+858.08 , 4125.76 , 438.89
+858.08 , 4641.48 , 492.16
+858.08 , 5157.20 , 545.71
+858.08 , 5672.91 , 599.54
+858.08 , 6188.63 , 653.64
+858.08 , 6704.35 , 708.03
+858.08 , 7220.07 , 762.71
+858.08 , 7735.79 , 817.66
+858.08 , 8251.51 , 872.89
+858.08 , 8767.23 , 928.41
+858.08 , 9282.95 , 984.20
+858.08 , 9798.67 , 1040.27
+858.08 , 10314.39 , 1096.63
+915.29 , -11414.26 , -921.56
+915.29 , -10843.55 , -877.23
+915.29 , -10272.84 , -832.56
+915.29 , -9702.12 , -787.56
+915.29 , -9131.41 , -742.22
+915.29 , -8560.70 , -696.56
+915.29 , -7989.99 , -650.56
+915.29 , -7419.27 , -604.23
+915.29 , -6848.56 , -557.56
+915.29 , -6277.85 , -510.57
+915.29 , -5707.13 , -463.24
+915.29 , -5136.42 , -415.58
+915.29 , -4565.71 , -367.58
+915.29 , -3994.99 , -319.24
+915.29 , -3424.28 , -270.55
+915.29 , -2853.57 , -221.48
+915.29 , -2282.85 , -171.99
+915.29 , -1712.14 , -121.95
+915.29 , -1141.43 , -70.93
+915.29 , -570.71 , -14.10
+915.29 , -114.14 , 0.00
+915.29 , 103.14 , 29.68
+915.29 , 515.72 , 79.05
+915.29 , 1031.44 , 135.20
+915.29 , 1547.16 , 190.76
+915.29 , 2062.88 , 246.36
+915.29 , 2578.60 , 302.17
+915.29 , 3094.32 , 358.24
+915.29 , 3610.04 , 414.60
+915.29 , 4125.76 , 471.27
+915.29 , 4641.48 , 528.24
+915.29 , 5157.20 , 585.52
+915.29 , 5672.91 , 643.12
+915.29 , 6188.63 , 701.03
+915.29 , 6704.35 , 759.26
+915.29 , 7220.07 , 817.80
+915.29 , 7735.79 , 876.66
+915.29 , 8251.51 , 935.84
+915.29 , 8767.23 , 995.34
+915.29 , 9282.95 , 1055.15
+915.29 , 9798.67 , 1115.27
+915.29 , 10314.39 , 1175.71
+972.50 , -11414.26 , -972.24
+972.50 , -10843.55 , -925.52
+972.50 , -10272.84 , -878.43
+972.50 , -9702.12 , -830.96
+972.50 , -9131.41 , -783.11
+972.50 , -8560.70 , -734.89
+972.50 , -7989.99 , -686.30
+972.50 , -7419.27 , -637.33
+972.50 , -6848.56 , -587.99
+972.50 , -6277.85 , -538.28
+972.50 , -5707.13 , -488.19
+972.50 , -5136.42 , -437.72
+972.50 , -4565.71 , -386.87
+972.50 , -3994.99 , -335.63
+972.50 , -3424.28 , -283.99
+972.50 , -2853.57 , -231.92
+972.50 , -2282.85 , -179.35
+972.50 , -1712.14 , -126.12
+972.50 , -1141.43 , -71.60
+972.50 , -570.71 , -6.45
+972.50 , -114.14 , 0.00
+972.50 , 103.14 , 33.08
+972.50 , 515.72 , 86.37
+972.50 , 1031.44 , 146.31
+972.50 , 1547.16 , 205.50
+972.50 , 2062.88 , 264.70
+972.50 , 2578.60 , 324.11
+972.50 , 3094.32 , 383.81
+972.50 , 3610.04 , 443.83
+972.50 , 4125.76 , 504.18
+972.50 , 4641.48 , 564.87
+972.50 , 5157.20 , 625.91
+972.50 , 5672.91 , 687.30
+972.50 , 6188.63 , 749.05
+972.50 , 6704.35 , 811.14
+972.50 , 7220.07 , 873.59
+972.50 , 7735.79 , 936.40
+972.50 , 8251.51 , 999.56
+972.50 , 8767.23 , 1063.07
+972.50 , 9282.95 , 1126.93
+972.50 , 9798.67 , 1191.14
+972.50 , 10314.39 , 1255.71
+1029.70 , -11414.26 , -1021.86
+1029.70 , -10843.55 , -972.81
+1029.70 , -10272.84 , -923.33
+1029.70 , -9702.12 , -873.44
+1029.70 , -9131.41 , -823.13
+1029.70 , -8560.70 , -772.39
+1029.70 , -7989.99 , -721.24
+1029.70 , -7419.27 , -669.67
+1029.70 , -6848.56 , -617.68
+1029.70 , -6277.85 , -565.27
+1029.70 , -5707.13 , -512.45
+1029.70 , -5136.42 , -459.19
+1029.70 , -4565.71 , -405.51
+1029.70 , -3994.99 , -351.39
+1029.70 , -3424.28 , -296.81
+1029.70 , -2853.57 , -241.73
+1029.70 , -2282.85 , -186.07
+1029.70 , -1712.14 , -129.61
+1029.70 , -1141.43 , -71.46
+1029.70 , -570.71 , 0.00
+1029.70 , -114.14 , 0.00
+1029.70 , 103.14 , 36.70
+1029.70 , 515.72 , 94.04
+1029.70 , 1031.44 , 157.85
+1029.70 , 1547.16 , 220.70
+1029.70 , 2062.88 , 283.52
+1029.70 , 2578.60 , 346.56
+1029.70 , 3094.32 , 409.90
+1029.70 , 3610.04 , 473.59
+1029.70 , 4125.76 , 537.65
+1029.70 , 4641.48 , 602.09
+1029.70 , 5157.20 , 666.91
+1029.70 , 5672.91 , 732.12
+1029.70 , 6188.63 , 797.72
+1029.70 , 6704.35 , 863.72
+1029.70 , 7220.07 , 930.10
+1029.70 , 7735.79 , 996.88
+1029.70 , 8251.51 , 1064.05
+1029.70 , 8767.23 , 1131.62
+1029.70 , 9282.95 , 1199.57
+1029.70 , 9798.67 , 1267.92
+1029.70 , 10314.39 , 1336.65
+1086.91 , -11414.26 , -1070.37
+1086.91 , -10843.55 , -1019.04
+1086.91 , -10272.84 , -967.24
+1086.91 , -9702.12 , -914.96
+1086.91 , -9131.41 , -862.23
+1086.91 , -8560.70 , -809.02
+1086.91 , -7989.99 , -755.35
+1086.91 , -7419.27 , -701.21
+1086.91 , -6848.56 , -646.60
+1086.91 , -6277.85 , -591.53
+1086.91 , -5707.13 , -535.99
+1086.91 , -5136.42 , -479.97
+1086.91 , -4565.71 , -423.47
+1086.91 , -3994.99 , -366.48
+1086.91 , -3424.28 , -308.96
+1086.91 , -2853.57 , -250.88
+1086.91 , -2282.85 , -192.11
+1086.91 , -1712.14 , -132.36
+1086.91 , -1141.43 , -70.38
+1086.91 , -570.71 , 0.00
+1086.91 , -114.14 , 0.00
+1086.91 , 103.14 , 40.53
+1086.91 , 515.72 , 102.10
+1086.91 , 1031.44 , 169.83
+1086.91 , 1547.16 , 236.37
+1086.91 , 2062.88 , 302.84
+1086.91 , 2578.60 , 369.53
+1086.91 , 3094.32 , 436.54
+1086.91 , 3610.04 , 503.92
+1086.91 , 4125.76 , 571.71
+1086.91 , 4641.48 , 639.91
+1086.91 , 5157.20 , 708.54
+1086.91 , 5672.91 , 777.59
+1086.91 , 6188.63 , 847.08
+1086.91 , 6704.35 , 917.00
+1086.91 , 7220.07 , 987.35
+1086.91 , 7735.79 , 1058.14
+1086.91 , 8251.51 , 1129.36
+1086.91 , 8767.23 , 1201.01
+1086.91 , 9282.95 , 1273.09
+1086.91 , 9798.67 , 1345.61
+1086.91 , 10314.39 , 1418.56
+1144.11 , -11414.26 , -1117.74
+1144.11 , -10843.55 , -1064.18
+1144.11 , -10272.84 , -1010.10
+1144.11 , -9702.12 , -955.49
+1144.11 , -9131.41 , -900.37
+1144.11 , -8560.70 , -844.73
+1144.11 , -7989.99 , -788.58
+1144.11 , -7419.27 , -731.90
+1144.11 , -6848.56 , -674.71
+1144.11 , -6277.85 , -617.00
+1144.11 , -5707.13 , -558.77
+1144.11 , -5136.42 , -500.01
+1144.11 , -4565.71 , -440.71
+1144.11 , -3994.99 , -380.85
+1144.11 , -3424.28 , -320.40
+1144.11 , -2853.57 , -259.31
+1144.11 , -2282.85 , -197.41
+1144.11 , -1712.14 , -134.30
+1144.11 , -1141.43 , -68.24
+1144.11 , -570.71 , 0.00
+1144.11 , -114.14 , 0.00
+1144.11 , 103.14 , 44.59
+1144.11 , 515.72 , 110.53
+1144.11 , 1031.44 , 182.27
+1144.11 , 1547.16 , 252.55
+1144.11 , 2062.88 , 322.69
+1144.11 , 2578.60 , 393.04
+1144.11 , 3094.32 , 463.74
+1144.11 , 3610.04 , 534.84
+1144.11 , 4125.76 , 606.37
+1144.11 , 4641.48 , 678.37
+1144.11 , 5157.20 , 750.82
+1144.11 , 5672.91 , 823.74
+1144.11 , 6188.63 , 897.14
+1144.11 , 6704.35 , 971.01
+1144.11 , 7220.07 , 1045.36
+1144.11 , 7735.79 , 1120.19
+1144.11 , 8251.51 , 1195.49
+1144.11 , 8767.23 , 1271.27
+1144.11 , 9282.95 , 1347.52
+1144.11 , 9798.67 , 1424.25
+1144.11 , 10314.39 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_drag.viepcd b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..102d2ba38dee164c86a6a611167df50fbf2d589a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -21.84
+5.72 , -22.52
+57.21 , -28.92
+114.41 , -35.99
+171.62 , -43.07
+228.82 , -50.22
+286.03 , -57.30
+343.23 , -64.38
+400.44 , -71.45
+457.65 , -78.53
+514.85 , -85.68
+572.06 , -92.76
+629.26 , -99.84
+686.47 , -106.91
+743.67 , -113.99
+800.88 , -121.14
+858.08 , -128.22
+915.29 , -135.30
+972.50 , -142.37
+1029.70 , -149.45
+1086.91 , -156.60
+1144.11 , -163.68
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/Axle_4x2_Tractor.vtlm b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/Axle_4x2_Tractor.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..e11cbf7cdde175e06ab8f6a0b79d46b84b3e0c1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/Axle_4x2_Tractor.vtlm
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/Axlegear.vgbx b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/Axlegear.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..8c4b5d9467fc9de8c168253de67633e521e24a0f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/Axlegear.vgbx
@@ -0,0 +1,33 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-11-03T14:19:09.9858299Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "3_speed_AMT",
+ "Inertia": 0.0,
+ "TracInt": 0.8,
+ "Gears": [
+ {
+ "Ratio": 2.64,
+ "LossMap": "Axle_4x2_Tractor.vtlm"
+ }
+ ],
+ "TqReserve": 0.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.22222222222222,
+ "StartAcc": 0.8,
+ "GearboxType": "AMT",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAfterUpshiftDelay": 6.0,
+ "UpshiftAfterDownshiftDelay": 6.0,
+ "UpshiftMinAcceleration": 0.1,
+ "PowershiftShiftTime": 0.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/GenericIEPC_Gbx3.viepc b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/GenericIEPC_Gbx3.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..863fb893954d209433b18cb5eefa1b054cda69f9
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/GenericIEPC_Gbx3.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 8.31
+ },
+ {
+ "Ratio": 4.65
+ },
+ {
+ "Ratio": 2.74
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/GenericIEPC_Gbx3_drag.viepc b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/GenericIEPC_Gbx3_drag.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..533a4a5e6a90b2c99b0ff3c0cf14b65eac3a9859
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/GenericIEPC_Gbx3_drag.viepc
@@ -0,0 +1,63 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 8.31
+ },
+ {
+ "Ratio": 4.65
+ },
+ {
+ "Ratio": 2.74
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3_drag1.viepcd",
+ "2": "IEPC_Gbx3_drag2.viepcd",
+ "3": "IEPC_Gbx3_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..596d5f768f377ef723c5e35cd12ede22dc1d012e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..d3b99d52c9d58fcc9c78ddaaacee45be25c9123c
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh
@@ -0,0 +1,84 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3_drag.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..146dfc42c35740688df216b61ebf31ead92f1074
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx3.vveh",
+ "GearboxFile": "Axlegear.vgbx",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3_drag.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3_drag.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..33adc6edc976be6d12ddeee3b5bdbfab21a3078d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3_drag.vecto
@@ -0,0 +1,44 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPCVehicle_Gbx3_drag.vveh",
+ "GearboxFile": "Axlegear.vgbx",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_1.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..52c23c595eece5b3cd06f8111e7c740348ddbf08
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -12984.38 , 0.00
+0.00 , -12335.16 , 0.00
+0.00 , -11685.94 , 0.00
+0.00 , -11036.72 , 0.00
+0.00 , -10387.50 , 0.00
+0.00 , -9738.28 , 0.00
+0.00 , -9089.06 , -0.13
+0.00 , -8439.84 , -0.66
+0.00 , -7790.63 , -0.98
+0.00 , -7141.41 , -1.19
+0.00 , -6492.19 , -1.32
+0.00 , -5842.97 , -1.38
+0.00 , -5193.75 , -1.39
+0.00 , -4544.53 , -1.35
+0.00 , -3895.31 , -1.26
+0.00 , -3246.09 , -1.13
+0.00 , -2596.88 , -0.97
+0.00 , -1947.66 , -0.77
+0.00 , -1298.44 , -0.53
+0.00 , -649.22 , -0.27
+0.00 , -129.84 , -0.02
+0.00 , 119.66 , 0.13
+0.00 , 598.32 , 0.56
+0.00 , 1196.64 , 1.12
+0.00 , 1794.96 , 1.70
+0.00 , 2393.28 , 2.31
+0.00 , 2991.60 , 2.93
+0.00 , 3589.92 , 3.58
+0.00 , 4188.24 , 4.25
+0.00 , 4786.56 , 4.93
+0.00 , 5384.88 , 5.64
+0.00 , 5983.20 , 6.37
+0.00 , 6581.52 , 7.12
+0.00 , 7179.84 , 7.88
+0.00 , 7778.16 , 8.67
+0.00 , 8376.48 , 9.47
+0.00 , 8974.80 , 10.29
+0.00 , 9573.12 , 11.13
+0.00 , 10171.44 , 11.99
+0.00 , 10769.76 , 12.87
+0.00 , 11368.08 , 13.76
+0.00 , 11966.40 , 14.67
+4.98 , -12984.38 , 0.00
+4.98 , -12335.16 , 0.00
+4.98 , -11685.94 , 0.00
+4.98 , -11036.72 , 0.00
+4.98 , -10387.50 , 0.00
+4.98 , -9738.28 , 0.00
+4.98 , -9089.06 , -0.50
+4.98 , -8439.84 , -0.84
+4.98 , -7790.63 , -1.04
+4.98 , -7141.41 , -1.16
+4.98 , -6492.19 , -1.22
+4.98 , -5842.97 , -1.24
+4.98 , -5193.75 , -1.21
+4.98 , -4544.53 , -1.15
+4.98 , -3895.31 , -1.06
+4.98 , -3246.09 , -0.94
+4.98 , -2596.88 , -0.80
+4.98 , -1947.66 , -0.62
+4.98 , -1298.44 , -0.43
+4.98 , -649.22 , -0.21
+4.98 , -129.84 , -0.02
+4.98 , 119.66 , 0.10
+4.98 , 598.32 , 0.43
+4.98 , 1196.64 , 0.85
+4.98 , 1794.96 , 1.30
+4.98 , 2393.28 , 1.75
+4.98 , 2991.60 , 2.23
+4.98 , 3589.92 , 2.71
+4.98 , 4188.24 , 3.21
+4.98 , 4786.56 , 3.73
+4.98 , 5384.88 , 4.26
+4.98 , 5983.20 , 4.80
+4.98 , 6581.52 , 5.36
+4.98 , 7179.84 , 5.93
+4.98 , 7778.16 , 6.52
+4.98 , 8376.48 , 7.12
+4.98 , 8974.80 , 7.73
+4.98 , 9573.12 , 8.35
+4.98 , 10171.44 , 8.99
+4.98 , 10769.76 , 9.64
+4.98 , 11368.08 , 10.30
+4.98 , 11966.40 , 10.98
+49.80 , -12984.38 , -58.10
+49.80 , -12335.16 , -55.37
+49.80 , -11685.94 , -52.62
+49.80 , -11036.72 , -49.85
+49.80 , -10387.50 , -47.06
+49.80 , -9738.28 , -44.25
+49.80 , -9089.06 , -41.42
+49.80 , -8439.84 , -38.57
+49.80 , -7790.63 , -35.70
+49.80 , -7141.41 , -32.81
+49.80 , -6492.19 , -29.90
+49.80 , -5842.97 , -26.98
+49.80 , -5193.75 , -24.03
+49.80 , -4544.53 , -21.07
+49.80 , -3895.31 , -18.08
+49.80 , -3246.09 , -15.08
+49.80 , -2596.88 , -12.06
+49.80 , -1947.66 , -9.02
+49.80 , -1298.44 , -5.96
+49.80 , -649.22 , -2.88
+49.80 , -129.84 , -0.37
+49.80 , 119.66 , 0.90
+49.80 , 598.32 , 3.68
+49.80 , 1196.64 , 7.16
+49.80 , 1794.96 , 10.66
+49.80 , 2393.28 , 14.17
+49.80 , 2991.60 , 17.71
+49.80 , 3589.92 , 21.26
+49.80 , 4188.24 , 24.84
+49.80 , 4786.56 , 28.43
+49.80 , 5384.88 , 32.04
+49.80 , 5983.20 , 35.67
+49.80 , 6581.52 , 39.32
+49.80 , 7179.84 , 42.99
+49.80 , 7778.16 , 46.68
+49.80 , 8376.48 , 50.38
+49.80 , 8974.80 , 54.11
+49.80 , 9573.12 , 57.85
+49.80 , 10171.44 , 61.61
+49.80 , 10769.76 , 65.39
+49.80 , 11368.08 , 69.19
+49.80 , 11966.40 , 73.01
+99.59 , -12984.38 , -120.57
+99.59 , -12335.16 , -114.73
+99.59 , -11685.94 , -108.87
+99.59 , -11036.72 , -102.99
+99.59 , -10387.50 , -97.08
+99.59 , -9738.28 , -91.15
+99.59 , -9089.06 , -85.20
+99.59 , -8439.84 , -79.23
+99.59 , -7790.63 , -73.23
+99.59 , -7141.41 , -67.21
+99.59 , -6492.19 , -61.17
+99.59 , -5842.97 , -55.10
+99.59 , -5193.75 , -49.01
+99.59 , -4544.53 , -42.90
+99.59 , -3895.31 , -36.77
+99.59 , -3246.09 , -30.61
+99.59 , -2596.88 , -24.43
+99.59 , -1947.66 , -18.23
+99.59 , -1298.44 , -12.01
+99.59 , -649.22 , -5.76
+99.59 , -129.84 , -0.66
+99.59 , 119.66 , 1.84
+99.59 , 598.32 , 7.35
+99.59 , 1196.64 , 14.22
+99.59 , 1794.96 , 21.11
+99.59 , 2393.28 , 28.02
+99.59 , 2991.60 , 34.96
+99.59 , 3589.92 , 41.92
+99.59 , 4188.24 , 48.90
+99.59 , 4786.56 , 55.90
+99.59 , 5384.88 , 62.93
+99.59 , 5983.20 , 69.98
+99.59 , 6581.52 , 77.05
+99.59 , 7179.84 , 84.15
+99.59 , 7778.16 , 91.27
+99.59 , 8376.48 , 98.41
+99.59 , 8974.80 , 105.58
+99.59 , 9573.12 , 112.76
+99.59 , 10171.44 , 119.97
+99.59 , 10769.76 , 127.21
+99.59 , 11368.08 , 134.46
+99.59 , 11966.40 , 141.74
+149.39 , -12984.38 , -182.44
+149.39 , -12335.16 , -173.55
+149.39 , -11685.94 , -164.62
+149.39 , -11036.72 , -155.67
+149.39 , -10387.50 , -146.69
+149.39 , -9738.28 , -137.68
+149.39 , -9089.06 , -128.65
+149.39 , -8439.84 , -119.58
+149.39 , -7790.63 , -110.49
+149.39 , -7141.41 , -101.36
+149.39 , -6492.19 , -92.21
+149.39 , -5842.97 , -83.03
+149.39 , -5193.75 , -73.82
+149.39 , -4544.53 , -64.58
+149.39 , -3895.31 , -55.31
+149.39 , -3246.09 , -46.02
+149.39 , -2596.88 , -36.70
+149.39 , -1947.66 , -27.34
+149.39 , -1298.44 , -17.96
+149.39 , -649.22 , -8.54
+149.39 , -129.84 , -0.79
+149.39 , 119.66 , 2.86
+149.39 , 598.32 , 11.12
+149.39 , 1196.64 , 21.39
+149.39 , 1794.96 , 31.68
+149.39 , 2393.28 , 41.99
+149.39 , 2991.60 , 52.34
+149.39 , 3589.92 , 62.71
+149.39 , 4188.24 , 73.12
+149.39 , 4786.56 , 83.55
+149.39 , 5384.88 , 94.01
+149.39 , 5983.20 , 104.50
+149.39 , 6581.52 , 115.02
+149.39 , 7179.84 , 125.57
+149.39 , 7778.16 , 136.15
+149.39 , 8376.48 , 146.76
+149.39 , 8974.80 , 157.40
+149.39 , 9573.12 , 168.06
+149.39 , 10171.44 , 178.76
+149.39 , 10769.76 , 189.48
+149.39 , 11368.08 , 200.23
+149.39 , 11966.40 , 211.02
+199.18 , -12984.38 , -243.71
+199.18 , -12335.16 , -231.81
+199.18 , -11685.94 , -219.87
+199.18 , -11036.72 , -207.89
+199.18 , -10387.50 , -195.88
+199.18 , -9738.28 , -183.83
+199.18 , -9089.06 , -171.74
+199.18 , -8439.84 , -159.61
+199.18 , -7790.63 , -147.45
+199.18 , -7141.41 , -135.25
+199.18 , -6492.19 , -123.01
+199.18 , -5842.97 , -110.74
+199.18 , -5193.75 , -98.43
+199.18 , -4544.53 , -86.08
+199.18 , -3895.31 , -73.70
+199.18 , -3246.09 , -61.27
+199.18 , -2596.88 , -48.82
+199.18 , -1947.66 , -36.32
+199.18 , -1298.44 , -23.78
+199.18 , -649.22 , -11.19
+199.18 , -129.84 , -0.63
+199.18 , 119.66 , 3.98
+199.18 , 598.32 , 15.01
+199.18 , 1196.64 , 28.68
+199.18 , 1794.96 , 42.37
+199.18 , 2393.28 , 56.10
+199.18 , 2991.60 , 69.87
+199.18 , 3589.92 , 83.67
+199.18 , 4188.24 , 97.52
+199.18 , 4786.56 , 111.40
+199.18 , 5384.88 , 125.31
+199.18 , 5983.20 , 139.27
+199.18 , 6581.52 , 153.26
+199.18 , 7179.84 , 167.29
+199.18 , 7778.16 , 181.36
+199.18 , 8376.48 , 195.46
+199.18 , 8974.80 , 209.61
+199.18 , 9573.12 , 223.79
+199.18 , 10171.44 , 238.01
+199.18 , 10769.76 , 252.26
+199.18 , 11368.08 , 266.56
+199.18 , 11966.40 , 280.89
+248.98 , -12984.38 , -304.37
+248.98 , -12335.16 , -289.50
+248.98 , -11685.94 , -274.59
+248.98 , -11036.72 , -259.63
+248.98 , -10387.50 , -244.61
+248.98 , -9738.28 , -229.56
+248.98 , -9089.06 , -214.45
+248.98 , -8439.84 , -199.30
+248.98 , -7790.63 , -184.10
+248.98 , -7141.41 , -168.85
+248.98 , -6492.19 , -153.55
+248.98 , -5842.97 , -138.20
+248.98 , -5193.75 , -122.81
+248.98 , -4544.53 , -107.37
+248.98 , -3895.31 , -91.88
+248.98 , -3246.09 , -76.35
+248.98 , -2596.88 , -60.76
+248.98 , -1947.66 , -45.13
+248.98 , -1298.44 , -29.44
+248.98 , -649.22 , -13.67
+248.98 , -129.84 , 0.00
+248.98 , 119.66 , 5.21
+248.98 , 598.32 , 19.04
+248.98 , 1196.64 , 36.13
+248.98 , 1794.96 , 53.24
+248.98 , 2393.28 , 70.39
+248.98 , 2991.60 , 87.59
+248.98 , 3589.92 , 104.83
+248.98 , 4188.24 , 122.13
+248.98 , 4786.56 , 139.47
+248.98 , 5384.88 , 156.87
+248.98 , 5983.20 , 174.31
+248.98 , 6581.52 , 191.80
+248.98 , 7179.84 , 209.33
+248.98 , 7778.16 , 226.92
+248.98 , 8376.48 , 244.56
+248.98 , 8974.80 , 262.24
+248.98 , 9573.12 , 279.97
+248.98 , 10171.44 , 297.76
+248.98 , 10769.76 , 315.58
+248.98 , 11368.08 , 333.46
+248.98 , 11966.40 , 351.39
+298.77 , -12984.38 , -364.37
+298.77 , -12335.16 , -346.59
+298.77 , -11685.94 , -328.74
+298.77 , -11036.72 , -310.84
+298.77 , -10387.50 , -292.87
+298.77 , -9738.28 , -274.84
+298.77 , -9089.06 , -256.75
+298.77 , -8439.84 , -238.60
+298.77 , -7790.63 , -220.39
+298.77 , -7141.41 , -202.12
+298.77 , -6492.19 , -183.79
+298.77 , -5842.97 , -165.40
+298.77 , -5193.75 , -146.94
+298.77 , -4544.53 , -128.43
+298.77 , -3895.31 , -109.85
+298.77 , -3246.09 , -91.21
+298.77 , -2596.88 , -72.51
+298.77 , -1947.66 , -53.75
+298.77 , -1298.44 , -34.91
+298.77 , -649.22 , -15.95
+298.77 , -129.84 , 0.00
+298.77 , 119.66 , 6.58
+298.77 , 598.32 , 23.25
+298.77 , 1196.64 , 43.76
+298.77 , 1794.96 , 64.29
+298.77 , 2393.28 , 84.87
+298.77 , 2991.60 , 105.52
+298.77 , 3589.92 , 126.22
+298.77 , 4188.24 , 146.98
+298.77 , 4786.56 , 167.81
+298.77 , 5384.88 , 188.70
+298.77 , 5983.20 , 209.65
+298.77 , 6581.52 , 230.66
+298.77 , 7179.84 , 251.73
+298.77 , 7778.16 , 272.87
+298.77 , 8376.48 , 294.07
+298.77 , 8974.80 , 315.33
+298.77 , 9573.12 , 336.65
+298.77 , 10171.44 , 358.03
+298.77 , 10769.76 , 379.47
+298.77 , 11368.08 , 400.98
+298.77 , 11966.40 , 422.54
+348.57 , -12984.38 , -423.69
+348.57 , -12335.16 , -403.04
+348.57 , -11685.94 , -382.31
+348.57 , -11036.72 , -361.50
+348.57 , -10387.50 , -340.62
+348.57 , -9738.28 , -319.66
+348.57 , -9089.06 , -298.62
+348.57 , -8439.84 , -277.51
+348.57 , -7790.63 , -256.31
+348.57 , -7141.41 , -235.05
+348.57 , -6492.19 , -213.70
+348.57 , -5842.97 , -192.28
+348.57 , -5193.75 , -170.79
+348.57 , -4544.53 , -149.21
+348.57 , -3895.31 , -127.57
+348.57 , -3246.09 , -105.84
+348.57 , -2596.88 , -84.03
+348.57 , -1947.66 , -62.14
+348.57 , -1298.44 , -40.16
+348.57 , -649.22 , -18.00
+348.57 , -129.84 , 0.00
+348.57 , 119.66 , 8.09
+348.57 , 598.32 , 27.64
+348.57 , 1196.64 , 51.59
+348.57 , 1794.96 , 75.56
+348.57 , 2393.28 , 99.58
+348.57 , 2991.60 , 123.68
+348.57 , 3589.92 , 147.86
+348.57 , 4188.24 , 172.10
+348.57 , 4786.56 , 196.43
+348.57 , 5384.88 , 220.84
+348.57 , 5983.20 , 245.32
+348.57 , 6581.52 , 269.88
+348.57 , 7179.84 , 294.51
+348.57 , 7778.16 , 319.23
+348.57 , 8376.48 , 344.02
+348.57 , 8974.80 , 368.89
+348.57 , 9573.12 , 393.83
+348.57 , 10171.44 , 418.85
+348.57 , 10769.76 , 443.95
+348.57 , 11368.08 , 469.13
+348.57 , 11966.40 , 494.38
+398.37 , -12984.38 , -482.31
+398.37 , -12335.16 , -458.83
+398.37 , -11685.94 , -435.26
+398.37 , -11036.72 , -411.59
+398.37 , -10387.50 , -387.83
+398.37 , -9738.28 , -363.97
+398.37 , -9089.06 , -340.02
+398.37 , -8439.84 , -315.97
+398.37 , -7790.63 , -291.83
+398.37 , -7141.41 , -267.59
+398.37 , -6492.19 , -243.26
+398.37 , -5842.97 , -218.84
+398.37 , -5193.75 , -194.32
+398.37 , -4544.53 , -169.71
+398.37 , -3895.31 , -145.00
+398.37 , -3246.09 , -120.19
+398.37 , -2596.88 , -95.29
+398.37 , -1947.66 , -70.28
+398.37 , -1298.44 , -45.14
+398.37 , -649.22 , -19.76
+398.37 , -129.84 , 0.00
+398.37 , 119.66 , 9.76
+398.37 , 598.32 , 32.25
+398.37 , 1196.64 , 59.66
+398.37 , 1794.96 , 87.07
+398.37 , 2393.28 , 114.55
+398.37 , 2991.60 , 142.11
+398.37 , 3589.92 , 169.77
+398.37 , 4188.24 , 197.52
+398.37 , 4786.56 , 225.37
+398.37 , 5384.88 , 253.31
+398.37 , 5983.20 , 281.34
+398.37 , 6581.52 , 309.47
+398.37 , 7179.84 , 337.70
+398.37 , 7778.16 , 366.02
+398.37 , 8376.48 , 394.44
+398.37 , 8974.80 , 422.95
+398.37 , 9573.12 , 451.56
+398.37 , 10171.44 , 480.26
+398.37 , 10769.76 , 509.05
+398.37 , 11368.08 , 537.94
+398.37 , 11966.40 , 566.93
+448.16 , -12984.38 , -540.17
+448.16 , -12335.16 , -513.92
+448.16 , -11685.94 , -487.55
+448.16 , -11036.72 , -461.06
+448.16 , -10387.50 , -434.46
+448.16 , -9738.28 , -407.75
+448.16 , -9089.06 , -380.92
+448.16 , -8439.84 , -353.97
+448.16 , -7790.63 , -326.91
+448.16 , -7141.41 , -299.73
+448.16 , -6492.19 , -272.44
+448.16 , -5842.97 , -245.03
+448.16 , -5193.75 , -217.51
+448.16 , -4544.53 , -189.87
+448.16 , -3895.31 , -162.12
+448.16 , -3246.09 , -134.25
+448.16 , -2596.88 , -106.26
+448.16 , -1947.66 , -78.13
+448.16 , -1298.44 , -49.84
+448.16 , -649.22 , -21.19
+448.16 , -129.84 , 0.00
+448.16 , 119.66 , 11.59
+448.16 , 598.32 , 37.10
+448.16 , 1196.64 , 67.98
+448.16 , 1794.96 , 98.85
+448.16 , 2393.28 , 129.79
+448.16 , 2991.60 , 160.84
+448.16 , 3589.92 , 191.99
+448.16 , 4188.24 , 223.26
+448.16 , 4786.56 , 254.64
+448.16 , 5384.88 , 286.14
+448.16 , 5983.20 , 317.75
+448.16 , 6581.52 , 349.48
+448.16 , 7179.84 , 381.32
+448.16 , 7778.16 , 413.28
+448.16 , 8376.48 , 445.36
+448.16 , 8974.80 , 477.54
+448.16 , 9573.12 , 509.85
+448.16 , 10171.44 , 542.27
+448.16 , 10769.76 , 574.80
+448.16 , 11368.08 , 607.45
+448.16 , 11966.40 , 640.21
+497.96 , -12984.38 , -597.26
+497.96 , -12335.16 , -568.28
+497.96 , -11685.94 , -539.16
+497.96 , -11036.72 , -509.90
+497.96 , -10387.50 , -480.50
+497.96 , -9738.28 , -450.96
+497.96 , -9089.06 , -421.28
+497.96 , -8439.84 , -391.47
+497.96 , -7790.63 , -361.52
+497.96 , -7141.41 , -331.43
+497.96 , -6492.19 , -301.20
+497.96 , -5842.97 , -270.83
+497.96 , -5193.75 , -240.33
+497.96 , -4544.53 , -209.68
+497.96 , -3895.31 , -178.90
+497.96 , -3246.09 , -147.97
+497.96 , -2596.88 , -116.90
+497.96 , -1947.66 , -85.66
+497.96 , -1298.44 , -54.21
+497.96 , -649.22 , -22.23
+497.96 , -129.84 , 0.00
+497.96 , 119.66 , 13.60
+497.96 , 598.32 , 42.20
+497.96 , 1196.64 , 76.58
+497.96 , 1794.96 , 110.92
+497.96 , 2393.28 , 145.34
+497.96 , 2991.60 , 179.88
+497.96 , 3589.92 , 214.55
+497.96 , 4188.24 , 249.35
+497.96 , 4786.56 , 284.29
+497.96 , 5384.88 , 319.36
+497.96 , 5983.20 , 354.57
+497.96 , 6581.52 , 389.92
+497.96 , 7179.84 , 425.41
+497.96 , 7778.16 , 461.03
+497.96 , 8376.48 , 496.79
+497.96 , 8974.80 , 532.69
+497.96 , 9573.12 , 568.73
+497.96 , 10171.44 , 604.90
+497.96 , 10769.76 , 641.21
+497.96 , 11368.08 , 677.66
+497.96 , 11966.40 , 714.24
+547.75 , -12984.38 , -653.54
+547.75 , -12335.16 , -621.88
+547.75 , -11685.94 , -590.05
+547.75 , -11036.72 , -558.06
+547.75 , -10387.50 , -525.90
+547.75 , -9738.28 , -493.58
+547.75 , -9089.06 , -461.09
+547.75 , -8439.84 , -428.44
+547.75 , -7790.63 , -395.63
+547.75 , -7141.41 , -362.65
+547.75 , -6492.19 , -329.51
+547.75 , -5842.97 , -296.21
+547.75 , -5193.75 , -262.74
+547.75 , -4544.53 , -229.11
+547.75 , -3895.31 , -195.31
+547.75 , -3246.09 , -161.34
+547.75 , -2596.88 , -127.18
+547.75 , -1947.66 , -92.83
+547.75 , -1298.44 , -58.20
+547.75 , -649.22 , -22.82
+547.75 , -129.84 , 0.00
+547.75 , 119.66 , 15.79
+547.75 , 598.32 , 47.58
+547.75 , 1196.64 , 85.48
+547.75 , 1794.96 , 123.30
+547.75 , 2393.28 , 161.22
+547.75 , 2991.60 , 199.26
+547.75 , 3589.92 , 237.46
+547.75 , 4188.24 , 275.81
+547.75 , 4786.56 , 314.32
+547.75 , 5384.88 , 352.99
+547.75 , 5983.20 , 391.83
+547.75 , 6581.52 , 430.82
+547.75 , 7179.84 , 469.98
+547.75 , 7778.16 , 509.30
+547.75 , 8376.48 , 548.78
+547.75 , 8974.80 , 588.42
+547.75 , 9573.12 , 628.23
+547.75 , 10171.44 , 668.20
+547.75 , 10769.76 , 708.32
+547.75 , 11368.08 , 748.61
+547.75 , 11966.40 , 789.06
+597.55 , -12984.38 , -708.97
+597.55 , -12335.16 , -674.68
+597.55 , -11685.94 , -640.19
+597.55 , -11036.72 , -605.51
+597.55 , -10387.50 , -570.63
+597.55 , -9738.28 , -535.56
+597.55 , -9089.06 , -500.30
+597.55 , -8439.84 , -464.85
+597.55 , -7790.63 , -429.21
+597.55 , -7141.41 , -393.37
+597.55 , -6492.19 , -357.35
+597.55 , -5842.97 , -321.13
+597.55 , -5193.75 , -284.71
+597.55 , -4544.53 , -248.11
+597.55 , -3895.31 , -211.31
+597.55 , -3246.09 , -174.30
+597.55 , -2596.88 , -137.08
+597.55 , -1947.66 , -99.61
+597.55 , -1298.44 , -61.78
+597.55 , -649.22 , -22.86
+597.55 , -129.84 , 0.00
+597.55 , 119.66 , 18.17
+597.55 , 598.32 , 53.24
+597.55 , 1196.64 , 94.71
+597.55 , 1794.96 , 136.03
+597.55 , 2393.28 , 177.45
+597.55 , 2991.60 , 219.01
+597.55 , 3589.92 , 260.75
+597.55 , 4188.24 , 302.67
+597.55 , 4786.56 , 344.78
+597.55 , 5384.88 , 387.07
+597.55 , 5983.20 , 429.54
+597.55 , 6581.52 , 472.21
+597.55 , 7179.84 , 515.06
+597.55 , 7778.16 , 558.11
+597.55 , 8376.48 , 601.34
+597.55 , 8974.80 , 644.76
+597.55 , 9573.12 , 688.37
+597.55 , 10171.44 , 732.17
+597.55 , 10769.76 , 776.15
+597.55 , 11368.08 , 820.33
+597.55 , 11966.40 , 864.69
+647.35 , -12984.38 , -763.53
+647.35 , -12335.16 , -726.65
+647.35 , -11685.94 , -689.55
+647.35 , -11036.72 , -652.22
+647.35 , -10387.50 , -614.67
+647.35 , -9738.28 , -576.89
+647.35 , -9089.06 , -538.89
+647.35 , -8439.84 , -500.67
+647.35 , -7790.63 , -462.22
+647.35 , -7141.41 , -423.56
+647.35 , -6492.19 , -384.67
+647.35 , -5842.97 , -345.56
+647.35 , -5193.75 , -306.22
+647.35 , -4544.53 , -266.66
+647.35 , -3895.31 , -226.86
+647.35 , -3246.09 , -186.83
+647.35 , -2596.88 , -146.54
+647.35 , -1947.66 , -105.95
+647.35 , -1298.44 , -64.90
+647.35 , -649.22 , -22.24
+647.35 , -129.84 , 0.00
+647.35 , 119.66 , 20.74
+647.35 , 598.32 , 59.20
+647.35 , 1196.64 , 104.27
+647.35 , 1794.96 , 149.12
+647.35 , 2393.28 , 194.05
+647.35 , 2991.60 , 239.16
+647.35 , 3589.92 , 284.45
+647.35 , 4188.24 , 329.96
+647.35 , 4786.56 , 375.67
+647.35 , 5384.88 , 421.60
+647.35 , 5983.20 , 467.75
+647.35 , 6581.52 , 514.11
+647.35 , 7179.84 , 560.69
+647.35 , 7778.16 , 607.48
+647.35 , 8376.48 , 654.50
+647.35 , 8974.80 , 701.73
+647.35 , 9573.12 , 749.18
+647.35 , 10171.44 , 796.84
+647.35 , 10769.76 , 844.73
+647.35 , 11368.08 , 892.83
+647.35 , 11966.40 , 941.14
+697.14 , -12984.38 , -817.17
+697.14 , -12335.16 , -777.76
+697.14 , -11685.94 , -738.08
+697.14 , -11036.72 , -698.15
+697.14 , -10387.50 , -657.96
+697.14 , -9738.28 , -617.52
+697.14 , -9089.06 , -576.82
+697.14 , -8439.84 , -535.86
+697.14 , -7790.63 , -494.65
+697.14 , -7141.41 , -453.18
+697.14 , -6492.19 , -411.45
+697.14 , -5842.97 , -369.47
+697.14 , -5193.75 , -327.22
+697.14 , -4544.53 , -284.72
+697.14 , -3895.31 , -241.95
+697.14 , -3246.09 , -198.90
+697.14 , -2596.88 , -155.54
+697.14 , -1947.66 , -111.82
+697.14 , -1298.44 , -67.51
+697.14 , -649.22 , -20.80
+697.14 , -129.84 , 0.00
+697.14 , 119.66 , 23.52
+697.14 , 598.32 , 65.48
+697.14 , 1196.64 , 114.20
+697.14 , 1794.96 , 162.59
+697.14 , 2393.28 , 211.06
+697.14 , 2991.60 , 259.72
+697.14 , 3589.92 , 308.59
+697.14 , 4188.24 , 357.69
+697.14 , 4786.56 , 407.04
+697.14 , 5384.88 , 456.62
+697.14 , 5983.20 , 506.46
+697.14 , 6581.52 , 556.54
+697.14 , 7179.84 , 606.87
+697.14 , 7778.16 , 657.45
+697.14 , 8376.48 , 708.28
+697.14 , 8974.80 , 759.35
+697.14 , 9573.12 , 810.68
+697.14 , 10171.44 , 862.25
+697.14 , 10769.76 , 914.07
+697.14 , 11368.08 , 966.13
+697.14 , 11966.40 , 1018.44
+746.94 , -12984.38 , -869.86
+746.94 , -12335.16 , -827.96
+746.94 , -11685.94 , -785.77
+746.94 , -11036.72 , -743.28
+746.94 , -10387.50 , -700.50
+746.94 , -9738.28 , -657.42
+746.94 , -9089.06 , -614.05
+746.94 , -8439.84 , -570.39
+746.94 , -7790.63 , -526.44
+746.94 , -7141.41 , -482.19
+746.94 , -6492.19 , -437.65
+746.94 , -5842.97 , -392.82
+746.94 , -5193.75 , -347.69
+746.94 , -4544.53 , -302.26
+746.94 , -3895.31 , -256.52
+746.94 , -3246.09 , -210.46
+746.94 , -2596.88 , -164.04
+746.94 , -1947.66 , -117.17
+746.94 , -1298.44 , -69.54
+746.94 , -649.22 , -18.27
+746.94 , -129.84 , 0.00
+746.94 , 119.66 , 26.49
+746.94 , 598.32 , 72.10
+746.94 , 1196.64 , 124.50
+746.94 , 1794.96 , 176.46
+746.94 , 2393.28 , 228.49
+746.94 , 2991.60 , 280.71
+746.94 , 3589.92 , 333.18
+746.94 , 4188.24 , 385.90
+746.94 , 4786.56 , 438.89
+746.94 , 5384.88 , 492.16
+746.94 , 5983.20 , 545.71
+746.94 , 6581.52 , 599.54
+746.94 , 7179.84 , 653.64
+746.94 , 7778.16 , 708.03
+746.94 , 8376.48 , 762.71
+746.94 , 8974.80 , 817.66
+746.94 , 9573.12 , 872.89
+746.94 , 10171.44 , 928.41
+746.94 , 10769.76 , 984.20
+746.94 , 11368.08 , 1040.27
+746.94 , 11966.40 , 1096.63
+796.73 , -12984.38 , -921.56
+796.73 , -12335.16 , -877.23
+796.73 , -11685.94 , -832.56
+796.73 , -11036.72 , -787.56
+796.73 , -10387.50 , -742.22
+796.73 , -9738.28 , -696.56
+796.73 , -9089.06 , -650.56
+796.73 , -8439.84 , -604.23
+796.73 , -7790.63 , -557.56
+796.73 , -7141.41 , -510.57
+796.73 , -6492.19 , -463.24
+796.73 , -5842.97 , -415.58
+796.73 , -5193.75 , -367.58
+796.73 , -4544.53 , -319.24
+796.73 , -3895.31 , -270.55
+796.73 , -3246.09 , -221.48
+796.73 , -2596.88 , -171.99
+796.73 , -1947.66 , -121.95
+796.73 , -1298.44 , -70.93
+796.73 , -649.22 , -14.10
+796.73 , -129.84 , 0.00
+796.73 , 119.66 , 29.68
+796.73 , 598.32 , 79.05
+796.73 , 1196.64 , 135.20
+796.73 , 1794.96 , 190.76
+796.73 , 2393.28 , 246.36
+796.73 , 2991.60 , 302.17
+796.73 , 3589.92 , 358.24
+796.73 , 4188.24 , 414.60
+796.73 , 4786.56 , 471.27
+796.73 , 5384.88 , 528.24
+796.73 , 5983.20 , 585.52
+796.73 , 6581.52 , 643.12
+796.73 , 7179.84 , 701.03
+796.73 , 7778.16 , 759.26
+796.73 , 8376.48 , 817.80
+796.73 , 8974.80 , 876.66
+796.73 , 9573.12 , 935.84
+796.73 , 10171.44 , 995.34
+796.73 , 10769.76 , 1055.15
+796.73 , 11368.08 , 1115.27
+796.73 , 11966.40 , 1175.71
+846.53 , -12984.38 , -972.24
+846.53 , -12335.16 , -925.52
+846.53 , -11685.94 , -878.43
+846.53 , -11036.72 , -830.96
+846.53 , -10387.50 , -783.11
+846.53 , -9738.28 , -734.89
+846.53 , -9089.06 , -686.30
+846.53 , -8439.84 , -637.33
+846.53 , -7790.63 , -587.99
+846.53 , -7141.41 , -538.28
+846.53 , -6492.19 , -488.19
+846.53 , -5842.97 , -437.72
+846.53 , -5193.75 , -386.87
+846.53 , -4544.53 , -335.63
+846.53 , -3895.31 , -283.99
+846.53 , -3246.09 , -231.92
+846.53 , -2596.88 , -179.35
+846.53 , -1947.66 , -126.12
+846.53 , -1298.44 , -71.60
+846.53 , -649.22 , -6.45
+846.53 , -129.84 , 0.00
+846.53 , 119.66 , 33.08
+846.53 , 598.32 , 86.37
+846.53 , 1196.64 , 146.31
+846.53 , 1794.96 , 205.50
+846.53 , 2393.28 , 264.70
+846.53 , 2991.60 , 324.11
+846.53 , 3589.92 , 383.81
+846.53 , 4188.24 , 443.83
+846.53 , 4786.56 , 504.18
+846.53 , 5384.88 , 564.87
+846.53 , 5983.20 , 625.91
+846.53 , 6581.52 , 687.30
+846.53 , 7179.84 , 749.05
+846.53 , 7778.16 , 811.14
+846.53 , 8376.48 , 873.59
+846.53 , 8974.80 , 936.40
+846.53 , 9573.12 , 999.56
+846.53 , 10171.44 , 1063.07
+846.53 , 10769.76 , 1126.93
+846.53 , 11368.08 , 1191.14
+846.53 , 11966.40 , 1255.71
+896.32 , -12984.38 , -1021.86
+896.32 , -12335.16 , -972.81
+896.32 , -11685.94 , -923.33
+896.32 , -11036.72 , -873.44
+896.32 , -10387.50 , -823.13
+896.32 , -9738.28 , -772.39
+896.32 , -9089.06 , -721.24
+896.32 , -8439.84 , -669.67
+896.32 , -7790.63 , -617.68
+896.32 , -7141.41 , -565.27
+896.32 , -6492.19 , -512.45
+896.32 , -5842.97 , -459.19
+896.32 , -5193.75 , -405.51
+896.32 , -4544.53 , -351.39
+896.32 , -3895.31 , -296.81
+896.32 , -3246.09 , -241.73
+896.32 , -2596.88 , -186.07
+896.32 , -1947.66 , -129.61
+896.32 , -1298.44 , -71.46
+896.32 , -649.22 , 0.00
+896.32 , -129.84 , 0.00
+896.32 , 119.66 , 36.70
+896.32 , 598.32 , 94.04
+896.32 , 1196.64 , 157.85
+896.32 , 1794.96 , 220.70
+896.32 , 2393.28 , 283.52
+896.32 , 2991.60 , 346.56
+896.32 , 3589.92 , 409.90
+896.32 , 4188.24 , 473.59
+896.32 , 4786.56 , 537.65
+896.32 , 5384.88 , 602.09
+896.32 , 5983.20 , 666.91
+896.32 , 6581.52 , 732.12
+896.32 , 7179.84 , 797.72
+896.32 , 7778.16 , 863.72
+896.32 , 8376.48 , 930.10
+896.32 , 8974.80 , 996.88
+896.32 , 9573.12 , 1064.05
+896.32 , 10171.44 , 1131.62
+896.32 , 10769.76 , 1199.57
+896.32 , 11368.08 , 1267.92
+896.32 , 11966.40 , 1336.65
+946.12 , -12984.38 , -1070.37
+946.12 , -12335.16 , -1019.04
+946.12 , -11685.94 , -967.24
+946.12 , -11036.72 , -914.96
+946.12 , -10387.50 , -862.23
+946.12 , -9738.28 , -809.02
+946.12 , -9089.06 , -755.35
+946.12 , -8439.84 , -701.21
+946.12 , -7790.63 , -646.60
+946.12 , -7141.41 , -591.53
+946.12 , -6492.19 , -535.99
+946.12 , -5842.97 , -479.97
+946.12 , -5193.75 , -423.47
+946.12 , -4544.53 , -366.48
+946.12 , -3895.31 , -308.96
+946.12 , -3246.09 , -250.88
+946.12 , -2596.88 , -192.11
+946.12 , -1947.66 , -132.36
+946.12 , -1298.44 , -70.38
+946.12 , -649.22 , 0.00
+946.12 , -129.84 , 0.00
+946.12 , 119.66 , 40.53
+946.12 , 598.32 , 102.10
+946.12 , 1196.64 , 169.83
+946.12 , 1794.96 , 236.37
+946.12 , 2393.28 , 302.84
+946.12 , 2991.60 , 369.53
+946.12 , 3589.92 , 436.54
+946.12 , 4188.24 , 503.92
+946.12 , 4786.56 , 571.71
+946.12 , 5384.88 , 639.91
+946.12 , 5983.20 , 708.54
+946.12 , 6581.52 , 777.59
+946.12 , 7179.84 , 847.08
+946.12 , 7778.16 , 917.00
+946.12 , 8376.48 , 987.35
+946.12 , 8974.80 , 1058.14
+946.12 , 9573.12 , 1129.36
+946.12 , 10171.44 , 1201.01
+946.12 , 10769.76 , 1273.09
+946.12 , 11368.08 , 1345.61
+946.12 , 11966.40 , 1418.56
+995.92 , -12984.38 , -1117.74
+995.92 , -12335.16 , -1064.18
+995.92 , -11685.94 , -1010.10
+995.92 , -11036.72 , -955.49
+995.92 , -10387.50 , -900.37
+995.92 , -9738.28 , -844.73
+995.92 , -9089.06 , -788.58
+995.92 , -8439.84 , -731.90
+995.92 , -7790.63 , -674.71
+995.92 , -7141.41 , -617.00
+995.92 , -6492.19 , -558.77
+995.92 , -5842.97 , -500.01
+995.92 , -5193.75 , -440.71
+995.92 , -4544.53 , -380.85
+995.92 , -3895.31 , -320.40
+995.92 , -3246.09 , -259.31
+995.92 , -2596.88 , -197.41
+995.92 , -1947.66 , -134.30
+995.92 , -1298.44 , -68.24
+995.92 , -649.22 , 0.00
+995.92 , -129.84 , 0.00
+995.92 , 119.66 , 44.59
+995.92 , 598.32 , 110.53
+995.92 , 1196.64 , 182.27
+995.92 , 1794.96 , 252.55
+995.92 , 2393.28 , 322.69
+995.92 , 2991.60 , 393.04
+995.92 , 3589.92 , 463.74
+995.92 , 4188.24 , 534.84
+995.92 , 4786.56 , 606.37
+995.92 , 5384.88 , 678.37
+995.92 , 5983.20 , 750.82
+995.92 , 6581.52 , 823.74
+995.92 , 7179.84 , 897.14
+995.92 , 7778.16 , 971.01
+995.92 , 8376.48 , 1045.36
+995.92 , 8974.80 , 1120.19
+995.92 , 9573.12 , 1195.49
+995.92 , 10171.44 , 1271.27
+995.92 , 10769.76 , 1347.52
+995.92 , 11368.08 , 1424.25
+995.92 , 11966.40 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_2.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..e4be1e22ede233c40afa5a00eeb1292d2cad8f78
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -7190.72 , 0.00
+0.00 , -6831.19 , 0.00
+0.00 , -6471.65 , 0.00
+0.00 , -6112.11 , 0.00
+0.00 , -5752.58 , 0.00
+0.00 , -5393.04 , 0.00
+0.00 , -5033.51 , -0.13
+0.00 , -4673.97 , -0.66
+0.00 , -4314.43 , -0.98
+0.00 , -3954.90 , -1.19
+0.00 , -3595.36 , -1.32
+0.00 , -3235.82 , -1.38
+0.00 , -2876.29 , -1.39
+0.00 , -2516.75 , -1.35
+0.00 , -2157.22 , -1.26
+0.00 , -1797.68 , -1.13
+0.00 , -1438.14 , -0.97
+0.00 , -1078.61 , -0.77
+0.00 , -719.07 , -0.53
+0.00 , -359.54 , -0.27
+0.00 , -71.91 , -0.02
+0.00 , 67.66 , 0.13
+0.00 , 338.29 , 0.56
+0.00 , 676.58 , 1.12
+0.00 , 1014.86 , 1.70
+0.00 , 1353.15 , 2.31
+0.00 , 1691.44 , 2.93
+0.00 , 2029.73 , 3.58
+0.00 , 2368.01 , 4.25
+0.00 , 2706.30 , 4.93
+0.00 , 3044.59 , 5.64
+0.00 , 3382.88 , 6.37
+0.00 , 3721.16 , 7.12
+0.00 , 4059.45 , 7.88
+0.00 , 4397.74 , 8.67
+0.00 , 4736.03 , 9.47
+0.00 , 5074.31 , 10.29
+0.00 , 5412.60 , 11.13
+0.00 , 5750.89 , 11.99
+0.00 , 6089.18 , 12.87
+0.00 , 6427.46 , 13.76
+0.00 , 6765.75 , 14.67
+8.90 , -7190.72 , 0.00
+8.90 , -6831.19 , 0.00
+8.90 , -6471.65 , 0.00
+8.90 , -6112.11 , 0.00
+8.90 , -5752.58 , 0.00
+8.90 , -5393.04 , 0.00
+8.90 , -5033.51 , -0.50
+8.90 , -4673.97 , -0.84
+8.90 , -4314.43 , -1.04
+8.90 , -3954.90 , -1.16
+8.90 , -3595.36 , -1.22
+8.90 , -3235.82 , -1.24
+8.90 , -2876.29 , -1.21
+8.90 , -2516.75 , -1.15
+8.90 , -2157.22 , -1.06
+8.90 , -1797.68 , -0.94
+8.90 , -1438.14 , -0.80
+8.90 , -1078.61 , -0.62
+8.90 , -719.07 , -0.43
+8.90 , -359.54 , -0.21
+8.90 , -71.91 , -0.02
+8.90 , 67.66 , 0.10
+8.90 , 338.29 , 0.43
+8.90 , 676.58 , 0.85
+8.90 , 1014.86 , 1.30
+8.90 , 1353.15 , 1.75
+8.90 , 1691.44 , 2.23
+8.90 , 2029.73 , 2.71
+8.90 , 2368.01 , 3.21
+8.90 , 2706.30 , 3.73
+8.90 , 3044.59 , 4.26
+8.90 , 3382.88 , 4.80
+8.90 , 3721.16 , 5.36
+8.90 , 4059.45 , 5.93
+8.90 , 4397.74 , 6.52
+8.90 , 4736.03 , 7.12
+8.90 , 5074.31 , 7.73
+8.90 , 5412.60 , 8.35
+8.90 , 5750.89 , 8.99
+8.90 , 6089.18 , 9.64
+8.90 , 6427.46 , 10.30
+8.90 , 6765.75 , 10.98
+88.99 , -7190.72 , -58.10
+88.99 , -6831.19 , -55.37
+88.99 , -6471.65 , -52.62
+88.99 , -6112.11 , -49.85
+88.99 , -5752.58 , -47.06
+88.99 , -5393.04 , -44.25
+88.99 , -5033.51 , -41.42
+88.99 , -4673.97 , -38.57
+88.99 , -4314.43 , -35.70
+88.99 , -3954.90 , -32.81
+88.99 , -3595.36 , -29.90
+88.99 , -3235.82 , -26.98
+88.99 , -2876.29 , -24.03
+88.99 , -2516.75 , -21.07
+88.99 , -2157.22 , -18.08
+88.99 , -1797.68 , -15.08
+88.99 , -1438.14 , -12.06
+88.99 , -1078.61 , -9.02
+88.99 , -719.07 , -5.96
+88.99 , -359.54 , -2.88
+88.99 , -71.91 , -0.37
+88.99 , 67.66 , 0.90
+88.99 , 338.29 , 3.68
+88.99 , 676.58 , 7.16
+88.99 , 1014.86 , 10.66
+88.99 , 1353.15 , 14.17
+88.99 , 1691.44 , 17.71
+88.99 , 2029.73 , 21.26
+88.99 , 2368.01 , 24.84
+88.99 , 2706.30 , 28.43
+88.99 , 3044.59 , 32.04
+88.99 , 3382.88 , 35.67
+88.99 , 3721.16 , 39.32
+88.99 , 4059.45 , 42.99
+88.99 , 4397.74 , 46.68
+88.99 , 4736.03 , 50.38
+88.99 , 5074.31 , 54.11
+88.99 , 5412.60 , 57.85
+88.99 , 5750.89 , 61.61
+88.99 , 6089.18 , 65.39
+88.99 , 6427.46 , 69.19
+88.99 , 6765.75 , 73.01
+177.98 , -7190.72 , -120.57
+177.98 , -6831.19 , -114.73
+177.98 , -6471.65 , -108.87
+177.98 , -6112.11 , -102.99
+177.98 , -5752.58 , -97.08
+177.98 , -5393.04 , -91.15
+177.98 , -5033.51 , -85.20
+177.98 , -4673.97 , -79.23
+177.98 , -4314.43 , -73.23
+177.98 , -3954.90 , -67.21
+177.98 , -3595.36 , -61.17
+177.98 , -3235.82 , -55.10
+177.98 , -2876.29 , -49.01
+177.98 , -2516.75 , -42.90
+177.98 , -2157.22 , -36.77
+177.98 , -1797.68 , -30.61
+177.98 , -1438.14 , -24.43
+177.98 , -1078.61 , -18.23
+177.98 , -719.07 , -12.01
+177.98 , -359.54 , -5.76
+177.98 , -71.91 , -0.66
+177.98 , 67.66 , 1.84
+177.98 , 338.29 , 7.35
+177.98 , 676.58 , 14.22
+177.98 , 1014.86 , 21.11
+177.98 , 1353.15 , 28.02
+177.98 , 1691.44 , 34.96
+177.98 , 2029.73 , 41.92
+177.98 , 2368.01 , 48.90
+177.98 , 2706.30 , 55.90
+177.98 , 3044.59 , 62.93
+177.98 , 3382.88 , 69.98
+177.98 , 3721.16 , 77.05
+177.98 , 4059.45 , 84.15
+177.98 , 4397.74 , 91.27
+177.98 , 4736.03 , 98.41
+177.98 , 5074.31 , 105.58
+177.98 , 5412.60 , 112.76
+177.98 , 5750.89 , 119.97
+177.98 , 6089.18 , 127.21
+177.98 , 6427.46 , 134.46
+177.98 , 6765.75 , 141.74
+266.97 , -7190.72 , -182.44
+266.97 , -6831.19 , -173.55
+266.97 , -6471.65 , -164.62
+266.97 , -6112.11 , -155.67
+266.97 , -5752.58 , -146.69
+266.97 , -5393.04 , -137.68
+266.97 , -5033.51 , -128.65
+266.97 , -4673.97 , -119.58
+266.97 , -4314.43 , -110.49
+266.97 , -3954.90 , -101.36
+266.97 , -3595.36 , -92.21
+266.97 , -3235.82 , -83.03
+266.97 , -2876.29 , -73.82
+266.97 , -2516.75 , -64.58
+266.97 , -2157.22 , -55.31
+266.97 , -1797.68 , -46.02
+266.97 , -1438.14 , -36.70
+266.97 , -1078.61 , -27.34
+266.97 , -719.07 , -17.96
+266.97 , -359.54 , -8.54
+266.97 , -71.91 , -0.79
+266.97 , 67.66 , 2.86
+266.97 , 338.29 , 11.12
+266.97 , 676.58 , 21.39
+266.97 , 1014.86 , 31.68
+266.97 , 1353.15 , 41.99
+266.97 , 1691.44 , 52.34
+266.97 , 2029.73 , 62.71
+266.97 , 2368.01 , 73.12
+266.97 , 2706.30 , 83.55
+266.97 , 3044.59 , 94.01
+266.97 , 3382.88 , 104.50
+266.97 , 3721.16 , 115.02
+266.97 , 4059.45 , 125.57
+266.97 , 4397.74 , 136.15
+266.97 , 4736.03 , 146.76
+266.97 , 5074.31 , 157.40
+266.97 , 5412.60 , 168.06
+266.97 , 5750.89 , 178.76
+266.97 , 6089.18 , 189.48
+266.97 , 6427.46 , 200.23
+266.97 , 6765.75 , 211.02
+355.96 , -7190.72 , -243.71
+355.96 , -6831.19 , -231.81
+355.96 , -6471.65 , -219.87
+355.96 , -6112.11 , -207.89
+355.96 , -5752.58 , -195.88
+355.96 , -5393.04 , -183.83
+355.96 , -5033.51 , -171.74
+355.96 , -4673.97 , -159.61
+355.96 , -4314.43 , -147.45
+355.96 , -3954.90 , -135.25
+355.96 , -3595.36 , -123.01
+355.96 , -3235.82 , -110.74
+355.96 , -2876.29 , -98.43
+355.96 , -2516.75 , -86.08
+355.96 , -2157.22 , -73.70
+355.96 , -1797.68 , -61.27
+355.96 , -1438.14 , -48.82
+355.96 , -1078.61 , -36.32
+355.96 , -719.07 , -23.78
+355.96 , -359.54 , -11.19
+355.96 , -71.91 , -0.63
+355.96 , 67.66 , 3.98
+355.96 , 338.29 , 15.01
+355.96 , 676.58 , 28.68
+355.96 , 1014.86 , 42.37
+355.96 , 1353.15 , 56.10
+355.96 , 1691.44 , 69.87
+355.96 , 2029.73 , 83.67
+355.96 , 2368.01 , 97.52
+355.96 , 2706.30 , 111.40
+355.96 , 3044.59 , 125.31
+355.96 , 3382.88 , 139.27
+355.96 , 3721.16 , 153.26
+355.96 , 4059.45 , 167.29
+355.96 , 4397.74 , 181.36
+355.96 , 4736.03 , 195.46
+355.96 , 5074.31 , 209.61
+355.96 , 5412.60 , 223.79
+355.96 , 5750.89 , 238.01
+355.96 , 6089.18 , 252.26
+355.96 , 6427.46 , 266.56
+355.96 , 6765.75 , 280.89
+444.95 , -7190.72 , -304.37
+444.95 , -6831.19 , -289.50
+444.95 , -6471.65 , -274.59
+444.95 , -6112.11 , -259.63
+444.95 , -5752.58 , -244.61
+444.95 , -5393.04 , -229.56
+444.95 , -5033.51 , -214.45
+444.95 , -4673.97 , -199.30
+444.95 , -4314.43 , -184.10
+444.95 , -3954.90 , -168.85
+444.95 , -3595.36 , -153.55
+444.95 , -3235.82 , -138.20
+444.95 , -2876.29 , -122.81
+444.95 , -2516.75 , -107.37
+444.95 , -2157.22 , -91.88
+444.95 , -1797.68 , -76.35
+444.95 , -1438.14 , -60.76
+444.95 , -1078.61 , -45.13
+444.95 , -719.07 , -29.44
+444.95 , -359.54 , -13.67
+444.95 , -71.91 , 0.00
+444.95 , 67.66 , 5.21
+444.95 , 338.29 , 19.04
+444.95 , 676.58 , 36.13
+444.95 , 1014.86 , 53.24
+444.95 , 1353.15 , 70.39
+444.95 , 1691.44 , 87.59
+444.95 , 2029.73 , 104.83
+444.95 , 2368.01 , 122.13
+444.95 , 2706.30 , 139.47
+444.95 , 3044.59 , 156.87
+444.95 , 3382.88 , 174.31
+444.95 , 3721.16 , 191.80
+444.95 , 4059.45 , 209.33
+444.95 , 4397.74 , 226.92
+444.95 , 4736.03 , 244.56
+444.95 , 5074.31 , 262.24
+444.95 , 5412.60 , 279.97
+444.95 , 5750.89 , 297.76
+444.95 , 6089.18 , 315.58
+444.95 , 6427.46 , 333.46
+444.95 , 6765.75 , 351.39
+533.94 , -7190.72 , -364.37
+533.94 , -6831.19 , -346.59
+533.94 , -6471.65 , -328.74
+533.94 , -6112.11 , -310.84
+533.94 , -5752.58 , -292.87
+533.94 , -5393.04 , -274.84
+533.94 , -5033.51 , -256.75
+533.94 , -4673.97 , -238.60
+533.94 , -4314.43 , -220.39
+533.94 , -3954.90 , -202.12
+533.94 , -3595.36 , -183.79
+533.94 , -3235.82 , -165.40
+533.94 , -2876.29 , -146.94
+533.94 , -2516.75 , -128.43
+533.94 , -2157.22 , -109.85
+533.94 , -1797.68 , -91.21
+533.94 , -1438.14 , -72.51
+533.94 , -1078.61 , -53.75
+533.94 , -719.07 , -34.91
+533.94 , -359.54 , -15.95
+533.94 , -71.91 , 0.00
+533.94 , 67.66 , 6.58
+533.94 , 338.29 , 23.25
+533.94 , 676.58 , 43.76
+533.94 , 1014.86 , 64.29
+533.94 , 1353.15 , 84.87
+533.94 , 1691.44 , 105.52
+533.94 , 2029.73 , 126.22
+533.94 , 2368.01 , 146.98
+533.94 , 2706.30 , 167.81
+533.94 , 3044.59 , 188.70
+533.94 , 3382.88 , 209.65
+533.94 , 3721.16 , 230.66
+533.94 , 4059.45 , 251.73
+533.94 , 4397.74 , 272.87
+533.94 , 4736.03 , 294.07
+533.94 , 5074.31 , 315.33
+533.94 , 5412.60 , 336.65
+533.94 , 5750.89 , 358.03
+533.94 , 6089.18 , 379.47
+533.94 , 6427.46 , 400.98
+533.94 , 6765.75 , 422.54
+622.93 , -7190.72 , -423.69
+622.93 , -6831.19 , -403.04
+622.93 , -6471.65 , -382.31
+622.93 , -6112.11 , -361.50
+622.93 , -5752.58 , -340.62
+622.93 , -5393.04 , -319.66
+622.93 , -5033.51 , -298.62
+622.93 , -4673.97 , -277.51
+622.93 , -4314.43 , -256.31
+622.93 , -3954.90 , -235.05
+622.93 , -3595.36 , -213.70
+622.93 , -3235.82 , -192.28
+622.93 , -2876.29 , -170.79
+622.93 , -2516.75 , -149.21
+622.93 , -2157.22 , -127.57
+622.93 , -1797.68 , -105.84
+622.93 , -1438.14 , -84.03
+622.93 , -1078.61 , -62.14
+622.93 , -719.07 , -40.16
+622.93 , -359.54 , -18.00
+622.93 , -71.91 , 0.00
+622.93 , 67.66 , 8.09
+622.93 , 338.29 , 27.64
+622.93 , 676.58 , 51.59
+622.93 , 1014.86 , 75.56
+622.93 , 1353.15 , 99.58
+622.93 , 1691.44 , 123.68
+622.93 , 2029.73 , 147.86
+622.93 , 2368.01 , 172.10
+622.93 , 2706.30 , 196.43
+622.93 , 3044.59 , 220.84
+622.93 , 3382.88 , 245.32
+622.93 , 3721.16 , 269.88
+622.93 , 4059.45 , 294.51
+622.93 , 4397.74 , 319.23
+622.93 , 4736.03 , 344.02
+622.93 , 5074.31 , 368.89
+622.93 , 5412.60 , 393.83
+622.93 , 5750.89 , 418.85
+622.93 , 6089.18 , 443.95
+622.93 , 6427.46 , 469.13
+622.93 , 6765.75 , 494.38
+711.92 , -7190.72 , -482.31
+711.92 , -6831.19 , -458.83
+711.92 , -6471.65 , -435.26
+711.92 , -6112.11 , -411.59
+711.92 , -5752.58 , -387.83
+711.92 , -5393.04 , -363.97
+711.92 , -5033.51 , -340.02
+711.92 , -4673.97 , -315.97
+711.92 , -4314.43 , -291.83
+711.92 , -3954.90 , -267.59
+711.92 , -3595.36 , -243.26
+711.92 , -3235.82 , -218.84
+711.92 , -2876.29 , -194.32
+711.92 , -2516.75 , -169.71
+711.92 , -2157.22 , -145.00
+711.92 , -1797.68 , -120.19
+711.92 , -1438.14 , -95.29
+711.92 , -1078.61 , -70.28
+711.92 , -719.07 , -45.14
+711.92 , -359.54 , -19.76
+711.92 , -71.91 , 0.00
+711.92 , 67.66 , 9.76
+711.92 , 338.29 , 32.25
+711.92 , 676.58 , 59.66
+711.92 , 1014.86 , 87.07
+711.92 , 1353.15 , 114.55
+711.92 , 1691.44 , 142.11
+711.92 , 2029.73 , 169.77
+711.92 , 2368.01 , 197.52
+711.92 , 2706.30 , 225.37
+711.92 , 3044.59 , 253.31
+711.92 , 3382.88 , 281.34
+711.92 , 3721.16 , 309.47
+711.92 , 4059.45 , 337.70
+711.92 , 4397.74 , 366.02
+711.92 , 4736.03 , 394.44
+711.92 , 5074.31 , 422.95
+711.92 , 5412.60 , 451.56
+711.92 , 5750.89 , 480.26
+711.92 , 6089.18 , 509.05
+711.92 , 6427.46 , 537.94
+711.92 , 6765.75 , 566.93
+800.91 , -7190.72 , -540.17
+800.91 , -6831.19 , -513.92
+800.91 , -6471.65 , -487.55
+800.91 , -6112.11 , -461.06
+800.91 , -5752.58 , -434.46
+800.91 , -5393.04 , -407.75
+800.91 , -5033.51 , -380.92
+800.91 , -4673.97 , -353.97
+800.91 , -4314.43 , -326.91
+800.91 , -3954.90 , -299.73
+800.91 , -3595.36 , -272.44
+800.91 , -3235.82 , -245.03
+800.91 , -2876.29 , -217.51
+800.91 , -2516.75 , -189.87
+800.91 , -2157.22 , -162.12
+800.91 , -1797.68 , -134.25
+800.91 , -1438.14 , -106.26
+800.91 , -1078.61 , -78.13
+800.91 , -719.07 , -49.84
+800.91 , -359.54 , -21.19
+800.91 , -71.91 , 0.00
+800.91 , 67.66 , 11.59
+800.91 , 338.29 , 37.10
+800.91 , 676.58 , 67.98
+800.91 , 1014.86 , 98.85
+800.91 , 1353.15 , 129.79
+800.91 , 1691.44 , 160.84
+800.91 , 2029.73 , 191.99
+800.91 , 2368.01 , 223.26
+800.91 , 2706.30 , 254.64
+800.91 , 3044.59 , 286.14
+800.91 , 3382.88 , 317.75
+800.91 , 3721.16 , 349.48
+800.91 , 4059.45 , 381.32
+800.91 , 4397.74 , 413.28
+800.91 , 4736.03 , 445.36
+800.91 , 5074.31 , 477.54
+800.91 , 5412.60 , 509.85
+800.91 , 5750.89 , 542.27
+800.91 , 6089.18 , 574.80
+800.91 , 6427.46 , 607.45
+800.91 , 6765.75 , 640.21
+889.90 , -7190.72 , -597.26
+889.90 , -6831.19 , -568.28
+889.90 , -6471.65 , -539.16
+889.90 , -6112.11 , -509.90
+889.90 , -5752.58 , -480.50
+889.90 , -5393.04 , -450.96
+889.90 , -5033.51 , -421.28
+889.90 , -4673.97 , -391.47
+889.90 , -4314.43 , -361.52
+889.90 , -3954.90 , -331.43
+889.90 , -3595.36 , -301.20
+889.90 , -3235.82 , -270.83
+889.90 , -2876.29 , -240.33
+889.90 , -2516.75 , -209.68
+889.90 , -2157.22 , -178.90
+889.90 , -1797.68 , -147.97
+889.90 , -1438.14 , -116.90
+889.90 , -1078.61 , -85.66
+889.90 , -719.07 , -54.21
+889.90 , -359.54 , -22.23
+889.90 , -71.91 , 0.00
+889.90 , 67.66 , 13.60
+889.90 , 338.29 , 42.20
+889.90 , 676.58 , 76.58
+889.90 , 1014.86 , 110.92
+889.90 , 1353.15 , 145.34
+889.90 , 1691.44 , 179.88
+889.90 , 2029.73 , 214.55
+889.90 , 2368.01 , 249.35
+889.90 , 2706.30 , 284.29
+889.90 , 3044.59 , 319.36
+889.90 , 3382.88 , 354.57
+889.90 , 3721.16 , 389.92
+889.90 , 4059.45 , 425.41
+889.90 , 4397.74 , 461.03
+889.90 , 4736.03 , 496.79
+889.90 , 5074.31 , 532.69
+889.90 , 5412.60 , 568.73
+889.90 , 5750.89 , 604.90
+889.90 , 6089.18 , 641.21
+889.90 , 6427.46 , 677.66
+889.90 , 6765.75 , 714.24
+978.89 , -7190.72 , -653.54
+978.89 , -6831.19 , -621.88
+978.89 , -6471.65 , -590.05
+978.89 , -6112.11 , -558.06
+978.89 , -5752.58 , -525.90
+978.89 , -5393.04 , -493.58
+978.89 , -5033.51 , -461.09
+978.89 , -4673.97 , -428.44
+978.89 , -4314.43 , -395.63
+978.89 , -3954.90 , -362.65
+978.89 , -3595.36 , -329.51
+978.89 , -3235.82 , -296.21
+978.89 , -2876.29 , -262.74
+978.89 , -2516.75 , -229.11
+978.89 , -2157.22 , -195.31
+978.89 , -1797.68 , -161.34
+978.89 , -1438.14 , -127.18
+978.89 , -1078.61 , -92.83
+978.89 , -719.07 , -58.20
+978.89 , -359.54 , -22.82
+978.89 , -71.91 , 0.00
+978.89 , 67.66 , 15.79
+978.89 , 338.29 , 47.58
+978.89 , 676.58 , 85.48
+978.89 , 1014.86 , 123.30
+978.89 , 1353.15 , 161.22
+978.89 , 1691.44 , 199.26
+978.89 , 2029.73 , 237.46
+978.89 , 2368.01 , 275.81
+978.89 , 2706.30 , 314.32
+978.89 , 3044.59 , 352.99
+978.89 , 3382.88 , 391.83
+978.89 , 3721.16 , 430.82
+978.89 , 4059.45 , 469.98
+978.89 , 4397.74 , 509.30
+978.89 , 4736.03 , 548.78
+978.89 , 5074.31 , 588.42
+978.89 , 5412.60 , 628.23
+978.89 , 5750.89 , 668.20
+978.89 , 6089.18 , 708.32
+978.89 , 6427.46 , 748.61
+978.89 , 6765.75 , 789.06
+1067.88 , -7190.72 , -708.97
+1067.88 , -6831.19 , -674.68
+1067.88 , -6471.65 , -640.19
+1067.88 , -6112.11 , -605.51
+1067.88 , -5752.58 , -570.63
+1067.88 , -5393.04 , -535.56
+1067.88 , -5033.51 , -500.30
+1067.88 , -4673.97 , -464.85
+1067.88 , -4314.43 , -429.21
+1067.88 , -3954.90 , -393.37
+1067.88 , -3595.36 , -357.35
+1067.88 , -3235.82 , -321.13
+1067.88 , -2876.29 , -284.71
+1067.88 , -2516.75 , -248.11
+1067.88 , -2157.22 , -211.31
+1067.88 , -1797.68 , -174.30
+1067.88 , -1438.14 , -137.08
+1067.88 , -1078.61 , -99.61
+1067.88 , -719.07 , -61.78
+1067.88 , -359.54 , -22.86
+1067.88 , -71.91 , 0.00
+1067.88 , 67.66 , 18.17
+1067.88 , 338.29 , 53.24
+1067.88 , 676.58 , 94.71
+1067.88 , 1014.86 , 136.03
+1067.88 , 1353.15 , 177.45
+1067.88 , 1691.44 , 219.01
+1067.88 , 2029.73 , 260.75
+1067.88 , 2368.01 , 302.67
+1067.88 , 2706.30 , 344.78
+1067.88 , 3044.59 , 387.07
+1067.88 , 3382.88 , 429.54
+1067.88 , 3721.16 , 472.21
+1067.88 , 4059.45 , 515.06
+1067.88 , 4397.74 , 558.11
+1067.88 , 4736.03 , 601.34
+1067.88 , 5074.31 , 644.76
+1067.88 , 5412.60 , 688.37
+1067.88 , 5750.89 , 732.17
+1067.88 , 6089.18 , 776.15
+1067.88 , 6427.46 , 820.33
+1067.88 , 6765.75 , 864.69
+1156.87 , -7190.72 , -763.53
+1156.87 , -6831.19 , -726.65
+1156.87 , -6471.65 , -689.55
+1156.87 , -6112.11 , -652.22
+1156.87 , -5752.58 , -614.67
+1156.87 , -5393.04 , -576.89
+1156.87 , -5033.51 , -538.89
+1156.87 , -4673.97 , -500.67
+1156.87 , -4314.43 , -462.22
+1156.87 , -3954.90 , -423.56
+1156.87 , -3595.36 , -384.67
+1156.87 , -3235.82 , -345.56
+1156.87 , -2876.29 , -306.22
+1156.87 , -2516.75 , -266.66
+1156.87 , -2157.22 , -226.86
+1156.87 , -1797.68 , -186.83
+1156.87 , -1438.14 , -146.54
+1156.87 , -1078.61 , -105.95
+1156.87 , -719.07 , -64.90
+1156.87 , -359.54 , -22.24
+1156.87 , -71.91 , 0.00
+1156.87 , 67.66 , 20.74
+1156.87 , 338.29 , 59.20
+1156.87 , 676.58 , 104.27
+1156.87 , 1014.86 , 149.12
+1156.87 , 1353.15 , 194.05
+1156.87 , 1691.44 , 239.16
+1156.87 , 2029.73 , 284.45
+1156.87 , 2368.01 , 329.96
+1156.87 , 2706.30 , 375.67
+1156.87 , 3044.59 , 421.60
+1156.87 , 3382.88 , 467.75
+1156.87 , 3721.16 , 514.11
+1156.87 , 4059.45 , 560.69
+1156.87 , 4397.74 , 607.48
+1156.87 , 4736.03 , 654.50
+1156.87 , 5074.31 , 701.73
+1156.87 , 5412.60 , 749.18
+1156.87 , 5750.89 , 796.84
+1156.87 , 6089.18 , 844.73
+1156.87 , 6427.46 , 892.83
+1156.87 , 6765.75 , 941.14
+1245.86 , -7190.72 , -817.17
+1245.86 , -6831.19 , -777.76
+1245.86 , -6471.65 , -738.08
+1245.86 , -6112.11 , -698.15
+1245.86 , -5752.58 , -657.96
+1245.86 , -5393.04 , -617.52
+1245.86 , -5033.51 , -576.82
+1245.86 , -4673.97 , -535.86
+1245.86 , -4314.43 , -494.65
+1245.86 , -3954.90 , -453.18
+1245.86 , -3595.36 , -411.45
+1245.86 , -3235.82 , -369.47
+1245.86 , -2876.29 , -327.22
+1245.86 , -2516.75 , -284.72
+1245.86 , -2157.22 , -241.95
+1245.86 , -1797.68 , -198.90
+1245.86 , -1438.14 , -155.54
+1245.86 , -1078.61 , -111.82
+1245.86 , -719.07 , -67.51
+1245.86 , -359.54 , -20.80
+1245.86 , -71.91 , 0.00
+1245.86 , 67.66 , 23.52
+1245.86 , 338.29 , 65.48
+1245.86 , 676.58 , 114.20
+1245.86 , 1014.86 , 162.59
+1245.86 , 1353.15 , 211.06
+1245.86 , 1691.44 , 259.72
+1245.86 , 2029.73 , 308.59
+1245.86 , 2368.01 , 357.69
+1245.86 , 2706.30 , 407.04
+1245.86 , 3044.59 , 456.62
+1245.86 , 3382.88 , 506.46
+1245.86 , 3721.16 , 556.54
+1245.86 , 4059.45 , 606.87
+1245.86 , 4397.74 , 657.45
+1245.86 , 4736.03 , 708.28
+1245.86 , 5074.31 , 759.35
+1245.86 , 5412.60 , 810.68
+1245.86 , 5750.89 , 862.25
+1245.86 , 6089.18 , 914.07
+1245.86 , 6427.46 , 966.13
+1245.86 , 6765.75 , 1018.44
+1334.85 , -7190.72 , -869.86
+1334.85 , -6831.19 , -827.96
+1334.85 , -6471.65 , -785.77
+1334.85 , -6112.11 , -743.28
+1334.85 , -5752.58 , -700.50
+1334.85 , -5393.04 , -657.42
+1334.85 , -5033.51 , -614.05
+1334.85 , -4673.97 , -570.39
+1334.85 , -4314.43 , -526.44
+1334.85 , -3954.90 , -482.19
+1334.85 , -3595.36 , -437.65
+1334.85 , -3235.82 , -392.82
+1334.85 , -2876.29 , -347.69
+1334.85 , -2516.75 , -302.26
+1334.85 , -2157.22 , -256.52
+1334.85 , -1797.68 , -210.46
+1334.85 , -1438.14 , -164.04
+1334.85 , -1078.61 , -117.17
+1334.85 , -719.07 , -69.54
+1334.85 , -359.54 , -18.27
+1334.85 , -71.91 , 0.00
+1334.85 , 67.66 , 26.49
+1334.85 , 338.29 , 72.10
+1334.85 , 676.58 , 124.50
+1334.85 , 1014.86 , 176.46
+1334.85 , 1353.15 , 228.49
+1334.85 , 1691.44 , 280.71
+1334.85 , 2029.73 , 333.18
+1334.85 , 2368.01 , 385.90
+1334.85 , 2706.30 , 438.89
+1334.85 , 3044.59 , 492.16
+1334.85 , 3382.88 , 545.71
+1334.85 , 3721.16 , 599.54
+1334.85 , 4059.45 , 653.64
+1334.85 , 4397.74 , 708.03
+1334.85 , 4736.03 , 762.71
+1334.85 , 5074.31 , 817.66
+1334.85 , 5412.60 , 872.89
+1334.85 , 5750.89 , 928.41
+1334.85 , 6089.18 , 984.20
+1334.85 , 6427.46 , 1040.27
+1334.85 , 6765.75 , 1096.63
+1423.84 , -7190.72 , -921.56
+1423.84 , -6831.19 , -877.23
+1423.84 , -6471.65 , -832.56
+1423.84 , -6112.11 , -787.56
+1423.84 , -5752.58 , -742.22
+1423.84 , -5393.04 , -696.56
+1423.84 , -5033.51 , -650.56
+1423.84 , -4673.97 , -604.23
+1423.84 , -4314.43 , -557.56
+1423.84 , -3954.90 , -510.57
+1423.84 , -3595.36 , -463.24
+1423.84 , -3235.82 , -415.58
+1423.84 , -2876.29 , -367.58
+1423.84 , -2516.75 , -319.24
+1423.84 , -2157.22 , -270.55
+1423.84 , -1797.68 , -221.48
+1423.84 , -1438.14 , -171.99
+1423.84 , -1078.61 , -121.95
+1423.84 , -719.07 , -70.93
+1423.84 , -359.54 , -14.10
+1423.84 , -71.91 , 0.00
+1423.84 , 67.66 , 29.68
+1423.84 , 338.29 , 79.05
+1423.84 , 676.58 , 135.20
+1423.84 , 1014.86 , 190.76
+1423.84 , 1353.15 , 246.36
+1423.84 , 1691.44 , 302.17
+1423.84 , 2029.73 , 358.24
+1423.84 , 2368.01 , 414.60
+1423.84 , 2706.30 , 471.27
+1423.84 , 3044.59 , 528.24
+1423.84 , 3382.88 , 585.52
+1423.84 , 3721.16 , 643.12
+1423.84 , 4059.45 , 701.03
+1423.84 , 4397.74 , 759.26
+1423.84 , 4736.03 , 817.80
+1423.84 , 5074.31 , 876.66
+1423.84 , 5412.60 , 935.84
+1423.84 , 5750.89 , 995.34
+1423.84 , 6089.18 , 1055.15
+1423.84 , 6427.46 , 1115.27
+1423.84 , 6765.75 , 1175.71
+1512.83 , -7190.72 , -972.24
+1512.83 , -6831.19 , -925.52
+1512.83 , -6471.65 , -878.43
+1512.83 , -6112.11 , -830.96
+1512.83 , -5752.58 , -783.11
+1512.83 , -5393.04 , -734.89
+1512.83 , -5033.51 , -686.30
+1512.83 , -4673.97 , -637.33
+1512.83 , -4314.43 , -587.99
+1512.83 , -3954.90 , -538.28
+1512.83 , -3595.36 , -488.19
+1512.83 , -3235.82 , -437.72
+1512.83 , -2876.29 , -386.87
+1512.83 , -2516.75 , -335.63
+1512.83 , -2157.22 , -283.99
+1512.83 , -1797.68 , -231.92
+1512.83 , -1438.14 , -179.35
+1512.83 , -1078.61 , -126.12
+1512.83 , -719.07 , -71.60
+1512.83 , -359.54 , -6.45
+1512.83 , -71.91 , 0.00
+1512.83 , 67.66 , 33.08
+1512.83 , 338.29 , 86.37
+1512.83 , 676.58 , 146.31
+1512.83 , 1014.86 , 205.50
+1512.83 , 1353.15 , 264.70
+1512.83 , 1691.44 , 324.11
+1512.83 , 2029.73 , 383.81
+1512.83 , 2368.01 , 443.83
+1512.83 , 2706.30 , 504.18
+1512.83 , 3044.59 , 564.87
+1512.83 , 3382.88 , 625.91
+1512.83 , 3721.16 , 687.30
+1512.83 , 4059.45 , 749.05
+1512.83 , 4397.74 , 811.14
+1512.83 , 4736.03 , 873.59
+1512.83 , 5074.31 , 936.40
+1512.83 , 5412.60 , 999.56
+1512.83 , 5750.89 , 1063.07
+1512.83 , 6089.18 , 1126.93
+1512.83 , 6427.46 , 1191.14
+1512.83 , 6765.75 , 1255.71
+1601.82 , -7190.72 , -1021.86
+1601.82 , -6831.19 , -972.81
+1601.82 , -6471.65 , -923.33
+1601.82 , -6112.11 , -873.44
+1601.82 , -5752.58 , -823.13
+1601.82 , -5393.04 , -772.39
+1601.82 , -5033.51 , -721.24
+1601.82 , -4673.97 , -669.67
+1601.82 , -4314.43 , -617.68
+1601.82 , -3954.90 , -565.27
+1601.82 , -3595.36 , -512.45
+1601.82 , -3235.82 , -459.19
+1601.82 , -2876.29 , -405.51
+1601.82 , -2516.75 , -351.39
+1601.82 , -2157.22 , -296.81
+1601.82 , -1797.68 , -241.73
+1601.82 , -1438.14 , -186.07
+1601.82 , -1078.61 , -129.61
+1601.82 , -719.07 , -71.46
+1601.82 , -359.54 , 0.00
+1601.82 , -71.91 , 0.00
+1601.82 , 67.66 , 36.70
+1601.82 , 338.29 , 94.04
+1601.82 , 676.58 , 157.85
+1601.82 , 1014.86 , 220.70
+1601.82 , 1353.15 , 283.52
+1601.82 , 1691.44 , 346.56
+1601.82 , 2029.73 , 409.90
+1601.82 , 2368.01 , 473.59
+1601.82 , 2706.30 , 537.65
+1601.82 , 3044.59 , 602.09
+1601.82 , 3382.88 , 666.91
+1601.82 , 3721.16 , 732.12
+1601.82 , 4059.45 , 797.72
+1601.82 , 4397.74 , 863.72
+1601.82 , 4736.03 , 930.10
+1601.82 , 5074.31 , 996.88
+1601.82 , 5412.60 , 1064.05
+1601.82 , 5750.89 , 1131.62
+1601.82 , 6089.18 , 1199.57
+1601.82 , 6427.46 , 1267.92
+1601.82 , 6765.75 , 1336.65
+1690.81 , -7190.72 , -1070.37
+1690.81 , -6831.19 , -1019.04
+1690.81 , -6471.65 , -967.24
+1690.81 , -6112.11 , -914.96
+1690.81 , -5752.58 , -862.23
+1690.81 , -5393.04 , -809.02
+1690.81 , -5033.51 , -755.35
+1690.81 , -4673.97 , -701.21
+1690.81 , -4314.43 , -646.60
+1690.81 , -3954.90 , -591.53
+1690.81 , -3595.36 , -535.99
+1690.81 , -3235.82 , -479.97
+1690.81 , -2876.29 , -423.47
+1690.81 , -2516.75 , -366.48
+1690.81 , -2157.22 , -308.96
+1690.81 , -1797.68 , -250.88
+1690.81 , -1438.14 , -192.11
+1690.81 , -1078.61 , -132.36
+1690.81 , -719.07 , -70.38
+1690.81 , -359.54 , 0.00
+1690.81 , -71.91 , 0.00
+1690.81 , 67.66 , 40.53
+1690.81 , 338.29 , 102.10
+1690.81 , 676.58 , 169.83
+1690.81 , 1014.86 , 236.37
+1690.81 , 1353.15 , 302.84
+1690.81 , 1691.44 , 369.53
+1690.81 , 2029.73 , 436.54
+1690.81 , 2368.01 , 503.92
+1690.81 , 2706.30 , 571.71
+1690.81 , 3044.59 , 639.91
+1690.81 , 3382.88 , 708.54
+1690.81 , 3721.16 , 777.59
+1690.81 , 4059.45 , 847.08
+1690.81 , 4397.74 , 917.00
+1690.81 , 4736.03 , 987.35
+1690.81 , 5074.31 , 1058.14
+1690.81 , 5412.60 , 1129.36
+1690.81 , 5750.89 , 1201.01
+1690.81 , 6089.18 , 1273.09
+1690.81 , 6427.46 , 1345.61
+1690.81 , 6765.75 , 1418.56
+1779.80 , -7190.72 , -1117.74
+1779.80 , -6831.19 , -1064.18
+1779.80 , -6471.65 , -1010.10
+1779.80 , -6112.11 , -955.49
+1779.80 , -5752.58 , -900.37
+1779.80 , -5393.04 , -844.73
+1779.80 , -5033.51 , -788.58
+1779.80 , -4673.97 , -731.90
+1779.80 , -4314.43 , -674.71
+1779.80 , -3954.90 , -617.00
+1779.80 , -3595.36 , -558.77
+1779.80 , -3235.82 , -500.01
+1779.80 , -2876.29 , -440.71
+1779.80 , -2516.75 , -380.85
+1779.80 , -2157.22 , -320.40
+1779.80 , -1797.68 , -259.31
+1779.80 , -1438.14 , -197.41
+1779.80 , -1078.61 , -134.30
+1779.80 , -719.07 , -68.24
+1779.80 , -359.54 , 0.00
+1779.80 , -71.91 , 0.00
+1779.80 , 67.66 , 44.59
+1779.80 , 338.29 , 110.53
+1779.80 , 676.58 , 182.27
+1779.80 , 1014.86 , 252.55
+1779.80 , 1353.15 , 322.69
+1779.80 , 1691.44 , 393.04
+1779.80 , 2029.73 , 463.74
+1779.80 , 2368.01 , 534.84
+1779.80 , 2706.30 , 606.37
+1779.80 , 3044.59 , 678.37
+1779.80 , 3382.88 , 750.82
+1779.80 , 3721.16 , 823.74
+1779.80 , 4059.45 , 897.14
+1779.80 , 4397.74 , 971.01
+1779.80 , 4736.03 , 1045.36
+1779.80 , 5074.31 , 1120.19
+1779.80 , 5412.60 , 1195.49
+1779.80 , 5750.89 , 1271.27
+1779.80 , 6089.18 , 1347.52
+1779.80 , 6427.46 , 1424.25
+1779.80 , 6765.75 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_3.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..0bcfef3ae913c68f305349289ee722f6d8f67f8f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -4193.88 , 0.00
+0.00 , -3984.18 , 0.00
+0.00 , -3774.49 , 0.00
+0.00 , -3564.80 , 0.00
+0.00 , -3355.10 , 0.00
+0.00 , -3145.41 , 0.00
+0.00 , -2935.71 , -0.13
+0.00 , -2726.02 , -0.66
+0.00 , -2516.33 , -0.98
+0.00 , -2306.63 , -1.19
+0.00 , -2096.94 , -1.32
+0.00 , -1887.24 , -1.38
+0.00 , -1677.55 , -1.39
+0.00 , -1467.86 , -1.35
+0.00 , -1258.16 , -1.26
+0.00 , -1048.47 , -1.13
+0.00 , -838.78 , -0.97
+0.00 , -629.08 , -0.77
+0.00 , -419.39 , -0.53
+0.00 , -209.69 , -0.27
+0.00 , -41.94 , -0.02
+0.00 , 40.28 , 0.13
+0.00 , 201.39 , 0.56
+0.00 , 402.78 , 1.12
+0.00 , 604.17 , 1.70
+0.00 , 805.56 , 2.31
+0.00 , 1006.95 , 2.93
+0.00 , 1208.34 , 3.58
+0.00 , 1409.73 , 4.25
+0.00 , 1611.12 , 4.93
+0.00 , 1812.51 , 5.64
+0.00 , 2013.90 , 6.37
+0.00 , 2215.29 , 7.12
+0.00 , 2416.68 , 7.88
+0.00 , 2618.07 , 8.67
+0.00 , 2819.46 , 9.47
+0.00 , 3020.85 , 10.29
+0.00 , 3222.24 , 11.13
+0.00 , 3423.63 , 11.99
+0.00 , 3625.02 , 12.87
+0.00 , 3826.41 , 13.76
+0.00 , 4027.80 , 14.67
+15.10 , -4193.88 , 0.00
+15.10 , -3984.18 , 0.00
+15.10 , -3774.49 , 0.00
+15.10 , -3564.80 , 0.00
+15.10 , -3355.10 , 0.00
+15.10 , -3145.41 , 0.00
+15.10 , -2935.71 , -0.50
+15.10 , -2726.02 , -0.84
+15.10 , -2516.33 , -1.04
+15.10 , -2306.63 , -1.16
+15.10 , -2096.94 , -1.22
+15.10 , -1887.24 , -1.24
+15.10 , -1677.55 , -1.21
+15.10 , -1467.86 , -1.15
+15.10 , -1258.16 , -1.06
+15.10 , -1048.47 , -0.94
+15.10 , -838.78 , -0.80
+15.10 , -629.08 , -0.62
+15.10 , -419.39 , -0.43
+15.10 , -209.69 , -0.21
+15.10 , -41.94 , -0.02
+15.10 , 40.28 , 0.10
+15.10 , 201.39 , 0.43
+15.10 , 402.78 , 0.85
+15.10 , 604.17 , 1.30
+15.10 , 805.56 , 1.75
+15.10 , 1006.95 , 2.23
+15.10 , 1208.34 , 2.71
+15.10 , 1409.73 , 3.21
+15.10 , 1611.12 , 3.73
+15.10 , 1812.51 , 4.26
+15.10 , 2013.90 , 4.80
+15.10 , 2215.29 , 5.36
+15.10 , 2416.68 , 5.93
+15.10 , 2618.07 , 6.52
+15.10 , 2819.46 , 7.12
+15.10 , 3020.85 , 7.73
+15.10 , 3222.24 , 8.35
+15.10 , 3423.63 , 8.99
+15.10 , 3625.02 , 9.64
+15.10 , 3826.41 , 10.30
+15.10 , 4027.80 , 10.98
+151.02 , -4193.88 , -58.10
+151.02 , -3984.18 , -55.37
+151.02 , -3774.49 , -52.62
+151.02 , -3564.80 , -49.85
+151.02 , -3355.10 , -47.06
+151.02 , -3145.41 , -44.25
+151.02 , -2935.71 , -41.42
+151.02 , -2726.02 , -38.57
+151.02 , -2516.33 , -35.70
+151.02 , -2306.63 , -32.81
+151.02 , -2096.94 , -29.90
+151.02 , -1887.24 , -26.98
+151.02 , -1677.55 , -24.03
+151.02 , -1467.86 , -21.07
+151.02 , -1258.16 , -18.08
+151.02 , -1048.47 , -15.08
+151.02 , -838.78 , -12.06
+151.02 , -629.08 , -9.02
+151.02 , -419.39 , -5.96
+151.02 , -209.69 , -2.88
+151.02 , -41.94 , -0.37
+151.02 , 40.28 , 0.90
+151.02 , 201.39 , 3.68
+151.02 , 402.78 , 7.16
+151.02 , 604.17 , 10.66
+151.02 , 805.56 , 14.17
+151.02 , 1006.95 , 17.71
+151.02 , 1208.34 , 21.26
+151.02 , 1409.73 , 24.84
+151.02 , 1611.12 , 28.43
+151.02 , 1812.51 , 32.04
+151.02 , 2013.90 , 35.67
+151.02 , 2215.29 , 39.32
+151.02 , 2416.68 , 42.99
+151.02 , 2618.07 , 46.68
+151.02 , 2819.46 , 50.38
+151.02 , 3020.85 , 54.11
+151.02 , 3222.24 , 57.85
+151.02 , 3423.63 , 61.61
+151.02 , 3625.02 , 65.39
+151.02 , 3826.41 , 69.19
+151.02 , 4027.80 , 73.01
+302.05 , -4193.88 , -120.57
+302.05 , -3984.18 , -114.73
+302.05 , -3774.49 , -108.87
+302.05 , -3564.80 , -102.99
+302.05 , -3355.10 , -97.08
+302.05 , -3145.41 , -91.15
+302.05 , -2935.71 , -85.20
+302.05 , -2726.02 , -79.23
+302.05 , -2516.33 , -73.23
+302.05 , -2306.63 , -67.21
+302.05 , -2096.94 , -61.17
+302.05 , -1887.24 , -55.10
+302.05 , -1677.55 , -49.01
+302.05 , -1467.86 , -42.90
+302.05 , -1258.16 , -36.77
+302.05 , -1048.47 , -30.61
+302.05 , -838.78 , -24.43
+302.05 , -629.08 , -18.23
+302.05 , -419.39 , -12.01
+302.05 , -209.69 , -5.76
+302.05 , -41.94 , -0.66
+302.05 , 40.28 , 1.84
+302.05 , 201.39 , 7.35
+302.05 , 402.78 , 14.22
+302.05 , 604.17 , 21.11
+302.05 , 805.56 , 28.02
+302.05 , 1006.95 , 34.96
+302.05 , 1208.34 , 41.92
+302.05 , 1409.73 , 48.90
+302.05 , 1611.12 , 55.90
+302.05 , 1812.51 , 62.93
+302.05 , 2013.90 , 69.98
+302.05 , 2215.29 , 77.05
+302.05 , 2416.68 , 84.15
+302.05 , 2618.07 , 91.27
+302.05 , 2819.46 , 98.41
+302.05 , 3020.85 , 105.58
+302.05 , 3222.24 , 112.76
+302.05 , 3423.63 , 119.97
+302.05 , 3625.02 , 127.21
+302.05 , 3826.41 , 134.46
+302.05 , 4027.80 , 141.74
+453.07 , -4193.88 , -182.44
+453.07 , -3984.18 , -173.55
+453.07 , -3774.49 , -164.62
+453.07 , -3564.80 , -155.67
+453.07 , -3355.10 , -146.69
+453.07 , -3145.41 , -137.68
+453.07 , -2935.71 , -128.65
+453.07 , -2726.02 , -119.58
+453.07 , -2516.33 , -110.49
+453.07 , -2306.63 , -101.36
+453.07 , -2096.94 , -92.21
+453.07 , -1887.24 , -83.03
+453.07 , -1677.55 , -73.82
+453.07 , -1467.86 , -64.58
+453.07 , -1258.16 , -55.31
+453.07 , -1048.47 , -46.02
+453.07 , -838.78 , -36.70
+453.07 , -629.08 , -27.34
+453.07 , -419.39 , -17.96
+453.07 , -209.69 , -8.54
+453.07 , -41.94 , -0.79
+453.07 , 40.28 , 2.86
+453.07 , 201.39 , 11.12
+453.07 , 402.78 , 21.39
+453.07 , 604.17 , 31.68
+453.07 , 805.56 , 41.99
+453.07 , 1006.95 , 52.34
+453.07 , 1208.34 , 62.71
+453.07 , 1409.73 , 73.12
+453.07 , 1611.12 , 83.55
+453.07 , 1812.51 , 94.01
+453.07 , 2013.90 , 104.50
+453.07 , 2215.29 , 115.02
+453.07 , 2416.68 , 125.57
+453.07 , 2618.07 , 136.15
+453.07 , 2819.46 , 146.76
+453.07 , 3020.85 , 157.40
+453.07 , 3222.24 , 168.06
+453.07 , 3423.63 , 178.76
+453.07 , 3625.02 , 189.48
+453.07 , 3826.41 , 200.23
+453.07 , 4027.80 , 211.02
+604.09 , -4193.88 , -243.71
+604.09 , -3984.18 , -231.81
+604.09 , -3774.49 , -219.87
+604.09 , -3564.80 , -207.89
+604.09 , -3355.10 , -195.88
+604.09 , -3145.41 , -183.83
+604.09 , -2935.71 , -171.74
+604.09 , -2726.02 , -159.61
+604.09 , -2516.33 , -147.45
+604.09 , -2306.63 , -135.25
+604.09 , -2096.94 , -123.01
+604.09 , -1887.24 , -110.74
+604.09 , -1677.55 , -98.43
+604.09 , -1467.86 , -86.08
+604.09 , -1258.16 , -73.70
+604.09 , -1048.47 , -61.27
+604.09 , -838.78 , -48.82
+604.09 , -629.08 , -36.32
+604.09 , -419.39 , -23.78
+604.09 , -209.69 , -11.19
+604.09 , -41.94 , -0.63
+604.09 , 40.28 , 3.98
+604.09 , 201.39 , 15.01
+604.09 , 402.78 , 28.68
+604.09 , 604.17 , 42.37
+604.09 , 805.56 , 56.10
+604.09 , 1006.95 , 69.87
+604.09 , 1208.34 , 83.67
+604.09 , 1409.73 , 97.52
+604.09 , 1611.12 , 111.40
+604.09 , 1812.51 , 125.31
+604.09 , 2013.90 , 139.27
+604.09 , 2215.29 , 153.26
+604.09 , 2416.68 , 167.29
+604.09 , 2618.07 , 181.36
+604.09 , 2819.46 , 195.46
+604.09 , 3020.85 , 209.61
+604.09 , 3222.24 , 223.79
+604.09 , 3423.63 , 238.01
+604.09 , 3625.02 , 252.26
+604.09 , 3826.41 , 266.56
+604.09 , 4027.80 , 280.89
+755.11 , -4193.88 , -304.37
+755.11 , -3984.18 , -289.50
+755.11 , -3774.49 , -274.59
+755.11 , -3564.80 , -259.63
+755.11 , -3355.10 , -244.61
+755.11 , -3145.41 , -229.56
+755.11 , -2935.71 , -214.45
+755.11 , -2726.02 , -199.30
+755.11 , -2516.33 , -184.10
+755.11 , -2306.63 , -168.85
+755.11 , -2096.94 , -153.55
+755.11 , -1887.24 , -138.20
+755.11 , -1677.55 , -122.81
+755.11 , -1467.86 , -107.37
+755.11 , -1258.16 , -91.88
+755.11 , -1048.47 , -76.35
+755.11 , -838.78 , -60.76
+755.11 , -629.08 , -45.13
+755.11 , -419.39 , -29.44
+755.11 , -209.69 , -13.67
+755.11 , -41.94 , 0.00
+755.11 , 40.28 , 5.21
+755.11 , 201.39 , 19.04
+755.11 , 402.78 , 36.13
+755.11 , 604.17 , 53.24
+755.11 , 805.56 , 70.39
+755.11 , 1006.95 , 87.59
+755.11 , 1208.34 , 104.83
+755.11 , 1409.73 , 122.13
+755.11 , 1611.12 , 139.47
+755.11 , 1812.51 , 156.87
+755.11 , 2013.90 , 174.31
+755.11 , 2215.29 , 191.80
+755.11 , 2416.68 , 209.33
+755.11 , 2618.07 , 226.92
+755.11 , 2819.46 , 244.56
+755.11 , 3020.85 , 262.24
+755.11 , 3222.24 , 279.97
+755.11 , 3423.63 , 297.76
+755.11 , 3625.02 , 315.58
+755.11 , 3826.41 , 333.46
+755.11 , 4027.80 , 351.39
+906.14 , -4193.88 , -364.37
+906.14 , -3984.18 , -346.59
+906.14 , -3774.49 , -328.74
+906.14 , -3564.80 , -310.84
+906.14 , -3355.10 , -292.87
+906.14 , -3145.41 , -274.84
+906.14 , -2935.71 , -256.75
+906.14 , -2726.02 , -238.60
+906.14 , -2516.33 , -220.39
+906.14 , -2306.63 , -202.12
+906.14 , -2096.94 , -183.79
+906.14 , -1887.24 , -165.40
+906.14 , -1677.55 , -146.94
+906.14 , -1467.86 , -128.43
+906.14 , -1258.16 , -109.85
+906.14 , -1048.47 , -91.21
+906.14 , -838.78 , -72.51
+906.14 , -629.08 , -53.75
+906.14 , -419.39 , -34.91
+906.14 , -209.69 , -15.95
+906.14 , -41.94 , 0.00
+906.14 , 40.28 , 6.58
+906.14 , 201.39 , 23.25
+906.14 , 402.78 , 43.76
+906.14 , 604.17 , 64.29
+906.14 , 805.56 , 84.87
+906.14 , 1006.95 , 105.52
+906.14 , 1208.34 , 126.22
+906.14 , 1409.73 , 146.98
+906.14 , 1611.12 , 167.81
+906.14 , 1812.51 , 188.70
+906.14 , 2013.90 , 209.65
+906.14 , 2215.29 , 230.66
+906.14 , 2416.68 , 251.73
+906.14 , 2618.07 , 272.87
+906.14 , 2819.46 , 294.07
+906.14 , 3020.85 , 315.33
+906.14 , 3222.24 , 336.65
+906.14 , 3423.63 , 358.03
+906.14 , 3625.02 , 379.47
+906.14 , 3826.41 , 400.98
+906.14 , 4027.80 , 422.54
+1057.16 , -4193.88 , -423.69
+1057.16 , -3984.18 , -403.04
+1057.16 , -3774.49 , -382.31
+1057.16 , -3564.80 , -361.50
+1057.16 , -3355.10 , -340.62
+1057.16 , -3145.41 , -319.66
+1057.16 , -2935.71 , -298.62
+1057.16 , -2726.02 , -277.51
+1057.16 , -2516.33 , -256.31
+1057.16 , -2306.63 , -235.05
+1057.16 , -2096.94 , -213.70
+1057.16 , -1887.24 , -192.28
+1057.16 , -1677.55 , -170.79
+1057.16 , -1467.86 , -149.21
+1057.16 , -1258.16 , -127.57
+1057.16 , -1048.47 , -105.84
+1057.16 , -838.78 , -84.03
+1057.16 , -629.08 , -62.14
+1057.16 , -419.39 , -40.16
+1057.16 , -209.69 , -18.00
+1057.16 , -41.94 , 0.00
+1057.16 , 40.28 , 8.09
+1057.16 , 201.39 , 27.64
+1057.16 , 402.78 , 51.59
+1057.16 , 604.17 , 75.56
+1057.16 , 805.56 , 99.58
+1057.16 , 1006.95 , 123.68
+1057.16 , 1208.34 , 147.86
+1057.16 , 1409.73 , 172.10
+1057.16 , 1611.12 , 196.43
+1057.16 , 1812.51 , 220.84
+1057.16 , 2013.90 , 245.32
+1057.16 , 2215.29 , 269.88
+1057.16 , 2416.68 , 294.51
+1057.16 , 2618.07 , 319.23
+1057.16 , 2819.46 , 344.02
+1057.16 , 3020.85 , 368.89
+1057.16 , 3222.24 , 393.83
+1057.16 , 3423.63 , 418.85
+1057.16 , 3625.02 , 443.95
+1057.16 , 3826.41 , 469.13
+1057.16 , 4027.80 , 494.38
+1208.18 , -4193.88 , -482.31
+1208.18 , -3984.18 , -458.83
+1208.18 , -3774.49 , -435.26
+1208.18 , -3564.80 , -411.59
+1208.18 , -3355.10 , -387.83
+1208.18 , -3145.41 , -363.97
+1208.18 , -2935.71 , -340.02
+1208.18 , -2726.02 , -315.97
+1208.18 , -2516.33 , -291.83
+1208.18 , -2306.63 , -267.59
+1208.18 , -2096.94 , -243.26
+1208.18 , -1887.24 , -218.84
+1208.18 , -1677.55 , -194.32
+1208.18 , -1467.86 , -169.71
+1208.18 , -1258.16 , -145.00
+1208.18 , -1048.47 , -120.19
+1208.18 , -838.78 , -95.29
+1208.18 , -629.08 , -70.28
+1208.18 , -419.39 , -45.14
+1208.18 , -209.69 , -19.76
+1208.18 , -41.94 , 0.00
+1208.18 , 40.28 , 9.76
+1208.18 , 201.39 , 32.25
+1208.18 , 402.78 , 59.66
+1208.18 , 604.17 , 87.07
+1208.18 , 805.56 , 114.55
+1208.18 , 1006.95 , 142.11
+1208.18 , 1208.34 , 169.77
+1208.18 , 1409.73 , 197.52
+1208.18 , 1611.12 , 225.37
+1208.18 , 1812.51 , 253.31
+1208.18 , 2013.90 , 281.34
+1208.18 , 2215.29 , 309.47
+1208.18 , 2416.68 , 337.70
+1208.18 , 2618.07 , 366.02
+1208.18 , 2819.46 , 394.44
+1208.18 , 3020.85 , 422.95
+1208.18 , 3222.24 , 451.56
+1208.18 , 3423.63 , 480.26
+1208.18 , 3625.02 , 509.05
+1208.18 , 3826.41 , 537.94
+1208.18 , 4027.80 , 566.93
+1359.21 , -4193.88 , -540.17
+1359.21 , -3984.18 , -513.92
+1359.21 , -3774.49 , -487.55
+1359.21 , -3564.80 , -461.06
+1359.21 , -3355.10 , -434.46
+1359.21 , -3145.41 , -407.75
+1359.21 , -2935.71 , -380.92
+1359.21 , -2726.02 , -353.97
+1359.21 , -2516.33 , -326.91
+1359.21 , -2306.63 , -299.73
+1359.21 , -2096.94 , -272.44
+1359.21 , -1887.24 , -245.03
+1359.21 , -1677.55 , -217.51
+1359.21 , -1467.86 , -189.87
+1359.21 , -1258.16 , -162.12
+1359.21 , -1048.47 , -134.25
+1359.21 , -838.78 , -106.26
+1359.21 , -629.08 , -78.13
+1359.21 , -419.39 , -49.84
+1359.21 , -209.69 , -21.19
+1359.21 , -41.94 , 0.00
+1359.21 , 40.28 , 11.59
+1359.21 , 201.39 , 37.10
+1359.21 , 402.78 , 67.98
+1359.21 , 604.17 , 98.85
+1359.21 , 805.56 , 129.79
+1359.21 , 1006.95 , 160.84
+1359.21 , 1208.34 , 191.99
+1359.21 , 1409.73 , 223.26
+1359.21 , 1611.12 , 254.64
+1359.21 , 1812.51 , 286.14
+1359.21 , 2013.90 , 317.75
+1359.21 , 2215.29 , 349.48
+1359.21 , 2416.68 , 381.32
+1359.21 , 2618.07 , 413.28
+1359.21 , 2819.46 , 445.36
+1359.21 , 3020.85 , 477.54
+1359.21 , 3222.24 , 509.85
+1359.21 , 3423.63 , 542.27
+1359.21 , 3625.02 , 574.80
+1359.21 , 3826.41 , 607.45
+1359.21 , 4027.80 , 640.21
+1510.23 , -4193.88 , -597.26
+1510.23 , -3984.18 , -568.28
+1510.23 , -3774.49 , -539.16
+1510.23 , -3564.80 , -509.90
+1510.23 , -3355.10 , -480.50
+1510.23 , -3145.41 , -450.96
+1510.23 , -2935.71 , -421.28
+1510.23 , -2726.02 , -391.47
+1510.23 , -2516.33 , -361.52
+1510.23 , -2306.63 , -331.43
+1510.23 , -2096.94 , -301.20
+1510.23 , -1887.24 , -270.83
+1510.23 , -1677.55 , -240.33
+1510.23 , -1467.86 , -209.68
+1510.23 , -1258.16 , -178.90
+1510.23 , -1048.47 , -147.97
+1510.23 , -838.78 , -116.90
+1510.23 , -629.08 , -85.66
+1510.23 , -419.39 , -54.21
+1510.23 , -209.69 , -22.23
+1510.23 , -41.94 , 0.00
+1510.23 , 40.28 , 13.60
+1510.23 , 201.39 , 42.20
+1510.23 , 402.78 , 76.58
+1510.23 , 604.17 , 110.92
+1510.23 , 805.56 , 145.34
+1510.23 , 1006.95 , 179.88
+1510.23 , 1208.34 , 214.55
+1510.23 , 1409.73 , 249.35
+1510.23 , 1611.12 , 284.29
+1510.23 , 1812.51 , 319.36
+1510.23 , 2013.90 , 354.57
+1510.23 , 2215.29 , 389.92
+1510.23 , 2416.68 , 425.41
+1510.23 , 2618.07 , 461.03
+1510.23 , 2819.46 , 496.79
+1510.23 , 3020.85 , 532.69
+1510.23 , 3222.24 , 568.73
+1510.23 , 3423.63 , 604.90
+1510.23 , 3625.02 , 641.21
+1510.23 , 3826.41 , 677.66
+1510.23 , 4027.80 , 714.24
+1661.25 , -4193.88 , -653.54
+1661.25 , -3984.18 , -621.88
+1661.25 , -3774.49 , -590.05
+1661.25 , -3564.80 , -558.06
+1661.25 , -3355.10 , -525.90
+1661.25 , -3145.41 , -493.58
+1661.25 , -2935.71 , -461.09
+1661.25 , -2726.02 , -428.44
+1661.25 , -2516.33 , -395.63
+1661.25 , -2306.63 , -362.65
+1661.25 , -2096.94 , -329.51
+1661.25 , -1887.24 , -296.21
+1661.25 , -1677.55 , -262.74
+1661.25 , -1467.86 , -229.11
+1661.25 , -1258.16 , -195.31
+1661.25 , -1048.47 , -161.34
+1661.25 , -838.78 , -127.18
+1661.25 , -629.08 , -92.83
+1661.25 , -419.39 , -58.20
+1661.25 , -209.69 , -22.82
+1661.25 , -41.94 , 0.00
+1661.25 , 40.28 , 15.79
+1661.25 , 201.39 , 47.58
+1661.25 , 402.78 , 85.48
+1661.25 , 604.17 , 123.30
+1661.25 , 805.56 , 161.22
+1661.25 , 1006.95 , 199.26
+1661.25 , 1208.34 , 237.46
+1661.25 , 1409.73 , 275.81
+1661.25 , 1611.12 , 314.32
+1661.25 , 1812.51 , 352.99
+1661.25 , 2013.90 , 391.83
+1661.25 , 2215.29 , 430.82
+1661.25 , 2416.68 , 469.98
+1661.25 , 2618.07 , 509.30
+1661.25 , 2819.46 , 548.78
+1661.25 , 3020.85 , 588.42
+1661.25 , 3222.24 , 628.23
+1661.25 , 3423.63 , 668.20
+1661.25 , 3625.02 , 708.32
+1661.25 , 3826.41 , 748.61
+1661.25 , 4027.80 , 789.06
+1812.27 , -4193.88 , -708.97
+1812.27 , -3984.18 , -674.68
+1812.27 , -3774.49 , -640.19
+1812.27 , -3564.80 , -605.51
+1812.27 , -3355.10 , -570.63
+1812.27 , -3145.41 , -535.56
+1812.27 , -2935.71 , -500.30
+1812.27 , -2726.02 , -464.85
+1812.27 , -2516.33 , -429.21
+1812.27 , -2306.63 , -393.37
+1812.27 , -2096.94 , -357.35
+1812.27 , -1887.24 , -321.13
+1812.27 , -1677.55 , -284.71
+1812.27 , -1467.86 , -248.11
+1812.27 , -1258.16 , -211.31
+1812.27 , -1048.47 , -174.30
+1812.27 , -838.78 , -137.08
+1812.27 , -629.08 , -99.61
+1812.27 , -419.39 , -61.78
+1812.27 , -209.69 , -22.86
+1812.27 , -41.94 , 0.00
+1812.27 , 40.28 , 18.17
+1812.27 , 201.39 , 53.24
+1812.27 , 402.78 , 94.71
+1812.27 , 604.17 , 136.03
+1812.27 , 805.56 , 177.45
+1812.27 , 1006.95 , 219.01
+1812.27 , 1208.34 , 260.75
+1812.27 , 1409.73 , 302.67
+1812.27 , 1611.12 , 344.78
+1812.27 , 1812.51 , 387.07
+1812.27 , 2013.90 , 429.54
+1812.27 , 2215.29 , 472.21
+1812.27 , 2416.68 , 515.06
+1812.27 , 2618.07 , 558.11
+1812.27 , 2819.46 , 601.34
+1812.27 , 3020.85 , 644.76
+1812.27 , 3222.24 , 688.37
+1812.27 , 3423.63 , 732.17
+1812.27 , 3625.02 , 776.15
+1812.27 , 3826.41 , 820.33
+1812.27 , 4027.80 , 864.69
+1963.30 , -4193.88 , -763.53
+1963.30 , -3984.18 , -726.65
+1963.30 , -3774.49 , -689.55
+1963.30 , -3564.80 , -652.22
+1963.30 , -3355.10 , -614.67
+1963.30 , -3145.41 , -576.89
+1963.30 , -2935.71 , -538.89
+1963.30 , -2726.02 , -500.67
+1963.30 , -2516.33 , -462.22
+1963.30 , -2306.63 , -423.56
+1963.30 , -2096.94 , -384.67
+1963.30 , -1887.24 , -345.56
+1963.30 , -1677.55 , -306.22
+1963.30 , -1467.86 , -266.66
+1963.30 , -1258.16 , -226.86
+1963.30 , -1048.47 , -186.83
+1963.30 , -838.78 , -146.54
+1963.30 , -629.08 , -105.95
+1963.30 , -419.39 , -64.90
+1963.30 , -209.69 , -22.24
+1963.30 , -41.94 , 0.00
+1963.30 , 40.28 , 20.74
+1963.30 , 201.39 , 59.20
+1963.30 , 402.78 , 104.27
+1963.30 , 604.17 , 149.12
+1963.30 , 805.56 , 194.05
+1963.30 , 1006.95 , 239.16
+1963.30 , 1208.34 , 284.45
+1963.30 , 1409.73 , 329.96
+1963.30 , 1611.12 , 375.67
+1963.30 , 1812.51 , 421.60
+1963.30 , 2013.90 , 467.75
+1963.30 , 2215.29 , 514.11
+1963.30 , 2416.68 , 560.69
+1963.30 , 2618.07 , 607.48
+1963.30 , 2819.46 , 654.50
+1963.30 , 3020.85 , 701.73
+1963.30 , 3222.24 , 749.18
+1963.30 , 3423.63 , 796.84
+1963.30 , 3625.02 , 844.73
+1963.30 , 3826.41 , 892.83
+1963.30 , 4027.80 , 941.14
+2114.32 , -4193.88 , -817.17
+2114.32 , -3984.18 , -777.76
+2114.32 , -3774.49 , -738.08
+2114.32 , -3564.80 , -698.15
+2114.32 , -3355.10 , -657.96
+2114.32 , -3145.41 , -617.52
+2114.32 , -2935.71 , -576.82
+2114.32 , -2726.02 , -535.86
+2114.32 , -2516.33 , -494.65
+2114.32 , -2306.63 , -453.18
+2114.32 , -2096.94 , -411.45
+2114.32 , -1887.24 , -369.47
+2114.32 , -1677.55 , -327.22
+2114.32 , -1467.86 , -284.72
+2114.32 , -1258.16 , -241.95
+2114.32 , -1048.47 , -198.90
+2114.32 , -838.78 , -155.54
+2114.32 , -629.08 , -111.82
+2114.32 , -419.39 , -67.51
+2114.32 , -209.69 , -20.80
+2114.32 , -41.94 , 0.00
+2114.32 , 40.28 , 23.52
+2114.32 , 201.39 , 65.48
+2114.32 , 402.78 , 114.20
+2114.32 , 604.17 , 162.59
+2114.32 , 805.56 , 211.06
+2114.32 , 1006.95 , 259.72
+2114.32 , 1208.34 , 308.59
+2114.32 , 1409.73 , 357.69
+2114.32 , 1611.12 , 407.04
+2114.32 , 1812.51 , 456.62
+2114.32 , 2013.90 , 506.46
+2114.32 , 2215.29 , 556.54
+2114.32 , 2416.68 , 606.87
+2114.32 , 2618.07 , 657.45
+2114.32 , 2819.46 , 708.28
+2114.32 , 3020.85 , 759.35
+2114.32 , 3222.24 , 810.68
+2114.32 , 3423.63 , 862.25
+2114.32 , 3625.02 , 914.07
+2114.32 , 3826.41 , 966.13
+2114.32 , 4027.80 , 1018.44
+2265.34 , -4193.88 , -869.86
+2265.34 , -3984.18 , -827.96
+2265.34 , -3774.49 , -785.77
+2265.34 , -3564.80 , -743.28
+2265.34 , -3355.10 , -700.50
+2265.34 , -3145.41 , -657.42
+2265.34 , -2935.71 , -614.05
+2265.34 , -2726.02 , -570.39
+2265.34 , -2516.33 , -526.44
+2265.34 , -2306.63 , -482.19
+2265.34 , -2096.94 , -437.65
+2265.34 , -1887.24 , -392.82
+2265.34 , -1677.55 , -347.69
+2265.34 , -1467.86 , -302.26
+2265.34 , -1258.16 , -256.52
+2265.34 , -1048.47 , -210.46
+2265.34 , -838.78 , -164.04
+2265.34 , -629.08 , -117.17
+2265.34 , -419.39 , -69.54
+2265.34 , -209.69 , -18.27
+2265.34 , -41.94 , 0.00
+2265.34 , 40.28 , 26.49
+2265.34 , 201.39 , 72.10
+2265.34 , 402.78 , 124.50
+2265.34 , 604.17 , 176.46
+2265.34 , 805.56 , 228.49
+2265.34 , 1006.95 , 280.71
+2265.34 , 1208.34 , 333.18
+2265.34 , 1409.73 , 385.90
+2265.34 , 1611.12 , 438.89
+2265.34 , 1812.51 , 492.16
+2265.34 , 2013.90 , 545.71
+2265.34 , 2215.29 , 599.54
+2265.34 , 2416.68 , 653.64
+2265.34 , 2618.07 , 708.03
+2265.34 , 2819.46 , 762.71
+2265.34 , 3020.85 , 817.66
+2265.34 , 3222.24 , 872.89
+2265.34 , 3423.63 , 928.41
+2265.34 , 3625.02 , 984.20
+2265.34 , 3826.41 , 1040.27
+2265.34 , 4027.80 , 1096.63
+2416.37 , -4193.88 , -921.56
+2416.37 , -3984.18 , -877.23
+2416.37 , -3774.49 , -832.56
+2416.37 , -3564.80 , -787.56
+2416.37 , -3355.10 , -742.22
+2416.37 , -3145.41 , -696.56
+2416.37 , -2935.71 , -650.56
+2416.37 , -2726.02 , -604.23
+2416.37 , -2516.33 , -557.56
+2416.37 , -2306.63 , -510.57
+2416.37 , -2096.94 , -463.24
+2416.37 , -1887.24 , -415.58
+2416.37 , -1677.55 , -367.58
+2416.37 , -1467.86 , -319.24
+2416.37 , -1258.16 , -270.55
+2416.37 , -1048.47 , -221.48
+2416.37 , -838.78 , -171.99
+2416.37 , -629.08 , -121.95
+2416.37 , -419.39 , -70.93
+2416.37 , -209.69 , -14.10
+2416.37 , -41.94 , 0.00
+2416.37 , 40.28 , 29.68
+2416.37 , 201.39 , 79.05
+2416.37 , 402.78 , 135.20
+2416.37 , 604.17 , 190.76
+2416.37 , 805.56 , 246.36
+2416.37 , 1006.95 , 302.17
+2416.37 , 1208.34 , 358.24
+2416.37 , 1409.73 , 414.60
+2416.37 , 1611.12 , 471.27
+2416.37 , 1812.51 , 528.24
+2416.37 , 2013.90 , 585.52
+2416.37 , 2215.29 , 643.12
+2416.37 , 2416.68 , 701.03
+2416.37 , 2618.07 , 759.26
+2416.37 , 2819.46 , 817.80
+2416.37 , 3020.85 , 876.66
+2416.37 , 3222.24 , 935.84
+2416.37 , 3423.63 , 995.34
+2416.37 , 3625.02 , 1055.15
+2416.37 , 3826.41 , 1115.27
+2416.37 , 4027.80 , 1175.71
+2567.39 , -4193.88 , -972.24
+2567.39 , -3984.18 , -925.52
+2567.39 , -3774.49 , -878.43
+2567.39 , -3564.80 , -830.96
+2567.39 , -3355.10 , -783.11
+2567.39 , -3145.41 , -734.89
+2567.39 , -2935.71 , -686.30
+2567.39 , -2726.02 , -637.33
+2567.39 , -2516.33 , -587.99
+2567.39 , -2306.63 , -538.28
+2567.39 , -2096.94 , -488.19
+2567.39 , -1887.24 , -437.72
+2567.39 , -1677.55 , -386.87
+2567.39 , -1467.86 , -335.63
+2567.39 , -1258.16 , -283.99
+2567.39 , -1048.47 , -231.92
+2567.39 , -838.78 , -179.35
+2567.39 , -629.08 , -126.12
+2567.39 , -419.39 , -71.60
+2567.39 , -209.69 , -6.45
+2567.39 , -41.94 , 0.00
+2567.39 , 40.28 , 33.08
+2567.39 , 201.39 , 86.37
+2567.39 , 402.78 , 146.31
+2567.39 , 604.17 , 205.50
+2567.39 , 805.56 , 264.70
+2567.39 , 1006.95 , 324.11
+2567.39 , 1208.34 , 383.81
+2567.39 , 1409.73 , 443.83
+2567.39 , 1611.12 , 504.18
+2567.39 , 1812.51 , 564.87
+2567.39 , 2013.90 , 625.91
+2567.39 , 2215.29 , 687.30
+2567.39 , 2416.68 , 749.05
+2567.39 , 2618.07 , 811.14
+2567.39 , 2819.46 , 873.59
+2567.39 , 3020.85 , 936.40
+2567.39 , 3222.24 , 999.56
+2567.39 , 3423.63 , 1063.07
+2567.39 , 3625.02 , 1126.93
+2567.39 , 3826.41 , 1191.14
+2567.39 , 4027.80 , 1255.71
+2718.41 , -4193.88 , -1021.86
+2718.41 , -3984.18 , -972.81
+2718.41 , -3774.49 , -923.33
+2718.41 , -3564.80 , -873.44
+2718.41 , -3355.10 , -823.13
+2718.41 , -3145.41 , -772.39
+2718.41 , -2935.71 , -721.24
+2718.41 , -2726.02 , -669.67
+2718.41 , -2516.33 , -617.68
+2718.41 , -2306.63 , -565.27
+2718.41 , -2096.94 , -512.45
+2718.41 , -1887.24 , -459.19
+2718.41 , -1677.55 , -405.51
+2718.41 , -1467.86 , -351.39
+2718.41 , -1258.16 , -296.81
+2718.41 , -1048.47 , -241.73
+2718.41 , -838.78 , -186.07
+2718.41 , -629.08 , -129.61
+2718.41 , -419.39 , -71.46
+2718.41 , -209.69 , 0.00
+2718.41 , -41.94 , 0.00
+2718.41 , 40.28 , 36.70
+2718.41 , 201.39 , 94.04
+2718.41 , 402.78 , 157.85
+2718.41 , 604.17 , 220.70
+2718.41 , 805.56 , 283.52
+2718.41 , 1006.95 , 346.56
+2718.41 , 1208.34 , 409.90
+2718.41 , 1409.73 , 473.59
+2718.41 , 1611.12 , 537.65
+2718.41 , 1812.51 , 602.09
+2718.41 , 2013.90 , 666.91
+2718.41 , 2215.29 , 732.12
+2718.41 , 2416.68 , 797.72
+2718.41 , 2618.07 , 863.72
+2718.41 , 2819.46 , 930.10
+2718.41 , 3020.85 , 996.88
+2718.41 , 3222.24 , 1064.05
+2718.41 , 3423.63 , 1131.62
+2718.41 , 3625.02 , 1199.57
+2718.41 , 3826.41 , 1267.92
+2718.41 , 4027.80 , 1336.65
+2869.43 , -4193.88 , -1070.37
+2869.43 , -3984.18 , -1019.04
+2869.43 , -3774.49 , -967.24
+2869.43 , -3564.80 , -914.96
+2869.43 , -3355.10 , -862.23
+2869.43 , -3145.41 , -809.02
+2869.43 , -2935.71 , -755.35
+2869.43 , -2726.02 , -701.21
+2869.43 , -2516.33 , -646.60
+2869.43 , -2306.63 , -591.53
+2869.43 , -2096.94 , -535.99
+2869.43 , -1887.24 , -479.97
+2869.43 , -1677.55 , -423.47
+2869.43 , -1467.86 , -366.48
+2869.43 , -1258.16 , -308.96
+2869.43 , -1048.47 , -250.88
+2869.43 , -838.78 , -192.11
+2869.43 , -629.08 , -132.36
+2869.43 , -419.39 , -70.38
+2869.43 , -209.69 , 0.00
+2869.43 , -41.94 , 0.00
+2869.43 , 40.28 , 40.53
+2869.43 , 201.39 , 102.10
+2869.43 , 402.78 , 169.83
+2869.43 , 604.17 , 236.37
+2869.43 , 805.56 , 302.84
+2869.43 , 1006.95 , 369.53
+2869.43 , 1208.34 , 436.54
+2869.43 , 1409.73 , 503.92
+2869.43 , 1611.12 , 571.71
+2869.43 , 1812.51 , 639.91
+2869.43 , 2013.90 , 708.54
+2869.43 , 2215.29 , 777.59
+2869.43 , 2416.68 , 847.08
+2869.43 , 2618.07 , 917.00
+2869.43 , 2819.46 , 987.35
+2869.43 , 3020.85 , 1058.14
+2869.43 , 3222.24 , 1129.36
+2869.43 , 3423.63 , 1201.01
+2869.43 , 3625.02 , 1273.09
+2869.43 , 3826.41 , 1345.61
+2869.43 , 4027.80 , 1418.56
+3020.46 , -4193.88 , -1117.74
+3020.46 , -3984.18 , -1064.18
+3020.46 , -3774.49 , -1010.10
+3020.46 , -3564.80 , -955.49
+3020.46 , -3355.10 , -900.37
+3020.46 , -3145.41 , -844.73
+3020.46 , -2935.71 , -788.58
+3020.46 , -2726.02 , -731.90
+3020.46 , -2516.33 , -674.71
+3020.46 , -2306.63 , -617.00
+3020.46 , -2096.94 , -558.77
+3020.46 , -1887.24 , -500.01
+3020.46 , -1677.55 , -440.71
+3020.46 , -1467.86 , -380.85
+3020.46 , -1258.16 , -320.40
+3020.46 , -1048.47 , -259.31
+3020.46 , -838.78 , -197.41
+3020.46 , -629.08 , -134.30
+3020.46 , -419.39 , -68.24
+3020.46 , -209.69 , 0.00
+3020.46 , -41.94 , 0.00
+3020.46 , 40.28 , 44.59
+3020.46 , 201.39 , 110.53
+3020.46 , 402.78 , 182.27
+3020.46 , 604.17 , 252.55
+3020.46 , 805.56 , 322.69
+3020.46 , 1006.95 , 393.04
+3020.46 , 1208.34 , 463.74
+3020.46 , 1409.73 , 534.84
+3020.46 , 1611.12 , 606.37
+3020.46 , 1812.51 , 678.37
+3020.46 , 2013.90 , 750.82
+3020.46 , 2215.29 , 823.74
+3020.46 , 2416.68 , 897.14
+3020.46 , 2618.07 , 971.01
+3020.46 , 2819.46 , 1045.36
+3020.46 , 3020.85 , 1120.19
+3020.46 , 3222.24 , 1195.49
+3020.46 , 3423.63 , 1271.27
+3020.46 , 3625.02 , 1347.52
+3020.46 , 3826.41 , 1424.25
+3020.46 , 4027.80 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..2c22528593c65014558a41670cf09448bd99eebb
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_FLD_max.viepcp
@@ -0,0 +1,24 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 4027.80 , -4193.88
+14.96 , 4027.80 , -4193.88
+151.09 , 4027.80 , -4193.88
+302.19 , 4027.80 , -4193.88
+452.92 , 4027.80 , -4193.88
+604.01 , 4027.80 , -4193.88
+755.11 , 4027.80 , -4193.88
+906.20 , 3356.50 , -3494.90
+1057.30 , 2876.98 , -2995.60
+1208.03 , 2517.38 , -2621.17
+1359.12 , 2237.68 , -2329.95
+1510.22 , 2013.90 , -2096.94
+1661.31 , 1830.82 , -1906.31
+1812.41 , 1678.25 , -1747.45
+1963.14 , 1549.15 , -1613.02
+2114.23 , 1438.52 , -1497.83
+2265.33 , 1342.60 , -1397.96
+2416.42 , 1258.71 , -1310.61
+2567.52 , 1184.66 , -1233.50
+2718.25 , 1118.82 , -1164.95
+2869.34 , 1059.96 , -1103.66
+3020.44 , 1006.95 , -1048.47
+
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..1c40e34f4c8b390982508509b839a7cc766f8bd1
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 4027.80 , -4193.88
+14.96 , 4027.80 , -4193.88
+151.09 , 4027.80 , -4193.88
+302.19 , 4027.80 , -4193.88
+452.92 , 4027.80 , -4193.88
+604.01 , 4027.80 , -4193.88
+755.11 , 4027.80 , -4193.88
+906.20 , 3356.50 , -3494.90
+1057.30 , 2876.98 , -2995.60
+1208.03 , 2517.38 , -2621.17
+1359.12 , 2237.68 , -2329.95
+1510.22 , 2013.90 , -2096.94
+1661.31 , 1830.82 , -1906.31
+1812.41 , 1678.25 , -1747.45
+1963.14 , 1549.15 , -1613.02
+2114.23 , 1438.52 , -1497.83
+2265.33 , 1342.60 , -1397.96
+2416.42 , 1258.71 , -1310.61
+2567.52 , 1184.66 , -1233.50
+2718.25 , 1118.82 , -1164.95
+2869.34 , 1059.96 , -1103.66
+3020.44 , 1006.95 , -1048.47
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag.viepcd b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..841a118a18b289b3d124302d4931e8de455c6793
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -8.02
+15.10 , -8.28
+151.02 , -10.62
+302.05 , -13.22
+453.07 , -15.82
+604.09 , -18.45
+755.11 , -21.05
+906.14 , -23.65
+1057.16 , -26.25
+1208.18 , -28.85
+1359.21 , -31.48
+1510.23 , -34.08
+1661.25 , -36.68
+1812.28 , -39.28
+1963.30 , -41.88
+2114.32 , -44.51
+2265.34 , -47.11
+2416.37 , -49.71
+2567.39 , -52.31
+2718.41 , -54.91
+2869.44 , -57.54
+3020.46 , -60.14
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag1.viepcd b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag1.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..69fa4188eac5b7a1325b80e75dcd3b202e9afd60
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag1.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -24.84
+4.98 , -25.62
+49.80 , -32.89
+99.59 , -40.94
+149.39 , -48.99
+199.18 , -57.13
+248.98 , -65.18
+298.77 , -73.23
+348.57 , -81.28
+398.37 , -89.33
+448.16 , -97.47
+497.96 , -105.52
+547.75 , -113.57
+597.55 , -121.62
+647.35 , -129.67
+697.14 , -137.81
+746.94 , -145.86
+796.73 , -153.91
+846.53 , -161.96
+896.32 , -170.01
+946.12 , -178.15
+995.92 , -186.20
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag2.viepcd b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag2.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..ffb4883b312afeed23be5a96783b2b92e3c03bed
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_Gbx3_drag2.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -13.76
+8.90 , -14.19
+88.99 , -18.22
+177.98 , -22.67
+266.97 , -27.13
+355.96 , -31.64
+444.95 , -36.10
+533.94 , -40.56
+622.93 , -45.01
+711.92 , -49.47
+800.91 , -53.98
+889.90 , -58.44
+978.89 , -62.89
+1067.88 , -67.35
+1156.87 , -71.81
+1245.86 , -76.32
+1334.85 , -80.78
+1423.84 , -85.23
+1512.83 , -89.69
+1601.82 , -94.15
+1690.81 , -98.66
+1779.80 , -103.11
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_3speed_PTO.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_3speed_PTO.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..ec266b20cc3dc2fc8c20f670fae33786d01c5ab8
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_3speed_PTO.vecto
@@ -0,0 +1,45 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 9
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "BatteryElectricVehicle.vveh",
+ "GearboxFile": "3speedEV.vgbx",
+ "TCU": "3speedEV.vgbx",
+ "Padd_electric": 3540.0,
+
+ "VACC": "Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "MunicipalUtility",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle.vveh
index 87c91d06aeb4ea0e100a6964bbe28b5fe8239b70..880bb724f08f6bf9341db6ce4c3aaa8b3075da7a 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle.vveh
@@ -78,7 +78,7 @@
"EcoRoll": "None",
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
- "CdxA": 4.83,
+ "CdA": 4.83,
"VehicleHeight": 3.0
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle_Cont30kW.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle_Cont30kW.vveh
index 5b4fb6ac9a57ab7d750a1fa98d2d308aa59a7f2e..940dd8d01bf8f5e96ae78074802e1e8eefb54b5a 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle_Cont30kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle_Cont30kW.vveh
@@ -78,7 +78,7 @@
"EcoRoll": "None",
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
- "CdxA": 4.83,
+ "CdA": 4.83,
"VehicleHeight": 3.0
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle_PTO.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle_PTO.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..145ccc032357d469223b51e91e879da92ef666bf
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BatteryElectricVehicle_PTO.vveh
@@ -0,0 +1,90 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 10
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "BatteryElectric",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "ElectricMotors": [
+ {
+ "Count": 2,
+ "Ratio": 2,
+ "MechanicalEfficiency": 0.97,
+ "Position": "B2",
+ "MotorFile": "GenericEMotor_125kW_485Nm.vem"
+ }
+ ],
+ "Battery": {
+ "NumPacks": 2,
+ "BatteryFile": "GenericBattery_243kWh_750V.vbat"
+ },
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "PTO": {
+ "Type": "drive shaft and/or up to 2 gear wheels - multi-disc clutch, oil pump",
+ "LossMap": "PTO-idle.vptol",
+ "Cycle": "",
+ "CycleDriving": ""
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/PTO-idle.vptol b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/PTO-idle.vptol
new file mode 100644
index 0000000000000000000000000000000000000000..7d1bdd293625e7cbbfc19603ecffe142ebbf60fe
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/PTO-idle.vptol
@@ -0,0 +1,15 @@
+Engine speed,PTO Torque
+# [rpm],[Nm]
+600,8.04746666666667
+800,11.4109530864198
+1000,15.4686419753086
+1200,20.2205333333333
+1400,25.6666271604938
+1600,31.8069234567901
+1800,38.6414222222222
+2000,46.1701234567901
+2200,54.3930271604938
+2400,63.3101333333333
+2600,72.9214419753087
+2800,83.2269530864197
+3000,94.2266666666667
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle.vveh
index 5236c113c09d8aac648f7b9c6c3473eadf8f175e..40f7f08ce9c3f977d7627701f0f66d4c886b4537 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle.vveh
@@ -13,7 +13,7 @@
"CurbWeightExtra": 1900.0,
"Loading": 3020.0,
"MassMax": 11.99,
- "CdxA": 4.83,
+ "CdA": 4.83,
"rdyn": 421.0,
"PowertrainConfiguration": "BatteryElectric",
"CdCorrMode": "CdofVdecl",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle_Cont30kW.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle_Cont30kW.vveh
index 5295910edae375220e5cbe575a9b94443b3ffad7..12adf968708e781f847be2b414df1ff6e5687791 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle_Cont30kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BatteryElectricVehicle_Cont30kW.vveh
@@ -78,7 +78,7 @@
"EcoRoll": "None",
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
- "CdxA": 4.83,
+ "CdA": 4.83,
"VehicleHeight": 3.0
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle.vveh
index f99a29f3ab8ec7bb395b11952d7d315057f3d598..74503285f56623bf66d9895d7ce51bc40e79cd61 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle.vveh
@@ -78,7 +78,7 @@
"EcoRoll": "None",
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
- "CdxA": 4.83,
+ "CdA": 4.83,
"VehicleHeight": 3.0
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle_Cont30kW.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle_Cont30kW.vveh
index 206d360c913e1011f878574dc02a3dd7f6ba235d..86df6d1a341876a4c80fc19b81c3e2ec0d853ad4 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle_Cont30kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB4/BatteryElectricVehicle_Cont30kW.vveh
@@ -78,7 +78,7 @@
"EcoRoll": "None",
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
- "CdxA": 4.83,
+ "CdA": 4.83,
"VehicleHeight": 3.0
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/IEPC/GenericDrag.viepcd b/VectoCore/VectoCoreTest/TestData/BatteryElectric/IEPC/GenericDrag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..314a3b4215bb1aa40d2cff6c8ce1d423f740eeff
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/IEPC/GenericDrag.viepcd
@@ -0,0 +1,11 @@
+n [rpm] , T_drag [Nm]
+0, -1.89
+37, -2.01
+370, -3.02
+740, -4.14
+1110, -5.26
+1480, -6.38
+1850, -7.5
+2220, -8.62
+2590, -9.74
+
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/IEPC/GenericFld.viepcp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/IEPC/GenericFld.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d7a681028a9a2a69ef89f14bd1b89e4ae5792efc
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/IEPC/GenericFld.viepcp
@@ -0,0 +1,13 @@
+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0, 1030.00, -1030.00
+37, 1030.00, -1030.00
+370, 1030.00, -1030.00
+740, 1030.00, -1030.00
+1110, 1030.00, -1030.00
+1480, 1030.00, -1030.00
+1850, 1030.00, -1030.00
+2220, 858.33, -858.33
+2590, 735.71, -735.71
+
+
+
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/IEPC/GenericIEPC.viepc b/VectoCore/VectoCoreTest/TestData/BatteryElectric/IEPC/GenericIEPC.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..78bd0500f2b6f975998f79b7e7ba894ef7265ca5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/IEPC/GenericIEPC.viepc
@@ -0,0 +1,69 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.15,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 3.2,
+ "MaxOutShaftTorque": 10000,
+ "MaxOutShaftSpeed": 5000
+ },
+ {
+ "Ratio": 1.6,
+ "MaxOutShaftTorque": 10000,
+ "MaxOutShaftSpeed": 5000
+ },
+ {
+ "Ratio": 1.6,
+ "MaxOutShaftTorque": 10000,
+ "MaxOutShaftSpeed": 5000
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 400,
+ "ContinuousTorque": 200,
+ "ContinuousTorqueSpeed": 2000,
+ "OverloadTorque": 500,
+ "OverloadTorqueSpeed": 2000,
+ "OverloadTime": 60,
+ "FullLoadCurve": "GenericFld.viepcp",
+ "PowerMaps": {
+ "1": "GenericPowerMap.viepco",
+ "2": "GenericPowerMap.viepco",
+ "3": "GenericPowerMap.viepco"
+ }
+ },
+ {
+ "Voltage": 800,
+ "ContinuousTorque": 200,
+ "ContinuousTorqueSpeed": 2000,
+ "OverloadTorque": 500,
+ "OverloadTorqueSpeed": 2000,
+ "OverloadTime": 60,
+ "FullLoadCurve": "GenericFld.viepcp",
+ "PowerMaps": {
+ "1": "GenericPowerMap.viepco",
+ "2": "GenericPowerMap.viepco",
+ "3": "GenericPowerMap.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "GenericDrag.viepcd",
+ "2": "GenericDrag.viepcd",
+ "3": "GenericDrag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/IEPC/GenericPowerMap.viepco b/VectoCore/VectoCoreTest/TestData/BatteryElectric/IEPC/GenericPowerMap.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..2cc4c716211c5f1847b8dd7e5a7ec77f5ee757d3
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/IEPC/GenericPowerMap.viepco
@@ -0,0 +1,379 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00,-1030.00,0.000
+0.00,-978.50,0.000
+0.00,-927.00,0.000
+0.00,-875.50,0.000
+0.00,-824.00,0.000
+0.00,-772.50,0.000
+0.00,-721.00,-0.220
+0.00,-669.50,-0.510
+0.00,-618.00,-0.671
+0.00,-566.50,-0.765
+0.00,-515.00,-0.813
+0.00,-463.50,-0.826
+0.00,-412.00,-0.811
+0.00,-360.50,-0.771
+0.00,-309.00,-0.710
+0.00,-257.50,-0.629
+0.00,-206.00,-0.531
+0.00,-154.50,-0.416
+0.00,-103.00,-0.287
+0.00,-51.50,-0.143
+0.00,-10.30,-0.015
+0.00,10.30,0.059
+0.00,51.50,0.264
+0.00,103.00,0.527
+0.00,154.50,0.800
+0.00,206.00,1.080
+0.00,257.50,1.370
+0.00,309.00,1.667
+0.00,360.50,1.972
+0.00,412.00,2.285
+0.00,463.50,2.606
+0.00,515.00,2.935
+0.00,566.50,3.270
+0.00,618.00,3.613
+0.00,669.50,3.964
+0.00,721.00,4.321
+0.00,772.50,4.685
+0.00,824.00,5.056
+0.00,875.50,5.433
+0.00,927.00,5.818
+0.00,978.50,6.209
+0.00,1030.00,6.606
+37.00,-1030.00,0.000
+37.00,-978.50,0.000
+37.00,-927.00,0.000
+37.00,-875.50,0.000
+37.00,-824.00,0.000
+37.00,-772.50,0.000
+37.00,-721.00,-0.447
+37.00,-669.50,-0.678
+37.00,-618.00,-0.798
+37.00,-566.50,-0.860
+37.00,-515.00,-0.883
+37.00,-463.50,-0.876
+37.00,-412.00,-0.845
+37.00,-360.50,-0.792
+37.00,-309.00,-0.721
+37.00,-257.50,-0.633
+37.00,-206.00,-0.530
+37.00,-154.50,-0.413
+37.00,-103.00,-0.283
+37.00,-51.50,-0.141
+37.00,-10.30,-0.015
+37.00,10.30,0.055
+37.00,51.50,0.248
+37.00,103.00,0.495
+37.00,154.50,0.749
+37.00,206.00,1.011
+37.00,257.50,1.280
+37.00,309.00,1.556
+37.00,360.50,1.840
+37.00,412.00,2.129
+37.00,463.50,2.426
+37.00,515.00,2.729
+37.00,566.50,3.039
+37.00,618.00,3.355
+37.00,669.50,3.677
+37.00,721.00,4.005
+37.00,772.50,4.340
+37.00,824.00,4.680
+37.00,875.50,5.026
+37.00,927.00,5.378
+37.00,978.50,5.735
+37.00,1030.00,6.098
+370.00,-1030.00,-36.344
+370.00,-978.50,-34.617
+370.00,-927.00,-32.881
+370.00,-875.50,-31.134
+370.00,-824.00,-29.376
+370.00,-772.50,-27.609
+370.00,-721.00,-25.831
+370.00,-669.50,-24.043
+370.00,-618.00,-22.244
+370.00,-566.50,-20.436
+370.00,-515.00,-18.617
+370.00,-463.50,-16.789
+370.00,-412.00,-14.950
+370.00,-360.50,-13.102
+370.00,-309.00,-11.244
+370.00,-257.50,-9.375
+370.00,-206.00,-7.497
+370.00,-154.50,-5.609
+370.00,-103.00,-3.711
+370.00,-51.50,-1.802
+370.00,-10.30,-0.248
+370.00,10.30,0.515
+370.00,51.50,2.185
+370.00,103.00,4.271
+370.00,154.50,6.366
+370.00,206.00,8.470
+370.00,257.50,10.584
+370.00,309.00,12.707
+370.00,360.50,14.839
+370.00,412.00,16.982
+370.00,463.50,19.133
+370.00,515.00,21.294
+370.00,566.50,23.465
+370.00,618.00,25.644
+370.00,669.50,27.833
+370.00,721.00,30.032
+370.00,772.50,32.239
+370.00,824.00,34.456
+370.00,875.50,36.682
+370.00,927.00,38.918
+370.00,978.50,41.162
+370.00,1030.00,43.415
+740.00,-1030.00,-74.961
+740.00,-978.50,-71.312
+740.00,-927.00,-67.651
+740.00,-875.50,-63.979
+740.00,-824.00,-60.294
+740.00,-772.50,-56.597
+740.00,-721.00,-52.889
+740.00,-669.50,-49.169
+740.00,-618.00,-45.436
+740.00,-566.50,-41.693
+740.00,-515.00,-37.937
+740.00,-463.50,-34.170
+740.00,-412.00,-30.391
+740.00,-360.50,-26.600
+740.00,-309.00,-22.798
+740.00,-257.50,-18.984
+740.00,-206.00,-15.158
+740.00,-154.50,-11.321
+740.00,-103.00,-7.471
+740.00,-51.50,-3.607
+740.00,-10.30,-0.452
+740.00,10.30,1.051
+740.00,51.50,4.367
+740.00,103.00,8.495
+740.00,154.50,12.632
+740.00,206.00,16.780
+740.00,257.50,20.940
+740.00,309.00,25.111
+740.00,360.50,29.294
+740.00,412.00,33.488
+740.00,463.50,37.693
+740.00,515.00,41.910
+740.00,566.50,46.139
+740.00,618.00,50.379
+740.00,669.50,54.630
+740.00,721.00,58.893
+740.00,772.50,63.167
+740.00,824.00,67.452
+740.00,875.50,71.749
+740.00,927.00,76.057
+740.00,978.50,80.377
+740.00,1030.00,84.707
+1110.00,-1030.00,-113.264
+1110.00,-978.50,-107.719
+1110.00,-927.00,-102.159
+1110.00,-875.50,-96.584
+1110.00,-824.00,-90.994
+1110.00,-772.50,-85.390
+1110.00,-721.00,-79.770
+1110.00,-669.50,-74.136
+1110.00,-618.00,-68.486
+1110.00,-566.50,-62.822
+1110.00,-515.00,-57.144
+1110.00,-463.50,-51.450
+1110.00,-412.00,-45.742
+1110.00,-360.50,-40.018
+1110.00,-309.00,-34.281
+1110.00,-257.50,-28.528
+1110.00,-206.00,-22.760
+1110.00,-154.50,-16.978
+1110.00,-103.00,-11.179
+1110.00,-51.50,-5.359
+1110.00,-10.30,-0.563
+1110.00,10.30,1.626
+1110.00,51.50,6.595
+1110.00,103.00,12.768
+1110.00,154.50,18.951
+1110.00,206.00,25.148
+1110.00,257.50,31.359
+1110.00,309.00,37.584
+1110.00,360.50,43.824
+1110.00,412.00,50.078
+1110.00,463.50,56.347
+1110.00,515.00,62.631
+1110.00,566.50,68.929
+1110.00,618.00,75.242
+1110.00,669.50,81.569
+1110.00,721.00,87.911
+1110.00,772.50,94.268
+1110.00,824.00,100.638
+1110.00,875.50,107.024
+1110.00,927.00,113.423
+1110.00,978.50,119.838
+1110.00,1030.00,126.266
+1480.00,-1030.00,-151.257
+1480.00,-978.50,-143.841
+1480.00,-927.00,-136.405
+1480.00,-875.50,-128.950
+1480.00,-824.00,-121.475
+1480.00,-772.50,-113.982
+1480.00,-721.00,-106.469
+1480.00,-669.50,-98.937
+1480.00,-618.00,-91.386
+1480.00,-566.50,-83.815
+1480.00,-515.00,-76.226
+1480.00,-463.50,-68.618
+1480.00,-412.00,-60.990
+1480.00,-360.50,-53.344
+1480.00,-309.00,-45.678
+1480.00,-257.50,-37.993
+1480.00,-206.00,-30.289
+1480.00,-154.50,-22.565
+1480.00,-103.00,-14.819
+1480.00,-51.50,-7.042
+1480.00,-10.30,-0.493
+1480.00,10.30,2.246
+1480.00,51.50,8.883
+1480.00,103.00,17.106
+1480.00,154.50,25.338
+1480.00,206.00,33.588
+1480.00,257.50,41.855
+1480.00,309.00,50.141
+1480.00,360.50,58.446
+1480.00,412.00,66.770
+1480.00,463.50,75.112
+1480.00,515.00,83.474
+1480.00,566.50,91.854
+1480.00,618.00,100.253
+1480.00,669.50,108.671
+1480.00,721.00,117.108
+1480.00,772.50,125.563
+1480.00,824.00,134.038
+1480.00,875.50,142.531
+1480.00,927.00,151.043
+1480.00,978.50,159.573
+1480.00,1030.00,168.122
+1850.00,-1030.00,-188.930
+1850.00,-978.50,-179.665
+1850.00,-927.00,-170.376
+1850.00,-875.50,-161.062
+1850.00,-824.00,-151.723
+1850.00,-772.50,-142.360
+1850.00,-721.00,-132.971
+1850.00,-669.50,-123.558
+1850.00,-618.00,-114.120
+1850.00,-566.50,-104.657
+1850.00,-515.00,-95.170
+1850.00,-463.50,-85.659
+1850.00,-412.00,-76.122
+1850.00,-360.50,-66.561
+1850.00,-309.00,-56.976
+1850.00,-257.50,-47.365
+1850.00,-206.00,-37.729
+1850.00,-154.50,-28.067
+1850.00,-103.00,-18.376
+1850.00,-51.50,-8.638
+1850.00,-10.30,0.000
+1850.00,10.30,2.921
+1850.00,51.50,11.243
+1850.00,103.00,21.520
+1850.00,154.50,31.807
+1850.00,206.00,42.113
+1850.00,257.50,52.443
+1850.00,309.00,62.797
+1850.00,360.50,73.174
+1850.00,412.00,83.576
+1850.00,463.50,94.003
+1850.00,515.00,104.453
+1850.00,566.50,114.928
+1850.00,618.00,125.427
+1850.00,669.50,135.950
+1850.00,721.00,146.498
+1850.00,772.50,157.070
+1850.00,824.00,167.666
+1850.00,875.50,178.286
+1850.00,927.00,188.931
+1850.00,978.50,199.599
+1850.00,1030.00,210.291
+2220.00,-1030.00,-226.266
+2220.00,-978.50,-215.178
+2220.00,-927.00,-204.058
+2220.00,-875.50,-192.907
+2220.00,-824.00,-181.723
+2220.00,-772.50,-170.509
+2220.00,-721.00,-159.262
+2220.00,-669.50,-147.984
+2220.00,-618.00,-136.675
+2220.00,-566.50,-125.334
+2220.00,-515.00,-113.962
+2220.00,-463.50,-102.558
+2220.00,-412.00,-91.123
+2220.00,-360.50,-79.656
+2220.00,-309.00,-68.158
+2220.00,-257.50,-56.628
+2220.00,-206.00,-45.066
+2220.00,-154.50,-33.469
+2220.00,-103.00,-21.833
+2220.00,-51.50,-10.128
+2220.00,-10.30,0.000
+2220.00,10.30,3.656
+2220.00,51.50,13.687
+2220.00,103.00,26.025
+2220.00,154.50,38.369
+2220.00,206.00,50.739
+2220.00,257.50,63.137
+2220.00,309.00,75.565
+2220.00,360.50,88.023
+2220.00,412.00,100.512
+2220.00,463.50,113.032
+2220.00,515.00,125.583
+2220.00,566.50,138.165
+2220.00,618.00,150.778
+2220.00,669.50,163.421
+2220.00,721.00,176.096
+2220.00,772.50,188.801
+2220.00,824.00,201.537
+2220.00,875.50,214.304
+2220.00,927.00,227.101
+2220.00,978.50,239.929
+2220.00,1030.00,252.787
+2590.00,-1030.00,-263.249
+2590.00,-978.50,-250.362
+2590.00,-927.00,-237.434
+2590.00,-875.50,-224.467
+2590.00,-824.00,-211.460
+2590.00,-772.50,-198.413
+2590.00,-721.00,-185.327
+2590.00,-669.50,-172.200
+2590.00,-618.00,-159.035
+2590.00,-566.50,-145.830
+2590.00,-515.00,-132.585
+2590.00,-463.50,-119.301
+2590.00,-412.00,-105.977
+2590.00,-360.50,-92.614
+2590.00,-309.00,-79.211
+2590.00,-257.50,-65.768
+2590.00,-206.00,-52.283
+2590.00,-154.50,-38.755
+2590.00,-103.00,-25.173
+2590.00,-51.50,-11.490
+2590.00,-10.30,0.000
+2590.00,10.30,4.457
+2590.00,51.50,16.224
+2590.00,103.00,30.631
+2590.00,154.50,45.039
+2590.00,206.00,59.477
+2590.00,257.50,73.949
+2590.00,309.00,88.458
+2590.00,360.50,103.005
+2590.00,412.00,117.591
+2590.00,463.50,132.215
+2590.00,515.00,146.877
+2590.00,566.50,161.579
+2590.00,618.00,176.319
+2590.00,669.50,191.097
+2590.00,721.00,205.914
+2590.00,772.50,220.770
+2590.00,824.00,235.664
+2590.00,875.50,250.596
+2590.00,927.00,265.567
+2590.00,978.50,280.576
+2590.00,1030.00,295.623
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/209kW_7c7l.veng
new file mode 100644
index 0000000000000000000000000000000000000000..55c93808f6660bfaa906083b1dc6182899876c89
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/209kW_7c7l.veng
@@ -0,0 +1,35 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-06-17T07:29:46.1581600Z",
+ "AppVersion": "3",
+ "FileVersion": 5
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "209kW 7.7l Engine",
+ "Displacement": "7700",
+ "IdlingSpeed": 600.0,
+ "Inertia": 3.33,
+ "Fuels": [
+ {
+ "WHTC-Urban": 0.0,
+ "WHTC-Rural": 0.0,
+ "WHTC-Motorway": 0.0,
+ "WHTC-Engineering": 1.0090832895,
+ "ColdHotBalancingFactor": 0.0,
+ "CFRegPer": 1.0,
+ "FuelMap": "209kW_ICE_Map.vmap",
+ "FuelType": "DieselCI"
+ }
+ ],
+ "RatedPower": 209000,
+ "RatedSpeed": 2550.0,
+ "MaxTorque": 1100,
+ "FullLoadCurve": "209kW_ICE_fld.vfld",
+ "WHRType": [
+ "None"
+ ],
+ "WHRCorrectionFactors": {}
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/209kW_ICE_Map.vmap b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/209kW_ICE_Map.vmap
new file mode 100644
index 0000000000000000000000000000000000000000..10f19d740cea49453b2c50171533dabc94912974
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/209kW_ICE_Map.vmap
@@ -0,0 +1,163 @@
+engine speed [rpm], torque [Nm], fuel consumption [g/h]
+600.00,0.00,648.214
+600.00,68.85,1626.915
+600.00,98.35,2053.103
+600.00,195.48,3383.983
+600.00,293.83,4726.347
+600.00,392.18,6058.504
+600.00,489.31,8107.779
+600.00,587.66,10186.402
+600.00,684.78,12239.042
+600.00,783.14,14317.665
+600.00,881.49,16396.288
+600.00,978.61,18448.929
+600.00,1076.96,20527.552
+600.00,1175.32,22606.175
+851.61,0.00,928.937
+851.61,64.67,1892.325
+851.61,92.39,2405.282
+851.61,183.63,4070.477
+851.61,276.02,5758.641
+851.61,368.41,7453.185
+851.61,459.65,9663.237
+851.61,552.04,11837.561
+851.61,643.28,13995.297
+851.61,735.67,16050.952
+851.61,828.06,18103.130
+851.61,919.30,20129.657
+851.61,1011.69,22181.836
+851.61,1104.09,24234.015
+1103.23,0.00,1209.659
+1103.23,62.41,2157.736
+1103.23,89.15,2758.737
+1103.23,177.19,4758.248
+1103.23,266.34,6792.210
+1103.23,355.49,8847.865
+1103.23,443.52,11219.971
+1103.23,532.67,13488.720
+1103.23,620.71,15726.845
+1103.23,709.86,17966.245
+1103.23,799.01,20229.890
+1103.23,887.05,22492.259
+1103.23,976.20,24743.508
+1103.23,1065.35,26994.757
+1354.84,0.00,1490.382
+1354.84,60.98,2421.870
+1354.84,87.11,3112.193
+1354.84,173.14,5444.742
+1354.84,260.25,7824.504
+1354.84,347.36,10242.546
+1354.84,433.39,12776.705
+1354.84,520.50,15141.155
+1354.84,606.52,17457.117
+1354.84,693.63,19881.539
+1354.84,780.75,22341.689
+1354.84,866.77,24801.840
+1354.84,953.88,27249.231
+1354.84,1041.00,30075.597
+1606.45,0.00,1964.218
+1606.45,60.00,2898.713
+1606.45,85.71,3701.160
+1606.45,170.35,6375.138
+1606.45,256.07,9132.915
+1606.45,341.78,11916.086
+1606.45,426.42,14629.424
+1606.45,512.14,17373.235
+1606.45,596.78,20240.205
+1606.45,682.49,23084.322
+1606.45,768.20,25784.963
+1606.45,852.85,28443.704
+1606.45,938.56,31162.121
+1606.45,1024.27,33987.192
+1858.06,0.00,2405.472
+1858.06,59.28,3395.960
+1858.06,84.69,4296.748
+1858.06,168.33,7298.534
+1858.06,253.02,10456.979
+1858.06,337.71,13614.161
+1858.06,421.35,16806.717
+1858.06,506.04,19948.738
+1858.06,589.67,23098.339
+1858.06,674.37,26265.628
+1858.06,759.06,29333.109
+1858.06,842.69,32242.669
+1858.06,927.39,35435.225
+1858.06,1012.08,38645.468
+2109.68,0.00,2908.296
+2109.68,58.74,4008.698
+2109.68,83.92,4995.396
+2109.68,166.78,8282.706
+2109.68,250.70,11854.275
+2109.68,334.61,15399.314
+2109.68,417.48,18962.040
+2109.68,501.40,22400.954
+2109.68,584.26,25903.038
+2109.68,668.18,29565.571
+2109.68,752.10,33148.511
+2109.68,834.96,36787.039
+2109.68,918.88,40596.124
+2109.68,1002.79,44447.432
+2361.29,0.00,3517.244
+2361.29,58.31,4836.211
+2361.29,83.30,5889.868
+2361.29,165.57,9403.322
+2361.29,248.87,13398.123
+2361.29,332.18,17295.644
+2361.29,414.44,21267.704
+2361.29,497.74,25214.497
+2361.29,580.01,29106.965
+2361.29,663.31,33230.630
+2361.29,746.62,37409.885
+2361.29,828.88,41464.064
+2361.29,912.18,45307.994
+2361.29,995.49,49151.923
+2612.90,0.00,4272.744
+2612.90,57.97,5567.707
+2612.90,82.81,6727.488
+2612.90,164.59,10597.214
+2612.90,247.40,14941.971
+2612.90,330.21,19262.724
+2612.90,411.98,23531.678
+2612.90,494.79,27996.455
+2612.90,576.57,32694.958
+2612.90,659.38,37346.716
+2612.90,742.19,41862.028
+2612.90,823.97,46367.264
+2612.90,906.78,50929.527
+2612.90,989.59,55491.791
+2864.52,0.00,4975.182
+2864.52,57.68,6271.408
+2864.52,82.40,7570.161
+2864.52,163.78,11901.020
+2864.52,246.18,16541.408
+2864.52,328.59,21435.734
+2864.52,409.96,26482.929
+2864.52,492.36,31523.807
+2864.52,573.74,36936.118
+2864.52,656.14,42358.536
+2864.52,738.54,47310.978
+2864.52,819.92,52201.514
+2864.52,902.32,57153.955
+2864.52,984.73,62106.397
+535.00,-48.25,0.000
+795.00,-53.16,0.000
+1055.00,-59.37,0.000
+1315.00,-66.29,0.000
+1575.00,-73.79,0.000
+1835.00,-81.42,0.000
+2095.00,-88.73,0.000
+2355.00,-95.54,0.000
+2615.00,-102.74,0.000
+2875.00,-110.97,0.000
+3005.00,-115.10,0.000
+535.00,-117.19,0.000
+795.00,-115.02,0.000
+1055.00,-117.63,0.000
+1315.00,-122.38,0.000
+1575.00,-128.43,0.000
+1835.00,-135.02,0.000
+2095.00,-141.54,0.000
+2355.00,-147.74,0.000
+2615.00,-154.45,0.000
+2875.00,-162.29,0.000
+3005.00,-166.24,0.000
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/209kW_ICE_fld.vfld b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/209kW_ICE_fld.vfld
new file mode 100644
index 0000000000000000000000000000000000000000..9fa844476ee0a96a2063e146c0d48bc6b19b5798
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/209kW_ICE_fld.vfld
@@ -0,0 +1,7 @@
+engine speed [1/min], full load torque [Nm], motoring torque [Nm]
+600.00,385.00,-55.851
+1321.50,1100.00,-61.072
+1867.50,1100.00,-75.131
+2550.00,782.67,-97.074
+3291.00,0.00,-144.231
+
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/Gen_Map.vemo b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/Gen_Map.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..2cc4c716211c5f1847b8dd7e5a7ec77f5ee757d3
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/Gen_Map.vemo
@@ -0,0 +1,379 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00,-1030.00,0.000
+0.00,-978.50,0.000
+0.00,-927.00,0.000
+0.00,-875.50,0.000
+0.00,-824.00,0.000
+0.00,-772.50,0.000
+0.00,-721.00,-0.220
+0.00,-669.50,-0.510
+0.00,-618.00,-0.671
+0.00,-566.50,-0.765
+0.00,-515.00,-0.813
+0.00,-463.50,-0.826
+0.00,-412.00,-0.811
+0.00,-360.50,-0.771
+0.00,-309.00,-0.710
+0.00,-257.50,-0.629
+0.00,-206.00,-0.531
+0.00,-154.50,-0.416
+0.00,-103.00,-0.287
+0.00,-51.50,-0.143
+0.00,-10.30,-0.015
+0.00,10.30,0.059
+0.00,51.50,0.264
+0.00,103.00,0.527
+0.00,154.50,0.800
+0.00,206.00,1.080
+0.00,257.50,1.370
+0.00,309.00,1.667
+0.00,360.50,1.972
+0.00,412.00,2.285
+0.00,463.50,2.606
+0.00,515.00,2.935
+0.00,566.50,3.270
+0.00,618.00,3.613
+0.00,669.50,3.964
+0.00,721.00,4.321
+0.00,772.50,4.685
+0.00,824.00,5.056
+0.00,875.50,5.433
+0.00,927.00,5.818
+0.00,978.50,6.209
+0.00,1030.00,6.606
+37.00,-1030.00,0.000
+37.00,-978.50,0.000
+37.00,-927.00,0.000
+37.00,-875.50,0.000
+37.00,-824.00,0.000
+37.00,-772.50,0.000
+37.00,-721.00,-0.447
+37.00,-669.50,-0.678
+37.00,-618.00,-0.798
+37.00,-566.50,-0.860
+37.00,-515.00,-0.883
+37.00,-463.50,-0.876
+37.00,-412.00,-0.845
+37.00,-360.50,-0.792
+37.00,-309.00,-0.721
+37.00,-257.50,-0.633
+37.00,-206.00,-0.530
+37.00,-154.50,-0.413
+37.00,-103.00,-0.283
+37.00,-51.50,-0.141
+37.00,-10.30,-0.015
+37.00,10.30,0.055
+37.00,51.50,0.248
+37.00,103.00,0.495
+37.00,154.50,0.749
+37.00,206.00,1.011
+37.00,257.50,1.280
+37.00,309.00,1.556
+37.00,360.50,1.840
+37.00,412.00,2.129
+37.00,463.50,2.426
+37.00,515.00,2.729
+37.00,566.50,3.039
+37.00,618.00,3.355
+37.00,669.50,3.677
+37.00,721.00,4.005
+37.00,772.50,4.340
+37.00,824.00,4.680
+37.00,875.50,5.026
+37.00,927.00,5.378
+37.00,978.50,5.735
+37.00,1030.00,6.098
+370.00,-1030.00,-36.344
+370.00,-978.50,-34.617
+370.00,-927.00,-32.881
+370.00,-875.50,-31.134
+370.00,-824.00,-29.376
+370.00,-772.50,-27.609
+370.00,-721.00,-25.831
+370.00,-669.50,-24.043
+370.00,-618.00,-22.244
+370.00,-566.50,-20.436
+370.00,-515.00,-18.617
+370.00,-463.50,-16.789
+370.00,-412.00,-14.950
+370.00,-360.50,-13.102
+370.00,-309.00,-11.244
+370.00,-257.50,-9.375
+370.00,-206.00,-7.497
+370.00,-154.50,-5.609
+370.00,-103.00,-3.711
+370.00,-51.50,-1.802
+370.00,-10.30,-0.248
+370.00,10.30,0.515
+370.00,51.50,2.185
+370.00,103.00,4.271
+370.00,154.50,6.366
+370.00,206.00,8.470
+370.00,257.50,10.584
+370.00,309.00,12.707
+370.00,360.50,14.839
+370.00,412.00,16.982
+370.00,463.50,19.133
+370.00,515.00,21.294
+370.00,566.50,23.465
+370.00,618.00,25.644
+370.00,669.50,27.833
+370.00,721.00,30.032
+370.00,772.50,32.239
+370.00,824.00,34.456
+370.00,875.50,36.682
+370.00,927.00,38.918
+370.00,978.50,41.162
+370.00,1030.00,43.415
+740.00,-1030.00,-74.961
+740.00,-978.50,-71.312
+740.00,-927.00,-67.651
+740.00,-875.50,-63.979
+740.00,-824.00,-60.294
+740.00,-772.50,-56.597
+740.00,-721.00,-52.889
+740.00,-669.50,-49.169
+740.00,-618.00,-45.436
+740.00,-566.50,-41.693
+740.00,-515.00,-37.937
+740.00,-463.50,-34.170
+740.00,-412.00,-30.391
+740.00,-360.50,-26.600
+740.00,-309.00,-22.798
+740.00,-257.50,-18.984
+740.00,-206.00,-15.158
+740.00,-154.50,-11.321
+740.00,-103.00,-7.471
+740.00,-51.50,-3.607
+740.00,-10.30,-0.452
+740.00,10.30,1.051
+740.00,51.50,4.367
+740.00,103.00,8.495
+740.00,154.50,12.632
+740.00,206.00,16.780
+740.00,257.50,20.940
+740.00,309.00,25.111
+740.00,360.50,29.294
+740.00,412.00,33.488
+740.00,463.50,37.693
+740.00,515.00,41.910
+740.00,566.50,46.139
+740.00,618.00,50.379
+740.00,669.50,54.630
+740.00,721.00,58.893
+740.00,772.50,63.167
+740.00,824.00,67.452
+740.00,875.50,71.749
+740.00,927.00,76.057
+740.00,978.50,80.377
+740.00,1030.00,84.707
+1110.00,-1030.00,-113.264
+1110.00,-978.50,-107.719
+1110.00,-927.00,-102.159
+1110.00,-875.50,-96.584
+1110.00,-824.00,-90.994
+1110.00,-772.50,-85.390
+1110.00,-721.00,-79.770
+1110.00,-669.50,-74.136
+1110.00,-618.00,-68.486
+1110.00,-566.50,-62.822
+1110.00,-515.00,-57.144
+1110.00,-463.50,-51.450
+1110.00,-412.00,-45.742
+1110.00,-360.50,-40.018
+1110.00,-309.00,-34.281
+1110.00,-257.50,-28.528
+1110.00,-206.00,-22.760
+1110.00,-154.50,-16.978
+1110.00,-103.00,-11.179
+1110.00,-51.50,-5.359
+1110.00,-10.30,-0.563
+1110.00,10.30,1.626
+1110.00,51.50,6.595
+1110.00,103.00,12.768
+1110.00,154.50,18.951
+1110.00,206.00,25.148
+1110.00,257.50,31.359
+1110.00,309.00,37.584
+1110.00,360.50,43.824
+1110.00,412.00,50.078
+1110.00,463.50,56.347
+1110.00,515.00,62.631
+1110.00,566.50,68.929
+1110.00,618.00,75.242
+1110.00,669.50,81.569
+1110.00,721.00,87.911
+1110.00,772.50,94.268
+1110.00,824.00,100.638
+1110.00,875.50,107.024
+1110.00,927.00,113.423
+1110.00,978.50,119.838
+1110.00,1030.00,126.266
+1480.00,-1030.00,-151.257
+1480.00,-978.50,-143.841
+1480.00,-927.00,-136.405
+1480.00,-875.50,-128.950
+1480.00,-824.00,-121.475
+1480.00,-772.50,-113.982
+1480.00,-721.00,-106.469
+1480.00,-669.50,-98.937
+1480.00,-618.00,-91.386
+1480.00,-566.50,-83.815
+1480.00,-515.00,-76.226
+1480.00,-463.50,-68.618
+1480.00,-412.00,-60.990
+1480.00,-360.50,-53.344
+1480.00,-309.00,-45.678
+1480.00,-257.50,-37.993
+1480.00,-206.00,-30.289
+1480.00,-154.50,-22.565
+1480.00,-103.00,-14.819
+1480.00,-51.50,-7.042
+1480.00,-10.30,-0.493
+1480.00,10.30,2.246
+1480.00,51.50,8.883
+1480.00,103.00,17.106
+1480.00,154.50,25.338
+1480.00,206.00,33.588
+1480.00,257.50,41.855
+1480.00,309.00,50.141
+1480.00,360.50,58.446
+1480.00,412.00,66.770
+1480.00,463.50,75.112
+1480.00,515.00,83.474
+1480.00,566.50,91.854
+1480.00,618.00,100.253
+1480.00,669.50,108.671
+1480.00,721.00,117.108
+1480.00,772.50,125.563
+1480.00,824.00,134.038
+1480.00,875.50,142.531
+1480.00,927.00,151.043
+1480.00,978.50,159.573
+1480.00,1030.00,168.122
+1850.00,-1030.00,-188.930
+1850.00,-978.50,-179.665
+1850.00,-927.00,-170.376
+1850.00,-875.50,-161.062
+1850.00,-824.00,-151.723
+1850.00,-772.50,-142.360
+1850.00,-721.00,-132.971
+1850.00,-669.50,-123.558
+1850.00,-618.00,-114.120
+1850.00,-566.50,-104.657
+1850.00,-515.00,-95.170
+1850.00,-463.50,-85.659
+1850.00,-412.00,-76.122
+1850.00,-360.50,-66.561
+1850.00,-309.00,-56.976
+1850.00,-257.50,-47.365
+1850.00,-206.00,-37.729
+1850.00,-154.50,-28.067
+1850.00,-103.00,-18.376
+1850.00,-51.50,-8.638
+1850.00,-10.30,0.000
+1850.00,10.30,2.921
+1850.00,51.50,11.243
+1850.00,103.00,21.520
+1850.00,154.50,31.807
+1850.00,206.00,42.113
+1850.00,257.50,52.443
+1850.00,309.00,62.797
+1850.00,360.50,73.174
+1850.00,412.00,83.576
+1850.00,463.50,94.003
+1850.00,515.00,104.453
+1850.00,566.50,114.928
+1850.00,618.00,125.427
+1850.00,669.50,135.950
+1850.00,721.00,146.498
+1850.00,772.50,157.070
+1850.00,824.00,167.666
+1850.00,875.50,178.286
+1850.00,927.00,188.931
+1850.00,978.50,199.599
+1850.00,1030.00,210.291
+2220.00,-1030.00,-226.266
+2220.00,-978.50,-215.178
+2220.00,-927.00,-204.058
+2220.00,-875.50,-192.907
+2220.00,-824.00,-181.723
+2220.00,-772.50,-170.509
+2220.00,-721.00,-159.262
+2220.00,-669.50,-147.984
+2220.00,-618.00,-136.675
+2220.00,-566.50,-125.334
+2220.00,-515.00,-113.962
+2220.00,-463.50,-102.558
+2220.00,-412.00,-91.123
+2220.00,-360.50,-79.656
+2220.00,-309.00,-68.158
+2220.00,-257.50,-56.628
+2220.00,-206.00,-45.066
+2220.00,-154.50,-33.469
+2220.00,-103.00,-21.833
+2220.00,-51.50,-10.128
+2220.00,-10.30,0.000
+2220.00,10.30,3.656
+2220.00,51.50,13.687
+2220.00,103.00,26.025
+2220.00,154.50,38.369
+2220.00,206.00,50.739
+2220.00,257.50,63.137
+2220.00,309.00,75.565
+2220.00,360.50,88.023
+2220.00,412.00,100.512
+2220.00,463.50,113.032
+2220.00,515.00,125.583
+2220.00,566.50,138.165
+2220.00,618.00,150.778
+2220.00,669.50,163.421
+2220.00,721.00,176.096
+2220.00,772.50,188.801
+2220.00,824.00,201.537
+2220.00,875.50,214.304
+2220.00,927.00,227.101
+2220.00,978.50,239.929
+2220.00,1030.00,252.787
+2590.00,-1030.00,-263.249
+2590.00,-978.50,-250.362
+2590.00,-927.00,-237.434
+2590.00,-875.50,-224.467
+2590.00,-824.00,-211.460
+2590.00,-772.50,-198.413
+2590.00,-721.00,-185.327
+2590.00,-669.50,-172.200
+2590.00,-618.00,-159.035
+2590.00,-566.50,-145.830
+2590.00,-515.00,-132.585
+2590.00,-463.50,-119.301
+2590.00,-412.00,-105.977
+2590.00,-360.50,-92.614
+2590.00,-309.00,-79.211
+2590.00,-257.50,-65.768
+2590.00,-206.00,-52.283
+2590.00,-154.50,-38.755
+2590.00,-103.00,-25.173
+2590.00,-51.50,-11.490
+2590.00,-10.30,0.000
+2590.00,10.30,4.457
+2590.00,51.50,16.224
+2590.00,103.00,30.631
+2590.00,154.50,45.039
+2590.00,206.00,59.477
+2590.00,257.50,73.949
+2590.00,309.00,88.458
+2590.00,360.50,103.005
+2590.00,412.00,117.591
+2590.00,463.50,132.215
+2590.00,515.00,146.877
+2590.00,566.50,161.579
+2590.00,618.00,176.319
+2590.00,669.50,191.097
+2590.00,721.00,205.914
+2590.00,772.50,220.770
+2590.00,824.00,235.664
+2590.00,875.50,250.596
+2590.00,927.00,265.567
+2590.00,978.50,280.576
+2590.00,1030.00,295.623
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/Gen_drag.vemd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/Gen_drag.vemd
new file mode 100644
index 0000000000000000000000000000000000000000..314a3b4215bb1aa40d2cff6c8ce1d423f740eeff
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/Gen_drag.vemd
@@ -0,0 +1,11 @@
+n [rpm] , T_drag [Nm]
+0, -1.89
+37, -2.01
+370, -3.02
+740, -4.14
+1110, -5.26
+1480, -6.38
+1850, -7.5
+2220, -8.62
+2590, -9.74
+
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/Gen_fld.vemp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/Gen_fld.vemp
new file mode 100644
index 0000000000000000000000000000000000000000..d7a681028a9a2a69ef89f14bd1b89e4ae5792efc
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/Gen_fld.vemp
@@ -0,0 +1,13 @@
+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0, 1030.00, -1030.00
+37, 1030.00, -1030.00
+370, 1030.00, -1030.00
+740, 1030.00, -1030.00
+1110, 1030.00, -1030.00
+1480, 1030.00, -1030.00
+1850, 1030.00, -1030.00
+2220, 858.33, -858.33
+2590, 735.71, -735.71
+
+
+
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/GenericBattery.vbat b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/GenericBattery.vbat
new file mode 100644
index 0000000000000000000000000000000000000000..b196ef74b1bc1895a313960f51f9da24ea3a1b31
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/GenericBattery.vbat
@@ -0,0 +1,18 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic Battery",
+ "InternalResistanceCurve": "GenericBattery.vbatr",
+ "SOC_min": 10,
+ "SOC_max": 90,
+ "MaxCurrentMap": "MaxCurrent.vimax",
+ "Capacity": 68,
+ "SoCCurve": "GenericBattery.vbatv"
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/GenericBattery.vbatr b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/GenericBattery.vbatr
new file mode 100644
index 0000000000000000000000000000000000000000..953f417ac43d9bc1432971034d22d3ab15d5e1a2
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/GenericBattery.vbatr
@@ -0,0 +1,3 @@
+SoC, Ri
+0, 0.04
+100, 0.04
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/GenericBattery.vbatv b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/GenericBattery.vbatv
new file mode 100644
index 0000000000000000000000000000000000000000..28376e3632a1a24d0631665c19822b66f0310257
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/GenericBattery.vbatv
@@ -0,0 +1,12 @@
+SOC, V
+0, 673.5
+10, 700.2
+20, 715.4
+30, 723.6
+40, 727.7
+50, 730.0
+60, 731.6
+70, 733.8
+80, 737.1
+90, 742.2
+100, 750.2
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/GenericGen.vem b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/GenericGen.vem
new file mode 100644
index 0000000000000000000000000000000000000000..8bce454f0ffcf15816a1bb5d813bce93b58a315d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/GenericGen.vem
@@ -0,0 +1,33 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-08-05T14:49:40.5920495Z",
+ "AppVersion": "3",
+ "FileVersion": 3
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic Electric Motor",
+ "Inertia": 0.134,
+ "ContinuousTorque": 798,
+ "ContinuousTorqueSpeed": 1850,
+ "OverloadTorque": 1030,
+ "OverloadTorqueSpeed": 1850,
+ "OverloadTime": 120,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "VoltageLevels": [
+ {
+ "Voltage": 0.0,
+ "FullLoadCurve": "Gen_fld.vemp",
+ "DragCurve": "Gen_drag.vemd",
+ "EfficiencyMap": "Gen_Map.vemo"
+ },
+ {
+ "Voltage": 1000.0,
+ "FullLoadCurve": "Gen_fld.vemp",
+ "DragCurve": "Gen_drag.vemd",
+ "EfficiencyMap": "Gen_Map.vemo"
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/Hybrid_Parameters.vhctl b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/Hybrid_Parameters.vhctl
new file mode 100644
index 0000000000000000000000000000000000000000..2f2ed814fcff9e24e146e56f0d0ff41378f5a386
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/Hybrid_Parameters.vhctl
@@ -0,0 +1,18 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:28:08.3781385Z",
+ "AppVersion": "3",
+ "FileVersion": 2
+ },
+ "Body": {
+ "----EquivalenceFactor": 2.0,
+ "MinSoC": 24.0,
+ "----MaxSoC": 80.0,
+ "TargetSoC": 70.0,
+ "----AuxBufferTime": 5.0,
+ "----AuxBufferChgTime": 5.0,
+ "----MinICEOnTime": 10.0,
+ "GensetMinOptPowerFactor": 0.2
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/MaxCurrent.vimax
new file mode 100644
index 0000000000000000000000000000000000000000..adf28fb9b5ced83296d2634fc6727e2d1b82357e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/MaxCurrent.vimax
@@ -0,0 +1,3 @@
+SOC, I_charge, I_discharge
+0, 1620, 1620
+100, 1620, 1620
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/ShiftParameters.vtcu b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/ShiftParameters.vtcu
new file mode 100644
index 0000000000000000000000000000000000000000..a26e0e50f9e03240a8ddf18d296b8edbcda8bdcb
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/ShiftParameters.vtcu
@@ -0,0 +1,14 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T15:52:04.0766564Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "Rating_current_gear": 0.995,
+ "RatioEarlyUpshiftFC" : 24,
+ "RatioEarlyDownshiftFC" : 24
+
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/Truck.vacc
new file mode 100644
index 0000000000000000000000000000000000000000..54e77864874d21d67e8f8d69a97b35c5c6031749
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/Common/Truck.vacc
@@ -0,0 +1,6 @@
+v [km/h],acc [m/s²],dec [m/s²]
+0,1,-1
+25,1,-1
+50,0.642857143,-1
+60,0.5,-0.5
+120,0.5,-0.5
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..6e4c104a21b4bf31fa7bc80e95c8c53d69437d5f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": true,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 12.276
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 13860.59,
+ "ContinuousTorqueSpeed": 166.99,
+ "OverloadTorque": 16517.20,
+ "OverloadTorqueSpeed": 166.01,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1Axl_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Axl.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 15015.63,
+ "ContinuousTorqueSpeed": 168.62,
+ "OverloadTorque": 17325.73,
+ "OverloadTorqueSpeed": 170.17,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1Axl_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Axl.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1Axl_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_ENG_Gbx1Axl.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_ENG_Gbx1Axl.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..3a4d93f4e55bb31268825f80295bf5fa14d13d01
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_ENG_Gbx1Axl.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx1Axl.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..66b2094898284f1421a9dc011cadd6657f6903de
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_Vehicle_Gbx1Axl.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1Axl.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_drag.viepcd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..07eb40e197c27c23aea5f69c3200e3b799688102
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC_Gbx1Axl_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -37.45
+3.37 , -38.62
+33.71 , -49.58
+67.42 , -61.71
+101.12 , -73.85
+134.83 , -86.11
+168.54 , -98.24
+202.25 , -110.38
+235.96 , -122.51
+269.67 , -134.65
+303.37 , -146.91
+337.08 , -159.04
+370.79 , -171.18
+404.50 , -183.31
+438.21 , -195.45
+471.92 , -207.71
+505.62 , -219.84
+539.33 , -231.98
+573.04 , -244.11
+606.75 , -256.24
+640.46 , -268.51
+674.17 , -280.64
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/GenericIEPC_Gbx1Whl1.viepc b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/GenericIEPC_Gbx1Whl1.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..5b924aea7e507dab781c6727c70efd7ef3105ee9
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/GenericIEPC_Gbx1Whl1.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 12.276
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 6930.29,
+ "ContinuousTorqueSpeed": 166.99,
+ "OverloadTorque": 8258.60,
+ "OverloadTorqueSpeed": 166.01,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1Whl1_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl1.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 7507.82,
+ "ContinuousTorqueSpeed": 168.62,
+ "OverloadTorque": 8662.87,
+ "OverloadTorqueSpeed": 170.17,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1Whl1_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl1.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1Whl1_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_ENG_Gbx1Whl1.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_ENG_Gbx1Whl1.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..23dc4d8779da2a340976283944f098d7eb74b70f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_ENG_Gbx1Whl1.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx1Whl1.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_Vehicle_Gbx1Whl1.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_Vehicle_Gbx1Whl1.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..cfb13988ce331d1927ea9bfedf3cef81a2563305
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_Vehicle_Gbx1Whl1.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1Whl1.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..b5980ac32ff2f44452666e544ce91c462f5c5a7f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -9785.31 , 0.00
+0.00 , -9296.05 , 0.00
+0.00 , -8806.78 , 0.00
+0.00 , -8317.52 , 0.00
+0.00 , -7828.25 , 0.00
+0.00 , -7338.98 , 0.00
+0.00 , -6849.72 , -0.07
+0.00 , -6360.45 , -0.33
+0.00 , -5871.19 , -0.49
+0.00 , -5381.92 , -0.60
+0.00 , -4892.66 , -0.66
+0.00 , -4403.39 , -0.69
+0.00 , -3914.12 , -0.70
+0.00 , -3424.86 , -0.67
+0.00 , -2935.59 , -0.63
+0.00 , -2446.33 , -0.57
+0.00 , -1957.06 , -0.48
+0.00 , -1467.80 , -0.38
+0.00 , -978.53 , -0.27
+0.00 , -489.27 , -0.13
+0.00 , -97.85 , -0.01
+0.00 , 86.63 , 0.06
+0.00 , 433.14 , 0.28
+0.00 , 866.29 , 0.56
+0.00 , 1299.43 , 0.85
+0.00 , 1732.57 , 1.15
+0.00 , 2165.72 , 1.47
+0.00 , 2598.86 , 1.79
+0.00 , 3032.00 , 2.12
+0.00 , 3465.15 , 2.47
+0.00 , 3898.29 , 2.82
+0.00 , 4331.43 , 3.19
+0.00 , 4764.58 , 3.56
+0.00 , 5197.72 , 3.94
+0.00 , 5630.86 , 4.33
+0.00 , 6064.01 , 4.74
+0.00 , 6497.15 , 5.15
+0.00 , 6930.29 , 5.57
+0.00 , 7363.44 , 6.00
+0.00 , 7796.58 , 6.43
+0.00 , 8229.72 , 6.88
+0.00 , 8662.87 , 7.34
+3.37 , -9785.31 , 0.00
+3.37 , -9296.05 , 0.00
+3.37 , -8806.78 , 0.00
+3.37 , -8317.52 , 0.00
+3.37 , -7828.25 , 0.00
+3.37 , -7338.98 , 0.00
+3.37 , -6849.72 , -0.25
+3.37 , -6360.45 , -0.42
+3.37 , -5871.19 , -0.52
+3.37 , -5381.92 , -0.58
+3.37 , -4892.66 , -0.61
+3.37 , -4403.39 , -0.62
+3.37 , -3914.12 , -0.61
+3.37 , -3424.86 , -0.58
+3.37 , -2935.59 , -0.53
+3.37 , -2446.33 , -0.47
+3.37 , -1957.06 , -0.40
+3.37 , -1467.80 , -0.31
+3.37 , -978.53 , -0.22
+3.37 , -489.27 , -0.11
+3.37 , -97.85 , -0.01
+3.37 , 86.63 , 0.05
+3.37 , 433.14 , 0.21
+3.37 , 866.29 , 0.43
+3.37 , 1299.43 , 0.65
+3.37 , 1732.57 , 0.88
+3.37 , 2165.72 , 1.11
+3.37 , 2598.86 , 1.36
+3.37 , 3032.00 , 1.61
+3.37 , 3465.15 , 1.87
+3.37 , 3898.29 , 2.13
+3.37 , 4331.43 , 2.40
+3.37 , 4764.58 , 2.68
+3.37 , 5197.72 , 2.97
+3.37 , 5630.86 , 3.26
+3.37 , 6064.01 , 3.56
+3.37 , 6497.15 , 3.86
+3.37 , 6930.29 , 4.18
+3.37 , 7363.44 , 4.50
+3.37 , 7796.58 , 4.82
+3.37 , 8229.72 , 5.15
+3.37 , 8662.87 , 5.49
+33.71 , -9785.31 , -29.05
+33.71 , -9296.05 , -27.68
+33.71 , -8806.78 , -26.31
+33.71 , -8317.52 , -24.92
+33.71 , -7828.25 , -23.53
+33.71 , -7338.98 , -22.12
+33.71 , -6849.72 , -20.71
+33.71 , -6360.45 , -19.28
+33.71 , -5871.19 , -17.85
+33.71 , -5381.92 , -16.41
+33.71 , -4892.66 , -14.95
+33.71 , -4403.39 , -13.49
+33.71 , -3914.12 , -12.02
+33.71 , -3424.86 , -10.53
+33.71 , -2935.59 , -9.04
+33.71 , -2446.33 , -7.54
+33.71 , -1957.06 , -6.03
+33.71 , -1467.80 , -4.51
+33.71 , -978.53 , -2.98
+33.71 , -489.27 , -1.44
+33.71 , -97.85 , -0.18
+33.71 , 86.63 , 0.45
+33.71 , 433.14 , 1.84
+33.71 , 866.29 , 3.58
+33.71 , 1299.43 , 5.33
+33.71 , 1732.57 , 7.09
+33.71 , 2165.72 , 8.85
+33.71 , 2598.86 , 10.63
+33.71 , 3032.00 , 12.42
+33.71 , 3465.15 , 14.21
+33.71 , 3898.29 , 16.02
+33.71 , 4331.43 , 17.84
+33.71 , 4764.58 , 19.66
+33.71 , 5197.72 , 21.49
+33.71 , 5630.86 , 23.34
+33.71 , 6064.01 , 25.19
+33.71 , 6497.15 , 27.05
+33.71 , 6930.29 , 28.93
+33.71 , 7363.44 , 30.81
+33.71 , 7796.58 , 32.70
+33.71 , 8229.72 , 34.60
+33.71 , 8662.87 , 36.50
+67.42 , -9785.31 , -60.28
+67.42 , -9296.05 , -57.37
+67.42 , -8806.78 , -54.44
+67.42 , -8317.52 , -51.49
+67.42 , -7828.25 , -48.54
+67.42 , -7338.98 , -45.58
+67.42 , -6849.72 , -42.60
+67.42 , -6360.45 , -39.61
+67.42 , -5871.19 , -36.61
+67.42 , -5381.92 , -33.60
+67.42 , -4892.66 , -30.58
+67.42 , -4403.39 , -27.55
+67.42 , -3914.12 , -24.51
+67.42 , -3424.86 , -21.45
+67.42 , -2935.59 , -18.38
+67.42 , -2446.33 , -15.31
+67.42 , -1957.06 , -12.22
+67.42 , -1467.80 , -9.12
+67.42 , -978.53 , -6.00
+67.42 , -489.27 , -2.88
+67.42 , -97.85 , -0.33
+67.42 , 86.63 , 0.92
+67.42 , 433.14 , 3.68
+67.42 , 866.29 , 7.11
+67.42 , 1299.43 , 10.56
+67.42 , 1732.57 , 14.01
+67.42 , 2165.72 , 17.48
+67.42 , 2598.86 , 20.96
+67.42 , 3032.00 , 24.45
+67.42 , 3465.15 , 27.95
+67.42 , 3898.29 , 31.47
+67.42 , 4331.43 , 34.99
+67.42 , 4764.58 , 38.53
+67.42 , 5197.72 , 42.08
+67.42 , 5630.86 , 45.64
+67.42 , 6064.01 , 49.21
+67.42 , 6497.15 , 52.79
+67.42 , 6930.29 , 56.38
+67.42 , 7363.44 , 59.99
+67.42 , 7796.58 , 63.60
+67.42 , 8229.72 , 67.23
+67.42 , 8662.87 , 70.87
+101.12 , -9785.31 , -91.22
+101.12 , -9296.05 , -86.77
+101.12 , -8806.78 , -82.31
+101.12 , -8317.52 , -77.84
+101.12 , -7828.25 , -73.35
+101.12 , -7338.98 , -68.84
+101.12 , -6849.72 , -64.32
+101.12 , -6360.45 , -59.79
+101.12 , -5871.19 , -55.24
+101.12 , -5381.92 , -50.68
+101.12 , -4892.66 , -46.11
+101.12 , -4403.39 , -41.51
+101.12 , -3914.12 , -36.91
+101.12 , -3424.86 , -32.29
+101.12 , -2935.59 , -27.66
+101.12 , -2446.33 , -23.01
+101.12 , -1957.06 , -18.35
+101.12 , -1467.80 , -13.67
+101.12 , -978.53 , -8.98
+101.12 , -489.27 , -4.27
+101.12 , -97.85 , -0.39
+101.12 , 86.63 , 1.43
+101.12 , 433.14 , 5.56
+101.12 , 866.29 , 10.69
+101.12 , 1299.43 , 15.84
+101.12 , 1732.57 , 21.00
+101.12 , 2165.72 , 26.17
+101.12 , 2598.86 , 31.36
+101.12 , 3032.00 , 36.56
+101.12 , 3465.15 , 41.77
+101.12 , 3898.29 , 47.01
+101.12 , 4331.43 , 52.25
+101.12 , 4764.58 , 57.51
+101.12 , 5197.72 , 62.79
+101.12 , 5630.86 , 68.08
+101.12 , 6064.01 , 73.38
+101.12 , 6497.15 , 78.70
+101.12 , 6930.29 , 84.03
+101.12 , 7363.44 , 89.38
+101.12 , 7796.58 , 94.74
+101.12 , 8229.72 , 100.12
+101.12 , 8662.87 , 105.51
+134.83 , -9785.31 , -121.86
+134.83 , -9296.05 , -115.91
+134.83 , -8806.78 , -109.94
+134.83 , -8317.52 , -103.95
+134.83 , -7828.25 , -97.94
+134.83 , -7338.98 , -91.91
+134.83 , -6849.72 , -85.87
+134.83 , -6360.45 , -79.81
+134.83 , -5871.19 , -73.73
+134.83 , -5381.92 , -67.63
+134.83 , -4892.66 , -61.51
+134.83 , -4403.39 , -55.37
+134.83 , -3914.12 , -49.21
+134.83 , -3424.86 , -43.04
+134.83 , -2935.59 , -36.85
+134.83 , -2446.33 , -30.64
+134.83 , -1957.06 , -24.41
+134.83 , -1467.80 , -18.16
+134.83 , -978.53 , -11.89
+134.83 , -489.27 , -5.59
+134.83 , -97.85 , -0.32
+134.83 , 86.63 , 1.99
+134.83 , 433.14 , 7.50
+134.83 , 866.29 , 14.34
+134.83 , 1299.43 , 21.19
+134.83 , 1732.57 , 28.05
+134.83 , 2165.72 , 34.94
+134.83 , 2598.86 , 41.84
+134.83 , 3032.00 , 48.76
+134.83 , 3465.15 , 55.70
+134.83 , 3898.29 , 62.66
+134.83 , 4331.43 , 69.63
+134.83 , 4764.58 , 76.63
+134.83 , 5197.72 , 83.65
+134.83 , 5630.86 , 90.68
+134.83 , 6064.01 , 97.73
+134.83 , 6497.15 , 104.80
+134.83 , 6930.29 , 111.90
+134.83 , 7363.44 , 119.00
+134.83 , 7796.58 , 126.13
+134.83 , 8229.72 , 133.28
+134.83 , 8662.87 , 140.44
+168.54 , -9785.31 , -152.18
+168.54 , -9296.05 , -144.75
+168.54 , -8806.78 , -137.29
+168.54 , -8317.52 , -129.81
+168.54 , -7828.25 , -122.31
+168.54 , -7338.98 , -114.78
+168.54 , -6849.72 , -107.23
+168.54 , -6360.45 , -99.65
+168.54 , -5871.19 , -92.05
+168.54 , -5381.92 , -84.42
+168.54 , -4892.66 , -76.77
+168.54 , -4403.39 , -69.10
+168.54 , -3914.12 , -61.41
+168.54 , -3424.86 , -53.69
+168.54 , -2935.59 , -45.94
+168.54 , -2446.33 , -38.17
+168.54 , -1957.06 , -30.38
+168.54 , -1467.80 , -22.57
+168.54 , -978.53 , -14.72
+168.54 , -489.27 , -6.84
+168.54 , -97.85 , 0.00
+168.54 , 86.63 , 2.61
+168.54 , 433.14 , 9.52
+168.54 , 866.29 , 18.06
+168.54 , 1299.43 , 26.62
+168.54 , 1732.57 , 35.19
+168.54 , 2165.72 , 43.79
+168.54 , 2598.86 , 52.42
+168.54 , 3032.00 , 61.07
+168.54 , 3465.15 , 69.74
+168.54 , 3898.29 , 78.43
+168.54 , 4331.43 , 87.15
+168.54 , 4764.58 , 95.90
+168.54 , 5197.72 , 104.67
+168.54 , 5630.86 , 113.46
+168.54 , 6064.01 , 122.28
+168.54 , 6497.15 , 131.12
+168.54 , 6930.29 , 139.99
+168.54 , 7363.44 , 148.88
+168.54 , 7796.58 , 157.79
+168.54 , 8229.72 , 166.73
+168.54 , 8662.87 , 175.69
+202.25 , -9785.31 , -182.19
+202.25 , -9296.05 , -173.29
+202.25 , -8806.78 , -164.37
+202.25 , -8317.52 , -155.42
+202.25 , -7828.25 , -146.44
+202.25 , -7338.98 , -137.42
+202.25 , -6849.72 , -128.38
+202.25 , -6360.45 , -119.30
+202.25 , -5871.19 , -110.20
+202.25 , -5381.92 , -101.06
+202.25 , -4892.66 , -91.89
+202.25 , -4403.39 , -82.70
+202.25 , -3914.12 , -73.47
+202.25 , -3424.86 , -64.21
+202.25 , -2935.59 , -54.93
+202.25 , -2446.33 , -45.61
+202.25 , -1957.06 , -36.26
+202.25 , -1467.80 , -26.87
+202.25 , -978.53 , -17.46
+202.25 , -489.27 , -7.98
+202.25 , -97.85 , 0.00
+202.25 , 86.63 , 3.29
+202.25 , 433.14 , 11.62
+202.25 , 866.29 , 21.88
+202.25 , 1299.43 , 32.14
+202.25 , 1732.57 , 42.44
+202.25 , 2165.72 , 52.76
+202.25 , 2598.86 , 63.11
+202.25 , 3032.00 , 73.49
+202.25 , 3465.15 , 83.91
+202.25 , 3898.29 , 94.35
+202.25 , 4331.43 , 104.82
+202.25 , 4764.58 , 115.33
+202.25 , 5197.72 , 125.87
+202.25 , 5630.86 , 136.43
+202.25 , 6064.01 , 147.03
+202.25 , 6497.15 , 157.66
+202.25 , 6930.29 , 168.32
+202.25 , 7363.44 , 179.01
+202.25 , 7796.58 , 189.74
+202.25 , 8229.72 , 200.49
+202.25 , 8662.87 , 211.27
+235.96 , -9785.31 , -211.85
+235.96 , -9296.05 , -201.52
+235.96 , -8806.78 , -191.16
+235.96 , -8317.52 , -180.75
+235.96 , -7828.25 , -170.31
+235.96 , -7338.98 , -159.83
+235.96 , -6849.72 , -149.31
+235.96 , -6360.45 , -138.75
+235.96 , -5871.19 , -128.16
+235.96 , -5381.92 , -117.52
+235.96 , -4892.66 , -106.85
+235.96 , -4403.39 , -96.14
+235.96 , -3914.12 , -85.39
+235.96 , -3424.86 , -74.61
+235.96 , -2935.59 , -63.78
+235.96 , -2446.33 , -52.92
+235.96 , -1957.06 , -42.02
+235.96 , -1467.80 , -31.07
+235.96 , -978.53 , -20.08
+235.96 , -489.27 , -9.00
+235.96 , -97.85 , 0.00
+235.96 , 86.63 , 4.05
+235.96 , 433.14 , 13.82
+235.96 , 866.29 , 25.80
+235.96 , 1299.43 , 37.78
+235.96 , 1732.57 , 49.79
+235.96 , 2165.72 , 61.84
+235.96 , 2598.86 , 73.93
+235.96 , 3032.00 , 86.05
+235.96 , 3465.15 , 98.22
+235.96 , 3898.29 , 110.42
+235.96 , 4331.43 , 122.66
+235.96 , 4764.58 , 134.94
+235.96 , 5197.72 , 147.26
+235.96 , 5630.86 , 159.61
+235.96 , 6064.01 , 172.01
+235.96 , 6497.15 , 184.44
+235.96 , 6930.29 , 196.92
+235.96 , 7363.44 , 209.43
+235.96 , 7796.58 , 221.98
+235.96 , 8229.72 , 234.57
+235.96 , 8662.87 , 247.19
+269.67 , -9785.31 , -241.15
+269.67 , -9296.05 , -229.41
+269.67 , -8806.78 , -217.63
+269.67 , -8317.52 , -205.79
+269.67 , -7828.25 , -193.91
+269.67 , -7338.98 , -181.98
+269.67 , -6849.72 , -170.01
+269.67 , -6360.45 , -157.99
+269.67 , -5871.19 , -145.91
+269.67 , -5381.92 , -133.80
+269.67 , -4892.66 , -121.63
+269.67 , -4403.39 , -109.42
+269.67 , -3914.12 , -97.16
+269.67 , -3424.86 , -84.85
+269.67 , -2935.59 , -72.50
+269.67 , -2446.33 , -60.10
+269.67 , -1957.06 , -47.65
+269.67 , -1467.80 , -35.14
+269.67 , -978.53 , -22.57
+269.67 , -489.27 , -9.88
+269.67 , -97.85 , 0.00
+269.67 , 86.63 , 4.88
+269.67 , 433.14 , 16.13
+269.67 , 866.29 , 29.83
+269.67 , 1299.43 , 43.53
+269.67 , 1732.57 , 57.27
+269.67 , 2165.72 , 71.06
+269.67 , 2598.86 , 84.89
+269.67 , 3032.00 , 98.76
+269.67 , 3465.15 , 112.68
+269.67 , 3898.29 , 126.65
+269.67 , 4331.43 , 140.67
+269.67 , 4764.58 , 154.74
+269.67 , 5197.72 , 168.85
+269.67 , 5630.86 , 183.01
+269.67 , 6064.01 , 197.22
+269.67 , 6497.15 , 211.48
+269.67 , 6930.29 , 225.78
+269.67 , 7363.44 , 240.13
+269.67 , 7796.58 , 254.53
+269.67 , 8229.72 , 268.97
+269.67 , 8662.87 , 283.46
+303.37 , -9785.31 , -270.09
+303.37 , -9296.05 , -256.96
+303.37 , -8806.78 , -243.78
+303.37 , -8317.52 , -230.53
+303.37 , -7828.25 , -217.23
+303.37 , -7338.98 , -203.87
+303.37 , -6849.72 , -190.46
+303.37 , -6360.45 , -176.98
+303.37 , -5871.19 , -163.45
+303.37 , -5381.92 , -149.87
+303.37 , -4892.66 , -136.22
+303.37 , -4403.39 , -122.52
+303.37 , -3914.12 , -108.76
+303.37 , -3424.86 , -94.94
+303.37 , -2935.59 , -81.06
+303.37 , -2446.33 , -67.13
+303.37 , -1957.06 , -53.13
+303.37 , -1467.80 , -39.07
+303.37 , -978.53 , -24.92
+303.37 , -489.27 , -10.59
+303.37 , -97.85 , 0.00
+303.37 , 86.63 , 5.80
+303.37 , 433.14 , 18.55
+303.37 , 866.29 , 33.99
+303.37 , 1299.43 , 49.42
+303.37 , 1732.57 , 64.90
+303.37 , 2165.72 , 80.42
+303.37 , 2598.86 , 96.00
+303.37 , 3032.00 , 111.63
+303.37 , 3465.15 , 127.32
+303.37 , 3898.29 , 143.07
+303.37 , 4331.43 , 158.88
+303.37 , 4764.58 , 174.74
+303.37 , 5197.72 , 190.66
+303.37 , 5630.86 , 206.64
+303.37 , 6064.01 , 222.68
+303.37 , 6497.15 , 238.77
+303.37 , 6930.29 , 254.92
+303.37 , 7363.44 , 271.13
+303.37 , 7796.58 , 287.40
+303.37 , 8229.72 , 303.72
+303.37 , 8662.87 , 320.10
+337.08 , -9785.31 , -298.63
+337.08 , -9296.05 , -284.14
+337.08 , -8806.78 , -269.58
+337.08 , -8317.52 , -254.95
+337.08 , -7828.25 , -240.25
+337.08 , -7338.98 , -225.48
+337.08 , -6849.72 , -210.64
+337.08 , -6360.45 , -195.74
+337.08 , -5871.19 , -180.76
+337.08 , -5381.92 , -165.71
+337.08 , -4892.66 , -150.60
+337.08 , -4403.39 , -135.42
+337.08 , -3914.12 , -120.16
+337.08 , -3424.86 , -104.84
+337.08 , -2935.59 , -89.45
+337.08 , -2446.33 , -73.99
+337.08 , -1957.06 , -58.45
+337.08 , -1467.80 , -42.83
+337.08 , -978.53 , -27.10
+337.08 , -489.27 , -11.12
+337.08 , -97.85 , 0.00
+337.08 , 86.63 , 6.80
+337.08 , 433.14 , 21.10
+337.08 , 866.29 , 38.29
+337.08 , 1299.43 , 55.46
+337.08 , 1732.57 , 72.67
+337.08 , 2165.72 , 89.94
+337.08 , 2598.86 , 107.27
+337.08 , 3032.00 , 124.67
+337.08 , 3465.15 , 142.14
+337.08 , 3898.29 , 159.68
+337.08 , 4331.43 , 177.29
+337.08 , 4764.58 , 194.96
+337.08 , 5197.72 , 212.70
+337.08 , 5630.86 , 230.52
+337.08 , 6064.01 , 248.40
+337.08 , 6497.15 , 266.35
+337.08 , 6930.29 , 284.37
+337.08 , 7363.44 , 302.45
+337.08 , 7796.58 , 320.61
+337.08 , 8229.72 , 338.83
+337.08 , 8662.87 , 357.12
+370.79 , -9785.31 , -326.77
+370.79 , -9296.05 , -310.94
+370.79 , -8806.78 , -295.03
+370.79 , -8317.52 , -279.03
+370.79 , -7828.25 , -262.95
+370.79 , -7338.98 , -246.79
+370.79 , -6849.72 , -230.55
+370.79 , -6360.45 , -214.22
+370.79 , -5871.19 , -197.81
+370.79 , -5381.92 , -181.33
+370.79 , -4892.66 , -164.76
+370.79 , -4403.39 , -148.10
+370.79 , -3914.12 , -131.37
+370.79 , -3424.86 , -114.55
+370.79 , -2935.59 , -97.65
+370.79 , -2446.33 , -80.67
+370.79 , -1957.06 , -63.59
+370.79 , -1467.80 , -46.42
+370.79 , -978.53 , -29.10
+370.79 , -489.27 , -11.41
+370.79 , -97.85 , 0.00
+370.79 , 86.63 , 7.90
+370.79 , 433.14 , 23.79
+370.79 , 866.29 , 42.74
+370.79 , 1299.43 , 61.65
+370.79 , 1732.57 , 80.61
+370.79 , 2165.72 , 99.63
+370.79 , 2598.86 , 118.73
+370.79 , 3032.00 , 137.91
+370.79 , 3465.15 , 157.16
+370.79 , 3898.29 , 176.50
+370.79 , 4331.43 , 195.91
+370.79 , 4764.58 , 215.41
+370.79 , 5197.72 , 234.99
+370.79 , 5630.86 , 254.65
+370.79 , 6064.01 , 274.39
+370.79 , 6497.15 , 294.21
+370.79 , 6930.29 , 314.12
+370.79 , 7363.44 , 334.10
+370.79 , 7796.58 , 354.16
+370.79 , 8229.72 , 374.31
+370.79 , 8662.87 , 394.53
+404.50 , -9785.31 , -354.49
+404.50 , -9296.05 , -337.34
+404.50 , -8806.78 , -320.10
+404.50 , -8317.52 , -302.75
+404.50 , -7828.25 , -285.32
+404.50 , -7338.98 , -267.78
+404.50 , -6849.72 , -250.15
+404.50 , -6360.45 , -232.43
+404.50 , -5871.19 , -214.60
+404.50 , -5381.92 , -196.69
+404.50 , -4892.66 , -178.67
+404.50 , -4403.39 , -160.56
+404.50 , -3914.12 , -142.36
+404.50 , -3424.86 , -124.05
+404.50 , -2935.59 , -105.65
+404.50 , -2446.33 , -87.15
+404.50 , -1957.06 , -68.54
+404.50 , -1467.80 , -49.80
+404.50 , -978.53 , -30.89
+404.50 , -489.27 , -11.43
+404.50 , -97.85 , 0.00
+404.50 , 86.63 , 9.08
+404.50 , 433.14 , 26.62
+404.50 , 866.29 , 47.35
+404.50 , 1299.43 , 68.02
+404.50 , 1732.57 , 88.72
+404.50 , 2165.72 , 109.51
+404.50 , 2598.86 , 130.38
+404.50 , 3032.00 , 151.34
+404.50 , 3465.15 , 172.39
+404.50 , 3898.29 , 193.53
+404.50 , 4331.43 , 214.77
+404.50 , 4764.58 , 236.11
+404.50 , 5197.72 , 257.53
+404.50 , 5630.86 , 279.05
+404.50 , 6064.01 , 300.67
+404.50 , 6497.15 , 322.38
+404.50 , 6930.29 , 344.19
+404.50 , 7363.44 , 366.08
+404.50 , 7796.58 , 388.08
+404.50 , 8229.72 , 410.16
+404.50 , 8662.87 , 432.34
+438.21 , -9785.31 , -381.77
+438.21 , -9296.05 , -363.33
+438.21 , -8806.78 , -344.77
+438.21 , -8317.52 , -326.11
+438.21 , -7828.25 , -307.33
+438.21 , -7338.98 , -288.45
+438.21 , -6849.72 , -269.45
+438.21 , -6360.45 , -250.33
+438.21 , -5871.19 , -231.11
+438.21 , -5381.92 , -211.78
+438.21 , -4892.66 , -192.34
+438.21 , -4403.39 , -172.78
+438.21 , -3914.12 , -153.11
+438.21 , -3424.86 , -133.33
+438.21 , -2935.59 , -113.43
+438.21 , -2446.33 , -93.42
+438.21 , -1957.06 , -73.27
+438.21 , -1467.80 , -52.98
+438.21 , -978.53 , -32.45
+438.21 , -489.27 , -11.12
+438.21 , -97.85 , 0.00
+438.21 , 86.63 , 10.37
+438.21 , 433.14 , 29.60
+438.21 , 866.29 , 52.14
+438.21 , 1299.43 , 74.56
+438.21 , 1732.57 , 97.03
+438.21 , 2165.72 , 119.58
+438.21 , 2598.86 , 142.23
+438.21 , 3032.00 , 164.98
+438.21 , 3465.15 , 187.84
+438.21 , 3898.29 , 210.80
+438.21 , 4331.43 , 233.87
+438.21 , 4764.58 , 257.05
+438.21 , 5197.72 , 280.34
+438.21 , 5630.86 , 303.74
+438.21 , 6064.01 , 327.25
+438.21 , 6497.15 , 350.87
+438.21 , 6930.29 , 374.59
+438.21 , 7363.44 , 398.42
+438.21 , 7796.58 , 422.36
+438.21 , 8229.72 , 446.41
+438.21 , 8662.87 , 470.57
+471.92 , -9785.31 , -408.59
+471.92 , -9296.05 , -388.88
+471.92 , -8806.78 , -369.04
+471.92 , -8317.52 , -349.08
+471.92 , -7828.25 , -328.98
+471.92 , -7338.98 , -308.76
+471.92 , -6849.72 , -288.41
+471.92 , -6360.45 , -267.93
+471.92 , -5871.19 , -247.32
+471.92 , -5381.92 , -226.59
+471.92 , -4892.66 , -205.73
+471.92 , -4403.39 , -184.73
+471.92 , -3914.12 , -163.61
+471.92 , -3424.86 , -142.36
+471.92 , -2935.59 , -120.97
+471.92 , -2446.33 , -99.45
+471.92 , -1957.06 , -77.77
+471.92 , -1467.80 , -55.91
+471.92 , -978.53 , -33.75
+471.92 , -489.27 , -10.40
+471.92 , -97.85 , 0.00
+471.92 , 86.63 , 11.76
+471.92 , 433.14 , 32.74
+471.92 , 866.29 , 57.10
+471.92 , 1299.43 , 81.29
+471.92 , 1732.57 , 105.53
+471.92 , 2165.72 , 129.86
+471.92 , 2598.86 , 154.29
+471.92 , 3032.00 , 178.85
+471.92 , 3465.15 , 203.52
+471.92 , 3898.29 , 228.31
+471.92 , 4331.43 , 253.23
+471.92 , 4764.58 , 278.27
+471.92 , 5197.72 , 303.44
+471.92 , 5630.86 , 328.73
+471.92 , 6064.01 , 354.14
+471.92 , 6497.15 , 379.68
+471.92 , 6930.29 , 405.34
+471.92 , 7363.44 , 431.13
+471.92 , 7796.58 , 457.03
+471.92 , 8229.72 , 483.07
+471.92 , 8662.87 , 509.22
+505.62 , -9785.31 , -434.93
+505.62 , -9296.05 , -413.98
+505.62 , -8806.78 , -392.88
+505.62 , -8317.52 , -371.64
+505.62 , -7828.25 , -350.25
+505.62 , -7338.98 , -328.71
+505.62 , -6849.72 , -307.03
+505.62 , -6360.45 , -285.20
+505.62 , -5871.19 , -263.22
+505.62 , -5381.92 , -241.10
+505.62 , -4892.66 , -218.83
+505.62 , -4403.39 , -196.41
+505.62 , -3914.12 , -173.85
+505.62 , -3424.86 , -151.13
+505.62 , -2935.59 , -128.26
+505.62 , -2446.33 , -105.23
+505.62 , -1957.06 , -82.02
+505.62 , -1467.80 , -58.59
+505.62 , -978.53 , -34.77
+505.62 , -489.27 , -9.14
+505.62 , -97.85 , 0.00
+505.62 , 86.63 , 13.25
+505.62 , 433.14 , 36.05
+505.62 , 866.29 , 62.25
+505.62 , 1299.43 , 88.23
+505.62 , 1732.57 , 114.25
+505.62 , 2165.72 , 140.36
+505.62 , 2598.86 , 166.59
+505.62 , 3032.00 , 192.95
+505.62 , 3465.15 , 219.45
+505.62 , 3898.29 , 246.08
+505.62 , 4331.43 , 272.86
+505.62 , 4764.58 , 299.77
+505.62 , 5197.72 , 326.82
+505.62 , 5630.86 , 354.02
+505.62 , 6064.01 , 381.35
+505.62 , 6497.15 , 408.83
+505.62 , 6930.29 , 436.45
+505.62 , 7363.44 , 464.20
+505.62 , 7796.58 , 492.10
+505.62 , 8229.72 , 520.14
+505.62 , 8662.87 , 548.31
+539.33 , -9785.31 , -460.78
+539.33 , -9296.05 , -438.62
+539.33 , -8806.78 , -416.28
+539.33 , -8317.52 , -393.78
+539.33 , -7828.25 , -371.11
+539.33 , -7338.98 , -348.28
+539.33 , -6849.72 , -325.28
+539.33 , -6360.45 , -302.11
+539.33 , -5871.19 , -278.78
+539.33 , -5381.92 , -255.29
+539.33 , -4892.66 , -231.62
+539.33 , -4403.39 , -207.79
+539.33 , -3914.12 , -183.79
+539.33 , -3424.86 , -159.62
+539.33 , -2935.59 , -135.27
+539.33 , -2446.33 , -110.74
+539.33 , -1957.06 , -85.99
+539.33 , -1467.80 , -60.98
+539.33 , -978.53 , -35.47
+539.33 , -489.27 , -7.05
+539.33 , -97.85 , 0.00
+539.33 , 86.63 , 14.84
+539.33 , 433.14 , 39.53
+539.33 , 866.29 , 67.60
+539.33 , 1299.43 , 95.38
+539.33 , 1732.57 , 123.18
+539.33 , 2165.72 , 151.09
+539.33 , 2598.86 , 179.12
+539.33 , 3032.00 , 207.30
+539.33 , 3465.15 , 235.63
+539.33 , 3898.29 , 264.12
+539.33 , 4331.43 , 292.76
+539.33 , 4764.58 , 321.56
+539.33 , 5197.72 , 350.51
+539.33 , 5630.86 , 379.63
+539.33 , 6064.01 , 408.90
+539.33 , 6497.15 , 438.33
+539.33 , 6930.29 , 467.92
+539.33 , 7363.44 , 497.67
+539.33 , 7796.58 , 527.57
+539.33 , 8229.72 , 557.64
+539.33 , 8662.87 , 587.85
+573.04 , -9785.31 , -486.12
+573.04 , -9296.05 , -462.76
+573.04 , -8806.78 , -439.22
+573.04 , -8317.52 , -415.48
+573.04 , -7828.25 , -391.56
+573.04 , -7338.98 , -367.45
+573.04 , -6849.72 , -343.15
+573.04 , -6360.45 , -318.67
+573.04 , -5871.19 , -294.00
+573.04 , -5381.92 , -269.14
+573.04 , -4892.66 , -244.09
+573.04 , -4403.39 , -218.86
+573.04 , -3914.12 , -193.44
+573.04 , -3424.86 , -167.82
+573.04 , -2935.59 , -142.00
+573.04 , -2446.33 , -115.96
+573.04 , -1957.06 , -89.67
+573.04 , -1467.80 , -63.06
+573.04 , -978.53 , -35.80
+573.04 , -489.27 , -3.22
+573.04 , -97.85 , 0.00
+573.04 , 86.63 , 16.54
+573.04 , 433.14 , 43.18
+573.04 , 866.29 , 73.16
+573.04 , 1299.43 , 102.75
+573.04 , 1732.57 , 132.35
+573.04 , 2165.72 , 162.06
+573.04 , 2598.86 , 191.91
+573.04 , 3032.00 , 221.91
+573.04 , 3465.15 , 252.09
+573.04 , 3898.29 , 282.44
+573.04 , 4331.43 , 312.96
+573.04 , 4764.58 , 343.65
+573.04 , 5197.72 , 374.52
+573.04 , 5630.86 , 405.57
+573.04 , 6064.01 , 436.80
+573.04 , 6497.15 , 468.20
+573.04 , 6930.29 , 499.78
+573.04 , 7363.44 , 531.53
+573.04 , 7796.58 , 563.46
+573.04 , 8229.72 , 595.57
+573.04 , 8662.87 , 627.85
+606.75 , -9785.31 , -510.93
+606.75 , -9296.05 , -486.40
+606.75 , -8806.78 , -461.67
+606.75 , -8317.52 , -436.72
+606.75 , -7828.25 , -411.56
+606.75 , -7338.98 , -386.20
+606.75 , -6849.72 , -360.62
+606.75 , -6360.45 , -334.84
+606.75 , -5871.19 , -308.84
+606.75 , -5381.92 , -282.64
+606.75 , -4892.66 , -256.22
+606.75 , -4403.39 , -229.60
+606.75 , -3914.12 , -202.76
+606.75 , -3424.86 , -175.70
+606.75 , -2935.59 , -148.41
+606.75 , -2446.33 , -120.87
+606.75 , -1957.06 , -93.04
+606.75 , -1467.80 , -64.80
+606.75 , -978.53 , -35.73
+606.75 , -489.27 , 0.00
+606.75 , -97.85 , 0.00
+606.75 , 86.63 , 18.35
+606.75 , 433.14 , 47.02
+606.75 , 866.29 , 78.93
+606.75 , 1299.43 , 110.35
+606.75 , 1732.57 , 141.76
+606.75 , 2165.72 , 173.28
+606.75 , 2598.86 , 204.95
+606.75 , 3032.00 , 236.80
+606.75 , 3465.15 , 268.83
+606.75 , 3898.29 , 301.04
+606.75 , 4331.43 , 333.46
+606.75 , 4764.58 , 366.06
+606.75 , 5197.72 , 398.86
+606.75 , 5630.86 , 431.86
+606.75 , 6064.01 , 465.05
+606.75 , 6497.15 , 498.44
+606.75 , 6930.29 , 532.03
+606.75 , 7363.44 , 565.81
+606.75 , 7796.58 , 599.79
+606.75 , 8229.72 , 633.96
+606.75 , 8662.87 , 668.33
+640.46 , -9785.31 , -535.19
+640.46 , -9296.05 , -509.52
+640.46 , -8806.78 , -483.62
+640.46 , -8317.52 , -457.48
+640.46 , -7828.25 , -431.11
+640.46 , -7338.98 , -404.51
+640.46 , -6849.72 , -377.67
+640.46 , -6360.45 , -350.60
+640.46 , -5871.19 , -323.30
+640.46 , -5381.92 , -295.76
+640.46 , -4892.66 , -267.99
+640.46 , -4403.39 , -239.99
+640.46 , -3914.12 , -211.74
+640.46 , -3424.86 , -183.24
+640.46 , -2935.59 , -154.48
+640.46 , -2446.33 , -125.44
+640.46 , -1957.06 , -96.05
+640.46 , -1467.80 , -66.18
+640.46 , -978.53 , -35.19
+640.46 , -489.27 , 0.00
+640.46 , -97.85 , 0.00
+640.46 , 86.63 , 20.27
+640.46 , 433.14 , 51.05
+640.46 , 866.29 , 84.92
+640.46 , 1299.43 , 118.19
+640.46 , 1732.57 , 151.42
+640.46 , 2165.72 , 184.76
+640.46 , 2598.86 , 218.27
+640.46 , 3032.00 , 251.96
+640.46 , 3465.15 , 285.86
+640.46 , 3898.29 , 319.96
+640.46 , 4331.43 , 354.27
+640.46 , 4764.58 , 388.80
+640.46 , 5197.72 , 423.54
+640.46 , 5630.86 , 458.50
+640.46 , 6064.01 , 493.68
+640.46 , 6497.15 , 529.07
+640.46 , 6930.29 , 564.68
+640.46 , 7363.44 , 600.51
+640.46 , 7796.58 , 636.55
+640.46 , 8229.72 , 672.81
+640.46 , 8662.87 , 709.28
+674.17 , -9785.31 , -558.87
+674.17 , -9296.05 , -532.09
+674.17 , -8806.78 , -505.05
+674.17 , -8317.52 , -477.75
+674.17 , -7828.25 , -450.19
+674.17 , -7338.98 , -422.37
+674.17 , -6849.72 , -394.29
+674.17 , -6360.45 , -365.95
+674.17 , -5871.19 , -337.36
+674.17 , -5381.92 , -308.50
+674.17 , -4892.66 , -279.38
+674.17 , -4403.39 , -250.00
+674.17 , -3914.12 , -220.35
+674.17 , -3424.86 , -190.43
+674.17 , -2935.59 , -160.20
+674.17 , -2446.33 , -129.65
+674.17 , -1957.06 , -98.70
+674.17 , -1467.80 , -67.15
+674.17 , -978.53 , -34.12
+674.17 , -489.27 , 0.00
+674.17 , -97.85 , 0.00
+674.17 , 86.63 , 22.30
+674.17 , 433.14 , 55.27
+674.17 , 866.29 , 91.14
+674.17 , 1299.43 , 126.27
+674.17 , 1732.57 , 161.34
+674.17 , 2165.72 , 196.52
+674.17 , 2598.86 , 231.87
+674.17 , 3032.00 , 267.42
+674.17 , 3465.15 , 303.19
+674.17 , 3898.29 , 339.18
+674.17 , 4331.43 , 375.41
+674.17 , 4764.58 , 411.87
+674.17 , 5197.72 , 448.57
+674.17 , 5630.86 , 485.51
+674.17 , 6064.01 , 522.68
+674.17 , 6497.15 , 560.09
+674.17 , 6930.29 , 597.75
+674.17 , 7363.44 , 635.63
+674.17 , 7796.58 , 673.76
+674.17 , 8229.72 , 712.12
+674.17 , 8662.87 , 750.73
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..cf325529f23837579dfd10ebea1c609e97a60f77
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 8662.87 , -9785.31
+3.34 , 8662.87 , -9785.31
+33.72 , 8662.87 , -9785.31
+67.45 , 8662.87 , -9785.31
+101.09 , 8662.87 , -9785.31
+134.82 , 8662.87 , -9785.31
+168.54 , 8662.87 , -9785.31
+202.26 , 7219.06 , -8154.43
+235.99 , 6187.71 , -6989.45
+269.63 , 5414.29 , -6115.82
+303.36 , 4812.74 , -5436.33
+337.08 , 4331.43 , -4892.66
+370.80 , 3937.68 , -4447.88
+404.53 , 3609.53 , -4077.21
+438.17 , 3331.85 , -3763.56
+471.90 , 3093.91 , -3494.79
+505.62 , 2887.62 , -3261.77
+539.35 , 2707.20 , -3057.98
+573.07 , 2547.92 , -2878.06
+606.71 , 2406.31 , -2718.10
+640.44 , 2279.72 , -2575.10
+674.16 , 2165.72 , -2446.33
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..cf325529f23837579dfd10ebea1c609e97a60f77
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 8662.87 , -9785.31
+3.34 , 8662.87 , -9785.31
+33.72 , 8662.87 , -9785.31
+67.45 , 8662.87 , -9785.31
+101.09 , 8662.87 , -9785.31
+134.82 , 8662.87 , -9785.31
+168.54 , 8662.87 , -9785.31
+202.26 , 7219.06 , -8154.43
+235.99 , 6187.71 , -6989.45
+269.63 , 5414.29 , -6115.82
+303.36 , 4812.74 , -5436.33
+337.08 , 4331.43 , -4892.66
+370.80 , 3937.68 , -4447.88
+404.53 , 3609.53 , -4077.21
+438.17 , 3331.85 , -3763.56
+471.90 , 3093.91 , -3494.79
+505.62 , 2887.62 , -3261.77
+539.35 , 2707.20 , -3057.98
+573.07 , 2547.92 , -2878.06
+606.71 , 2406.31 , -2718.10
+640.44 , 2279.72 , -2575.10
+674.16 , 2165.72 , -2446.33
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_drag.viepcd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..02b9cfdf04fa8e9596deed86f2453d35136592f2
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC_Gbx1Whl1_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -18.72
+3.37 , -19.31
+33.71 , -24.79
+67.42 , -30.86
+101.12 , -36.92
+134.83 , -43.06
+168.54 , -49.12
+202.25 , -55.19
+235.96 , -61.26
+269.67 , -67.32
+303.37 , -73.46
+337.08 , -79.52
+370.79 , -85.59
+404.50 , -91.66
+438.21 , -97.72
+471.92 , -103.85
+505.62 , -109.92
+539.33 , -115.99
+573.04 , -122.06
+606.75 , -128.12
+640.46 , -134.25
+674.17 , -140.32
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/GenericIEPC_Gbx1Whl2.viepc b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/GenericIEPC_Gbx1Whl2.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..77bb834401f33bc4b2a25ae51ca8f4a67a6b6d51
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/GenericIEPC_Gbx1Whl2.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 2,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 12.276
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 13860.59,
+ "ContinuousTorqueSpeed": 166.99,
+ "OverloadTorque": 16517.20,
+ "OverloadTorqueSpeed": 166.01,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1Whl2_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl2.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 15015.63,
+ "ContinuousTorqueSpeed": 168.62,
+ "OverloadTorque": 17325.73,
+ "OverloadTorqueSpeed": 170.17,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1Whl2_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1Whl2.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1Whl2_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_ENG_Gbx1Whl2.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_ENG_Gbx1Whl2.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..d826a010c7133b88f2373c6b8335da18a2eee0c8
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_ENG_Gbx1Whl2.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx1Whl2.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_Vehicle_Gbx1Whl2.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_Vehicle_Gbx1Whl2.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..22a694626fa007c104dd2d709e82db0e0fe2c6e1
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_Vehicle_Gbx1Whl2.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1Whl2.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..34a156b7879d62462d6d49a3c99ceafec0effec5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 17325.73 , -19570.62
+3.34 , 17325.73 , -19570.62
+33.72 , 17325.73 , -19570.62
+67.45 , 17325.73 , -19570.62
+101.09 , 17325.73 , -19570.62
+134.82 , 17325.73 , -19570.62
+168.54 , 17325.73 , -19570.62
+202.26 , 14438.11 , -16308.85
+235.99 , 12375.42 , -13978.91
+269.63 , 10828.58 , -12231.64
+303.36 , 9625.48 , -10872.66
+337.08 , 8662.87 , -9785.31
+370.80 , 7875.35 , -8895.76
+404.53 , 7219.06 , -8154.43
+438.17 , 6663.71 , -7527.12
+471.90 , 6187.83 , -6989.58
+505.62 , 5775.24 , -6523.54
+539.35 , 5414.41 , -6115.95
+573.07 , 5095.84 , -5756.11
+606.71 , 4812.63 , -5436.20
+640.44 , 4559.44 , -5150.21
+674.16 , 4331.43 , -4892.66
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_drag.viepcd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..07eb40e197c27c23aea5f69c3200e3b799688102
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC_Gbx1Whl2_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -37.45
+3.37 , -38.62
+33.71 , -49.58
+67.42 , -61.71
+101.12 , -73.85
+134.83 , -86.11
+168.54 , -98.24
+202.25 , -110.38
+235.96 , -122.51
+269.67 , -134.65
+303.37 , -146.91
+337.08 , -159.04
+370.79 , -171.18
+404.50 , -183.31
+438.21 , -195.45
+471.92 , -207.71
+505.62 , -219.84
+539.33 , -231.98
+573.04 , -244.11
+606.75 , -256.24
+640.46 , -268.51
+674.17 , -280.64
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/Axle_4x2_Tractor.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/Axle_4x2_Tractor.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..e11cbf7cdde175e06ab8f6a0b79d46b84b3e0c1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/Axle_4x2_Tractor.vtlm
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/Axlegear.vgbx b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/Axlegear.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..8c4b5d9467fc9de8c168253de67633e521e24a0f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/Axlegear.vgbx
@@ -0,0 +1,33 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-11-03T14:19:09.9858299Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "3_speed_AMT",
+ "Inertia": 0.0,
+ "TracInt": 0.8,
+ "Gears": [
+ {
+ "Ratio": 2.64,
+ "LossMap": "Axle_4x2_Tractor.vtlm"
+ }
+ ],
+ "TqReserve": 0.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.22222222222222,
+ "StartAcc": 0.8,
+ "GearboxType": "AMT",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAfterUpshiftDelay": 6.0,
+ "UpshiftAfterDownshiftDelay": 6.0,
+ "UpshiftMinAcceleration": 0.1,
+ "PowershiftShiftTime": 0.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/GenericIEPC_Gbx1.viepc b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/GenericIEPC_Gbx1.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..8fcddfd0904b8b3f8c53039ee4aa55372733a70b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/GenericIEPC_Gbx1.viepc
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 4.65
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 5412.60,
+ "ContinuousTorqueSpeed": 440.86,
+ "OverloadTorque": 6450.02,
+ "OverloadTorqueSpeed": 438.28,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx1_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 5863.65,
+ "ContinuousTorqueSpeed": 445.16,
+ "OverloadTorque": 6765.75,
+ "OverloadTorqueSpeed": 449.25,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx1_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx1.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx1_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_ENG_Gbx1.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_ENG_Gbx1.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..d2d2ae973f430cb783c48cda76335d11ebaa8890
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_ENG_Gbx1.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx1.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "Axlegear.vgbx",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..1f27defc739513aa86f68e0de1141b8b9f8ea0ff
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_Vehicle_Gbx1.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx1.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..e4be1e22ede233c40afa5a00eeb1292d2cad8f78
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -7190.72 , 0.00
+0.00 , -6831.19 , 0.00
+0.00 , -6471.65 , 0.00
+0.00 , -6112.11 , 0.00
+0.00 , -5752.58 , 0.00
+0.00 , -5393.04 , 0.00
+0.00 , -5033.51 , -0.13
+0.00 , -4673.97 , -0.66
+0.00 , -4314.43 , -0.98
+0.00 , -3954.90 , -1.19
+0.00 , -3595.36 , -1.32
+0.00 , -3235.82 , -1.38
+0.00 , -2876.29 , -1.39
+0.00 , -2516.75 , -1.35
+0.00 , -2157.22 , -1.26
+0.00 , -1797.68 , -1.13
+0.00 , -1438.14 , -0.97
+0.00 , -1078.61 , -0.77
+0.00 , -719.07 , -0.53
+0.00 , -359.54 , -0.27
+0.00 , -71.91 , -0.02
+0.00 , 67.66 , 0.13
+0.00 , 338.29 , 0.56
+0.00 , 676.58 , 1.12
+0.00 , 1014.86 , 1.70
+0.00 , 1353.15 , 2.31
+0.00 , 1691.44 , 2.93
+0.00 , 2029.73 , 3.58
+0.00 , 2368.01 , 4.25
+0.00 , 2706.30 , 4.93
+0.00 , 3044.59 , 5.64
+0.00 , 3382.88 , 6.37
+0.00 , 3721.16 , 7.12
+0.00 , 4059.45 , 7.88
+0.00 , 4397.74 , 8.67
+0.00 , 4736.03 , 9.47
+0.00 , 5074.31 , 10.29
+0.00 , 5412.60 , 11.13
+0.00 , 5750.89 , 11.99
+0.00 , 6089.18 , 12.87
+0.00 , 6427.46 , 13.76
+0.00 , 6765.75 , 14.67
+8.90 , -7190.72 , 0.00
+8.90 , -6831.19 , 0.00
+8.90 , -6471.65 , 0.00
+8.90 , -6112.11 , 0.00
+8.90 , -5752.58 , 0.00
+8.90 , -5393.04 , 0.00
+8.90 , -5033.51 , -0.50
+8.90 , -4673.97 , -0.84
+8.90 , -4314.43 , -1.04
+8.90 , -3954.90 , -1.16
+8.90 , -3595.36 , -1.22
+8.90 , -3235.82 , -1.24
+8.90 , -2876.29 , -1.21
+8.90 , -2516.75 , -1.15
+8.90 , -2157.22 , -1.06
+8.90 , -1797.68 , -0.94
+8.90 , -1438.14 , -0.80
+8.90 , -1078.61 , -0.62
+8.90 , -719.07 , -0.43
+8.90 , -359.54 , -0.21
+8.90 , -71.91 , -0.02
+8.90 , 67.66 , 0.10
+8.90 , 338.29 , 0.43
+8.90 , 676.58 , 0.85
+8.90 , 1014.86 , 1.30
+8.90 , 1353.15 , 1.75
+8.90 , 1691.44 , 2.23
+8.90 , 2029.73 , 2.71
+8.90 , 2368.01 , 3.21
+8.90 , 2706.30 , 3.73
+8.90 , 3044.59 , 4.26
+8.90 , 3382.88 , 4.80
+8.90 , 3721.16 , 5.36
+8.90 , 4059.45 , 5.93
+8.90 , 4397.74 , 6.52
+8.90 , 4736.03 , 7.12
+8.90 , 5074.31 , 7.73
+8.90 , 5412.60 , 8.35
+8.90 , 5750.89 , 8.99
+8.90 , 6089.18 , 9.64
+8.90 , 6427.46 , 10.30
+8.90 , 6765.75 , 10.98
+88.99 , -7190.72 , -58.10
+88.99 , -6831.19 , -55.37
+88.99 , -6471.65 , -52.62
+88.99 , -6112.11 , -49.85
+88.99 , -5752.58 , -47.06
+88.99 , -5393.04 , -44.25
+88.99 , -5033.51 , -41.42
+88.99 , -4673.97 , -38.57
+88.99 , -4314.43 , -35.70
+88.99 , -3954.90 , -32.81
+88.99 , -3595.36 , -29.90
+88.99 , -3235.82 , -26.98
+88.99 , -2876.29 , -24.03
+88.99 , -2516.75 , -21.07
+88.99 , -2157.22 , -18.08
+88.99 , -1797.68 , -15.08
+88.99 , -1438.14 , -12.06
+88.99 , -1078.61 , -9.02
+88.99 , -719.07 , -5.96
+88.99 , -359.54 , -2.88
+88.99 , -71.91 , -0.37
+88.99 , 67.66 , 0.90
+88.99 , 338.29 , 3.68
+88.99 , 676.58 , 7.16
+88.99 , 1014.86 , 10.66
+88.99 , 1353.15 , 14.17
+88.99 , 1691.44 , 17.71
+88.99 , 2029.73 , 21.26
+88.99 , 2368.01 , 24.84
+88.99 , 2706.30 , 28.43
+88.99 , 3044.59 , 32.04
+88.99 , 3382.88 , 35.67
+88.99 , 3721.16 , 39.32
+88.99 , 4059.45 , 42.99
+88.99 , 4397.74 , 46.68
+88.99 , 4736.03 , 50.38
+88.99 , 5074.31 , 54.11
+88.99 , 5412.60 , 57.85
+88.99 , 5750.89 , 61.61
+88.99 , 6089.18 , 65.39
+88.99 , 6427.46 , 69.19
+88.99 , 6765.75 , 73.01
+177.98 , -7190.72 , -120.57
+177.98 , -6831.19 , -114.73
+177.98 , -6471.65 , -108.87
+177.98 , -6112.11 , -102.99
+177.98 , -5752.58 , -97.08
+177.98 , -5393.04 , -91.15
+177.98 , -5033.51 , -85.20
+177.98 , -4673.97 , -79.23
+177.98 , -4314.43 , -73.23
+177.98 , -3954.90 , -67.21
+177.98 , -3595.36 , -61.17
+177.98 , -3235.82 , -55.10
+177.98 , -2876.29 , -49.01
+177.98 , -2516.75 , -42.90
+177.98 , -2157.22 , -36.77
+177.98 , -1797.68 , -30.61
+177.98 , -1438.14 , -24.43
+177.98 , -1078.61 , -18.23
+177.98 , -719.07 , -12.01
+177.98 , -359.54 , -5.76
+177.98 , -71.91 , -0.66
+177.98 , 67.66 , 1.84
+177.98 , 338.29 , 7.35
+177.98 , 676.58 , 14.22
+177.98 , 1014.86 , 21.11
+177.98 , 1353.15 , 28.02
+177.98 , 1691.44 , 34.96
+177.98 , 2029.73 , 41.92
+177.98 , 2368.01 , 48.90
+177.98 , 2706.30 , 55.90
+177.98 , 3044.59 , 62.93
+177.98 , 3382.88 , 69.98
+177.98 , 3721.16 , 77.05
+177.98 , 4059.45 , 84.15
+177.98 , 4397.74 , 91.27
+177.98 , 4736.03 , 98.41
+177.98 , 5074.31 , 105.58
+177.98 , 5412.60 , 112.76
+177.98 , 5750.89 , 119.97
+177.98 , 6089.18 , 127.21
+177.98 , 6427.46 , 134.46
+177.98 , 6765.75 , 141.74
+266.97 , -7190.72 , -182.44
+266.97 , -6831.19 , -173.55
+266.97 , -6471.65 , -164.62
+266.97 , -6112.11 , -155.67
+266.97 , -5752.58 , -146.69
+266.97 , -5393.04 , -137.68
+266.97 , -5033.51 , -128.65
+266.97 , -4673.97 , -119.58
+266.97 , -4314.43 , -110.49
+266.97 , -3954.90 , -101.36
+266.97 , -3595.36 , -92.21
+266.97 , -3235.82 , -83.03
+266.97 , -2876.29 , -73.82
+266.97 , -2516.75 , -64.58
+266.97 , -2157.22 , -55.31
+266.97 , -1797.68 , -46.02
+266.97 , -1438.14 , -36.70
+266.97 , -1078.61 , -27.34
+266.97 , -719.07 , -17.96
+266.97 , -359.54 , -8.54
+266.97 , -71.91 , -0.79
+266.97 , 67.66 , 2.86
+266.97 , 338.29 , 11.12
+266.97 , 676.58 , 21.39
+266.97 , 1014.86 , 31.68
+266.97 , 1353.15 , 41.99
+266.97 , 1691.44 , 52.34
+266.97 , 2029.73 , 62.71
+266.97 , 2368.01 , 73.12
+266.97 , 2706.30 , 83.55
+266.97 , 3044.59 , 94.01
+266.97 , 3382.88 , 104.50
+266.97 , 3721.16 , 115.02
+266.97 , 4059.45 , 125.57
+266.97 , 4397.74 , 136.15
+266.97 , 4736.03 , 146.76
+266.97 , 5074.31 , 157.40
+266.97 , 5412.60 , 168.06
+266.97 , 5750.89 , 178.76
+266.97 , 6089.18 , 189.48
+266.97 , 6427.46 , 200.23
+266.97 , 6765.75 , 211.02
+355.96 , -7190.72 , -243.71
+355.96 , -6831.19 , -231.81
+355.96 , -6471.65 , -219.87
+355.96 , -6112.11 , -207.89
+355.96 , -5752.58 , -195.88
+355.96 , -5393.04 , -183.83
+355.96 , -5033.51 , -171.74
+355.96 , -4673.97 , -159.61
+355.96 , -4314.43 , -147.45
+355.96 , -3954.90 , -135.25
+355.96 , -3595.36 , -123.01
+355.96 , -3235.82 , -110.74
+355.96 , -2876.29 , -98.43
+355.96 , -2516.75 , -86.08
+355.96 , -2157.22 , -73.70
+355.96 , -1797.68 , -61.27
+355.96 , -1438.14 , -48.82
+355.96 , -1078.61 , -36.32
+355.96 , -719.07 , -23.78
+355.96 , -359.54 , -11.19
+355.96 , -71.91 , -0.63
+355.96 , 67.66 , 3.98
+355.96 , 338.29 , 15.01
+355.96 , 676.58 , 28.68
+355.96 , 1014.86 , 42.37
+355.96 , 1353.15 , 56.10
+355.96 , 1691.44 , 69.87
+355.96 , 2029.73 , 83.67
+355.96 , 2368.01 , 97.52
+355.96 , 2706.30 , 111.40
+355.96 , 3044.59 , 125.31
+355.96 , 3382.88 , 139.27
+355.96 , 3721.16 , 153.26
+355.96 , 4059.45 , 167.29
+355.96 , 4397.74 , 181.36
+355.96 , 4736.03 , 195.46
+355.96 , 5074.31 , 209.61
+355.96 , 5412.60 , 223.79
+355.96 , 5750.89 , 238.01
+355.96 , 6089.18 , 252.26
+355.96 , 6427.46 , 266.56
+355.96 , 6765.75 , 280.89
+444.95 , -7190.72 , -304.37
+444.95 , -6831.19 , -289.50
+444.95 , -6471.65 , -274.59
+444.95 , -6112.11 , -259.63
+444.95 , -5752.58 , -244.61
+444.95 , -5393.04 , -229.56
+444.95 , -5033.51 , -214.45
+444.95 , -4673.97 , -199.30
+444.95 , -4314.43 , -184.10
+444.95 , -3954.90 , -168.85
+444.95 , -3595.36 , -153.55
+444.95 , -3235.82 , -138.20
+444.95 , -2876.29 , -122.81
+444.95 , -2516.75 , -107.37
+444.95 , -2157.22 , -91.88
+444.95 , -1797.68 , -76.35
+444.95 , -1438.14 , -60.76
+444.95 , -1078.61 , -45.13
+444.95 , -719.07 , -29.44
+444.95 , -359.54 , -13.67
+444.95 , -71.91 , 0.00
+444.95 , 67.66 , 5.21
+444.95 , 338.29 , 19.04
+444.95 , 676.58 , 36.13
+444.95 , 1014.86 , 53.24
+444.95 , 1353.15 , 70.39
+444.95 , 1691.44 , 87.59
+444.95 , 2029.73 , 104.83
+444.95 , 2368.01 , 122.13
+444.95 , 2706.30 , 139.47
+444.95 , 3044.59 , 156.87
+444.95 , 3382.88 , 174.31
+444.95 , 3721.16 , 191.80
+444.95 , 4059.45 , 209.33
+444.95 , 4397.74 , 226.92
+444.95 , 4736.03 , 244.56
+444.95 , 5074.31 , 262.24
+444.95 , 5412.60 , 279.97
+444.95 , 5750.89 , 297.76
+444.95 , 6089.18 , 315.58
+444.95 , 6427.46 , 333.46
+444.95 , 6765.75 , 351.39
+533.94 , -7190.72 , -364.37
+533.94 , -6831.19 , -346.59
+533.94 , -6471.65 , -328.74
+533.94 , -6112.11 , -310.84
+533.94 , -5752.58 , -292.87
+533.94 , -5393.04 , -274.84
+533.94 , -5033.51 , -256.75
+533.94 , -4673.97 , -238.60
+533.94 , -4314.43 , -220.39
+533.94 , -3954.90 , -202.12
+533.94 , -3595.36 , -183.79
+533.94 , -3235.82 , -165.40
+533.94 , -2876.29 , -146.94
+533.94 , -2516.75 , -128.43
+533.94 , -2157.22 , -109.85
+533.94 , -1797.68 , -91.21
+533.94 , -1438.14 , -72.51
+533.94 , -1078.61 , -53.75
+533.94 , -719.07 , -34.91
+533.94 , -359.54 , -15.95
+533.94 , -71.91 , 0.00
+533.94 , 67.66 , 6.58
+533.94 , 338.29 , 23.25
+533.94 , 676.58 , 43.76
+533.94 , 1014.86 , 64.29
+533.94 , 1353.15 , 84.87
+533.94 , 1691.44 , 105.52
+533.94 , 2029.73 , 126.22
+533.94 , 2368.01 , 146.98
+533.94 , 2706.30 , 167.81
+533.94 , 3044.59 , 188.70
+533.94 , 3382.88 , 209.65
+533.94 , 3721.16 , 230.66
+533.94 , 4059.45 , 251.73
+533.94 , 4397.74 , 272.87
+533.94 , 4736.03 , 294.07
+533.94 , 5074.31 , 315.33
+533.94 , 5412.60 , 336.65
+533.94 , 5750.89 , 358.03
+533.94 , 6089.18 , 379.47
+533.94 , 6427.46 , 400.98
+533.94 , 6765.75 , 422.54
+622.93 , -7190.72 , -423.69
+622.93 , -6831.19 , -403.04
+622.93 , -6471.65 , -382.31
+622.93 , -6112.11 , -361.50
+622.93 , -5752.58 , -340.62
+622.93 , -5393.04 , -319.66
+622.93 , -5033.51 , -298.62
+622.93 , -4673.97 , -277.51
+622.93 , -4314.43 , -256.31
+622.93 , -3954.90 , -235.05
+622.93 , -3595.36 , -213.70
+622.93 , -3235.82 , -192.28
+622.93 , -2876.29 , -170.79
+622.93 , -2516.75 , -149.21
+622.93 , -2157.22 , -127.57
+622.93 , -1797.68 , -105.84
+622.93 , -1438.14 , -84.03
+622.93 , -1078.61 , -62.14
+622.93 , -719.07 , -40.16
+622.93 , -359.54 , -18.00
+622.93 , -71.91 , 0.00
+622.93 , 67.66 , 8.09
+622.93 , 338.29 , 27.64
+622.93 , 676.58 , 51.59
+622.93 , 1014.86 , 75.56
+622.93 , 1353.15 , 99.58
+622.93 , 1691.44 , 123.68
+622.93 , 2029.73 , 147.86
+622.93 , 2368.01 , 172.10
+622.93 , 2706.30 , 196.43
+622.93 , 3044.59 , 220.84
+622.93 , 3382.88 , 245.32
+622.93 , 3721.16 , 269.88
+622.93 , 4059.45 , 294.51
+622.93 , 4397.74 , 319.23
+622.93 , 4736.03 , 344.02
+622.93 , 5074.31 , 368.89
+622.93 , 5412.60 , 393.83
+622.93 , 5750.89 , 418.85
+622.93 , 6089.18 , 443.95
+622.93 , 6427.46 , 469.13
+622.93 , 6765.75 , 494.38
+711.92 , -7190.72 , -482.31
+711.92 , -6831.19 , -458.83
+711.92 , -6471.65 , -435.26
+711.92 , -6112.11 , -411.59
+711.92 , -5752.58 , -387.83
+711.92 , -5393.04 , -363.97
+711.92 , -5033.51 , -340.02
+711.92 , -4673.97 , -315.97
+711.92 , -4314.43 , -291.83
+711.92 , -3954.90 , -267.59
+711.92 , -3595.36 , -243.26
+711.92 , -3235.82 , -218.84
+711.92 , -2876.29 , -194.32
+711.92 , -2516.75 , -169.71
+711.92 , -2157.22 , -145.00
+711.92 , -1797.68 , -120.19
+711.92 , -1438.14 , -95.29
+711.92 , -1078.61 , -70.28
+711.92 , -719.07 , -45.14
+711.92 , -359.54 , -19.76
+711.92 , -71.91 , 0.00
+711.92 , 67.66 , 9.76
+711.92 , 338.29 , 32.25
+711.92 , 676.58 , 59.66
+711.92 , 1014.86 , 87.07
+711.92 , 1353.15 , 114.55
+711.92 , 1691.44 , 142.11
+711.92 , 2029.73 , 169.77
+711.92 , 2368.01 , 197.52
+711.92 , 2706.30 , 225.37
+711.92 , 3044.59 , 253.31
+711.92 , 3382.88 , 281.34
+711.92 , 3721.16 , 309.47
+711.92 , 4059.45 , 337.70
+711.92 , 4397.74 , 366.02
+711.92 , 4736.03 , 394.44
+711.92 , 5074.31 , 422.95
+711.92 , 5412.60 , 451.56
+711.92 , 5750.89 , 480.26
+711.92 , 6089.18 , 509.05
+711.92 , 6427.46 , 537.94
+711.92 , 6765.75 , 566.93
+800.91 , -7190.72 , -540.17
+800.91 , -6831.19 , -513.92
+800.91 , -6471.65 , -487.55
+800.91 , -6112.11 , -461.06
+800.91 , -5752.58 , -434.46
+800.91 , -5393.04 , -407.75
+800.91 , -5033.51 , -380.92
+800.91 , -4673.97 , -353.97
+800.91 , -4314.43 , -326.91
+800.91 , -3954.90 , -299.73
+800.91 , -3595.36 , -272.44
+800.91 , -3235.82 , -245.03
+800.91 , -2876.29 , -217.51
+800.91 , -2516.75 , -189.87
+800.91 , -2157.22 , -162.12
+800.91 , -1797.68 , -134.25
+800.91 , -1438.14 , -106.26
+800.91 , -1078.61 , -78.13
+800.91 , -719.07 , -49.84
+800.91 , -359.54 , -21.19
+800.91 , -71.91 , 0.00
+800.91 , 67.66 , 11.59
+800.91 , 338.29 , 37.10
+800.91 , 676.58 , 67.98
+800.91 , 1014.86 , 98.85
+800.91 , 1353.15 , 129.79
+800.91 , 1691.44 , 160.84
+800.91 , 2029.73 , 191.99
+800.91 , 2368.01 , 223.26
+800.91 , 2706.30 , 254.64
+800.91 , 3044.59 , 286.14
+800.91 , 3382.88 , 317.75
+800.91 , 3721.16 , 349.48
+800.91 , 4059.45 , 381.32
+800.91 , 4397.74 , 413.28
+800.91 , 4736.03 , 445.36
+800.91 , 5074.31 , 477.54
+800.91 , 5412.60 , 509.85
+800.91 , 5750.89 , 542.27
+800.91 , 6089.18 , 574.80
+800.91 , 6427.46 , 607.45
+800.91 , 6765.75 , 640.21
+889.90 , -7190.72 , -597.26
+889.90 , -6831.19 , -568.28
+889.90 , -6471.65 , -539.16
+889.90 , -6112.11 , -509.90
+889.90 , -5752.58 , -480.50
+889.90 , -5393.04 , -450.96
+889.90 , -5033.51 , -421.28
+889.90 , -4673.97 , -391.47
+889.90 , -4314.43 , -361.52
+889.90 , -3954.90 , -331.43
+889.90 , -3595.36 , -301.20
+889.90 , -3235.82 , -270.83
+889.90 , -2876.29 , -240.33
+889.90 , -2516.75 , -209.68
+889.90 , -2157.22 , -178.90
+889.90 , -1797.68 , -147.97
+889.90 , -1438.14 , -116.90
+889.90 , -1078.61 , -85.66
+889.90 , -719.07 , -54.21
+889.90 , -359.54 , -22.23
+889.90 , -71.91 , 0.00
+889.90 , 67.66 , 13.60
+889.90 , 338.29 , 42.20
+889.90 , 676.58 , 76.58
+889.90 , 1014.86 , 110.92
+889.90 , 1353.15 , 145.34
+889.90 , 1691.44 , 179.88
+889.90 , 2029.73 , 214.55
+889.90 , 2368.01 , 249.35
+889.90 , 2706.30 , 284.29
+889.90 , 3044.59 , 319.36
+889.90 , 3382.88 , 354.57
+889.90 , 3721.16 , 389.92
+889.90 , 4059.45 , 425.41
+889.90 , 4397.74 , 461.03
+889.90 , 4736.03 , 496.79
+889.90 , 5074.31 , 532.69
+889.90 , 5412.60 , 568.73
+889.90 , 5750.89 , 604.90
+889.90 , 6089.18 , 641.21
+889.90 , 6427.46 , 677.66
+889.90 , 6765.75 , 714.24
+978.89 , -7190.72 , -653.54
+978.89 , -6831.19 , -621.88
+978.89 , -6471.65 , -590.05
+978.89 , -6112.11 , -558.06
+978.89 , -5752.58 , -525.90
+978.89 , -5393.04 , -493.58
+978.89 , -5033.51 , -461.09
+978.89 , -4673.97 , -428.44
+978.89 , -4314.43 , -395.63
+978.89 , -3954.90 , -362.65
+978.89 , -3595.36 , -329.51
+978.89 , -3235.82 , -296.21
+978.89 , -2876.29 , -262.74
+978.89 , -2516.75 , -229.11
+978.89 , -2157.22 , -195.31
+978.89 , -1797.68 , -161.34
+978.89 , -1438.14 , -127.18
+978.89 , -1078.61 , -92.83
+978.89 , -719.07 , -58.20
+978.89 , -359.54 , -22.82
+978.89 , -71.91 , 0.00
+978.89 , 67.66 , 15.79
+978.89 , 338.29 , 47.58
+978.89 , 676.58 , 85.48
+978.89 , 1014.86 , 123.30
+978.89 , 1353.15 , 161.22
+978.89 , 1691.44 , 199.26
+978.89 , 2029.73 , 237.46
+978.89 , 2368.01 , 275.81
+978.89 , 2706.30 , 314.32
+978.89 , 3044.59 , 352.99
+978.89 , 3382.88 , 391.83
+978.89 , 3721.16 , 430.82
+978.89 , 4059.45 , 469.98
+978.89 , 4397.74 , 509.30
+978.89 , 4736.03 , 548.78
+978.89 , 5074.31 , 588.42
+978.89 , 5412.60 , 628.23
+978.89 , 5750.89 , 668.20
+978.89 , 6089.18 , 708.32
+978.89 , 6427.46 , 748.61
+978.89 , 6765.75 , 789.06
+1067.88 , -7190.72 , -708.97
+1067.88 , -6831.19 , -674.68
+1067.88 , -6471.65 , -640.19
+1067.88 , -6112.11 , -605.51
+1067.88 , -5752.58 , -570.63
+1067.88 , -5393.04 , -535.56
+1067.88 , -5033.51 , -500.30
+1067.88 , -4673.97 , -464.85
+1067.88 , -4314.43 , -429.21
+1067.88 , -3954.90 , -393.37
+1067.88 , -3595.36 , -357.35
+1067.88 , -3235.82 , -321.13
+1067.88 , -2876.29 , -284.71
+1067.88 , -2516.75 , -248.11
+1067.88 , -2157.22 , -211.31
+1067.88 , -1797.68 , -174.30
+1067.88 , -1438.14 , -137.08
+1067.88 , -1078.61 , -99.61
+1067.88 , -719.07 , -61.78
+1067.88 , -359.54 , -22.86
+1067.88 , -71.91 , 0.00
+1067.88 , 67.66 , 18.17
+1067.88 , 338.29 , 53.24
+1067.88 , 676.58 , 94.71
+1067.88 , 1014.86 , 136.03
+1067.88 , 1353.15 , 177.45
+1067.88 , 1691.44 , 219.01
+1067.88 , 2029.73 , 260.75
+1067.88 , 2368.01 , 302.67
+1067.88 , 2706.30 , 344.78
+1067.88 , 3044.59 , 387.07
+1067.88 , 3382.88 , 429.54
+1067.88 , 3721.16 , 472.21
+1067.88 , 4059.45 , 515.06
+1067.88 , 4397.74 , 558.11
+1067.88 , 4736.03 , 601.34
+1067.88 , 5074.31 , 644.76
+1067.88 , 5412.60 , 688.37
+1067.88 , 5750.89 , 732.17
+1067.88 , 6089.18 , 776.15
+1067.88 , 6427.46 , 820.33
+1067.88 , 6765.75 , 864.69
+1156.87 , -7190.72 , -763.53
+1156.87 , -6831.19 , -726.65
+1156.87 , -6471.65 , -689.55
+1156.87 , -6112.11 , -652.22
+1156.87 , -5752.58 , -614.67
+1156.87 , -5393.04 , -576.89
+1156.87 , -5033.51 , -538.89
+1156.87 , -4673.97 , -500.67
+1156.87 , -4314.43 , -462.22
+1156.87 , -3954.90 , -423.56
+1156.87 , -3595.36 , -384.67
+1156.87 , -3235.82 , -345.56
+1156.87 , -2876.29 , -306.22
+1156.87 , -2516.75 , -266.66
+1156.87 , -2157.22 , -226.86
+1156.87 , -1797.68 , -186.83
+1156.87 , -1438.14 , -146.54
+1156.87 , -1078.61 , -105.95
+1156.87 , -719.07 , -64.90
+1156.87 , -359.54 , -22.24
+1156.87 , -71.91 , 0.00
+1156.87 , 67.66 , 20.74
+1156.87 , 338.29 , 59.20
+1156.87 , 676.58 , 104.27
+1156.87 , 1014.86 , 149.12
+1156.87 , 1353.15 , 194.05
+1156.87 , 1691.44 , 239.16
+1156.87 , 2029.73 , 284.45
+1156.87 , 2368.01 , 329.96
+1156.87 , 2706.30 , 375.67
+1156.87 , 3044.59 , 421.60
+1156.87 , 3382.88 , 467.75
+1156.87 , 3721.16 , 514.11
+1156.87 , 4059.45 , 560.69
+1156.87 , 4397.74 , 607.48
+1156.87 , 4736.03 , 654.50
+1156.87 , 5074.31 , 701.73
+1156.87 , 5412.60 , 749.18
+1156.87 , 5750.89 , 796.84
+1156.87 , 6089.18 , 844.73
+1156.87 , 6427.46 , 892.83
+1156.87 , 6765.75 , 941.14
+1245.86 , -7190.72 , -817.17
+1245.86 , -6831.19 , -777.76
+1245.86 , -6471.65 , -738.08
+1245.86 , -6112.11 , -698.15
+1245.86 , -5752.58 , -657.96
+1245.86 , -5393.04 , -617.52
+1245.86 , -5033.51 , -576.82
+1245.86 , -4673.97 , -535.86
+1245.86 , -4314.43 , -494.65
+1245.86 , -3954.90 , -453.18
+1245.86 , -3595.36 , -411.45
+1245.86 , -3235.82 , -369.47
+1245.86 , -2876.29 , -327.22
+1245.86 , -2516.75 , -284.72
+1245.86 , -2157.22 , -241.95
+1245.86 , -1797.68 , -198.90
+1245.86 , -1438.14 , -155.54
+1245.86 , -1078.61 , -111.82
+1245.86 , -719.07 , -67.51
+1245.86 , -359.54 , -20.80
+1245.86 , -71.91 , 0.00
+1245.86 , 67.66 , 23.52
+1245.86 , 338.29 , 65.48
+1245.86 , 676.58 , 114.20
+1245.86 , 1014.86 , 162.59
+1245.86 , 1353.15 , 211.06
+1245.86 , 1691.44 , 259.72
+1245.86 , 2029.73 , 308.59
+1245.86 , 2368.01 , 357.69
+1245.86 , 2706.30 , 407.04
+1245.86 , 3044.59 , 456.62
+1245.86 , 3382.88 , 506.46
+1245.86 , 3721.16 , 556.54
+1245.86 , 4059.45 , 606.87
+1245.86 , 4397.74 , 657.45
+1245.86 , 4736.03 , 708.28
+1245.86 , 5074.31 , 759.35
+1245.86 , 5412.60 , 810.68
+1245.86 , 5750.89 , 862.25
+1245.86 , 6089.18 , 914.07
+1245.86 , 6427.46 , 966.13
+1245.86 , 6765.75 , 1018.44
+1334.85 , -7190.72 , -869.86
+1334.85 , -6831.19 , -827.96
+1334.85 , -6471.65 , -785.77
+1334.85 , -6112.11 , -743.28
+1334.85 , -5752.58 , -700.50
+1334.85 , -5393.04 , -657.42
+1334.85 , -5033.51 , -614.05
+1334.85 , -4673.97 , -570.39
+1334.85 , -4314.43 , -526.44
+1334.85 , -3954.90 , -482.19
+1334.85 , -3595.36 , -437.65
+1334.85 , -3235.82 , -392.82
+1334.85 , -2876.29 , -347.69
+1334.85 , -2516.75 , -302.26
+1334.85 , -2157.22 , -256.52
+1334.85 , -1797.68 , -210.46
+1334.85 , -1438.14 , -164.04
+1334.85 , -1078.61 , -117.17
+1334.85 , -719.07 , -69.54
+1334.85 , -359.54 , -18.27
+1334.85 , -71.91 , 0.00
+1334.85 , 67.66 , 26.49
+1334.85 , 338.29 , 72.10
+1334.85 , 676.58 , 124.50
+1334.85 , 1014.86 , 176.46
+1334.85 , 1353.15 , 228.49
+1334.85 , 1691.44 , 280.71
+1334.85 , 2029.73 , 333.18
+1334.85 , 2368.01 , 385.90
+1334.85 , 2706.30 , 438.89
+1334.85 , 3044.59 , 492.16
+1334.85 , 3382.88 , 545.71
+1334.85 , 3721.16 , 599.54
+1334.85 , 4059.45 , 653.64
+1334.85 , 4397.74 , 708.03
+1334.85 , 4736.03 , 762.71
+1334.85 , 5074.31 , 817.66
+1334.85 , 5412.60 , 872.89
+1334.85 , 5750.89 , 928.41
+1334.85 , 6089.18 , 984.20
+1334.85 , 6427.46 , 1040.27
+1334.85 , 6765.75 , 1096.63
+1423.84 , -7190.72 , -921.56
+1423.84 , -6831.19 , -877.23
+1423.84 , -6471.65 , -832.56
+1423.84 , -6112.11 , -787.56
+1423.84 , -5752.58 , -742.22
+1423.84 , -5393.04 , -696.56
+1423.84 , -5033.51 , -650.56
+1423.84 , -4673.97 , -604.23
+1423.84 , -4314.43 , -557.56
+1423.84 , -3954.90 , -510.57
+1423.84 , -3595.36 , -463.24
+1423.84 , -3235.82 , -415.58
+1423.84 , -2876.29 , -367.58
+1423.84 , -2516.75 , -319.24
+1423.84 , -2157.22 , -270.55
+1423.84 , -1797.68 , -221.48
+1423.84 , -1438.14 , -171.99
+1423.84 , -1078.61 , -121.95
+1423.84 , -719.07 , -70.93
+1423.84 , -359.54 , -14.10
+1423.84 , -71.91 , 0.00
+1423.84 , 67.66 , 29.68
+1423.84 , 338.29 , 79.05
+1423.84 , 676.58 , 135.20
+1423.84 , 1014.86 , 190.76
+1423.84 , 1353.15 , 246.36
+1423.84 , 1691.44 , 302.17
+1423.84 , 2029.73 , 358.24
+1423.84 , 2368.01 , 414.60
+1423.84 , 2706.30 , 471.27
+1423.84 , 3044.59 , 528.24
+1423.84 , 3382.88 , 585.52
+1423.84 , 3721.16 , 643.12
+1423.84 , 4059.45 , 701.03
+1423.84 , 4397.74 , 759.26
+1423.84 , 4736.03 , 817.80
+1423.84 , 5074.31 , 876.66
+1423.84 , 5412.60 , 935.84
+1423.84 , 5750.89 , 995.34
+1423.84 , 6089.18 , 1055.15
+1423.84 , 6427.46 , 1115.27
+1423.84 , 6765.75 , 1175.71
+1512.83 , -7190.72 , -972.24
+1512.83 , -6831.19 , -925.52
+1512.83 , -6471.65 , -878.43
+1512.83 , -6112.11 , -830.96
+1512.83 , -5752.58 , -783.11
+1512.83 , -5393.04 , -734.89
+1512.83 , -5033.51 , -686.30
+1512.83 , -4673.97 , -637.33
+1512.83 , -4314.43 , -587.99
+1512.83 , -3954.90 , -538.28
+1512.83 , -3595.36 , -488.19
+1512.83 , -3235.82 , -437.72
+1512.83 , -2876.29 , -386.87
+1512.83 , -2516.75 , -335.63
+1512.83 , -2157.22 , -283.99
+1512.83 , -1797.68 , -231.92
+1512.83 , -1438.14 , -179.35
+1512.83 , -1078.61 , -126.12
+1512.83 , -719.07 , -71.60
+1512.83 , -359.54 , -6.45
+1512.83 , -71.91 , 0.00
+1512.83 , 67.66 , 33.08
+1512.83 , 338.29 , 86.37
+1512.83 , 676.58 , 146.31
+1512.83 , 1014.86 , 205.50
+1512.83 , 1353.15 , 264.70
+1512.83 , 1691.44 , 324.11
+1512.83 , 2029.73 , 383.81
+1512.83 , 2368.01 , 443.83
+1512.83 , 2706.30 , 504.18
+1512.83 , 3044.59 , 564.87
+1512.83 , 3382.88 , 625.91
+1512.83 , 3721.16 , 687.30
+1512.83 , 4059.45 , 749.05
+1512.83 , 4397.74 , 811.14
+1512.83 , 4736.03 , 873.59
+1512.83 , 5074.31 , 936.40
+1512.83 , 5412.60 , 999.56
+1512.83 , 5750.89 , 1063.07
+1512.83 , 6089.18 , 1126.93
+1512.83 , 6427.46 , 1191.14
+1512.83 , 6765.75 , 1255.71
+1601.82 , -7190.72 , -1021.86
+1601.82 , -6831.19 , -972.81
+1601.82 , -6471.65 , -923.33
+1601.82 , -6112.11 , -873.44
+1601.82 , -5752.58 , -823.13
+1601.82 , -5393.04 , -772.39
+1601.82 , -5033.51 , -721.24
+1601.82 , -4673.97 , -669.67
+1601.82 , -4314.43 , -617.68
+1601.82 , -3954.90 , -565.27
+1601.82 , -3595.36 , -512.45
+1601.82 , -3235.82 , -459.19
+1601.82 , -2876.29 , -405.51
+1601.82 , -2516.75 , -351.39
+1601.82 , -2157.22 , -296.81
+1601.82 , -1797.68 , -241.73
+1601.82 , -1438.14 , -186.07
+1601.82 , -1078.61 , -129.61
+1601.82 , -719.07 , -71.46
+1601.82 , -359.54 , 0.00
+1601.82 , -71.91 , 0.00
+1601.82 , 67.66 , 36.70
+1601.82 , 338.29 , 94.04
+1601.82 , 676.58 , 157.85
+1601.82 , 1014.86 , 220.70
+1601.82 , 1353.15 , 283.52
+1601.82 , 1691.44 , 346.56
+1601.82 , 2029.73 , 409.90
+1601.82 , 2368.01 , 473.59
+1601.82 , 2706.30 , 537.65
+1601.82 , 3044.59 , 602.09
+1601.82 , 3382.88 , 666.91
+1601.82 , 3721.16 , 732.12
+1601.82 , 4059.45 , 797.72
+1601.82 , 4397.74 , 863.72
+1601.82 , 4736.03 , 930.10
+1601.82 , 5074.31 , 996.88
+1601.82 , 5412.60 , 1064.05
+1601.82 , 5750.89 , 1131.62
+1601.82 , 6089.18 , 1199.57
+1601.82 , 6427.46 , 1267.92
+1601.82 , 6765.75 , 1336.65
+1690.81 , -7190.72 , -1070.37
+1690.81 , -6831.19 , -1019.04
+1690.81 , -6471.65 , -967.24
+1690.81 , -6112.11 , -914.96
+1690.81 , -5752.58 , -862.23
+1690.81 , -5393.04 , -809.02
+1690.81 , -5033.51 , -755.35
+1690.81 , -4673.97 , -701.21
+1690.81 , -4314.43 , -646.60
+1690.81 , -3954.90 , -591.53
+1690.81 , -3595.36 , -535.99
+1690.81 , -3235.82 , -479.97
+1690.81 , -2876.29 , -423.47
+1690.81 , -2516.75 , -366.48
+1690.81 , -2157.22 , -308.96
+1690.81 , -1797.68 , -250.88
+1690.81 , -1438.14 , -192.11
+1690.81 , -1078.61 , -132.36
+1690.81 , -719.07 , -70.38
+1690.81 , -359.54 , 0.00
+1690.81 , -71.91 , 0.00
+1690.81 , 67.66 , 40.53
+1690.81 , 338.29 , 102.10
+1690.81 , 676.58 , 169.83
+1690.81 , 1014.86 , 236.37
+1690.81 , 1353.15 , 302.84
+1690.81 , 1691.44 , 369.53
+1690.81 , 2029.73 , 436.54
+1690.81 , 2368.01 , 503.92
+1690.81 , 2706.30 , 571.71
+1690.81 , 3044.59 , 639.91
+1690.81 , 3382.88 , 708.54
+1690.81 , 3721.16 , 777.59
+1690.81 , 4059.45 , 847.08
+1690.81 , 4397.74 , 917.00
+1690.81 , 4736.03 , 987.35
+1690.81 , 5074.31 , 1058.14
+1690.81 , 5412.60 , 1129.36
+1690.81 , 5750.89 , 1201.01
+1690.81 , 6089.18 , 1273.09
+1690.81 , 6427.46 , 1345.61
+1690.81 , 6765.75 , 1418.56
+1779.80 , -7190.72 , -1117.74
+1779.80 , -6831.19 , -1064.18
+1779.80 , -6471.65 , -1010.10
+1779.80 , -6112.11 , -955.49
+1779.80 , -5752.58 , -900.37
+1779.80 , -5393.04 , -844.73
+1779.80 , -5033.51 , -788.58
+1779.80 , -4673.97 , -731.90
+1779.80 , -4314.43 , -674.71
+1779.80 , -3954.90 , -617.00
+1779.80 , -3595.36 , -558.77
+1779.80 , -3235.82 , -500.01
+1779.80 , -2876.29 , -440.71
+1779.80 , -2516.75 , -380.85
+1779.80 , -2157.22 , -320.40
+1779.80 , -1797.68 , -259.31
+1779.80 , -1438.14 , -197.41
+1779.80 , -1078.61 , -134.30
+1779.80 , -719.07 , -68.24
+1779.80 , -359.54 , 0.00
+1779.80 , -71.91 , 0.00
+1779.80 , 67.66 , 44.59
+1779.80 , 338.29 , 110.53
+1779.80 , 676.58 , 182.27
+1779.80 , 1014.86 , 252.55
+1779.80 , 1353.15 , 322.69
+1779.80 , 1691.44 , 393.04
+1779.80 , 2029.73 , 463.74
+1779.80 , 2368.01 , 534.84
+1779.80 , 2706.30 , 606.37
+1779.80 , 3044.59 , 678.37
+1779.80 , 3382.88 , 750.82
+1779.80 , 3721.16 , 823.74
+1779.80 , 4059.45 , 897.14
+1779.80 , 4397.74 , 971.01
+1779.80 , 4736.03 , 1045.36
+1779.80 , 5074.31 , 1120.19
+1779.80 , 5412.60 , 1195.49
+1779.80 , 5750.89 , 1271.27
+1779.80 , 6089.18 , 1347.52
+1779.80 , 6427.46 , 1424.25
+1779.80 , 6765.75 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..14358b02ff657904b67a1a81913128b0ff6bad78
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 6765.75 , -7190.72
+8.82 , 6765.75 , -7190.72
+89.03 , 6765.75 , -7190.72
+178.06 , 6765.75 , -7190.72
+266.88 , 6765.75 , -7190.72
+355.91 , 6765.75 , -7190.72
+444.95 , 6765.75 , -7190.72
+533.98 , 5638.13 , -5992.27
+623.01 , 4832.64 , -5136.19
+711.83 , 4228.59 , -4494.20
+800.86 , 3758.78 , -3994.88
+889.89 , 3382.88 , -3595.36
+978.92 , 3075.35 , -3268.52
+1067.96 , 2819.06 , -2996.13
+1156.77 , 2602.20 , -2765.65
+1245.81 , 2416.37 , -2568.14
+1334.84 , 2255.25 , -2396.91
+1423.87 , 2114.34 , -2247.15
+1512.90 , 1989.94 , -2114.94
+1601.72 , 1879.34 , -1997.39
+1690.75 , 1780.47 , -1892.31
+1779.78 , 1691.44 , -1797.68
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..14358b02ff657904b67a1a81913128b0ff6bad78
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 6765.75 , -7190.72
+8.82 , 6765.75 , -7190.72
+89.03 , 6765.75 , -7190.72
+178.06 , 6765.75 , -7190.72
+266.88 , 6765.75 , -7190.72
+355.91 , 6765.75 , -7190.72
+444.95 , 6765.75 , -7190.72
+533.98 , 5638.13 , -5992.27
+623.01 , 4832.64 , -5136.19
+711.83 , 4228.59 , -4494.20
+800.86 , 3758.78 , -3994.88
+889.89 , 3382.88 , -3595.36
+978.92 , 3075.35 , -3268.52
+1067.96 , 2819.06 , -2996.13
+1156.77 , 2602.20 , -2765.65
+1245.81 , 2416.37 , -2568.14
+1334.84 , 2255.25 , -2396.91
+1423.87 , 2114.34 , -2247.15
+1512.90 , 1989.94 , -2114.94
+1601.72 , 1879.34 , -1997.39
+1690.75 , 1780.47 , -1892.31
+1779.78 , 1691.44 , -1797.68
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_drag.viepcd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..ffb4883b312afeed23be5a96783b2b92e3c03bed
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC_Gbx1_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -13.76
+8.90 , -14.19
+88.99 , -18.22
+177.98 , -22.67
+266.97 , -27.13
+355.96 , -31.64
+444.95 , -36.10
+533.94 , -40.56
+622.93 , -45.01
+711.92 , -49.47
+800.91 , -53.98
+889.90 , -58.44
+978.89 , -62.89
+1067.88 , -67.35
+1156.87 , -71.81
+1245.86 , -76.32
+1334.85 , -80.78
+1423.84 , -85.23
+1512.83 , -89.69
+1601.82 , -94.15
+1690.81 , -98.66
+1779.80 , -103.11
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/GenericIEPC_Gbx3Axl.viepc b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/GenericIEPC_Gbx3Axl.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..960168f579fdda05ed04d0089c7fb128803c6922
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/GenericIEPC_Gbx3Axl.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": true,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 21.9384
+ },
+ {
+ "Ratio": 12.276
+ },
+ {
+ "Ratio": 7.2336
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3Axl_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Axl_1.viepco",
+ "2": "IEPC_Gbx3Axl_2.viepco",
+ "3": "IEPC_Gbx3Axl_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3Axl_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Axl_1.viepco",
+ "2": "IEPC_Gbx3Axl_2.viepco",
+ "3": "IEPC_Gbx3Axl_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3Axl_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_ENG_Gbx3Axl.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_ENG_Gbx3Axl.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..f06545a5fa8c567c132fcd4291c0c5292bcce37c
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_ENG_Gbx3Axl.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx3Axl.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_Vehicle_Gbx3Axl.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_Vehicle_Gbx3Axl.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..62b96216fe4a1a5d4d908d32e13745bc1c0747fa
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_Vehicle_Gbx3Axl.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3Axl.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_1.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..6661444505d1f80e1b7ccf4680f069a1394f3e8d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -35338.92 , 0.00
+0.00 , -33571.97 , 0.00
+0.00 , -31805.03 , 0.00
+0.00 , -30038.08 , 0.00
+0.00 , -28271.13 , 0.00
+0.00 , -26504.19 , 0.00
+0.00 , -24737.24 , -0.13
+0.00 , -22970.30 , -0.66
+0.00 , -21203.35 , -0.98
+0.00 , -19436.40 , -1.19
+0.00 , -17669.46 , -1.32
+0.00 , -15902.51 , -1.38
+0.00 , -14135.57 , -1.39
+0.00 , -12368.62 , -1.35
+0.00 , -10601.68 , -1.26
+0.00 , -8834.73 , -1.13
+0.00 , -7067.78 , -0.97
+0.00 , -5300.84 , -0.77
+0.00 , -3533.89 , -0.53
+0.00 , -1766.95 , -0.27
+0.00 , -353.39 , -0.02
+0.00 , 306.44 , 0.13
+0.00 , 1532.18 , 0.56
+0.00 , 3064.36 , 1.12
+0.00 , 4596.53 , 1.70
+0.00 , 6128.71 , 2.31
+0.00 , 7660.89 , 2.93
+0.00 , 9193.07 , 3.58
+0.00 , 10725.24 , 4.25
+0.00 , 12257.42 , 4.93
+0.00 , 13789.60 , 5.64
+0.00 , 15321.78 , 6.37
+0.00 , 16853.96 , 7.12
+0.00 , 18386.13 , 7.88
+0.00 , 19918.31 , 8.67
+0.00 , 21450.49 , 9.47
+0.00 , 22982.67 , 10.29
+0.00 , 24514.85 , 11.13
+0.00 , 26047.02 , 11.99
+0.00 , 27579.20 , 12.87
+0.00 , 29111.38 , 13.76
+0.00 , 30643.56 , 14.67
+1.89 , -35338.92 , 0.00
+1.89 , -33571.97 , 0.00
+1.89 , -31805.03 , 0.00
+1.89 , -30038.08 , 0.00
+1.89 , -28271.13 , 0.00
+1.89 , -26504.19 , 0.00
+1.89 , -24737.24 , -0.50
+1.89 , -22970.30 , -0.84
+1.89 , -21203.35 , -1.04
+1.89 , -19436.40 , -1.16
+1.89 , -17669.46 , -1.22
+1.89 , -15902.51 , -1.24
+1.89 , -14135.57 , -1.21
+1.89 , -12368.62 , -1.15
+1.89 , -10601.68 , -1.06
+1.89 , -8834.73 , -0.94
+1.89 , -7067.78 , -0.80
+1.89 , -5300.84 , -0.62
+1.89 , -3533.89 , -0.43
+1.89 , -1766.95 , -0.21
+1.89 , -353.39 , -0.02
+1.89 , 306.44 , 0.10
+1.89 , 1532.18 , 0.43
+1.89 , 3064.36 , 0.85
+1.89 , 4596.53 , 1.30
+1.89 , 6128.71 , 1.75
+1.89 , 7660.89 , 2.23
+1.89 , 9193.07 , 2.71
+1.89 , 10725.24 , 3.21
+1.89 , 12257.42 , 3.73
+1.89 , 13789.60 , 4.26
+1.89 , 15321.78 , 4.80
+1.89 , 16853.96 , 5.36
+1.89 , 18386.13 , 5.93
+1.89 , 19918.31 , 6.52
+1.89 , 21450.49 , 7.12
+1.89 , 22982.67 , 7.73
+1.89 , 24514.85 , 8.35
+1.89 , 26047.02 , 8.99
+1.89 , 27579.20 , 9.64
+1.89 , 29111.38 , 10.30
+1.89 , 30643.56 , 10.98
+18.86 , -35338.92 , -58.10
+18.86 , -33571.97 , -55.37
+18.86 , -31805.03 , -52.62
+18.86 , -30038.08 , -49.85
+18.86 , -28271.13 , -47.06
+18.86 , -26504.19 , -44.25
+18.86 , -24737.24 , -41.42
+18.86 , -22970.30 , -38.57
+18.86 , -21203.35 , -35.70
+18.86 , -19436.40 , -32.81
+18.86 , -17669.46 , -29.90
+18.86 , -15902.51 , -26.98
+18.86 , -14135.57 , -24.03
+18.86 , -12368.62 , -21.07
+18.86 , -10601.68 , -18.08
+18.86 , -8834.73 , -15.08
+18.86 , -7067.78 , -12.06
+18.86 , -5300.84 , -9.02
+18.86 , -3533.89 , -5.96
+18.86 , -1766.95 , -2.88
+18.86 , -353.39 , -0.37
+18.86 , 306.44 , 0.90
+18.86 , 1532.18 , 3.68
+18.86 , 3064.36 , 7.16
+18.86 , 4596.53 , 10.66
+18.86 , 6128.71 , 14.17
+18.86 , 7660.89 , 17.71
+18.86 , 9193.07 , 21.26
+18.86 , 10725.24 , 24.84
+18.86 , 12257.42 , 28.43
+18.86 , 13789.60 , 32.04
+18.86 , 15321.78 , 35.67
+18.86 , 16853.96 , 39.32
+18.86 , 18386.13 , 42.99
+18.86 , 19918.31 , 46.68
+18.86 , 21450.49 , 50.38
+18.86 , 22982.67 , 54.11
+18.86 , 24514.85 , 57.85
+18.86 , 26047.02 , 61.61
+18.86 , 27579.20 , 65.39
+18.86 , 29111.38 , 69.19
+18.86 , 30643.56 , 73.01
+37.72 , -35338.92 , -120.57
+37.72 , -33571.97 , -114.73
+37.72 , -31805.03 , -108.87
+37.72 , -30038.08 , -102.99
+37.72 , -28271.13 , -97.08
+37.72 , -26504.19 , -91.15
+37.72 , -24737.24 , -85.20
+37.72 , -22970.30 , -79.23
+37.72 , -21203.35 , -73.23
+37.72 , -19436.40 , -67.21
+37.72 , -17669.46 , -61.17
+37.72 , -15902.51 , -55.10
+37.72 , -14135.57 , -49.01
+37.72 , -12368.62 , -42.90
+37.72 , -10601.68 , -36.77
+37.72 , -8834.73 , -30.61
+37.72 , -7067.78 , -24.43
+37.72 , -5300.84 , -18.23
+37.72 , -3533.89 , -12.01
+37.72 , -1766.95 , -5.76
+37.72 , -353.39 , -0.66
+37.72 , 306.44 , 1.84
+37.72 , 1532.18 , 7.35
+37.72 , 3064.36 , 14.22
+37.72 , 4596.53 , 21.11
+37.72 , 6128.71 , 28.02
+37.72 , 7660.89 , 34.96
+37.72 , 9193.07 , 41.92
+37.72 , 10725.24 , 48.90
+37.72 , 12257.42 , 55.90
+37.72 , 13789.60 , 62.93
+37.72 , 15321.78 , 69.98
+37.72 , 16853.96 , 77.05
+37.72 , 18386.13 , 84.15
+37.72 , 19918.31 , 91.27
+37.72 , 21450.49 , 98.41
+37.72 , 22982.67 , 105.58
+37.72 , 24514.85 , 112.76
+37.72 , 26047.02 , 119.97
+37.72 , 27579.20 , 127.21
+37.72 , 29111.38 , 134.46
+37.72 , 30643.56 , 141.74
+56.59 , -35338.92 , -182.44
+56.59 , -33571.97 , -173.55
+56.59 , -31805.03 , -164.62
+56.59 , -30038.08 , -155.67
+56.59 , -28271.13 , -146.69
+56.59 , -26504.19 , -137.68
+56.59 , -24737.24 , -128.65
+56.59 , -22970.30 , -119.58
+56.59 , -21203.35 , -110.49
+56.59 , -19436.40 , -101.36
+56.59 , -17669.46 , -92.21
+56.59 , -15902.51 , -83.03
+56.59 , -14135.57 , -73.82
+56.59 , -12368.62 , -64.58
+56.59 , -10601.68 , -55.31
+56.59 , -8834.73 , -46.02
+56.59 , -7067.78 , -36.70
+56.59 , -5300.84 , -27.34
+56.59 , -3533.89 , -17.96
+56.59 , -1766.95 , -8.54
+56.59 , -353.39 , -0.79
+56.59 , 306.44 , 2.86
+56.59 , 1532.18 , 11.12
+56.59 , 3064.36 , 21.39
+56.59 , 4596.53 , 31.68
+56.59 , 6128.71 , 41.99
+56.59 , 7660.89 , 52.34
+56.59 , 9193.07 , 62.71
+56.59 , 10725.24 , 73.12
+56.59 , 12257.42 , 83.55
+56.59 , 13789.60 , 94.01
+56.59 , 15321.78 , 104.50
+56.59 , 16853.96 , 115.02
+56.59 , 18386.13 , 125.57
+56.59 , 19918.31 , 136.15
+56.59 , 21450.49 , 146.76
+56.59 , 22982.67 , 157.40
+56.59 , 24514.85 , 168.06
+56.59 , 26047.02 , 178.76
+56.59 , 27579.20 , 189.48
+56.59 , 29111.38 , 200.23
+56.59 , 30643.56 , 211.02
+75.45 , -35338.92 , -243.71
+75.45 , -33571.97 , -231.81
+75.45 , -31805.03 , -219.87
+75.45 , -30038.08 , -207.89
+75.45 , -28271.13 , -195.88
+75.45 , -26504.19 , -183.83
+75.45 , -24737.24 , -171.74
+75.45 , -22970.30 , -159.61
+75.45 , -21203.35 , -147.45
+75.45 , -19436.40 , -135.25
+75.45 , -17669.46 , -123.01
+75.45 , -15902.51 , -110.74
+75.45 , -14135.57 , -98.43
+75.45 , -12368.62 , -86.08
+75.45 , -10601.68 , -73.70
+75.45 , -8834.73 , -61.27
+75.45 , -7067.78 , -48.82
+75.45 , -5300.84 , -36.32
+75.45 , -3533.89 , -23.78
+75.45 , -1766.95 , -11.19
+75.45 , -353.39 , -0.63
+75.45 , 306.44 , 3.98
+75.45 , 1532.18 , 15.01
+75.45 , 3064.36 , 28.68
+75.45 , 4596.53 , 42.37
+75.45 , 6128.71 , 56.10
+75.45 , 7660.89 , 69.87
+75.45 , 9193.07 , 83.67
+75.45 , 10725.24 , 97.52
+75.45 , 12257.42 , 111.40
+75.45 , 13789.60 , 125.31
+75.45 , 15321.78 , 139.27
+75.45 , 16853.96 , 153.26
+75.45 , 18386.13 , 167.29
+75.45 , 19918.31 , 181.36
+75.45 , 21450.49 , 195.46
+75.45 , 22982.67 , 209.61
+75.45 , 24514.85 , 223.79
+75.45 , 26047.02 , 238.01
+75.45 , 27579.20 , 252.26
+75.45 , 29111.38 , 266.56
+75.45 , 30643.56 , 280.89
+94.31 , -35338.92 , -304.37
+94.31 , -33571.97 , -289.50
+94.31 , -31805.03 , -274.59
+94.31 , -30038.08 , -259.63
+94.31 , -28271.13 , -244.61
+94.31 , -26504.19 , -229.56
+94.31 , -24737.24 , -214.45
+94.31 , -22970.30 , -199.30
+94.31 , -21203.35 , -184.10
+94.31 , -19436.40 , -168.85
+94.31 , -17669.46 , -153.55
+94.31 , -15902.51 , -138.20
+94.31 , -14135.57 , -122.81
+94.31 , -12368.62 , -107.37
+94.31 , -10601.68 , -91.88
+94.31 , -8834.73 , -76.35
+94.31 , -7067.78 , -60.76
+94.31 , -5300.84 , -45.13
+94.31 , -3533.89 , -29.44
+94.31 , -1766.95 , -13.67
+94.31 , -353.39 , 0.00
+94.31 , 306.44 , 5.21
+94.31 , 1532.18 , 19.04
+94.31 , 3064.36 , 36.13
+94.31 , 4596.53 , 53.24
+94.31 , 6128.71 , 70.39
+94.31 , 7660.89 , 87.59
+94.31 , 9193.07 , 104.83
+94.31 , 10725.24 , 122.13
+94.31 , 12257.42 , 139.47
+94.31 , 13789.60 , 156.87
+94.31 , 15321.78 , 174.31
+94.31 , 16853.96 , 191.80
+94.31 , 18386.13 , 209.33
+94.31 , 19918.31 , 226.92
+94.31 , 21450.49 , 244.56
+94.31 , 22982.67 , 262.24
+94.31 , 24514.85 , 279.97
+94.31 , 26047.02 , 297.76
+94.31 , 27579.20 , 315.58
+94.31 , 29111.38 , 333.46
+94.31 , 30643.56 , 351.39
+113.17 , -35338.92 , -364.37
+113.17 , -33571.97 , -346.59
+113.17 , -31805.03 , -328.74
+113.17 , -30038.08 , -310.84
+113.17 , -28271.13 , -292.87
+113.17 , -26504.19 , -274.84
+113.17 , -24737.24 , -256.75
+113.17 , -22970.30 , -238.60
+113.17 , -21203.35 , -220.39
+113.17 , -19436.40 , -202.12
+113.17 , -17669.46 , -183.79
+113.17 , -15902.51 , -165.40
+113.17 , -14135.57 , -146.94
+113.17 , -12368.62 , -128.43
+113.17 , -10601.68 , -109.85
+113.17 , -8834.73 , -91.21
+113.17 , -7067.78 , -72.51
+113.17 , -5300.84 , -53.75
+113.17 , -3533.89 , -34.91
+113.17 , -1766.95 , -15.95
+113.17 , -353.39 , 0.00
+113.17 , 306.44 , 6.58
+113.17 , 1532.18 , 23.25
+113.17 , 3064.36 , 43.76
+113.17 , 4596.53 , 64.29
+113.17 , 6128.71 , 84.87
+113.17 , 7660.89 , 105.52
+113.17 , 9193.07 , 126.22
+113.17 , 10725.24 , 146.98
+113.17 , 12257.42 , 167.81
+113.17 , 13789.60 , 188.70
+113.17 , 15321.78 , 209.65
+113.17 , 16853.96 , 230.66
+113.17 , 18386.13 , 251.73
+113.17 , 19918.31 , 272.87
+113.17 , 21450.49 , 294.07
+113.17 , 22982.67 , 315.33
+113.17 , 24514.85 , 336.65
+113.17 , 26047.02 , 358.03
+113.17 , 27579.20 , 379.47
+113.17 , 29111.38 , 400.98
+113.17 , 30643.56 , 422.54
+132.03 , -35338.92 , -423.69
+132.03 , -33571.97 , -403.04
+132.03 , -31805.03 , -382.31
+132.03 , -30038.08 , -361.50
+132.03 , -28271.13 , -340.62
+132.03 , -26504.19 , -319.66
+132.03 , -24737.24 , -298.62
+132.03 , -22970.30 , -277.51
+132.03 , -21203.35 , -256.31
+132.03 , -19436.40 , -235.05
+132.03 , -17669.46 , -213.70
+132.03 , -15902.51 , -192.28
+132.03 , -14135.57 , -170.79
+132.03 , -12368.62 , -149.21
+132.03 , -10601.68 , -127.57
+132.03 , -8834.73 , -105.84
+132.03 , -7067.78 , -84.03
+132.03 , -5300.84 , -62.14
+132.03 , -3533.89 , -40.16
+132.03 , -1766.95 , -18.00
+132.03 , -353.39 , 0.00
+132.03 , 306.44 , 8.09
+132.03 , 1532.18 , 27.64
+132.03 , 3064.36 , 51.59
+132.03 , 4596.53 , 75.56
+132.03 , 6128.71 , 99.58
+132.03 , 7660.89 , 123.68
+132.03 , 9193.07 , 147.86
+132.03 , 10725.24 , 172.10
+132.03 , 12257.42 , 196.43
+132.03 , 13789.60 , 220.84
+132.03 , 15321.78 , 245.32
+132.03 , 16853.96 , 269.88
+132.03 , 18386.13 , 294.51
+132.03 , 19918.31 , 319.23
+132.03 , 21450.49 , 344.02
+132.03 , 22982.67 , 368.89
+132.03 , 24514.85 , 393.83
+132.03 , 26047.02 , 418.85
+132.03 , 27579.20 , 443.95
+132.03 , 29111.38 , 469.13
+132.03 , 30643.56 , 494.38
+150.90 , -35338.92 , -482.31
+150.90 , -33571.97 , -458.83
+150.90 , -31805.03 , -435.26
+150.90 , -30038.08 , -411.59
+150.90 , -28271.13 , -387.83
+150.90 , -26504.19 , -363.97
+150.90 , -24737.24 , -340.02
+150.90 , -22970.30 , -315.97
+150.90 , -21203.35 , -291.83
+150.90 , -19436.40 , -267.59
+150.90 , -17669.46 , -243.26
+150.90 , -15902.51 , -218.84
+150.90 , -14135.57 , -194.32
+150.90 , -12368.62 , -169.71
+150.90 , -10601.68 , -145.00
+150.90 , -8834.73 , -120.19
+150.90 , -7067.78 , -95.29
+150.90 , -5300.84 , -70.28
+150.90 , -3533.89 , -45.14
+150.90 , -1766.95 , -19.76
+150.90 , -353.39 , 0.00
+150.90 , 306.44 , 9.76
+150.90 , 1532.18 , 32.25
+150.90 , 3064.36 , 59.66
+150.90 , 4596.53 , 87.07
+150.90 , 6128.71 , 114.55
+150.90 , 7660.89 , 142.11
+150.90 , 9193.07 , 169.77
+150.90 , 10725.24 , 197.52
+150.90 , 12257.42 , 225.37
+150.90 , 13789.60 , 253.31
+150.90 , 15321.78 , 281.34
+150.90 , 16853.96 , 309.47
+150.90 , 18386.13 , 337.70
+150.90 , 19918.31 , 366.02
+150.90 , 21450.49 , 394.44
+150.90 , 22982.67 , 422.95
+150.90 , 24514.85 , 451.56
+150.90 , 26047.02 , 480.26
+150.90 , 27579.20 , 509.05
+150.90 , 29111.38 , 537.94
+150.90 , 30643.56 , 566.93
+169.76 , -35338.92 , -540.17
+169.76 , -33571.97 , -513.92
+169.76 , -31805.03 , -487.55
+169.76 , -30038.08 , -461.06
+169.76 , -28271.13 , -434.46
+169.76 , -26504.19 , -407.75
+169.76 , -24737.24 , -380.92
+169.76 , -22970.30 , -353.97
+169.76 , -21203.35 , -326.91
+169.76 , -19436.40 , -299.73
+169.76 , -17669.46 , -272.44
+169.76 , -15902.51 , -245.03
+169.76 , -14135.57 , -217.51
+169.76 , -12368.62 , -189.87
+169.76 , -10601.68 , -162.12
+169.76 , -8834.73 , -134.25
+169.76 , -7067.78 , -106.26
+169.76 , -5300.84 , -78.13
+169.76 , -3533.89 , -49.84
+169.76 , -1766.95 , -21.19
+169.76 , -353.39 , 0.00
+169.76 , 306.44 , 11.59
+169.76 , 1532.18 , 37.10
+169.76 , 3064.36 , 67.98
+169.76 , 4596.53 , 98.85
+169.76 , 6128.71 , 129.79
+169.76 , 7660.89 , 160.84
+169.76 , 9193.07 , 191.99
+169.76 , 10725.24 , 223.26
+169.76 , 12257.42 , 254.64
+169.76 , 13789.60 , 286.14
+169.76 , 15321.78 , 317.75
+169.76 , 16853.96 , 349.48
+169.76 , 18386.13 , 381.32
+169.76 , 19918.31 , 413.28
+169.76 , 21450.49 , 445.36
+169.76 , 22982.67 , 477.54
+169.76 , 24514.85 , 509.85
+169.76 , 26047.02 , 542.27
+169.76 , 27579.20 , 574.80
+169.76 , 29111.38 , 607.45
+169.76 , 30643.56 , 640.21
+188.62 , -35338.92 , -597.26
+188.62 , -33571.97 , -568.28
+188.62 , -31805.03 , -539.16
+188.62 , -30038.08 , -509.90
+188.62 , -28271.13 , -480.50
+188.62 , -26504.19 , -450.96
+188.62 , -24737.24 , -421.28
+188.62 , -22970.30 , -391.47
+188.62 , -21203.35 , -361.52
+188.62 , -19436.40 , -331.43
+188.62 , -17669.46 , -301.20
+188.62 , -15902.51 , -270.83
+188.62 , -14135.57 , -240.33
+188.62 , -12368.62 , -209.68
+188.62 , -10601.68 , -178.90
+188.62 , -8834.73 , -147.97
+188.62 , -7067.78 , -116.90
+188.62 , -5300.84 , -85.66
+188.62 , -3533.89 , -54.21
+188.62 , -1766.95 , -22.23
+188.62 , -353.39 , 0.00
+188.62 , 306.44 , 13.60
+188.62 , 1532.18 , 42.20
+188.62 , 3064.36 , 76.58
+188.62 , 4596.53 , 110.92
+188.62 , 6128.71 , 145.34
+188.62 , 7660.89 , 179.88
+188.62 , 9193.07 , 214.55
+188.62 , 10725.24 , 249.35
+188.62 , 12257.42 , 284.29
+188.62 , 13789.60 , 319.36
+188.62 , 15321.78 , 354.57
+188.62 , 16853.96 , 389.92
+188.62 , 18386.13 , 425.41
+188.62 , 19918.31 , 461.03
+188.62 , 21450.49 , 496.79
+188.62 , 22982.67 , 532.69
+188.62 , 24514.85 , 568.73
+188.62 , 26047.02 , 604.90
+188.62 , 27579.20 , 641.21
+188.62 , 29111.38 , 677.66
+188.62 , 30643.56 , 714.24
+207.48 , -35338.92 , -653.54
+207.48 , -33571.97 , -621.88
+207.48 , -31805.03 , -590.05
+207.48 , -30038.08 , -558.06
+207.48 , -28271.13 , -525.90
+207.48 , -26504.19 , -493.58
+207.48 , -24737.24 , -461.09
+207.48 , -22970.30 , -428.44
+207.48 , -21203.35 , -395.63
+207.48 , -19436.40 , -362.65
+207.48 , -17669.46 , -329.51
+207.48 , -15902.51 , -296.21
+207.48 , -14135.57 , -262.74
+207.48 , -12368.62 , -229.11
+207.48 , -10601.68 , -195.31
+207.48 , -8834.73 , -161.34
+207.48 , -7067.78 , -127.18
+207.48 , -5300.84 , -92.83
+207.48 , -3533.89 , -58.20
+207.48 , -1766.95 , -22.82
+207.48 , -353.39 , 0.00
+207.48 , 306.44 , 15.79
+207.48 , 1532.18 , 47.58
+207.48 , 3064.36 , 85.48
+207.48 , 4596.53 , 123.30
+207.48 , 6128.71 , 161.22
+207.48 , 7660.89 , 199.26
+207.48 , 9193.07 , 237.46
+207.48 , 10725.24 , 275.81
+207.48 , 12257.42 , 314.32
+207.48 , 13789.60 , 352.99
+207.48 , 15321.78 , 391.83
+207.48 , 16853.96 , 430.82
+207.48 , 18386.13 , 469.98
+207.48 , 19918.31 , 509.30
+207.48 , 21450.49 , 548.78
+207.48 , 22982.67 , 588.42
+207.48 , 24514.85 , 628.23
+207.48 , 26047.02 , 668.20
+207.48 , 27579.20 , 708.32
+207.48 , 29111.38 , 748.61
+207.48 , 30643.56 , 789.06
+226.34 , -35338.92 , -708.97
+226.34 , -33571.97 , -674.68
+226.34 , -31805.03 , -640.19
+226.34 , -30038.08 , -605.51
+226.34 , -28271.13 , -570.63
+226.34 , -26504.19 , -535.56
+226.34 , -24737.24 , -500.30
+226.34 , -22970.30 , -464.85
+226.34 , -21203.35 , -429.21
+226.34 , -19436.40 , -393.37
+226.34 , -17669.46 , -357.35
+226.34 , -15902.51 , -321.13
+226.34 , -14135.57 , -284.71
+226.34 , -12368.62 , -248.11
+226.34 , -10601.68 , -211.31
+226.34 , -8834.73 , -174.30
+226.34 , -7067.78 , -137.08
+226.34 , -5300.84 , -99.61
+226.34 , -3533.89 , -61.78
+226.34 , -1766.95 , -22.86
+226.34 , -353.39 , 0.00
+226.34 , 306.44 , 18.17
+226.34 , 1532.18 , 53.24
+226.34 , 3064.36 , 94.71
+226.34 , 4596.53 , 136.03
+226.34 , 6128.71 , 177.45
+226.34 , 7660.89 , 219.01
+226.34 , 9193.07 , 260.75
+226.34 , 10725.24 , 302.67
+226.34 , 12257.42 , 344.78
+226.34 , 13789.60 , 387.07
+226.34 , 15321.78 , 429.54
+226.34 , 16853.96 , 472.21
+226.34 , 18386.13 , 515.06
+226.34 , 19918.31 , 558.11
+226.34 , 21450.49 , 601.34
+226.34 , 22982.67 , 644.76
+226.34 , 24514.85 , 688.37
+226.34 , 26047.02 , 732.17
+226.34 , 27579.20 , 776.15
+226.34 , 29111.38 , 820.33
+226.34 , 30643.56 , 864.69
+245.21 , -35338.92 , -763.53
+245.21 , -33571.97 , -726.65
+245.21 , -31805.03 , -689.55
+245.21 , -30038.08 , -652.22
+245.21 , -28271.13 , -614.67
+245.21 , -26504.19 , -576.89
+245.21 , -24737.24 , -538.89
+245.21 , -22970.30 , -500.67
+245.21 , -21203.35 , -462.22
+245.21 , -19436.40 , -423.56
+245.21 , -17669.46 , -384.67
+245.21 , -15902.51 , -345.56
+245.21 , -14135.57 , -306.22
+245.21 , -12368.62 , -266.66
+245.21 , -10601.68 , -226.86
+245.21 , -8834.73 , -186.83
+245.21 , -7067.78 , -146.54
+245.21 , -5300.84 , -105.95
+245.21 , -3533.89 , -64.90
+245.21 , -1766.95 , -22.24
+245.21 , -353.39 , 0.00
+245.21 , 306.44 , 20.74
+245.21 , 1532.18 , 59.20
+245.21 , 3064.36 , 104.27
+245.21 , 4596.53 , 149.12
+245.21 , 6128.71 , 194.05
+245.21 , 7660.89 , 239.16
+245.21 , 9193.07 , 284.45
+245.21 , 10725.24 , 329.96
+245.21 , 12257.42 , 375.67
+245.21 , 13789.60 , 421.60
+245.21 , 15321.78 , 467.75
+245.21 , 16853.96 , 514.11
+245.21 , 18386.13 , 560.69
+245.21 , 19918.31 , 607.48
+245.21 , 21450.49 , 654.50
+245.21 , 22982.67 , 701.73
+245.21 , 24514.85 , 749.18
+245.21 , 26047.02 , 796.84
+245.21 , 27579.20 , 844.73
+245.21 , 29111.38 , 892.83
+245.21 , 30643.56 , 941.14
+264.07 , -35338.92 , -817.17
+264.07 , -33571.97 , -777.76
+264.07 , -31805.03 , -738.08
+264.07 , -30038.08 , -698.15
+264.07 , -28271.13 , -657.96
+264.07 , -26504.19 , -617.52
+264.07 , -24737.24 , -576.82
+264.07 , -22970.30 , -535.86
+264.07 , -21203.35 , -494.65
+264.07 , -19436.40 , -453.18
+264.07 , -17669.46 , -411.45
+264.07 , -15902.51 , -369.47
+264.07 , -14135.57 , -327.22
+264.07 , -12368.62 , -284.72
+264.07 , -10601.68 , -241.95
+264.07 , -8834.73 , -198.90
+264.07 , -7067.78 , -155.54
+264.07 , -5300.84 , -111.82
+264.07 , -3533.89 , -67.51
+264.07 , -1766.95 , -20.80
+264.07 , -353.39 , 0.00
+264.07 , 306.44 , 23.52
+264.07 , 1532.18 , 65.48
+264.07 , 3064.36 , 114.20
+264.07 , 4596.53 , 162.59
+264.07 , 6128.71 , 211.06
+264.07 , 7660.89 , 259.72
+264.07 , 9193.07 , 308.59
+264.07 , 10725.24 , 357.69
+264.07 , 12257.42 , 407.04
+264.07 , 13789.60 , 456.62
+264.07 , 15321.78 , 506.46
+264.07 , 16853.96 , 556.54
+264.07 , 18386.13 , 606.87
+264.07 , 19918.31 , 657.45
+264.07 , 21450.49 , 708.28
+264.07 , 22982.67 , 759.35
+264.07 , 24514.85 , 810.68
+264.07 , 26047.02 , 862.25
+264.07 , 27579.20 , 914.07
+264.07 , 29111.38 , 966.13
+264.07 , 30643.56 , 1018.44
+282.93 , -35338.92 , -869.86
+282.93 , -33571.97 , -827.96
+282.93 , -31805.03 , -785.77
+282.93 , -30038.08 , -743.28
+282.93 , -28271.13 , -700.50
+282.93 , -26504.19 , -657.42
+282.93 , -24737.24 , -614.05
+282.93 , -22970.30 , -570.39
+282.93 , -21203.35 , -526.44
+282.93 , -19436.40 , -482.19
+282.93 , -17669.46 , -437.65
+282.93 , -15902.51 , -392.82
+282.93 , -14135.57 , -347.69
+282.93 , -12368.62 , -302.26
+282.93 , -10601.68 , -256.52
+282.93 , -8834.73 , -210.46
+282.93 , -7067.78 , -164.04
+282.93 , -5300.84 , -117.17
+282.93 , -3533.89 , -69.54
+282.93 , -1766.95 , -18.27
+282.93 , -353.39 , 0.00
+282.93 , 306.44 , 26.49
+282.93 , 1532.18 , 72.10
+282.93 , 3064.36 , 124.50
+282.93 , 4596.53 , 176.46
+282.93 , 6128.71 , 228.49
+282.93 , 7660.89 , 280.71
+282.93 , 9193.07 , 333.18
+282.93 , 10725.24 , 385.90
+282.93 , 12257.42 , 438.89
+282.93 , 13789.60 , 492.16
+282.93 , 15321.78 , 545.71
+282.93 , 16853.96 , 599.54
+282.93 , 18386.13 , 653.64
+282.93 , 19918.31 , 708.03
+282.93 , 21450.49 , 762.71
+282.93 , 22982.67 , 817.66
+282.93 , 24514.85 , 872.89
+282.93 , 26047.02 , 928.41
+282.93 , 27579.20 , 984.20
+282.93 , 29111.38 , 1040.27
+282.93 , 30643.56 , 1096.63
+301.79 , -35338.92 , -921.56
+301.79 , -33571.97 , -877.23
+301.79 , -31805.03 , -832.56
+301.79 , -30038.08 , -787.56
+301.79 , -28271.13 , -742.22
+301.79 , -26504.19 , -696.56
+301.79 , -24737.24 , -650.56
+301.79 , -22970.30 , -604.23
+301.79 , -21203.35 , -557.56
+301.79 , -19436.40 , -510.57
+301.79 , -17669.46 , -463.24
+301.79 , -15902.51 , -415.58
+301.79 , -14135.57 , -367.58
+301.79 , -12368.62 , -319.24
+301.79 , -10601.68 , -270.55
+301.79 , -8834.73 , -221.48
+301.79 , -7067.78 , -171.99
+301.79 , -5300.84 , -121.95
+301.79 , -3533.89 , -70.93
+301.79 , -1766.95 , -14.10
+301.79 , -353.39 , 0.00
+301.79 , 306.44 , 29.68
+301.79 , 1532.18 , 79.05
+301.79 , 3064.36 , 135.20
+301.79 , 4596.53 , 190.76
+301.79 , 6128.71 , 246.36
+301.79 , 7660.89 , 302.17
+301.79 , 9193.07 , 358.24
+301.79 , 10725.24 , 414.60
+301.79 , 12257.42 , 471.27
+301.79 , 13789.60 , 528.24
+301.79 , 15321.78 , 585.52
+301.79 , 16853.96 , 643.12
+301.79 , 18386.13 , 701.03
+301.79 , 19918.31 , 759.26
+301.79 , 21450.49 , 817.80
+301.79 , 22982.67 , 876.66
+301.79 , 24514.85 , 935.84
+301.79 , 26047.02 , 995.34
+301.79 , 27579.20 , 1055.15
+301.79 , 29111.38 , 1115.27
+301.79 , 30643.56 , 1175.71
+320.65 , -35338.92 , -972.24
+320.65 , -33571.97 , -925.52
+320.65 , -31805.03 , -878.43
+320.65 , -30038.08 , -830.96
+320.65 , -28271.13 , -783.11
+320.65 , -26504.19 , -734.89
+320.65 , -24737.24 , -686.30
+320.65 , -22970.30 , -637.33
+320.65 , -21203.35 , -587.99
+320.65 , -19436.40 , -538.28
+320.65 , -17669.46 , -488.19
+320.65 , -15902.51 , -437.72
+320.65 , -14135.57 , -386.87
+320.65 , -12368.62 , -335.63
+320.65 , -10601.68 , -283.99
+320.65 , -8834.73 , -231.92
+320.65 , -7067.78 , -179.35
+320.65 , -5300.84 , -126.12
+320.65 , -3533.89 , -71.60
+320.65 , -1766.95 , -6.45
+320.65 , -353.39 , 0.00
+320.65 , 306.44 , 33.08
+320.65 , 1532.18 , 86.37
+320.65 , 3064.36 , 146.31
+320.65 , 4596.53 , 205.50
+320.65 , 6128.71 , 264.70
+320.65 , 7660.89 , 324.11
+320.65 , 9193.07 , 383.81
+320.65 , 10725.24 , 443.83
+320.65 , 12257.42 , 504.18
+320.65 , 13789.60 , 564.87
+320.65 , 15321.78 , 625.91
+320.65 , 16853.96 , 687.30
+320.65 , 18386.13 , 749.05
+320.65 , 19918.31 , 811.14
+320.65 , 21450.49 , 873.59
+320.65 , 22982.67 , 936.40
+320.65 , 24514.85 , 999.56
+320.65 , 26047.02 , 1063.07
+320.65 , 27579.20 , 1126.93
+320.65 , 29111.38 , 1191.14
+320.65 , 30643.56 , 1255.71
+339.52 , -35338.92 , -1021.86
+339.52 , -33571.97 , -972.81
+339.52 , -31805.03 , -923.33
+339.52 , -30038.08 , -873.44
+339.52 , -28271.13 , -823.13
+339.52 , -26504.19 , -772.39
+339.52 , -24737.24 , -721.24
+339.52 , -22970.30 , -669.67
+339.52 , -21203.35 , -617.68
+339.52 , -19436.40 , -565.27
+339.52 , -17669.46 , -512.45
+339.52 , -15902.51 , -459.19
+339.52 , -14135.57 , -405.51
+339.52 , -12368.62 , -351.39
+339.52 , -10601.68 , -296.81
+339.52 , -8834.73 , -241.73
+339.52 , -7067.78 , -186.07
+339.52 , -5300.84 , -129.61
+339.52 , -3533.89 , -71.46
+339.52 , -1766.95 , 0.00
+339.52 , -353.39 , 0.00
+339.52 , 306.44 , 36.70
+339.52 , 1532.18 , 94.04
+339.52 , 3064.36 , 157.85
+339.52 , 4596.53 , 220.70
+339.52 , 6128.71 , 283.52
+339.52 , 7660.89 , 346.56
+339.52 , 9193.07 , 409.90
+339.52 , 10725.24 , 473.59
+339.52 , 12257.42 , 537.65
+339.52 , 13789.60 , 602.09
+339.52 , 15321.78 , 666.91
+339.52 , 16853.96 , 732.12
+339.52 , 18386.13 , 797.72
+339.52 , 19918.31 , 863.72
+339.52 , 21450.49 , 930.10
+339.52 , 22982.67 , 996.88
+339.52 , 24514.85 , 1064.05
+339.52 , 26047.02 , 1131.62
+339.52 , 27579.20 , 1199.57
+339.52 , 29111.38 , 1267.92
+339.52 , 30643.56 , 1336.65
+358.38 , -35338.92 , -1070.37
+358.38 , -33571.97 , -1019.04
+358.38 , -31805.03 , -967.24
+358.38 , -30038.08 , -914.96
+358.38 , -28271.13 , -862.23
+358.38 , -26504.19 , -809.02
+358.38 , -24737.24 , -755.35
+358.38 , -22970.30 , -701.21
+358.38 , -21203.35 , -646.60
+358.38 , -19436.40 , -591.53
+358.38 , -17669.46 , -535.99
+358.38 , -15902.51 , -479.97
+358.38 , -14135.57 , -423.47
+358.38 , -12368.62 , -366.48
+358.38 , -10601.68 , -308.96
+358.38 , -8834.73 , -250.88
+358.38 , -7067.78 , -192.11
+358.38 , -5300.84 , -132.36
+358.38 , -3533.89 , -70.38
+358.38 , -1766.95 , 0.00
+358.38 , -353.39 , 0.00
+358.38 , 306.44 , 40.53
+358.38 , 1532.18 , 102.10
+358.38 , 3064.36 , 169.83
+358.38 , 4596.53 , 236.37
+358.38 , 6128.71 , 302.84
+358.38 , 7660.89 , 369.53
+358.38 , 9193.07 , 436.54
+358.38 , 10725.24 , 503.92
+358.38 , 12257.42 , 571.71
+358.38 , 13789.60 , 639.91
+358.38 , 15321.78 , 708.54
+358.38 , 16853.96 , 777.59
+358.38 , 18386.13 , 847.08
+358.38 , 19918.31 , 917.00
+358.38 , 21450.49 , 987.35
+358.38 , 22982.67 , 1058.14
+358.38 , 24514.85 , 1129.36
+358.38 , 26047.02 , 1201.01
+358.38 , 27579.20 , 1273.09
+358.38 , 29111.38 , 1345.61
+358.38 , 30643.56 , 1418.56
+377.24 , -35338.92 , -1117.74
+377.24 , -33571.97 , -1064.18
+377.24 , -31805.03 , -1010.10
+377.24 , -30038.08 , -955.49
+377.24 , -28271.13 , -900.37
+377.24 , -26504.19 , -844.73
+377.24 , -24737.24 , -788.58
+377.24 , -22970.30 , -731.90
+377.24 , -21203.35 , -674.71
+377.24 , -19436.40 , -617.00
+377.24 , -17669.46 , -558.77
+377.24 , -15902.51 , -500.01
+377.24 , -14135.57 , -440.71
+377.24 , -12368.62 , -380.85
+377.24 , -10601.68 , -320.40
+377.24 , -8834.73 , -259.31
+377.24 , -7067.78 , -197.41
+377.24 , -5300.84 , -134.30
+377.24 , -3533.89 , -68.24
+377.24 , -1766.95 , 0.00
+377.24 , -353.39 , 0.00
+377.24 , 306.44 , 44.59
+377.24 , 1532.18 , 110.53
+377.24 , 3064.36 , 182.27
+377.24 , 4596.53 , 252.55
+377.24 , 6128.71 , 322.69
+377.24 , 7660.89 , 393.04
+377.24 , 9193.07 , 463.74
+377.24 , 10725.24 , 534.84
+377.24 , 12257.42 , 606.37
+377.24 , 13789.60 , 678.37
+377.24 , 15321.78 , 750.82
+377.24 , 16853.96 , 823.74
+377.24 , 18386.13 , 897.14
+377.24 , 19918.31 , 971.01
+377.24 , 21450.49 , 1045.36
+377.24 , 22982.67 , 1120.19
+377.24 , 24514.85 , 1195.49
+377.24 , 26047.02 , 1271.27
+377.24 , 27579.20 , 1347.52
+377.24 , 29111.38 , 1424.25
+377.24 , 30643.56 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_2.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_3.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..07feb55aeb84a3946955f362d5131493fe83d565
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -11414.26 , 0.00
+0.00 , -10843.55 , 0.00
+0.00 , -10272.84 , 0.00
+0.00 , -9702.12 , 0.00
+0.00 , -9131.41 , 0.00
+0.00 , -8560.70 , 0.00
+0.00 , -7989.99 , -0.13
+0.00 , -7419.27 , -0.66
+0.00 , -6848.56 , -0.98
+0.00 , -6277.85 , -1.19
+0.00 , -5707.13 , -1.32
+0.00 , -5136.42 , -1.38
+0.00 , -4565.71 , -1.39
+0.00 , -3994.99 , -1.35
+0.00 , -3424.28 , -1.26
+0.00 , -2853.57 , -1.13
+0.00 , -2282.85 , -0.97
+0.00 , -1712.14 , -0.77
+0.00 , -1141.43 , -0.53
+0.00 , -570.71 , -0.27
+0.00 , -114.14 , -0.02
+0.00 , 103.14 , 0.13
+0.00 , 515.72 , 0.56
+0.00 , 1031.44 , 1.12
+0.00 , 1547.16 , 1.70
+0.00 , 2062.88 , 2.31
+0.00 , 2578.60 , 2.93
+0.00 , 3094.32 , 3.58
+0.00 , 3610.04 , 4.25
+0.00 , 4125.76 , 4.93
+0.00 , 4641.48 , 5.64
+0.00 , 5157.20 , 6.37
+0.00 , 5672.91 , 7.12
+0.00 , 6188.63 , 7.88
+0.00 , 6704.35 , 8.67
+0.00 , 7220.07 , 9.47
+0.00 , 7735.79 , 10.29
+0.00 , 8251.51 , 11.13
+0.00 , 8767.23 , 11.99
+0.00 , 9282.95 , 12.87
+0.00 , 9798.67 , 13.76
+0.00 , 10314.39 , 14.67
+5.72 , -11414.26 , 0.00
+5.72 , -10843.55 , 0.00
+5.72 , -10272.84 , 0.00
+5.72 , -9702.12 , 0.00
+5.72 , -9131.41 , 0.00
+5.72 , -8560.70 , 0.00
+5.72 , -7989.99 , -0.50
+5.72 , -7419.27 , -0.84
+5.72 , -6848.56 , -1.04
+5.72 , -6277.85 , -1.16
+5.72 , -5707.13 , -1.22
+5.72 , -5136.42 , -1.24
+5.72 , -4565.71 , -1.21
+5.72 , -3994.99 , -1.15
+5.72 , -3424.28 , -1.06
+5.72 , -2853.57 , -0.94
+5.72 , -2282.85 , -0.80
+5.72 , -1712.14 , -0.62
+5.72 , -1141.43 , -0.43
+5.72 , -570.71 , -0.21
+5.72 , -114.14 , -0.02
+5.72 , 103.14 , 0.10
+5.72 , 515.72 , 0.43
+5.72 , 1031.44 , 0.85
+5.72 , 1547.16 , 1.30
+5.72 , 2062.88 , 1.75
+5.72 , 2578.60 , 2.23
+5.72 , 3094.32 , 2.71
+5.72 , 3610.04 , 3.21
+5.72 , 4125.76 , 3.73
+5.72 , 4641.48 , 4.26
+5.72 , 5157.20 , 4.80
+5.72 , 5672.91 , 5.36
+5.72 , 6188.63 , 5.93
+5.72 , 6704.35 , 6.52
+5.72 , 7220.07 , 7.12
+5.72 , 7735.79 , 7.73
+5.72 , 8251.51 , 8.35
+5.72 , 8767.23 , 8.99
+5.72 , 9282.95 , 9.64
+5.72 , 9798.67 , 10.30
+5.72 , 10314.39 , 10.98
+57.21 , -11414.26 , -58.10
+57.21 , -10843.55 , -55.37
+57.21 , -10272.84 , -52.62
+57.21 , -9702.12 , -49.85
+57.21 , -9131.41 , -47.06
+57.21 , -8560.70 , -44.25
+57.21 , -7989.99 , -41.42
+57.21 , -7419.27 , -38.57
+57.21 , -6848.56 , -35.70
+57.21 , -6277.85 , -32.81
+57.21 , -5707.13 , -29.90
+57.21 , -5136.42 , -26.98
+57.21 , -4565.71 , -24.03
+57.21 , -3994.99 , -21.07
+57.21 , -3424.28 , -18.08
+57.21 , -2853.57 , -15.08
+57.21 , -2282.85 , -12.06
+57.21 , -1712.14 , -9.02
+57.21 , -1141.43 , -5.96
+57.21 , -570.71 , -2.88
+57.21 , -114.14 , -0.37
+57.21 , 103.14 , 0.90
+57.21 , 515.72 , 3.68
+57.21 , 1031.44 , 7.16
+57.21 , 1547.16 , 10.66
+57.21 , 2062.88 , 14.17
+57.21 , 2578.60 , 17.71
+57.21 , 3094.32 , 21.26
+57.21 , 3610.04 , 24.84
+57.21 , 4125.76 , 28.43
+57.21 , 4641.48 , 32.04
+57.21 , 5157.20 , 35.67
+57.21 , 5672.91 , 39.32
+57.21 , 6188.63 , 42.99
+57.21 , 6704.35 , 46.68
+57.21 , 7220.07 , 50.38
+57.21 , 7735.79 , 54.11
+57.21 , 8251.51 , 57.85
+57.21 , 8767.23 , 61.61
+57.21 , 9282.95 , 65.39
+57.21 , 9798.67 , 69.19
+57.21 , 10314.39 , 73.01
+114.41 , -11414.26 , -120.57
+114.41 , -10843.55 , -114.73
+114.41 , -10272.84 , -108.87
+114.41 , -9702.12 , -102.99
+114.41 , -9131.41 , -97.08
+114.41 , -8560.70 , -91.15
+114.41 , -7989.99 , -85.20
+114.41 , -7419.27 , -79.23
+114.41 , -6848.56 , -73.23
+114.41 , -6277.85 , -67.21
+114.41 , -5707.13 , -61.17
+114.41 , -5136.42 , -55.10
+114.41 , -4565.71 , -49.01
+114.41 , -3994.99 , -42.90
+114.41 , -3424.28 , -36.77
+114.41 , -2853.57 , -30.61
+114.41 , -2282.85 , -24.43
+114.41 , -1712.14 , -18.23
+114.41 , -1141.43 , -12.01
+114.41 , -570.71 , -5.76
+114.41 , -114.14 , -0.66
+114.41 , 103.14 , 1.84
+114.41 , 515.72 , 7.35
+114.41 , 1031.44 , 14.22
+114.41 , 1547.16 , 21.11
+114.41 , 2062.88 , 28.02
+114.41 , 2578.60 , 34.96
+114.41 , 3094.32 , 41.92
+114.41 , 3610.04 , 48.90
+114.41 , 4125.76 , 55.90
+114.41 , 4641.48 , 62.93
+114.41 , 5157.20 , 69.98
+114.41 , 5672.91 , 77.05
+114.41 , 6188.63 , 84.15
+114.41 , 6704.35 , 91.27
+114.41 , 7220.07 , 98.41
+114.41 , 7735.79 , 105.58
+114.41 , 8251.51 , 112.76
+114.41 , 8767.23 , 119.97
+114.41 , 9282.95 , 127.21
+114.41 , 9798.67 , 134.46
+114.41 , 10314.39 , 141.74
+171.62 , -11414.26 , -182.44
+171.62 , -10843.55 , -173.55
+171.62 , -10272.84 , -164.62
+171.62 , -9702.12 , -155.67
+171.62 , -9131.41 , -146.69
+171.62 , -8560.70 , -137.68
+171.62 , -7989.99 , -128.65
+171.62 , -7419.27 , -119.58
+171.62 , -6848.56 , -110.49
+171.62 , -6277.85 , -101.36
+171.62 , -5707.13 , -92.21
+171.62 , -5136.42 , -83.03
+171.62 , -4565.71 , -73.82
+171.62 , -3994.99 , -64.58
+171.62 , -3424.28 , -55.31
+171.62 , -2853.57 , -46.02
+171.62 , -2282.85 , -36.70
+171.62 , -1712.14 , -27.34
+171.62 , -1141.43 , -17.96
+171.62 , -570.71 , -8.54
+171.62 , -114.14 , -0.79
+171.62 , 103.14 , 2.86
+171.62 , 515.72 , 11.12
+171.62 , 1031.44 , 21.39
+171.62 , 1547.16 , 31.68
+171.62 , 2062.88 , 41.99
+171.62 , 2578.60 , 52.34
+171.62 , 3094.32 , 62.71
+171.62 , 3610.04 , 73.12
+171.62 , 4125.76 , 83.55
+171.62 , 4641.48 , 94.01
+171.62 , 5157.20 , 104.50
+171.62 , 5672.91 , 115.02
+171.62 , 6188.63 , 125.57
+171.62 , 6704.35 , 136.15
+171.62 , 7220.07 , 146.76
+171.62 , 7735.79 , 157.40
+171.62 , 8251.51 , 168.06
+171.62 , 8767.23 , 178.76
+171.62 , 9282.95 , 189.48
+171.62 , 9798.67 , 200.23
+171.62 , 10314.39 , 211.02
+228.82 , -11414.26 , -243.71
+228.82 , -10843.55 , -231.81
+228.82 , -10272.84 , -219.87
+228.82 , -9702.12 , -207.89
+228.82 , -9131.41 , -195.88
+228.82 , -8560.70 , -183.83
+228.82 , -7989.99 , -171.74
+228.82 , -7419.27 , -159.61
+228.82 , -6848.56 , -147.45
+228.82 , -6277.85 , -135.25
+228.82 , -5707.13 , -123.01
+228.82 , -5136.42 , -110.74
+228.82 , -4565.71 , -98.43
+228.82 , -3994.99 , -86.08
+228.82 , -3424.28 , -73.70
+228.82 , -2853.57 , -61.27
+228.82 , -2282.85 , -48.82
+228.82 , -1712.14 , -36.32
+228.82 , -1141.43 , -23.78
+228.82 , -570.71 , -11.19
+228.82 , -114.14 , -0.63
+228.82 , 103.14 , 3.98
+228.82 , 515.72 , 15.01
+228.82 , 1031.44 , 28.68
+228.82 , 1547.16 , 42.37
+228.82 , 2062.88 , 56.10
+228.82 , 2578.60 , 69.87
+228.82 , 3094.32 , 83.67
+228.82 , 3610.04 , 97.52
+228.82 , 4125.76 , 111.40
+228.82 , 4641.48 , 125.31
+228.82 , 5157.20 , 139.27
+228.82 , 5672.91 , 153.26
+228.82 , 6188.63 , 167.29
+228.82 , 6704.35 , 181.36
+228.82 , 7220.07 , 195.46
+228.82 , 7735.79 , 209.61
+228.82 , 8251.51 , 223.79
+228.82 , 8767.23 , 238.01
+228.82 , 9282.95 , 252.26
+228.82 , 9798.67 , 266.56
+228.82 , 10314.39 , 280.89
+286.03 , -11414.26 , -304.37
+286.03 , -10843.55 , -289.50
+286.03 , -10272.84 , -274.59
+286.03 , -9702.12 , -259.63
+286.03 , -9131.41 , -244.61
+286.03 , -8560.70 , -229.56
+286.03 , -7989.99 , -214.45
+286.03 , -7419.27 , -199.30
+286.03 , -6848.56 , -184.10
+286.03 , -6277.85 , -168.85
+286.03 , -5707.13 , -153.55
+286.03 , -5136.42 , -138.20
+286.03 , -4565.71 , -122.81
+286.03 , -3994.99 , -107.37
+286.03 , -3424.28 , -91.88
+286.03 , -2853.57 , -76.35
+286.03 , -2282.85 , -60.76
+286.03 , -1712.14 , -45.13
+286.03 , -1141.43 , -29.44
+286.03 , -570.71 , -13.67
+286.03 , -114.14 , 0.00
+286.03 , 103.14 , 5.21
+286.03 , 515.72 , 19.04
+286.03 , 1031.44 , 36.13
+286.03 , 1547.16 , 53.24
+286.03 , 2062.88 , 70.39
+286.03 , 2578.60 , 87.59
+286.03 , 3094.32 , 104.83
+286.03 , 3610.04 , 122.13
+286.03 , 4125.76 , 139.47
+286.03 , 4641.48 , 156.87
+286.03 , 5157.20 , 174.31
+286.03 , 5672.91 , 191.80
+286.03 , 6188.63 , 209.33
+286.03 , 6704.35 , 226.92
+286.03 , 7220.07 , 244.56
+286.03 , 7735.79 , 262.24
+286.03 , 8251.51 , 279.97
+286.03 , 8767.23 , 297.76
+286.03 , 9282.95 , 315.58
+286.03 , 9798.67 , 333.46
+286.03 , 10314.39 , 351.39
+343.23 , -11414.26 , -364.37
+343.23 , -10843.55 , -346.59
+343.23 , -10272.84 , -328.74
+343.23 , -9702.12 , -310.84
+343.23 , -9131.41 , -292.87
+343.23 , -8560.70 , -274.84
+343.23 , -7989.99 , -256.75
+343.23 , -7419.27 , -238.60
+343.23 , -6848.56 , -220.39
+343.23 , -6277.85 , -202.12
+343.23 , -5707.13 , -183.79
+343.23 , -5136.42 , -165.40
+343.23 , -4565.71 , -146.94
+343.23 , -3994.99 , -128.43
+343.23 , -3424.28 , -109.85
+343.23 , -2853.57 , -91.21
+343.23 , -2282.85 , -72.51
+343.23 , -1712.14 , -53.75
+343.23 , -1141.43 , -34.91
+343.23 , -570.71 , -15.95
+343.23 , -114.14 , 0.00
+343.23 , 103.14 , 6.58
+343.23 , 515.72 , 23.25
+343.23 , 1031.44 , 43.76
+343.23 , 1547.16 , 64.29
+343.23 , 2062.88 , 84.87
+343.23 , 2578.60 , 105.52
+343.23 , 3094.32 , 126.22
+343.23 , 3610.04 , 146.98
+343.23 , 4125.76 , 167.81
+343.23 , 4641.48 , 188.70
+343.23 , 5157.20 , 209.65
+343.23 , 5672.91 , 230.66
+343.23 , 6188.63 , 251.73
+343.23 , 6704.35 , 272.87
+343.23 , 7220.07 , 294.07
+343.23 , 7735.79 , 315.33
+343.23 , 8251.51 , 336.65
+343.23 , 8767.23 , 358.03
+343.23 , 9282.95 , 379.47
+343.23 , 9798.67 , 400.98
+343.23 , 10314.39 , 422.54
+400.44 , -11414.26 , -423.69
+400.44 , -10843.55 , -403.04
+400.44 , -10272.84 , -382.31
+400.44 , -9702.12 , -361.50
+400.44 , -9131.41 , -340.62
+400.44 , -8560.70 , -319.66
+400.44 , -7989.99 , -298.62
+400.44 , -7419.27 , -277.51
+400.44 , -6848.56 , -256.31
+400.44 , -6277.85 , -235.05
+400.44 , -5707.13 , -213.70
+400.44 , -5136.42 , -192.28
+400.44 , -4565.71 , -170.79
+400.44 , -3994.99 , -149.21
+400.44 , -3424.28 , -127.57
+400.44 , -2853.57 , -105.84
+400.44 , -2282.85 , -84.03
+400.44 , -1712.14 , -62.14
+400.44 , -1141.43 , -40.16
+400.44 , -570.71 , -18.00
+400.44 , -114.14 , 0.00
+400.44 , 103.14 , 8.09
+400.44 , 515.72 , 27.64
+400.44 , 1031.44 , 51.59
+400.44 , 1547.16 , 75.56
+400.44 , 2062.88 , 99.58
+400.44 , 2578.60 , 123.68
+400.44 , 3094.32 , 147.86
+400.44 , 3610.04 , 172.10
+400.44 , 4125.76 , 196.43
+400.44 , 4641.48 , 220.84
+400.44 , 5157.20 , 245.32
+400.44 , 5672.91 , 269.88
+400.44 , 6188.63 , 294.51
+400.44 , 6704.35 , 319.23
+400.44 , 7220.07 , 344.02
+400.44 , 7735.79 , 368.89
+400.44 , 8251.51 , 393.83
+400.44 , 8767.23 , 418.85
+400.44 , 9282.95 , 443.95
+400.44 , 9798.67 , 469.13
+400.44 , 10314.39 , 494.38
+457.64 , -11414.26 , -482.31
+457.64 , -10843.55 , -458.83
+457.64 , -10272.84 , -435.26
+457.64 , -9702.12 , -411.59
+457.64 , -9131.41 , -387.83
+457.64 , -8560.70 , -363.97
+457.64 , -7989.99 , -340.02
+457.64 , -7419.27 , -315.97
+457.64 , -6848.56 , -291.83
+457.64 , -6277.85 , -267.59
+457.64 , -5707.13 , -243.26
+457.64 , -5136.42 , -218.84
+457.64 , -4565.71 , -194.32
+457.64 , -3994.99 , -169.71
+457.64 , -3424.28 , -145.00
+457.64 , -2853.57 , -120.19
+457.64 , -2282.85 , -95.29
+457.64 , -1712.14 , -70.28
+457.64 , -1141.43 , -45.14
+457.64 , -570.71 , -19.76
+457.64 , -114.14 , 0.00
+457.64 , 103.14 , 9.76
+457.64 , 515.72 , 32.25
+457.64 , 1031.44 , 59.66
+457.64 , 1547.16 , 87.07
+457.64 , 2062.88 , 114.55
+457.64 , 2578.60 , 142.11
+457.64 , 3094.32 , 169.77
+457.64 , 3610.04 , 197.52
+457.64 , 4125.76 , 225.37
+457.64 , 4641.48 , 253.31
+457.64 , 5157.20 , 281.34
+457.64 , 5672.91 , 309.47
+457.64 , 6188.63 , 337.70
+457.64 , 6704.35 , 366.02
+457.64 , 7220.07 , 394.44
+457.64 , 7735.79 , 422.95
+457.64 , 8251.51 , 451.56
+457.64 , 8767.23 , 480.26
+457.64 , 9282.95 , 509.05
+457.64 , 9798.67 , 537.94
+457.64 , 10314.39 , 566.93
+514.85 , -11414.26 , -540.17
+514.85 , -10843.55 , -513.92
+514.85 , -10272.84 , -487.55
+514.85 , -9702.12 , -461.06
+514.85 , -9131.41 , -434.46
+514.85 , -8560.70 , -407.75
+514.85 , -7989.99 , -380.92
+514.85 , -7419.27 , -353.97
+514.85 , -6848.56 , -326.91
+514.85 , -6277.85 , -299.73
+514.85 , -5707.13 , -272.44
+514.85 , -5136.42 , -245.03
+514.85 , -4565.71 , -217.51
+514.85 , -3994.99 , -189.87
+514.85 , -3424.28 , -162.12
+514.85 , -2853.57 , -134.25
+514.85 , -2282.85 , -106.26
+514.85 , -1712.14 , -78.13
+514.85 , -1141.43 , -49.84
+514.85 , -570.71 , -21.19
+514.85 , -114.14 , 0.00
+514.85 , 103.14 , 11.59
+514.85 , 515.72 , 37.10
+514.85 , 1031.44 , 67.98
+514.85 , 1547.16 , 98.85
+514.85 , 2062.88 , 129.79
+514.85 , 2578.60 , 160.84
+514.85 , 3094.32 , 191.99
+514.85 , 3610.04 , 223.26
+514.85 , 4125.76 , 254.64
+514.85 , 4641.48 , 286.14
+514.85 , 5157.20 , 317.75
+514.85 , 5672.91 , 349.48
+514.85 , 6188.63 , 381.32
+514.85 , 6704.35 , 413.28
+514.85 , 7220.07 , 445.36
+514.85 , 7735.79 , 477.54
+514.85 , 8251.51 , 509.85
+514.85 , 8767.23 , 542.27
+514.85 , 9282.95 , 574.80
+514.85 , 9798.67 , 607.45
+514.85 , 10314.39 , 640.21
+572.06 , -11414.26 , -597.26
+572.06 , -10843.55 , -568.28
+572.06 , -10272.84 , -539.16
+572.06 , -9702.12 , -509.90
+572.06 , -9131.41 , -480.50
+572.06 , -8560.70 , -450.96
+572.06 , -7989.99 , -421.28
+572.06 , -7419.27 , -391.47
+572.06 , -6848.56 , -361.52
+572.06 , -6277.85 , -331.43
+572.06 , -5707.13 , -301.20
+572.06 , -5136.42 , -270.83
+572.06 , -4565.71 , -240.33
+572.06 , -3994.99 , -209.68
+572.06 , -3424.28 , -178.90
+572.06 , -2853.57 , -147.97
+572.06 , -2282.85 , -116.90
+572.06 , -1712.14 , -85.66
+572.06 , -1141.43 , -54.21
+572.06 , -570.71 , -22.23
+572.06 , -114.14 , 0.00
+572.06 , 103.14 , 13.60
+572.06 , 515.72 , 42.20
+572.06 , 1031.44 , 76.58
+572.06 , 1547.16 , 110.92
+572.06 , 2062.88 , 145.34
+572.06 , 2578.60 , 179.88
+572.06 , 3094.32 , 214.55
+572.06 , 3610.04 , 249.35
+572.06 , 4125.76 , 284.29
+572.06 , 4641.48 , 319.36
+572.06 , 5157.20 , 354.57
+572.06 , 5672.91 , 389.92
+572.06 , 6188.63 , 425.41
+572.06 , 6704.35 , 461.03
+572.06 , 7220.07 , 496.79
+572.06 , 7735.79 , 532.69
+572.06 , 8251.51 , 568.73
+572.06 , 8767.23 , 604.90
+572.06 , 9282.95 , 641.21
+572.06 , 9798.67 , 677.66
+572.06 , 10314.39 , 714.24
+629.26 , -11414.26 , -653.54
+629.26 , -10843.55 , -621.88
+629.26 , -10272.84 , -590.05
+629.26 , -9702.12 , -558.06
+629.26 , -9131.41 , -525.90
+629.26 , -8560.70 , -493.58
+629.26 , -7989.99 , -461.09
+629.26 , -7419.27 , -428.44
+629.26 , -6848.56 , -395.63
+629.26 , -6277.85 , -362.65
+629.26 , -5707.13 , -329.51
+629.26 , -5136.42 , -296.21
+629.26 , -4565.71 , -262.74
+629.26 , -3994.99 , -229.11
+629.26 , -3424.28 , -195.31
+629.26 , -2853.57 , -161.34
+629.26 , -2282.85 , -127.18
+629.26 , -1712.14 , -92.83
+629.26 , -1141.43 , -58.20
+629.26 , -570.71 , -22.82
+629.26 , -114.14 , 0.00
+629.26 , 103.14 , 15.79
+629.26 , 515.72 , 47.58
+629.26 , 1031.44 , 85.48
+629.26 , 1547.16 , 123.30
+629.26 , 2062.88 , 161.22
+629.26 , 2578.60 , 199.26
+629.26 , 3094.32 , 237.46
+629.26 , 3610.04 , 275.81
+629.26 , 4125.76 , 314.32
+629.26 , 4641.48 , 352.99
+629.26 , 5157.20 , 391.83
+629.26 , 5672.91 , 430.82
+629.26 , 6188.63 , 469.98
+629.26 , 6704.35 , 509.30
+629.26 , 7220.07 , 548.78
+629.26 , 7735.79 , 588.42
+629.26 , 8251.51 , 628.23
+629.26 , 8767.23 , 668.20
+629.26 , 9282.95 , 708.32
+629.26 , 9798.67 , 748.61
+629.26 , 10314.39 , 789.06
+686.47 , -11414.26 , -708.97
+686.47 , -10843.55 , -674.68
+686.47 , -10272.84 , -640.19
+686.47 , -9702.12 , -605.51
+686.47 , -9131.41 , -570.63
+686.47 , -8560.70 , -535.56
+686.47 , -7989.99 , -500.30
+686.47 , -7419.27 , -464.85
+686.47 , -6848.56 , -429.21
+686.47 , -6277.85 , -393.37
+686.47 , -5707.13 , -357.35
+686.47 , -5136.42 , -321.13
+686.47 , -4565.71 , -284.71
+686.47 , -3994.99 , -248.11
+686.47 , -3424.28 , -211.31
+686.47 , -2853.57 , -174.30
+686.47 , -2282.85 , -137.08
+686.47 , -1712.14 , -99.61
+686.47 , -1141.43 , -61.78
+686.47 , -570.71 , -22.86
+686.47 , -114.14 , 0.00
+686.47 , 103.14 , 18.17
+686.47 , 515.72 , 53.24
+686.47 , 1031.44 , 94.71
+686.47 , 1547.16 , 136.03
+686.47 , 2062.88 , 177.45
+686.47 , 2578.60 , 219.01
+686.47 , 3094.32 , 260.75
+686.47 , 3610.04 , 302.67
+686.47 , 4125.76 , 344.78
+686.47 , 4641.48 , 387.07
+686.47 , 5157.20 , 429.54
+686.47 , 5672.91 , 472.21
+686.47 , 6188.63 , 515.06
+686.47 , 6704.35 , 558.11
+686.47 , 7220.07 , 601.34
+686.47 , 7735.79 , 644.76
+686.47 , 8251.51 , 688.37
+686.47 , 8767.23 , 732.17
+686.47 , 9282.95 , 776.15
+686.47 , 9798.67 , 820.33
+686.47 , 10314.39 , 864.69
+743.67 , -11414.26 , -763.53
+743.67 , -10843.55 , -726.65
+743.67 , -10272.84 , -689.55
+743.67 , -9702.12 , -652.22
+743.67 , -9131.41 , -614.67
+743.67 , -8560.70 , -576.89
+743.67 , -7989.99 , -538.89
+743.67 , -7419.27 , -500.67
+743.67 , -6848.56 , -462.22
+743.67 , -6277.85 , -423.56
+743.67 , -5707.13 , -384.67
+743.67 , -5136.42 , -345.56
+743.67 , -4565.71 , -306.22
+743.67 , -3994.99 , -266.66
+743.67 , -3424.28 , -226.86
+743.67 , -2853.57 , -186.83
+743.67 , -2282.85 , -146.54
+743.67 , -1712.14 , -105.95
+743.67 , -1141.43 , -64.90
+743.67 , -570.71 , -22.24
+743.67 , -114.14 , 0.00
+743.67 , 103.14 , 20.74
+743.67 , 515.72 , 59.20
+743.67 , 1031.44 , 104.27
+743.67 , 1547.16 , 149.12
+743.67 , 2062.88 , 194.05
+743.67 , 2578.60 , 239.16
+743.67 , 3094.32 , 284.45
+743.67 , 3610.04 , 329.96
+743.67 , 4125.76 , 375.67
+743.67 , 4641.48 , 421.60
+743.67 , 5157.20 , 467.75
+743.67 , 5672.91 , 514.11
+743.67 , 6188.63 , 560.69
+743.67 , 6704.35 , 607.48
+743.67 , 7220.07 , 654.50
+743.67 , 7735.79 , 701.73
+743.67 , 8251.51 , 749.18
+743.67 , 8767.23 , 796.84
+743.67 , 9282.95 , 844.73
+743.67 , 9798.67 , 892.83
+743.67 , 10314.39 , 941.14
+800.88 , -11414.26 , -817.17
+800.88 , -10843.55 , -777.76
+800.88 , -10272.84 , -738.08
+800.88 , -9702.12 , -698.15
+800.88 , -9131.41 , -657.96
+800.88 , -8560.70 , -617.52
+800.88 , -7989.99 , -576.82
+800.88 , -7419.27 , -535.86
+800.88 , -6848.56 , -494.65
+800.88 , -6277.85 , -453.18
+800.88 , -5707.13 , -411.45
+800.88 , -5136.42 , -369.47
+800.88 , -4565.71 , -327.22
+800.88 , -3994.99 , -284.72
+800.88 , -3424.28 , -241.95
+800.88 , -2853.57 , -198.90
+800.88 , -2282.85 , -155.54
+800.88 , -1712.14 , -111.82
+800.88 , -1141.43 , -67.51
+800.88 , -570.71 , -20.80
+800.88 , -114.14 , 0.00
+800.88 , 103.14 , 23.52
+800.88 , 515.72 , 65.48
+800.88 , 1031.44 , 114.20
+800.88 , 1547.16 , 162.59
+800.88 , 2062.88 , 211.06
+800.88 , 2578.60 , 259.72
+800.88 , 3094.32 , 308.59
+800.88 , 3610.04 , 357.69
+800.88 , 4125.76 , 407.04
+800.88 , 4641.48 , 456.62
+800.88 , 5157.20 , 506.46
+800.88 , 5672.91 , 556.54
+800.88 , 6188.63 , 606.87
+800.88 , 6704.35 , 657.45
+800.88 , 7220.07 , 708.28
+800.88 , 7735.79 , 759.35
+800.88 , 8251.51 , 810.68
+800.88 , 8767.23 , 862.25
+800.88 , 9282.95 , 914.07
+800.88 , 9798.67 , 966.13
+800.88 , 10314.39 , 1018.44
+858.08 , -11414.26 , -869.86
+858.08 , -10843.55 , -827.96
+858.08 , -10272.84 , -785.77
+858.08 , -9702.12 , -743.28
+858.08 , -9131.41 , -700.50
+858.08 , -8560.70 , -657.42
+858.08 , -7989.99 , -614.05
+858.08 , -7419.27 , -570.39
+858.08 , -6848.56 , -526.44
+858.08 , -6277.85 , -482.19
+858.08 , -5707.13 , -437.65
+858.08 , -5136.42 , -392.82
+858.08 , -4565.71 , -347.69
+858.08 , -3994.99 , -302.26
+858.08 , -3424.28 , -256.52
+858.08 , -2853.57 , -210.46
+858.08 , -2282.85 , -164.04
+858.08 , -1712.14 , -117.17
+858.08 , -1141.43 , -69.54
+858.08 , -570.71 , -18.27
+858.08 , -114.14 , 0.00
+858.08 , 103.14 , 26.49
+858.08 , 515.72 , 72.10
+858.08 , 1031.44 , 124.50
+858.08 , 1547.16 , 176.46
+858.08 , 2062.88 , 228.49
+858.08 , 2578.60 , 280.71
+858.08 , 3094.32 , 333.18
+858.08 , 3610.04 , 385.90
+858.08 , 4125.76 , 438.89
+858.08 , 4641.48 , 492.16
+858.08 , 5157.20 , 545.71
+858.08 , 5672.91 , 599.54
+858.08 , 6188.63 , 653.64
+858.08 , 6704.35 , 708.03
+858.08 , 7220.07 , 762.71
+858.08 , 7735.79 , 817.66
+858.08 , 8251.51 , 872.89
+858.08 , 8767.23 , 928.41
+858.08 , 9282.95 , 984.20
+858.08 , 9798.67 , 1040.27
+858.08 , 10314.39 , 1096.63
+915.29 , -11414.26 , -921.56
+915.29 , -10843.55 , -877.23
+915.29 , -10272.84 , -832.56
+915.29 , -9702.12 , -787.56
+915.29 , -9131.41 , -742.22
+915.29 , -8560.70 , -696.56
+915.29 , -7989.99 , -650.56
+915.29 , -7419.27 , -604.23
+915.29 , -6848.56 , -557.56
+915.29 , -6277.85 , -510.57
+915.29 , -5707.13 , -463.24
+915.29 , -5136.42 , -415.58
+915.29 , -4565.71 , -367.58
+915.29 , -3994.99 , -319.24
+915.29 , -3424.28 , -270.55
+915.29 , -2853.57 , -221.48
+915.29 , -2282.85 , -171.99
+915.29 , -1712.14 , -121.95
+915.29 , -1141.43 , -70.93
+915.29 , -570.71 , -14.10
+915.29 , -114.14 , 0.00
+915.29 , 103.14 , 29.68
+915.29 , 515.72 , 79.05
+915.29 , 1031.44 , 135.20
+915.29 , 1547.16 , 190.76
+915.29 , 2062.88 , 246.36
+915.29 , 2578.60 , 302.17
+915.29 , 3094.32 , 358.24
+915.29 , 3610.04 , 414.60
+915.29 , 4125.76 , 471.27
+915.29 , 4641.48 , 528.24
+915.29 , 5157.20 , 585.52
+915.29 , 5672.91 , 643.12
+915.29 , 6188.63 , 701.03
+915.29 , 6704.35 , 759.26
+915.29 , 7220.07 , 817.80
+915.29 , 7735.79 , 876.66
+915.29 , 8251.51 , 935.84
+915.29 , 8767.23 , 995.34
+915.29 , 9282.95 , 1055.15
+915.29 , 9798.67 , 1115.27
+915.29 , 10314.39 , 1175.71
+972.50 , -11414.26 , -972.24
+972.50 , -10843.55 , -925.52
+972.50 , -10272.84 , -878.43
+972.50 , -9702.12 , -830.96
+972.50 , -9131.41 , -783.11
+972.50 , -8560.70 , -734.89
+972.50 , -7989.99 , -686.30
+972.50 , -7419.27 , -637.33
+972.50 , -6848.56 , -587.99
+972.50 , -6277.85 , -538.28
+972.50 , -5707.13 , -488.19
+972.50 , -5136.42 , -437.72
+972.50 , -4565.71 , -386.87
+972.50 , -3994.99 , -335.63
+972.50 , -3424.28 , -283.99
+972.50 , -2853.57 , -231.92
+972.50 , -2282.85 , -179.35
+972.50 , -1712.14 , -126.12
+972.50 , -1141.43 , -71.60
+972.50 , -570.71 , -6.45
+972.50 , -114.14 , 0.00
+972.50 , 103.14 , 33.08
+972.50 , 515.72 , 86.37
+972.50 , 1031.44 , 146.31
+972.50 , 1547.16 , 205.50
+972.50 , 2062.88 , 264.70
+972.50 , 2578.60 , 324.11
+972.50 , 3094.32 , 383.81
+972.50 , 3610.04 , 443.83
+972.50 , 4125.76 , 504.18
+972.50 , 4641.48 , 564.87
+972.50 , 5157.20 , 625.91
+972.50 , 5672.91 , 687.30
+972.50 , 6188.63 , 749.05
+972.50 , 6704.35 , 811.14
+972.50 , 7220.07 , 873.59
+972.50 , 7735.79 , 936.40
+972.50 , 8251.51 , 999.56
+972.50 , 8767.23 , 1063.07
+972.50 , 9282.95 , 1126.93
+972.50 , 9798.67 , 1191.14
+972.50 , 10314.39 , 1255.71
+1029.70 , -11414.26 , -1021.86
+1029.70 , -10843.55 , -972.81
+1029.70 , -10272.84 , -923.33
+1029.70 , -9702.12 , -873.44
+1029.70 , -9131.41 , -823.13
+1029.70 , -8560.70 , -772.39
+1029.70 , -7989.99 , -721.24
+1029.70 , -7419.27 , -669.67
+1029.70 , -6848.56 , -617.68
+1029.70 , -6277.85 , -565.27
+1029.70 , -5707.13 , -512.45
+1029.70 , -5136.42 , -459.19
+1029.70 , -4565.71 , -405.51
+1029.70 , -3994.99 , -351.39
+1029.70 , -3424.28 , -296.81
+1029.70 , -2853.57 , -241.73
+1029.70 , -2282.85 , -186.07
+1029.70 , -1712.14 , -129.61
+1029.70 , -1141.43 , -71.46
+1029.70 , -570.71 , 0.00
+1029.70 , -114.14 , 0.00
+1029.70 , 103.14 , 36.70
+1029.70 , 515.72 , 94.04
+1029.70 , 1031.44 , 157.85
+1029.70 , 1547.16 , 220.70
+1029.70 , 2062.88 , 283.52
+1029.70 , 2578.60 , 346.56
+1029.70 , 3094.32 , 409.90
+1029.70 , 3610.04 , 473.59
+1029.70 , 4125.76 , 537.65
+1029.70 , 4641.48 , 602.09
+1029.70 , 5157.20 , 666.91
+1029.70 , 5672.91 , 732.12
+1029.70 , 6188.63 , 797.72
+1029.70 , 6704.35 , 863.72
+1029.70 , 7220.07 , 930.10
+1029.70 , 7735.79 , 996.88
+1029.70 , 8251.51 , 1064.05
+1029.70 , 8767.23 , 1131.62
+1029.70 , 9282.95 , 1199.57
+1029.70 , 9798.67 , 1267.92
+1029.70 , 10314.39 , 1336.65
+1086.91 , -11414.26 , -1070.37
+1086.91 , -10843.55 , -1019.04
+1086.91 , -10272.84 , -967.24
+1086.91 , -9702.12 , -914.96
+1086.91 , -9131.41 , -862.23
+1086.91 , -8560.70 , -809.02
+1086.91 , -7989.99 , -755.35
+1086.91 , -7419.27 , -701.21
+1086.91 , -6848.56 , -646.60
+1086.91 , -6277.85 , -591.53
+1086.91 , -5707.13 , -535.99
+1086.91 , -5136.42 , -479.97
+1086.91 , -4565.71 , -423.47
+1086.91 , -3994.99 , -366.48
+1086.91 , -3424.28 , -308.96
+1086.91 , -2853.57 , -250.88
+1086.91 , -2282.85 , -192.11
+1086.91 , -1712.14 , -132.36
+1086.91 , -1141.43 , -70.38
+1086.91 , -570.71 , 0.00
+1086.91 , -114.14 , 0.00
+1086.91 , 103.14 , 40.53
+1086.91 , 515.72 , 102.10
+1086.91 , 1031.44 , 169.83
+1086.91 , 1547.16 , 236.37
+1086.91 , 2062.88 , 302.84
+1086.91 , 2578.60 , 369.53
+1086.91 , 3094.32 , 436.54
+1086.91 , 3610.04 , 503.92
+1086.91 , 4125.76 , 571.71
+1086.91 , 4641.48 , 639.91
+1086.91 , 5157.20 , 708.54
+1086.91 , 5672.91 , 777.59
+1086.91 , 6188.63 , 847.08
+1086.91 , 6704.35 , 917.00
+1086.91 , 7220.07 , 987.35
+1086.91 , 7735.79 , 1058.14
+1086.91 , 8251.51 , 1129.36
+1086.91 , 8767.23 , 1201.01
+1086.91 , 9282.95 , 1273.09
+1086.91 , 9798.67 , 1345.61
+1086.91 , 10314.39 , 1418.56
+1144.11 , -11414.26 , -1117.74
+1144.11 , -10843.55 , -1064.18
+1144.11 , -10272.84 , -1010.10
+1144.11 , -9702.12 , -955.49
+1144.11 , -9131.41 , -900.37
+1144.11 , -8560.70 , -844.73
+1144.11 , -7989.99 , -788.58
+1144.11 , -7419.27 , -731.90
+1144.11 , -6848.56 , -674.71
+1144.11 , -6277.85 , -617.00
+1144.11 , -5707.13 , -558.77
+1144.11 , -5136.42 , -500.01
+1144.11 , -4565.71 , -440.71
+1144.11 , -3994.99 , -380.85
+1144.11 , -3424.28 , -320.40
+1144.11 , -2853.57 , -259.31
+1144.11 , -2282.85 , -197.41
+1144.11 , -1712.14 , -134.30
+1144.11 , -1141.43 , -68.24
+1144.11 , -570.71 , 0.00
+1144.11 , -114.14 , 0.00
+1144.11 , 103.14 , 44.59
+1144.11 , 515.72 , 110.53
+1144.11 , 1031.44 , 182.27
+1144.11 , 1547.16 , 252.55
+1144.11 , 2062.88 , 322.69
+1144.11 , 2578.60 , 393.04
+1144.11 , 3094.32 , 463.74
+1144.11 , 3610.04 , 534.84
+1144.11 , 4125.76 , 606.37
+1144.11 , 4641.48 , 678.37
+1144.11 , 5157.20 , 750.82
+1144.11 , 5672.91 , 823.74
+1144.11 , 6188.63 , 897.14
+1144.11 , 6704.35 , 971.01
+1144.11 , 7220.07 , 1045.36
+1144.11 , 7735.79 , 1120.19
+1144.11 , 8251.51 , 1195.49
+1144.11 , 8767.23 , 1271.27
+1144.11 , 9282.95 , 1347.52
+1144.11 , 9798.67 , 1424.25
+1144.11 , 10314.39 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_drag.viepcd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..a46cb34e6831d05626e67324b6a261bde045c857
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC_Gbx3Axl_drag.viepcd
@@ -0,0 +1,24 @@
+n_out , T_drag_out
+0.00 , -21.84
+5.72 , -22.52
+57.21 , -28.92
+114.41 , -35.99
+171.62 , -43.07
+228.82 , -50.22
+286.03 , -57.30
+343.23 , -64.38
+400.44 , -71.45
+457.65 , -78.53
+514.85 , -85.68
+572.06 , -92.76
+629.26 , -99.84
+686.47 , -106.91
+743.67 , -113.99
+800.88 , -121.14
+858.08 , -128.22
+915.29 , -135.30
+972.50 , -142.37
+1029.70 , -149.45
+1086.91 , -156.60
+1144.11 , -163.68
+
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..100936bf6a5a357b12e1f3c23c4e10d762325c19
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 21.9384
+ },
+ {
+ "Ratio": 12.276
+ },
+ {
+ "Ratio": 7.2336
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3Whl1_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl1_1.viepco",
+ "2": "IEPC_Gbx3Whl1_2.viepco",
+ "3": "IEPC_Gbx3Whl1_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3Whl1_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl1_1.viepco",
+ "2": "IEPC_Gbx3Whl1_2.viepco",
+ "3": "IEPC_Gbx3Whl1_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3Whl1_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_ENG_Gbx3Whl1.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_ENG_Gbx3Whl1.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..4e6fcefa3c70689d8a89bcd47a51d7a232e28799
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_ENG_Gbx3Whl1.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx3Whl1.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..94622846b552ed61d81fff828a3b68de9dae39c6
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_Vehicle_Gbx3Whl1.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3Whl1.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_1.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..7d9dd773ee374dc7a818143da159de20d758b556
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -17669.46 , 0.00
+0.00 , -16785.99 , 0.00
+0.00 , -15902.51 , 0.00
+0.00 , -15019.04 , 0.00
+0.00 , -14135.57 , 0.00
+0.00 , -13252.09 , 0.00
+0.00 , -12368.62 , -0.07
+0.00 , -11485.15 , -0.33
+0.00 , -10601.68 , -0.49
+0.00 , -9718.20 , -0.60
+0.00 , -8834.73 , -0.66
+0.00 , -7951.26 , -0.69
+0.00 , -7067.78 , -0.70
+0.00 , -6184.31 , -0.67
+0.00 , -5300.84 , -0.63
+0.00 , -4417.36 , -0.57
+0.00 , -3533.89 , -0.48
+0.00 , -2650.42 , -0.38
+0.00 , -1766.95 , -0.27
+0.00 , -883.47 , -0.13
+0.00 , -176.69 , -0.01
+0.00 , 153.22 , 0.06
+0.00 , 766.09 , 0.28
+0.00 , 1532.18 , 0.56
+0.00 , 2298.27 , 0.85
+0.00 , 3064.36 , 1.15
+0.00 , 3830.44 , 1.47
+0.00 , 4596.53 , 1.79
+0.00 , 5362.62 , 2.12
+0.00 , 6128.71 , 2.47
+0.00 , 6894.80 , 2.82
+0.00 , 7660.89 , 3.19
+0.00 , 8426.98 , 3.56
+0.00 , 9193.07 , 3.94
+0.00 , 9959.16 , 4.33
+0.00 , 10725.24 , 4.74
+0.00 , 11491.33 , 5.15
+0.00 , 12257.42 , 5.57
+0.00 , 13023.51 , 6.00
+0.00 , 13789.60 , 6.43
+0.00 , 14555.69 , 6.88
+0.00 , 15321.78 , 7.34
+1.89 , -17669.46 , 0.00
+1.89 , -16785.99 , 0.00
+1.89 , -15902.51 , 0.00
+1.89 , -15019.04 , 0.00
+1.89 , -14135.57 , 0.00
+1.89 , -13252.09 , 0.00
+1.89 , -12368.62 , -0.25
+1.89 , -11485.15 , -0.42
+1.89 , -10601.68 , -0.52
+1.89 , -9718.20 , -0.58
+1.89 , -8834.73 , -0.61
+1.89 , -7951.26 , -0.62
+1.89 , -7067.78 , -0.61
+1.89 , -6184.31 , -0.58
+1.89 , -5300.84 , -0.53
+1.89 , -4417.36 , -0.47
+1.89 , -3533.89 , -0.40
+1.89 , -2650.42 , -0.31
+1.89 , -1766.95 , -0.22
+1.89 , -883.47 , -0.11
+1.89 , -176.69 , -0.01
+1.89 , 153.22 , 0.05
+1.89 , 766.09 , 0.21
+1.89 , 1532.18 , 0.43
+1.89 , 2298.27 , 0.65
+1.89 , 3064.36 , 0.88
+1.89 , 3830.44 , 1.11
+1.89 , 4596.53 , 1.36
+1.89 , 5362.62 , 1.61
+1.89 , 6128.71 , 1.87
+1.89 , 6894.80 , 2.13
+1.89 , 7660.89 , 2.40
+1.89 , 8426.98 , 2.68
+1.89 , 9193.07 , 2.97
+1.89 , 9959.16 , 3.26
+1.89 , 10725.24 , 3.56
+1.89 , 11491.33 , 3.86
+1.89 , 12257.42 , 4.18
+1.89 , 13023.51 , 4.50
+1.89 , 13789.60 , 4.82
+1.89 , 14555.69 , 5.15
+1.89 , 15321.78 , 5.49
+18.86 , -17669.46 , -29.05
+18.86 , -16785.99 , -27.68
+18.86 , -15902.51 , -26.31
+18.86 , -15019.04 , -24.92
+18.86 , -14135.57 , -23.53
+18.86 , -13252.09 , -22.12
+18.86 , -12368.62 , -20.71
+18.86 , -11485.15 , -19.28
+18.86 , -10601.68 , -17.85
+18.86 , -9718.20 , -16.41
+18.86 , -8834.73 , -14.95
+18.86 , -7951.26 , -13.49
+18.86 , -7067.78 , -12.02
+18.86 , -6184.31 , -10.53
+18.86 , -5300.84 , -9.04
+18.86 , -4417.36 , -7.54
+18.86 , -3533.89 , -6.03
+18.86 , -2650.42 , -4.51
+18.86 , -1766.95 , -2.98
+18.86 , -883.47 , -1.44
+18.86 , -176.69 , -0.18
+18.86 , 153.22 , 0.45
+18.86 , 766.09 , 1.84
+18.86 , 1532.18 , 3.58
+18.86 , 2298.27 , 5.33
+18.86 , 3064.36 , 7.09
+18.86 , 3830.44 , 8.85
+18.86 , 4596.53 , 10.63
+18.86 , 5362.62 , 12.42
+18.86 , 6128.71 , 14.21
+18.86 , 6894.80 , 16.02
+18.86 , 7660.89 , 17.84
+18.86 , 8426.98 , 19.66
+18.86 , 9193.07 , 21.49
+18.86 , 9959.16 , 23.34
+18.86 , 10725.24 , 25.19
+18.86 , 11491.33 , 27.05
+18.86 , 12257.42 , 28.93
+18.86 , 13023.51 , 30.81
+18.86 , 13789.60 , 32.70
+18.86 , 14555.69 , 34.60
+18.86 , 15321.78 , 36.50
+37.72 , -17669.46 , -60.28
+37.72 , -16785.99 , -57.37
+37.72 , -15902.51 , -54.44
+37.72 , -15019.04 , -51.49
+37.72 , -14135.57 , -48.54
+37.72 , -13252.09 , -45.58
+37.72 , -12368.62 , -42.60
+37.72 , -11485.15 , -39.61
+37.72 , -10601.68 , -36.61
+37.72 , -9718.20 , -33.60
+37.72 , -8834.73 , -30.58
+37.72 , -7951.26 , -27.55
+37.72 , -7067.78 , -24.51
+37.72 , -6184.31 , -21.45
+37.72 , -5300.84 , -18.38
+37.72 , -4417.36 , -15.31
+37.72 , -3533.89 , -12.22
+37.72 , -2650.42 , -9.12
+37.72 , -1766.95 , -6.00
+37.72 , -883.47 , -2.88
+37.72 , -176.69 , -0.33
+37.72 , 153.22 , 0.92
+37.72 , 766.09 , 3.68
+37.72 , 1532.18 , 7.11
+37.72 , 2298.27 , 10.56
+37.72 , 3064.36 , 14.01
+37.72 , 3830.44 , 17.48
+37.72 , 4596.53 , 20.96
+37.72 , 5362.62 , 24.45
+37.72 , 6128.71 , 27.95
+37.72 , 6894.80 , 31.47
+37.72 , 7660.89 , 34.99
+37.72 , 8426.98 , 38.53
+37.72 , 9193.07 , 42.08
+37.72 , 9959.16 , 45.64
+37.72 , 10725.24 , 49.21
+37.72 , 11491.33 , 52.79
+37.72 , 12257.42 , 56.38
+37.72 , 13023.51 , 59.99
+37.72 , 13789.60 , 63.60
+37.72 , 14555.69 , 67.23
+37.72 , 15321.78 , 70.87
+56.59 , -17669.46 , -91.22
+56.59 , -16785.99 , -86.77
+56.59 , -15902.51 , -82.31
+56.59 , -15019.04 , -77.84
+56.59 , -14135.57 , -73.35
+56.59 , -13252.09 , -68.84
+56.59 , -12368.62 , -64.32
+56.59 , -11485.15 , -59.79
+56.59 , -10601.68 , -55.24
+56.59 , -9718.20 , -50.68
+56.59 , -8834.73 , -46.11
+56.59 , -7951.26 , -41.51
+56.59 , -7067.78 , -36.91
+56.59 , -6184.31 , -32.29
+56.59 , -5300.84 , -27.66
+56.59 , -4417.36 , -23.01
+56.59 , -3533.89 , -18.35
+56.59 , -2650.42 , -13.67
+56.59 , -1766.95 , -8.98
+56.59 , -883.47 , -4.27
+56.59 , -176.69 , -0.39
+56.59 , 153.22 , 1.43
+56.59 , 766.09 , 5.56
+56.59 , 1532.18 , 10.69
+56.59 , 2298.27 , 15.84
+56.59 , 3064.36 , 21.00
+56.59 , 3830.44 , 26.17
+56.59 , 4596.53 , 31.36
+56.59 , 5362.62 , 36.56
+56.59 , 6128.71 , 41.77
+56.59 , 6894.80 , 47.01
+56.59 , 7660.89 , 52.25
+56.59 , 8426.98 , 57.51
+56.59 , 9193.07 , 62.79
+56.59 , 9959.16 , 68.08
+56.59 , 10725.24 , 73.38
+56.59 , 11491.33 , 78.70
+56.59 , 12257.42 , 84.03
+56.59 , 13023.51 , 89.38
+56.59 , 13789.60 , 94.74
+56.59 , 14555.69 , 100.12
+56.59 , 15321.78 , 105.51
+75.45 , -17669.46 , -121.86
+75.45 , -16785.99 , -115.91
+75.45 , -15902.51 , -109.94
+75.45 , -15019.04 , -103.95
+75.45 , -14135.57 , -97.94
+75.45 , -13252.09 , -91.91
+75.45 , -12368.62 , -85.87
+75.45 , -11485.15 , -79.81
+75.45 , -10601.68 , -73.73
+75.45 , -9718.20 , -67.63
+75.45 , -8834.73 , -61.51
+75.45 , -7951.26 , -55.37
+75.45 , -7067.78 , -49.21
+75.45 , -6184.31 , -43.04
+75.45 , -5300.84 , -36.85
+75.45 , -4417.36 , -30.64
+75.45 , -3533.89 , -24.41
+75.45 , -2650.42 , -18.16
+75.45 , -1766.95 , -11.89
+75.45 , -883.47 , -5.59
+75.45 , -176.69 , -0.32
+75.45 , 153.22 , 1.99
+75.45 , 766.09 , 7.50
+75.45 , 1532.18 , 14.34
+75.45 , 2298.27 , 21.19
+75.45 , 3064.36 , 28.05
+75.45 , 3830.44 , 34.94
+75.45 , 4596.53 , 41.84
+75.45 , 5362.62 , 48.76
+75.45 , 6128.71 , 55.70
+75.45 , 6894.80 , 62.66
+75.45 , 7660.89 , 69.63
+75.45 , 8426.98 , 76.63
+75.45 , 9193.07 , 83.65
+75.45 , 9959.16 , 90.68
+75.45 , 10725.24 , 97.73
+75.45 , 11491.33 , 104.80
+75.45 , 12257.42 , 111.90
+75.45 , 13023.51 , 119.00
+75.45 , 13789.60 , 126.13
+75.45 , 14555.69 , 133.28
+75.45 , 15321.78 , 140.44
+94.31 , -17669.46 , -152.18
+94.31 , -16785.99 , -144.75
+94.31 , -15902.51 , -137.29
+94.31 , -15019.04 , -129.81
+94.31 , -14135.57 , -122.31
+94.31 , -13252.09 , -114.78
+94.31 , -12368.62 , -107.23
+94.31 , -11485.15 , -99.65
+94.31 , -10601.68 , -92.05
+94.31 , -9718.20 , -84.42
+94.31 , -8834.73 , -76.77
+94.31 , -7951.26 , -69.10
+94.31 , -7067.78 , -61.41
+94.31 , -6184.31 , -53.69
+94.31 , -5300.84 , -45.94
+94.31 , -4417.36 , -38.17
+94.31 , -3533.89 , -30.38
+94.31 , -2650.42 , -22.57
+94.31 , -1766.95 , -14.72
+94.31 , -883.47 , -6.84
+94.31 , -176.69 , 0.00
+94.31 , 153.22 , 2.61
+94.31 , 766.09 , 9.52
+94.31 , 1532.18 , 18.06
+94.31 , 2298.27 , 26.62
+94.31 , 3064.36 , 35.19
+94.31 , 3830.44 , 43.79
+94.31 , 4596.53 , 52.42
+94.31 , 5362.62 , 61.07
+94.31 , 6128.71 , 69.74
+94.31 , 6894.80 , 78.43
+94.31 , 7660.89 , 87.15
+94.31 , 8426.98 , 95.90
+94.31 , 9193.07 , 104.67
+94.31 , 9959.16 , 113.46
+94.31 , 10725.24 , 122.28
+94.31 , 11491.33 , 131.12
+94.31 , 12257.42 , 139.99
+94.31 , 13023.51 , 148.88
+94.31 , 13789.60 , 157.79
+94.31 , 14555.69 , 166.73
+94.31 , 15321.78 , 175.69
+113.17 , -17669.46 , -182.19
+113.17 , -16785.99 , -173.29
+113.17 , -15902.51 , -164.37
+113.17 , -15019.04 , -155.42
+113.17 , -14135.57 , -146.44
+113.17 , -13252.09 , -137.42
+113.17 , -12368.62 , -128.38
+113.17 , -11485.15 , -119.30
+113.17 , -10601.68 , -110.20
+113.17 , -9718.20 , -101.06
+113.17 , -8834.73 , -91.89
+113.17 , -7951.26 , -82.70
+113.17 , -7067.78 , -73.47
+113.17 , -6184.31 , -64.21
+113.17 , -5300.84 , -54.93
+113.17 , -4417.36 , -45.61
+113.17 , -3533.89 , -36.26
+113.17 , -2650.42 , -26.87
+113.17 , -1766.95 , -17.46
+113.17 , -883.47 , -7.98
+113.17 , -176.69 , 0.00
+113.17 , 153.22 , 3.29
+113.17 , 766.09 , 11.62
+113.17 , 1532.18 , 21.88
+113.17 , 2298.27 , 32.14
+113.17 , 3064.36 , 42.44
+113.17 , 3830.44 , 52.76
+113.17 , 4596.53 , 63.11
+113.17 , 5362.62 , 73.49
+113.17 , 6128.71 , 83.91
+113.17 , 6894.80 , 94.35
+113.17 , 7660.89 , 104.82
+113.17 , 8426.98 , 115.33
+113.17 , 9193.07 , 125.87
+113.17 , 9959.16 , 136.43
+113.17 , 10725.24 , 147.03
+113.17 , 11491.33 , 157.66
+113.17 , 12257.42 , 168.32
+113.17 , 13023.51 , 179.01
+113.17 , 13789.60 , 189.74
+113.17 , 14555.69 , 200.49
+113.17 , 15321.78 , 211.27
+132.03 , -17669.46 , -211.85
+132.03 , -16785.99 , -201.52
+132.03 , -15902.51 , -191.16
+132.03 , -15019.04 , -180.75
+132.03 , -14135.57 , -170.31
+132.03 , -13252.09 , -159.83
+132.03 , -12368.62 , -149.31
+132.03 , -11485.15 , -138.75
+132.03 , -10601.68 , -128.16
+132.03 , -9718.20 , -117.52
+132.03 , -8834.73 , -106.85
+132.03 , -7951.26 , -96.14
+132.03 , -7067.78 , -85.39
+132.03 , -6184.31 , -74.61
+132.03 , -5300.84 , -63.78
+132.03 , -4417.36 , -52.92
+132.03 , -3533.89 , -42.02
+132.03 , -2650.42 , -31.07
+132.03 , -1766.95 , -20.08
+132.03 , -883.47 , -9.00
+132.03 , -176.69 , 0.00
+132.03 , 153.22 , 4.05
+132.03 , 766.09 , 13.82
+132.03 , 1532.18 , 25.80
+132.03 , 2298.27 , 37.78
+132.03 , 3064.36 , 49.79
+132.03 , 3830.44 , 61.84
+132.03 , 4596.53 , 73.93
+132.03 , 5362.62 , 86.05
+132.03 , 6128.71 , 98.22
+132.03 , 6894.80 , 110.42
+132.03 , 7660.89 , 122.66
+132.03 , 8426.98 , 134.94
+132.03 , 9193.07 , 147.26
+132.03 , 9959.16 , 159.61
+132.03 , 10725.24 , 172.01
+132.03 , 11491.33 , 184.44
+132.03 , 12257.42 , 196.92
+132.03 , 13023.51 , 209.43
+132.03 , 13789.60 , 221.98
+132.03 , 14555.69 , 234.57
+132.03 , 15321.78 , 247.19
+150.90 , -17669.46 , -241.15
+150.90 , -16785.99 , -229.41
+150.90 , -15902.51 , -217.63
+150.90 , -15019.04 , -205.79
+150.90 , -14135.57 , -193.91
+150.90 , -13252.09 , -181.98
+150.90 , -12368.62 , -170.01
+150.90 , -11485.15 , -157.99
+150.90 , -10601.68 , -145.91
+150.90 , -9718.20 , -133.80
+150.90 , -8834.73 , -121.63
+150.90 , -7951.26 , -109.42
+150.90 , -7067.78 , -97.16
+150.90 , -6184.31 , -84.85
+150.90 , -5300.84 , -72.50
+150.90 , -4417.36 , -60.10
+150.90 , -3533.89 , -47.65
+150.90 , -2650.42 , -35.14
+150.90 , -1766.95 , -22.57
+150.90 , -883.47 , -9.88
+150.90 , -176.69 , 0.00
+150.90 , 153.22 , 4.88
+150.90 , 766.09 , 16.13
+150.90 , 1532.18 , 29.83
+150.90 , 2298.27 , 43.53
+150.90 , 3064.36 , 57.27
+150.90 , 3830.44 , 71.06
+150.90 , 4596.53 , 84.89
+150.90 , 5362.62 , 98.76
+150.90 , 6128.71 , 112.68
+150.90 , 6894.80 , 126.65
+150.90 , 7660.89 , 140.67
+150.90 , 8426.98 , 154.74
+150.90 , 9193.07 , 168.85
+150.90 , 9959.16 , 183.01
+150.90 , 10725.24 , 197.22
+150.90 , 11491.33 , 211.48
+150.90 , 12257.42 , 225.78
+150.90 , 13023.51 , 240.13
+150.90 , 13789.60 , 254.53
+150.90 , 14555.69 , 268.97
+150.90 , 15321.78 , 283.46
+169.76 , -17669.46 , -270.09
+169.76 , -16785.99 , -256.96
+169.76 , -15902.51 , -243.78
+169.76 , -15019.04 , -230.53
+169.76 , -14135.57 , -217.23
+169.76 , -13252.09 , -203.87
+169.76 , -12368.62 , -190.46
+169.76 , -11485.15 , -176.98
+169.76 , -10601.68 , -163.45
+169.76 , -9718.20 , -149.87
+169.76 , -8834.73 , -136.22
+169.76 , -7951.26 , -122.52
+169.76 , -7067.78 , -108.76
+169.76 , -6184.31 , -94.94
+169.76 , -5300.84 , -81.06
+169.76 , -4417.36 , -67.13
+169.76 , -3533.89 , -53.13
+169.76 , -2650.42 , -39.07
+169.76 , -1766.95 , -24.92
+169.76 , -883.47 , -10.59
+169.76 , -176.69 , 0.00
+169.76 , 153.22 , 5.80
+169.76 , 766.09 , 18.55
+169.76 , 1532.18 , 33.99
+169.76 , 2298.27 , 49.42
+169.76 , 3064.36 , 64.90
+169.76 , 3830.44 , 80.42
+169.76 , 4596.53 , 96.00
+169.76 , 5362.62 , 111.63
+169.76 , 6128.71 , 127.32
+169.76 , 6894.80 , 143.07
+169.76 , 7660.89 , 158.88
+169.76 , 8426.98 , 174.74
+169.76 , 9193.07 , 190.66
+169.76 , 9959.16 , 206.64
+169.76 , 10725.24 , 222.68
+169.76 , 11491.33 , 238.77
+169.76 , 12257.42 , 254.92
+169.76 , 13023.51 , 271.13
+169.76 , 13789.60 , 287.40
+169.76 , 14555.69 , 303.72
+169.76 , 15321.78 , 320.10
+188.62 , -17669.46 , -298.63
+188.62 , -16785.99 , -284.14
+188.62 , -15902.51 , -269.58
+188.62 , -15019.04 , -254.95
+188.62 , -14135.57 , -240.25
+188.62 , -13252.09 , -225.48
+188.62 , -12368.62 , -210.64
+188.62 , -11485.15 , -195.74
+188.62 , -10601.68 , -180.76
+188.62 , -9718.20 , -165.71
+188.62 , -8834.73 , -150.60
+188.62 , -7951.26 , -135.42
+188.62 , -7067.78 , -120.16
+188.62 , -6184.31 , -104.84
+188.62 , -5300.84 , -89.45
+188.62 , -4417.36 , -73.99
+188.62 , -3533.89 , -58.45
+188.62 , -2650.42 , -42.83
+188.62 , -1766.95 , -27.10
+188.62 , -883.47 , -11.12
+188.62 , -176.69 , 0.00
+188.62 , 153.22 , 6.80
+188.62 , 766.09 , 21.10
+188.62 , 1532.18 , 38.29
+188.62 , 2298.27 , 55.46
+188.62 , 3064.36 , 72.67
+188.62 , 3830.44 , 89.94
+188.62 , 4596.53 , 107.27
+188.62 , 5362.62 , 124.67
+188.62 , 6128.71 , 142.14
+188.62 , 6894.80 , 159.68
+188.62 , 7660.89 , 177.29
+188.62 , 8426.98 , 194.96
+188.62 , 9193.07 , 212.70
+188.62 , 9959.16 , 230.52
+188.62 , 10725.24 , 248.40
+188.62 , 11491.33 , 266.35
+188.62 , 12257.42 , 284.37
+188.62 , 13023.51 , 302.45
+188.62 , 13789.60 , 320.61
+188.62 , 14555.69 , 338.83
+188.62 , 15321.78 , 357.12
+207.48 , -17669.46 , -326.77
+207.48 , -16785.99 , -310.94
+207.48 , -15902.51 , -295.03
+207.48 , -15019.04 , -279.03
+207.48 , -14135.57 , -262.95
+207.48 , -13252.09 , -246.79
+207.48 , -12368.62 , -230.55
+207.48 , -11485.15 , -214.22
+207.48 , -10601.68 , -197.81
+207.48 , -9718.20 , -181.33
+207.48 , -8834.73 , -164.76
+207.48 , -7951.26 , -148.10
+207.48 , -7067.78 , -131.37
+207.48 , -6184.31 , -114.55
+207.48 , -5300.84 , -97.65
+207.48 , -4417.36 , -80.67
+207.48 , -3533.89 , -63.59
+207.48 , -2650.42 , -46.42
+207.48 , -1766.95 , -29.10
+207.48 , -883.47 , -11.41
+207.48 , -176.69 , 0.00
+207.48 , 153.22 , 7.90
+207.48 , 766.09 , 23.79
+207.48 , 1532.18 , 42.74
+207.48 , 2298.27 , 61.65
+207.48 , 3064.36 , 80.61
+207.48 , 3830.44 , 99.63
+207.48 , 4596.53 , 118.73
+207.48 , 5362.62 , 137.91
+207.48 , 6128.71 , 157.16
+207.48 , 6894.80 , 176.50
+207.48 , 7660.89 , 195.91
+207.48 , 8426.98 , 215.41
+207.48 , 9193.07 , 234.99
+207.48 , 9959.16 , 254.65
+207.48 , 10725.24 , 274.39
+207.48 , 11491.33 , 294.21
+207.48 , 12257.42 , 314.12
+207.48 , 13023.51 , 334.10
+207.48 , 13789.60 , 354.16
+207.48 , 14555.69 , 374.31
+207.48 , 15321.78 , 394.53
+226.34 , -17669.46 , -354.49
+226.34 , -16785.99 , -337.34
+226.34 , -15902.51 , -320.10
+226.34 , -15019.04 , -302.75
+226.34 , -14135.57 , -285.32
+226.34 , -13252.09 , -267.78
+226.34 , -12368.62 , -250.15
+226.34 , -11485.15 , -232.43
+226.34 , -10601.68 , -214.60
+226.34 , -9718.20 , -196.69
+226.34 , -8834.73 , -178.67
+226.34 , -7951.26 , -160.56
+226.34 , -7067.78 , -142.36
+226.34 , -6184.31 , -124.05
+226.34 , -5300.84 , -105.65
+226.34 , -4417.36 , -87.15
+226.34 , -3533.89 , -68.54
+226.34 , -2650.42 , -49.80
+226.34 , -1766.95 , -30.89
+226.34 , -883.47 , -11.43
+226.34 , -176.69 , 0.00
+226.34 , 153.22 , 9.08
+226.34 , 766.09 , 26.62
+226.34 , 1532.18 , 47.35
+226.34 , 2298.27 , 68.02
+226.34 , 3064.36 , 88.72
+226.34 , 3830.44 , 109.51
+226.34 , 4596.53 , 130.38
+226.34 , 5362.62 , 151.34
+226.34 , 6128.71 , 172.39
+226.34 , 6894.80 , 193.53
+226.34 , 7660.89 , 214.77
+226.34 , 8426.98 , 236.11
+226.34 , 9193.07 , 257.53
+226.34 , 9959.16 , 279.05
+226.34 , 10725.24 , 300.67
+226.34 , 11491.33 , 322.38
+226.34 , 12257.42 , 344.19
+226.34 , 13023.51 , 366.08
+226.34 , 13789.60 , 388.08
+226.34 , 14555.69 , 410.16
+226.34 , 15321.78 , 432.34
+245.21 , -17669.46 , -381.77
+245.21 , -16785.99 , -363.33
+245.21 , -15902.51 , -344.77
+245.21 , -15019.04 , -326.11
+245.21 , -14135.57 , -307.33
+245.21 , -13252.09 , -288.45
+245.21 , -12368.62 , -269.45
+245.21 , -11485.15 , -250.33
+245.21 , -10601.68 , -231.11
+245.21 , -9718.20 , -211.78
+245.21 , -8834.73 , -192.34
+245.21 , -7951.26 , -172.78
+245.21 , -7067.78 , -153.11
+245.21 , -6184.31 , -133.33
+245.21 , -5300.84 , -113.43
+245.21 , -4417.36 , -93.42
+245.21 , -3533.89 , -73.27
+245.21 , -2650.42 , -52.98
+245.21 , -1766.95 , -32.45
+245.21 , -883.47 , -11.12
+245.21 , -176.69 , 0.00
+245.21 , 153.22 , 10.37
+245.21 , 766.09 , 29.60
+245.21 , 1532.18 , 52.14
+245.21 , 2298.27 , 74.56
+245.21 , 3064.36 , 97.03
+245.21 , 3830.44 , 119.58
+245.21 , 4596.53 , 142.23
+245.21 , 5362.62 , 164.98
+245.21 , 6128.71 , 187.84
+245.21 , 6894.80 , 210.80
+245.21 , 7660.89 , 233.87
+245.21 , 8426.98 , 257.05
+245.21 , 9193.07 , 280.34
+245.21 , 9959.16 , 303.74
+245.21 , 10725.24 , 327.25
+245.21 , 11491.33 , 350.87
+245.21 , 12257.42 , 374.59
+245.21 , 13023.51 , 398.42
+245.21 , 13789.60 , 422.36
+245.21 , 14555.69 , 446.41
+245.21 , 15321.78 , 470.57
+264.07 , -17669.46 , -408.59
+264.07 , -16785.99 , -388.88
+264.07 , -15902.51 , -369.04
+264.07 , -15019.04 , -349.08
+264.07 , -14135.57 , -328.98
+264.07 , -13252.09 , -308.76
+264.07 , -12368.62 , -288.41
+264.07 , -11485.15 , -267.93
+264.07 , -10601.68 , -247.32
+264.07 , -9718.20 , -226.59
+264.07 , -8834.73 , -205.73
+264.07 , -7951.26 , -184.73
+264.07 , -7067.78 , -163.61
+264.07 , -6184.31 , -142.36
+264.07 , -5300.84 , -120.97
+264.07 , -4417.36 , -99.45
+264.07 , -3533.89 , -77.77
+264.07 , -2650.42 , -55.91
+264.07 , -1766.95 , -33.75
+264.07 , -883.47 , -10.40
+264.07 , -176.69 , 0.00
+264.07 , 153.22 , 11.76
+264.07 , 766.09 , 32.74
+264.07 , 1532.18 , 57.10
+264.07 , 2298.27 , 81.29
+264.07 , 3064.36 , 105.53
+264.07 , 3830.44 , 129.86
+264.07 , 4596.53 , 154.29
+264.07 , 5362.62 , 178.85
+264.07 , 6128.71 , 203.52
+264.07 , 6894.80 , 228.31
+264.07 , 7660.89 , 253.23
+264.07 , 8426.98 , 278.27
+264.07 , 9193.07 , 303.44
+264.07 , 9959.16 , 328.73
+264.07 , 10725.24 , 354.14
+264.07 , 11491.33 , 379.68
+264.07 , 12257.42 , 405.34
+264.07 , 13023.51 , 431.13
+264.07 , 13789.60 , 457.03
+264.07 , 14555.69 , 483.07
+264.07 , 15321.78 , 509.22
+282.93 , -17669.46 , -434.93
+282.93 , -16785.99 , -413.98
+282.93 , -15902.51 , -392.88
+282.93 , -15019.04 , -371.64
+282.93 , -14135.57 , -350.25
+282.93 , -13252.09 , -328.71
+282.93 , -12368.62 , -307.03
+282.93 , -11485.15 , -285.20
+282.93 , -10601.68 , -263.22
+282.93 , -9718.20 , -241.10
+282.93 , -8834.73 , -218.83
+282.93 , -7951.26 , -196.41
+282.93 , -7067.78 , -173.85
+282.93 , -6184.31 , -151.13
+282.93 , -5300.84 , -128.26
+282.93 , -4417.36 , -105.23
+282.93 , -3533.89 , -82.02
+282.93 , -2650.42 , -58.59
+282.93 , -1766.95 , -34.77
+282.93 , -883.47 , -9.14
+282.93 , -176.69 , 0.00
+282.93 , 153.22 , 13.25
+282.93 , 766.09 , 36.05
+282.93 , 1532.18 , 62.25
+282.93 , 2298.27 , 88.23
+282.93 , 3064.36 , 114.25
+282.93 , 3830.44 , 140.36
+282.93 , 4596.53 , 166.59
+282.93 , 5362.62 , 192.95
+282.93 , 6128.71 , 219.45
+282.93 , 6894.80 , 246.08
+282.93 , 7660.89 , 272.86
+282.93 , 8426.98 , 299.77
+282.93 , 9193.07 , 326.82
+282.93 , 9959.16 , 354.02
+282.93 , 10725.24 , 381.35
+282.93 , 11491.33 , 408.83
+282.93 , 12257.42 , 436.45
+282.93 , 13023.51 , 464.20
+282.93 , 13789.60 , 492.10
+282.93 , 14555.69 , 520.14
+282.93 , 15321.78 , 548.31
+301.79 , -17669.46 , -460.78
+301.79 , -16785.99 , -438.62
+301.79 , -15902.51 , -416.28
+301.79 , -15019.04 , -393.78
+301.79 , -14135.57 , -371.11
+301.79 , -13252.09 , -348.28
+301.79 , -12368.62 , -325.28
+301.79 , -11485.15 , -302.11
+301.79 , -10601.68 , -278.78
+301.79 , -9718.20 , -255.29
+301.79 , -8834.73 , -231.62
+301.79 , -7951.26 , -207.79
+301.79 , -7067.78 , -183.79
+301.79 , -6184.31 , -159.62
+301.79 , -5300.84 , -135.27
+301.79 , -4417.36 , -110.74
+301.79 , -3533.89 , -85.99
+301.79 , -2650.42 , -60.98
+301.79 , -1766.95 , -35.47
+301.79 , -883.47 , -7.05
+301.79 , -176.69 , 0.00
+301.79 , 153.22 , 14.84
+301.79 , 766.09 , 39.53
+301.79 , 1532.18 , 67.60
+301.79 , 2298.27 , 95.38
+301.79 , 3064.36 , 123.18
+301.79 , 3830.44 , 151.09
+301.79 , 4596.53 , 179.12
+301.79 , 5362.62 , 207.30
+301.79 , 6128.71 , 235.63
+301.79 , 6894.80 , 264.12
+301.79 , 7660.89 , 292.76
+301.79 , 8426.98 , 321.56
+301.79 , 9193.07 , 350.51
+301.79 , 9959.16 , 379.63
+301.79 , 10725.24 , 408.90
+301.79 , 11491.33 , 438.33
+301.79 , 12257.42 , 467.92
+301.79 , 13023.51 , 497.67
+301.79 , 13789.60 , 527.57
+301.79 , 14555.69 , 557.64
+301.79 , 15321.78 , 587.85
+320.65 , -17669.46 , -486.12
+320.65 , -16785.99 , -462.76
+320.65 , -15902.51 , -439.22
+320.65 , -15019.04 , -415.48
+320.65 , -14135.57 , -391.56
+320.65 , -13252.09 , -367.45
+320.65 , -12368.62 , -343.15
+320.65 , -11485.15 , -318.67
+320.65 , -10601.68 , -294.00
+320.65 , -9718.20 , -269.14
+320.65 , -8834.73 , -244.09
+320.65 , -7951.26 , -218.86
+320.65 , -7067.78 , -193.44
+320.65 , -6184.31 , -167.82
+320.65 , -5300.84 , -142.00
+320.65 , -4417.36 , -115.96
+320.65 , -3533.89 , -89.67
+320.65 , -2650.42 , -63.06
+320.65 , -1766.95 , -35.80
+320.65 , -883.47 , -3.22
+320.65 , -176.69 , 0.00
+320.65 , 153.22 , 16.54
+320.65 , 766.09 , 43.18
+320.65 , 1532.18 , 73.16
+320.65 , 2298.27 , 102.75
+320.65 , 3064.36 , 132.35
+320.65 , 3830.44 , 162.06
+320.65 , 4596.53 , 191.91
+320.65 , 5362.62 , 221.91
+320.65 , 6128.71 , 252.09
+320.65 , 6894.80 , 282.44
+320.65 , 7660.89 , 312.96
+320.65 , 8426.98 , 343.65
+320.65 , 9193.07 , 374.52
+320.65 , 9959.16 , 405.57
+320.65 , 10725.24 , 436.80
+320.65 , 11491.33 , 468.20
+320.65 , 12257.42 , 499.78
+320.65 , 13023.51 , 531.53
+320.65 , 13789.60 , 563.46
+320.65 , 14555.69 , 595.57
+320.65 , 15321.78 , 627.85
+339.52 , -17669.46 , -510.93
+339.52 , -16785.99 , -486.40
+339.52 , -15902.51 , -461.67
+339.52 , -15019.04 , -436.72
+339.52 , -14135.57 , -411.56
+339.52 , -13252.09 , -386.20
+339.52 , -12368.62 , -360.62
+339.52 , -11485.15 , -334.84
+339.52 , -10601.68 , -308.84
+339.52 , -9718.20 , -282.64
+339.52 , -8834.73 , -256.22
+339.52 , -7951.26 , -229.60
+339.52 , -7067.78 , -202.76
+339.52 , -6184.31 , -175.70
+339.52 , -5300.84 , -148.41
+339.52 , -4417.36 , -120.87
+339.52 , -3533.89 , -93.04
+339.52 , -2650.42 , -64.80
+339.52 , -1766.95 , -35.73
+339.52 , -883.47 , 0.00
+339.52 , -176.69 , 0.00
+339.52 , 153.22 , 18.35
+339.52 , 766.09 , 47.02
+339.52 , 1532.18 , 78.93
+339.52 , 2298.27 , 110.35
+339.52 , 3064.36 , 141.76
+339.52 , 3830.44 , 173.28
+339.52 , 4596.53 , 204.95
+339.52 , 5362.62 , 236.80
+339.52 , 6128.71 , 268.83
+339.52 , 6894.80 , 301.04
+339.52 , 7660.89 , 333.46
+339.52 , 8426.98 , 366.06
+339.52 , 9193.07 , 398.86
+339.52 , 9959.16 , 431.86
+339.52 , 10725.24 , 465.05
+339.52 , 11491.33 , 498.44
+339.52 , 12257.42 , 532.03
+339.52 , 13023.51 , 565.81
+339.52 , 13789.60 , 599.79
+339.52 , 14555.69 , 633.96
+339.52 , 15321.78 , 668.33
+358.38 , -17669.46 , -535.19
+358.38 , -16785.99 , -509.52
+358.38 , -15902.51 , -483.62
+358.38 , -15019.04 , -457.48
+358.38 , -14135.57 , -431.11
+358.38 , -13252.09 , -404.51
+358.38 , -12368.62 , -377.67
+358.38 , -11485.15 , -350.60
+358.38 , -10601.68 , -323.30
+358.38 , -9718.20 , -295.76
+358.38 , -8834.73 , -267.99
+358.38 , -7951.26 , -239.99
+358.38 , -7067.78 , -211.74
+358.38 , -6184.31 , -183.24
+358.38 , -5300.84 , -154.48
+358.38 , -4417.36 , -125.44
+358.38 , -3533.89 , -96.05
+358.38 , -2650.42 , -66.18
+358.38 , -1766.95 , -35.19
+358.38 , -883.47 , 0.00
+358.38 , -176.69 , 0.00
+358.38 , 153.22 , 20.27
+358.38 , 766.09 , 51.05
+358.38 , 1532.18 , 84.92
+358.38 , 2298.27 , 118.19
+358.38 , 3064.36 , 151.42
+358.38 , 3830.44 , 184.76
+358.38 , 4596.53 , 218.27
+358.38 , 5362.62 , 251.96
+358.38 , 6128.71 , 285.86
+358.38 , 6894.80 , 319.96
+358.38 , 7660.89 , 354.27
+358.38 , 8426.98 , 388.80
+358.38 , 9193.07 , 423.54
+358.38 , 9959.16 , 458.50
+358.38 , 10725.24 , 493.68
+358.38 , 11491.33 , 529.07
+358.38 , 12257.42 , 564.68
+358.38 , 13023.51 , 600.51
+358.38 , 13789.60 , 636.55
+358.38 , 14555.69 , 672.81
+358.38 , 15321.78 , 709.28
+377.24 , -17669.46 , -558.87
+377.24 , -16785.99 , -532.09
+377.24 , -15902.51 , -505.05
+377.24 , -15019.04 , -477.75
+377.24 , -14135.57 , -450.19
+377.24 , -13252.09 , -422.37
+377.24 , -12368.62 , -394.29
+377.24 , -11485.15 , -365.95
+377.24 , -10601.68 , -337.36
+377.24 , -9718.20 , -308.50
+377.24 , -8834.73 , -279.38
+377.24 , -7951.26 , -250.00
+377.24 , -7067.78 , -220.35
+377.24 , -6184.31 , -190.43
+377.24 , -5300.84 , -160.20
+377.24 , -4417.36 , -129.65
+377.24 , -3533.89 , -98.70
+377.24 , -2650.42 , -67.15
+377.24 , -1766.95 , -34.12
+377.24 , -883.47 , 0.00
+377.24 , -176.69 , 0.00
+377.24 , 153.22 , 22.30
+377.24 , 766.09 , 55.27
+377.24 , 1532.18 , 91.14
+377.24 , 2298.27 , 126.27
+377.24 , 3064.36 , 161.34
+377.24 , 3830.44 , 196.52
+377.24 , 4596.53 , 231.87
+377.24 , 5362.62 , 267.42
+377.24 , 6128.71 , 303.19
+377.24 , 6894.80 , 339.18
+377.24 , 7660.89 , 375.41
+377.24 , 8426.98 , 411.87
+377.24 , 9193.07 , 448.57
+377.24 , 9959.16 , 485.51
+377.24 , 10725.24 , 522.68
+377.24 , 11491.33 , 560.09
+377.24 , 12257.42 , 597.75
+377.24 , 13023.51 , 635.63
+377.24 , 13789.60 , 673.76
+377.24 , 14555.69 , 712.12
+377.24 , 15321.78 , 750.73
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_2.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..b5980ac32ff2f44452666e544ce91c462f5c5a7f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -9785.31 , 0.00
+0.00 , -9296.05 , 0.00
+0.00 , -8806.78 , 0.00
+0.00 , -8317.52 , 0.00
+0.00 , -7828.25 , 0.00
+0.00 , -7338.98 , 0.00
+0.00 , -6849.72 , -0.07
+0.00 , -6360.45 , -0.33
+0.00 , -5871.19 , -0.49
+0.00 , -5381.92 , -0.60
+0.00 , -4892.66 , -0.66
+0.00 , -4403.39 , -0.69
+0.00 , -3914.12 , -0.70
+0.00 , -3424.86 , -0.67
+0.00 , -2935.59 , -0.63
+0.00 , -2446.33 , -0.57
+0.00 , -1957.06 , -0.48
+0.00 , -1467.80 , -0.38
+0.00 , -978.53 , -0.27
+0.00 , -489.27 , -0.13
+0.00 , -97.85 , -0.01
+0.00 , 86.63 , 0.06
+0.00 , 433.14 , 0.28
+0.00 , 866.29 , 0.56
+0.00 , 1299.43 , 0.85
+0.00 , 1732.57 , 1.15
+0.00 , 2165.72 , 1.47
+0.00 , 2598.86 , 1.79
+0.00 , 3032.00 , 2.12
+0.00 , 3465.15 , 2.47
+0.00 , 3898.29 , 2.82
+0.00 , 4331.43 , 3.19
+0.00 , 4764.58 , 3.56
+0.00 , 5197.72 , 3.94
+0.00 , 5630.86 , 4.33
+0.00 , 6064.01 , 4.74
+0.00 , 6497.15 , 5.15
+0.00 , 6930.29 , 5.57
+0.00 , 7363.44 , 6.00
+0.00 , 7796.58 , 6.43
+0.00 , 8229.72 , 6.88
+0.00 , 8662.87 , 7.34
+3.37 , -9785.31 , 0.00
+3.37 , -9296.05 , 0.00
+3.37 , -8806.78 , 0.00
+3.37 , -8317.52 , 0.00
+3.37 , -7828.25 , 0.00
+3.37 , -7338.98 , 0.00
+3.37 , -6849.72 , -0.25
+3.37 , -6360.45 , -0.42
+3.37 , -5871.19 , -0.52
+3.37 , -5381.92 , -0.58
+3.37 , -4892.66 , -0.61
+3.37 , -4403.39 , -0.62
+3.37 , -3914.12 , -0.61
+3.37 , -3424.86 , -0.58
+3.37 , -2935.59 , -0.53
+3.37 , -2446.33 , -0.47
+3.37 , -1957.06 , -0.40
+3.37 , -1467.80 , -0.31
+3.37 , -978.53 , -0.22
+3.37 , -489.27 , -0.11
+3.37 , -97.85 , -0.01
+3.37 , 86.63 , 0.05
+3.37 , 433.14 , 0.21
+3.37 , 866.29 , 0.43
+3.37 , 1299.43 , 0.65
+3.37 , 1732.57 , 0.88
+3.37 , 2165.72 , 1.11
+3.37 , 2598.86 , 1.36
+3.37 , 3032.00 , 1.61
+3.37 , 3465.15 , 1.87
+3.37 , 3898.29 , 2.13
+3.37 , 4331.43 , 2.40
+3.37 , 4764.58 , 2.68
+3.37 , 5197.72 , 2.97
+3.37 , 5630.86 , 3.26
+3.37 , 6064.01 , 3.56
+3.37 , 6497.15 , 3.86
+3.37 , 6930.29 , 4.18
+3.37 , 7363.44 , 4.50
+3.37 , 7796.58 , 4.82
+3.37 , 8229.72 , 5.15
+3.37 , 8662.87 , 5.49
+33.71 , -9785.31 , -29.05
+33.71 , -9296.05 , -27.68
+33.71 , -8806.78 , -26.31
+33.71 , -8317.52 , -24.92
+33.71 , -7828.25 , -23.53
+33.71 , -7338.98 , -22.12
+33.71 , -6849.72 , -20.71
+33.71 , -6360.45 , -19.28
+33.71 , -5871.19 , -17.85
+33.71 , -5381.92 , -16.41
+33.71 , -4892.66 , -14.95
+33.71 , -4403.39 , -13.49
+33.71 , -3914.12 , -12.02
+33.71 , -3424.86 , -10.53
+33.71 , -2935.59 , -9.04
+33.71 , -2446.33 , -7.54
+33.71 , -1957.06 , -6.03
+33.71 , -1467.80 , -4.51
+33.71 , -978.53 , -2.98
+33.71 , -489.27 , -1.44
+33.71 , -97.85 , -0.18
+33.71 , 86.63 , 0.45
+33.71 , 433.14 , 1.84
+33.71 , 866.29 , 3.58
+33.71 , 1299.43 , 5.33
+33.71 , 1732.57 , 7.09
+33.71 , 2165.72 , 8.85
+33.71 , 2598.86 , 10.63
+33.71 , 3032.00 , 12.42
+33.71 , 3465.15 , 14.21
+33.71 , 3898.29 , 16.02
+33.71 , 4331.43 , 17.84
+33.71 , 4764.58 , 19.66
+33.71 , 5197.72 , 21.49
+33.71 , 5630.86 , 23.34
+33.71 , 6064.01 , 25.19
+33.71 , 6497.15 , 27.05
+33.71 , 6930.29 , 28.93
+33.71 , 7363.44 , 30.81
+33.71 , 7796.58 , 32.70
+33.71 , 8229.72 , 34.60
+33.71 , 8662.87 , 36.50
+67.42 , -9785.31 , -60.28
+67.42 , -9296.05 , -57.37
+67.42 , -8806.78 , -54.44
+67.42 , -8317.52 , -51.49
+67.42 , -7828.25 , -48.54
+67.42 , -7338.98 , -45.58
+67.42 , -6849.72 , -42.60
+67.42 , -6360.45 , -39.61
+67.42 , -5871.19 , -36.61
+67.42 , -5381.92 , -33.60
+67.42 , -4892.66 , -30.58
+67.42 , -4403.39 , -27.55
+67.42 , -3914.12 , -24.51
+67.42 , -3424.86 , -21.45
+67.42 , -2935.59 , -18.38
+67.42 , -2446.33 , -15.31
+67.42 , -1957.06 , -12.22
+67.42 , -1467.80 , -9.12
+67.42 , -978.53 , -6.00
+67.42 , -489.27 , -2.88
+67.42 , -97.85 , -0.33
+67.42 , 86.63 , 0.92
+67.42 , 433.14 , 3.68
+67.42 , 866.29 , 7.11
+67.42 , 1299.43 , 10.56
+67.42 , 1732.57 , 14.01
+67.42 , 2165.72 , 17.48
+67.42 , 2598.86 , 20.96
+67.42 , 3032.00 , 24.45
+67.42 , 3465.15 , 27.95
+67.42 , 3898.29 , 31.47
+67.42 , 4331.43 , 34.99
+67.42 , 4764.58 , 38.53
+67.42 , 5197.72 , 42.08
+67.42 , 5630.86 , 45.64
+67.42 , 6064.01 , 49.21
+67.42 , 6497.15 , 52.79
+67.42 , 6930.29 , 56.38
+67.42 , 7363.44 , 59.99
+67.42 , 7796.58 , 63.60
+67.42 , 8229.72 , 67.23
+67.42 , 8662.87 , 70.87
+101.12 , -9785.31 , -91.22
+101.12 , -9296.05 , -86.77
+101.12 , -8806.78 , -82.31
+101.12 , -8317.52 , -77.84
+101.12 , -7828.25 , -73.35
+101.12 , -7338.98 , -68.84
+101.12 , -6849.72 , -64.32
+101.12 , -6360.45 , -59.79
+101.12 , -5871.19 , -55.24
+101.12 , -5381.92 , -50.68
+101.12 , -4892.66 , -46.11
+101.12 , -4403.39 , -41.51
+101.12 , -3914.12 , -36.91
+101.12 , -3424.86 , -32.29
+101.12 , -2935.59 , -27.66
+101.12 , -2446.33 , -23.01
+101.12 , -1957.06 , -18.35
+101.12 , -1467.80 , -13.67
+101.12 , -978.53 , -8.98
+101.12 , -489.27 , -4.27
+101.12 , -97.85 , -0.39
+101.12 , 86.63 , 1.43
+101.12 , 433.14 , 5.56
+101.12 , 866.29 , 10.69
+101.12 , 1299.43 , 15.84
+101.12 , 1732.57 , 21.00
+101.12 , 2165.72 , 26.17
+101.12 , 2598.86 , 31.36
+101.12 , 3032.00 , 36.56
+101.12 , 3465.15 , 41.77
+101.12 , 3898.29 , 47.01
+101.12 , 4331.43 , 52.25
+101.12 , 4764.58 , 57.51
+101.12 , 5197.72 , 62.79
+101.12 , 5630.86 , 68.08
+101.12 , 6064.01 , 73.38
+101.12 , 6497.15 , 78.70
+101.12 , 6930.29 , 84.03
+101.12 , 7363.44 , 89.38
+101.12 , 7796.58 , 94.74
+101.12 , 8229.72 , 100.12
+101.12 , 8662.87 , 105.51
+134.83 , -9785.31 , -121.86
+134.83 , -9296.05 , -115.91
+134.83 , -8806.78 , -109.94
+134.83 , -8317.52 , -103.95
+134.83 , -7828.25 , -97.94
+134.83 , -7338.98 , -91.91
+134.83 , -6849.72 , -85.87
+134.83 , -6360.45 , -79.81
+134.83 , -5871.19 , -73.73
+134.83 , -5381.92 , -67.63
+134.83 , -4892.66 , -61.51
+134.83 , -4403.39 , -55.37
+134.83 , -3914.12 , -49.21
+134.83 , -3424.86 , -43.04
+134.83 , -2935.59 , -36.85
+134.83 , -2446.33 , -30.64
+134.83 , -1957.06 , -24.41
+134.83 , -1467.80 , -18.16
+134.83 , -978.53 , -11.89
+134.83 , -489.27 , -5.59
+134.83 , -97.85 , -0.32
+134.83 , 86.63 , 1.99
+134.83 , 433.14 , 7.50
+134.83 , 866.29 , 14.34
+134.83 , 1299.43 , 21.19
+134.83 , 1732.57 , 28.05
+134.83 , 2165.72 , 34.94
+134.83 , 2598.86 , 41.84
+134.83 , 3032.00 , 48.76
+134.83 , 3465.15 , 55.70
+134.83 , 3898.29 , 62.66
+134.83 , 4331.43 , 69.63
+134.83 , 4764.58 , 76.63
+134.83 , 5197.72 , 83.65
+134.83 , 5630.86 , 90.68
+134.83 , 6064.01 , 97.73
+134.83 , 6497.15 , 104.80
+134.83 , 6930.29 , 111.90
+134.83 , 7363.44 , 119.00
+134.83 , 7796.58 , 126.13
+134.83 , 8229.72 , 133.28
+134.83 , 8662.87 , 140.44
+168.54 , -9785.31 , -152.18
+168.54 , -9296.05 , -144.75
+168.54 , -8806.78 , -137.29
+168.54 , -8317.52 , -129.81
+168.54 , -7828.25 , -122.31
+168.54 , -7338.98 , -114.78
+168.54 , -6849.72 , -107.23
+168.54 , -6360.45 , -99.65
+168.54 , -5871.19 , -92.05
+168.54 , -5381.92 , -84.42
+168.54 , -4892.66 , -76.77
+168.54 , -4403.39 , -69.10
+168.54 , -3914.12 , -61.41
+168.54 , -3424.86 , -53.69
+168.54 , -2935.59 , -45.94
+168.54 , -2446.33 , -38.17
+168.54 , -1957.06 , -30.38
+168.54 , -1467.80 , -22.57
+168.54 , -978.53 , -14.72
+168.54 , -489.27 , -6.84
+168.54 , -97.85 , 0.00
+168.54 , 86.63 , 2.61
+168.54 , 433.14 , 9.52
+168.54 , 866.29 , 18.06
+168.54 , 1299.43 , 26.62
+168.54 , 1732.57 , 35.19
+168.54 , 2165.72 , 43.79
+168.54 , 2598.86 , 52.42
+168.54 , 3032.00 , 61.07
+168.54 , 3465.15 , 69.74
+168.54 , 3898.29 , 78.43
+168.54 , 4331.43 , 87.15
+168.54 , 4764.58 , 95.90
+168.54 , 5197.72 , 104.67
+168.54 , 5630.86 , 113.46
+168.54 , 6064.01 , 122.28
+168.54 , 6497.15 , 131.12
+168.54 , 6930.29 , 139.99
+168.54 , 7363.44 , 148.88
+168.54 , 7796.58 , 157.79
+168.54 , 8229.72 , 166.73
+168.54 , 8662.87 , 175.69
+202.25 , -9785.31 , -182.19
+202.25 , -9296.05 , -173.29
+202.25 , -8806.78 , -164.37
+202.25 , -8317.52 , -155.42
+202.25 , -7828.25 , -146.44
+202.25 , -7338.98 , -137.42
+202.25 , -6849.72 , -128.38
+202.25 , -6360.45 , -119.30
+202.25 , -5871.19 , -110.20
+202.25 , -5381.92 , -101.06
+202.25 , -4892.66 , -91.89
+202.25 , -4403.39 , -82.70
+202.25 , -3914.12 , -73.47
+202.25 , -3424.86 , -64.21
+202.25 , -2935.59 , -54.93
+202.25 , -2446.33 , -45.61
+202.25 , -1957.06 , -36.26
+202.25 , -1467.80 , -26.87
+202.25 , -978.53 , -17.46
+202.25 , -489.27 , -7.98
+202.25 , -97.85 , 0.00
+202.25 , 86.63 , 3.29
+202.25 , 433.14 , 11.62
+202.25 , 866.29 , 21.88
+202.25 , 1299.43 , 32.14
+202.25 , 1732.57 , 42.44
+202.25 , 2165.72 , 52.76
+202.25 , 2598.86 , 63.11
+202.25 , 3032.00 , 73.49
+202.25 , 3465.15 , 83.91
+202.25 , 3898.29 , 94.35
+202.25 , 4331.43 , 104.82
+202.25 , 4764.58 , 115.33
+202.25 , 5197.72 , 125.87
+202.25 , 5630.86 , 136.43
+202.25 , 6064.01 , 147.03
+202.25 , 6497.15 , 157.66
+202.25 , 6930.29 , 168.32
+202.25 , 7363.44 , 179.01
+202.25 , 7796.58 , 189.74
+202.25 , 8229.72 , 200.49
+202.25 , 8662.87 , 211.27
+235.96 , -9785.31 , -211.85
+235.96 , -9296.05 , -201.52
+235.96 , -8806.78 , -191.16
+235.96 , -8317.52 , -180.75
+235.96 , -7828.25 , -170.31
+235.96 , -7338.98 , -159.83
+235.96 , -6849.72 , -149.31
+235.96 , -6360.45 , -138.75
+235.96 , -5871.19 , -128.16
+235.96 , -5381.92 , -117.52
+235.96 , -4892.66 , -106.85
+235.96 , -4403.39 , -96.14
+235.96 , -3914.12 , -85.39
+235.96 , -3424.86 , -74.61
+235.96 , -2935.59 , -63.78
+235.96 , -2446.33 , -52.92
+235.96 , -1957.06 , -42.02
+235.96 , -1467.80 , -31.07
+235.96 , -978.53 , -20.08
+235.96 , -489.27 , -9.00
+235.96 , -97.85 , 0.00
+235.96 , 86.63 , 4.05
+235.96 , 433.14 , 13.82
+235.96 , 866.29 , 25.80
+235.96 , 1299.43 , 37.78
+235.96 , 1732.57 , 49.79
+235.96 , 2165.72 , 61.84
+235.96 , 2598.86 , 73.93
+235.96 , 3032.00 , 86.05
+235.96 , 3465.15 , 98.22
+235.96 , 3898.29 , 110.42
+235.96 , 4331.43 , 122.66
+235.96 , 4764.58 , 134.94
+235.96 , 5197.72 , 147.26
+235.96 , 5630.86 , 159.61
+235.96 , 6064.01 , 172.01
+235.96 , 6497.15 , 184.44
+235.96 , 6930.29 , 196.92
+235.96 , 7363.44 , 209.43
+235.96 , 7796.58 , 221.98
+235.96 , 8229.72 , 234.57
+235.96 , 8662.87 , 247.19
+269.67 , -9785.31 , -241.15
+269.67 , -9296.05 , -229.41
+269.67 , -8806.78 , -217.63
+269.67 , -8317.52 , -205.79
+269.67 , -7828.25 , -193.91
+269.67 , -7338.98 , -181.98
+269.67 , -6849.72 , -170.01
+269.67 , -6360.45 , -157.99
+269.67 , -5871.19 , -145.91
+269.67 , -5381.92 , -133.80
+269.67 , -4892.66 , -121.63
+269.67 , -4403.39 , -109.42
+269.67 , -3914.12 , -97.16
+269.67 , -3424.86 , -84.85
+269.67 , -2935.59 , -72.50
+269.67 , -2446.33 , -60.10
+269.67 , -1957.06 , -47.65
+269.67 , -1467.80 , -35.14
+269.67 , -978.53 , -22.57
+269.67 , -489.27 , -9.88
+269.67 , -97.85 , 0.00
+269.67 , 86.63 , 4.88
+269.67 , 433.14 , 16.13
+269.67 , 866.29 , 29.83
+269.67 , 1299.43 , 43.53
+269.67 , 1732.57 , 57.27
+269.67 , 2165.72 , 71.06
+269.67 , 2598.86 , 84.89
+269.67 , 3032.00 , 98.76
+269.67 , 3465.15 , 112.68
+269.67 , 3898.29 , 126.65
+269.67 , 4331.43 , 140.67
+269.67 , 4764.58 , 154.74
+269.67 , 5197.72 , 168.85
+269.67 , 5630.86 , 183.01
+269.67 , 6064.01 , 197.22
+269.67 , 6497.15 , 211.48
+269.67 , 6930.29 , 225.78
+269.67 , 7363.44 , 240.13
+269.67 , 7796.58 , 254.53
+269.67 , 8229.72 , 268.97
+269.67 , 8662.87 , 283.46
+303.37 , -9785.31 , -270.09
+303.37 , -9296.05 , -256.96
+303.37 , -8806.78 , -243.78
+303.37 , -8317.52 , -230.53
+303.37 , -7828.25 , -217.23
+303.37 , -7338.98 , -203.87
+303.37 , -6849.72 , -190.46
+303.37 , -6360.45 , -176.98
+303.37 , -5871.19 , -163.45
+303.37 , -5381.92 , -149.87
+303.37 , -4892.66 , -136.22
+303.37 , -4403.39 , -122.52
+303.37 , -3914.12 , -108.76
+303.37 , -3424.86 , -94.94
+303.37 , -2935.59 , -81.06
+303.37 , -2446.33 , -67.13
+303.37 , -1957.06 , -53.13
+303.37 , -1467.80 , -39.07
+303.37 , -978.53 , -24.92
+303.37 , -489.27 , -10.59
+303.37 , -97.85 , 0.00
+303.37 , 86.63 , 5.80
+303.37 , 433.14 , 18.55
+303.37 , 866.29 , 33.99
+303.37 , 1299.43 , 49.42
+303.37 , 1732.57 , 64.90
+303.37 , 2165.72 , 80.42
+303.37 , 2598.86 , 96.00
+303.37 , 3032.00 , 111.63
+303.37 , 3465.15 , 127.32
+303.37 , 3898.29 , 143.07
+303.37 , 4331.43 , 158.88
+303.37 , 4764.58 , 174.74
+303.37 , 5197.72 , 190.66
+303.37 , 5630.86 , 206.64
+303.37 , 6064.01 , 222.68
+303.37 , 6497.15 , 238.77
+303.37 , 6930.29 , 254.92
+303.37 , 7363.44 , 271.13
+303.37 , 7796.58 , 287.40
+303.37 , 8229.72 , 303.72
+303.37 , 8662.87 , 320.10
+337.08 , -9785.31 , -298.63
+337.08 , -9296.05 , -284.14
+337.08 , -8806.78 , -269.58
+337.08 , -8317.52 , -254.95
+337.08 , -7828.25 , -240.25
+337.08 , -7338.98 , -225.48
+337.08 , -6849.72 , -210.64
+337.08 , -6360.45 , -195.74
+337.08 , -5871.19 , -180.76
+337.08 , -5381.92 , -165.71
+337.08 , -4892.66 , -150.60
+337.08 , -4403.39 , -135.42
+337.08 , -3914.12 , -120.16
+337.08 , -3424.86 , -104.84
+337.08 , -2935.59 , -89.45
+337.08 , -2446.33 , -73.99
+337.08 , -1957.06 , -58.45
+337.08 , -1467.80 , -42.83
+337.08 , -978.53 , -27.10
+337.08 , -489.27 , -11.12
+337.08 , -97.85 , 0.00
+337.08 , 86.63 , 6.80
+337.08 , 433.14 , 21.10
+337.08 , 866.29 , 38.29
+337.08 , 1299.43 , 55.46
+337.08 , 1732.57 , 72.67
+337.08 , 2165.72 , 89.94
+337.08 , 2598.86 , 107.27
+337.08 , 3032.00 , 124.67
+337.08 , 3465.15 , 142.14
+337.08 , 3898.29 , 159.68
+337.08 , 4331.43 , 177.29
+337.08 , 4764.58 , 194.96
+337.08 , 5197.72 , 212.70
+337.08 , 5630.86 , 230.52
+337.08 , 6064.01 , 248.40
+337.08 , 6497.15 , 266.35
+337.08 , 6930.29 , 284.37
+337.08 , 7363.44 , 302.45
+337.08 , 7796.58 , 320.61
+337.08 , 8229.72 , 338.83
+337.08 , 8662.87 , 357.12
+370.79 , -9785.31 , -326.77
+370.79 , -9296.05 , -310.94
+370.79 , -8806.78 , -295.03
+370.79 , -8317.52 , -279.03
+370.79 , -7828.25 , -262.95
+370.79 , -7338.98 , -246.79
+370.79 , -6849.72 , -230.55
+370.79 , -6360.45 , -214.22
+370.79 , -5871.19 , -197.81
+370.79 , -5381.92 , -181.33
+370.79 , -4892.66 , -164.76
+370.79 , -4403.39 , -148.10
+370.79 , -3914.12 , -131.37
+370.79 , -3424.86 , -114.55
+370.79 , -2935.59 , -97.65
+370.79 , -2446.33 , -80.67
+370.79 , -1957.06 , -63.59
+370.79 , -1467.80 , -46.42
+370.79 , -978.53 , -29.10
+370.79 , -489.27 , -11.41
+370.79 , -97.85 , 0.00
+370.79 , 86.63 , 7.90
+370.79 , 433.14 , 23.79
+370.79 , 866.29 , 42.74
+370.79 , 1299.43 , 61.65
+370.79 , 1732.57 , 80.61
+370.79 , 2165.72 , 99.63
+370.79 , 2598.86 , 118.73
+370.79 , 3032.00 , 137.91
+370.79 , 3465.15 , 157.16
+370.79 , 3898.29 , 176.50
+370.79 , 4331.43 , 195.91
+370.79 , 4764.58 , 215.41
+370.79 , 5197.72 , 234.99
+370.79 , 5630.86 , 254.65
+370.79 , 6064.01 , 274.39
+370.79 , 6497.15 , 294.21
+370.79 , 6930.29 , 314.12
+370.79 , 7363.44 , 334.10
+370.79 , 7796.58 , 354.16
+370.79 , 8229.72 , 374.31
+370.79 , 8662.87 , 394.53
+404.50 , -9785.31 , -354.49
+404.50 , -9296.05 , -337.34
+404.50 , -8806.78 , -320.10
+404.50 , -8317.52 , -302.75
+404.50 , -7828.25 , -285.32
+404.50 , -7338.98 , -267.78
+404.50 , -6849.72 , -250.15
+404.50 , -6360.45 , -232.43
+404.50 , -5871.19 , -214.60
+404.50 , -5381.92 , -196.69
+404.50 , -4892.66 , -178.67
+404.50 , -4403.39 , -160.56
+404.50 , -3914.12 , -142.36
+404.50 , -3424.86 , -124.05
+404.50 , -2935.59 , -105.65
+404.50 , -2446.33 , -87.15
+404.50 , -1957.06 , -68.54
+404.50 , -1467.80 , -49.80
+404.50 , -978.53 , -30.89
+404.50 , -489.27 , -11.43
+404.50 , -97.85 , 0.00
+404.50 , 86.63 , 9.08
+404.50 , 433.14 , 26.62
+404.50 , 866.29 , 47.35
+404.50 , 1299.43 , 68.02
+404.50 , 1732.57 , 88.72
+404.50 , 2165.72 , 109.51
+404.50 , 2598.86 , 130.38
+404.50 , 3032.00 , 151.34
+404.50 , 3465.15 , 172.39
+404.50 , 3898.29 , 193.53
+404.50 , 4331.43 , 214.77
+404.50 , 4764.58 , 236.11
+404.50 , 5197.72 , 257.53
+404.50 , 5630.86 , 279.05
+404.50 , 6064.01 , 300.67
+404.50 , 6497.15 , 322.38
+404.50 , 6930.29 , 344.19
+404.50 , 7363.44 , 366.08
+404.50 , 7796.58 , 388.08
+404.50 , 8229.72 , 410.16
+404.50 , 8662.87 , 432.34
+438.21 , -9785.31 , -381.77
+438.21 , -9296.05 , -363.33
+438.21 , -8806.78 , -344.77
+438.21 , -8317.52 , -326.11
+438.21 , -7828.25 , -307.33
+438.21 , -7338.98 , -288.45
+438.21 , -6849.72 , -269.45
+438.21 , -6360.45 , -250.33
+438.21 , -5871.19 , -231.11
+438.21 , -5381.92 , -211.78
+438.21 , -4892.66 , -192.34
+438.21 , -4403.39 , -172.78
+438.21 , -3914.12 , -153.11
+438.21 , -3424.86 , -133.33
+438.21 , -2935.59 , -113.43
+438.21 , -2446.33 , -93.42
+438.21 , -1957.06 , -73.27
+438.21 , -1467.80 , -52.98
+438.21 , -978.53 , -32.45
+438.21 , -489.27 , -11.12
+438.21 , -97.85 , 0.00
+438.21 , 86.63 , 10.37
+438.21 , 433.14 , 29.60
+438.21 , 866.29 , 52.14
+438.21 , 1299.43 , 74.56
+438.21 , 1732.57 , 97.03
+438.21 , 2165.72 , 119.58
+438.21 , 2598.86 , 142.23
+438.21 , 3032.00 , 164.98
+438.21 , 3465.15 , 187.84
+438.21 , 3898.29 , 210.80
+438.21 , 4331.43 , 233.87
+438.21 , 4764.58 , 257.05
+438.21 , 5197.72 , 280.34
+438.21 , 5630.86 , 303.74
+438.21 , 6064.01 , 327.25
+438.21 , 6497.15 , 350.87
+438.21 , 6930.29 , 374.59
+438.21 , 7363.44 , 398.42
+438.21 , 7796.58 , 422.36
+438.21 , 8229.72 , 446.41
+438.21 , 8662.87 , 470.57
+471.92 , -9785.31 , -408.59
+471.92 , -9296.05 , -388.88
+471.92 , -8806.78 , -369.04
+471.92 , -8317.52 , -349.08
+471.92 , -7828.25 , -328.98
+471.92 , -7338.98 , -308.76
+471.92 , -6849.72 , -288.41
+471.92 , -6360.45 , -267.93
+471.92 , -5871.19 , -247.32
+471.92 , -5381.92 , -226.59
+471.92 , -4892.66 , -205.73
+471.92 , -4403.39 , -184.73
+471.92 , -3914.12 , -163.61
+471.92 , -3424.86 , -142.36
+471.92 , -2935.59 , -120.97
+471.92 , -2446.33 , -99.45
+471.92 , -1957.06 , -77.77
+471.92 , -1467.80 , -55.91
+471.92 , -978.53 , -33.75
+471.92 , -489.27 , -10.40
+471.92 , -97.85 , 0.00
+471.92 , 86.63 , 11.76
+471.92 , 433.14 , 32.74
+471.92 , 866.29 , 57.10
+471.92 , 1299.43 , 81.29
+471.92 , 1732.57 , 105.53
+471.92 , 2165.72 , 129.86
+471.92 , 2598.86 , 154.29
+471.92 , 3032.00 , 178.85
+471.92 , 3465.15 , 203.52
+471.92 , 3898.29 , 228.31
+471.92 , 4331.43 , 253.23
+471.92 , 4764.58 , 278.27
+471.92 , 5197.72 , 303.44
+471.92 , 5630.86 , 328.73
+471.92 , 6064.01 , 354.14
+471.92 , 6497.15 , 379.68
+471.92 , 6930.29 , 405.34
+471.92 , 7363.44 , 431.13
+471.92 , 7796.58 , 457.03
+471.92 , 8229.72 , 483.07
+471.92 , 8662.87 , 509.22
+505.62 , -9785.31 , -434.93
+505.62 , -9296.05 , -413.98
+505.62 , -8806.78 , -392.88
+505.62 , -8317.52 , -371.64
+505.62 , -7828.25 , -350.25
+505.62 , -7338.98 , -328.71
+505.62 , -6849.72 , -307.03
+505.62 , -6360.45 , -285.20
+505.62 , -5871.19 , -263.22
+505.62 , -5381.92 , -241.10
+505.62 , -4892.66 , -218.83
+505.62 , -4403.39 , -196.41
+505.62 , -3914.12 , -173.85
+505.62 , -3424.86 , -151.13
+505.62 , -2935.59 , -128.26
+505.62 , -2446.33 , -105.23
+505.62 , -1957.06 , -82.02
+505.62 , -1467.80 , -58.59
+505.62 , -978.53 , -34.77
+505.62 , -489.27 , -9.14
+505.62 , -97.85 , 0.00
+505.62 , 86.63 , 13.25
+505.62 , 433.14 , 36.05
+505.62 , 866.29 , 62.25
+505.62 , 1299.43 , 88.23
+505.62 , 1732.57 , 114.25
+505.62 , 2165.72 , 140.36
+505.62 , 2598.86 , 166.59
+505.62 , 3032.00 , 192.95
+505.62 , 3465.15 , 219.45
+505.62 , 3898.29 , 246.08
+505.62 , 4331.43 , 272.86
+505.62 , 4764.58 , 299.77
+505.62 , 5197.72 , 326.82
+505.62 , 5630.86 , 354.02
+505.62 , 6064.01 , 381.35
+505.62 , 6497.15 , 408.83
+505.62 , 6930.29 , 436.45
+505.62 , 7363.44 , 464.20
+505.62 , 7796.58 , 492.10
+505.62 , 8229.72 , 520.14
+505.62 , 8662.87 , 548.31
+539.33 , -9785.31 , -460.78
+539.33 , -9296.05 , -438.62
+539.33 , -8806.78 , -416.28
+539.33 , -8317.52 , -393.78
+539.33 , -7828.25 , -371.11
+539.33 , -7338.98 , -348.28
+539.33 , -6849.72 , -325.28
+539.33 , -6360.45 , -302.11
+539.33 , -5871.19 , -278.78
+539.33 , -5381.92 , -255.29
+539.33 , -4892.66 , -231.62
+539.33 , -4403.39 , -207.79
+539.33 , -3914.12 , -183.79
+539.33 , -3424.86 , -159.62
+539.33 , -2935.59 , -135.27
+539.33 , -2446.33 , -110.74
+539.33 , -1957.06 , -85.99
+539.33 , -1467.80 , -60.98
+539.33 , -978.53 , -35.47
+539.33 , -489.27 , -7.05
+539.33 , -97.85 , 0.00
+539.33 , 86.63 , 14.84
+539.33 , 433.14 , 39.53
+539.33 , 866.29 , 67.60
+539.33 , 1299.43 , 95.38
+539.33 , 1732.57 , 123.18
+539.33 , 2165.72 , 151.09
+539.33 , 2598.86 , 179.12
+539.33 , 3032.00 , 207.30
+539.33 , 3465.15 , 235.63
+539.33 , 3898.29 , 264.12
+539.33 , 4331.43 , 292.76
+539.33 , 4764.58 , 321.56
+539.33 , 5197.72 , 350.51
+539.33 , 5630.86 , 379.63
+539.33 , 6064.01 , 408.90
+539.33 , 6497.15 , 438.33
+539.33 , 6930.29 , 467.92
+539.33 , 7363.44 , 497.67
+539.33 , 7796.58 , 527.57
+539.33 , 8229.72 , 557.64
+539.33 , 8662.87 , 587.85
+573.04 , -9785.31 , -486.12
+573.04 , -9296.05 , -462.76
+573.04 , -8806.78 , -439.22
+573.04 , -8317.52 , -415.48
+573.04 , -7828.25 , -391.56
+573.04 , -7338.98 , -367.45
+573.04 , -6849.72 , -343.15
+573.04 , -6360.45 , -318.67
+573.04 , -5871.19 , -294.00
+573.04 , -5381.92 , -269.14
+573.04 , -4892.66 , -244.09
+573.04 , -4403.39 , -218.86
+573.04 , -3914.12 , -193.44
+573.04 , -3424.86 , -167.82
+573.04 , -2935.59 , -142.00
+573.04 , -2446.33 , -115.96
+573.04 , -1957.06 , -89.67
+573.04 , -1467.80 , -63.06
+573.04 , -978.53 , -35.80
+573.04 , -489.27 , -3.22
+573.04 , -97.85 , 0.00
+573.04 , 86.63 , 16.54
+573.04 , 433.14 , 43.18
+573.04 , 866.29 , 73.16
+573.04 , 1299.43 , 102.75
+573.04 , 1732.57 , 132.35
+573.04 , 2165.72 , 162.06
+573.04 , 2598.86 , 191.91
+573.04 , 3032.00 , 221.91
+573.04 , 3465.15 , 252.09
+573.04 , 3898.29 , 282.44
+573.04 , 4331.43 , 312.96
+573.04 , 4764.58 , 343.65
+573.04 , 5197.72 , 374.52
+573.04 , 5630.86 , 405.57
+573.04 , 6064.01 , 436.80
+573.04 , 6497.15 , 468.20
+573.04 , 6930.29 , 499.78
+573.04 , 7363.44 , 531.53
+573.04 , 7796.58 , 563.46
+573.04 , 8229.72 , 595.57
+573.04 , 8662.87 , 627.85
+606.75 , -9785.31 , -510.93
+606.75 , -9296.05 , -486.40
+606.75 , -8806.78 , -461.67
+606.75 , -8317.52 , -436.72
+606.75 , -7828.25 , -411.56
+606.75 , -7338.98 , -386.20
+606.75 , -6849.72 , -360.62
+606.75 , -6360.45 , -334.84
+606.75 , -5871.19 , -308.84
+606.75 , -5381.92 , -282.64
+606.75 , -4892.66 , -256.22
+606.75 , -4403.39 , -229.60
+606.75 , -3914.12 , -202.76
+606.75 , -3424.86 , -175.70
+606.75 , -2935.59 , -148.41
+606.75 , -2446.33 , -120.87
+606.75 , -1957.06 , -93.04
+606.75 , -1467.80 , -64.80
+606.75 , -978.53 , -35.73
+606.75 , -489.27 , 0.00
+606.75 , -97.85 , 0.00
+606.75 , 86.63 , 18.35
+606.75 , 433.14 , 47.02
+606.75 , 866.29 , 78.93
+606.75 , 1299.43 , 110.35
+606.75 , 1732.57 , 141.76
+606.75 , 2165.72 , 173.28
+606.75 , 2598.86 , 204.95
+606.75 , 3032.00 , 236.80
+606.75 , 3465.15 , 268.83
+606.75 , 3898.29 , 301.04
+606.75 , 4331.43 , 333.46
+606.75 , 4764.58 , 366.06
+606.75 , 5197.72 , 398.86
+606.75 , 5630.86 , 431.86
+606.75 , 6064.01 , 465.05
+606.75 , 6497.15 , 498.44
+606.75 , 6930.29 , 532.03
+606.75 , 7363.44 , 565.81
+606.75 , 7796.58 , 599.79
+606.75 , 8229.72 , 633.96
+606.75 , 8662.87 , 668.33
+640.46 , -9785.31 , -535.19
+640.46 , -9296.05 , -509.52
+640.46 , -8806.78 , -483.62
+640.46 , -8317.52 , -457.48
+640.46 , -7828.25 , -431.11
+640.46 , -7338.98 , -404.51
+640.46 , -6849.72 , -377.67
+640.46 , -6360.45 , -350.60
+640.46 , -5871.19 , -323.30
+640.46 , -5381.92 , -295.76
+640.46 , -4892.66 , -267.99
+640.46 , -4403.39 , -239.99
+640.46 , -3914.12 , -211.74
+640.46 , -3424.86 , -183.24
+640.46 , -2935.59 , -154.48
+640.46 , -2446.33 , -125.44
+640.46 , -1957.06 , -96.05
+640.46 , -1467.80 , -66.18
+640.46 , -978.53 , -35.19
+640.46 , -489.27 , 0.00
+640.46 , -97.85 , 0.00
+640.46 , 86.63 , 20.27
+640.46 , 433.14 , 51.05
+640.46 , 866.29 , 84.92
+640.46 , 1299.43 , 118.19
+640.46 , 1732.57 , 151.42
+640.46 , 2165.72 , 184.76
+640.46 , 2598.86 , 218.27
+640.46 , 3032.00 , 251.96
+640.46 , 3465.15 , 285.86
+640.46 , 3898.29 , 319.96
+640.46 , 4331.43 , 354.27
+640.46 , 4764.58 , 388.80
+640.46 , 5197.72 , 423.54
+640.46 , 5630.86 , 458.50
+640.46 , 6064.01 , 493.68
+640.46 , 6497.15 , 529.07
+640.46 , 6930.29 , 564.68
+640.46 , 7363.44 , 600.51
+640.46 , 7796.58 , 636.55
+640.46 , 8229.72 , 672.81
+640.46 , 8662.87 , 709.28
+674.17 , -9785.31 , -558.87
+674.17 , -9296.05 , -532.09
+674.17 , -8806.78 , -505.05
+674.17 , -8317.52 , -477.75
+674.17 , -7828.25 , -450.19
+674.17 , -7338.98 , -422.37
+674.17 , -6849.72 , -394.29
+674.17 , -6360.45 , -365.95
+674.17 , -5871.19 , -337.36
+674.17 , -5381.92 , -308.50
+674.17 , -4892.66 , -279.38
+674.17 , -4403.39 , -250.00
+674.17 , -3914.12 , -220.35
+674.17 , -3424.86 , -190.43
+674.17 , -2935.59 , -160.20
+674.17 , -2446.33 , -129.65
+674.17 , -1957.06 , -98.70
+674.17 , -1467.80 , -67.15
+674.17 , -978.53 , -34.12
+674.17 , -489.27 , 0.00
+674.17 , -97.85 , 0.00
+674.17 , 86.63 , 22.30
+674.17 , 433.14 , 55.27
+674.17 , 866.29 , 91.14
+674.17 , 1299.43 , 126.27
+674.17 , 1732.57 , 161.34
+674.17 , 2165.72 , 196.52
+674.17 , 2598.86 , 231.87
+674.17 , 3032.00 , 267.42
+674.17 , 3465.15 , 303.19
+674.17 , 3898.29 , 339.18
+674.17 , 4331.43 , 375.41
+674.17 , 4764.58 , 411.87
+674.17 , 5197.72 , 448.57
+674.17 , 5630.86 , 485.51
+674.17 , 6064.01 , 522.68
+674.17 , 6497.15 , 560.09
+674.17 , 6930.29 , 597.75
+674.17 , 7363.44 , 635.63
+674.17 , 7796.58 , 673.76
+674.17 , 8229.72 , 712.12
+674.17 , 8662.87 , 750.73
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_3.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..55066d31695ad3421b5ce6a0cac2b0ec831c3a20
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -5707.13 , 0.00
+0.00 , -5421.78 , 0.00
+0.00 , -5136.42 , 0.00
+0.00 , -4851.06 , 0.00
+0.00 , -4565.71 , 0.00
+0.00 , -4280.35 , 0.00
+0.00 , -3994.99 , -0.07
+0.00 , -3709.64 , -0.33
+0.00 , -3424.28 , -0.49
+0.00 , -3138.92 , -0.60
+0.00 , -2853.57 , -0.66
+0.00 , -2568.21 , -0.69
+0.00 , -2282.85 , -0.70
+0.00 , -1997.50 , -0.67
+0.00 , -1712.14 , -0.63
+0.00 , -1426.78 , -0.57
+0.00 , -1141.43 , -0.48
+0.00 , -856.07 , -0.38
+0.00 , -570.71 , -0.27
+0.00 , -285.36 , -0.13
+0.00 , -57.07 , -0.01
+0.00 , 51.57 , 0.06
+0.00 , 257.86 , 0.28
+0.00 , 515.72 , 0.56
+0.00 , 773.58 , 0.85
+0.00 , 1031.44 , 1.15
+0.00 , 1289.30 , 1.47
+0.00 , 1547.16 , 1.79
+0.00 , 1805.02 , 2.12
+0.00 , 2062.88 , 2.47
+0.00 , 2320.74 , 2.82
+0.00 , 2578.60 , 3.19
+0.00 , 2836.46 , 3.56
+0.00 , 3094.32 , 3.94
+0.00 , 3352.18 , 4.33
+0.00 , 3610.04 , 4.74
+0.00 , 3867.90 , 5.15
+0.00 , 4125.76 , 5.57
+0.00 , 4383.62 , 6.00
+0.00 , 4641.48 , 6.43
+0.00 , 4899.34 , 6.88
+0.00 , 5157.20 , 7.34
+5.72 , -5707.13 , 0.00
+5.72 , -5421.78 , 0.00
+5.72 , -5136.42 , 0.00
+5.72 , -4851.06 , 0.00
+5.72 , -4565.71 , 0.00
+5.72 , -4280.35 , 0.00
+5.72 , -3994.99 , -0.25
+5.72 , -3709.64 , -0.42
+5.72 , -3424.28 , -0.52
+5.72 , -3138.92 , -0.58
+5.72 , -2853.57 , -0.61
+5.72 , -2568.21 , -0.62
+5.72 , -2282.85 , -0.61
+5.72 , -1997.50 , -0.58
+5.72 , -1712.14 , -0.53
+5.72 , -1426.78 , -0.47
+5.72 , -1141.43 , -0.40
+5.72 , -856.07 , -0.31
+5.72 , -570.71 , -0.22
+5.72 , -285.36 , -0.11
+5.72 , -57.07 , -0.01
+5.72 , 51.57 , 0.05
+5.72 , 257.86 , 0.21
+5.72 , 515.72 , 0.43
+5.72 , 773.58 , 0.65
+5.72 , 1031.44 , 0.88
+5.72 , 1289.30 , 1.11
+5.72 , 1547.16 , 1.36
+5.72 , 1805.02 , 1.61
+5.72 , 2062.88 , 1.87
+5.72 , 2320.74 , 2.13
+5.72 , 2578.60 , 2.40
+5.72 , 2836.46 , 2.68
+5.72 , 3094.32 , 2.97
+5.72 , 3352.18 , 3.26
+5.72 , 3610.04 , 3.56
+5.72 , 3867.90 , 3.86
+5.72 , 4125.76 , 4.18
+5.72 , 4383.62 , 4.50
+5.72 , 4641.48 , 4.82
+5.72 , 4899.34 , 5.15
+5.72 , 5157.20 , 5.49
+57.21 , -5707.13 , -29.05
+57.21 , -5421.78 , -27.68
+57.21 , -5136.42 , -26.31
+57.21 , -4851.06 , -24.92
+57.21 , -4565.71 , -23.53
+57.21 , -4280.35 , -22.12
+57.21 , -3994.99 , -20.71
+57.21 , -3709.64 , -19.28
+57.21 , -3424.28 , -17.85
+57.21 , -3138.92 , -16.41
+57.21 , -2853.57 , -14.95
+57.21 , -2568.21 , -13.49
+57.21 , -2282.85 , -12.02
+57.21 , -1997.50 , -10.53
+57.21 , -1712.14 , -9.04
+57.21 , -1426.78 , -7.54
+57.21 , -1141.43 , -6.03
+57.21 , -856.07 , -4.51
+57.21 , -570.71 , -2.98
+57.21 , -285.36 , -1.44
+57.21 , -57.07 , -0.18
+57.21 , 51.57 , 0.45
+57.21 , 257.86 , 1.84
+57.21 , 515.72 , 3.58
+57.21 , 773.58 , 5.33
+57.21 , 1031.44 , 7.09
+57.21 , 1289.30 , 8.85
+57.21 , 1547.16 , 10.63
+57.21 , 1805.02 , 12.42
+57.21 , 2062.88 , 14.21
+57.21 , 2320.74 , 16.02
+57.21 , 2578.60 , 17.84
+57.21 , 2836.46 , 19.66
+57.21 , 3094.32 , 21.49
+57.21 , 3352.18 , 23.34
+57.21 , 3610.04 , 25.19
+57.21 , 3867.90 , 27.05
+57.21 , 4125.76 , 28.93
+57.21 , 4383.62 , 30.81
+57.21 , 4641.48 , 32.70
+57.21 , 4899.34 , 34.60
+57.21 , 5157.20 , 36.50
+114.41 , -5707.13 , -60.28
+114.41 , -5421.78 , -57.37
+114.41 , -5136.42 , -54.44
+114.41 , -4851.06 , -51.49
+114.41 , -4565.71 , -48.54
+114.41 , -4280.35 , -45.58
+114.41 , -3994.99 , -42.60
+114.41 , -3709.64 , -39.61
+114.41 , -3424.28 , -36.61
+114.41 , -3138.92 , -33.60
+114.41 , -2853.57 , -30.58
+114.41 , -2568.21 , -27.55
+114.41 , -2282.85 , -24.51
+114.41 , -1997.50 , -21.45
+114.41 , -1712.14 , -18.38
+114.41 , -1426.78 , -15.31
+114.41 , -1141.43 , -12.22
+114.41 , -856.07 , -9.12
+114.41 , -570.71 , -6.00
+114.41 , -285.36 , -2.88
+114.41 , -57.07 , -0.33
+114.41 , 51.57 , 0.92
+114.41 , 257.86 , 3.68
+114.41 , 515.72 , 7.11
+114.41 , 773.58 , 10.56
+114.41 , 1031.44 , 14.01
+114.41 , 1289.30 , 17.48
+114.41 , 1547.16 , 20.96
+114.41 , 1805.02 , 24.45
+114.41 , 2062.88 , 27.95
+114.41 , 2320.74 , 31.47
+114.41 , 2578.60 , 34.99
+114.41 , 2836.46 , 38.53
+114.41 , 3094.32 , 42.08
+114.41 , 3352.18 , 45.64
+114.41 , 3610.04 , 49.21
+114.41 , 3867.90 , 52.79
+114.41 , 4125.76 , 56.38
+114.41 , 4383.62 , 59.99
+114.41 , 4641.48 , 63.60
+114.41 , 4899.34 , 67.23
+114.41 , 5157.20 , 70.87
+171.62 , -5707.13 , -91.22
+171.62 , -5421.78 , -86.77
+171.62 , -5136.42 , -82.31
+171.62 , -4851.06 , -77.84
+171.62 , -4565.71 , -73.35
+171.62 , -4280.35 , -68.84
+171.62 , -3994.99 , -64.32
+171.62 , -3709.64 , -59.79
+171.62 , -3424.28 , -55.24
+171.62 , -3138.92 , -50.68
+171.62 , -2853.57 , -46.11
+171.62 , -2568.21 , -41.51
+171.62 , -2282.85 , -36.91
+171.62 , -1997.50 , -32.29
+171.62 , -1712.14 , -27.66
+171.62 , -1426.78 , -23.01
+171.62 , -1141.43 , -18.35
+171.62 , -856.07 , -13.67
+171.62 , -570.71 , -8.98
+171.62 , -285.36 , -4.27
+171.62 , -57.07 , -0.39
+171.62 , 51.57 , 1.43
+171.62 , 257.86 , 5.56
+171.62 , 515.72 , 10.69
+171.62 , 773.58 , 15.84
+171.62 , 1031.44 , 21.00
+171.62 , 1289.30 , 26.17
+171.62 , 1547.16 , 31.36
+171.62 , 1805.02 , 36.56
+171.62 , 2062.88 , 41.77
+171.62 , 2320.74 , 47.01
+171.62 , 2578.60 , 52.25
+171.62 , 2836.46 , 57.51
+171.62 , 3094.32 , 62.79
+171.62 , 3352.18 , 68.08
+171.62 , 3610.04 , 73.38
+171.62 , 3867.90 , 78.70
+171.62 , 4125.76 , 84.03
+171.62 , 4383.62 , 89.38
+171.62 , 4641.48 , 94.74
+171.62 , 4899.34 , 100.12
+171.62 , 5157.20 , 105.51
+228.82 , -5707.13 , -121.86
+228.82 , -5421.78 , -115.91
+228.82 , -5136.42 , -109.94
+228.82 , -4851.06 , -103.95
+228.82 , -4565.71 , -97.94
+228.82 , -4280.35 , -91.91
+228.82 , -3994.99 , -85.87
+228.82 , -3709.64 , -79.81
+228.82 , -3424.28 , -73.73
+228.82 , -3138.92 , -67.63
+228.82 , -2853.57 , -61.51
+228.82 , -2568.21 , -55.37
+228.82 , -2282.85 , -49.21
+228.82 , -1997.50 , -43.04
+228.82 , -1712.14 , -36.85
+228.82 , -1426.78 , -30.64
+228.82 , -1141.43 , -24.41
+228.82 , -856.07 , -18.16
+228.82 , -570.71 , -11.89
+228.82 , -285.36 , -5.59
+228.82 , -57.07 , -0.32
+228.82 , 51.57 , 1.99
+228.82 , 257.86 , 7.50
+228.82 , 515.72 , 14.34
+228.82 , 773.58 , 21.19
+228.82 , 1031.44 , 28.05
+228.82 , 1289.30 , 34.94
+228.82 , 1547.16 , 41.84
+228.82 , 1805.02 , 48.76
+228.82 , 2062.88 , 55.70
+228.82 , 2320.74 , 62.66
+228.82 , 2578.60 , 69.63
+228.82 , 2836.46 , 76.63
+228.82 , 3094.32 , 83.65
+228.82 , 3352.18 , 90.68
+228.82 , 3610.04 , 97.73
+228.82 , 3867.90 , 104.80
+228.82 , 4125.76 , 111.90
+228.82 , 4383.62 , 119.00
+228.82 , 4641.48 , 126.13
+228.82 , 4899.34 , 133.28
+228.82 , 5157.20 , 140.44
+286.03 , -5707.13 , -152.18
+286.03 , -5421.78 , -144.75
+286.03 , -5136.42 , -137.29
+286.03 , -4851.06 , -129.81
+286.03 , -4565.71 , -122.31
+286.03 , -4280.35 , -114.78
+286.03 , -3994.99 , -107.23
+286.03 , -3709.64 , -99.65
+286.03 , -3424.28 , -92.05
+286.03 , -3138.92 , -84.42
+286.03 , -2853.57 , -76.77
+286.03 , -2568.21 , -69.10
+286.03 , -2282.85 , -61.41
+286.03 , -1997.50 , -53.69
+286.03 , -1712.14 , -45.94
+286.03 , -1426.78 , -38.17
+286.03 , -1141.43 , -30.38
+286.03 , -856.07 , -22.57
+286.03 , -570.71 , -14.72
+286.03 , -285.36 , -6.84
+286.03 , -57.07 , 0.00
+286.03 , 51.57 , 2.61
+286.03 , 257.86 , 9.52
+286.03 , 515.72 , 18.06
+286.03 , 773.58 , 26.62
+286.03 , 1031.44 , 35.19
+286.03 , 1289.30 , 43.79
+286.03 , 1547.16 , 52.42
+286.03 , 1805.02 , 61.07
+286.03 , 2062.88 , 69.74
+286.03 , 2320.74 , 78.43
+286.03 , 2578.60 , 87.15
+286.03 , 2836.46 , 95.90
+286.03 , 3094.32 , 104.67
+286.03 , 3352.18 , 113.46
+286.03 , 3610.04 , 122.28
+286.03 , 3867.90 , 131.12
+286.03 , 4125.76 , 139.99
+286.03 , 4383.62 , 148.88
+286.03 , 4641.48 , 157.79
+286.03 , 4899.34 , 166.73
+286.03 , 5157.20 , 175.69
+343.23 , -5707.13 , -182.19
+343.23 , -5421.78 , -173.29
+343.23 , -5136.42 , -164.37
+343.23 , -4851.06 , -155.42
+343.23 , -4565.71 , -146.44
+343.23 , -4280.35 , -137.42
+343.23 , -3994.99 , -128.38
+343.23 , -3709.64 , -119.30
+343.23 , -3424.28 , -110.20
+343.23 , -3138.92 , -101.06
+343.23 , -2853.57 , -91.89
+343.23 , -2568.21 , -82.70
+343.23 , -2282.85 , -73.47
+343.23 , -1997.50 , -64.21
+343.23 , -1712.14 , -54.93
+343.23 , -1426.78 , -45.61
+343.23 , -1141.43 , -36.26
+343.23 , -856.07 , -26.87
+343.23 , -570.71 , -17.46
+343.23 , -285.36 , -7.98
+343.23 , -57.07 , 0.00
+343.23 , 51.57 , 3.29
+343.23 , 257.86 , 11.62
+343.23 , 515.72 , 21.88
+343.23 , 773.58 , 32.14
+343.23 , 1031.44 , 42.44
+343.23 , 1289.30 , 52.76
+343.23 , 1547.16 , 63.11
+343.23 , 1805.02 , 73.49
+343.23 , 2062.88 , 83.91
+343.23 , 2320.74 , 94.35
+343.23 , 2578.60 , 104.82
+343.23 , 2836.46 , 115.33
+343.23 , 3094.32 , 125.87
+343.23 , 3352.18 , 136.43
+343.23 , 3610.04 , 147.03
+343.23 , 3867.90 , 157.66
+343.23 , 4125.76 , 168.32
+343.23 , 4383.62 , 179.01
+343.23 , 4641.48 , 189.74
+343.23 , 4899.34 , 200.49
+343.23 , 5157.20 , 211.27
+400.44 , -5707.13 , -211.85
+400.44 , -5421.78 , -201.52
+400.44 , -5136.42 , -191.16
+400.44 , -4851.06 , -180.75
+400.44 , -4565.71 , -170.31
+400.44 , -4280.35 , -159.83
+400.44 , -3994.99 , -149.31
+400.44 , -3709.64 , -138.75
+400.44 , -3424.28 , -128.16
+400.44 , -3138.92 , -117.52
+400.44 , -2853.57 , -106.85
+400.44 , -2568.21 , -96.14
+400.44 , -2282.85 , -85.39
+400.44 , -1997.50 , -74.61
+400.44 , -1712.14 , -63.78
+400.44 , -1426.78 , -52.92
+400.44 , -1141.43 , -42.02
+400.44 , -856.07 , -31.07
+400.44 , -570.71 , -20.08
+400.44 , -285.36 , -9.00
+400.44 , -57.07 , 0.00
+400.44 , 51.57 , 4.05
+400.44 , 257.86 , 13.82
+400.44 , 515.72 , 25.80
+400.44 , 773.58 , 37.78
+400.44 , 1031.44 , 49.79
+400.44 , 1289.30 , 61.84
+400.44 , 1547.16 , 73.93
+400.44 , 1805.02 , 86.05
+400.44 , 2062.88 , 98.22
+400.44 , 2320.74 , 110.42
+400.44 , 2578.60 , 122.66
+400.44 , 2836.46 , 134.94
+400.44 , 3094.32 , 147.26
+400.44 , 3352.18 , 159.61
+400.44 , 3610.04 , 172.01
+400.44 , 3867.90 , 184.44
+400.44 , 4125.76 , 196.92
+400.44 , 4383.62 , 209.43
+400.44 , 4641.48 , 221.98
+400.44 , 4899.34 , 234.57
+400.44 , 5157.20 , 247.19
+457.64 , -5707.13 , -241.15
+457.64 , -5421.78 , -229.41
+457.64 , -5136.42 , -217.63
+457.64 , -4851.06 , -205.79
+457.64 , -4565.71 , -193.91
+457.64 , -4280.35 , -181.98
+457.64 , -3994.99 , -170.01
+457.64 , -3709.64 , -157.99
+457.64 , -3424.28 , -145.91
+457.64 , -3138.92 , -133.80
+457.64 , -2853.57 , -121.63
+457.64 , -2568.21 , -109.42
+457.64 , -2282.85 , -97.16
+457.64 , -1997.50 , -84.85
+457.64 , -1712.14 , -72.50
+457.64 , -1426.78 , -60.10
+457.64 , -1141.43 , -47.65
+457.64 , -856.07 , -35.14
+457.64 , -570.71 , -22.57
+457.64 , -285.36 , -9.88
+457.64 , -57.07 , 0.00
+457.64 , 51.57 , 4.88
+457.64 , 257.86 , 16.13
+457.64 , 515.72 , 29.83
+457.64 , 773.58 , 43.53
+457.64 , 1031.44 , 57.27
+457.64 , 1289.30 , 71.06
+457.64 , 1547.16 , 84.89
+457.64 , 1805.02 , 98.76
+457.64 , 2062.88 , 112.68
+457.64 , 2320.74 , 126.65
+457.64 , 2578.60 , 140.67
+457.64 , 2836.46 , 154.74
+457.64 , 3094.32 , 168.85
+457.64 , 3352.18 , 183.01
+457.64 , 3610.04 , 197.22
+457.64 , 3867.90 , 211.48
+457.64 , 4125.76 , 225.78
+457.64 , 4383.62 , 240.13
+457.64 , 4641.48 , 254.53
+457.64 , 4899.34 , 268.97
+457.64 , 5157.20 , 283.46
+514.85 , -5707.13 , -270.09
+514.85 , -5421.78 , -256.96
+514.85 , -5136.42 , -243.78
+514.85 , -4851.06 , -230.53
+514.85 , -4565.71 , -217.23
+514.85 , -4280.35 , -203.87
+514.85 , -3994.99 , -190.46
+514.85 , -3709.64 , -176.98
+514.85 , -3424.28 , -163.45
+514.85 , -3138.92 , -149.87
+514.85 , -2853.57 , -136.22
+514.85 , -2568.21 , -122.52
+514.85 , -2282.85 , -108.76
+514.85 , -1997.50 , -94.94
+514.85 , -1712.14 , -81.06
+514.85 , -1426.78 , -67.13
+514.85 , -1141.43 , -53.13
+514.85 , -856.07 , -39.07
+514.85 , -570.71 , -24.92
+514.85 , -285.36 , -10.59
+514.85 , -57.07 , 0.00
+514.85 , 51.57 , 5.80
+514.85 , 257.86 , 18.55
+514.85 , 515.72 , 33.99
+514.85 , 773.58 , 49.42
+514.85 , 1031.44 , 64.90
+514.85 , 1289.30 , 80.42
+514.85 , 1547.16 , 96.00
+514.85 , 1805.02 , 111.63
+514.85 , 2062.88 , 127.32
+514.85 , 2320.74 , 143.07
+514.85 , 2578.60 , 158.88
+514.85 , 2836.46 , 174.74
+514.85 , 3094.32 , 190.66
+514.85 , 3352.18 , 206.64
+514.85 , 3610.04 , 222.68
+514.85 , 3867.90 , 238.77
+514.85 , 4125.76 , 254.92
+514.85 , 4383.62 , 271.13
+514.85 , 4641.48 , 287.40
+514.85 , 4899.34 , 303.72
+514.85 , 5157.20 , 320.10
+572.06 , -5707.13 , -298.63
+572.06 , -5421.78 , -284.14
+572.06 , -5136.42 , -269.58
+572.06 , -4851.06 , -254.95
+572.06 , -4565.71 , -240.25
+572.06 , -4280.35 , -225.48
+572.06 , -3994.99 , -210.64
+572.06 , -3709.64 , -195.74
+572.06 , -3424.28 , -180.76
+572.06 , -3138.92 , -165.71
+572.06 , -2853.57 , -150.60
+572.06 , -2568.21 , -135.42
+572.06 , -2282.85 , -120.16
+572.06 , -1997.50 , -104.84
+572.06 , -1712.14 , -89.45
+572.06 , -1426.78 , -73.99
+572.06 , -1141.43 , -58.45
+572.06 , -856.07 , -42.83
+572.06 , -570.71 , -27.10
+572.06 , -285.36 , -11.12
+572.06 , -57.07 , 0.00
+572.06 , 51.57 , 6.80
+572.06 , 257.86 , 21.10
+572.06 , 515.72 , 38.29
+572.06 , 773.58 , 55.46
+572.06 , 1031.44 , 72.67
+572.06 , 1289.30 , 89.94
+572.06 , 1547.16 , 107.27
+572.06 , 1805.02 , 124.67
+572.06 , 2062.88 , 142.14
+572.06 , 2320.74 , 159.68
+572.06 , 2578.60 , 177.29
+572.06 , 2836.46 , 194.96
+572.06 , 3094.32 , 212.70
+572.06 , 3352.18 , 230.52
+572.06 , 3610.04 , 248.40
+572.06 , 3867.90 , 266.35
+572.06 , 4125.76 , 284.37
+572.06 , 4383.62 , 302.45
+572.06 , 4641.48 , 320.61
+572.06 , 4899.34 , 338.83
+572.06 , 5157.20 , 357.12
+629.26 , -5707.13 , -326.77
+629.26 , -5421.78 , -310.94
+629.26 , -5136.42 , -295.03
+629.26 , -4851.06 , -279.03
+629.26 , -4565.71 , -262.95
+629.26 , -4280.35 , -246.79
+629.26 , -3994.99 , -230.55
+629.26 , -3709.64 , -214.22
+629.26 , -3424.28 , -197.81
+629.26 , -3138.92 , -181.33
+629.26 , -2853.57 , -164.76
+629.26 , -2568.21 , -148.10
+629.26 , -2282.85 , -131.37
+629.26 , -1997.50 , -114.55
+629.26 , -1712.14 , -97.65
+629.26 , -1426.78 , -80.67
+629.26 , -1141.43 , -63.59
+629.26 , -856.07 , -46.42
+629.26 , -570.71 , -29.10
+629.26 , -285.36 , -11.41
+629.26 , -57.07 , 0.00
+629.26 , 51.57 , 7.90
+629.26 , 257.86 , 23.79
+629.26 , 515.72 , 42.74
+629.26 , 773.58 , 61.65
+629.26 , 1031.44 , 80.61
+629.26 , 1289.30 , 99.63
+629.26 , 1547.16 , 118.73
+629.26 , 1805.02 , 137.91
+629.26 , 2062.88 , 157.16
+629.26 , 2320.74 , 176.50
+629.26 , 2578.60 , 195.91
+629.26 , 2836.46 , 215.41
+629.26 , 3094.32 , 234.99
+629.26 , 3352.18 , 254.65
+629.26 , 3610.04 , 274.39
+629.26 , 3867.90 , 294.21
+629.26 , 4125.76 , 314.12
+629.26 , 4383.62 , 334.10
+629.26 , 4641.48 , 354.16
+629.26 , 4899.34 , 374.31
+629.26 , 5157.20 , 394.53
+686.47 , -5707.13 , -354.49
+686.47 , -5421.78 , -337.34
+686.47 , -5136.42 , -320.10
+686.47 , -4851.06 , -302.75
+686.47 , -4565.71 , -285.32
+686.47 , -4280.35 , -267.78
+686.47 , -3994.99 , -250.15
+686.47 , -3709.64 , -232.43
+686.47 , -3424.28 , -214.60
+686.47 , -3138.92 , -196.69
+686.47 , -2853.57 , -178.67
+686.47 , -2568.21 , -160.56
+686.47 , -2282.85 , -142.36
+686.47 , -1997.50 , -124.05
+686.47 , -1712.14 , -105.65
+686.47 , -1426.78 , -87.15
+686.47 , -1141.43 , -68.54
+686.47 , -856.07 , -49.80
+686.47 , -570.71 , -30.89
+686.47 , -285.36 , -11.43
+686.47 , -57.07 , 0.00
+686.47 , 51.57 , 9.08
+686.47 , 257.86 , 26.62
+686.47 , 515.72 , 47.35
+686.47 , 773.58 , 68.02
+686.47 , 1031.44 , 88.72
+686.47 , 1289.30 , 109.51
+686.47 , 1547.16 , 130.38
+686.47 , 1805.02 , 151.34
+686.47 , 2062.88 , 172.39
+686.47 , 2320.74 , 193.53
+686.47 , 2578.60 , 214.77
+686.47 , 2836.46 , 236.11
+686.47 , 3094.32 , 257.53
+686.47 , 3352.18 , 279.05
+686.47 , 3610.04 , 300.67
+686.47 , 3867.90 , 322.38
+686.47 , 4125.76 , 344.19
+686.47 , 4383.62 , 366.08
+686.47 , 4641.48 , 388.08
+686.47 , 4899.34 , 410.16
+686.47 , 5157.20 , 432.34
+743.67 , -5707.13 , -381.77
+743.67 , -5421.78 , -363.33
+743.67 , -5136.42 , -344.77
+743.67 , -4851.06 , -326.11
+743.67 , -4565.71 , -307.33
+743.67 , -4280.35 , -288.45
+743.67 , -3994.99 , -269.45
+743.67 , -3709.64 , -250.33
+743.67 , -3424.28 , -231.11
+743.67 , -3138.92 , -211.78
+743.67 , -2853.57 , -192.34
+743.67 , -2568.21 , -172.78
+743.67 , -2282.85 , -153.11
+743.67 , -1997.50 , -133.33
+743.67 , -1712.14 , -113.43
+743.67 , -1426.78 , -93.42
+743.67 , -1141.43 , -73.27
+743.67 , -856.07 , -52.98
+743.67 , -570.71 , -32.45
+743.67 , -285.36 , -11.12
+743.67 , -57.07 , 0.00
+743.67 , 51.57 , 10.37
+743.67 , 257.86 , 29.60
+743.67 , 515.72 , 52.14
+743.67 , 773.58 , 74.56
+743.67 , 1031.44 , 97.03
+743.67 , 1289.30 , 119.58
+743.67 , 1547.16 , 142.23
+743.67 , 1805.02 , 164.98
+743.67 , 2062.88 , 187.84
+743.67 , 2320.74 , 210.80
+743.67 , 2578.60 , 233.87
+743.67 , 2836.46 , 257.05
+743.67 , 3094.32 , 280.34
+743.67 , 3352.18 , 303.74
+743.67 , 3610.04 , 327.25
+743.67 , 3867.90 , 350.87
+743.67 , 4125.76 , 374.59
+743.67 , 4383.62 , 398.42
+743.67 , 4641.48 , 422.36
+743.67 , 4899.34 , 446.41
+743.67 , 5157.20 , 470.57
+800.88 , -5707.13 , -408.59
+800.88 , -5421.78 , -388.88
+800.88 , -5136.42 , -369.04
+800.88 , -4851.06 , -349.08
+800.88 , -4565.71 , -328.98
+800.88 , -4280.35 , -308.76
+800.88 , -3994.99 , -288.41
+800.88 , -3709.64 , -267.93
+800.88 , -3424.28 , -247.32
+800.88 , -3138.92 , -226.59
+800.88 , -2853.57 , -205.73
+800.88 , -2568.21 , -184.73
+800.88 , -2282.85 , -163.61
+800.88 , -1997.50 , -142.36
+800.88 , -1712.14 , -120.97
+800.88 , -1426.78 , -99.45
+800.88 , -1141.43 , -77.77
+800.88 , -856.07 , -55.91
+800.88 , -570.71 , -33.75
+800.88 , -285.36 , -10.40
+800.88 , -57.07 , 0.00
+800.88 , 51.57 , 11.76
+800.88 , 257.86 , 32.74
+800.88 , 515.72 , 57.10
+800.88 , 773.58 , 81.29
+800.88 , 1031.44 , 105.53
+800.88 , 1289.30 , 129.86
+800.88 , 1547.16 , 154.29
+800.88 , 1805.02 , 178.85
+800.88 , 2062.88 , 203.52
+800.88 , 2320.74 , 228.31
+800.88 , 2578.60 , 253.23
+800.88 , 2836.46 , 278.27
+800.88 , 3094.32 , 303.44
+800.88 , 3352.18 , 328.73
+800.88 , 3610.04 , 354.14
+800.88 , 3867.90 , 379.68
+800.88 , 4125.76 , 405.34
+800.88 , 4383.62 , 431.13
+800.88 , 4641.48 , 457.03
+800.88 , 4899.34 , 483.07
+800.88 , 5157.20 , 509.22
+858.08 , -5707.13 , -434.93
+858.08 , -5421.78 , -413.98
+858.08 , -5136.42 , -392.88
+858.08 , -4851.06 , -371.64
+858.08 , -4565.71 , -350.25
+858.08 , -4280.35 , -328.71
+858.08 , -3994.99 , -307.03
+858.08 , -3709.64 , -285.20
+858.08 , -3424.28 , -263.22
+858.08 , -3138.92 , -241.10
+858.08 , -2853.57 , -218.83
+858.08 , -2568.21 , -196.41
+858.08 , -2282.85 , -173.85
+858.08 , -1997.50 , -151.13
+858.08 , -1712.14 , -128.26
+858.08 , -1426.78 , -105.23
+858.08 , -1141.43 , -82.02
+858.08 , -856.07 , -58.59
+858.08 , -570.71 , -34.77
+858.08 , -285.36 , -9.14
+858.08 , -57.07 , 0.00
+858.08 , 51.57 , 13.25
+858.08 , 257.86 , 36.05
+858.08 , 515.72 , 62.25
+858.08 , 773.58 , 88.23
+858.08 , 1031.44 , 114.25
+858.08 , 1289.30 , 140.36
+858.08 , 1547.16 , 166.59
+858.08 , 1805.02 , 192.95
+858.08 , 2062.88 , 219.45
+858.08 , 2320.74 , 246.08
+858.08 , 2578.60 , 272.86
+858.08 , 2836.46 , 299.77
+858.08 , 3094.32 , 326.82
+858.08 , 3352.18 , 354.02
+858.08 , 3610.04 , 381.35
+858.08 , 3867.90 , 408.83
+858.08 , 4125.76 , 436.45
+858.08 , 4383.62 , 464.20
+858.08 , 4641.48 , 492.10
+858.08 , 4899.34 , 520.14
+858.08 , 5157.20 , 548.31
+915.29 , -5707.13 , -460.78
+915.29 , -5421.78 , -438.62
+915.29 , -5136.42 , -416.28
+915.29 , -4851.06 , -393.78
+915.29 , -4565.71 , -371.11
+915.29 , -4280.35 , -348.28
+915.29 , -3994.99 , -325.28
+915.29 , -3709.64 , -302.11
+915.29 , -3424.28 , -278.78
+915.29 , -3138.92 , -255.29
+915.29 , -2853.57 , -231.62
+915.29 , -2568.21 , -207.79
+915.29 , -2282.85 , -183.79
+915.29 , -1997.50 , -159.62
+915.29 , -1712.14 , -135.27
+915.29 , -1426.78 , -110.74
+915.29 , -1141.43 , -85.99
+915.29 , -856.07 , -60.98
+915.29 , -570.71 , -35.47
+915.29 , -285.36 , -7.05
+915.29 , -57.07 , 0.00
+915.29 , 51.57 , 14.84
+915.29 , 257.86 , 39.53
+915.29 , 515.72 , 67.60
+915.29 , 773.58 , 95.38
+915.29 , 1031.44 , 123.18
+915.29 , 1289.30 , 151.09
+915.29 , 1547.16 , 179.12
+915.29 , 1805.02 , 207.30
+915.29 , 2062.88 , 235.63
+915.29 , 2320.74 , 264.12
+915.29 , 2578.60 , 292.76
+915.29 , 2836.46 , 321.56
+915.29 , 3094.32 , 350.51
+915.29 , 3352.18 , 379.63
+915.29 , 3610.04 , 408.90
+915.29 , 3867.90 , 438.33
+915.29 , 4125.76 , 467.92
+915.29 , 4383.62 , 497.67
+915.29 , 4641.48 , 527.57
+915.29 , 4899.34 , 557.64
+915.29 , 5157.20 , 587.85
+972.50 , -5707.13 , -486.12
+972.50 , -5421.78 , -462.76
+972.50 , -5136.42 , -439.22
+972.50 , -4851.06 , -415.48
+972.50 , -4565.71 , -391.56
+972.50 , -4280.35 , -367.45
+972.50 , -3994.99 , -343.15
+972.50 , -3709.64 , -318.67
+972.50 , -3424.28 , -294.00
+972.50 , -3138.92 , -269.14
+972.50 , -2853.57 , -244.09
+972.50 , -2568.21 , -218.86
+972.50 , -2282.85 , -193.44
+972.50 , -1997.50 , -167.82
+972.50 , -1712.14 , -142.00
+972.50 , -1426.78 , -115.96
+972.50 , -1141.43 , -89.67
+972.50 , -856.07 , -63.06
+972.50 , -570.71 , -35.80
+972.50 , -285.36 , -3.22
+972.50 , -57.07 , 0.00
+972.50 , 51.57 , 16.54
+972.50 , 257.86 , 43.18
+972.50 , 515.72 , 73.16
+972.50 , 773.58 , 102.75
+972.50 , 1031.44 , 132.35
+972.50 , 1289.30 , 162.06
+972.50 , 1547.16 , 191.91
+972.50 , 1805.02 , 221.91
+972.50 , 2062.88 , 252.09
+972.50 , 2320.74 , 282.44
+972.50 , 2578.60 , 312.96
+972.50 , 2836.46 , 343.65
+972.50 , 3094.32 , 374.52
+972.50 , 3352.18 , 405.57
+972.50 , 3610.04 , 436.80
+972.50 , 3867.90 , 468.20
+972.50 , 4125.76 , 499.78
+972.50 , 4383.62 , 531.53
+972.50 , 4641.48 , 563.46
+972.50 , 4899.34 , 595.57
+972.50 , 5157.20 , 627.85
+1029.70 , -5707.13 , -510.93
+1029.70 , -5421.78 , -486.40
+1029.70 , -5136.42 , -461.67
+1029.70 , -4851.06 , -436.72
+1029.70 , -4565.71 , -411.56
+1029.70 , -4280.35 , -386.20
+1029.70 , -3994.99 , -360.62
+1029.70 , -3709.64 , -334.84
+1029.70 , -3424.28 , -308.84
+1029.70 , -3138.92 , -282.64
+1029.70 , -2853.57 , -256.22
+1029.70 , -2568.21 , -229.60
+1029.70 , -2282.85 , -202.76
+1029.70 , -1997.50 , -175.70
+1029.70 , -1712.14 , -148.41
+1029.70 , -1426.78 , -120.87
+1029.70 , -1141.43 , -93.04
+1029.70 , -856.07 , -64.80
+1029.70 , -570.71 , -35.73
+1029.70 , -285.36 , 0.00
+1029.70 , -57.07 , 0.00
+1029.70 , 51.57 , 18.35
+1029.70 , 257.86 , 47.02
+1029.70 , 515.72 , 78.93
+1029.70 , 773.58 , 110.35
+1029.70 , 1031.44 , 141.76
+1029.70 , 1289.30 , 173.28
+1029.70 , 1547.16 , 204.95
+1029.70 , 1805.02 , 236.80
+1029.70 , 2062.88 , 268.83
+1029.70 , 2320.74 , 301.04
+1029.70 , 2578.60 , 333.46
+1029.70 , 2836.46 , 366.06
+1029.70 , 3094.32 , 398.86
+1029.70 , 3352.18 , 431.86
+1029.70 , 3610.04 , 465.05
+1029.70 , 3867.90 , 498.44
+1029.70 , 4125.76 , 532.03
+1029.70 , 4383.62 , 565.81
+1029.70 , 4641.48 , 599.79
+1029.70 , 4899.34 , 633.96
+1029.70 , 5157.20 , 668.33
+1086.91 , -5707.13 , -535.19
+1086.91 , -5421.78 , -509.52
+1086.91 , -5136.42 , -483.62
+1086.91 , -4851.06 , -457.48
+1086.91 , -4565.71 , -431.11
+1086.91 , -4280.35 , -404.51
+1086.91 , -3994.99 , -377.67
+1086.91 , -3709.64 , -350.60
+1086.91 , -3424.28 , -323.30
+1086.91 , -3138.92 , -295.76
+1086.91 , -2853.57 , -267.99
+1086.91 , -2568.21 , -239.99
+1086.91 , -2282.85 , -211.74
+1086.91 , -1997.50 , -183.24
+1086.91 , -1712.14 , -154.48
+1086.91 , -1426.78 , -125.44
+1086.91 , -1141.43 , -96.05
+1086.91 , -856.07 , -66.18
+1086.91 , -570.71 , -35.19
+1086.91 , -285.36 , 0.00
+1086.91 , -57.07 , 0.00
+1086.91 , 51.57 , 20.27
+1086.91 , 257.86 , 51.05
+1086.91 , 515.72 , 84.92
+1086.91 , 773.58 , 118.19
+1086.91 , 1031.44 , 151.42
+1086.91 , 1289.30 , 184.76
+1086.91 , 1547.16 , 218.27
+1086.91 , 1805.02 , 251.96
+1086.91 , 2062.88 , 285.86
+1086.91 , 2320.74 , 319.96
+1086.91 , 2578.60 , 354.27
+1086.91 , 2836.46 , 388.80
+1086.91 , 3094.32 , 423.54
+1086.91 , 3352.18 , 458.50
+1086.91 , 3610.04 , 493.68
+1086.91 , 3867.90 , 529.07
+1086.91 , 4125.76 , 564.68
+1086.91 , 4383.62 , 600.51
+1086.91 , 4641.48 , 636.55
+1086.91 , 4899.34 , 672.81
+1086.91 , 5157.20 , 709.28
+1144.11 , -5707.13 , -558.87
+1144.11 , -5421.78 , -532.09
+1144.11 , -5136.42 , -505.05
+1144.11 , -4851.06 , -477.75
+1144.11 , -4565.71 , -450.19
+1144.11 , -4280.35 , -422.37
+1144.11 , -3994.99 , -394.29
+1144.11 , -3709.64 , -365.95
+1144.11 , -3424.28 , -337.36
+1144.11 , -3138.92 , -308.50
+1144.11 , -2853.57 , -279.38
+1144.11 , -2568.21 , -250.00
+1144.11 , -2282.85 , -220.35
+1144.11 , -1997.50 , -190.43
+1144.11 , -1712.14 , -160.20
+1144.11 , -1426.78 , -129.65
+1144.11 , -1141.43 , -98.70
+1144.11 , -856.07 , -67.15
+1144.11 , -570.71 , -34.12
+1144.11 , -285.36 , 0.00
+1144.11 , -57.07 , 0.00
+1144.11 , 51.57 , 22.30
+1144.11 , 257.86 , 55.27
+1144.11 , 515.72 , 91.14
+1144.11 , 773.58 , 126.27
+1144.11 , 1031.44 , 161.34
+1144.11 , 1289.30 , 196.52
+1144.11 , 1547.16 , 231.87
+1144.11 , 1805.02 , 267.42
+1144.11 , 2062.88 , 303.19
+1144.11 , 2320.74 , 339.18
+1144.11 , 2578.60 , 375.41
+1144.11 , 2836.46 , 411.87
+1144.11 , 3094.32 , 448.57
+1144.11 , 3352.18 , 485.51
+1144.11 , 3610.04 , 522.68
+1144.11 , 3867.90 , 560.09
+1144.11 , 4125.76 , 597.75
+1144.11 , 4383.62 , 635.63
+1144.11 , 4641.48 , 673.76
+1144.11 , 4899.34 , 712.12
+1144.11 , 5157.20 , 750.73
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..3c80c1e20b59f7eb9bf9944d96f50223c180d0ce
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 5157.20 , -5707.13
+5.67 , 5157.20 , -5707.13
+57.23 , 5157.20 , -5707.13
+114.47 , 5157.20 , -5707.13
+171.56 , 5157.20 , -5707.13
+228.79 , 5157.20 , -5707.13
+286.03 , 5157.20 , -5707.13
+343.26 , 4297.66 , -4755.94
+400.49 , 3683.68 , -4076.49
+457.59 , 3223.25 , -3566.96
+514.82 , 2865.13 , -3170.65
+572.05 , 2578.60 , -2853.57
+629.29 , 2344.19 , -2594.16
+686.52 , 2148.83 , -2377.97
+743.61 , 1983.53 , -2195.04
+800.85 , 1841.88 , -2038.28
+858.08 , 1719.07 , -1902.38
+915.31 , 1611.66 , -1783.52
+972.54 , 1516.83 , -1678.58
+1029.64 , 1432.53 , -1585.29
+1086.87 , 1357.17 , -1501.89
+1144.11 , 1289.30 , -1426.78
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..3c80c1e20b59f7eb9bf9944d96f50223c180d0ce
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 5157.20 , -5707.13
+5.67 , 5157.20 , -5707.13
+57.23 , 5157.20 , -5707.13
+114.47 , 5157.20 , -5707.13
+171.56 , 5157.20 , -5707.13
+228.79 , 5157.20 , -5707.13
+286.03 , 5157.20 , -5707.13
+343.26 , 4297.66 , -4755.94
+400.49 , 3683.68 , -4076.49
+457.59 , 3223.25 , -3566.96
+514.82 , 2865.13 , -3170.65
+572.05 , 2578.60 , -2853.57
+629.29 , 2344.19 , -2594.16
+686.52 , 2148.83 , -2377.97
+743.61 , 1983.53 , -2195.04
+800.85 , 1841.88 , -2038.28
+858.08 , 1719.07 , -1902.38
+915.31 , 1611.66 , -1783.52
+972.54 , 1516.83 , -1678.58
+1029.64 , 1432.53 , -1585.29
+1086.87 , 1357.17 , -1501.89
+1144.11 , 1289.30 , -1426.78
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_drag.viepcd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..620f776f90668e47b3191d74c31059957ef5facb
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC_Gbx3Whl1_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -10.92
+5.72 , -11.26
+57.21 , -14.46
+114.41 , -18.00
+171.62 , -21.53
+228.82 , -25.11
+286.03 , -28.65
+343.23 , -32.19
+400.44 , -35.73
+457.65 , -39.27
+514.85 , -42.84
+572.06 , -46.38
+629.26 , -49.92
+686.47 , -53.46
+743.67 , -57.00
+800.88 , -60.57
+858.08 , -64.11
+915.29 , -67.65
+972.50 , -71.19
+1029.70 , -74.73
+1086.91 , -78.30
+1144.11 , -81.84
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/GenericIEPC_Gbx3Whl2.viepc b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/GenericIEPC_Gbx3Whl2.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..47e3bfc6dd49ea605c5f474274d8e24a00f7791a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/GenericIEPC_Gbx3Whl2.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": true,
+ "NrOfDesignTypeWheelMotorMeasured": 2,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 21.9384
+ },
+ {
+ "Ratio": 12.276
+ },
+ {
+ "Ratio": 7.2336
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3Whl2_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl2_1.viepco",
+ "2": "IEPC_Gbx3Whl2_2.viepco",
+ "3": "IEPC_Gbx3Whl2_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3Whl2_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3Whl2_1.viepco",
+ "2": "IEPC_Gbx3Whl2_2.viepco",
+ "3": "IEPC_Gbx3Whl2_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3Whl2_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_ENG_Gbx3Whl2.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_ENG_Gbx3Whl2.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..f402ce770e3afc13e7c5ea64530f48e7a1d7fbad
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_ENG_Gbx3Whl2.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx3Whl2.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_Vehicle_Gbx3Whl2.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_Vehicle_Gbx3Whl2.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..9edc0421106cb1f924a38de10540c860eb14b724
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_Vehicle_Gbx3Whl2.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3Whl2.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_1.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..6661444505d1f80e1b7ccf4680f069a1394f3e8d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -35338.92 , 0.00
+0.00 , -33571.97 , 0.00
+0.00 , -31805.03 , 0.00
+0.00 , -30038.08 , 0.00
+0.00 , -28271.13 , 0.00
+0.00 , -26504.19 , 0.00
+0.00 , -24737.24 , -0.13
+0.00 , -22970.30 , -0.66
+0.00 , -21203.35 , -0.98
+0.00 , -19436.40 , -1.19
+0.00 , -17669.46 , -1.32
+0.00 , -15902.51 , -1.38
+0.00 , -14135.57 , -1.39
+0.00 , -12368.62 , -1.35
+0.00 , -10601.68 , -1.26
+0.00 , -8834.73 , -1.13
+0.00 , -7067.78 , -0.97
+0.00 , -5300.84 , -0.77
+0.00 , -3533.89 , -0.53
+0.00 , -1766.95 , -0.27
+0.00 , -353.39 , -0.02
+0.00 , 306.44 , 0.13
+0.00 , 1532.18 , 0.56
+0.00 , 3064.36 , 1.12
+0.00 , 4596.53 , 1.70
+0.00 , 6128.71 , 2.31
+0.00 , 7660.89 , 2.93
+0.00 , 9193.07 , 3.58
+0.00 , 10725.24 , 4.25
+0.00 , 12257.42 , 4.93
+0.00 , 13789.60 , 5.64
+0.00 , 15321.78 , 6.37
+0.00 , 16853.96 , 7.12
+0.00 , 18386.13 , 7.88
+0.00 , 19918.31 , 8.67
+0.00 , 21450.49 , 9.47
+0.00 , 22982.67 , 10.29
+0.00 , 24514.85 , 11.13
+0.00 , 26047.02 , 11.99
+0.00 , 27579.20 , 12.87
+0.00 , 29111.38 , 13.76
+0.00 , 30643.56 , 14.67
+1.89 , -35338.92 , 0.00
+1.89 , -33571.97 , 0.00
+1.89 , -31805.03 , 0.00
+1.89 , -30038.08 , 0.00
+1.89 , -28271.13 , 0.00
+1.89 , -26504.19 , 0.00
+1.89 , -24737.24 , -0.50
+1.89 , -22970.30 , -0.84
+1.89 , -21203.35 , -1.04
+1.89 , -19436.40 , -1.16
+1.89 , -17669.46 , -1.22
+1.89 , -15902.51 , -1.24
+1.89 , -14135.57 , -1.21
+1.89 , -12368.62 , -1.15
+1.89 , -10601.68 , -1.06
+1.89 , -8834.73 , -0.94
+1.89 , -7067.78 , -0.80
+1.89 , -5300.84 , -0.62
+1.89 , -3533.89 , -0.43
+1.89 , -1766.95 , -0.21
+1.89 , -353.39 , -0.02
+1.89 , 306.44 , 0.10
+1.89 , 1532.18 , 0.43
+1.89 , 3064.36 , 0.85
+1.89 , 4596.53 , 1.30
+1.89 , 6128.71 , 1.75
+1.89 , 7660.89 , 2.23
+1.89 , 9193.07 , 2.71
+1.89 , 10725.24 , 3.21
+1.89 , 12257.42 , 3.73
+1.89 , 13789.60 , 4.26
+1.89 , 15321.78 , 4.80
+1.89 , 16853.96 , 5.36
+1.89 , 18386.13 , 5.93
+1.89 , 19918.31 , 6.52
+1.89 , 21450.49 , 7.12
+1.89 , 22982.67 , 7.73
+1.89 , 24514.85 , 8.35
+1.89 , 26047.02 , 8.99
+1.89 , 27579.20 , 9.64
+1.89 , 29111.38 , 10.30
+1.89 , 30643.56 , 10.98
+18.86 , -35338.92 , -58.10
+18.86 , -33571.97 , -55.37
+18.86 , -31805.03 , -52.62
+18.86 , -30038.08 , -49.85
+18.86 , -28271.13 , -47.06
+18.86 , -26504.19 , -44.25
+18.86 , -24737.24 , -41.42
+18.86 , -22970.30 , -38.57
+18.86 , -21203.35 , -35.70
+18.86 , -19436.40 , -32.81
+18.86 , -17669.46 , -29.90
+18.86 , -15902.51 , -26.98
+18.86 , -14135.57 , -24.03
+18.86 , -12368.62 , -21.07
+18.86 , -10601.68 , -18.08
+18.86 , -8834.73 , -15.08
+18.86 , -7067.78 , -12.06
+18.86 , -5300.84 , -9.02
+18.86 , -3533.89 , -5.96
+18.86 , -1766.95 , -2.88
+18.86 , -353.39 , -0.37
+18.86 , 306.44 , 0.90
+18.86 , 1532.18 , 3.68
+18.86 , 3064.36 , 7.16
+18.86 , 4596.53 , 10.66
+18.86 , 6128.71 , 14.17
+18.86 , 7660.89 , 17.71
+18.86 , 9193.07 , 21.26
+18.86 , 10725.24 , 24.84
+18.86 , 12257.42 , 28.43
+18.86 , 13789.60 , 32.04
+18.86 , 15321.78 , 35.67
+18.86 , 16853.96 , 39.32
+18.86 , 18386.13 , 42.99
+18.86 , 19918.31 , 46.68
+18.86 , 21450.49 , 50.38
+18.86 , 22982.67 , 54.11
+18.86 , 24514.85 , 57.85
+18.86 , 26047.02 , 61.61
+18.86 , 27579.20 , 65.39
+18.86 , 29111.38 , 69.19
+18.86 , 30643.56 , 73.01
+37.72 , -35338.92 , -120.57
+37.72 , -33571.97 , -114.73
+37.72 , -31805.03 , -108.87
+37.72 , -30038.08 , -102.99
+37.72 , -28271.13 , -97.08
+37.72 , -26504.19 , -91.15
+37.72 , -24737.24 , -85.20
+37.72 , -22970.30 , -79.23
+37.72 , -21203.35 , -73.23
+37.72 , -19436.40 , -67.21
+37.72 , -17669.46 , -61.17
+37.72 , -15902.51 , -55.10
+37.72 , -14135.57 , -49.01
+37.72 , -12368.62 , -42.90
+37.72 , -10601.68 , -36.77
+37.72 , -8834.73 , -30.61
+37.72 , -7067.78 , -24.43
+37.72 , -5300.84 , -18.23
+37.72 , -3533.89 , -12.01
+37.72 , -1766.95 , -5.76
+37.72 , -353.39 , -0.66
+37.72 , 306.44 , 1.84
+37.72 , 1532.18 , 7.35
+37.72 , 3064.36 , 14.22
+37.72 , 4596.53 , 21.11
+37.72 , 6128.71 , 28.02
+37.72 , 7660.89 , 34.96
+37.72 , 9193.07 , 41.92
+37.72 , 10725.24 , 48.90
+37.72 , 12257.42 , 55.90
+37.72 , 13789.60 , 62.93
+37.72 , 15321.78 , 69.98
+37.72 , 16853.96 , 77.05
+37.72 , 18386.13 , 84.15
+37.72 , 19918.31 , 91.27
+37.72 , 21450.49 , 98.41
+37.72 , 22982.67 , 105.58
+37.72 , 24514.85 , 112.76
+37.72 , 26047.02 , 119.97
+37.72 , 27579.20 , 127.21
+37.72 , 29111.38 , 134.46
+37.72 , 30643.56 , 141.74
+56.59 , -35338.92 , -182.44
+56.59 , -33571.97 , -173.55
+56.59 , -31805.03 , -164.62
+56.59 , -30038.08 , -155.67
+56.59 , -28271.13 , -146.69
+56.59 , -26504.19 , -137.68
+56.59 , -24737.24 , -128.65
+56.59 , -22970.30 , -119.58
+56.59 , -21203.35 , -110.49
+56.59 , -19436.40 , -101.36
+56.59 , -17669.46 , -92.21
+56.59 , -15902.51 , -83.03
+56.59 , -14135.57 , -73.82
+56.59 , -12368.62 , -64.58
+56.59 , -10601.68 , -55.31
+56.59 , -8834.73 , -46.02
+56.59 , -7067.78 , -36.70
+56.59 , -5300.84 , -27.34
+56.59 , -3533.89 , -17.96
+56.59 , -1766.95 , -8.54
+56.59 , -353.39 , -0.79
+56.59 , 306.44 , 2.86
+56.59 , 1532.18 , 11.12
+56.59 , 3064.36 , 21.39
+56.59 , 4596.53 , 31.68
+56.59 , 6128.71 , 41.99
+56.59 , 7660.89 , 52.34
+56.59 , 9193.07 , 62.71
+56.59 , 10725.24 , 73.12
+56.59 , 12257.42 , 83.55
+56.59 , 13789.60 , 94.01
+56.59 , 15321.78 , 104.50
+56.59 , 16853.96 , 115.02
+56.59 , 18386.13 , 125.57
+56.59 , 19918.31 , 136.15
+56.59 , 21450.49 , 146.76
+56.59 , 22982.67 , 157.40
+56.59 , 24514.85 , 168.06
+56.59 , 26047.02 , 178.76
+56.59 , 27579.20 , 189.48
+56.59 , 29111.38 , 200.23
+56.59 , 30643.56 , 211.02
+75.45 , -35338.92 , -243.71
+75.45 , -33571.97 , -231.81
+75.45 , -31805.03 , -219.87
+75.45 , -30038.08 , -207.89
+75.45 , -28271.13 , -195.88
+75.45 , -26504.19 , -183.83
+75.45 , -24737.24 , -171.74
+75.45 , -22970.30 , -159.61
+75.45 , -21203.35 , -147.45
+75.45 , -19436.40 , -135.25
+75.45 , -17669.46 , -123.01
+75.45 , -15902.51 , -110.74
+75.45 , -14135.57 , -98.43
+75.45 , -12368.62 , -86.08
+75.45 , -10601.68 , -73.70
+75.45 , -8834.73 , -61.27
+75.45 , -7067.78 , -48.82
+75.45 , -5300.84 , -36.32
+75.45 , -3533.89 , -23.78
+75.45 , -1766.95 , -11.19
+75.45 , -353.39 , -0.63
+75.45 , 306.44 , 3.98
+75.45 , 1532.18 , 15.01
+75.45 , 3064.36 , 28.68
+75.45 , 4596.53 , 42.37
+75.45 , 6128.71 , 56.10
+75.45 , 7660.89 , 69.87
+75.45 , 9193.07 , 83.67
+75.45 , 10725.24 , 97.52
+75.45 , 12257.42 , 111.40
+75.45 , 13789.60 , 125.31
+75.45 , 15321.78 , 139.27
+75.45 , 16853.96 , 153.26
+75.45 , 18386.13 , 167.29
+75.45 , 19918.31 , 181.36
+75.45 , 21450.49 , 195.46
+75.45 , 22982.67 , 209.61
+75.45 , 24514.85 , 223.79
+75.45 , 26047.02 , 238.01
+75.45 , 27579.20 , 252.26
+75.45 , 29111.38 , 266.56
+75.45 , 30643.56 , 280.89
+94.31 , -35338.92 , -304.37
+94.31 , -33571.97 , -289.50
+94.31 , -31805.03 , -274.59
+94.31 , -30038.08 , -259.63
+94.31 , -28271.13 , -244.61
+94.31 , -26504.19 , -229.56
+94.31 , -24737.24 , -214.45
+94.31 , -22970.30 , -199.30
+94.31 , -21203.35 , -184.10
+94.31 , -19436.40 , -168.85
+94.31 , -17669.46 , -153.55
+94.31 , -15902.51 , -138.20
+94.31 , -14135.57 , -122.81
+94.31 , -12368.62 , -107.37
+94.31 , -10601.68 , -91.88
+94.31 , -8834.73 , -76.35
+94.31 , -7067.78 , -60.76
+94.31 , -5300.84 , -45.13
+94.31 , -3533.89 , -29.44
+94.31 , -1766.95 , -13.67
+94.31 , -353.39 , 0.00
+94.31 , 306.44 , 5.21
+94.31 , 1532.18 , 19.04
+94.31 , 3064.36 , 36.13
+94.31 , 4596.53 , 53.24
+94.31 , 6128.71 , 70.39
+94.31 , 7660.89 , 87.59
+94.31 , 9193.07 , 104.83
+94.31 , 10725.24 , 122.13
+94.31 , 12257.42 , 139.47
+94.31 , 13789.60 , 156.87
+94.31 , 15321.78 , 174.31
+94.31 , 16853.96 , 191.80
+94.31 , 18386.13 , 209.33
+94.31 , 19918.31 , 226.92
+94.31 , 21450.49 , 244.56
+94.31 , 22982.67 , 262.24
+94.31 , 24514.85 , 279.97
+94.31 , 26047.02 , 297.76
+94.31 , 27579.20 , 315.58
+94.31 , 29111.38 , 333.46
+94.31 , 30643.56 , 351.39
+113.17 , -35338.92 , -364.37
+113.17 , -33571.97 , -346.59
+113.17 , -31805.03 , -328.74
+113.17 , -30038.08 , -310.84
+113.17 , -28271.13 , -292.87
+113.17 , -26504.19 , -274.84
+113.17 , -24737.24 , -256.75
+113.17 , -22970.30 , -238.60
+113.17 , -21203.35 , -220.39
+113.17 , -19436.40 , -202.12
+113.17 , -17669.46 , -183.79
+113.17 , -15902.51 , -165.40
+113.17 , -14135.57 , -146.94
+113.17 , -12368.62 , -128.43
+113.17 , -10601.68 , -109.85
+113.17 , -8834.73 , -91.21
+113.17 , -7067.78 , -72.51
+113.17 , -5300.84 , -53.75
+113.17 , -3533.89 , -34.91
+113.17 , -1766.95 , -15.95
+113.17 , -353.39 , 0.00
+113.17 , 306.44 , 6.58
+113.17 , 1532.18 , 23.25
+113.17 , 3064.36 , 43.76
+113.17 , 4596.53 , 64.29
+113.17 , 6128.71 , 84.87
+113.17 , 7660.89 , 105.52
+113.17 , 9193.07 , 126.22
+113.17 , 10725.24 , 146.98
+113.17 , 12257.42 , 167.81
+113.17 , 13789.60 , 188.70
+113.17 , 15321.78 , 209.65
+113.17 , 16853.96 , 230.66
+113.17 , 18386.13 , 251.73
+113.17 , 19918.31 , 272.87
+113.17 , 21450.49 , 294.07
+113.17 , 22982.67 , 315.33
+113.17 , 24514.85 , 336.65
+113.17 , 26047.02 , 358.03
+113.17 , 27579.20 , 379.47
+113.17 , 29111.38 , 400.98
+113.17 , 30643.56 , 422.54
+132.03 , -35338.92 , -423.69
+132.03 , -33571.97 , -403.04
+132.03 , -31805.03 , -382.31
+132.03 , -30038.08 , -361.50
+132.03 , -28271.13 , -340.62
+132.03 , -26504.19 , -319.66
+132.03 , -24737.24 , -298.62
+132.03 , -22970.30 , -277.51
+132.03 , -21203.35 , -256.31
+132.03 , -19436.40 , -235.05
+132.03 , -17669.46 , -213.70
+132.03 , -15902.51 , -192.28
+132.03 , -14135.57 , -170.79
+132.03 , -12368.62 , -149.21
+132.03 , -10601.68 , -127.57
+132.03 , -8834.73 , -105.84
+132.03 , -7067.78 , -84.03
+132.03 , -5300.84 , -62.14
+132.03 , -3533.89 , -40.16
+132.03 , -1766.95 , -18.00
+132.03 , -353.39 , 0.00
+132.03 , 306.44 , 8.09
+132.03 , 1532.18 , 27.64
+132.03 , 3064.36 , 51.59
+132.03 , 4596.53 , 75.56
+132.03 , 6128.71 , 99.58
+132.03 , 7660.89 , 123.68
+132.03 , 9193.07 , 147.86
+132.03 , 10725.24 , 172.10
+132.03 , 12257.42 , 196.43
+132.03 , 13789.60 , 220.84
+132.03 , 15321.78 , 245.32
+132.03 , 16853.96 , 269.88
+132.03 , 18386.13 , 294.51
+132.03 , 19918.31 , 319.23
+132.03 , 21450.49 , 344.02
+132.03 , 22982.67 , 368.89
+132.03 , 24514.85 , 393.83
+132.03 , 26047.02 , 418.85
+132.03 , 27579.20 , 443.95
+132.03 , 29111.38 , 469.13
+132.03 , 30643.56 , 494.38
+150.90 , -35338.92 , -482.31
+150.90 , -33571.97 , -458.83
+150.90 , -31805.03 , -435.26
+150.90 , -30038.08 , -411.59
+150.90 , -28271.13 , -387.83
+150.90 , -26504.19 , -363.97
+150.90 , -24737.24 , -340.02
+150.90 , -22970.30 , -315.97
+150.90 , -21203.35 , -291.83
+150.90 , -19436.40 , -267.59
+150.90 , -17669.46 , -243.26
+150.90 , -15902.51 , -218.84
+150.90 , -14135.57 , -194.32
+150.90 , -12368.62 , -169.71
+150.90 , -10601.68 , -145.00
+150.90 , -8834.73 , -120.19
+150.90 , -7067.78 , -95.29
+150.90 , -5300.84 , -70.28
+150.90 , -3533.89 , -45.14
+150.90 , -1766.95 , -19.76
+150.90 , -353.39 , 0.00
+150.90 , 306.44 , 9.76
+150.90 , 1532.18 , 32.25
+150.90 , 3064.36 , 59.66
+150.90 , 4596.53 , 87.07
+150.90 , 6128.71 , 114.55
+150.90 , 7660.89 , 142.11
+150.90 , 9193.07 , 169.77
+150.90 , 10725.24 , 197.52
+150.90 , 12257.42 , 225.37
+150.90 , 13789.60 , 253.31
+150.90 , 15321.78 , 281.34
+150.90 , 16853.96 , 309.47
+150.90 , 18386.13 , 337.70
+150.90 , 19918.31 , 366.02
+150.90 , 21450.49 , 394.44
+150.90 , 22982.67 , 422.95
+150.90 , 24514.85 , 451.56
+150.90 , 26047.02 , 480.26
+150.90 , 27579.20 , 509.05
+150.90 , 29111.38 , 537.94
+150.90 , 30643.56 , 566.93
+169.76 , -35338.92 , -540.17
+169.76 , -33571.97 , -513.92
+169.76 , -31805.03 , -487.55
+169.76 , -30038.08 , -461.06
+169.76 , -28271.13 , -434.46
+169.76 , -26504.19 , -407.75
+169.76 , -24737.24 , -380.92
+169.76 , -22970.30 , -353.97
+169.76 , -21203.35 , -326.91
+169.76 , -19436.40 , -299.73
+169.76 , -17669.46 , -272.44
+169.76 , -15902.51 , -245.03
+169.76 , -14135.57 , -217.51
+169.76 , -12368.62 , -189.87
+169.76 , -10601.68 , -162.12
+169.76 , -8834.73 , -134.25
+169.76 , -7067.78 , -106.26
+169.76 , -5300.84 , -78.13
+169.76 , -3533.89 , -49.84
+169.76 , -1766.95 , -21.19
+169.76 , -353.39 , 0.00
+169.76 , 306.44 , 11.59
+169.76 , 1532.18 , 37.10
+169.76 , 3064.36 , 67.98
+169.76 , 4596.53 , 98.85
+169.76 , 6128.71 , 129.79
+169.76 , 7660.89 , 160.84
+169.76 , 9193.07 , 191.99
+169.76 , 10725.24 , 223.26
+169.76 , 12257.42 , 254.64
+169.76 , 13789.60 , 286.14
+169.76 , 15321.78 , 317.75
+169.76 , 16853.96 , 349.48
+169.76 , 18386.13 , 381.32
+169.76 , 19918.31 , 413.28
+169.76 , 21450.49 , 445.36
+169.76 , 22982.67 , 477.54
+169.76 , 24514.85 , 509.85
+169.76 , 26047.02 , 542.27
+169.76 , 27579.20 , 574.80
+169.76 , 29111.38 , 607.45
+169.76 , 30643.56 , 640.21
+188.62 , -35338.92 , -597.26
+188.62 , -33571.97 , -568.28
+188.62 , -31805.03 , -539.16
+188.62 , -30038.08 , -509.90
+188.62 , -28271.13 , -480.50
+188.62 , -26504.19 , -450.96
+188.62 , -24737.24 , -421.28
+188.62 , -22970.30 , -391.47
+188.62 , -21203.35 , -361.52
+188.62 , -19436.40 , -331.43
+188.62 , -17669.46 , -301.20
+188.62 , -15902.51 , -270.83
+188.62 , -14135.57 , -240.33
+188.62 , -12368.62 , -209.68
+188.62 , -10601.68 , -178.90
+188.62 , -8834.73 , -147.97
+188.62 , -7067.78 , -116.90
+188.62 , -5300.84 , -85.66
+188.62 , -3533.89 , -54.21
+188.62 , -1766.95 , -22.23
+188.62 , -353.39 , 0.00
+188.62 , 306.44 , 13.60
+188.62 , 1532.18 , 42.20
+188.62 , 3064.36 , 76.58
+188.62 , 4596.53 , 110.92
+188.62 , 6128.71 , 145.34
+188.62 , 7660.89 , 179.88
+188.62 , 9193.07 , 214.55
+188.62 , 10725.24 , 249.35
+188.62 , 12257.42 , 284.29
+188.62 , 13789.60 , 319.36
+188.62 , 15321.78 , 354.57
+188.62 , 16853.96 , 389.92
+188.62 , 18386.13 , 425.41
+188.62 , 19918.31 , 461.03
+188.62 , 21450.49 , 496.79
+188.62 , 22982.67 , 532.69
+188.62 , 24514.85 , 568.73
+188.62 , 26047.02 , 604.90
+188.62 , 27579.20 , 641.21
+188.62 , 29111.38 , 677.66
+188.62 , 30643.56 , 714.24
+207.48 , -35338.92 , -653.54
+207.48 , -33571.97 , -621.88
+207.48 , -31805.03 , -590.05
+207.48 , -30038.08 , -558.06
+207.48 , -28271.13 , -525.90
+207.48 , -26504.19 , -493.58
+207.48 , -24737.24 , -461.09
+207.48 , -22970.30 , -428.44
+207.48 , -21203.35 , -395.63
+207.48 , -19436.40 , -362.65
+207.48 , -17669.46 , -329.51
+207.48 , -15902.51 , -296.21
+207.48 , -14135.57 , -262.74
+207.48 , -12368.62 , -229.11
+207.48 , -10601.68 , -195.31
+207.48 , -8834.73 , -161.34
+207.48 , -7067.78 , -127.18
+207.48 , -5300.84 , -92.83
+207.48 , -3533.89 , -58.20
+207.48 , -1766.95 , -22.82
+207.48 , -353.39 , 0.00
+207.48 , 306.44 , 15.79
+207.48 , 1532.18 , 47.58
+207.48 , 3064.36 , 85.48
+207.48 , 4596.53 , 123.30
+207.48 , 6128.71 , 161.22
+207.48 , 7660.89 , 199.26
+207.48 , 9193.07 , 237.46
+207.48 , 10725.24 , 275.81
+207.48 , 12257.42 , 314.32
+207.48 , 13789.60 , 352.99
+207.48 , 15321.78 , 391.83
+207.48 , 16853.96 , 430.82
+207.48 , 18386.13 , 469.98
+207.48 , 19918.31 , 509.30
+207.48 , 21450.49 , 548.78
+207.48 , 22982.67 , 588.42
+207.48 , 24514.85 , 628.23
+207.48 , 26047.02 , 668.20
+207.48 , 27579.20 , 708.32
+207.48 , 29111.38 , 748.61
+207.48 , 30643.56 , 789.06
+226.34 , -35338.92 , -708.97
+226.34 , -33571.97 , -674.68
+226.34 , -31805.03 , -640.19
+226.34 , -30038.08 , -605.51
+226.34 , -28271.13 , -570.63
+226.34 , -26504.19 , -535.56
+226.34 , -24737.24 , -500.30
+226.34 , -22970.30 , -464.85
+226.34 , -21203.35 , -429.21
+226.34 , -19436.40 , -393.37
+226.34 , -17669.46 , -357.35
+226.34 , -15902.51 , -321.13
+226.34 , -14135.57 , -284.71
+226.34 , -12368.62 , -248.11
+226.34 , -10601.68 , -211.31
+226.34 , -8834.73 , -174.30
+226.34 , -7067.78 , -137.08
+226.34 , -5300.84 , -99.61
+226.34 , -3533.89 , -61.78
+226.34 , -1766.95 , -22.86
+226.34 , -353.39 , 0.00
+226.34 , 306.44 , 18.17
+226.34 , 1532.18 , 53.24
+226.34 , 3064.36 , 94.71
+226.34 , 4596.53 , 136.03
+226.34 , 6128.71 , 177.45
+226.34 , 7660.89 , 219.01
+226.34 , 9193.07 , 260.75
+226.34 , 10725.24 , 302.67
+226.34 , 12257.42 , 344.78
+226.34 , 13789.60 , 387.07
+226.34 , 15321.78 , 429.54
+226.34 , 16853.96 , 472.21
+226.34 , 18386.13 , 515.06
+226.34 , 19918.31 , 558.11
+226.34 , 21450.49 , 601.34
+226.34 , 22982.67 , 644.76
+226.34 , 24514.85 , 688.37
+226.34 , 26047.02 , 732.17
+226.34 , 27579.20 , 776.15
+226.34 , 29111.38 , 820.33
+226.34 , 30643.56 , 864.69
+245.21 , -35338.92 , -763.53
+245.21 , -33571.97 , -726.65
+245.21 , -31805.03 , -689.55
+245.21 , -30038.08 , -652.22
+245.21 , -28271.13 , -614.67
+245.21 , -26504.19 , -576.89
+245.21 , -24737.24 , -538.89
+245.21 , -22970.30 , -500.67
+245.21 , -21203.35 , -462.22
+245.21 , -19436.40 , -423.56
+245.21 , -17669.46 , -384.67
+245.21 , -15902.51 , -345.56
+245.21 , -14135.57 , -306.22
+245.21 , -12368.62 , -266.66
+245.21 , -10601.68 , -226.86
+245.21 , -8834.73 , -186.83
+245.21 , -7067.78 , -146.54
+245.21 , -5300.84 , -105.95
+245.21 , -3533.89 , -64.90
+245.21 , -1766.95 , -22.24
+245.21 , -353.39 , 0.00
+245.21 , 306.44 , 20.74
+245.21 , 1532.18 , 59.20
+245.21 , 3064.36 , 104.27
+245.21 , 4596.53 , 149.12
+245.21 , 6128.71 , 194.05
+245.21 , 7660.89 , 239.16
+245.21 , 9193.07 , 284.45
+245.21 , 10725.24 , 329.96
+245.21 , 12257.42 , 375.67
+245.21 , 13789.60 , 421.60
+245.21 , 15321.78 , 467.75
+245.21 , 16853.96 , 514.11
+245.21 , 18386.13 , 560.69
+245.21 , 19918.31 , 607.48
+245.21 , 21450.49 , 654.50
+245.21 , 22982.67 , 701.73
+245.21 , 24514.85 , 749.18
+245.21 , 26047.02 , 796.84
+245.21 , 27579.20 , 844.73
+245.21 , 29111.38 , 892.83
+245.21 , 30643.56 , 941.14
+264.07 , -35338.92 , -817.17
+264.07 , -33571.97 , -777.76
+264.07 , -31805.03 , -738.08
+264.07 , -30038.08 , -698.15
+264.07 , -28271.13 , -657.96
+264.07 , -26504.19 , -617.52
+264.07 , -24737.24 , -576.82
+264.07 , -22970.30 , -535.86
+264.07 , -21203.35 , -494.65
+264.07 , -19436.40 , -453.18
+264.07 , -17669.46 , -411.45
+264.07 , -15902.51 , -369.47
+264.07 , -14135.57 , -327.22
+264.07 , -12368.62 , -284.72
+264.07 , -10601.68 , -241.95
+264.07 , -8834.73 , -198.90
+264.07 , -7067.78 , -155.54
+264.07 , -5300.84 , -111.82
+264.07 , -3533.89 , -67.51
+264.07 , -1766.95 , -20.80
+264.07 , -353.39 , 0.00
+264.07 , 306.44 , 23.52
+264.07 , 1532.18 , 65.48
+264.07 , 3064.36 , 114.20
+264.07 , 4596.53 , 162.59
+264.07 , 6128.71 , 211.06
+264.07 , 7660.89 , 259.72
+264.07 , 9193.07 , 308.59
+264.07 , 10725.24 , 357.69
+264.07 , 12257.42 , 407.04
+264.07 , 13789.60 , 456.62
+264.07 , 15321.78 , 506.46
+264.07 , 16853.96 , 556.54
+264.07 , 18386.13 , 606.87
+264.07 , 19918.31 , 657.45
+264.07 , 21450.49 , 708.28
+264.07 , 22982.67 , 759.35
+264.07 , 24514.85 , 810.68
+264.07 , 26047.02 , 862.25
+264.07 , 27579.20 , 914.07
+264.07 , 29111.38 , 966.13
+264.07 , 30643.56 , 1018.44
+282.93 , -35338.92 , -869.86
+282.93 , -33571.97 , -827.96
+282.93 , -31805.03 , -785.77
+282.93 , -30038.08 , -743.28
+282.93 , -28271.13 , -700.50
+282.93 , -26504.19 , -657.42
+282.93 , -24737.24 , -614.05
+282.93 , -22970.30 , -570.39
+282.93 , -21203.35 , -526.44
+282.93 , -19436.40 , -482.19
+282.93 , -17669.46 , -437.65
+282.93 , -15902.51 , -392.82
+282.93 , -14135.57 , -347.69
+282.93 , -12368.62 , -302.26
+282.93 , -10601.68 , -256.52
+282.93 , -8834.73 , -210.46
+282.93 , -7067.78 , -164.04
+282.93 , -5300.84 , -117.17
+282.93 , -3533.89 , -69.54
+282.93 , -1766.95 , -18.27
+282.93 , -353.39 , 0.00
+282.93 , 306.44 , 26.49
+282.93 , 1532.18 , 72.10
+282.93 , 3064.36 , 124.50
+282.93 , 4596.53 , 176.46
+282.93 , 6128.71 , 228.49
+282.93 , 7660.89 , 280.71
+282.93 , 9193.07 , 333.18
+282.93 , 10725.24 , 385.90
+282.93 , 12257.42 , 438.89
+282.93 , 13789.60 , 492.16
+282.93 , 15321.78 , 545.71
+282.93 , 16853.96 , 599.54
+282.93 , 18386.13 , 653.64
+282.93 , 19918.31 , 708.03
+282.93 , 21450.49 , 762.71
+282.93 , 22982.67 , 817.66
+282.93 , 24514.85 , 872.89
+282.93 , 26047.02 , 928.41
+282.93 , 27579.20 , 984.20
+282.93 , 29111.38 , 1040.27
+282.93 , 30643.56 , 1096.63
+301.79 , -35338.92 , -921.56
+301.79 , -33571.97 , -877.23
+301.79 , -31805.03 , -832.56
+301.79 , -30038.08 , -787.56
+301.79 , -28271.13 , -742.22
+301.79 , -26504.19 , -696.56
+301.79 , -24737.24 , -650.56
+301.79 , -22970.30 , -604.23
+301.79 , -21203.35 , -557.56
+301.79 , -19436.40 , -510.57
+301.79 , -17669.46 , -463.24
+301.79 , -15902.51 , -415.58
+301.79 , -14135.57 , -367.58
+301.79 , -12368.62 , -319.24
+301.79 , -10601.68 , -270.55
+301.79 , -8834.73 , -221.48
+301.79 , -7067.78 , -171.99
+301.79 , -5300.84 , -121.95
+301.79 , -3533.89 , -70.93
+301.79 , -1766.95 , -14.10
+301.79 , -353.39 , 0.00
+301.79 , 306.44 , 29.68
+301.79 , 1532.18 , 79.05
+301.79 , 3064.36 , 135.20
+301.79 , 4596.53 , 190.76
+301.79 , 6128.71 , 246.36
+301.79 , 7660.89 , 302.17
+301.79 , 9193.07 , 358.24
+301.79 , 10725.24 , 414.60
+301.79 , 12257.42 , 471.27
+301.79 , 13789.60 , 528.24
+301.79 , 15321.78 , 585.52
+301.79 , 16853.96 , 643.12
+301.79 , 18386.13 , 701.03
+301.79 , 19918.31 , 759.26
+301.79 , 21450.49 , 817.80
+301.79 , 22982.67 , 876.66
+301.79 , 24514.85 , 935.84
+301.79 , 26047.02 , 995.34
+301.79 , 27579.20 , 1055.15
+301.79 , 29111.38 , 1115.27
+301.79 , 30643.56 , 1175.71
+320.65 , -35338.92 , -972.24
+320.65 , -33571.97 , -925.52
+320.65 , -31805.03 , -878.43
+320.65 , -30038.08 , -830.96
+320.65 , -28271.13 , -783.11
+320.65 , -26504.19 , -734.89
+320.65 , -24737.24 , -686.30
+320.65 , -22970.30 , -637.33
+320.65 , -21203.35 , -587.99
+320.65 , -19436.40 , -538.28
+320.65 , -17669.46 , -488.19
+320.65 , -15902.51 , -437.72
+320.65 , -14135.57 , -386.87
+320.65 , -12368.62 , -335.63
+320.65 , -10601.68 , -283.99
+320.65 , -8834.73 , -231.92
+320.65 , -7067.78 , -179.35
+320.65 , -5300.84 , -126.12
+320.65 , -3533.89 , -71.60
+320.65 , -1766.95 , -6.45
+320.65 , -353.39 , 0.00
+320.65 , 306.44 , 33.08
+320.65 , 1532.18 , 86.37
+320.65 , 3064.36 , 146.31
+320.65 , 4596.53 , 205.50
+320.65 , 6128.71 , 264.70
+320.65 , 7660.89 , 324.11
+320.65 , 9193.07 , 383.81
+320.65 , 10725.24 , 443.83
+320.65 , 12257.42 , 504.18
+320.65 , 13789.60 , 564.87
+320.65 , 15321.78 , 625.91
+320.65 , 16853.96 , 687.30
+320.65 , 18386.13 , 749.05
+320.65 , 19918.31 , 811.14
+320.65 , 21450.49 , 873.59
+320.65 , 22982.67 , 936.40
+320.65 , 24514.85 , 999.56
+320.65 , 26047.02 , 1063.07
+320.65 , 27579.20 , 1126.93
+320.65 , 29111.38 , 1191.14
+320.65 , 30643.56 , 1255.71
+339.52 , -35338.92 , -1021.86
+339.52 , -33571.97 , -972.81
+339.52 , -31805.03 , -923.33
+339.52 , -30038.08 , -873.44
+339.52 , -28271.13 , -823.13
+339.52 , -26504.19 , -772.39
+339.52 , -24737.24 , -721.24
+339.52 , -22970.30 , -669.67
+339.52 , -21203.35 , -617.68
+339.52 , -19436.40 , -565.27
+339.52 , -17669.46 , -512.45
+339.52 , -15902.51 , -459.19
+339.52 , -14135.57 , -405.51
+339.52 , -12368.62 , -351.39
+339.52 , -10601.68 , -296.81
+339.52 , -8834.73 , -241.73
+339.52 , -7067.78 , -186.07
+339.52 , -5300.84 , -129.61
+339.52 , -3533.89 , -71.46
+339.52 , -1766.95 , 0.00
+339.52 , -353.39 , 0.00
+339.52 , 306.44 , 36.70
+339.52 , 1532.18 , 94.04
+339.52 , 3064.36 , 157.85
+339.52 , 4596.53 , 220.70
+339.52 , 6128.71 , 283.52
+339.52 , 7660.89 , 346.56
+339.52 , 9193.07 , 409.90
+339.52 , 10725.24 , 473.59
+339.52 , 12257.42 , 537.65
+339.52 , 13789.60 , 602.09
+339.52 , 15321.78 , 666.91
+339.52 , 16853.96 , 732.12
+339.52 , 18386.13 , 797.72
+339.52 , 19918.31 , 863.72
+339.52 , 21450.49 , 930.10
+339.52 , 22982.67 , 996.88
+339.52 , 24514.85 , 1064.05
+339.52 , 26047.02 , 1131.62
+339.52 , 27579.20 , 1199.57
+339.52 , 29111.38 , 1267.92
+339.52 , 30643.56 , 1336.65
+358.38 , -35338.92 , -1070.37
+358.38 , -33571.97 , -1019.04
+358.38 , -31805.03 , -967.24
+358.38 , -30038.08 , -914.96
+358.38 , -28271.13 , -862.23
+358.38 , -26504.19 , -809.02
+358.38 , -24737.24 , -755.35
+358.38 , -22970.30 , -701.21
+358.38 , -21203.35 , -646.60
+358.38 , -19436.40 , -591.53
+358.38 , -17669.46 , -535.99
+358.38 , -15902.51 , -479.97
+358.38 , -14135.57 , -423.47
+358.38 , -12368.62 , -366.48
+358.38 , -10601.68 , -308.96
+358.38 , -8834.73 , -250.88
+358.38 , -7067.78 , -192.11
+358.38 , -5300.84 , -132.36
+358.38 , -3533.89 , -70.38
+358.38 , -1766.95 , 0.00
+358.38 , -353.39 , 0.00
+358.38 , 306.44 , 40.53
+358.38 , 1532.18 , 102.10
+358.38 , 3064.36 , 169.83
+358.38 , 4596.53 , 236.37
+358.38 , 6128.71 , 302.84
+358.38 , 7660.89 , 369.53
+358.38 , 9193.07 , 436.54
+358.38 , 10725.24 , 503.92
+358.38 , 12257.42 , 571.71
+358.38 , 13789.60 , 639.91
+358.38 , 15321.78 , 708.54
+358.38 , 16853.96 , 777.59
+358.38 , 18386.13 , 847.08
+358.38 , 19918.31 , 917.00
+358.38 , 21450.49 , 987.35
+358.38 , 22982.67 , 1058.14
+358.38 , 24514.85 , 1129.36
+358.38 , 26047.02 , 1201.01
+358.38 , 27579.20 , 1273.09
+358.38 , 29111.38 , 1345.61
+358.38 , 30643.56 , 1418.56
+377.24 , -35338.92 , -1117.74
+377.24 , -33571.97 , -1064.18
+377.24 , -31805.03 , -1010.10
+377.24 , -30038.08 , -955.49
+377.24 , -28271.13 , -900.37
+377.24 , -26504.19 , -844.73
+377.24 , -24737.24 , -788.58
+377.24 , -22970.30 , -731.90
+377.24 , -21203.35 , -674.71
+377.24 , -19436.40 , -617.00
+377.24 , -17669.46 , -558.77
+377.24 , -15902.51 , -500.01
+377.24 , -14135.57 , -440.71
+377.24 , -12368.62 , -380.85
+377.24 , -10601.68 , -320.40
+377.24 , -8834.73 , -259.31
+377.24 , -7067.78 , -197.41
+377.24 , -5300.84 , -134.30
+377.24 , -3533.89 , -68.24
+377.24 , -1766.95 , 0.00
+377.24 , -353.39 , 0.00
+377.24 , 306.44 , 44.59
+377.24 , 1532.18 , 110.53
+377.24 , 3064.36 , 182.27
+377.24 , 4596.53 , 252.55
+377.24 , 6128.71 , 322.69
+377.24 , 7660.89 , 393.04
+377.24 , 9193.07 , 463.74
+377.24 , 10725.24 , 534.84
+377.24 , 12257.42 , 606.37
+377.24 , 13789.60 , 678.37
+377.24 , 15321.78 , 750.82
+377.24 , 16853.96 , 823.74
+377.24 , 18386.13 , 897.14
+377.24 , 19918.31 , 971.01
+377.24 , 21450.49 , 1045.36
+377.24 , 22982.67 , 1120.19
+377.24 , 24514.85 , 1195.49
+377.24 , 26047.02 , 1271.27
+377.24 , 27579.20 , 1347.52
+377.24 , 29111.38 , 1424.25
+377.24 , 30643.56 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_2.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..1962087695b285e0f81e6a191f1e49d6e79209e0
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -19570.62 , 0.00
+0.00 , -18592.09 , 0.00
+0.00 , -17613.56 , 0.00
+0.00 , -16635.03 , 0.00
+0.00 , -15656.50 , 0.00
+0.00 , -14677.97 , 0.00
+0.00 , -13699.44 , -0.13
+0.00 , -12720.91 , -0.66
+0.00 , -11742.37 , -0.98
+0.00 , -10763.84 , -1.19
+0.00 , -9785.31 , -1.32
+0.00 , -8806.78 , -1.38
+0.00 , -7828.25 , -1.39
+0.00 , -6849.72 , -1.35
+0.00 , -5871.19 , -1.26
+0.00 , -4892.66 , -1.13
+0.00 , -3914.12 , -0.97
+0.00 , -2935.59 , -0.77
+0.00 , -1957.06 , -0.53
+0.00 , -978.53 , -0.27
+0.00 , -195.71 , -0.02
+0.00 , 173.26 , 0.13
+0.00 , 866.29 , 0.56
+0.00 , 1732.57 , 1.12
+0.00 , 2598.86 , 1.70
+0.00 , 3465.15 , 2.31
+0.00 , 4331.43 , 2.93
+0.00 , 5197.72 , 3.58
+0.00 , 6064.01 , 4.25
+0.00 , 6930.29 , 4.93
+0.00 , 7796.58 , 5.64
+0.00 , 8662.87 , 6.37
+0.00 , 9529.15 , 7.12
+0.00 , 10395.44 , 7.88
+0.00 , 11261.73 , 8.67
+0.00 , 12128.01 , 9.47
+0.00 , 12994.30 , 10.29
+0.00 , 13860.59 , 11.13
+0.00 , 14726.87 , 11.99
+0.00 , 15593.16 , 12.87
+0.00 , 16459.45 , 13.76
+0.00 , 17325.73 , 14.67
+3.37 , -19570.62 , 0.00
+3.37 , -18592.09 , 0.00
+3.37 , -17613.56 , 0.00
+3.37 , -16635.03 , 0.00
+3.37 , -15656.50 , 0.00
+3.37 , -14677.97 , 0.00
+3.37 , -13699.44 , -0.50
+3.37 , -12720.91 , -0.84
+3.37 , -11742.37 , -1.04
+3.37 , -10763.84 , -1.16
+3.37 , -9785.31 , -1.22
+3.37 , -8806.78 , -1.24
+3.37 , -7828.25 , -1.21
+3.37 , -6849.72 , -1.15
+3.37 , -5871.19 , -1.06
+3.37 , -4892.66 , -0.94
+3.37 , -3914.12 , -0.80
+3.37 , -2935.59 , -0.62
+3.37 , -1957.06 , -0.43
+3.37 , -978.53 , -0.21
+3.37 , -195.71 , -0.02
+3.37 , 173.26 , 0.10
+3.37 , 866.29 , 0.43
+3.37 , 1732.57 , 0.85
+3.37 , 2598.86 , 1.30
+3.37 , 3465.15 , 1.75
+3.37 , 4331.43 , 2.23
+3.37 , 5197.72 , 2.71
+3.37 , 6064.01 , 3.21
+3.37 , 6930.29 , 3.73
+3.37 , 7796.58 , 4.26
+3.37 , 8662.87 , 4.80
+3.37 , 9529.15 , 5.36
+3.37 , 10395.44 , 5.93
+3.37 , 11261.73 , 6.52
+3.37 , 12128.01 , 7.12
+3.37 , 12994.30 , 7.73
+3.37 , 13860.59 , 8.35
+3.37 , 14726.87 , 8.99
+3.37 , 15593.16 , 9.64
+3.37 , 16459.45 , 10.30
+3.37 , 17325.73 , 10.98
+33.71 , -19570.62 , -58.10
+33.71 , -18592.09 , -55.37
+33.71 , -17613.56 , -52.62
+33.71 , -16635.03 , -49.85
+33.71 , -15656.50 , -47.06
+33.71 , -14677.97 , -44.25
+33.71 , -13699.44 , -41.42
+33.71 , -12720.91 , -38.57
+33.71 , -11742.37 , -35.70
+33.71 , -10763.84 , -32.81
+33.71 , -9785.31 , -29.90
+33.71 , -8806.78 , -26.98
+33.71 , -7828.25 , -24.03
+33.71 , -6849.72 , -21.07
+33.71 , -5871.19 , -18.08
+33.71 , -4892.66 , -15.08
+33.71 , -3914.12 , -12.06
+33.71 , -2935.59 , -9.02
+33.71 , -1957.06 , -5.96
+33.71 , -978.53 , -2.88
+33.71 , -195.71 , -0.37
+33.71 , 173.26 , 0.90
+33.71 , 866.29 , 3.68
+33.71 , 1732.57 , 7.16
+33.71 , 2598.86 , 10.66
+33.71 , 3465.15 , 14.17
+33.71 , 4331.43 , 17.71
+33.71 , 5197.72 , 21.26
+33.71 , 6064.01 , 24.84
+33.71 , 6930.29 , 28.43
+33.71 , 7796.58 , 32.04
+33.71 , 8662.87 , 35.67
+33.71 , 9529.15 , 39.32
+33.71 , 10395.44 , 42.99
+33.71 , 11261.73 , 46.68
+33.71 , 12128.01 , 50.38
+33.71 , 12994.30 , 54.11
+33.71 , 13860.59 , 57.85
+33.71 , 14726.87 , 61.61
+33.71 , 15593.16 , 65.39
+33.71 , 16459.45 , 69.19
+33.71 , 17325.73 , 73.01
+67.42 , -19570.62 , -120.57
+67.42 , -18592.09 , -114.73
+67.42 , -17613.56 , -108.87
+67.42 , -16635.03 , -102.99
+67.42 , -15656.50 , -97.08
+67.42 , -14677.97 , -91.15
+67.42 , -13699.44 , -85.20
+67.42 , -12720.91 , -79.23
+67.42 , -11742.37 , -73.23
+67.42 , -10763.84 , -67.21
+67.42 , -9785.31 , -61.17
+67.42 , -8806.78 , -55.10
+67.42 , -7828.25 , -49.01
+67.42 , -6849.72 , -42.90
+67.42 , -5871.19 , -36.77
+67.42 , -4892.66 , -30.61
+67.42 , -3914.12 , -24.43
+67.42 , -2935.59 , -18.23
+67.42 , -1957.06 , -12.01
+67.42 , -978.53 , -5.76
+67.42 , -195.71 , -0.66
+67.42 , 173.26 , 1.84
+67.42 , 866.29 , 7.35
+67.42 , 1732.57 , 14.22
+67.42 , 2598.86 , 21.11
+67.42 , 3465.15 , 28.02
+67.42 , 4331.43 , 34.96
+67.42 , 5197.72 , 41.92
+67.42 , 6064.01 , 48.90
+67.42 , 6930.29 , 55.90
+67.42 , 7796.58 , 62.93
+67.42 , 8662.87 , 69.98
+67.42 , 9529.15 , 77.05
+67.42 , 10395.44 , 84.15
+67.42 , 11261.73 , 91.27
+67.42 , 12128.01 , 98.41
+67.42 , 12994.30 , 105.58
+67.42 , 13860.59 , 112.76
+67.42 , 14726.87 , 119.97
+67.42 , 15593.16 , 127.21
+67.42 , 16459.45 , 134.46
+67.42 , 17325.73 , 141.74
+101.12 , -19570.62 , -182.44
+101.12 , -18592.09 , -173.55
+101.12 , -17613.56 , -164.62
+101.12 , -16635.03 , -155.67
+101.12 , -15656.50 , -146.69
+101.12 , -14677.97 , -137.68
+101.12 , -13699.44 , -128.65
+101.12 , -12720.91 , -119.58
+101.12 , -11742.37 , -110.49
+101.12 , -10763.84 , -101.36
+101.12 , -9785.31 , -92.21
+101.12 , -8806.78 , -83.03
+101.12 , -7828.25 , -73.82
+101.12 , -6849.72 , -64.58
+101.12 , -5871.19 , -55.31
+101.12 , -4892.66 , -46.02
+101.12 , -3914.12 , -36.70
+101.12 , -2935.59 , -27.34
+101.12 , -1957.06 , -17.96
+101.12 , -978.53 , -8.54
+101.12 , -195.71 , -0.79
+101.12 , 173.26 , 2.86
+101.12 , 866.29 , 11.12
+101.12 , 1732.57 , 21.39
+101.12 , 2598.86 , 31.68
+101.12 , 3465.15 , 41.99
+101.12 , 4331.43 , 52.34
+101.12 , 5197.72 , 62.71
+101.12 , 6064.01 , 73.12
+101.12 , 6930.29 , 83.55
+101.12 , 7796.58 , 94.01
+101.12 , 8662.87 , 104.50
+101.12 , 9529.15 , 115.02
+101.12 , 10395.44 , 125.57
+101.12 , 11261.73 , 136.15
+101.12 , 12128.01 , 146.76
+101.12 , 12994.30 , 157.40
+101.12 , 13860.59 , 168.06
+101.12 , 14726.87 , 178.76
+101.12 , 15593.16 , 189.48
+101.12 , 16459.45 , 200.23
+101.12 , 17325.73 , 211.02
+134.83 , -19570.62 , -243.71
+134.83 , -18592.09 , -231.81
+134.83 , -17613.56 , -219.87
+134.83 , -16635.03 , -207.89
+134.83 , -15656.50 , -195.88
+134.83 , -14677.97 , -183.83
+134.83 , -13699.44 , -171.74
+134.83 , -12720.91 , -159.61
+134.83 , -11742.37 , -147.45
+134.83 , -10763.84 , -135.25
+134.83 , -9785.31 , -123.01
+134.83 , -8806.78 , -110.74
+134.83 , -7828.25 , -98.43
+134.83 , -6849.72 , -86.08
+134.83 , -5871.19 , -73.70
+134.83 , -4892.66 , -61.27
+134.83 , -3914.12 , -48.82
+134.83 , -2935.59 , -36.32
+134.83 , -1957.06 , -23.78
+134.83 , -978.53 , -11.19
+134.83 , -195.71 , -0.63
+134.83 , 173.26 , 3.98
+134.83 , 866.29 , 15.01
+134.83 , 1732.57 , 28.68
+134.83 , 2598.86 , 42.37
+134.83 , 3465.15 , 56.10
+134.83 , 4331.43 , 69.87
+134.83 , 5197.72 , 83.67
+134.83 , 6064.01 , 97.52
+134.83 , 6930.29 , 111.40
+134.83 , 7796.58 , 125.31
+134.83 , 8662.87 , 139.27
+134.83 , 9529.15 , 153.26
+134.83 , 10395.44 , 167.29
+134.83 , 11261.73 , 181.36
+134.83 , 12128.01 , 195.46
+134.83 , 12994.30 , 209.61
+134.83 , 13860.59 , 223.79
+134.83 , 14726.87 , 238.01
+134.83 , 15593.16 , 252.26
+134.83 , 16459.45 , 266.56
+134.83 , 17325.73 , 280.89
+168.54 , -19570.62 , -304.37
+168.54 , -18592.09 , -289.50
+168.54 , -17613.56 , -274.59
+168.54 , -16635.03 , -259.63
+168.54 , -15656.50 , -244.61
+168.54 , -14677.97 , -229.56
+168.54 , -13699.44 , -214.45
+168.54 , -12720.91 , -199.30
+168.54 , -11742.37 , -184.10
+168.54 , -10763.84 , -168.85
+168.54 , -9785.31 , -153.55
+168.54 , -8806.78 , -138.20
+168.54 , -7828.25 , -122.81
+168.54 , -6849.72 , -107.37
+168.54 , -5871.19 , -91.88
+168.54 , -4892.66 , -76.35
+168.54 , -3914.12 , -60.76
+168.54 , -2935.59 , -45.13
+168.54 , -1957.06 , -29.44
+168.54 , -978.53 , -13.67
+168.54 , -195.71 , 0.00
+168.54 , 173.26 , 5.21
+168.54 , 866.29 , 19.04
+168.54 , 1732.57 , 36.13
+168.54 , 2598.86 , 53.24
+168.54 , 3465.15 , 70.39
+168.54 , 4331.43 , 87.59
+168.54 , 5197.72 , 104.83
+168.54 , 6064.01 , 122.13
+168.54 , 6930.29 , 139.47
+168.54 , 7796.58 , 156.87
+168.54 , 8662.87 , 174.31
+168.54 , 9529.15 , 191.80
+168.54 , 10395.44 , 209.33
+168.54 , 11261.73 , 226.92
+168.54 , 12128.01 , 244.56
+168.54 , 12994.30 , 262.24
+168.54 , 13860.59 , 279.97
+168.54 , 14726.87 , 297.76
+168.54 , 15593.16 , 315.58
+168.54 , 16459.45 , 333.46
+168.54 , 17325.73 , 351.39
+202.25 , -19570.62 , -364.37
+202.25 , -18592.09 , -346.59
+202.25 , -17613.56 , -328.74
+202.25 , -16635.03 , -310.84
+202.25 , -15656.50 , -292.87
+202.25 , -14677.97 , -274.84
+202.25 , -13699.44 , -256.75
+202.25 , -12720.91 , -238.60
+202.25 , -11742.37 , -220.39
+202.25 , -10763.84 , -202.12
+202.25 , -9785.31 , -183.79
+202.25 , -8806.78 , -165.40
+202.25 , -7828.25 , -146.94
+202.25 , -6849.72 , -128.43
+202.25 , -5871.19 , -109.85
+202.25 , -4892.66 , -91.21
+202.25 , -3914.12 , -72.51
+202.25 , -2935.59 , -53.75
+202.25 , -1957.06 , -34.91
+202.25 , -978.53 , -15.95
+202.25 , -195.71 , 0.00
+202.25 , 173.26 , 6.58
+202.25 , 866.29 , 23.25
+202.25 , 1732.57 , 43.76
+202.25 , 2598.86 , 64.29
+202.25 , 3465.15 , 84.87
+202.25 , 4331.43 , 105.52
+202.25 , 5197.72 , 126.22
+202.25 , 6064.01 , 146.98
+202.25 , 6930.29 , 167.81
+202.25 , 7796.58 , 188.70
+202.25 , 8662.87 , 209.65
+202.25 , 9529.15 , 230.66
+202.25 , 10395.44 , 251.73
+202.25 , 11261.73 , 272.87
+202.25 , 12128.01 , 294.07
+202.25 , 12994.30 , 315.33
+202.25 , 13860.59 , 336.65
+202.25 , 14726.87 , 358.03
+202.25 , 15593.16 , 379.47
+202.25 , 16459.45 , 400.98
+202.25 , 17325.73 , 422.54
+235.96 , -19570.62 , -423.69
+235.96 , -18592.09 , -403.04
+235.96 , -17613.56 , -382.31
+235.96 , -16635.03 , -361.50
+235.96 , -15656.50 , -340.62
+235.96 , -14677.97 , -319.66
+235.96 , -13699.44 , -298.62
+235.96 , -12720.91 , -277.51
+235.96 , -11742.37 , -256.31
+235.96 , -10763.84 , -235.05
+235.96 , -9785.31 , -213.70
+235.96 , -8806.78 , -192.28
+235.96 , -7828.25 , -170.79
+235.96 , -6849.72 , -149.21
+235.96 , -5871.19 , -127.57
+235.96 , -4892.66 , -105.84
+235.96 , -3914.12 , -84.03
+235.96 , -2935.59 , -62.14
+235.96 , -1957.06 , -40.16
+235.96 , -978.53 , -18.00
+235.96 , -195.71 , 0.00
+235.96 , 173.26 , 8.09
+235.96 , 866.29 , 27.64
+235.96 , 1732.57 , 51.59
+235.96 , 2598.86 , 75.56
+235.96 , 3465.15 , 99.58
+235.96 , 4331.43 , 123.68
+235.96 , 5197.72 , 147.86
+235.96 , 6064.01 , 172.10
+235.96 , 6930.29 , 196.43
+235.96 , 7796.58 , 220.84
+235.96 , 8662.87 , 245.32
+235.96 , 9529.15 , 269.88
+235.96 , 10395.44 , 294.51
+235.96 , 11261.73 , 319.23
+235.96 , 12128.01 , 344.02
+235.96 , 12994.30 , 368.89
+235.96 , 13860.59 , 393.83
+235.96 , 14726.87 , 418.85
+235.96 , 15593.16 , 443.95
+235.96 , 16459.45 , 469.13
+235.96 , 17325.73 , 494.38
+269.67 , -19570.62 , -482.31
+269.67 , -18592.09 , -458.83
+269.67 , -17613.56 , -435.26
+269.67 , -16635.03 , -411.59
+269.67 , -15656.50 , -387.83
+269.67 , -14677.97 , -363.97
+269.67 , -13699.44 , -340.02
+269.67 , -12720.91 , -315.97
+269.67 , -11742.37 , -291.83
+269.67 , -10763.84 , -267.59
+269.67 , -9785.31 , -243.26
+269.67 , -8806.78 , -218.84
+269.67 , -7828.25 , -194.32
+269.67 , -6849.72 , -169.71
+269.67 , -5871.19 , -145.00
+269.67 , -4892.66 , -120.19
+269.67 , -3914.12 , -95.29
+269.67 , -2935.59 , -70.28
+269.67 , -1957.06 , -45.14
+269.67 , -978.53 , -19.76
+269.67 , -195.71 , 0.00
+269.67 , 173.26 , 9.76
+269.67 , 866.29 , 32.25
+269.67 , 1732.57 , 59.66
+269.67 , 2598.86 , 87.07
+269.67 , 3465.15 , 114.55
+269.67 , 4331.43 , 142.11
+269.67 , 5197.72 , 169.77
+269.67 , 6064.01 , 197.52
+269.67 , 6930.29 , 225.37
+269.67 , 7796.58 , 253.31
+269.67 , 8662.87 , 281.34
+269.67 , 9529.15 , 309.47
+269.67 , 10395.44 , 337.70
+269.67 , 11261.73 , 366.02
+269.67 , 12128.01 , 394.44
+269.67 , 12994.30 , 422.95
+269.67 , 13860.59 , 451.56
+269.67 , 14726.87 , 480.26
+269.67 , 15593.16 , 509.05
+269.67 , 16459.45 , 537.94
+269.67 , 17325.73 , 566.93
+303.37 , -19570.62 , -540.17
+303.37 , -18592.09 , -513.92
+303.37 , -17613.56 , -487.55
+303.37 , -16635.03 , -461.06
+303.37 , -15656.50 , -434.46
+303.37 , -14677.97 , -407.75
+303.37 , -13699.44 , -380.92
+303.37 , -12720.91 , -353.97
+303.37 , -11742.37 , -326.91
+303.37 , -10763.84 , -299.73
+303.37 , -9785.31 , -272.44
+303.37 , -8806.78 , -245.03
+303.37 , -7828.25 , -217.51
+303.37 , -6849.72 , -189.87
+303.37 , -5871.19 , -162.12
+303.37 , -4892.66 , -134.25
+303.37 , -3914.12 , -106.26
+303.37 , -2935.59 , -78.13
+303.37 , -1957.06 , -49.84
+303.37 , -978.53 , -21.19
+303.37 , -195.71 , 0.00
+303.37 , 173.26 , 11.59
+303.37 , 866.29 , 37.10
+303.37 , 1732.57 , 67.98
+303.37 , 2598.86 , 98.85
+303.37 , 3465.15 , 129.79
+303.37 , 4331.43 , 160.84
+303.37 , 5197.72 , 191.99
+303.37 , 6064.01 , 223.26
+303.37 , 6930.29 , 254.64
+303.37 , 7796.58 , 286.14
+303.37 , 8662.87 , 317.75
+303.37 , 9529.15 , 349.48
+303.37 , 10395.44 , 381.32
+303.37 , 11261.73 , 413.28
+303.37 , 12128.01 , 445.36
+303.37 , 12994.30 , 477.54
+303.37 , 13860.59 , 509.85
+303.37 , 14726.87 , 542.27
+303.37 , 15593.16 , 574.80
+303.37 , 16459.45 , 607.45
+303.37 , 17325.73 , 640.21
+337.08 , -19570.62 , -597.26
+337.08 , -18592.09 , -568.28
+337.08 , -17613.56 , -539.16
+337.08 , -16635.03 , -509.90
+337.08 , -15656.50 , -480.50
+337.08 , -14677.97 , -450.96
+337.08 , -13699.44 , -421.28
+337.08 , -12720.91 , -391.47
+337.08 , -11742.37 , -361.52
+337.08 , -10763.84 , -331.43
+337.08 , -9785.31 , -301.20
+337.08 , -8806.78 , -270.83
+337.08 , -7828.25 , -240.33
+337.08 , -6849.72 , -209.68
+337.08 , -5871.19 , -178.90
+337.08 , -4892.66 , -147.97
+337.08 , -3914.12 , -116.90
+337.08 , -2935.59 , -85.66
+337.08 , -1957.06 , -54.21
+337.08 , -978.53 , -22.23
+337.08 , -195.71 , 0.00
+337.08 , 173.26 , 13.60
+337.08 , 866.29 , 42.20
+337.08 , 1732.57 , 76.58
+337.08 , 2598.86 , 110.92
+337.08 , 3465.15 , 145.34
+337.08 , 4331.43 , 179.88
+337.08 , 5197.72 , 214.55
+337.08 , 6064.01 , 249.35
+337.08 , 6930.29 , 284.29
+337.08 , 7796.58 , 319.36
+337.08 , 8662.87 , 354.57
+337.08 , 9529.15 , 389.92
+337.08 , 10395.44 , 425.41
+337.08 , 11261.73 , 461.03
+337.08 , 12128.01 , 496.79
+337.08 , 12994.30 , 532.69
+337.08 , 13860.59 , 568.73
+337.08 , 14726.87 , 604.90
+337.08 , 15593.16 , 641.21
+337.08 , 16459.45 , 677.66
+337.08 , 17325.73 , 714.24
+370.79 , -19570.62 , -653.54
+370.79 , -18592.09 , -621.88
+370.79 , -17613.56 , -590.05
+370.79 , -16635.03 , -558.06
+370.79 , -15656.50 , -525.90
+370.79 , -14677.97 , -493.58
+370.79 , -13699.44 , -461.09
+370.79 , -12720.91 , -428.44
+370.79 , -11742.37 , -395.63
+370.79 , -10763.84 , -362.65
+370.79 , -9785.31 , -329.51
+370.79 , -8806.78 , -296.21
+370.79 , -7828.25 , -262.74
+370.79 , -6849.72 , -229.11
+370.79 , -5871.19 , -195.31
+370.79 , -4892.66 , -161.34
+370.79 , -3914.12 , -127.18
+370.79 , -2935.59 , -92.83
+370.79 , -1957.06 , -58.20
+370.79 , -978.53 , -22.82
+370.79 , -195.71 , 0.00
+370.79 , 173.26 , 15.79
+370.79 , 866.29 , 47.58
+370.79 , 1732.57 , 85.48
+370.79 , 2598.86 , 123.30
+370.79 , 3465.15 , 161.22
+370.79 , 4331.43 , 199.26
+370.79 , 5197.72 , 237.46
+370.79 , 6064.01 , 275.81
+370.79 , 6930.29 , 314.32
+370.79 , 7796.58 , 352.99
+370.79 , 8662.87 , 391.83
+370.79 , 9529.15 , 430.82
+370.79 , 10395.44 , 469.98
+370.79 , 11261.73 , 509.30
+370.79 , 12128.01 , 548.78
+370.79 , 12994.30 , 588.42
+370.79 , 13860.59 , 628.23
+370.79 , 14726.87 , 668.20
+370.79 , 15593.16 , 708.32
+370.79 , 16459.45 , 748.61
+370.79 , 17325.73 , 789.06
+404.50 , -19570.62 , -708.97
+404.50 , -18592.09 , -674.68
+404.50 , -17613.56 , -640.19
+404.50 , -16635.03 , -605.51
+404.50 , -15656.50 , -570.63
+404.50 , -14677.97 , -535.56
+404.50 , -13699.44 , -500.30
+404.50 , -12720.91 , -464.85
+404.50 , -11742.37 , -429.21
+404.50 , -10763.84 , -393.37
+404.50 , -9785.31 , -357.35
+404.50 , -8806.78 , -321.13
+404.50 , -7828.25 , -284.71
+404.50 , -6849.72 , -248.11
+404.50 , -5871.19 , -211.31
+404.50 , -4892.66 , -174.30
+404.50 , -3914.12 , -137.08
+404.50 , -2935.59 , -99.61
+404.50 , -1957.06 , -61.78
+404.50 , -978.53 , -22.86
+404.50 , -195.71 , 0.00
+404.50 , 173.26 , 18.17
+404.50 , 866.29 , 53.24
+404.50 , 1732.57 , 94.71
+404.50 , 2598.86 , 136.03
+404.50 , 3465.15 , 177.45
+404.50 , 4331.43 , 219.01
+404.50 , 5197.72 , 260.75
+404.50 , 6064.01 , 302.67
+404.50 , 6930.29 , 344.78
+404.50 , 7796.58 , 387.07
+404.50 , 8662.87 , 429.54
+404.50 , 9529.15 , 472.21
+404.50 , 10395.44 , 515.06
+404.50 , 11261.73 , 558.11
+404.50 , 12128.01 , 601.34
+404.50 , 12994.30 , 644.76
+404.50 , 13860.59 , 688.37
+404.50 , 14726.87 , 732.17
+404.50 , 15593.16 , 776.15
+404.50 , 16459.45 , 820.33
+404.50 , 17325.73 , 864.69
+438.21 , -19570.62 , -763.53
+438.21 , -18592.09 , -726.65
+438.21 , -17613.56 , -689.55
+438.21 , -16635.03 , -652.22
+438.21 , -15656.50 , -614.67
+438.21 , -14677.97 , -576.89
+438.21 , -13699.44 , -538.89
+438.21 , -12720.91 , -500.67
+438.21 , -11742.37 , -462.22
+438.21 , -10763.84 , -423.56
+438.21 , -9785.31 , -384.67
+438.21 , -8806.78 , -345.56
+438.21 , -7828.25 , -306.22
+438.21 , -6849.72 , -266.66
+438.21 , -5871.19 , -226.86
+438.21 , -4892.66 , -186.83
+438.21 , -3914.12 , -146.54
+438.21 , -2935.59 , -105.95
+438.21 , -1957.06 , -64.90
+438.21 , -978.53 , -22.24
+438.21 , -195.71 , 0.00
+438.21 , 173.26 , 20.74
+438.21 , 866.29 , 59.20
+438.21 , 1732.57 , 104.27
+438.21 , 2598.86 , 149.12
+438.21 , 3465.15 , 194.05
+438.21 , 4331.43 , 239.16
+438.21 , 5197.72 , 284.45
+438.21 , 6064.01 , 329.96
+438.21 , 6930.29 , 375.67
+438.21 , 7796.58 , 421.60
+438.21 , 8662.87 , 467.75
+438.21 , 9529.15 , 514.11
+438.21 , 10395.44 , 560.69
+438.21 , 11261.73 , 607.48
+438.21 , 12128.01 , 654.50
+438.21 , 12994.30 , 701.73
+438.21 , 13860.59 , 749.18
+438.21 , 14726.87 , 796.84
+438.21 , 15593.16 , 844.73
+438.21 , 16459.45 , 892.83
+438.21 , 17325.73 , 941.14
+471.92 , -19570.62 , -817.17
+471.92 , -18592.09 , -777.76
+471.92 , -17613.56 , -738.08
+471.92 , -16635.03 , -698.15
+471.92 , -15656.50 , -657.96
+471.92 , -14677.97 , -617.52
+471.92 , -13699.44 , -576.82
+471.92 , -12720.91 , -535.86
+471.92 , -11742.37 , -494.65
+471.92 , -10763.84 , -453.18
+471.92 , -9785.31 , -411.45
+471.92 , -8806.78 , -369.47
+471.92 , -7828.25 , -327.22
+471.92 , -6849.72 , -284.72
+471.92 , -5871.19 , -241.95
+471.92 , -4892.66 , -198.90
+471.92 , -3914.12 , -155.54
+471.92 , -2935.59 , -111.82
+471.92 , -1957.06 , -67.51
+471.92 , -978.53 , -20.80
+471.92 , -195.71 , 0.00
+471.92 , 173.26 , 23.52
+471.92 , 866.29 , 65.48
+471.92 , 1732.57 , 114.20
+471.92 , 2598.86 , 162.59
+471.92 , 3465.15 , 211.06
+471.92 , 4331.43 , 259.72
+471.92 , 5197.72 , 308.59
+471.92 , 6064.01 , 357.69
+471.92 , 6930.29 , 407.04
+471.92 , 7796.58 , 456.62
+471.92 , 8662.87 , 506.46
+471.92 , 9529.15 , 556.54
+471.92 , 10395.44 , 606.87
+471.92 , 11261.73 , 657.45
+471.92 , 12128.01 , 708.28
+471.92 , 12994.30 , 759.35
+471.92 , 13860.59 , 810.68
+471.92 , 14726.87 , 862.25
+471.92 , 15593.16 , 914.07
+471.92 , 16459.45 , 966.13
+471.92 , 17325.73 , 1018.44
+505.62 , -19570.62 , -869.86
+505.62 , -18592.09 , -827.96
+505.62 , -17613.56 , -785.77
+505.62 , -16635.03 , -743.28
+505.62 , -15656.50 , -700.50
+505.62 , -14677.97 , -657.42
+505.62 , -13699.44 , -614.05
+505.62 , -12720.91 , -570.39
+505.62 , -11742.37 , -526.44
+505.62 , -10763.84 , -482.19
+505.62 , -9785.31 , -437.65
+505.62 , -8806.78 , -392.82
+505.62 , -7828.25 , -347.69
+505.62 , -6849.72 , -302.26
+505.62 , -5871.19 , -256.52
+505.62 , -4892.66 , -210.46
+505.62 , -3914.12 , -164.04
+505.62 , -2935.59 , -117.17
+505.62 , -1957.06 , -69.54
+505.62 , -978.53 , -18.27
+505.62 , -195.71 , 0.00
+505.62 , 173.26 , 26.49
+505.62 , 866.29 , 72.10
+505.62 , 1732.57 , 124.50
+505.62 , 2598.86 , 176.46
+505.62 , 3465.15 , 228.49
+505.62 , 4331.43 , 280.71
+505.62 , 5197.72 , 333.18
+505.62 , 6064.01 , 385.90
+505.62 , 6930.29 , 438.89
+505.62 , 7796.58 , 492.16
+505.62 , 8662.87 , 545.71
+505.62 , 9529.15 , 599.54
+505.62 , 10395.44 , 653.64
+505.62 , 11261.73 , 708.03
+505.62 , 12128.01 , 762.71
+505.62 , 12994.30 , 817.66
+505.62 , 13860.59 , 872.89
+505.62 , 14726.87 , 928.41
+505.62 , 15593.16 , 984.20
+505.62 , 16459.45 , 1040.27
+505.62 , 17325.73 , 1096.63
+539.33 , -19570.62 , -921.56
+539.33 , -18592.09 , -877.23
+539.33 , -17613.56 , -832.56
+539.33 , -16635.03 , -787.56
+539.33 , -15656.50 , -742.22
+539.33 , -14677.97 , -696.56
+539.33 , -13699.44 , -650.56
+539.33 , -12720.91 , -604.23
+539.33 , -11742.37 , -557.56
+539.33 , -10763.84 , -510.57
+539.33 , -9785.31 , -463.24
+539.33 , -8806.78 , -415.58
+539.33 , -7828.25 , -367.58
+539.33 , -6849.72 , -319.24
+539.33 , -5871.19 , -270.55
+539.33 , -4892.66 , -221.48
+539.33 , -3914.12 , -171.99
+539.33 , -2935.59 , -121.95
+539.33 , -1957.06 , -70.93
+539.33 , -978.53 , -14.10
+539.33 , -195.71 , 0.00
+539.33 , 173.26 , 29.68
+539.33 , 866.29 , 79.05
+539.33 , 1732.57 , 135.20
+539.33 , 2598.86 , 190.76
+539.33 , 3465.15 , 246.36
+539.33 , 4331.43 , 302.17
+539.33 , 5197.72 , 358.24
+539.33 , 6064.01 , 414.60
+539.33 , 6930.29 , 471.27
+539.33 , 7796.58 , 528.24
+539.33 , 8662.87 , 585.52
+539.33 , 9529.15 , 643.12
+539.33 , 10395.44 , 701.03
+539.33 , 11261.73 , 759.26
+539.33 , 12128.01 , 817.80
+539.33 , 12994.30 , 876.66
+539.33 , 13860.59 , 935.84
+539.33 , 14726.87 , 995.34
+539.33 , 15593.16 , 1055.15
+539.33 , 16459.45 , 1115.27
+539.33 , 17325.73 , 1175.71
+573.04 , -19570.62 , -972.24
+573.04 , -18592.09 , -925.52
+573.04 , -17613.56 , -878.43
+573.04 , -16635.03 , -830.96
+573.04 , -15656.50 , -783.11
+573.04 , -14677.97 , -734.89
+573.04 , -13699.44 , -686.30
+573.04 , -12720.91 , -637.33
+573.04 , -11742.37 , -587.99
+573.04 , -10763.84 , -538.28
+573.04 , -9785.31 , -488.19
+573.04 , -8806.78 , -437.72
+573.04 , -7828.25 , -386.87
+573.04 , -6849.72 , -335.63
+573.04 , -5871.19 , -283.99
+573.04 , -4892.66 , -231.92
+573.04 , -3914.12 , -179.35
+573.04 , -2935.59 , -126.12
+573.04 , -1957.06 , -71.60
+573.04 , -978.53 , -6.45
+573.04 , -195.71 , 0.00
+573.04 , 173.26 , 33.08
+573.04 , 866.29 , 86.37
+573.04 , 1732.57 , 146.31
+573.04 , 2598.86 , 205.50
+573.04 , 3465.15 , 264.70
+573.04 , 4331.43 , 324.11
+573.04 , 5197.72 , 383.81
+573.04 , 6064.01 , 443.83
+573.04 , 6930.29 , 504.18
+573.04 , 7796.58 , 564.87
+573.04 , 8662.87 , 625.91
+573.04 , 9529.15 , 687.30
+573.04 , 10395.44 , 749.05
+573.04 , 11261.73 , 811.14
+573.04 , 12128.01 , 873.59
+573.04 , 12994.30 , 936.40
+573.04 , 13860.59 , 999.56
+573.04 , 14726.87 , 1063.07
+573.04 , 15593.16 , 1126.93
+573.04 , 16459.45 , 1191.14
+573.04 , 17325.73 , 1255.71
+606.75 , -19570.62 , -1021.86
+606.75 , -18592.09 , -972.81
+606.75 , -17613.56 , -923.33
+606.75 , -16635.03 , -873.44
+606.75 , -15656.50 , -823.13
+606.75 , -14677.97 , -772.39
+606.75 , -13699.44 , -721.24
+606.75 , -12720.91 , -669.67
+606.75 , -11742.37 , -617.68
+606.75 , -10763.84 , -565.27
+606.75 , -9785.31 , -512.45
+606.75 , -8806.78 , -459.19
+606.75 , -7828.25 , -405.51
+606.75 , -6849.72 , -351.39
+606.75 , -5871.19 , -296.81
+606.75 , -4892.66 , -241.73
+606.75 , -3914.12 , -186.07
+606.75 , -2935.59 , -129.61
+606.75 , -1957.06 , -71.46
+606.75 , -978.53 , 0.00
+606.75 , -195.71 , 0.00
+606.75 , 173.26 , 36.70
+606.75 , 866.29 , 94.04
+606.75 , 1732.57 , 157.85
+606.75 , 2598.86 , 220.70
+606.75 , 3465.15 , 283.52
+606.75 , 4331.43 , 346.56
+606.75 , 5197.72 , 409.90
+606.75 , 6064.01 , 473.59
+606.75 , 6930.29 , 537.65
+606.75 , 7796.58 , 602.09
+606.75 , 8662.87 , 666.91
+606.75 , 9529.15 , 732.12
+606.75 , 10395.44 , 797.72
+606.75 , 11261.73 , 863.72
+606.75 , 12128.01 , 930.10
+606.75 , 12994.30 , 996.88
+606.75 , 13860.59 , 1064.05
+606.75 , 14726.87 , 1131.62
+606.75 , 15593.16 , 1199.57
+606.75 , 16459.45 , 1267.92
+606.75 , 17325.73 , 1336.65
+640.46 , -19570.62 , -1070.37
+640.46 , -18592.09 , -1019.04
+640.46 , -17613.56 , -967.24
+640.46 , -16635.03 , -914.96
+640.46 , -15656.50 , -862.23
+640.46 , -14677.97 , -809.02
+640.46 , -13699.44 , -755.35
+640.46 , -12720.91 , -701.21
+640.46 , -11742.37 , -646.60
+640.46 , -10763.84 , -591.53
+640.46 , -9785.31 , -535.99
+640.46 , -8806.78 , -479.97
+640.46 , -7828.25 , -423.47
+640.46 , -6849.72 , -366.48
+640.46 , -5871.19 , -308.96
+640.46 , -4892.66 , -250.88
+640.46 , -3914.12 , -192.11
+640.46 , -2935.59 , -132.36
+640.46 , -1957.06 , -70.38
+640.46 , -978.53 , 0.00
+640.46 , -195.71 , 0.00
+640.46 , 173.26 , 40.53
+640.46 , 866.29 , 102.10
+640.46 , 1732.57 , 169.83
+640.46 , 2598.86 , 236.37
+640.46 , 3465.15 , 302.84
+640.46 , 4331.43 , 369.53
+640.46 , 5197.72 , 436.54
+640.46 , 6064.01 , 503.92
+640.46 , 6930.29 , 571.71
+640.46 , 7796.58 , 639.91
+640.46 , 8662.87 , 708.54
+640.46 , 9529.15 , 777.59
+640.46 , 10395.44 , 847.08
+640.46 , 11261.73 , 917.00
+640.46 , 12128.01 , 987.35
+640.46 , 12994.30 , 1058.14
+640.46 , 13860.59 , 1129.36
+640.46 , 14726.87 , 1201.01
+640.46 , 15593.16 , 1273.09
+640.46 , 16459.45 , 1345.61
+640.46 , 17325.73 , 1418.56
+674.17 , -19570.62 , -1117.74
+674.17 , -18592.09 , -1064.18
+674.17 , -17613.56 , -1010.10
+674.17 , -16635.03 , -955.49
+674.17 , -15656.50 , -900.37
+674.17 , -14677.97 , -844.73
+674.17 , -13699.44 , -788.58
+674.17 , -12720.91 , -731.90
+674.17 , -11742.37 , -674.71
+674.17 , -10763.84 , -617.00
+674.17 , -9785.31 , -558.77
+674.17 , -8806.78 , -500.01
+674.17 , -7828.25 , -440.71
+674.17 , -6849.72 , -380.85
+674.17 , -5871.19 , -320.40
+674.17 , -4892.66 , -259.31
+674.17 , -3914.12 , -197.41
+674.17 , -2935.59 , -134.30
+674.17 , -1957.06 , -68.24
+674.17 , -978.53 , 0.00
+674.17 , -195.71 , 0.00
+674.17 , 173.26 , 44.59
+674.17 , 866.29 , 110.53
+674.17 , 1732.57 , 182.27
+674.17 , 2598.86 , 252.55
+674.17 , 3465.15 , 322.69
+674.17 , 4331.43 , 393.04
+674.17 , 5197.72 , 463.74
+674.17 , 6064.01 , 534.84
+674.17 , 6930.29 , 606.37
+674.17 , 7796.58 , 678.37
+674.17 , 8662.87 , 750.82
+674.17 , 9529.15 , 823.74
+674.17 , 10395.44 , 897.14
+674.17 , 11261.73 , 971.01
+674.17 , 12128.01 , 1045.36
+674.17 , 12994.30 , 1120.19
+674.17 , 13860.59 , 1195.49
+674.17 , 14726.87 , 1271.27
+674.17 , 15593.16 , 1347.52
+674.17 , 16459.45 , 1424.25
+674.17 , 17325.73 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_3.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..07feb55aeb84a3946955f362d5131493fe83d565
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -11414.26 , 0.00
+0.00 , -10843.55 , 0.00
+0.00 , -10272.84 , 0.00
+0.00 , -9702.12 , 0.00
+0.00 , -9131.41 , 0.00
+0.00 , -8560.70 , 0.00
+0.00 , -7989.99 , -0.13
+0.00 , -7419.27 , -0.66
+0.00 , -6848.56 , -0.98
+0.00 , -6277.85 , -1.19
+0.00 , -5707.13 , -1.32
+0.00 , -5136.42 , -1.38
+0.00 , -4565.71 , -1.39
+0.00 , -3994.99 , -1.35
+0.00 , -3424.28 , -1.26
+0.00 , -2853.57 , -1.13
+0.00 , -2282.85 , -0.97
+0.00 , -1712.14 , -0.77
+0.00 , -1141.43 , -0.53
+0.00 , -570.71 , -0.27
+0.00 , -114.14 , -0.02
+0.00 , 103.14 , 0.13
+0.00 , 515.72 , 0.56
+0.00 , 1031.44 , 1.12
+0.00 , 1547.16 , 1.70
+0.00 , 2062.88 , 2.31
+0.00 , 2578.60 , 2.93
+0.00 , 3094.32 , 3.58
+0.00 , 3610.04 , 4.25
+0.00 , 4125.76 , 4.93
+0.00 , 4641.48 , 5.64
+0.00 , 5157.20 , 6.37
+0.00 , 5672.91 , 7.12
+0.00 , 6188.63 , 7.88
+0.00 , 6704.35 , 8.67
+0.00 , 7220.07 , 9.47
+0.00 , 7735.79 , 10.29
+0.00 , 8251.51 , 11.13
+0.00 , 8767.23 , 11.99
+0.00 , 9282.95 , 12.87
+0.00 , 9798.67 , 13.76
+0.00 , 10314.39 , 14.67
+5.72 , -11414.26 , 0.00
+5.72 , -10843.55 , 0.00
+5.72 , -10272.84 , 0.00
+5.72 , -9702.12 , 0.00
+5.72 , -9131.41 , 0.00
+5.72 , -8560.70 , 0.00
+5.72 , -7989.99 , -0.50
+5.72 , -7419.27 , -0.84
+5.72 , -6848.56 , -1.04
+5.72 , -6277.85 , -1.16
+5.72 , -5707.13 , -1.22
+5.72 , -5136.42 , -1.24
+5.72 , -4565.71 , -1.21
+5.72 , -3994.99 , -1.15
+5.72 , -3424.28 , -1.06
+5.72 , -2853.57 , -0.94
+5.72 , -2282.85 , -0.80
+5.72 , -1712.14 , -0.62
+5.72 , -1141.43 , -0.43
+5.72 , -570.71 , -0.21
+5.72 , -114.14 , -0.02
+5.72 , 103.14 , 0.10
+5.72 , 515.72 , 0.43
+5.72 , 1031.44 , 0.85
+5.72 , 1547.16 , 1.30
+5.72 , 2062.88 , 1.75
+5.72 , 2578.60 , 2.23
+5.72 , 3094.32 , 2.71
+5.72 , 3610.04 , 3.21
+5.72 , 4125.76 , 3.73
+5.72 , 4641.48 , 4.26
+5.72 , 5157.20 , 4.80
+5.72 , 5672.91 , 5.36
+5.72 , 6188.63 , 5.93
+5.72 , 6704.35 , 6.52
+5.72 , 7220.07 , 7.12
+5.72 , 7735.79 , 7.73
+5.72 , 8251.51 , 8.35
+5.72 , 8767.23 , 8.99
+5.72 , 9282.95 , 9.64
+5.72 , 9798.67 , 10.30
+5.72 , 10314.39 , 10.98
+57.21 , -11414.26 , -58.10
+57.21 , -10843.55 , -55.37
+57.21 , -10272.84 , -52.62
+57.21 , -9702.12 , -49.85
+57.21 , -9131.41 , -47.06
+57.21 , -8560.70 , -44.25
+57.21 , -7989.99 , -41.42
+57.21 , -7419.27 , -38.57
+57.21 , -6848.56 , -35.70
+57.21 , -6277.85 , -32.81
+57.21 , -5707.13 , -29.90
+57.21 , -5136.42 , -26.98
+57.21 , -4565.71 , -24.03
+57.21 , -3994.99 , -21.07
+57.21 , -3424.28 , -18.08
+57.21 , -2853.57 , -15.08
+57.21 , -2282.85 , -12.06
+57.21 , -1712.14 , -9.02
+57.21 , -1141.43 , -5.96
+57.21 , -570.71 , -2.88
+57.21 , -114.14 , -0.37
+57.21 , 103.14 , 0.90
+57.21 , 515.72 , 3.68
+57.21 , 1031.44 , 7.16
+57.21 , 1547.16 , 10.66
+57.21 , 2062.88 , 14.17
+57.21 , 2578.60 , 17.71
+57.21 , 3094.32 , 21.26
+57.21 , 3610.04 , 24.84
+57.21 , 4125.76 , 28.43
+57.21 , 4641.48 , 32.04
+57.21 , 5157.20 , 35.67
+57.21 , 5672.91 , 39.32
+57.21 , 6188.63 , 42.99
+57.21 , 6704.35 , 46.68
+57.21 , 7220.07 , 50.38
+57.21 , 7735.79 , 54.11
+57.21 , 8251.51 , 57.85
+57.21 , 8767.23 , 61.61
+57.21 , 9282.95 , 65.39
+57.21 , 9798.67 , 69.19
+57.21 , 10314.39 , 73.01
+114.41 , -11414.26 , -120.57
+114.41 , -10843.55 , -114.73
+114.41 , -10272.84 , -108.87
+114.41 , -9702.12 , -102.99
+114.41 , -9131.41 , -97.08
+114.41 , -8560.70 , -91.15
+114.41 , -7989.99 , -85.20
+114.41 , -7419.27 , -79.23
+114.41 , -6848.56 , -73.23
+114.41 , -6277.85 , -67.21
+114.41 , -5707.13 , -61.17
+114.41 , -5136.42 , -55.10
+114.41 , -4565.71 , -49.01
+114.41 , -3994.99 , -42.90
+114.41 , -3424.28 , -36.77
+114.41 , -2853.57 , -30.61
+114.41 , -2282.85 , -24.43
+114.41 , -1712.14 , -18.23
+114.41 , -1141.43 , -12.01
+114.41 , -570.71 , -5.76
+114.41 , -114.14 , -0.66
+114.41 , 103.14 , 1.84
+114.41 , 515.72 , 7.35
+114.41 , 1031.44 , 14.22
+114.41 , 1547.16 , 21.11
+114.41 , 2062.88 , 28.02
+114.41 , 2578.60 , 34.96
+114.41 , 3094.32 , 41.92
+114.41 , 3610.04 , 48.90
+114.41 , 4125.76 , 55.90
+114.41 , 4641.48 , 62.93
+114.41 , 5157.20 , 69.98
+114.41 , 5672.91 , 77.05
+114.41 , 6188.63 , 84.15
+114.41 , 6704.35 , 91.27
+114.41 , 7220.07 , 98.41
+114.41 , 7735.79 , 105.58
+114.41 , 8251.51 , 112.76
+114.41 , 8767.23 , 119.97
+114.41 , 9282.95 , 127.21
+114.41 , 9798.67 , 134.46
+114.41 , 10314.39 , 141.74
+171.62 , -11414.26 , -182.44
+171.62 , -10843.55 , -173.55
+171.62 , -10272.84 , -164.62
+171.62 , -9702.12 , -155.67
+171.62 , -9131.41 , -146.69
+171.62 , -8560.70 , -137.68
+171.62 , -7989.99 , -128.65
+171.62 , -7419.27 , -119.58
+171.62 , -6848.56 , -110.49
+171.62 , -6277.85 , -101.36
+171.62 , -5707.13 , -92.21
+171.62 , -5136.42 , -83.03
+171.62 , -4565.71 , -73.82
+171.62 , -3994.99 , -64.58
+171.62 , -3424.28 , -55.31
+171.62 , -2853.57 , -46.02
+171.62 , -2282.85 , -36.70
+171.62 , -1712.14 , -27.34
+171.62 , -1141.43 , -17.96
+171.62 , -570.71 , -8.54
+171.62 , -114.14 , -0.79
+171.62 , 103.14 , 2.86
+171.62 , 515.72 , 11.12
+171.62 , 1031.44 , 21.39
+171.62 , 1547.16 , 31.68
+171.62 , 2062.88 , 41.99
+171.62 , 2578.60 , 52.34
+171.62 , 3094.32 , 62.71
+171.62 , 3610.04 , 73.12
+171.62 , 4125.76 , 83.55
+171.62 , 4641.48 , 94.01
+171.62 , 5157.20 , 104.50
+171.62 , 5672.91 , 115.02
+171.62 , 6188.63 , 125.57
+171.62 , 6704.35 , 136.15
+171.62 , 7220.07 , 146.76
+171.62 , 7735.79 , 157.40
+171.62 , 8251.51 , 168.06
+171.62 , 8767.23 , 178.76
+171.62 , 9282.95 , 189.48
+171.62 , 9798.67 , 200.23
+171.62 , 10314.39 , 211.02
+228.82 , -11414.26 , -243.71
+228.82 , -10843.55 , -231.81
+228.82 , -10272.84 , -219.87
+228.82 , -9702.12 , -207.89
+228.82 , -9131.41 , -195.88
+228.82 , -8560.70 , -183.83
+228.82 , -7989.99 , -171.74
+228.82 , -7419.27 , -159.61
+228.82 , -6848.56 , -147.45
+228.82 , -6277.85 , -135.25
+228.82 , -5707.13 , -123.01
+228.82 , -5136.42 , -110.74
+228.82 , -4565.71 , -98.43
+228.82 , -3994.99 , -86.08
+228.82 , -3424.28 , -73.70
+228.82 , -2853.57 , -61.27
+228.82 , -2282.85 , -48.82
+228.82 , -1712.14 , -36.32
+228.82 , -1141.43 , -23.78
+228.82 , -570.71 , -11.19
+228.82 , -114.14 , -0.63
+228.82 , 103.14 , 3.98
+228.82 , 515.72 , 15.01
+228.82 , 1031.44 , 28.68
+228.82 , 1547.16 , 42.37
+228.82 , 2062.88 , 56.10
+228.82 , 2578.60 , 69.87
+228.82 , 3094.32 , 83.67
+228.82 , 3610.04 , 97.52
+228.82 , 4125.76 , 111.40
+228.82 , 4641.48 , 125.31
+228.82 , 5157.20 , 139.27
+228.82 , 5672.91 , 153.26
+228.82 , 6188.63 , 167.29
+228.82 , 6704.35 , 181.36
+228.82 , 7220.07 , 195.46
+228.82 , 7735.79 , 209.61
+228.82 , 8251.51 , 223.79
+228.82 , 8767.23 , 238.01
+228.82 , 9282.95 , 252.26
+228.82 , 9798.67 , 266.56
+228.82 , 10314.39 , 280.89
+286.03 , -11414.26 , -304.37
+286.03 , -10843.55 , -289.50
+286.03 , -10272.84 , -274.59
+286.03 , -9702.12 , -259.63
+286.03 , -9131.41 , -244.61
+286.03 , -8560.70 , -229.56
+286.03 , -7989.99 , -214.45
+286.03 , -7419.27 , -199.30
+286.03 , -6848.56 , -184.10
+286.03 , -6277.85 , -168.85
+286.03 , -5707.13 , -153.55
+286.03 , -5136.42 , -138.20
+286.03 , -4565.71 , -122.81
+286.03 , -3994.99 , -107.37
+286.03 , -3424.28 , -91.88
+286.03 , -2853.57 , -76.35
+286.03 , -2282.85 , -60.76
+286.03 , -1712.14 , -45.13
+286.03 , -1141.43 , -29.44
+286.03 , -570.71 , -13.67
+286.03 , -114.14 , 0.00
+286.03 , 103.14 , 5.21
+286.03 , 515.72 , 19.04
+286.03 , 1031.44 , 36.13
+286.03 , 1547.16 , 53.24
+286.03 , 2062.88 , 70.39
+286.03 , 2578.60 , 87.59
+286.03 , 3094.32 , 104.83
+286.03 , 3610.04 , 122.13
+286.03 , 4125.76 , 139.47
+286.03 , 4641.48 , 156.87
+286.03 , 5157.20 , 174.31
+286.03 , 5672.91 , 191.80
+286.03 , 6188.63 , 209.33
+286.03 , 6704.35 , 226.92
+286.03 , 7220.07 , 244.56
+286.03 , 7735.79 , 262.24
+286.03 , 8251.51 , 279.97
+286.03 , 8767.23 , 297.76
+286.03 , 9282.95 , 315.58
+286.03 , 9798.67 , 333.46
+286.03 , 10314.39 , 351.39
+343.23 , -11414.26 , -364.37
+343.23 , -10843.55 , -346.59
+343.23 , -10272.84 , -328.74
+343.23 , -9702.12 , -310.84
+343.23 , -9131.41 , -292.87
+343.23 , -8560.70 , -274.84
+343.23 , -7989.99 , -256.75
+343.23 , -7419.27 , -238.60
+343.23 , -6848.56 , -220.39
+343.23 , -6277.85 , -202.12
+343.23 , -5707.13 , -183.79
+343.23 , -5136.42 , -165.40
+343.23 , -4565.71 , -146.94
+343.23 , -3994.99 , -128.43
+343.23 , -3424.28 , -109.85
+343.23 , -2853.57 , -91.21
+343.23 , -2282.85 , -72.51
+343.23 , -1712.14 , -53.75
+343.23 , -1141.43 , -34.91
+343.23 , -570.71 , -15.95
+343.23 , -114.14 , 0.00
+343.23 , 103.14 , 6.58
+343.23 , 515.72 , 23.25
+343.23 , 1031.44 , 43.76
+343.23 , 1547.16 , 64.29
+343.23 , 2062.88 , 84.87
+343.23 , 2578.60 , 105.52
+343.23 , 3094.32 , 126.22
+343.23 , 3610.04 , 146.98
+343.23 , 4125.76 , 167.81
+343.23 , 4641.48 , 188.70
+343.23 , 5157.20 , 209.65
+343.23 , 5672.91 , 230.66
+343.23 , 6188.63 , 251.73
+343.23 , 6704.35 , 272.87
+343.23 , 7220.07 , 294.07
+343.23 , 7735.79 , 315.33
+343.23 , 8251.51 , 336.65
+343.23 , 8767.23 , 358.03
+343.23 , 9282.95 , 379.47
+343.23 , 9798.67 , 400.98
+343.23 , 10314.39 , 422.54
+400.44 , -11414.26 , -423.69
+400.44 , -10843.55 , -403.04
+400.44 , -10272.84 , -382.31
+400.44 , -9702.12 , -361.50
+400.44 , -9131.41 , -340.62
+400.44 , -8560.70 , -319.66
+400.44 , -7989.99 , -298.62
+400.44 , -7419.27 , -277.51
+400.44 , -6848.56 , -256.31
+400.44 , -6277.85 , -235.05
+400.44 , -5707.13 , -213.70
+400.44 , -5136.42 , -192.28
+400.44 , -4565.71 , -170.79
+400.44 , -3994.99 , -149.21
+400.44 , -3424.28 , -127.57
+400.44 , -2853.57 , -105.84
+400.44 , -2282.85 , -84.03
+400.44 , -1712.14 , -62.14
+400.44 , -1141.43 , -40.16
+400.44 , -570.71 , -18.00
+400.44 , -114.14 , 0.00
+400.44 , 103.14 , 8.09
+400.44 , 515.72 , 27.64
+400.44 , 1031.44 , 51.59
+400.44 , 1547.16 , 75.56
+400.44 , 2062.88 , 99.58
+400.44 , 2578.60 , 123.68
+400.44 , 3094.32 , 147.86
+400.44 , 3610.04 , 172.10
+400.44 , 4125.76 , 196.43
+400.44 , 4641.48 , 220.84
+400.44 , 5157.20 , 245.32
+400.44 , 5672.91 , 269.88
+400.44 , 6188.63 , 294.51
+400.44 , 6704.35 , 319.23
+400.44 , 7220.07 , 344.02
+400.44 , 7735.79 , 368.89
+400.44 , 8251.51 , 393.83
+400.44 , 8767.23 , 418.85
+400.44 , 9282.95 , 443.95
+400.44 , 9798.67 , 469.13
+400.44 , 10314.39 , 494.38
+457.64 , -11414.26 , -482.31
+457.64 , -10843.55 , -458.83
+457.64 , -10272.84 , -435.26
+457.64 , -9702.12 , -411.59
+457.64 , -9131.41 , -387.83
+457.64 , -8560.70 , -363.97
+457.64 , -7989.99 , -340.02
+457.64 , -7419.27 , -315.97
+457.64 , -6848.56 , -291.83
+457.64 , -6277.85 , -267.59
+457.64 , -5707.13 , -243.26
+457.64 , -5136.42 , -218.84
+457.64 , -4565.71 , -194.32
+457.64 , -3994.99 , -169.71
+457.64 , -3424.28 , -145.00
+457.64 , -2853.57 , -120.19
+457.64 , -2282.85 , -95.29
+457.64 , -1712.14 , -70.28
+457.64 , -1141.43 , -45.14
+457.64 , -570.71 , -19.76
+457.64 , -114.14 , 0.00
+457.64 , 103.14 , 9.76
+457.64 , 515.72 , 32.25
+457.64 , 1031.44 , 59.66
+457.64 , 1547.16 , 87.07
+457.64 , 2062.88 , 114.55
+457.64 , 2578.60 , 142.11
+457.64 , 3094.32 , 169.77
+457.64 , 3610.04 , 197.52
+457.64 , 4125.76 , 225.37
+457.64 , 4641.48 , 253.31
+457.64 , 5157.20 , 281.34
+457.64 , 5672.91 , 309.47
+457.64 , 6188.63 , 337.70
+457.64 , 6704.35 , 366.02
+457.64 , 7220.07 , 394.44
+457.64 , 7735.79 , 422.95
+457.64 , 8251.51 , 451.56
+457.64 , 8767.23 , 480.26
+457.64 , 9282.95 , 509.05
+457.64 , 9798.67 , 537.94
+457.64 , 10314.39 , 566.93
+514.85 , -11414.26 , -540.17
+514.85 , -10843.55 , -513.92
+514.85 , -10272.84 , -487.55
+514.85 , -9702.12 , -461.06
+514.85 , -9131.41 , -434.46
+514.85 , -8560.70 , -407.75
+514.85 , -7989.99 , -380.92
+514.85 , -7419.27 , -353.97
+514.85 , -6848.56 , -326.91
+514.85 , -6277.85 , -299.73
+514.85 , -5707.13 , -272.44
+514.85 , -5136.42 , -245.03
+514.85 , -4565.71 , -217.51
+514.85 , -3994.99 , -189.87
+514.85 , -3424.28 , -162.12
+514.85 , -2853.57 , -134.25
+514.85 , -2282.85 , -106.26
+514.85 , -1712.14 , -78.13
+514.85 , -1141.43 , -49.84
+514.85 , -570.71 , -21.19
+514.85 , -114.14 , 0.00
+514.85 , 103.14 , 11.59
+514.85 , 515.72 , 37.10
+514.85 , 1031.44 , 67.98
+514.85 , 1547.16 , 98.85
+514.85 , 2062.88 , 129.79
+514.85 , 2578.60 , 160.84
+514.85 , 3094.32 , 191.99
+514.85 , 3610.04 , 223.26
+514.85 , 4125.76 , 254.64
+514.85 , 4641.48 , 286.14
+514.85 , 5157.20 , 317.75
+514.85 , 5672.91 , 349.48
+514.85 , 6188.63 , 381.32
+514.85 , 6704.35 , 413.28
+514.85 , 7220.07 , 445.36
+514.85 , 7735.79 , 477.54
+514.85 , 8251.51 , 509.85
+514.85 , 8767.23 , 542.27
+514.85 , 9282.95 , 574.80
+514.85 , 9798.67 , 607.45
+514.85 , 10314.39 , 640.21
+572.06 , -11414.26 , -597.26
+572.06 , -10843.55 , -568.28
+572.06 , -10272.84 , -539.16
+572.06 , -9702.12 , -509.90
+572.06 , -9131.41 , -480.50
+572.06 , -8560.70 , -450.96
+572.06 , -7989.99 , -421.28
+572.06 , -7419.27 , -391.47
+572.06 , -6848.56 , -361.52
+572.06 , -6277.85 , -331.43
+572.06 , -5707.13 , -301.20
+572.06 , -5136.42 , -270.83
+572.06 , -4565.71 , -240.33
+572.06 , -3994.99 , -209.68
+572.06 , -3424.28 , -178.90
+572.06 , -2853.57 , -147.97
+572.06 , -2282.85 , -116.90
+572.06 , -1712.14 , -85.66
+572.06 , -1141.43 , -54.21
+572.06 , -570.71 , -22.23
+572.06 , -114.14 , 0.00
+572.06 , 103.14 , 13.60
+572.06 , 515.72 , 42.20
+572.06 , 1031.44 , 76.58
+572.06 , 1547.16 , 110.92
+572.06 , 2062.88 , 145.34
+572.06 , 2578.60 , 179.88
+572.06 , 3094.32 , 214.55
+572.06 , 3610.04 , 249.35
+572.06 , 4125.76 , 284.29
+572.06 , 4641.48 , 319.36
+572.06 , 5157.20 , 354.57
+572.06 , 5672.91 , 389.92
+572.06 , 6188.63 , 425.41
+572.06 , 6704.35 , 461.03
+572.06 , 7220.07 , 496.79
+572.06 , 7735.79 , 532.69
+572.06 , 8251.51 , 568.73
+572.06 , 8767.23 , 604.90
+572.06 , 9282.95 , 641.21
+572.06 , 9798.67 , 677.66
+572.06 , 10314.39 , 714.24
+629.26 , -11414.26 , -653.54
+629.26 , -10843.55 , -621.88
+629.26 , -10272.84 , -590.05
+629.26 , -9702.12 , -558.06
+629.26 , -9131.41 , -525.90
+629.26 , -8560.70 , -493.58
+629.26 , -7989.99 , -461.09
+629.26 , -7419.27 , -428.44
+629.26 , -6848.56 , -395.63
+629.26 , -6277.85 , -362.65
+629.26 , -5707.13 , -329.51
+629.26 , -5136.42 , -296.21
+629.26 , -4565.71 , -262.74
+629.26 , -3994.99 , -229.11
+629.26 , -3424.28 , -195.31
+629.26 , -2853.57 , -161.34
+629.26 , -2282.85 , -127.18
+629.26 , -1712.14 , -92.83
+629.26 , -1141.43 , -58.20
+629.26 , -570.71 , -22.82
+629.26 , -114.14 , 0.00
+629.26 , 103.14 , 15.79
+629.26 , 515.72 , 47.58
+629.26 , 1031.44 , 85.48
+629.26 , 1547.16 , 123.30
+629.26 , 2062.88 , 161.22
+629.26 , 2578.60 , 199.26
+629.26 , 3094.32 , 237.46
+629.26 , 3610.04 , 275.81
+629.26 , 4125.76 , 314.32
+629.26 , 4641.48 , 352.99
+629.26 , 5157.20 , 391.83
+629.26 , 5672.91 , 430.82
+629.26 , 6188.63 , 469.98
+629.26 , 6704.35 , 509.30
+629.26 , 7220.07 , 548.78
+629.26 , 7735.79 , 588.42
+629.26 , 8251.51 , 628.23
+629.26 , 8767.23 , 668.20
+629.26 , 9282.95 , 708.32
+629.26 , 9798.67 , 748.61
+629.26 , 10314.39 , 789.06
+686.47 , -11414.26 , -708.97
+686.47 , -10843.55 , -674.68
+686.47 , -10272.84 , -640.19
+686.47 , -9702.12 , -605.51
+686.47 , -9131.41 , -570.63
+686.47 , -8560.70 , -535.56
+686.47 , -7989.99 , -500.30
+686.47 , -7419.27 , -464.85
+686.47 , -6848.56 , -429.21
+686.47 , -6277.85 , -393.37
+686.47 , -5707.13 , -357.35
+686.47 , -5136.42 , -321.13
+686.47 , -4565.71 , -284.71
+686.47 , -3994.99 , -248.11
+686.47 , -3424.28 , -211.31
+686.47 , -2853.57 , -174.30
+686.47 , -2282.85 , -137.08
+686.47 , -1712.14 , -99.61
+686.47 , -1141.43 , -61.78
+686.47 , -570.71 , -22.86
+686.47 , -114.14 , 0.00
+686.47 , 103.14 , 18.17
+686.47 , 515.72 , 53.24
+686.47 , 1031.44 , 94.71
+686.47 , 1547.16 , 136.03
+686.47 , 2062.88 , 177.45
+686.47 , 2578.60 , 219.01
+686.47 , 3094.32 , 260.75
+686.47 , 3610.04 , 302.67
+686.47 , 4125.76 , 344.78
+686.47 , 4641.48 , 387.07
+686.47 , 5157.20 , 429.54
+686.47 , 5672.91 , 472.21
+686.47 , 6188.63 , 515.06
+686.47 , 6704.35 , 558.11
+686.47 , 7220.07 , 601.34
+686.47 , 7735.79 , 644.76
+686.47 , 8251.51 , 688.37
+686.47 , 8767.23 , 732.17
+686.47 , 9282.95 , 776.15
+686.47 , 9798.67 , 820.33
+686.47 , 10314.39 , 864.69
+743.67 , -11414.26 , -763.53
+743.67 , -10843.55 , -726.65
+743.67 , -10272.84 , -689.55
+743.67 , -9702.12 , -652.22
+743.67 , -9131.41 , -614.67
+743.67 , -8560.70 , -576.89
+743.67 , -7989.99 , -538.89
+743.67 , -7419.27 , -500.67
+743.67 , -6848.56 , -462.22
+743.67 , -6277.85 , -423.56
+743.67 , -5707.13 , -384.67
+743.67 , -5136.42 , -345.56
+743.67 , -4565.71 , -306.22
+743.67 , -3994.99 , -266.66
+743.67 , -3424.28 , -226.86
+743.67 , -2853.57 , -186.83
+743.67 , -2282.85 , -146.54
+743.67 , -1712.14 , -105.95
+743.67 , -1141.43 , -64.90
+743.67 , -570.71 , -22.24
+743.67 , -114.14 , 0.00
+743.67 , 103.14 , 20.74
+743.67 , 515.72 , 59.20
+743.67 , 1031.44 , 104.27
+743.67 , 1547.16 , 149.12
+743.67 , 2062.88 , 194.05
+743.67 , 2578.60 , 239.16
+743.67 , 3094.32 , 284.45
+743.67 , 3610.04 , 329.96
+743.67 , 4125.76 , 375.67
+743.67 , 4641.48 , 421.60
+743.67 , 5157.20 , 467.75
+743.67 , 5672.91 , 514.11
+743.67 , 6188.63 , 560.69
+743.67 , 6704.35 , 607.48
+743.67 , 7220.07 , 654.50
+743.67 , 7735.79 , 701.73
+743.67 , 8251.51 , 749.18
+743.67 , 8767.23 , 796.84
+743.67 , 9282.95 , 844.73
+743.67 , 9798.67 , 892.83
+743.67 , 10314.39 , 941.14
+800.88 , -11414.26 , -817.17
+800.88 , -10843.55 , -777.76
+800.88 , -10272.84 , -738.08
+800.88 , -9702.12 , -698.15
+800.88 , -9131.41 , -657.96
+800.88 , -8560.70 , -617.52
+800.88 , -7989.99 , -576.82
+800.88 , -7419.27 , -535.86
+800.88 , -6848.56 , -494.65
+800.88 , -6277.85 , -453.18
+800.88 , -5707.13 , -411.45
+800.88 , -5136.42 , -369.47
+800.88 , -4565.71 , -327.22
+800.88 , -3994.99 , -284.72
+800.88 , -3424.28 , -241.95
+800.88 , -2853.57 , -198.90
+800.88 , -2282.85 , -155.54
+800.88 , -1712.14 , -111.82
+800.88 , -1141.43 , -67.51
+800.88 , -570.71 , -20.80
+800.88 , -114.14 , 0.00
+800.88 , 103.14 , 23.52
+800.88 , 515.72 , 65.48
+800.88 , 1031.44 , 114.20
+800.88 , 1547.16 , 162.59
+800.88 , 2062.88 , 211.06
+800.88 , 2578.60 , 259.72
+800.88 , 3094.32 , 308.59
+800.88 , 3610.04 , 357.69
+800.88 , 4125.76 , 407.04
+800.88 , 4641.48 , 456.62
+800.88 , 5157.20 , 506.46
+800.88 , 5672.91 , 556.54
+800.88 , 6188.63 , 606.87
+800.88 , 6704.35 , 657.45
+800.88 , 7220.07 , 708.28
+800.88 , 7735.79 , 759.35
+800.88 , 8251.51 , 810.68
+800.88 , 8767.23 , 862.25
+800.88 , 9282.95 , 914.07
+800.88 , 9798.67 , 966.13
+800.88 , 10314.39 , 1018.44
+858.08 , -11414.26 , -869.86
+858.08 , -10843.55 , -827.96
+858.08 , -10272.84 , -785.77
+858.08 , -9702.12 , -743.28
+858.08 , -9131.41 , -700.50
+858.08 , -8560.70 , -657.42
+858.08 , -7989.99 , -614.05
+858.08 , -7419.27 , -570.39
+858.08 , -6848.56 , -526.44
+858.08 , -6277.85 , -482.19
+858.08 , -5707.13 , -437.65
+858.08 , -5136.42 , -392.82
+858.08 , -4565.71 , -347.69
+858.08 , -3994.99 , -302.26
+858.08 , -3424.28 , -256.52
+858.08 , -2853.57 , -210.46
+858.08 , -2282.85 , -164.04
+858.08 , -1712.14 , -117.17
+858.08 , -1141.43 , -69.54
+858.08 , -570.71 , -18.27
+858.08 , -114.14 , 0.00
+858.08 , 103.14 , 26.49
+858.08 , 515.72 , 72.10
+858.08 , 1031.44 , 124.50
+858.08 , 1547.16 , 176.46
+858.08 , 2062.88 , 228.49
+858.08 , 2578.60 , 280.71
+858.08 , 3094.32 , 333.18
+858.08 , 3610.04 , 385.90
+858.08 , 4125.76 , 438.89
+858.08 , 4641.48 , 492.16
+858.08 , 5157.20 , 545.71
+858.08 , 5672.91 , 599.54
+858.08 , 6188.63 , 653.64
+858.08 , 6704.35 , 708.03
+858.08 , 7220.07 , 762.71
+858.08 , 7735.79 , 817.66
+858.08 , 8251.51 , 872.89
+858.08 , 8767.23 , 928.41
+858.08 , 9282.95 , 984.20
+858.08 , 9798.67 , 1040.27
+858.08 , 10314.39 , 1096.63
+915.29 , -11414.26 , -921.56
+915.29 , -10843.55 , -877.23
+915.29 , -10272.84 , -832.56
+915.29 , -9702.12 , -787.56
+915.29 , -9131.41 , -742.22
+915.29 , -8560.70 , -696.56
+915.29 , -7989.99 , -650.56
+915.29 , -7419.27 , -604.23
+915.29 , -6848.56 , -557.56
+915.29 , -6277.85 , -510.57
+915.29 , -5707.13 , -463.24
+915.29 , -5136.42 , -415.58
+915.29 , -4565.71 , -367.58
+915.29 , -3994.99 , -319.24
+915.29 , -3424.28 , -270.55
+915.29 , -2853.57 , -221.48
+915.29 , -2282.85 , -171.99
+915.29 , -1712.14 , -121.95
+915.29 , -1141.43 , -70.93
+915.29 , -570.71 , -14.10
+915.29 , -114.14 , 0.00
+915.29 , 103.14 , 29.68
+915.29 , 515.72 , 79.05
+915.29 , 1031.44 , 135.20
+915.29 , 1547.16 , 190.76
+915.29 , 2062.88 , 246.36
+915.29 , 2578.60 , 302.17
+915.29 , 3094.32 , 358.24
+915.29 , 3610.04 , 414.60
+915.29 , 4125.76 , 471.27
+915.29 , 4641.48 , 528.24
+915.29 , 5157.20 , 585.52
+915.29 , 5672.91 , 643.12
+915.29 , 6188.63 , 701.03
+915.29 , 6704.35 , 759.26
+915.29 , 7220.07 , 817.80
+915.29 , 7735.79 , 876.66
+915.29 , 8251.51 , 935.84
+915.29 , 8767.23 , 995.34
+915.29 , 9282.95 , 1055.15
+915.29 , 9798.67 , 1115.27
+915.29 , 10314.39 , 1175.71
+972.50 , -11414.26 , -972.24
+972.50 , -10843.55 , -925.52
+972.50 , -10272.84 , -878.43
+972.50 , -9702.12 , -830.96
+972.50 , -9131.41 , -783.11
+972.50 , -8560.70 , -734.89
+972.50 , -7989.99 , -686.30
+972.50 , -7419.27 , -637.33
+972.50 , -6848.56 , -587.99
+972.50 , -6277.85 , -538.28
+972.50 , -5707.13 , -488.19
+972.50 , -5136.42 , -437.72
+972.50 , -4565.71 , -386.87
+972.50 , -3994.99 , -335.63
+972.50 , -3424.28 , -283.99
+972.50 , -2853.57 , -231.92
+972.50 , -2282.85 , -179.35
+972.50 , -1712.14 , -126.12
+972.50 , -1141.43 , -71.60
+972.50 , -570.71 , -6.45
+972.50 , -114.14 , 0.00
+972.50 , 103.14 , 33.08
+972.50 , 515.72 , 86.37
+972.50 , 1031.44 , 146.31
+972.50 , 1547.16 , 205.50
+972.50 , 2062.88 , 264.70
+972.50 , 2578.60 , 324.11
+972.50 , 3094.32 , 383.81
+972.50 , 3610.04 , 443.83
+972.50 , 4125.76 , 504.18
+972.50 , 4641.48 , 564.87
+972.50 , 5157.20 , 625.91
+972.50 , 5672.91 , 687.30
+972.50 , 6188.63 , 749.05
+972.50 , 6704.35 , 811.14
+972.50 , 7220.07 , 873.59
+972.50 , 7735.79 , 936.40
+972.50 , 8251.51 , 999.56
+972.50 , 8767.23 , 1063.07
+972.50 , 9282.95 , 1126.93
+972.50 , 9798.67 , 1191.14
+972.50 , 10314.39 , 1255.71
+1029.70 , -11414.26 , -1021.86
+1029.70 , -10843.55 , -972.81
+1029.70 , -10272.84 , -923.33
+1029.70 , -9702.12 , -873.44
+1029.70 , -9131.41 , -823.13
+1029.70 , -8560.70 , -772.39
+1029.70 , -7989.99 , -721.24
+1029.70 , -7419.27 , -669.67
+1029.70 , -6848.56 , -617.68
+1029.70 , -6277.85 , -565.27
+1029.70 , -5707.13 , -512.45
+1029.70 , -5136.42 , -459.19
+1029.70 , -4565.71 , -405.51
+1029.70 , -3994.99 , -351.39
+1029.70 , -3424.28 , -296.81
+1029.70 , -2853.57 , -241.73
+1029.70 , -2282.85 , -186.07
+1029.70 , -1712.14 , -129.61
+1029.70 , -1141.43 , -71.46
+1029.70 , -570.71 , 0.00
+1029.70 , -114.14 , 0.00
+1029.70 , 103.14 , 36.70
+1029.70 , 515.72 , 94.04
+1029.70 , 1031.44 , 157.85
+1029.70 , 1547.16 , 220.70
+1029.70 , 2062.88 , 283.52
+1029.70 , 2578.60 , 346.56
+1029.70 , 3094.32 , 409.90
+1029.70 , 3610.04 , 473.59
+1029.70 , 4125.76 , 537.65
+1029.70 , 4641.48 , 602.09
+1029.70 , 5157.20 , 666.91
+1029.70 , 5672.91 , 732.12
+1029.70 , 6188.63 , 797.72
+1029.70 , 6704.35 , 863.72
+1029.70 , 7220.07 , 930.10
+1029.70 , 7735.79 , 996.88
+1029.70 , 8251.51 , 1064.05
+1029.70 , 8767.23 , 1131.62
+1029.70 , 9282.95 , 1199.57
+1029.70 , 9798.67 , 1267.92
+1029.70 , 10314.39 , 1336.65
+1086.91 , -11414.26 , -1070.37
+1086.91 , -10843.55 , -1019.04
+1086.91 , -10272.84 , -967.24
+1086.91 , -9702.12 , -914.96
+1086.91 , -9131.41 , -862.23
+1086.91 , -8560.70 , -809.02
+1086.91 , -7989.99 , -755.35
+1086.91 , -7419.27 , -701.21
+1086.91 , -6848.56 , -646.60
+1086.91 , -6277.85 , -591.53
+1086.91 , -5707.13 , -535.99
+1086.91 , -5136.42 , -479.97
+1086.91 , -4565.71 , -423.47
+1086.91 , -3994.99 , -366.48
+1086.91 , -3424.28 , -308.96
+1086.91 , -2853.57 , -250.88
+1086.91 , -2282.85 , -192.11
+1086.91 , -1712.14 , -132.36
+1086.91 , -1141.43 , -70.38
+1086.91 , -570.71 , 0.00
+1086.91 , -114.14 , 0.00
+1086.91 , 103.14 , 40.53
+1086.91 , 515.72 , 102.10
+1086.91 , 1031.44 , 169.83
+1086.91 , 1547.16 , 236.37
+1086.91 , 2062.88 , 302.84
+1086.91 , 2578.60 , 369.53
+1086.91 , 3094.32 , 436.54
+1086.91 , 3610.04 , 503.92
+1086.91 , 4125.76 , 571.71
+1086.91 , 4641.48 , 639.91
+1086.91 , 5157.20 , 708.54
+1086.91 , 5672.91 , 777.59
+1086.91 , 6188.63 , 847.08
+1086.91 , 6704.35 , 917.00
+1086.91 , 7220.07 , 987.35
+1086.91 , 7735.79 , 1058.14
+1086.91 , 8251.51 , 1129.36
+1086.91 , 8767.23 , 1201.01
+1086.91 , 9282.95 , 1273.09
+1086.91 , 9798.67 , 1345.61
+1086.91 , 10314.39 , 1418.56
+1144.11 , -11414.26 , -1117.74
+1144.11 , -10843.55 , -1064.18
+1144.11 , -10272.84 , -1010.10
+1144.11 , -9702.12 , -955.49
+1144.11 , -9131.41 , -900.37
+1144.11 , -8560.70 , -844.73
+1144.11 , -7989.99 , -788.58
+1144.11 , -7419.27 , -731.90
+1144.11 , -6848.56 , -674.71
+1144.11 , -6277.85 , -617.00
+1144.11 , -5707.13 , -558.77
+1144.11 , -5136.42 , -500.01
+1144.11 , -4565.71 , -440.71
+1144.11 , -3994.99 , -380.85
+1144.11 , -3424.28 , -320.40
+1144.11 , -2853.57 , -259.31
+1144.11 , -2282.85 , -197.41
+1144.11 , -1712.14 , -134.30
+1144.11 , -1141.43 , -68.24
+1144.11 , -570.71 , 0.00
+1144.11 , -114.14 , 0.00
+1144.11 , 103.14 , 44.59
+1144.11 , 515.72 , 110.53
+1144.11 , 1031.44 , 182.27
+1144.11 , 1547.16 , 252.55
+1144.11 , 2062.88 , 322.69
+1144.11 , 2578.60 , 393.04
+1144.11 , 3094.32 , 463.74
+1144.11 , 3610.04 , 534.84
+1144.11 , 4125.76 , 606.37
+1144.11 , 4641.48 , 678.37
+1144.11 , 5157.20 , 750.82
+1144.11 , 5672.91 , 823.74
+1144.11 , 6188.63 , 897.14
+1144.11 , 6704.35 , 971.01
+1144.11 , 7220.07 , 1045.36
+1144.11 , 7735.79 , 1120.19
+1144.11 , 8251.51 , 1195.49
+1144.11 , 8767.23 , 1271.27
+1144.11 , 9282.95 , 1347.52
+1144.11 , 9798.67 , 1424.25
+1144.11 , 10314.39 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_max.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..d8fab6b92266a3ef4e063c492b66954062a39e22
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 10314.39 , -11414.26
+5.67 , 10314.39 , -11414.26
+57.23 , 10314.39 , -11414.26
+114.47 , 10314.39 , -11414.26
+171.56 , 10314.39 , -11414.26
+228.79 , 10314.39 , -11414.26
+286.03 , 10314.39 , -11414.26
+343.26 , 8595.33 , -9511.89
+400.49 , 7367.36 , -8152.98
+457.59 , 6446.49 , -7133.92
+514.82 , 5730.26 , -6341.31
+572.05 , 5157.20 , -5707.13
+629.29 , 4688.37 , -5188.32
+686.52 , 4297.66 , -4755.94
+743.61 , 3967.05 , -4390.08
+800.85 , 3683.75 , -4076.57
+858.08 , 3438.13 , -3804.75
+915.31 , 3223.32 , -3567.03
+972.54 , 3033.67 , -3357.16
+1029.64 , 2865.06 , -3170.58
+1086.87 , 2714.33 , -3003.78
+1144.11 , 2578.60 , -2853.57
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_drag.viepcd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..102d2ba38dee164c86a6a611167df50fbf2d589a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC_Gbx3Whl2_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -21.84
+5.72 , -22.52
+57.21 , -28.92
+114.41 , -35.99
+171.62 , -43.07
+228.82 , -50.22
+286.03 , -57.30
+343.23 , -64.38
+400.44 , -71.45
+457.65 , -78.53
+514.85 , -85.68
+572.06 , -92.76
+629.26 , -99.84
+686.47 , -106.91
+743.67 , -113.99
+800.88 , -121.14
+858.08 , -128.22
+915.29 , -135.30
+972.50 , -142.37
+1029.70 , -149.45
+1086.91 , -156.60
+1144.11 , -163.68
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/Axle_4x2_Tractor.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/Axle_4x2_Tractor.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..e11cbf7cdde175e06ab8f6a0b79d46b84b3e0c1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/Axle_4x2_Tractor.vtlm
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/Axlegear.vgbx b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/Axlegear.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..8c4b5d9467fc9de8c168253de67633e521e24a0f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/Axlegear.vgbx
@@ -0,0 +1,33 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-11-03T14:19:09.9858299Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "3_speed_AMT",
+ "Inertia": 0.0,
+ "TracInt": 0.8,
+ "Gears": [
+ {
+ "Ratio": 2.64,
+ "LossMap": "Axle_4x2_Tractor.vtlm"
+ }
+ ],
+ "TqReserve": 0.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.22222222222222,
+ "StartAcc": 0.8,
+ "GearboxType": "AMT",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAfterUpshiftDelay": 6.0,
+ "UpshiftAfterDownshiftDelay": 6.0,
+ "UpshiftMinAcceleration": 0.1,
+ "PowershiftShiftTime": 0.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/GenericIEPC_Gbx3.viepc b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/GenericIEPC_Gbx3.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..863fb893954d209433b18cb5eefa1b054cda69f9
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/GenericIEPC_Gbx3.viepc
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 8.31
+ },
+ {
+ "Ratio": 4.65
+ },
+ {
+ "Ratio": 2.74
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/GenericIEPC_Gbx3_drag.viepc b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/GenericIEPC_Gbx3_drag.viepc
new file mode 100644
index 0000000000000000000000000000000000000000..533a4a5e6a90b2c99b0ff3c0cf14b65eac3a9859
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/GenericIEPC_Gbx3_drag.viepc
@@ -0,0 +1,63 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:54:28.7387223Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IEPC",
+ "Inertia": 0.5,
+ "DifferentialIncluded": false,
+ "DesignTypeWheelMotor": false,
+ "NrOfDesignTypeWheelMotorMeasured": 1,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "Gears": [
+ {
+ "Ratio": 8.31
+ },
+ {
+ "Ratio": 4.65
+ },
+ {
+ "Ratio": 2.74
+ }
+ ],
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 3222.24,
+ "ContinuousTorqueSpeed": 748.18,
+ "OverloadTorque": 3839.84,
+ "OverloadTorqueSpeed": 743.80,
+ "OverloadTime": 312,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_min.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 3490.76,
+ "ContinuousTorqueSpeed": 755.47,
+ "OverloadTorque": 4027.80,
+ "OverloadTorqueSpeed": 762.41,
+ "OverloadTime": 345,
+ "FullLoadCurve": "IEPC_Gbx3_FLD_max.viepcp",
+ "PowerMaps": {
+ "1": "IEPC_Gbx3_1.viepco",
+ "2": "IEPC_Gbx3_2.viepco",
+ "3": "IEPC_Gbx3_3.viepco"
+ }
+ }
+ ],
+ "DragCurves": {
+ "1": "IEPC_Gbx3_drag1.viepcd",
+ "2": "IEPC_Gbx3_drag2.viepcd",
+ "3": "IEPC_Gbx3_drag.viepcd"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..72acd74aa5bf7b92fd7d255647930ba7d795b433
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx3.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "Axlegear.vgbx",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3_drag.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3_drag.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..aad5769a42aa7bd720108aafe4ffa096c0f3c056
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3_drag.vecto
@@ -0,0 +1,46 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T08:55:18.2100810Z",
+ "AppVersion": "3",
+ "FileVersion": 12
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "IEPC-S_Vehicle_Gbx3_drag.vveh",
+ "EngineFile": "../Common/209kW_7c7l.veng",
+ "GearboxFile": "Axlegear.vgbx",
+ "TCU": "../Common/ShiftParameters.vtcu",
+ "HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
+ "Padd_electric": 3540.0,
+
+ "VACC": "../Common/Truck.vacc",
+
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Off",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..d01a2b7415dd7d2d823bea04f9fae421271fe0b4
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3_drag.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3_drag.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..822cf72445696b6fa33bc07e254be7c82eefac17
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_Vehicle_Gbx3_drag.vveh
@@ -0,0 +1,88 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "IEPC-S",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "IEPC": "GenericIEPC_Gbx3_drag.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery.vbat",
+ "StreamId": 0
+ }
+ ],
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "../Common/GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_1.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_1.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..52c23c595eece5b3cd06f8111e7c740348ddbf08
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_1.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -12984.38 , 0.00
+0.00 , -12335.16 , 0.00
+0.00 , -11685.94 , 0.00
+0.00 , -11036.72 , 0.00
+0.00 , -10387.50 , 0.00
+0.00 , -9738.28 , 0.00
+0.00 , -9089.06 , -0.13
+0.00 , -8439.84 , -0.66
+0.00 , -7790.63 , -0.98
+0.00 , -7141.41 , -1.19
+0.00 , -6492.19 , -1.32
+0.00 , -5842.97 , -1.38
+0.00 , -5193.75 , -1.39
+0.00 , -4544.53 , -1.35
+0.00 , -3895.31 , -1.26
+0.00 , -3246.09 , -1.13
+0.00 , -2596.88 , -0.97
+0.00 , -1947.66 , -0.77
+0.00 , -1298.44 , -0.53
+0.00 , -649.22 , -0.27
+0.00 , -129.84 , -0.02
+0.00 , 119.66 , 0.13
+0.00 , 598.32 , 0.56
+0.00 , 1196.64 , 1.12
+0.00 , 1794.96 , 1.70
+0.00 , 2393.28 , 2.31
+0.00 , 2991.60 , 2.93
+0.00 , 3589.92 , 3.58
+0.00 , 4188.24 , 4.25
+0.00 , 4786.56 , 4.93
+0.00 , 5384.88 , 5.64
+0.00 , 5983.20 , 6.37
+0.00 , 6581.52 , 7.12
+0.00 , 7179.84 , 7.88
+0.00 , 7778.16 , 8.67
+0.00 , 8376.48 , 9.47
+0.00 , 8974.80 , 10.29
+0.00 , 9573.12 , 11.13
+0.00 , 10171.44 , 11.99
+0.00 , 10769.76 , 12.87
+0.00 , 11368.08 , 13.76
+0.00 , 11966.40 , 14.67
+4.98 , -12984.38 , 0.00
+4.98 , -12335.16 , 0.00
+4.98 , -11685.94 , 0.00
+4.98 , -11036.72 , 0.00
+4.98 , -10387.50 , 0.00
+4.98 , -9738.28 , 0.00
+4.98 , -9089.06 , -0.50
+4.98 , -8439.84 , -0.84
+4.98 , -7790.63 , -1.04
+4.98 , -7141.41 , -1.16
+4.98 , -6492.19 , -1.22
+4.98 , -5842.97 , -1.24
+4.98 , -5193.75 , -1.21
+4.98 , -4544.53 , -1.15
+4.98 , -3895.31 , -1.06
+4.98 , -3246.09 , -0.94
+4.98 , -2596.88 , -0.80
+4.98 , -1947.66 , -0.62
+4.98 , -1298.44 , -0.43
+4.98 , -649.22 , -0.21
+4.98 , -129.84 , -0.02
+4.98 , 119.66 , 0.10
+4.98 , 598.32 , 0.43
+4.98 , 1196.64 , 0.85
+4.98 , 1794.96 , 1.30
+4.98 , 2393.28 , 1.75
+4.98 , 2991.60 , 2.23
+4.98 , 3589.92 , 2.71
+4.98 , 4188.24 , 3.21
+4.98 , 4786.56 , 3.73
+4.98 , 5384.88 , 4.26
+4.98 , 5983.20 , 4.80
+4.98 , 6581.52 , 5.36
+4.98 , 7179.84 , 5.93
+4.98 , 7778.16 , 6.52
+4.98 , 8376.48 , 7.12
+4.98 , 8974.80 , 7.73
+4.98 , 9573.12 , 8.35
+4.98 , 10171.44 , 8.99
+4.98 , 10769.76 , 9.64
+4.98 , 11368.08 , 10.30
+4.98 , 11966.40 , 10.98
+49.80 , -12984.38 , -58.10
+49.80 , -12335.16 , -55.37
+49.80 , -11685.94 , -52.62
+49.80 , -11036.72 , -49.85
+49.80 , -10387.50 , -47.06
+49.80 , -9738.28 , -44.25
+49.80 , -9089.06 , -41.42
+49.80 , -8439.84 , -38.57
+49.80 , -7790.63 , -35.70
+49.80 , -7141.41 , -32.81
+49.80 , -6492.19 , -29.90
+49.80 , -5842.97 , -26.98
+49.80 , -5193.75 , -24.03
+49.80 , -4544.53 , -21.07
+49.80 , -3895.31 , -18.08
+49.80 , -3246.09 , -15.08
+49.80 , -2596.88 , -12.06
+49.80 , -1947.66 , -9.02
+49.80 , -1298.44 , -5.96
+49.80 , -649.22 , -2.88
+49.80 , -129.84 , -0.37
+49.80 , 119.66 , 0.90
+49.80 , 598.32 , 3.68
+49.80 , 1196.64 , 7.16
+49.80 , 1794.96 , 10.66
+49.80 , 2393.28 , 14.17
+49.80 , 2991.60 , 17.71
+49.80 , 3589.92 , 21.26
+49.80 , 4188.24 , 24.84
+49.80 , 4786.56 , 28.43
+49.80 , 5384.88 , 32.04
+49.80 , 5983.20 , 35.67
+49.80 , 6581.52 , 39.32
+49.80 , 7179.84 , 42.99
+49.80 , 7778.16 , 46.68
+49.80 , 8376.48 , 50.38
+49.80 , 8974.80 , 54.11
+49.80 , 9573.12 , 57.85
+49.80 , 10171.44 , 61.61
+49.80 , 10769.76 , 65.39
+49.80 , 11368.08 , 69.19
+49.80 , 11966.40 , 73.01
+99.59 , -12984.38 , -120.57
+99.59 , -12335.16 , -114.73
+99.59 , -11685.94 , -108.87
+99.59 , -11036.72 , -102.99
+99.59 , -10387.50 , -97.08
+99.59 , -9738.28 , -91.15
+99.59 , -9089.06 , -85.20
+99.59 , -8439.84 , -79.23
+99.59 , -7790.63 , -73.23
+99.59 , -7141.41 , -67.21
+99.59 , -6492.19 , -61.17
+99.59 , -5842.97 , -55.10
+99.59 , -5193.75 , -49.01
+99.59 , -4544.53 , -42.90
+99.59 , -3895.31 , -36.77
+99.59 , -3246.09 , -30.61
+99.59 , -2596.88 , -24.43
+99.59 , -1947.66 , -18.23
+99.59 , -1298.44 , -12.01
+99.59 , -649.22 , -5.76
+99.59 , -129.84 , -0.66
+99.59 , 119.66 , 1.84
+99.59 , 598.32 , 7.35
+99.59 , 1196.64 , 14.22
+99.59 , 1794.96 , 21.11
+99.59 , 2393.28 , 28.02
+99.59 , 2991.60 , 34.96
+99.59 , 3589.92 , 41.92
+99.59 , 4188.24 , 48.90
+99.59 , 4786.56 , 55.90
+99.59 , 5384.88 , 62.93
+99.59 , 5983.20 , 69.98
+99.59 , 6581.52 , 77.05
+99.59 , 7179.84 , 84.15
+99.59 , 7778.16 , 91.27
+99.59 , 8376.48 , 98.41
+99.59 , 8974.80 , 105.58
+99.59 , 9573.12 , 112.76
+99.59 , 10171.44 , 119.97
+99.59 , 10769.76 , 127.21
+99.59 , 11368.08 , 134.46
+99.59 , 11966.40 , 141.74
+149.39 , -12984.38 , -182.44
+149.39 , -12335.16 , -173.55
+149.39 , -11685.94 , -164.62
+149.39 , -11036.72 , -155.67
+149.39 , -10387.50 , -146.69
+149.39 , -9738.28 , -137.68
+149.39 , -9089.06 , -128.65
+149.39 , -8439.84 , -119.58
+149.39 , -7790.63 , -110.49
+149.39 , -7141.41 , -101.36
+149.39 , -6492.19 , -92.21
+149.39 , -5842.97 , -83.03
+149.39 , -5193.75 , -73.82
+149.39 , -4544.53 , -64.58
+149.39 , -3895.31 , -55.31
+149.39 , -3246.09 , -46.02
+149.39 , -2596.88 , -36.70
+149.39 , -1947.66 , -27.34
+149.39 , -1298.44 , -17.96
+149.39 , -649.22 , -8.54
+149.39 , -129.84 , -0.79
+149.39 , 119.66 , 2.86
+149.39 , 598.32 , 11.12
+149.39 , 1196.64 , 21.39
+149.39 , 1794.96 , 31.68
+149.39 , 2393.28 , 41.99
+149.39 , 2991.60 , 52.34
+149.39 , 3589.92 , 62.71
+149.39 , 4188.24 , 73.12
+149.39 , 4786.56 , 83.55
+149.39 , 5384.88 , 94.01
+149.39 , 5983.20 , 104.50
+149.39 , 6581.52 , 115.02
+149.39 , 7179.84 , 125.57
+149.39 , 7778.16 , 136.15
+149.39 , 8376.48 , 146.76
+149.39 , 8974.80 , 157.40
+149.39 , 9573.12 , 168.06
+149.39 , 10171.44 , 178.76
+149.39 , 10769.76 , 189.48
+149.39 , 11368.08 , 200.23
+149.39 , 11966.40 , 211.02
+199.18 , -12984.38 , -243.71
+199.18 , -12335.16 , -231.81
+199.18 , -11685.94 , -219.87
+199.18 , -11036.72 , -207.89
+199.18 , -10387.50 , -195.88
+199.18 , -9738.28 , -183.83
+199.18 , -9089.06 , -171.74
+199.18 , -8439.84 , -159.61
+199.18 , -7790.63 , -147.45
+199.18 , -7141.41 , -135.25
+199.18 , -6492.19 , -123.01
+199.18 , -5842.97 , -110.74
+199.18 , -5193.75 , -98.43
+199.18 , -4544.53 , -86.08
+199.18 , -3895.31 , -73.70
+199.18 , -3246.09 , -61.27
+199.18 , -2596.88 , -48.82
+199.18 , -1947.66 , -36.32
+199.18 , -1298.44 , -23.78
+199.18 , -649.22 , -11.19
+199.18 , -129.84 , -0.63
+199.18 , 119.66 , 3.98
+199.18 , 598.32 , 15.01
+199.18 , 1196.64 , 28.68
+199.18 , 1794.96 , 42.37
+199.18 , 2393.28 , 56.10
+199.18 , 2991.60 , 69.87
+199.18 , 3589.92 , 83.67
+199.18 , 4188.24 , 97.52
+199.18 , 4786.56 , 111.40
+199.18 , 5384.88 , 125.31
+199.18 , 5983.20 , 139.27
+199.18 , 6581.52 , 153.26
+199.18 , 7179.84 , 167.29
+199.18 , 7778.16 , 181.36
+199.18 , 8376.48 , 195.46
+199.18 , 8974.80 , 209.61
+199.18 , 9573.12 , 223.79
+199.18 , 10171.44 , 238.01
+199.18 , 10769.76 , 252.26
+199.18 , 11368.08 , 266.56
+199.18 , 11966.40 , 280.89
+248.98 , -12984.38 , -304.37
+248.98 , -12335.16 , -289.50
+248.98 , -11685.94 , -274.59
+248.98 , -11036.72 , -259.63
+248.98 , -10387.50 , -244.61
+248.98 , -9738.28 , -229.56
+248.98 , -9089.06 , -214.45
+248.98 , -8439.84 , -199.30
+248.98 , -7790.63 , -184.10
+248.98 , -7141.41 , -168.85
+248.98 , -6492.19 , -153.55
+248.98 , -5842.97 , -138.20
+248.98 , -5193.75 , -122.81
+248.98 , -4544.53 , -107.37
+248.98 , -3895.31 , -91.88
+248.98 , -3246.09 , -76.35
+248.98 , -2596.88 , -60.76
+248.98 , -1947.66 , -45.13
+248.98 , -1298.44 , -29.44
+248.98 , -649.22 , -13.67
+248.98 , -129.84 , 0.00
+248.98 , 119.66 , 5.21
+248.98 , 598.32 , 19.04
+248.98 , 1196.64 , 36.13
+248.98 , 1794.96 , 53.24
+248.98 , 2393.28 , 70.39
+248.98 , 2991.60 , 87.59
+248.98 , 3589.92 , 104.83
+248.98 , 4188.24 , 122.13
+248.98 , 4786.56 , 139.47
+248.98 , 5384.88 , 156.87
+248.98 , 5983.20 , 174.31
+248.98 , 6581.52 , 191.80
+248.98 , 7179.84 , 209.33
+248.98 , 7778.16 , 226.92
+248.98 , 8376.48 , 244.56
+248.98 , 8974.80 , 262.24
+248.98 , 9573.12 , 279.97
+248.98 , 10171.44 , 297.76
+248.98 , 10769.76 , 315.58
+248.98 , 11368.08 , 333.46
+248.98 , 11966.40 , 351.39
+298.77 , -12984.38 , -364.37
+298.77 , -12335.16 , -346.59
+298.77 , -11685.94 , -328.74
+298.77 , -11036.72 , -310.84
+298.77 , -10387.50 , -292.87
+298.77 , -9738.28 , -274.84
+298.77 , -9089.06 , -256.75
+298.77 , -8439.84 , -238.60
+298.77 , -7790.63 , -220.39
+298.77 , -7141.41 , -202.12
+298.77 , -6492.19 , -183.79
+298.77 , -5842.97 , -165.40
+298.77 , -5193.75 , -146.94
+298.77 , -4544.53 , -128.43
+298.77 , -3895.31 , -109.85
+298.77 , -3246.09 , -91.21
+298.77 , -2596.88 , -72.51
+298.77 , -1947.66 , -53.75
+298.77 , -1298.44 , -34.91
+298.77 , -649.22 , -15.95
+298.77 , -129.84 , 0.00
+298.77 , 119.66 , 6.58
+298.77 , 598.32 , 23.25
+298.77 , 1196.64 , 43.76
+298.77 , 1794.96 , 64.29
+298.77 , 2393.28 , 84.87
+298.77 , 2991.60 , 105.52
+298.77 , 3589.92 , 126.22
+298.77 , 4188.24 , 146.98
+298.77 , 4786.56 , 167.81
+298.77 , 5384.88 , 188.70
+298.77 , 5983.20 , 209.65
+298.77 , 6581.52 , 230.66
+298.77 , 7179.84 , 251.73
+298.77 , 7778.16 , 272.87
+298.77 , 8376.48 , 294.07
+298.77 , 8974.80 , 315.33
+298.77 , 9573.12 , 336.65
+298.77 , 10171.44 , 358.03
+298.77 , 10769.76 , 379.47
+298.77 , 11368.08 , 400.98
+298.77 , 11966.40 , 422.54
+348.57 , -12984.38 , -423.69
+348.57 , -12335.16 , -403.04
+348.57 , -11685.94 , -382.31
+348.57 , -11036.72 , -361.50
+348.57 , -10387.50 , -340.62
+348.57 , -9738.28 , -319.66
+348.57 , -9089.06 , -298.62
+348.57 , -8439.84 , -277.51
+348.57 , -7790.63 , -256.31
+348.57 , -7141.41 , -235.05
+348.57 , -6492.19 , -213.70
+348.57 , -5842.97 , -192.28
+348.57 , -5193.75 , -170.79
+348.57 , -4544.53 , -149.21
+348.57 , -3895.31 , -127.57
+348.57 , -3246.09 , -105.84
+348.57 , -2596.88 , -84.03
+348.57 , -1947.66 , -62.14
+348.57 , -1298.44 , -40.16
+348.57 , -649.22 , -18.00
+348.57 , -129.84 , 0.00
+348.57 , 119.66 , 8.09
+348.57 , 598.32 , 27.64
+348.57 , 1196.64 , 51.59
+348.57 , 1794.96 , 75.56
+348.57 , 2393.28 , 99.58
+348.57 , 2991.60 , 123.68
+348.57 , 3589.92 , 147.86
+348.57 , 4188.24 , 172.10
+348.57 , 4786.56 , 196.43
+348.57 , 5384.88 , 220.84
+348.57 , 5983.20 , 245.32
+348.57 , 6581.52 , 269.88
+348.57 , 7179.84 , 294.51
+348.57 , 7778.16 , 319.23
+348.57 , 8376.48 , 344.02
+348.57 , 8974.80 , 368.89
+348.57 , 9573.12 , 393.83
+348.57 , 10171.44 , 418.85
+348.57 , 10769.76 , 443.95
+348.57 , 11368.08 , 469.13
+348.57 , 11966.40 , 494.38
+398.37 , -12984.38 , -482.31
+398.37 , -12335.16 , -458.83
+398.37 , -11685.94 , -435.26
+398.37 , -11036.72 , -411.59
+398.37 , -10387.50 , -387.83
+398.37 , -9738.28 , -363.97
+398.37 , -9089.06 , -340.02
+398.37 , -8439.84 , -315.97
+398.37 , -7790.63 , -291.83
+398.37 , -7141.41 , -267.59
+398.37 , -6492.19 , -243.26
+398.37 , -5842.97 , -218.84
+398.37 , -5193.75 , -194.32
+398.37 , -4544.53 , -169.71
+398.37 , -3895.31 , -145.00
+398.37 , -3246.09 , -120.19
+398.37 , -2596.88 , -95.29
+398.37 , -1947.66 , -70.28
+398.37 , -1298.44 , -45.14
+398.37 , -649.22 , -19.76
+398.37 , -129.84 , 0.00
+398.37 , 119.66 , 9.76
+398.37 , 598.32 , 32.25
+398.37 , 1196.64 , 59.66
+398.37 , 1794.96 , 87.07
+398.37 , 2393.28 , 114.55
+398.37 , 2991.60 , 142.11
+398.37 , 3589.92 , 169.77
+398.37 , 4188.24 , 197.52
+398.37 , 4786.56 , 225.37
+398.37 , 5384.88 , 253.31
+398.37 , 5983.20 , 281.34
+398.37 , 6581.52 , 309.47
+398.37 , 7179.84 , 337.70
+398.37 , 7778.16 , 366.02
+398.37 , 8376.48 , 394.44
+398.37 , 8974.80 , 422.95
+398.37 , 9573.12 , 451.56
+398.37 , 10171.44 , 480.26
+398.37 , 10769.76 , 509.05
+398.37 , 11368.08 , 537.94
+398.37 , 11966.40 , 566.93
+448.16 , -12984.38 , -540.17
+448.16 , -12335.16 , -513.92
+448.16 , -11685.94 , -487.55
+448.16 , -11036.72 , -461.06
+448.16 , -10387.50 , -434.46
+448.16 , -9738.28 , -407.75
+448.16 , -9089.06 , -380.92
+448.16 , -8439.84 , -353.97
+448.16 , -7790.63 , -326.91
+448.16 , -7141.41 , -299.73
+448.16 , -6492.19 , -272.44
+448.16 , -5842.97 , -245.03
+448.16 , -5193.75 , -217.51
+448.16 , -4544.53 , -189.87
+448.16 , -3895.31 , -162.12
+448.16 , -3246.09 , -134.25
+448.16 , -2596.88 , -106.26
+448.16 , -1947.66 , -78.13
+448.16 , -1298.44 , -49.84
+448.16 , -649.22 , -21.19
+448.16 , -129.84 , 0.00
+448.16 , 119.66 , 11.59
+448.16 , 598.32 , 37.10
+448.16 , 1196.64 , 67.98
+448.16 , 1794.96 , 98.85
+448.16 , 2393.28 , 129.79
+448.16 , 2991.60 , 160.84
+448.16 , 3589.92 , 191.99
+448.16 , 4188.24 , 223.26
+448.16 , 4786.56 , 254.64
+448.16 , 5384.88 , 286.14
+448.16 , 5983.20 , 317.75
+448.16 , 6581.52 , 349.48
+448.16 , 7179.84 , 381.32
+448.16 , 7778.16 , 413.28
+448.16 , 8376.48 , 445.36
+448.16 , 8974.80 , 477.54
+448.16 , 9573.12 , 509.85
+448.16 , 10171.44 , 542.27
+448.16 , 10769.76 , 574.80
+448.16 , 11368.08 , 607.45
+448.16 , 11966.40 , 640.21
+497.96 , -12984.38 , -597.26
+497.96 , -12335.16 , -568.28
+497.96 , -11685.94 , -539.16
+497.96 , -11036.72 , -509.90
+497.96 , -10387.50 , -480.50
+497.96 , -9738.28 , -450.96
+497.96 , -9089.06 , -421.28
+497.96 , -8439.84 , -391.47
+497.96 , -7790.63 , -361.52
+497.96 , -7141.41 , -331.43
+497.96 , -6492.19 , -301.20
+497.96 , -5842.97 , -270.83
+497.96 , -5193.75 , -240.33
+497.96 , -4544.53 , -209.68
+497.96 , -3895.31 , -178.90
+497.96 , -3246.09 , -147.97
+497.96 , -2596.88 , -116.90
+497.96 , -1947.66 , -85.66
+497.96 , -1298.44 , -54.21
+497.96 , -649.22 , -22.23
+497.96 , -129.84 , 0.00
+497.96 , 119.66 , 13.60
+497.96 , 598.32 , 42.20
+497.96 , 1196.64 , 76.58
+497.96 , 1794.96 , 110.92
+497.96 , 2393.28 , 145.34
+497.96 , 2991.60 , 179.88
+497.96 , 3589.92 , 214.55
+497.96 , 4188.24 , 249.35
+497.96 , 4786.56 , 284.29
+497.96 , 5384.88 , 319.36
+497.96 , 5983.20 , 354.57
+497.96 , 6581.52 , 389.92
+497.96 , 7179.84 , 425.41
+497.96 , 7778.16 , 461.03
+497.96 , 8376.48 , 496.79
+497.96 , 8974.80 , 532.69
+497.96 , 9573.12 , 568.73
+497.96 , 10171.44 , 604.90
+497.96 , 10769.76 , 641.21
+497.96 , 11368.08 , 677.66
+497.96 , 11966.40 , 714.24
+547.75 , -12984.38 , -653.54
+547.75 , -12335.16 , -621.88
+547.75 , -11685.94 , -590.05
+547.75 , -11036.72 , -558.06
+547.75 , -10387.50 , -525.90
+547.75 , -9738.28 , -493.58
+547.75 , -9089.06 , -461.09
+547.75 , -8439.84 , -428.44
+547.75 , -7790.63 , -395.63
+547.75 , -7141.41 , -362.65
+547.75 , -6492.19 , -329.51
+547.75 , -5842.97 , -296.21
+547.75 , -5193.75 , -262.74
+547.75 , -4544.53 , -229.11
+547.75 , -3895.31 , -195.31
+547.75 , -3246.09 , -161.34
+547.75 , -2596.88 , -127.18
+547.75 , -1947.66 , -92.83
+547.75 , -1298.44 , -58.20
+547.75 , -649.22 , -22.82
+547.75 , -129.84 , 0.00
+547.75 , 119.66 , 15.79
+547.75 , 598.32 , 47.58
+547.75 , 1196.64 , 85.48
+547.75 , 1794.96 , 123.30
+547.75 , 2393.28 , 161.22
+547.75 , 2991.60 , 199.26
+547.75 , 3589.92 , 237.46
+547.75 , 4188.24 , 275.81
+547.75 , 4786.56 , 314.32
+547.75 , 5384.88 , 352.99
+547.75 , 5983.20 , 391.83
+547.75 , 6581.52 , 430.82
+547.75 , 7179.84 , 469.98
+547.75 , 7778.16 , 509.30
+547.75 , 8376.48 , 548.78
+547.75 , 8974.80 , 588.42
+547.75 , 9573.12 , 628.23
+547.75 , 10171.44 , 668.20
+547.75 , 10769.76 , 708.32
+547.75 , 11368.08 , 748.61
+547.75 , 11966.40 , 789.06
+597.55 , -12984.38 , -708.97
+597.55 , -12335.16 , -674.68
+597.55 , -11685.94 , -640.19
+597.55 , -11036.72 , -605.51
+597.55 , -10387.50 , -570.63
+597.55 , -9738.28 , -535.56
+597.55 , -9089.06 , -500.30
+597.55 , -8439.84 , -464.85
+597.55 , -7790.63 , -429.21
+597.55 , -7141.41 , -393.37
+597.55 , -6492.19 , -357.35
+597.55 , -5842.97 , -321.13
+597.55 , -5193.75 , -284.71
+597.55 , -4544.53 , -248.11
+597.55 , -3895.31 , -211.31
+597.55 , -3246.09 , -174.30
+597.55 , -2596.88 , -137.08
+597.55 , -1947.66 , -99.61
+597.55 , -1298.44 , -61.78
+597.55 , -649.22 , -22.86
+597.55 , -129.84 , 0.00
+597.55 , 119.66 , 18.17
+597.55 , 598.32 , 53.24
+597.55 , 1196.64 , 94.71
+597.55 , 1794.96 , 136.03
+597.55 , 2393.28 , 177.45
+597.55 , 2991.60 , 219.01
+597.55 , 3589.92 , 260.75
+597.55 , 4188.24 , 302.67
+597.55 , 4786.56 , 344.78
+597.55 , 5384.88 , 387.07
+597.55 , 5983.20 , 429.54
+597.55 , 6581.52 , 472.21
+597.55 , 7179.84 , 515.06
+597.55 , 7778.16 , 558.11
+597.55 , 8376.48 , 601.34
+597.55 , 8974.80 , 644.76
+597.55 , 9573.12 , 688.37
+597.55 , 10171.44 , 732.17
+597.55 , 10769.76 , 776.15
+597.55 , 11368.08 , 820.33
+597.55 , 11966.40 , 864.69
+647.35 , -12984.38 , -763.53
+647.35 , -12335.16 , -726.65
+647.35 , -11685.94 , -689.55
+647.35 , -11036.72 , -652.22
+647.35 , -10387.50 , -614.67
+647.35 , -9738.28 , -576.89
+647.35 , -9089.06 , -538.89
+647.35 , -8439.84 , -500.67
+647.35 , -7790.63 , -462.22
+647.35 , -7141.41 , -423.56
+647.35 , -6492.19 , -384.67
+647.35 , -5842.97 , -345.56
+647.35 , -5193.75 , -306.22
+647.35 , -4544.53 , -266.66
+647.35 , -3895.31 , -226.86
+647.35 , -3246.09 , -186.83
+647.35 , -2596.88 , -146.54
+647.35 , -1947.66 , -105.95
+647.35 , -1298.44 , -64.90
+647.35 , -649.22 , -22.24
+647.35 , -129.84 , 0.00
+647.35 , 119.66 , 20.74
+647.35 , 598.32 , 59.20
+647.35 , 1196.64 , 104.27
+647.35 , 1794.96 , 149.12
+647.35 , 2393.28 , 194.05
+647.35 , 2991.60 , 239.16
+647.35 , 3589.92 , 284.45
+647.35 , 4188.24 , 329.96
+647.35 , 4786.56 , 375.67
+647.35 , 5384.88 , 421.60
+647.35 , 5983.20 , 467.75
+647.35 , 6581.52 , 514.11
+647.35 , 7179.84 , 560.69
+647.35 , 7778.16 , 607.48
+647.35 , 8376.48 , 654.50
+647.35 , 8974.80 , 701.73
+647.35 , 9573.12 , 749.18
+647.35 , 10171.44 , 796.84
+647.35 , 10769.76 , 844.73
+647.35 , 11368.08 , 892.83
+647.35 , 11966.40 , 941.14
+697.14 , -12984.38 , -817.17
+697.14 , -12335.16 , -777.76
+697.14 , -11685.94 , -738.08
+697.14 , -11036.72 , -698.15
+697.14 , -10387.50 , -657.96
+697.14 , -9738.28 , -617.52
+697.14 , -9089.06 , -576.82
+697.14 , -8439.84 , -535.86
+697.14 , -7790.63 , -494.65
+697.14 , -7141.41 , -453.18
+697.14 , -6492.19 , -411.45
+697.14 , -5842.97 , -369.47
+697.14 , -5193.75 , -327.22
+697.14 , -4544.53 , -284.72
+697.14 , -3895.31 , -241.95
+697.14 , -3246.09 , -198.90
+697.14 , -2596.88 , -155.54
+697.14 , -1947.66 , -111.82
+697.14 , -1298.44 , -67.51
+697.14 , -649.22 , -20.80
+697.14 , -129.84 , 0.00
+697.14 , 119.66 , 23.52
+697.14 , 598.32 , 65.48
+697.14 , 1196.64 , 114.20
+697.14 , 1794.96 , 162.59
+697.14 , 2393.28 , 211.06
+697.14 , 2991.60 , 259.72
+697.14 , 3589.92 , 308.59
+697.14 , 4188.24 , 357.69
+697.14 , 4786.56 , 407.04
+697.14 , 5384.88 , 456.62
+697.14 , 5983.20 , 506.46
+697.14 , 6581.52 , 556.54
+697.14 , 7179.84 , 606.87
+697.14 , 7778.16 , 657.45
+697.14 , 8376.48 , 708.28
+697.14 , 8974.80 , 759.35
+697.14 , 9573.12 , 810.68
+697.14 , 10171.44 , 862.25
+697.14 , 10769.76 , 914.07
+697.14 , 11368.08 , 966.13
+697.14 , 11966.40 , 1018.44
+746.94 , -12984.38 , -869.86
+746.94 , -12335.16 , -827.96
+746.94 , -11685.94 , -785.77
+746.94 , -11036.72 , -743.28
+746.94 , -10387.50 , -700.50
+746.94 , -9738.28 , -657.42
+746.94 , -9089.06 , -614.05
+746.94 , -8439.84 , -570.39
+746.94 , -7790.63 , -526.44
+746.94 , -7141.41 , -482.19
+746.94 , -6492.19 , -437.65
+746.94 , -5842.97 , -392.82
+746.94 , -5193.75 , -347.69
+746.94 , -4544.53 , -302.26
+746.94 , -3895.31 , -256.52
+746.94 , -3246.09 , -210.46
+746.94 , -2596.88 , -164.04
+746.94 , -1947.66 , -117.17
+746.94 , -1298.44 , -69.54
+746.94 , -649.22 , -18.27
+746.94 , -129.84 , 0.00
+746.94 , 119.66 , 26.49
+746.94 , 598.32 , 72.10
+746.94 , 1196.64 , 124.50
+746.94 , 1794.96 , 176.46
+746.94 , 2393.28 , 228.49
+746.94 , 2991.60 , 280.71
+746.94 , 3589.92 , 333.18
+746.94 , 4188.24 , 385.90
+746.94 , 4786.56 , 438.89
+746.94 , 5384.88 , 492.16
+746.94 , 5983.20 , 545.71
+746.94 , 6581.52 , 599.54
+746.94 , 7179.84 , 653.64
+746.94 , 7778.16 , 708.03
+746.94 , 8376.48 , 762.71
+746.94 , 8974.80 , 817.66
+746.94 , 9573.12 , 872.89
+746.94 , 10171.44 , 928.41
+746.94 , 10769.76 , 984.20
+746.94 , 11368.08 , 1040.27
+746.94 , 11966.40 , 1096.63
+796.73 , -12984.38 , -921.56
+796.73 , -12335.16 , -877.23
+796.73 , -11685.94 , -832.56
+796.73 , -11036.72 , -787.56
+796.73 , -10387.50 , -742.22
+796.73 , -9738.28 , -696.56
+796.73 , -9089.06 , -650.56
+796.73 , -8439.84 , -604.23
+796.73 , -7790.63 , -557.56
+796.73 , -7141.41 , -510.57
+796.73 , -6492.19 , -463.24
+796.73 , -5842.97 , -415.58
+796.73 , -5193.75 , -367.58
+796.73 , -4544.53 , -319.24
+796.73 , -3895.31 , -270.55
+796.73 , -3246.09 , -221.48
+796.73 , -2596.88 , -171.99
+796.73 , -1947.66 , -121.95
+796.73 , -1298.44 , -70.93
+796.73 , -649.22 , -14.10
+796.73 , -129.84 , 0.00
+796.73 , 119.66 , 29.68
+796.73 , 598.32 , 79.05
+796.73 , 1196.64 , 135.20
+796.73 , 1794.96 , 190.76
+796.73 , 2393.28 , 246.36
+796.73 , 2991.60 , 302.17
+796.73 , 3589.92 , 358.24
+796.73 , 4188.24 , 414.60
+796.73 , 4786.56 , 471.27
+796.73 , 5384.88 , 528.24
+796.73 , 5983.20 , 585.52
+796.73 , 6581.52 , 643.12
+796.73 , 7179.84 , 701.03
+796.73 , 7778.16 , 759.26
+796.73 , 8376.48 , 817.80
+796.73 , 8974.80 , 876.66
+796.73 , 9573.12 , 935.84
+796.73 , 10171.44 , 995.34
+796.73 , 10769.76 , 1055.15
+796.73 , 11368.08 , 1115.27
+796.73 , 11966.40 , 1175.71
+846.53 , -12984.38 , -972.24
+846.53 , -12335.16 , -925.52
+846.53 , -11685.94 , -878.43
+846.53 , -11036.72 , -830.96
+846.53 , -10387.50 , -783.11
+846.53 , -9738.28 , -734.89
+846.53 , -9089.06 , -686.30
+846.53 , -8439.84 , -637.33
+846.53 , -7790.63 , -587.99
+846.53 , -7141.41 , -538.28
+846.53 , -6492.19 , -488.19
+846.53 , -5842.97 , -437.72
+846.53 , -5193.75 , -386.87
+846.53 , -4544.53 , -335.63
+846.53 , -3895.31 , -283.99
+846.53 , -3246.09 , -231.92
+846.53 , -2596.88 , -179.35
+846.53 , -1947.66 , -126.12
+846.53 , -1298.44 , -71.60
+846.53 , -649.22 , -6.45
+846.53 , -129.84 , 0.00
+846.53 , 119.66 , 33.08
+846.53 , 598.32 , 86.37
+846.53 , 1196.64 , 146.31
+846.53 , 1794.96 , 205.50
+846.53 , 2393.28 , 264.70
+846.53 , 2991.60 , 324.11
+846.53 , 3589.92 , 383.81
+846.53 , 4188.24 , 443.83
+846.53 , 4786.56 , 504.18
+846.53 , 5384.88 , 564.87
+846.53 , 5983.20 , 625.91
+846.53 , 6581.52 , 687.30
+846.53 , 7179.84 , 749.05
+846.53 , 7778.16 , 811.14
+846.53 , 8376.48 , 873.59
+846.53 , 8974.80 , 936.40
+846.53 , 9573.12 , 999.56
+846.53 , 10171.44 , 1063.07
+846.53 , 10769.76 , 1126.93
+846.53 , 11368.08 , 1191.14
+846.53 , 11966.40 , 1255.71
+896.32 , -12984.38 , -1021.86
+896.32 , -12335.16 , -972.81
+896.32 , -11685.94 , -923.33
+896.32 , -11036.72 , -873.44
+896.32 , -10387.50 , -823.13
+896.32 , -9738.28 , -772.39
+896.32 , -9089.06 , -721.24
+896.32 , -8439.84 , -669.67
+896.32 , -7790.63 , -617.68
+896.32 , -7141.41 , -565.27
+896.32 , -6492.19 , -512.45
+896.32 , -5842.97 , -459.19
+896.32 , -5193.75 , -405.51
+896.32 , -4544.53 , -351.39
+896.32 , -3895.31 , -296.81
+896.32 , -3246.09 , -241.73
+896.32 , -2596.88 , -186.07
+896.32 , -1947.66 , -129.61
+896.32 , -1298.44 , -71.46
+896.32 , -649.22 , 0.00
+896.32 , -129.84 , 0.00
+896.32 , 119.66 , 36.70
+896.32 , 598.32 , 94.04
+896.32 , 1196.64 , 157.85
+896.32 , 1794.96 , 220.70
+896.32 , 2393.28 , 283.52
+896.32 , 2991.60 , 346.56
+896.32 , 3589.92 , 409.90
+896.32 , 4188.24 , 473.59
+896.32 , 4786.56 , 537.65
+896.32 , 5384.88 , 602.09
+896.32 , 5983.20 , 666.91
+896.32 , 6581.52 , 732.12
+896.32 , 7179.84 , 797.72
+896.32 , 7778.16 , 863.72
+896.32 , 8376.48 , 930.10
+896.32 , 8974.80 , 996.88
+896.32 , 9573.12 , 1064.05
+896.32 , 10171.44 , 1131.62
+896.32 , 10769.76 , 1199.57
+896.32 , 11368.08 , 1267.92
+896.32 , 11966.40 , 1336.65
+946.12 , -12984.38 , -1070.37
+946.12 , -12335.16 , -1019.04
+946.12 , -11685.94 , -967.24
+946.12 , -11036.72 , -914.96
+946.12 , -10387.50 , -862.23
+946.12 , -9738.28 , -809.02
+946.12 , -9089.06 , -755.35
+946.12 , -8439.84 , -701.21
+946.12 , -7790.63 , -646.60
+946.12 , -7141.41 , -591.53
+946.12 , -6492.19 , -535.99
+946.12 , -5842.97 , -479.97
+946.12 , -5193.75 , -423.47
+946.12 , -4544.53 , -366.48
+946.12 , -3895.31 , -308.96
+946.12 , -3246.09 , -250.88
+946.12 , -2596.88 , -192.11
+946.12 , -1947.66 , -132.36
+946.12 , -1298.44 , -70.38
+946.12 , -649.22 , 0.00
+946.12 , -129.84 , 0.00
+946.12 , 119.66 , 40.53
+946.12 , 598.32 , 102.10
+946.12 , 1196.64 , 169.83
+946.12 , 1794.96 , 236.37
+946.12 , 2393.28 , 302.84
+946.12 , 2991.60 , 369.53
+946.12 , 3589.92 , 436.54
+946.12 , 4188.24 , 503.92
+946.12 , 4786.56 , 571.71
+946.12 , 5384.88 , 639.91
+946.12 , 5983.20 , 708.54
+946.12 , 6581.52 , 777.59
+946.12 , 7179.84 , 847.08
+946.12 , 7778.16 , 917.00
+946.12 , 8376.48 , 987.35
+946.12 , 8974.80 , 1058.14
+946.12 , 9573.12 , 1129.36
+946.12 , 10171.44 , 1201.01
+946.12 , 10769.76 , 1273.09
+946.12 , 11368.08 , 1345.61
+946.12 , 11966.40 , 1418.56
+995.92 , -12984.38 , -1117.74
+995.92 , -12335.16 , -1064.18
+995.92 , -11685.94 , -1010.10
+995.92 , -11036.72 , -955.49
+995.92 , -10387.50 , -900.37
+995.92 , -9738.28 , -844.73
+995.92 , -9089.06 , -788.58
+995.92 , -8439.84 , -731.90
+995.92 , -7790.63 , -674.71
+995.92 , -7141.41 , -617.00
+995.92 , -6492.19 , -558.77
+995.92 , -5842.97 , -500.01
+995.92 , -5193.75 , -440.71
+995.92 , -4544.53 , -380.85
+995.92 , -3895.31 , -320.40
+995.92 , -3246.09 , -259.31
+995.92 , -2596.88 , -197.41
+995.92 , -1947.66 , -134.30
+995.92 , -1298.44 , -68.24
+995.92 , -649.22 , 0.00
+995.92 , -129.84 , 0.00
+995.92 , 119.66 , 44.59
+995.92 , 598.32 , 110.53
+995.92 , 1196.64 , 182.27
+995.92 , 1794.96 , 252.55
+995.92 , 2393.28 , 322.69
+995.92 , 2991.60 , 393.04
+995.92 , 3589.92 , 463.74
+995.92 , 4188.24 , 534.84
+995.92 , 4786.56 , 606.37
+995.92 , 5384.88 , 678.37
+995.92 , 5983.20 , 750.82
+995.92 , 6581.52 , 823.74
+995.92 , 7179.84 , 897.14
+995.92 , 7778.16 , 971.01
+995.92 , 8376.48 , 1045.36
+995.92 , 8974.80 , 1120.19
+995.92 , 9573.12 , 1195.49
+995.92 , 10171.44 , 1271.27
+995.92 , 10769.76 , 1347.52
+995.92 , 11368.08 , 1424.25
+995.92 , 11966.40 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_2.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_2.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..e4be1e22ede233c40afa5a00eeb1292d2cad8f78
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_2.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -7190.72 , 0.00
+0.00 , -6831.19 , 0.00
+0.00 , -6471.65 , 0.00
+0.00 , -6112.11 , 0.00
+0.00 , -5752.58 , 0.00
+0.00 , -5393.04 , 0.00
+0.00 , -5033.51 , -0.13
+0.00 , -4673.97 , -0.66
+0.00 , -4314.43 , -0.98
+0.00 , -3954.90 , -1.19
+0.00 , -3595.36 , -1.32
+0.00 , -3235.82 , -1.38
+0.00 , -2876.29 , -1.39
+0.00 , -2516.75 , -1.35
+0.00 , -2157.22 , -1.26
+0.00 , -1797.68 , -1.13
+0.00 , -1438.14 , -0.97
+0.00 , -1078.61 , -0.77
+0.00 , -719.07 , -0.53
+0.00 , -359.54 , -0.27
+0.00 , -71.91 , -0.02
+0.00 , 67.66 , 0.13
+0.00 , 338.29 , 0.56
+0.00 , 676.58 , 1.12
+0.00 , 1014.86 , 1.70
+0.00 , 1353.15 , 2.31
+0.00 , 1691.44 , 2.93
+0.00 , 2029.73 , 3.58
+0.00 , 2368.01 , 4.25
+0.00 , 2706.30 , 4.93
+0.00 , 3044.59 , 5.64
+0.00 , 3382.88 , 6.37
+0.00 , 3721.16 , 7.12
+0.00 , 4059.45 , 7.88
+0.00 , 4397.74 , 8.67
+0.00 , 4736.03 , 9.47
+0.00 , 5074.31 , 10.29
+0.00 , 5412.60 , 11.13
+0.00 , 5750.89 , 11.99
+0.00 , 6089.18 , 12.87
+0.00 , 6427.46 , 13.76
+0.00 , 6765.75 , 14.67
+8.90 , -7190.72 , 0.00
+8.90 , -6831.19 , 0.00
+8.90 , -6471.65 , 0.00
+8.90 , -6112.11 , 0.00
+8.90 , -5752.58 , 0.00
+8.90 , -5393.04 , 0.00
+8.90 , -5033.51 , -0.50
+8.90 , -4673.97 , -0.84
+8.90 , -4314.43 , -1.04
+8.90 , -3954.90 , -1.16
+8.90 , -3595.36 , -1.22
+8.90 , -3235.82 , -1.24
+8.90 , -2876.29 , -1.21
+8.90 , -2516.75 , -1.15
+8.90 , -2157.22 , -1.06
+8.90 , -1797.68 , -0.94
+8.90 , -1438.14 , -0.80
+8.90 , -1078.61 , -0.62
+8.90 , -719.07 , -0.43
+8.90 , -359.54 , -0.21
+8.90 , -71.91 , -0.02
+8.90 , 67.66 , 0.10
+8.90 , 338.29 , 0.43
+8.90 , 676.58 , 0.85
+8.90 , 1014.86 , 1.30
+8.90 , 1353.15 , 1.75
+8.90 , 1691.44 , 2.23
+8.90 , 2029.73 , 2.71
+8.90 , 2368.01 , 3.21
+8.90 , 2706.30 , 3.73
+8.90 , 3044.59 , 4.26
+8.90 , 3382.88 , 4.80
+8.90 , 3721.16 , 5.36
+8.90 , 4059.45 , 5.93
+8.90 , 4397.74 , 6.52
+8.90 , 4736.03 , 7.12
+8.90 , 5074.31 , 7.73
+8.90 , 5412.60 , 8.35
+8.90 , 5750.89 , 8.99
+8.90 , 6089.18 , 9.64
+8.90 , 6427.46 , 10.30
+8.90 , 6765.75 , 10.98
+88.99 , -7190.72 , -58.10
+88.99 , -6831.19 , -55.37
+88.99 , -6471.65 , -52.62
+88.99 , -6112.11 , -49.85
+88.99 , -5752.58 , -47.06
+88.99 , -5393.04 , -44.25
+88.99 , -5033.51 , -41.42
+88.99 , -4673.97 , -38.57
+88.99 , -4314.43 , -35.70
+88.99 , -3954.90 , -32.81
+88.99 , -3595.36 , -29.90
+88.99 , -3235.82 , -26.98
+88.99 , -2876.29 , -24.03
+88.99 , -2516.75 , -21.07
+88.99 , -2157.22 , -18.08
+88.99 , -1797.68 , -15.08
+88.99 , -1438.14 , -12.06
+88.99 , -1078.61 , -9.02
+88.99 , -719.07 , -5.96
+88.99 , -359.54 , -2.88
+88.99 , -71.91 , -0.37
+88.99 , 67.66 , 0.90
+88.99 , 338.29 , 3.68
+88.99 , 676.58 , 7.16
+88.99 , 1014.86 , 10.66
+88.99 , 1353.15 , 14.17
+88.99 , 1691.44 , 17.71
+88.99 , 2029.73 , 21.26
+88.99 , 2368.01 , 24.84
+88.99 , 2706.30 , 28.43
+88.99 , 3044.59 , 32.04
+88.99 , 3382.88 , 35.67
+88.99 , 3721.16 , 39.32
+88.99 , 4059.45 , 42.99
+88.99 , 4397.74 , 46.68
+88.99 , 4736.03 , 50.38
+88.99 , 5074.31 , 54.11
+88.99 , 5412.60 , 57.85
+88.99 , 5750.89 , 61.61
+88.99 , 6089.18 , 65.39
+88.99 , 6427.46 , 69.19
+88.99 , 6765.75 , 73.01
+177.98 , -7190.72 , -120.57
+177.98 , -6831.19 , -114.73
+177.98 , -6471.65 , -108.87
+177.98 , -6112.11 , -102.99
+177.98 , -5752.58 , -97.08
+177.98 , -5393.04 , -91.15
+177.98 , -5033.51 , -85.20
+177.98 , -4673.97 , -79.23
+177.98 , -4314.43 , -73.23
+177.98 , -3954.90 , -67.21
+177.98 , -3595.36 , -61.17
+177.98 , -3235.82 , -55.10
+177.98 , -2876.29 , -49.01
+177.98 , -2516.75 , -42.90
+177.98 , -2157.22 , -36.77
+177.98 , -1797.68 , -30.61
+177.98 , -1438.14 , -24.43
+177.98 , -1078.61 , -18.23
+177.98 , -719.07 , -12.01
+177.98 , -359.54 , -5.76
+177.98 , -71.91 , -0.66
+177.98 , 67.66 , 1.84
+177.98 , 338.29 , 7.35
+177.98 , 676.58 , 14.22
+177.98 , 1014.86 , 21.11
+177.98 , 1353.15 , 28.02
+177.98 , 1691.44 , 34.96
+177.98 , 2029.73 , 41.92
+177.98 , 2368.01 , 48.90
+177.98 , 2706.30 , 55.90
+177.98 , 3044.59 , 62.93
+177.98 , 3382.88 , 69.98
+177.98 , 3721.16 , 77.05
+177.98 , 4059.45 , 84.15
+177.98 , 4397.74 , 91.27
+177.98 , 4736.03 , 98.41
+177.98 , 5074.31 , 105.58
+177.98 , 5412.60 , 112.76
+177.98 , 5750.89 , 119.97
+177.98 , 6089.18 , 127.21
+177.98 , 6427.46 , 134.46
+177.98 , 6765.75 , 141.74
+266.97 , -7190.72 , -182.44
+266.97 , -6831.19 , -173.55
+266.97 , -6471.65 , -164.62
+266.97 , -6112.11 , -155.67
+266.97 , -5752.58 , -146.69
+266.97 , -5393.04 , -137.68
+266.97 , -5033.51 , -128.65
+266.97 , -4673.97 , -119.58
+266.97 , -4314.43 , -110.49
+266.97 , -3954.90 , -101.36
+266.97 , -3595.36 , -92.21
+266.97 , -3235.82 , -83.03
+266.97 , -2876.29 , -73.82
+266.97 , -2516.75 , -64.58
+266.97 , -2157.22 , -55.31
+266.97 , -1797.68 , -46.02
+266.97 , -1438.14 , -36.70
+266.97 , -1078.61 , -27.34
+266.97 , -719.07 , -17.96
+266.97 , -359.54 , -8.54
+266.97 , -71.91 , -0.79
+266.97 , 67.66 , 2.86
+266.97 , 338.29 , 11.12
+266.97 , 676.58 , 21.39
+266.97 , 1014.86 , 31.68
+266.97 , 1353.15 , 41.99
+266.97 , 1691.44 , 52.34
+266.97 , 2029.73 , 62.71
+266.97 , 2368.01 , 73.12
+266.97 , 2706.30 , 83.55
+266.97 , 3044.59 , 94.01
+266.97 , 3382.88 , 104.50
+266.97 , 3721.16 , 115.02
+266.97 , 4059.45 , 125.57
+266.97 , 4397.74 , 136.15
+266.97 , 4736.03 , 146.76
+266.97 , 5074.31 , 157.40
+266.97 , 5412.60 , 168.06
+266.97 , 5750.89 , 178.76
+266.97 , 6089.18 , 189.48
+266.97 , 6427.46 , 200.23
+266.97 , 6765.75 , 211.02
+355.96 , -7190.72 , -243.71
+355.96 , -6831.19 , -231.81
+355.96 , -6471.65 , -219.87
+355.96 , -6112.11 , -207.89
+355.96 , -5752.58 , -195.88
+355.96 , -5393.04 , -183.83
+355.96 , -5033.51 , -171.74
+355.96 , -4673.97 , -159.61
+355.96 , -4314.43 , -147.45
+355.96 , -3954.90 , -135.25
+355.96 , -3595.36 , -123.01
+355.96 , -3235.82 , -110.74
+355.96 , -2876.29 , -98.43
+355.96 , -2516.75 , -86.08
+355.96 , -2157.22 , -73.70
+355.96 , -1797.68 , -61.27
+355.96 , -1438.14 , -48.82
+355.96 , -1078.61 , -36.32
+355.96 , -719.07 , -23.78
+355.96 , -359.54 , -11.19
+355.96 , -71.91 , -0.63
+355.96 , 67.66 , 3.98
+355.96 , 338.29 , 15.01
+355.96 , 676.58 , 28.68
+355.96 , 1014.86 , 42.37
+355.96 , 1353.15 , 56.10
+355.96 , 1691.44 , 69.87
+355.96 , 2029.73 , 83.67
+355.96 , 2368.01 , 97.52
+355.96 , 2706.30 , 111.40
+355.96 , 3044.59 , 125.31
+355.96 , 3382.88 , 139.27
+355.96 , 3721.16 , 153.26
+355.96 , 4059.45 , 167.29
+355.96 , 4397.74 , 181.36
+355.96 , 4736.03 , 195.46
+355.96 , 5074.31 , 209.61
+355.96 , 5412.60 , 223.79
+355.96 , 5750.89 , 238.01
+355.96 , 6089.18 , 252.26
+355.96 , 6427.46 , 266.56
+355.96 , 6765.75 , 280.89
+444.95 , -7190.72 , -304.37
+444.95 , -6831.19 , -289.50
+444.95 , -6471.65 , -274.59
+444.95 , -6112.11 , -259.63
+444.95 , -5752.58 , -244.61
+444.95 , -5393.04 , -229.56
+444.95 , -5033.51 , -214.45
+444.95 , -4673.97 , -199.30
+444.95 , -4314.43 , -184.10
+444.95 , -3954.90 , -168.85
+444.95 , -3595.36 , -153.55
+444.95 , -3235.82 , -138.20
+444.95 , -2876.29 , -122.81
+444.95 , -2516.75 , -107.37
+444.95 , -2157.22 , -91.88
+444.95 , -1797.68 , -76.35
+444.95 , -1438.14 , -60.76
+444.95 , -1078.61 , -45.13
+444.95 , -719.07 , -29.44
+444.95 , -359.54 , -13.67
+444.95 , -71.91 , 0.00
+444.95 , 67.66 , 5.21
+444.95 , 338.29 , 19.04
+444.95 , 676.58 , 36.13
+444.95 , 1014.86 , 53.24
+444.95 , 1353.15 , 70.39
+444.95 , 1691.44 , 87.59
+444.95 , 2029.73 , 104.83
+444.95 , 2368.01 , 122.13
+444.95 , 2706.30 , 139.47
+444.95 , 3044.59 , 156.87
+444.95 , 3382.88 , 174.31
+444.95 , 3721.16 , 191.80
+444.95 , 4059.45 , 209.33
+444.95 , 4397.74 , 226.92
+444.95 , 4736.03 , 244.56
+444.95 , 5074.31 , 262.24
+444.95 , 5412.60 , 279.97
+444.95 , 5750.89 , 297.76
+444.95 , 6089.18 , 315.58
+444.95 , 6427.46 , 333.46
+444.95 , 6765.75 , 351.39
+533.94 , -7190.72 , -364.37
+533.94 , -6831.19 , -346.59
+533.94 , -6471.65 , -328.74
+533.94 , -6112.11 , -310.84
+533.94 , -5752.58 , -292.87
+533.94 , -5393.04 , -274.84
+533.94 , -5033.51 , -256.75
+533.94 , -4673.97 , -238.60
+533.94 , -4314.43 , -220.39
+533.94 , -3954.90 , -202.12
+533.94 , -3595.36 , -183.79
+533.94 , -3235.82 , -165.40
+533.94 , -2876.29 , -146.94
+533.94 , -2516.75 , -128.43
+533.94 , -2157.22 , -109.85
+533.94 , -1797.68 , -91.21
+533.94 , -1438.14 , -72.51
+533.94 , -1078.61 , -53.75
+533.94 , -719.07 , -34.91
+533.94 , -359.54 , -15.95
+533.94 , -71.91 , 0.00
+533.94 , 67.66 , 6.58
+533.94 , 338.29 , 23.25
+533.94 , 676.58 , 43.76
+533.94 , 1014.86 , 64.29
+533.94 , 1353.15 , 84.87
+533.94 , 1691.44 , 105.52
+533.94 , 2029.73 , 126.22
+533.94 , 2368.01 , 146.98
+533.94 , 2706.30 , 167.81
+533.94 , 3044.59 , 188.70
+533.94 , 3382.88 , 209.65
+533.94 , 3721.16 , 230.66
+533.94 , 4059.45 , 251.73
+533.94 , 4397.74 , 272.87
+533.94 , 4736.03 , 294.07
+533.94 , 5074.31 , 315.33
+533.94 , 5412.60 , 336.65
+533.94 , 5750.89 , 358.03
+533.94 , 6089.18 , 379.47
+533.94 , 6427.46 , 400.98
+533.94 , 6765.75 , 422.54
+622.93 , -7190.72 , -423.69
+622.93 , -6831.19 , -403.04
+622.93 , -6471.65 , -382.31
+622.93 , -6112.11 , -361.50
+622.93 , -5752.58 , -340.62
+622.93 , -5393.04 , -319.66
+622.93 , -5033.51 , -298.62
+622.93 , -4673.97 , -277.51
+622.93 , -4314.43 , -256.31
+622.93 , -3954.90 , -235.05
+622.93 , -3595.36 , -213.70
+622.93 , -3235.82 , -192.28
+622.93 , -2876.29 , -170.79
+622.93 , -2516.75 , -149.21
+622.93 , -2157.22 , -127.57
+622.93 , -1797.68 , -105.84
+622.93 , -1438.14 , -84.03
+622.93 , -1078.61 , -62.14
+622.93 , -719.07 , -40.16
+622.93 , -359.54 , -18.00
+622.93 , -71.91 , 0.00
+622.93 , 67.66 , 8.09
+622.93 , 338.29 , 27.64
+622.93 , 676.58 , 51.59
+622.93 , 1014.86 , 75.56
+622.93 , 1353.15 , 99.58
+622.93 , 1691.44 , 123.68
+622.93 , 2029.73 , 147.86
+622.93 , 2368.01 , 172.10
+622.93 , 2706.30 , 196.43
+622.93 , 3044.59 , 220.84
+622.93 , 3382.88 , 245.32
+622.93 , 3721.16 , 269.88
+622.93 , 4059.45 , 294.51
+622.93 , 4397.74 , 319.23
+622.93 , 4736.03 , 344.02
+622.93 , 5074.31 , 368.89
+622.93 , 5412.60 , 393.83
+622.93 , 5750.89 , 418.85
+622.93 , 6089.18 , 443.95
+622.93 , 6427.46 , 469.13
+622.93 , 6765.75 , 494.38
+711.92 , -7190.72 , -482.31
+711.92 , -6831.19 , -458.83
+711.92 , -6471.65 , -435.26
+711.92 , -6112.11 , -411.59
+711.92 , -5752.58 , -387.83
+711.92 , -5393.04 , -363.97
+711.92 , -5033.51 , -340.02
+711.92 , -4673.97 , -315.97
+711.92 , -4314.43 , -291.83
+711.92 , -3954.90 , -267.59
+711.92 , -3595.36 , -243.26
+711.92 , -3235.82 , -218.84
+711.92 , -2876.29 , -194.32
+711.92 , -2516.75 , -169.71
+711.92 , -2157.22 , -145.00
+711.92 , -1797.68 , -120.19
+711.92 , -1438.14 , -95.29
+711.92 , -1078.61 , -70.28
+711.92 , -719.07 , -45.14
+711.92 , -359.54 , -19.76
+711.92 , -71.91 , 0.00
+711.92 , 67.66 , 9.76
+711.92 , 338.29 , 32.25
+711.92 , 676.58 , 59.66
+711.92 , 1014.86 , 87.07
+711.92 , 1353.15 , 114.55
+711.92 , 1691.44 , 142.11
+711.92 , 2029.73 , 169.77
+711.92 , 2368.01 , 197.52
+711.92 , 2706.30 , 225.37
+711.92 , 3044.59 , 253.31
+711.92 , 3382.88 , 281.34
+711.92 , 3721.16 , 309.47
+711.92 , 4059.45 , 337.70
+711.92 , 4397.74 , 366.02
+711.92 , 4736.03 , 394.44
+711.92 , 5074.31 , 422.95
+711.92 , 5412.60 , 451.56
+711.92 , 5750.89 , 480.26
+711.92 , 6089.18 , 509.05
+711.92 , 6427.46 , 537.94
+711.92 , 6765.75 , 566.93
+800.91 , -7190.72 , -540.17
+800.91 , -6831.19 , -513.92
+800.91 , -6471.65 , -487.55
+800.91 , -6112.11 , -461.06
+800.91 , -5752.58 , -434.46
+800.91 , -5393.04 , -407.75
+800.91 , -5033.51 , -380.92
+800.91 , -4673.97 , -353.97
+800.91 , -4314.43 , -326.91
+800.91 , -3954.90 , -299.73
+800.91 , -3595.36 , -272.44
+800.91 , -3235.82 , -245.03
+800.91 , -2876.29 , -217.51
+800.91 , -2516.75 , -189.87
+800.91 , -2157.22 , -162.12
+800.91 , -1797.68 , -134.25
+800.91 , -1438.14 , -106.26
+800.91 , -1078.61 , -78.13
+800.91 , -719.07 , -49.84
+800.91 , -359.54 , -21.19
+800.91 , -71.91 , 0.00
+800.91 , 67.66 , 11.59
+800.91 , 338.29 , 37.10
+800.91 , 676.58 , 67.98
+800.91 , 1014.86 , 98.85
+800.91 , 1353.15 , 129.79
+800.91 , 1691.44 , 160.84
+800.91 , 2029.73 , 191.99
+800.91 , 2368.01 , 223.26
+800.91 , 2706.30 , 254.64
+800.91 , 3044.59 , 286.14
+800.91 , 3382.88 , 317.75
+800.91 , 3721.16 , 349.48
+800.91 , 4059.45 , 381.32
+800.91 , 4397.74 , 413.28
+800.91 , 4736.03 , 445.36
+800.91 , 5074.31 , 477.54
+800.91 , 5412.60 , 509.85
+800.91 , 5750.89 , 542.27
+800.91 , 6089.18 , 574.80
+800.91 , 6427.46 , 607.45
+800.91 , 6765.75 , 640.21
+889.90 , -7190.72 , -597.26
+889.90 , -6831.19 , -568.28
+889.90 , -6471.65 , -539.16
+889.90 , -6112.11 , -509.90
+889.90 , -5752.58 , -480.50
+889.90 , -5393.04 , -450.96
+889.90 , -5033.51 , -421.28
+889.90 , -4673.97 , -391.47
+889.90 , -4314.43 , -361.52
+889.90 , -3954.90 , -331.43
+889.90 , -3595.36 , -301.20
+889.90 , -3235.82 , -270.83
+889.90 , -2876.29 , -240.33
+889.90 , -2516.75 , -209.68
+889.90 , -2157.22 , -178.90
+889.90 , -1797.68 , -147.97
+889.90 , -1438.14 , -116.90
+889.90 , -1078.61 , -85.66
+889.90 , -719.07 , -54.21
+889.90 , -359.54 , -22.23
+889.90 , -71.91 , 0.00
+889.90 , 67.66 , 13.60
+889.90 , 338.29 , 42.20
+889.90 , 676.58 , 76.58
+889.90 , 1014.86 , 110.92
+889.90 , 1353.15 , 145.34
+889.90 , 1691.44 , 179.88
+889.90 , 2029.73 , 214.55
+889.90 , 2368.01 , 249.35
+889.90 , 2706.30 , 284.29
+889.90 , 3044.59 , 319.36
+889.90 , 3382.88 , 354.57
+889.90 , 3721.16 , 389.92
+889.90 , 4059.45 , 425.41
+889.90 , 4397.74 , 461.03
+889.90 , 4736.03 , 496.79
+889.90 , 5074.31 , 532.69
+889.90 , 5412.60 , 568.73
+889.90 , 5750.89 , 604.90
+889.90 , 6089.18 , 641.21
+889.90 , 6427.46 , 677.66
+889.90 , 6765.75 , 714.24
+978.89 , -7190.72 , -653.54
+978.89 , -6831.19 , -621.88
+978.89 , -6471.65 , -590.05
+978.89 , -6112.11 , -558.06
+978.89 , -5752.58 , -525.90
+978.89 , -5393.04 , -493.58
+978.89 , -5033.51 , -461.09
+978.89 , -4673.97 , -428.44
+978.89 , -4314.43 , -395.63
+978.89 , -3954.90 , -362.65
+978.89 , -3595.36 , -329.51
+978.89 , -3235.82 , -296.21
+978.89 , -2876.29 , -262.74
+978.89 , -2516.75 , -229.11
+978.89 , -2157.22 , -195.31
+978.89 , -1797.68 , -161.34
+978.89 , -1438.14 , -127.18
+978.89 , -1078.61 , -92.83
+978.89 , -719.07 , -58.20
+978.89 , -359.54 , -22.82
+978.89 , -71.91 , 0.00
+978.89 , 67.66 , 15.79
+978.89 , 338.29 , 47.58
+978.89 , 676.58 , 85.48
+978.89 , 1014.86 , 123.30
+978.89 , 1353.15 , 161.22
+978.89 , 1691.44 , 199.26
+978.89 , 2029.73 , 237.46
+978.89 , 2368.01 , 275.81
+978.89 , 2706.30 , 314.32
+978.89 , 3044.59 , 352.99
+978.89 , 3382.88 , 391.83
+978.89 , 3721.16 , 430.82
+978.89 , 4059.45 , 469.98
+978.89 , 4397.74 , 509.30
+978.89 , 4736.03 , 548.78
+978.89 , 5074.31 , 588.42
+978.89 , 5412.60 , 628.23
+978.89 , 5750.89 , 668.20
+978.89 , 6089.18 , 708.32
+978.89 , 6427.46 , 748.61
+978.89 , 6765.75 , 789.06
+1067.88 , -7190.72 , -708.97
+1067.88 , -6831.19 , -674.68
+1067.88 , -6471.65 , -640.19
+1067.88 , -6112.11 , -605.51
+1067.88 , -5752.58 , -570.63
+1067.88 , -5393.04 , -535.56
+1067.88 , -5033.51 , -500.30
+1067.88 , -4673.97 , -464.85
+1067.88 , -4314.43 , -429.21
+1067.88 , -3954.90 , -393.37
+1067.88 , -3595.36 , -357.35
+1067.88 , -3235.82 , -321.13
+1067.88 , -2876.29 , -284.71
+1067.88 , -2516.75 , -248.11
+1067.88 , -2157.22 , -211.31
+1067.88 , -1797.68 , -174.30
+1067.88 , -1438.14 , -137.08
+1067.88 , -1078.61 , -99.61
+1067.88 , -719.07 , -61.78
+1067.88 , -359.54 , -22.86
+1067.88 , -71.91 , 0.00
+1067.88 , 67.66 , 18.17
+1067.88 , 338.29 , 53.24
+1067.88 , 676.58 , 94.71
+1067.88 , 1014.86 , 136.03
+1067.88 , 1353.15 , 177.45
+1067.88 , 1691.44 , 219.01
+1067.88 , 2029.73 , 260.75
+1067.88 , 2368.01 , 302.67
+1067.88 , 2706.30 , 344.78
+1067.88 , 3044.59 , 387.07
+1067.88 , 3382.88 , 429.54
+1067.88 , 3721.16 , 472.21
+1067.88 , 4059.45 , 515.06
+1067.88 , 4397.74 , 558.11
+1067.88 , 4736.03 , 601.34
+1067.88 , 5074.31 , 644.76
+1067.88 , 5412.60 , 688.37
+1067.88 , 5750.89 , 732.17
+1067.88 , 6089.18 , 776.15
+1067.88 , 6427.46 , 820.33
+1067.88 , 6765.75 , 864.69
+1156.87 , -7190.72 , -763.53
+1156.87 , -6831.19 , -726.65
+1156.87 , -6471.65 , -689.55
+1156.87 , -6112.11 , -652.22
+1156.87 , -5752.58 , -614.67
+1156.87 , -5393.04 , -576.89
+1156.87 , -5033.51 , -538.89
+1156.87 , -4673.97 , -500.67
+1156.87 , -4314.43 , -462.22
+1156.87 , -3954.90 , -423.56
+1156.87 , -3595.36 , -384.67
+1156.87 , -3235.82 , -345.56
+1156.87 , -2876.29 , -306.22
+1156.87 , -2516.75 , -266.66
+1156.87 , -2157.22 , -226.86
+1156.87 , -1797.68 , -186.83
+1156.87 , -1438.14 , -146.54
+1156.87 , -1078.61 , -105.95
+1156.87 , -719.07 , -64.90
+1156.87 , -359.54 , -22.24
+1156.87 , -71.91 , 0.00
+1156.87 , 67.66 , 20.74
+1156.87 , 338.29 , 59.20
+1156.87 , 676.58 , 104.27
+1156.87 , 1014.86 , 149.12
+1156.87 , 1353.15 , 194.05
+1156.87 , 1691.44 , 239.16
+1156.87 , 2029.73 , 284.45
+1156.87 , 2368.01 , 329.96
+1156.87 , 2706.30 , 375.67
+1156.87 , 3044.59 , 421.60
+1156.87 , 3382.88 , 467.75
+1156.87 , 3721.16 , 514.11
+1156.87 , 4059.45 , 560.69
+1156.87 , 4397.74 , 607.48
+1156.87 , 4736.03 , 654.50
+1156.87 , 5074.31 , 701.73
+1156.87 , 5412.60 , 749.18
+1156.87 , 5750.89 , 796.84
+1156.87 , 6089.18 , 844.73
+1156.87 , 6427.46 , 892.83
+1156.87 , 6765.75 , 941.14
+1245.86 , -7190.72 , -817.17
+1245.86 , -6831.19 , -777.76
+1245.86 , -6471.65 , -738.08
+1245.86 , -6112.11 , -698.15
+1245.86 , -5752.58 , -657.96
+1245.86 , -5393.04 , -617.52
+1245.86 , -5033.51 , -576.82
+1245.86 , -4673.97 , -535.86
+1245.86 , -4314.43 , -494.65
+1245.86 , -3954.90 , -453.18
+1245.86 , -3595.36 , -411.45
+1245.86 , -3235.82 , -369.47
+1245.86 , -2876.29 , -327.22
+1245.86 , -2516.75 , -284.72
+1245.86 , -2157.22 , -241.95
+1245.86 , -1797.68 , -198.90
+1245.86 , -1438.14 , -155.54
+1245.86 , -1078.61 , -111.82
+1245.86 , -719.07 , -67.51
+1245.86 , -359.54 , -20.80
+1245.86 , -71.91 , 0.00
+1245.86 , 67.66 , 23.52
+1245.86 , 338.29 , 65.48
+1245.86 , 676.58 , 114.20
+1245.86 , 1014.86 , 162.59
+1245.86 , 1353.15 , 211.06
+1245.86 , 1691.44 , 259.72
+1245.86 , 2029.73 , 308.59
+1245.86 , 2368.01 , 357.69
+1245.86 , 2706.30 , 407.04
+1245.86 , 3044.59 , 456.62
+1245.86 , 3382.88 , 506.46
+1245.86 , 3721.16 , 556.54
+1245.86 , 4059.45 , 606.87
+1245.86 , 4397.74 , 657.45
+1245.86 , 4736.03 , 708.28
+1245.86 , 5074.31 , 759.35
+1245.86 , 5412.60 , 810.68
+1245.86 , 5750.89 , 862.25
+1245.86 , 6089.18 , 914.07
+1245.86 , 6427.46 , 966.13
+1245.86 , 6765.75 , 1018.44
+1334.85 , -7190.72 , -869.86
+1334.85 , -6831.19 , -827.96
+1334.85 , -6471.65 , -785.77
+1334.85 , -6112.11 , -743.28
+1334.85 , -5752.58 , -700.50
+1334.85 , -5393.04 , -657.42
+1334.85 , -5033.51 , -614.05
+1334.85 , -4673.97 , -570.39
+1334.85 , -4314.43 , -526.44
+1334.85 , -3954.90 , -482.19
+1334.85 , -3595.36 , -437.65
+1334.85 , -3235.82 , -392.82
+1334.85 , -2876.29 , -347.69
+1334.85 , -2516.75 , -302.26
+1334.85 , -2157.22 , -256.52
+1334.85 , -1797.68 , -210.46
+1334.85 , -1438.14 , -164.04
+1334.85 , -1078.61 , -117.17
+1334.85 , -719.07 , -69.54
+1334.85 , -359.54 , -18.27
+1334.85 , -71.91 , 0.00
+1334.85 , 67.66 , 26.49
+1334.85 , 338.29 , 72.10
+1334.85 , 676.58 , 124.50
+1334.85 , 1014.86 , 176.46
+1334.85 , 1353.15 , 228.49
+1334.85 , 1691.44 , 280.71
+1334.85 , 2029.73 , 333.18
+1334.85 , 2368.01 , 385.90
+1334.85 , 2706.30 , 438.89
+1334.85 , 3044.59 , 492.16
+1334.85 , 3382.88 , 545.71
+1334.85 , 3721.16 , 599.54
+1334.85 , 4059.45 , 653.64
+1334.85 , 4397.74 , 708.03
+1334.85 , 4736.03 , 762.71
+1334.85 , 5074.31 , 817.66
+1334.85 , 5412.60 , 872.89
+1334.85 , 5750.89 , 928.41
+1334.85 , 6089.18 , 984.20
+1334.85 , 6427.46 , 1040.27
+1334.85 , 6765.75 , 1096.63
+1423.84 , -7190.72 , -921.56
+1423.84 , -6831.19 , -877.23
+1423.84 , -6471.65 , -832.56
+1423.84 , -6112.11 , -787.56
+1423.84 , -5752.58 , -742.22
+1423.84 , -5393.04 , -696.56
+1423.84 , -5033.51 , -650.56
+1423.84 , -4673.97 , -604.23
+1423.84 , -4314.43 , -557.56
+1423.84 , -3954.90 , -510.57
+1423.84 , -3595.36 , -463.24
+1423.84 , -3235.82 , -415.58
+1423.84 , -2876.29 , -367.58
+1423.84 , -2516.75 , -319.24
+1423.84 , -2157.22 , -270.55
+1423.84 , -1797.68 , -221.48
+1423.84 , -1438.14 , -171.99
+1423.84 , -1078.61 , -121.95
+1423.84 , -719.07 , -70.93
+1423.84 , -359.54 , -14.10
+1423.84 , -71.91 , 0.00
+1423.84 , 67.66 , 29.68
+1423.84 , 338.29 , 79.05
+1423.84 , 676.58 , 135.20
+1423.84 , 1014.86 , 190.76
+1423.84 , 1353.15 , 246.36
+1423.84 , 1691.44 , 302.17
+1423.84 , 2029.73 , 358.24
+1423.84 , 2368.01 , 414.60
+1423.84 , 2706.30 , 471.27
+1423.84 , 3044.59 , 528.24
+1423.84 , 3382.88 , 585.52
+1423.84 , 3721.16 , 643.12
+1423.84 , 4059.45 , 701.03
+1423.84 , 4397.74 , 759.26
+1423.84 , 4736.03 , 817.80
+1423.84 , 5074.31 , 876.66
+1423.84 , 5412.60 , 935.84
+1423.84 , 5750.89 , 995.34
+1423.84 , 6089.18 , 1055.15
+1423.84 , 6427.46 , 1115.27
+1423.84 , 6765.75 , 1175.71
+1512.83 , -7190.72 , -972.24
+1512.83 , -6831.19 , -925.52
+1512.83 , -6471.65 , -878.43
+1512.83 , -6112.11 , -830.96
+1512.83 , -5752.58 , -783.11
+1512.83 , -5393.04 , -734.89
+1512.83 , -5033.51 , -686.30
+1512.83 , -4673.97 , -637.33
+1512.83 , -4314.43 , -587.99
+1512.83 , -3954.90 , -538.28
+1512.83 , -3595.36 , -488.19
+1512.83 , -3235.82 , -437.72
+1512.83 , -2876.29 , -386.87
+1512.83 , -2516.75 , -335.63
+1512.83 , -2157.22 , -283.99
+1512.83 , -1797.68 , -231.92
+1512.83 , -1438.14 , -179.35
+1512.83 , -1078.61 , -126.12
+1512.83 , -719.07 , -71.60
+1512.83 , -359.54 , -6.45
+1512.83 , -71.91 , 0.00
+1512.83 , 67.66 , 33.08
+1512.83 , 338.29 , 86.37
+1512.83 , 676.58 , 146.31
+1512.83 , 1014.86 , 205.50
+1512.83 , 1353.15 , 264.70
+1512.83 , 1691.44 , 324.11
+1512.83 , 2029.73 , 383.81
+1512.83 , 2368.01 , 443.83
+1512.83 , 2706.30 , 504.18
+1512.83 , 3044.59 , 564.87
+1512.83 , 3382.88 , 625.91
+1512.83 , 3721.16 , 687.30
+1512.83 , 4059.45 , 749.05
+1512.83 , 4397.74 , 811.14
+1512.83 , 4736.03 , 873.59
+1512.83 , 5074.31 , 936.40
+1512.83 , 5412.60 , 999.56
+1512.83 , 5750.89 , 1063.07
+1512.83 , 6089.18 , 1126.93
+1512.83 , 6427.46 , 1191.14
+1512.83 , 6765.75 , 1255.71
+1601.82 , -7190.72 , -1021.86
+1601.82 , -6831.19 , -972.81
+1601.82 , -6471.65 , -923.33
+1601.82 , -6112.11 , -873.44
+1601.82 , -5752.58 , -823.13
+1601.82 , -5393.04 , -772.39
+1601.82 , -5033.51 , -721.24
+1601.82 , -4673.97 , -669.67
+1601.82 , -4314.43 , -617.68
+1601.82 , -3954.90 , -565.27
+1601.82 , -3595.36 , -512.45
+1601.82 , -3235.82 , -459.19
+1601.82 , -2876.29 , -405.51
+1601.82 , -2516.75 , -351.39
+1601.82 , -2157.22 , -296.81
+1601.82 , -1797.68 , -241.73
+1601.82 , -1438.14 , -186.07
+1601.82 , -1078.61 , -129.61
+1601.82 , -719.07 , -71.46
+1601.82 , -359.54 , 0.00
+1601.82 , -71.91 , 0.00
+1601.82 , 67.66 , 36.70
+1601.82 , 338.29 , 94.04
+1601.82 , 676.58 , 157.85
+1601.82 , 1014.86 , 220.70
+1601.82 , 1353.15 , 283.52
+1601.82 , 1691.44 , 346.56
+1601.82 , 2029.73 , 409.90
+1601.82 , 2368.01 , 473.59
+1601.82 , 2706.30 , 537.65
+1601.82 , 3044.59 , 602.09
+1601.82 , 3382.88 , 666.91
+1601.82 , 3721.16 , 732.12
+1601.82 , 4059.45 , 797.72
+1601.82 , 4397.74 , 863.72
+1601.82 , 4736.03 , 930.10
+1601.82 , 5074.31 , 996.88
+1601.82 , 5412.60 , 1064.05
+1601.82 , 5750.89 , 1131.62
+1601.82 , 6089.18 , 1199.57
+1601.82 , 6427.46 , 1267.92
+1601.82 , 6765.75 , 1336.65
+1690.81 , -7190.72 , -1070.37
+1690.81 , -6831.19 , -1019.04
+1690.81 , -6471.65 , -967.24
+1690.81 , -6112.11 , -914.96
+1690.81 , -5752.58 , -862.23
+1690.81 , -5393.04 , -809.02
+1690.81 , -5033.51 , -755.35
+1690.81 , -4673.97 , -701.21
+1690.81 , -4314.43 , -646.60
+1690.81 , -3954.90 , -591.53
+1690.81 , -3595.36 , -535.99
+1690.81 , -3235.82 , -479.97
+1690.81 , -2876.29 , -423.47
+1690.81 , -2516.75 , -366.48
+1690.81 , -2157.22 , -308.96
+1690.81 , -1797.68 , -250.88
+1690.81 , -1438.14 , -192.11
+1690.81 , -1078.61 , -132.36
+1690.81 , -719.07 , -70.38
+1690.81 , -359.54 , 0.00
+1690.81 , -71.91 , 0.00
+1690.81 , 67.66 , 40.53
+1690.81 , 338.29 , 102.10
+1690.81 , 676.58 , 169.83
+1690.81 , 1014.86 , 236.37
+1690.81 , 1353.15 , 302.84
+1690.81 , 1691.44 , 369.53
+1690.81 , 2029.73 , 436.54
+1690.81 , 2368.01 , 503.92
+1690.81 , 2706.30 , 571.71
+1690.81 , 3044.59 , 639.91
+1690.81 , 3382.88 , 708.54
+1690.81 , 3721.16 , 777.59
+1690.81 , 4059.45 , 847.08
+1690.81 , 4397.74 , 917.00
+1690.81 , 4736.03 , 987.35
+1690.81 , 5074.31 , 1058.14
+1690.81 , 5412.60 , 1129.36
+1690.81 , 5750.89 , 1201.01
+1690.81 , 6089.18 , 1273.09
+1690.81 , 6427.46 , 1345.61
+1690.81 , 6765.75 , 1418.56
+1779.80 , -7190.72 , -1117.74
+1779.80 , -6831.19 , -1064.18
+1779.80 , -6471.65 , -1010.10
+1779.80 , -6112.11 , -955.49
+1779.80 , -5752.58 , -900.37
+1779.80 , -5393.04 , -844.73
+1779.80 , -5033.51 , -788.58
+1779.80 , -4673.97 , -731.90
+1779.80 , -4314.43 , -674.71
+1779.80 , -3954.90 , -617.00
+1779.80 , -3595.36 , -558.77
+1779.80 , -3235.82 , -500.01
+1779.80 , -2876.29 , -440.71
+1779.80 , -2516.75 , -380.85
+1779.80 , -2157.22 , -320.40
+1779.80 , -1797.68 , -259.31
+1779.80 , -1438.14 , -197.41
+1779.80 , -1078.61 , -134.30
+1779.80 , -719.07 , -68.24
+1779.80 , -359.54 , 0.00
+1779.80 , -71.91 , 0.00
+1779.80 , 67.66 , 44.59
+1779.80 , 338.29 , 110.53
+1779.80 , 676.58 , 182.27
+1779.80 , 1014.86 , 252.55
+1779.80 , 1353.15 , 322.69
+1779.80 , 1691.44 , 393.04
+1779.80 , 2029.73 , 463.74
+1779.80 , 2368.01 , 534.84
+1779.80 , 2706.30 , 606.37
+1779.80 , 3044.59 , 678.37
+1779.80 , 3382.88 , 750.82
+1779.80 , 3721.16 , 823.74
+1779.80 , 4059.45 , 897.14
+1779.80 , 4397.74 , 971.01
+1779.80 , 4736.03 , 1045.36
+1779.80 , 5074.31 , 1120.19
+1779.80 , 5412.60 , 1195.49
+1779.80 , 5750.89 , 1271.27
+1779.80 , 6089.18 , 1347.52
+1779.80 , 6427.46 , 1424.25
+1779.80 , 6765.75 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_3.viepco b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_3.viepco
new file mode 100644
index 0000000000000000000000000000000000000000..0bcfef3ae913c68f305349289ee722f6d8f67f8f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_3.viepco
@@ -0,0 +1,925 @@
+n_out , T_out , P_el
+0.00 , -4193.88 , 0.00
+0.00 , -3984.18 , 0.00
+0.00 , -3774.49 , 0.00
+0.00 , -3564.80 , 0.00
+0.00 , -3355.10 , 0.00
+0.00 , -3145.41 , 0.00
+0.00 , -2935.71 , -0.13
+0.00 , -2726.02 , -0.66
+0.00 , -2516.33 , -0.98
+0.00 , -2306.63 , -1.19
+0.00 , -2096.94 , -1.32
+0.00 , -1887.24 , -1.38
+0.00 , -1677.55 , -1.39
+0.00 , -1467.86 , -1.35
+0.00 , -1258.16 , -1.26
+0.00 , -1048.47 , -1.13
+0.00 , -838.78 , -0.97
+0.00 , -629.08 , -0.77
+0.00 , -419.39 , -0.53
+0.00 , -209.69 , -0.27
+0.00 , -41.94 , -0.02
+0.00 , 40.28 , 0.13
+0.00 , 201.39 , 0.56
+0.00 , 402.78 , 1.12
+0.00 , 604.17 , 1.70
+0.00 , 805.56 , 2.31
+0.00 , 1006.95 , 2.93
+0.00 , 1208.34 , 3.58
+0.00 , 1409.73 , 4.25
+0.00 , 1611.12 , 4.93
+0.00 , 1812.51 , 5.64
+0.00 , 2013.90 , 6.37
+0.00 , 2215.29 , 7.12
+0.00 , 2416.68 , 7.88
+0.00 , 2618.07 , 8.67
+0.00 , 2819.46 , 9.47
+0.00 , 3020.85 , 10.29
+0.00 , 3222.24 , 11.13
+0.00 , 3423.63 , 11.99
+0.00 , 3625.02 , 12.87
+0.00 , 3826.41 , 13.76
+0.00 , 4027.80 , 14.67
+15.10 , -4193.88 , 0.00
+15.10 , -3984.18 , 0.00
+15.10 , -3774.49 , 0.00
+15.10 , -3564.80 , 0.00
+15.10 , -3355.10 , 0.00
+15.10 , -3145.41 , 0.00
+15.10 , -2935.71 , -0.50
+15.10 , -2726.02 , -0.84
+15.10 , -2516.33 , -1.04
+15.10 , -2306.63 , -1.16
+15.10 , -2096.94 , -1.22
+15.10 , -1887.24 , -1.24
+15.10 , -1677.55 , -1.21
+15.10 , -1467.86 , -1.15
+15.10 , -1258.16 , -1.06
+15.10 , -1048.47 , -0.94
+15.10 , -838.78 , -0.80
+15.10 , -629.08 , -0.62
+15.10 , -419.39 , -0.43
+15.10 , -209.69 , -0.21
+15.10 , -41.94 , -0.02
+15.10 , 40.28 , 0.10
+15.10 , 201.39 , 0.43
+15.10 , 402.78 , 0.85
+15.10 , 604.17 , 1.30
+15.10 , 805.56 , 1.75
+15.10 , 1006.95 , 2.23
+15.10 , 1208.34 , 2.71
+15.10 , 1409.73 , 3.21
+15.10 , 1611.12 , 3.73
+15.10 , 1812.51 , 4.26
+15.10 , 2013.90 , 4.80
+15.10 , 2215.29 , 5.36
+15.10 , 2416.68 , 5.93
+15.10 , 2618.07 , 6.52
+15.10 , 2819.46 , 7.12
+15.10 , 3020.85 , 7.73
+15.10 , 3222.24 , 8.35
+15.10 , 3423.63 , 8.99
+15.10 , 3625.02 , 9.64
+15.10 , 3826.41 , 10.30
+15.10 , 4027.80 , 10.98
+151.02 , -4193.88 , -58.10
+151.02 , -3984.18 , -55.37
+151.02 , -3774.49 , -52.62
+151.02 , -3564.80 , -49.85
+151.02 , -3355.10 , -47.06
+151.02 , -3145.41 , -44.25
+151.02 , -2935.71 , -41.42
+151.02 , -2726.02 , -38.57
+151.02 , -2516.33 , -35.70
+151.02 , -2306.63 , -32.81
+151.02 , -2096.94 , -29.90
+151.02 , -1887.24 , -26.98
+151.02 , -1677.55 , -24.03
+151.02 , -1467.86 , -21.07
+151.02 , -1258.16 , -18.08
+151.02 , -1048.47 , -15.08
+151.02 , -838.78 , -12.06
+151.02 , -629.08 , -9.02
+151.02 , -419.39 , -5.96
+151.02 , -209.69 , -2.88
+151.02 , -41.94 , -0.37
+151.02 , 40.28 , 0.90
+151.02 , 201.39 , 3.68
+151.02 , 402.78 , 7.16
+151.02 , 604.17 , 10.66
+151.02 , 805.56 , 14.17
+151.02 , 1006.95 , 17.71
+151.02 , 1208.34 , 21.26
+151.02 , 1409.73 , 24.84
+151.02 , 1611.12 , 28.43
+151.02 , 1812.51 , 32.04
+151.02 , 2013.90 , 35.67
+151.02 , 2215.29 , 39.32
+151.02 , 2416.68 , 42.99
+151.02 , 2618.07 , 46.68
+151.02 , 2819.46 , 50.38
+151.02 , 3020.85 , 54.11
+151.02 , 3222.24 , 57.85
+151.02 , 3423.63 , 61.61
+151.02 , 3625.02 , 65.39
+151.02 , 3826.41 , 69.19
+151.02 , 4027.80 , 73.01
+302.05 , -4193.88 , -120.57
+302.05 , -3984.18 , -114.73
+302.05 , -3774.49 , -108.87
+302.05 , -3564.80 , -102.99
+302.05 , -3355.10 , -97.08
+302.05 , -3145.41 , -91.15
+302.05 , -2935.71 , -85.20
+302.05 , -2726.02 , -79.23
+302.05 , -2516.33 , -73.23
+302.05 , -2306.63 , -67.21
+302.05 , -2096.94 , -61.17
+302.05 , -1887.24 , -55.10
+302.05 , -1677.55 , -49.01
+302.05 , -1467.86 , -42.90
+302.05 , -1258.16 , -36.77
+302.05 , -1048.47 , -30.61
+302.05 , -838.78 , -24.43
+302.05 , -629.08 , -18.23
+302.05 , -419.39 , -12.01
+302.05 , -209.69 , -5.76
+302.05 , -41.94 , -0.66
+302.05 , 40.28 , 1.84
+302.05 , 201.39 , 7.35
+302.05 , 402.78 , 14.22
+302.05 , 604.17 , 21.11
+302.05 , 805.56 , 28.02
+302.05 , 1006.95 , 34.96
+302.05 , 1208.34 , 41.92
+302.05 , 1409.73 , 48.90
+302.05 , 1611.12 , 55.90
+302.05 , 1812.51 , 62.93
+302.05 , 2013.90 , 69.98
+302.05 , 2215.29 , 77.05
+302.05 , 2416.68 , 84.15
+302.05 , 2618.07 , 91.27
+302.05 , 2819.46 , 98.41
+302.05 , 3020.85 , 105.58
+302.05 , 3222.24 , 112.76
+302.05 , 3423.63 , 119.97
+302.05 , 3625.02 , 127.21
+302.05 , 3826.41 , 134.46
+302.05 , 4027.80 , 141.74
+453.07 , -4193.88 , -182.44
+453.07 , -3984.18 , -173.55
+453.07 , -3774.49 , -164.62
+453.07 , -3564.80 , -155.67
+453.07 , -3355.10 , -146.69
+453.07 , -3145.41 , -137.68
+453.07 , -2935.71 , -128.65
+453.07 , -2726.02 , -119.58
+453.07 , -2516.33 , -110.49
+453.07 , -2306.63 , -101.36
+453.07 , -2096.94 , -92.21
+453.07 , -1887.24 , -83.03
+453.07 , -1677.55 , -73.82
+453.07 , -1467.86 , -64.58
+453.07 , -1258.16 , -55.31
+453.07 , -1048.47 , -46.02
+453.07 , -838.78 , -36.70
+453.07 , -629.08 , -27.34
+453.07 , -419.39 , -17.96
+453.07 , -209.69 , -8.54
+453.07 , -41.94 , -0.79
+453.07 , 40.28 , 2.86
+453.07 , 201.39 , 11.12
+453.07 , 402.78 , 21.39
+453.07 , 604.17 , 31.68
+453.07 , 805.56 , 41.99
+453.07 , 1006.95 , 52.34
+453.07 , 1208.34 , 62.71
+453.07 , 1409.73 , 73.12
+453.07 , 1611.12 , 83.55
+453.07 , 1812.51 , 94.01
+453.07 , 2013.90 , 104.50
+453.07 , 2215.29 , 115.02
+453.07 , 2416.68 , 125.57
+453.07 , 2618.07 , 136.15
+453.07 , 2819.46 , 146.76
+453.07 , 3020.85 , 157.40
+453.07 , 3222.24 , 168.06
+453.07 , 3423.63 , 178.76
+453.07 , 3625.02 , 189.48
+453.07 , 3826.41 , 200.23
+453.07 , 4027.80 , 211.02
+604.09 , -4193.88 , -243.71
+604.09 , -3984.18 , -231.81
+604.09 , -3774.49 , -219.87
+604.09 , -3564.80 , -207.89
+604.09 , -3355.10 , -195.88
+604.09 , -3145.41 , -183.83
+604.09 , -2935.71 , -171.74
+604.09 , -2726.02 , -159.61
+604.09 , -2516.33 , -147.45
+604.09 , -2306.63 , -135.25
+604.09 , -2096.94 , -123.01
+604.09 , -1887.24 , -110.74
+604.09 , -1677.55 , -98.43
+604.09 , -1467.86 , -86.08
+604.09 , -1258.16 , -73.70
+604.09 , -1048.47 , -61.27
+604.09 , -838.78 , -48.82
+604.09 , -629.08 , -36.32
+604.09 , -419.39 , -23.78
+604.09 , -209.69 , -11.19
+604.09 , -41.94 , -0.63
+604.09 , 40.28 , 3.98
+604.09 , 201.39 , 15.01
+604.09 , 402.78 , 28.68
+604.09 , 604.17 , 42.37
+604.09 , 805.56 , 56.10
+604.09 , 1006.95 , 69.87
+604.09 , 1208.34 , 83.67
+604.09 , 1409.73 , 97.52
+604.09 , 1611.12 , 111.40
+604.09 , 1812.51 , 125.31
+604.09 , 2013.90 , 139.27
+604.09 , 2215.29 , 153.26
+604.09 , 2416.68 , 167.29
+604.09 , 2618.07 , 181.36
+604.09 , 2819.46 , 195.46
+604.09 , 3020.85 , 209.61
+604.09 , 3222.24 , 223.79
+604.09 , 3423.63 , 238.01
+604.09 , 3625.02 , 252.26
+604.09 , 3826.41 , 266.56
+604.09 , 4027.80 , 280.89
+755.11 , -4193.88 , -304.37
+755.11 , -3984.18 , -289.50
+755.11 , -3774.49 , -274.59
+755.11 , -3564.80 , -259.63
+755.11 , -3355.10 , -244.61
+755.11 , -3145.41 , -229.56
+755.11 , -2935.71 , -214.45
+755.11 , -2726.02 , -199.30
+755.11 , -2516.33 , -184.10
+755.11 , -2306.63 , -168.85
+755.11 , -2096.94 , -153.55
+755.11 , -1887.24 , -138.20
+755.11 , -1677.55 , -122.81
+755.11 , -1467.86 , -107.37
+755.11 , -1258.16 , -91.88
+755.11 , -1048.47 , -76.35
+755.11 , -838.78 , -60.76
+755.11 , -629.08 , -45.13
+755.11 , -419.39 , -29.44
+755.11 , -209.69 , -13.67
+755.11 , -41.94 , 0.00
+755.11 , 40.28 , 5.21
+755.11 , 201.39 , 19.04
+755.11 , 402.78 , 36.13
+755.11 , 604.17 , 53.24
+755.11 , 805.56 , 70.39
+755.11 , 1006.95 , 87.59
+755.11 , 1208.34 , 104.83
+755.11 , 1409.73 , 122.13
+755.11 , 1611.12 , 139.47
+755.11 , 1812.51 , 156.87
+755.11 , 2013.90 , 174.31
+755.11 , 2215.29 , 191.80
+755.11 , 2416.68 , 209.33
+755.11 , 2618.07 , 226.92
+755.11 , 2819.46 , 244.56
+755.11 , 3020.85 , 262.24
+755.11 , 3222.24 , 279.97
+755.11 , 3423.63 , 297.76
+755.11 , 3625.02 , 315.58
+755.11 , 3826.41 , 333.46
+755.11 , 4027.80 , 351.39
+906.14 , -4193.88 , -364.37
+906.14 , -3984.18 , -346.59
+906.14 , -3774.49 , -328.74
+906.14 , -3564.80 , -310.84
+906.14 , -3355.10 , -292.87
+906.14 , -3145.41 , -274.84
+906.14 , -2935.71 , -256.75
+906.14 , -2726.02 , -238.60
+906.14 , -2516.33 , -220.39
+906.14 , -2306.63 , -202.12
+906.14 , -2096.94 , -183.79
+906.14 , -1887.24 , -165.40
+906.14 , -1677.55 , -146.94
+906.14 , -1467.86 , -128.43
+906.14 , -1258.16 , -109.85
+906.14 , -1048.47 , -91.21
+906.14 , -838.78 , -72.51
+906.14 , -629.08 , -53.75
+906.14 , -419.39 , -34.91
+906.14 , -209.69 , -15.95
+906.14 , -41.94 , 0.00
+906.14 , 40.28 , 6.58
+906.14 , 201.39 , 23.25
+906.14 , 402.78 , 43.76
+906.14 , 604.17 , 64.29
+906.14 , 805.56 , 84.87
+906.14 , 1006.95 , 105.52
+906.14 , 1208.34 , 126.22
+906.14 , 1409.73 , 146.98
+906.14 , 1611.12 , 167.81
+906.14 , 1812.51 , 188.70
+906.14 , 2013.90 , 209.65
+906.14 , 2215.29 , 230.66
+906.14 , 2416.68 , 251.73
+906.14 , 2618.07 , 272.87
+906.14 , 2819.46 , 294.07
+906.14 , 3020.85 , 315.33
+906.14 , 3222.24 , 336.65
+906.14 , 3423.63 , 358.03
+906.14 , 3625.02 , 379.47
+906.14 , 3826.41 , 400.98
+906.14 , 4027.80 , 422.54
+1057.16 , -4193.88 , -423.69
+1057.16 , -3984.18 , -403.04
+1057.16 , -3774.49 , -382.31
+1057.16 , -3564.80 , -361.50
+1057.16 , -3355.10 , -340.62
+1057.16 , -3145.41 , -319.66
+1057.16 , -2935.71 , -298.62
+1057.16 , -2726.02 , -277.51
+1057.16 , -2516.33 , -256.31
+1057.16 , -2306.63 , -235.05
+1057.16 , -2096.94 , -213.70
+1057.16 , -1887.24 , -192.28
+1057.16 , -1677.55 , -170.79
+1057.16 , -1467.86 , -149.21
+1057.16 , -1258.16 , -127.57
+1057.16 , -1048.47 , -105.84
+1057.16 , -838.78 , -84.03
+1057.16 , -629.08 , -62.14
+1057.16 , -419.39 , -40.16
+1057.16 , -209.69 , -18.00
+1057.16 , -41.94 , 0.00
+1057.16 , 40.28 , 8.09
+1057.16 , 201.39 , 27.64
+1057.16 , 402.78 , 51.59
+1057.16 , 604.17 , 75.56
+1057.16 , 805.56 , 99.58
+1057.16 , 1006.95 , 123.68
+1057.16 , 1208.34 , 147.86
+1057.16 , 1409.73 , 172.10
+1057.16 , 1611.12 , 196.43
+1057.16 , 1812.51 , 220.84
+1057.16 , 2013.90 , 245.32
+1057.16 , 2215.29 , 269.88
+1057.16 , 2416.68 , 294.51
+1057.16 , 2618.07 , 319.23
+1057.16 , 2819.46 , 344.02
+1057.16 , 3020.85 , 368.89
+1057.16 , 3222.24 , 393.83
+1057.16 , 3423.63 , 418.85
+1057.16 , 3625.02 , 443.95
+1057.16 , 3826.41 , 469.13
+1057.16 , 4027.80 , 494.38
+1208.18 , -4193.88 , -482.31
+1208.18 , -3984.18 , -458.83
+1208.18 , -3774.49 , -435.26
+1208.18 , -3564.80 , -411.59
+1208.18 , -3355.10 , -387.83
+1208.18 , -3145.41 , -363.97
+1208.18 , -2935.71 , -340.02
+1208.18 , -2726.02 , -315.97
+1208.18 , -2516.33 , -291.83
+1208.18 , -2306.63 , -267.59
+1208.18 , -2096.94 , -243.26
+1208.18 , -1887.24 , -218.84
+1208.18 , -1677.55 , -194.32
+1208.18 , -1467.86 , -169.71
+1208.18 , -1258.16 , -145.00
+1208.18 , -1048.47 , -120.19
+1208.18 , -838.78 , -95.29
+1208.18 , -629.08 , -70.28
+1208.18 , -419.39 , -45.14
+1208.18 , -209.69 , -19.76
+1208.18 , -41.94 , 0.00
+1208.18 , 40.28 , 9.76
+1208.18 , 201.39 , 32.25
+1208.18 , 402.78 , 59.66
+1208.18 , 604.17 , 87.07
+1208.18 , 805.56 , 114.55
+1208.18 , 1006.95 , 142.11
+1208.18 , 1208.34 , 169.77
+1208.18 , 1409.73 , 197.52
+1208.18 , 1611.12 , 225.37
+1208.18 , 1812.51 , 253.31
+1208.18 , 2013.90 , 281.34
+1208.18 , 2215.29 , 309.47
+1208.18 , 2416.68 , 337.70
+1208.18 , 2618.07 , 366.02
+1208.18 , 2819.46 , 394.44
+1208.18 , 3020.85 , 422.95
+1208.18 , 3222.24 , 451.56
+1208.18 , 3423.63 , 480.26
+1208.18 , 3625.02 , 509.05
+1208.18 , 3826.41 , 537.94
+1208.18 , 4027.80 , 566.93
+1359.21 , -4193.88 , -540.17
+1359.21 , -3984.18 , -513.92
+1359.21 , -3774.49 , -487.55
+1359.21 , -3564.80 , -461.06
+1359.21 , -3355.10 , -434.46
+1359.21 , -3145.41 , -407.75
+1359.21 , -2935.71 , -380.92
+1359.21 , -2726.02 , -353.97
+1359.21 , -2516.33 , -326.91
+1359.21 , -2306.63 , -299.73
+1359.21 , -2096.94 , -272.44
+1359.21 , -1887.24 , -245.03
+1359.21 , -1677.55 , -217.51
+1359.21 , -1467.86 , -189.87
+1359.21 , -1258.16 , -162.12
+1359.21 , -1048.47 , -134.25
+1359.21 , -838.78 , -106.26
+1359.21 , -629.08 , -78.13
+1359.21 , -419.39 , -49.84
+1359.21 , -209.69 , -21.19
+1359.21 , -41.94 , 0.00
+1359.21 , 40.28 , 11.59
+1359.21 , 201.39 , 37.10
+1359.21 , 402.78 , 67.98
+1359.21 , 604.17 , 98.85
+1359.21 , 805.56 , 129.79
+1359.21 , 1006.95 , 160.84
+1359.21 , 1208.34 , 191.99
+1359.21 , 1409.73 , 223.26
+1359.21 , 1611.12 , 254.64
+1359.21 , 1812.51 , 286.14
+1359.21 , 2013.90 , 317.75
+1359.21 , 2215.29 , 349.48
+1359.21 , 2416.68 , 381.32
+1359.21 , 2618.07 , 413.28
+1359.21 , 2819.46 , 445.36
+1359.21 , 3020.85 , 477.54
+1359.21 , 3222.24 , 509.85
+1359.21 , 3423.63 , 542.27
+1359.21 , 3625.02 , 574.80
+1359.21 , 3826.41 , 607.45
+1359.21 , 4027.80 , 640.21
+1510.23 , -4193.88 , -597.26
+1510.23 , -3984.18 , -568.28
+1510.23 , -3774.49 , -539.16
+1510.23 , -3564.80 , -509.90
+1510.23 , -3355.10 , -480.50
+1510.23 , -3145.41 , -450.96
+1510.23 , -2935.71 , -421.28
+1510.23 , -2726.02 , -391.47
+1510.23 , -2516.33 , -361.52
+1510.23 , -2306.63 , -331.43
+1510.23 , -2096.94 , -301.20
+1510.23 , -1887.24 , -270.83
+1510.23 , -1677.55 , -240.33
+1510.23 , -1467.86 , -209.68
+1510.23 , -1258.16 , -178.90
+1510.23 , -1048.47 , -147.97
+1510.23 , -838.78 , -116.90
+1510.23 , -629.08 , -85.66
+1510.23 , -419.39 , -54.21
+1510.23 , -209.69 , -22.23
+1510.23 , -41.94 , 0.00
+1510.23 , 40.28 , 13.60
+1510.23 , 201.39 , 42.20
+1510.23 , 402.78 , 76.58
+1510.23 , 604.17 , 110.92
+1510.23 , 805.56 , 145.34
+1510.23 , 1006.95 , 179.88
+1510.23 , 1208.34 , 214.55
+1510.23 , 1409.73 , 249.35
+1510.23 , 1611.12 , 284.29
+1510.23 , 1812.51 , 319.36
+1510.23 , 2013.90 , 354.57
+1510.23 , 2215.29 , 389.92
+1510.23 , 2416.68 , 425.41
+1510.23 , 2618.07 , 461.03
+1510.23 , 2819.46 , 496.79
+1510.23 , 3020.85 , 532.69
+1510.23 , 3222.24 , 568.73
+1510.23 , 3423.63 , 604.90
+1510.23 , 3625.02 , 641.21
+1510.23 , 3826.41 , 677.66
+1510.23 , 4027.80 , 714.24
+1661.25 , -4193.88 , -653.54
+1661.25 , -3984.18 , -621.88
+1661.25 , -3774.49 , -590.05
+1661.25 , -3564.80 , -558.06
+1661.25 , -3355.10 , -525.90
+1661.25 , -3145.41 , -493.58
+1661.25 , -2935.71 , -461.09
+1661.25 , -2726.02 , -428.44
+1661.25 , -2516.33 , -395.63
+1661.25 , -2306.63 , -362.65
+1661.25 , -2096.94 , -329.51
+1661.25 , -1887.24 , -296.21
+1661.25 , -1677.55 , -262.74
+1661.25 , -1467.86 , -229.11
+1661.25 , -1258.16 , -195.31
+1661.25 , -1048.47 , -161.34
+1661.25 , -838.78 , -127.18
+1661.25 , -629.08 , -92.83
+1661.25 , -419.39 , -58.20
+1661.25 , -209.69 , -22.82
+1661.25 , -41.94 , 0.00
+1661.25 , 40.28 , 15.79
+1661.25 , 201.39 , 47.58
+1661.25 , 402.78 , 85.48
+1661.25 , 604.17 , 123.30
+1661.25 , 805.56 , 161.22
+1661.25 , 1006.95 , 199.26
+1661.25 , 1208.34 , 237.46
+1661.25 , 1409.73 , 275.81
+1661.25 , 1611.12 , 314.32
+1661.25 , 1812.51 , 352.99
+1661.25 , 2013.90 , 391.83
+1661.25 , 2215.29 , 430.82
+1661.25 , 2416.68 , 469.98
+1661.25 , 2618.07 , 509.30
+1661.25 , 2819.46 , 548.78
+1661.25 , 3020.85 , 588.42
+1661.25 , 3222.24 , 628.23
+1661.25 , 3423.63 , 668.20
+1661.25 , 3625.02 , 708.32
+1661.25 , 3826.41 , 748.61
+1661.25 , 4027.80 , 789.06
+1812.27 , -4193.88 , -708.97
+1812.27 , -3984.18 , -674.68
+1812.27 , -3774.49 , -640.19
+1812.27 , -3564.80 , -605.51
+1812.27 , -3355.10 , -570.63
+1812.27 , -3145.41 , -535.56
+1812.27 , -2935.71 , -500.30
+1812.27 , -2726.02 , -464.85
+1812.27 , -2516.33 , -429.21
+1812.27 , -2306.63 , -393.37
+1812.27 , -2096.94 , -357.35
+1812.27 , -1887.24 , -321.13
+1812.27 , -1677.55 , -284.71
+1812.27 , -1467.86 , -248.11
+1812.27 , -1258.16 , -211.31
+1812.27 , -1048.47 , -174.30
+1812.27 , -838.78 , -137.08
+1812.27 , -629.08 , -99.61
+1812.27 , -419.39 , -61.78
+1812.27 , -209.69 , -22.86
+1812.27 , -41.94 , 0.00
+1812.27 , 40.28 , 18.17
+1812.27 , 201.39 , 53.24
+1812.27 , 402.78 , 94.71
+1812.27 , 604.17 , 136.03
+1812.27 , 805.56 , 177.45
+1812.27 , 1006.95 , 219.01
+1812.27 , 1208.34 , 260.75
+1812.27 , 1409.73 , 302.67
+1812.27 , 1611.12 , 344.78
+1812.27 , 1812.51 , 387.07
+1812.27 , 2013.90 , 429.54
+1812.27 , 2215.29 , 472.21
+1812.27 , 2416.68 , 515.06
+1812.27 , 2618.07 , 558.11
+1812.27 , 2819.46 , 601.34
+1812.27 , 3020.85 , 644.76
+1812.27 , 3222.24 , 688.37
+1812.27 , 3423.63 , 732.17
+1812.27 , 3625.02 , 776.15
+1812.27 , 3826.41 , 820.33
+1812.27 , 4027.80 , 864.69
+1963.30 , -4193.88 , -763.53
+1963.30 , -3984.18 , -726.65
+1963.30 , -3774.49 , -689.55
+1963.30 , -3564.80 , -652.22
+1963.30 , -3355.10 , -614.67
+1963.30 , -3145.41 , -576.89
+1963.30 , -2935.71 , -538.89
+1963.30 , -2726.02 , -500.67
+1963.30 , -2516.33 , -462.22
+1963.30 , -2306.63 , -423.56
+1963.30 , -2096.94 , -384.67
+1963.30 , -1887.24 , -345.56
+1963.30 , -1677.55 , -306.22
+1963.30 , -1467.86 , -266.66
+1963.30 , -1258.16 , -226.86
+1963.30 , -1048.47 , -186.83
+1963.30 , -838.78 , -146.54
+1963.30 , -629.08 , -105.95
+1963.30 , -419.39 , -64.90
+1963.30 , -209.69 , -22.24
+1963.30 , -41.94 , 0.00
+1963.30 , 40.28 , 20.74
+1963.30 , 201.39 , 59.20
+1963.30 , 402.78 , 104.27
+1963.30 , 604.17 , 149.12
+1963.30 , 805.56 , 194.05
+1963.30 , 1006.95 , 239.16
+1963.30 , 1208.34 , 284.45
+1963.30 , 1409.73 , 329.96
+1963.30 , 1611.12 , 375.67
+1963.30 , 1812.51 , 421.60
+1963.30 , 2013.90 , 467.75
+1963.30 , 2215.29 , 514.11
+1963.30 , 2416.68 , 560.69
+1963.30 , 2618.07 , 607.48
+1963.30 , 2819.46 , 654.50
+1963.30 , 3020.85 , 701.73
+1963.30 , 3222.24 , 749.18
+1963.30 , 3423.63 , 796.84
+1963.30 , 3625.02 , 844.73
+1963.30 , 3826.41 , 892.83
+1963.30 , 4027.80 , 941.14
+2114.32 , -4193.88 , -817.17
+2114.32 , -3984.18 , -777.76
+2114.32 , -3774.49 , -738.08
+2114.32 , -3564.80 , -698.15
+2114.32 , -3355.10 , -657.96
+2114.32 , -3145.41 , -617.52
+2114.32 , -2935.71 , -576.82
+2114.32 , -2726.02 , -535.86
+2114.32 , -2516.33 , -494.65
+2114.32 , -2306.63 , -453.18
+2114.32 , -2096.94 , -411.45
+2114.32 , -1887.24 , -369.47
+2114.32 , -1677.55 , -327.22
+2114.32 , -1467.86 , -284.72
+2114.32 , -1258.16 , -241.95
+2114.32 , -1048.47 , -198.90
+2114.32 , -838.78 , -155.54
+2114.32 , -629.08 , -111.82
+2114.32 , -419.39 , -67.51
+2114.32 , -209.69 , -20.80
+2114.32 , -41.94 , 0.00
+2114.32 , 40.28 , 23.52
+2114.32 , 201.39 , 65.48
+2114.32 , 402.78 , 114.20
+2114.32 , 604.17 , 162.59
+2114.32 , 805.56 , 211.06
+2114.32 , 1006.95 , 259.72
+2114.32 , 1208.34 , 308.59
+2114.32 , 1409.73 , 357.69
+2114.32 , 1611.12 , 407.04
+2114.32 , 1812.51 , 456.62
+2114.32 , 2013.90 , 506.46
+2114.32 , 2215.29 , 556.54
+2114.32 , 2416.68 , 606.87
+2114.32 , 2618.07 , 657.45
+2114.32 , 2819.46 , 708.28
+2114.32 , 3020.85 , 759.35
+2114.32 , 3222.24 , 810.68
+2114.32 , 3423.63 , 862.25
+2114.32 , 3625.02 , 914.07
+2114.32 , 3826.41 , 966.13
+2114.32 , 4027.80 , 1018.44
+2265.34 , -4193.88 , -869.86
+2265.34 , -3984.18 , -827.96
+2265.34 , -3774.49 , -785.77
+2265.34 , -3564.80 , -743.28
+2265.34 , -3355.10 , -700.50
+2265.34 , -3145.41 , -657.42
+2265.34 , -2935.71 , -614.05
+2265.34 , -2726.02 , -570.39
+2265.34 , -2516.33 , -526.44
+2265.34 , -2306.63 , -482.19
+2265.34 , -2096.94 , -437.65
+2265.34 , -1887.24 , -392.82
+2265.34 , -1677.55 , -347.69
+2265.34 , -1467.86 , -302.26
+2265.34 , -1258.16 , -256.52
+2265.34 , -1048.47 , -210.46
+2265.34 , -838.78 , -164.04
+2265.34 , -629.08 , -117.17
+2265.34 , -419.39 , -69.54
+2265.34 , -209.69 , -18.27
+2265.34 , -41.94 , 0.00
+2265.34 , 40.28 , 26.49
+2265.34 , 201.39 , 72.10
+2265.34 , 402.78 , 124.50
+2265.34 , 604.17 , 176.46
+2265.34 , 805.56 , 228.49
+2265.34 , 1006.95 , 280.71
+2265.34 , 1208.34 , 333.18
+2265.34 , 1409.73 , 385.90
+2265.34 , 1611.12 , 438.89
+2265.34 , 1812.51 , 492.16
+2265.34 , 2013.90 , 545.71
+2265.34 , 2215.29 , 599.54
+2265.34 , 2416.68 , 653.64
+2265.34 , 2618.07 , 708.03
+2265.34 , 2819.46 , 762.71
+2265.34 , 3020.85 , 817.66
+2265.34 , 3222.24 , 872.89
+2265.34 , 3423.63 , 928.41
+2265.34 , 3625.02 , 984.20
+2265.34 , 3826.41 , 1040.27
+2265.34 , 4027.80 , 1096.63
+2416.37 , -4193.88 , -921.56
+2416.37 , -3984.18 , -877.23
+2416.37 , -3774.49 , -832.56
+2416.37 , -3564.80 , -787.56
+2416.37 , -3355.10 , -742.22
+2416.37 , -3145.41 , -696.56
+2416.37 , -2935.71 , -650.56
+2416.37 , -2726.02 , -604.23
+2416.37 , -2516.33 , -557.56
+2416.37 , -2306.63 , -510.57
+2416.37 , -2096.94 , -463.24
+2416.37 , -1887.24 , -415.58
+2416.37 , -1677.55 , -367.58
+2416.37 , -1467.86 , -319.24
+2416.37 , -1258.16 , -270.55
+2416.37 , -1048.47 , -221.48
+2416.37 , -838.78 , -171.99
+2416.37 , -629.08 , -121.95
+2416.37 , -419.39 , -70.93
+2416.37 , -209.69 , -14.10
+2416.37 , -41.94 , 0.00
+2416.37 , 40.28 , 29.68
+2416.37 , 201.39 , 79.05
+2416.37 , 402.78 , 135.20
+2416.37 , 604.17 , 190.76
+2416.37 , 805.56 , 246.36
+2416.37 , 1006.95 , 302.17
+2416.37 , 1208.34 , 358.24
+2416.37 , 1409.73 , 414.60
+2416.37 , 1611.12 , 471.27
+2416.37 , 1812.51 , 528.24
+2416.37 , 2013.90 , 585.52
+2416.37 , 2215.29 , 643.12
+2416.37 , 2416.68 , 701.03
+2416.37 , 2618.07 , 759.26
+2416.37 , 2819.46 , 817.80
+2416.37 , 3020.85 , 876.66
+2416.37 , 3222.24 , 935.84
+2416.37 , 3423.63 , 995.34
+2416.37 , 3625.02 , 1055.15
+2416.37 , 3826.41 , 1115.27
+2416.37 , 4027.80 , 1175.71
+2567.39 , -4193.88 , -972.24
+2567.39 , -3984.18 , -925.52
+2567.39 , -3774.49 , -878.43
+2567.39 , -3564.80 , -830.96
+2567.39 , -3355.10 , -783.11
+2567.39 , -3145.41 , -734.89
+2567.39 , -2935.71 , -686.30
+2567.39 , -2726.02 , -637.33
+2567.39 , -2516.33 , -587.99
+2567.39 , -2306.63 , -538.28
+2567.39 , -2096.94 , -488.19
+2567.39 , -1887.24 , -437.72
+2567.39 , -1677.55 , -386.87
+2567.39 , -1467.86 , -335.63
+2567.39 , -1258.16 , -283.99
+2567.39 , -1048.47 , -231.92
+2567.39 , -838.78 , -179.35
+2567.39 , -629.08 , -126.12
+2567.39 , -419.39 , -71.60
+2567.39 , -209.69 , -6.45
+2567.39 , -41.94 , 0.00
+2567.39 , 40.28 , 33.08
+2567.39 , 201.39 , 86.37
+2567.39 , 402.78 , 146.31
+2567.39 , 604.17 , 205.50
+2567.39 , 805.56 , 264.70
+2567.39 , 1006.95 , 324.11
+2567.39 , 1208.34 , 383.81
+2567.39 , 1409.73 , 443.83
+2567.39 , 1611.12 , 504.18
+2567.39 , 1812.51 , 564.87
+2567.39 , 2013.90 , 625.91
+2567.39 , 2215.29 , 687.30
+2567.39 , 2416.68 , 749.05
+2567.39 , 2618.07 , 811.14
+2567.39 , 2819.46 , 873.59
+2567.39 , 3020.85 , 936.40
+2567.39 , 3222.24 , 999.56
+2567.39 , 3423.63 , 1063.07
+2567.39 , 3625.02 , 1126.93
+2567.39 , 3826.41 , 1191.14
+2567.39 , 4027.80 , 1255.71
+2718.41 , -4193.88 , -1021.86
+2718.41 , -3984.18 , -972.81
+2718.41 , -3774.49 , -923.33
+2718.41 , -3564.80 , -873.44
+2718.41 , -3355.10 , -823.13
+2718.41 , -3145.41 , -772.39
+2718.41 , -2935.71 , -721.24
+2718.41 , -2726.02 , -669.67
+2718.41 , -2516.33 , -617.68
+2718.41 , -2306.63 , -565.27
+2718.41 , -2096.94 , -512.45
+2718.41 , -1887.24 , -459.19
+2718.41 , -1677.55 , -405.51
+2718.41 , -1467.86 , -351.39
+2718.41 , -1258.16 , -296.81
+2718.41 , -1048.47 , -241.73
+2718.41 , -838.78 , -186.07
+2718.41 , -629.08 , -129.61
+2718.41 , -419.39 , -71.46
+2718.41 , -209.69 , 0.00
+2718.41 , -41.94 , 0.00
+2718.41 , 40.28 , 36.70
+2718.41 , 201.39 , 94.04
+2718.41 , 402.78 , 157.85
+2718.41 , 604.17 , 220.70
+2718.41 , 805.56 , 283.52
+2718.41 , 1006.95 , 346.56
+2718.41 , 1208.34 , 409.90
+2718.41 , 1409.73 , 473.59
+2718.41 , 1611.12 , 537.65
+2718.41 , 1812.51 , 602.09
+2718.41 , 2013.90 , 666.91
+2718.41 , 2215.29 , 732.12
+2718.41 , 2416.68 , 797.72
+2718.41 , 2618.07 , 863.72
+2718.41 , 2819.46 , 930.10
+2718.41 , 3020.85 , 996.88
+2718.41 , 3222.24 , 1064.05
+2718.41 , 3423.63 , 1131.62
+2718.41 , 3625.02 , 1199.57
+2718.41 , 3826.41 , 1267.92
+2718.41 , 4027.80 , 1336.65
+2869.43 , -4193.88 , -1070.37
+2869.43 , -3984.18 , -1019.04
+2869.43 , -3774.49 , -967.24
+2869.43 , -3564.80 , -914.96
+2869.43 , -3355.10 , -862.23
+2869.43 , -3145.41 , -809.02
+2869.43 , -2935.71 , -755.35
+2869.43 , -2726.02 , -701.21
+2869.43 , -2516.33 , -646.60
+2869.43 , -2306.63 , -591.53
+2869.43 , -2096.94 , -535.99
+2869.43 , -1887.24 , -479.97
+2869.43 , -1677.55 , -423.47
+2869.43 , -1467.86 , -366.48
+2869.43 , -1258.16 , -308.96
+2869.43 , -1048.47 , -250.88
+2869.43 , -838.78 , -192.11
+2869.43 , -629.08 , -132.36
+2869.43 , -419.39 , -70.38
+2869.43 , -209.69 , 0.00
+2869.43 , -41.94 , 0.00
+2869.43 , 40.28 , 40.53
+2869.43 , 201.39 , 102.10
+2869.43 , 402.78 , 169.83
+2869.43 , 604.17 , 236.37
+2869.43 , 805.56 , 302.84
+2869.43 , 1006.95 , 369.53
+2869.43 , 1208.34 , 436.54
+2869.43 , 1409.73 , 503.92
+2869.43 , 1611.12 , 571.71
+2869.43 , 1812.51 , 639.91
+2869.43 , 2013.90 , 708.54
+2869.43 , 2215.29 , 777.59
+2869.43 , 2416.68 , 847.08
+2869.43 , 2618.07 , 917.00
+2869.43 , 2819.46 , 987.35
+2869.43 , 3020.85 , 1058.14
+2869.43 , 3222.24 , 1129.36
+2869.43 , 3423.63 , 1201.01
+2869.43 , 3625.02 , 1273.09
+2869.43 , 3826.41 , 1345.61
+2869.43 , 4027.80 , 1418.56
+3020.46 , -4193.88 , -1117.74
+3020.46 , -3984.18 , -1064.18
+3020.46 , -3774.49 , -1010.10
+3020.46 , -3564.80 , -955.49
+3020.46 , -3355.10 , -900.37
+3020.46 , -3145.41 , -844.73
+3020.46 , -2935.71 , -788.58
+3020.46 , -2726.02 , -731.90
+3020.46 , -2516.33 , -674.71
+3020.46 , -2306.63 , -617.00
+3020.46 , -2096.94 , -558.77
+3020.46 , -1887.24 , -500.01
+3020.46 , -1677.55 , -440.71
+3020.46 , -1467.86 , -380.85
+3020.46 , -1258.16 , -320.40
+3020.46 , -1048.47 , -259.31
+3020.46 , -838.78 , -197.41
+3020.46 , -629.08 , -134.30
+3020.46 , -419.39 , -68.24
+3020.46 , -209.69 , 0.00
+3020.46 , -41.94 , 0.00
+3020.46 , 40.28 , 44.59
+3020.46 , 201.39 , 110.53
+3020.46 , 402.78 , 182.27
+3020.46 , 604.17 , 252.55
+3020.46 , 805.56 , 322.69
+3020.46 , 1006.95 , 393.04
+3020.46 , 1208.34 , 463.74
+3020.46 , 1409.73 , 534.84
+3020.46 , 1611.12 , 606.37
+3020.46 , 1812.51 , 678.37
+3020.46 , 2013.90 , 750.82
+3020.46 , 2215.29 , 823.74
+3020.46 , 2416.68 , 897.14
+3020.46 , 2618.07 , 971.01
+3020.46 , 2819.46 , 1045.36
+3020.46 , 3020.85 , 1120.19
+3020.46 , 3222.24 , 1195.49
+3020.46 , 3423.63 , 1271.27
+3020.46 , 3625.02 , 1347.52
+3020.46 , 3826.41 , 1424.25
+3020.46 , 4027.80 , 1501.45
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_FLD_max.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_FLD_max.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..2c22528593c65014558a41670cf09448bd99eebb
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_FLD_max.viepcp
@@ -0,0 +1,24 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 4027.80 , -4193.88
+14.96 , 4027.80 , -4193.88
+151.09 , 4027.80 , -4193.88
+302.19 , 4027.80 , -4193.88
+452.92 , 4027.80 , -4193.88
+604.01 , 4027.80 , -4193.88
+755.11 , 4027.80 , -4193.88
+906.20 , 3356.50 , -3494.90
+1057.30 , 2876.98 , -2995.60
+1208.03 , 2517.38 , -2621.17
+1359.12 , 2237.68 , -2329.95
+1510.22 , 2013.90 , -2096.94
+1661.31 , 1830.82 , -1906.31
+1812.41 , 1678.25 , -1747.45
+1963.14 , 1549.15 , -1613.02
+2114.23 , 1438.52 , -1497.83
+2265.33 , 1342.60 , -1397.96
+2416.42 , 1258.71 , -1310.61
+2567.52 , 1184.66 , -1233.50
+2718.25 , 1118.82 , -1164.95
+2869.34 , 1059.96 , -1103.66
+3020.44 , 1006.95 , -1048.47
+
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_FLD_min.viepcp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_FLD_min.viepcp
new file mode 100644
index 0000000000000000000000000000000000000000..1c40e34f4c8b390982508509b839a7cc766f8bd1
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_FLD_min.viepcp
@@ -0,0 +1,23 @@
+n_out , T_drive_out , T_recuperation_out
+0.00 , 4027.80 , -4193.88
+14.96 , 4027.80 , -4193.88
+151.09 , 4027.80 , -4193.88
+302.19 , 4027.80 , -4193.88
+452.92 , 4027.80 , -4193.88
+604.01 , 4027.80 , -4193.88
+755.11 , 4027.80 , -4193.88
+906.20 , 3356.50 , -3494.90
+1057.30 , 2876.98 , -2995.60
+1208.03 , 2517.38 , -2621.17
+1359.12 , 2237.68 , -2329.95
+1510.22 , 2013.90 , -2096.94
+1661.31 , 1830.82 , -1906.31
+1812.41 , 1678.25 , -1747.45
+1963.14 , 1549.15 , -1613.02
+2114.23 , 1438.52 , -1497.83
+2265.33 , 1342.60 , -1397.96
+2416.42 , 1258.71 , -1310.61
+2567.52 , 1184.66 , -1233.50
+2718.25 , 1118.82 , -1164.95
+2869.34 , 1059.96 , -1103.66
+3020.44 , 1006.95 , -1048.47
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag.viepcd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..841a118a18b289b3d124302d4931e8de455c6793
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -8.02
+15.10 , -8.28
+151.02 , -10.62
+302.05 , -13.22
+453.07 , -15.82
+604.09 , -18.45
+755.11 , -21.05
+906.14 , -23.65
+1057.16 , -26.25
+1208.18 , -28.85
+1359.21 , -31.48
+1510.23 , -34.08
+1661.25 , -36.68
+1812.28 , -39.28
+1963.30 , -41.88
+2114.32 , -44.51
+2265.34 , -47.11
+2416.37 , -49.71
+2567.39 , -52.31
+2718.41 , -54.91
+2869.44 , -57.54
+3020.46 , -60.14
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag1.viepcd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag1.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..69fa4188eac5b7a1325b80e75dcd3b202e9afd60
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag1.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -24.84
+4.98 , -25.62
+49.80 , -32.89
+99.59 , -40.94
+149.39 , -48.99
+199.18 , -57.13
+248.98 , -65.18
+298.77 , -73.23
+348.57 , -81.28
+398.37 , -89.33
+448.16 , -97.47
+497.96 , -105.52
+547.75 , -113.57
+597.55 , -121.62
+647.35 , -129.67
+697.14 , -137.81
+746.94 , -145.86
+796.73 , -153.91
+846.53 , -161.96
+896.32 , -170.01
+946.12 , -178.15
+995.92 , -186.20
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag2.viepcd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag2.viepcd
new file mode 100644
index 0000000000000000000000000000000000000000..ffb4883b312afeed23be5a96783b2b92e3c03bed
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC_Gbx3_drag2.viepcd
@@ -0,0 +1,23 @@
+n_out , T_drag_out
+0.00 , -13.76
+8.90 , -14.19
+88.99 , -18.22
+177.98 , -22.67
+266.97 , -27.13
+355.96 , -31.64
+444.95 , -36.10
+533.94 , -40.56
+622.93 , -45.01
+711.92 , -49.47
+800.91 , -53.98
+889.90 , -58.44
+978.89 , -62.89
+1067.88 , -67.35
+1156.87 , -71.81
+1245.86 , -76.32
+1334.85 , -80.78
+1423.84 , -85.23
+1512.83 , -89.69
+1601.82 , -94.15
+1690.81 , -98.66
+1779.80 , -103.11
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/325kW.vfld b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/325kW.vfld
new file mode 100644
index 0000000000000000000000000000000000000000..750d4048ef2da521d3c51bd0a8af39b6373c8575
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/325kW.vfld
@@ -0,0 +1,202 @@
+engine speed [1/min], full load torque [Nm], motoring torque [Nm]
+600,1188,-138
+608,1206.92,-138.2
+616,1225.84,-138.4
+624,1244.76,-138.6
+632,1263.68,-138.8
+640,1282.6,-139
+648,1301.52,-139.2
+656,1320.44,-139.4
+664,1339.36,-139.6
+672,1358.28,-139.8
+680,1377.2,-140
+688,1396.12,-140.2
+696,1415.04,-140.4
+704,1433.96,-140.6
+712,1452.88,-140.8
+720,1471.8,-141
+728,1490.72,-141.2
+736,1509.64,-141.4
+744,1528.56,-141.6
+752,1547.48,-141.8
+760,1566.4,-142
+768,1585.32,-142.2
+776,1604.24,-142.4
+784,1623.16,-142.6
+792,1642.08,-142.8
+800,1661,-143
+808,1679.92,-143.36
+816,1698.84,-143.72
+824,1717.76,-144.08
+832,1736.68,-144.44
+840,1755.6,-144.8
+848,1774.52,-145.16
+856,1793.44,-145.52
+864,1812.36,-145.88
+872,1831.28,-146.24
+880,1850.2,-146.6
+888,1869.12,-146.96
+896,1888.04,-147.32
+904,1906.96,-147.68
+912,1925.88,-148.04
+920,1944.8,-148.4
+928,1963.72,-148.76
+936,1982.64,-149.12
+944,2001.56,-149.48
+952,2020.48,-149.84
+960,2039.4,-150.2
+968,2058.32,-150.56
+976,2077.24,-150.92
+984,2096.16,-151.28
+992,2115.08,-151.64
+1000,2134,-152
+1008,2134,-152.52
+1016,2134,-153.04
+1024,2134,-153.56
+1032,2134,-154.08
+1040,2134,-154.6
+1048,2134,-155.12
+1056,2134,-155.64
+1064,2134,-156.16
+1072,2134,-156.68
+1080,2134,-157.2
+1088,2134,-157.72
+1096,2134,-158.24
+1104,2134,-158.76
+1112,2134,-159.28
+1120,2134,-159.8
+1128,2134,-160.32
+1136,2134,-160.84
+1144,2134,-161.36
+1152,2134,-161.88
+1160,2134,-162.4
+1168,2134,-162.92
+1176,2134,-163.44
+1184,2134,-163.96
+1192,2134,-164.48
+1200,2134,-165
+1208,2134,-165.88
+1216,2134,-166.76
+1224,2134,-167.64
+1232,2134,-168.52
+1240,2134,-169.4
+1248,2134,-170.28
+1256,2134,-171.16
+1264,2134,-172.04
+1272,2134,-172.92
+1280,2134,-173.8
+1288,2134,-174.68
+1296,2134,-175.56
+1304,2134,-176.44
+1312,2134,-177.32
+1320,2134,-178.2
+1328,2134,-179.08
+1336,2134,-179.96
+1344,2134,-180.84
+1352,2134,-181.72
+1360,2134,-182.6
+1368,2134,-183.48
+1376,2134,-184.36
+1384,2134,-185.24
+1392,2134,-186.12
+1400,2134,-187
+1408,2125.76,-188.2
+1416,2117.52,-189.4
+1424,2109.28,-190.6
+1432,2101.04,-191.8
+1440,2092.8,-193
+1448,2084.56,-194.2
+1456,2076.32,-195.4
+1464,2068.08,-196.6
+1472,2059.84,-197.8
+1480,2051.6,-199
+1488,2043.36,-200.2
+1496,2035.12,-201.3911
+1504,2026.88,-202.5793
+1512,2018.64,-203.7675
+1520,2010.4,-204.9557
+1528,2002.16,-206.1439
+1536,1993.92,-207.3321
+1544,1985.68,-208.5203
+1552,1977.44,-209.7085
+1560,1969.2,-210.8967
+1568,1960.96,-212.0849
+1576,1952.72,-213.2731
+1584,1944.48,-214.4613
+1592,1936.24,-215.6495
+1600,1928,-216.8377
+1608,1919.76,-218.0259
+1616,1911.52,-219.16
+1624,1903.28,-220.24
+1632,1895.04,-221.32
+1640,1886.8,-222.4
+1648,1878.56,-223.48
+1656,1870.32,-224.56
+1664,1862.08,-225.64
+1672,1853.84,-226.72
+1680,1845.6,-227.8
+1688,1837.36,-228.88
+1696,1829.12,-229.96
+1704,1820.88,-231.04
+1712,1812.64,-232.12
+1720,1804.4,-233.2
+1728,1796.16,-234.28
+1736,1787.92,-235.36
+1744,1779.68,-236.44
+1752,1771.44,-237.52
+1760,1763.2,-238.6
+1768,1754.96,-239.68
+1776,1746.72,-240.76
+1784,1738.48,-241.84
+1792,1730.24,-242.92
+1800,1722,-244
+1808,1703.24,-245.36
+1816,1684.48,-246.72
+1824,1665.72,-248.08
+1832,1646.96,-249.44
+1840,1628.2,-250.8
+1848,1609.44,-252.16
+1856,1590.68,-253.52
+1864,1571.92,-254.88
+1872,1553.16,-256.24
+1880,1534.4,-257.6
+1888,1515.64,-258.96
+1896,1496.88,-260.32
+1904,1478.12,-261.68
+1912,1459.36,-263.04
+1920,1440.6,-264.4
+1928,1421.84,-265.76
+1936,1403.08,-267.12
+1944,1384.32,-268.48
+1952,1365.56,-269.84
+1960,1346.8,-271.2
+1968,1328.04,-272.56
+1976,1309.28,-273.92
+1984,1290.52,-275.28
+1992,1271.76,-276.64
+2000,1253,-278
+2008,1234.28,-279.36
+2016,1215.56,-280.72
+2024,1196.84,-282.08
+2032,1178.12,-283.44
+2040,1159.4,-284.8
+2048,1140.68,-286.16
+2056,1121.96,-287.52
+2064,1103.24,-288.88
+2072,1084.52,-290.24
+2080,1065.8,-291.6
+2088,1047.08,-292.96
+2096,1028.36,-294.32
+2104,978.24,-295.68
+2112,896.72,-297.04
+2120,815.2,-298.4
+2128,733.68,-299.76
+2136,652.16,-301.12
+2144,570.64,-302.48
+2152,489.12,-303.84
+2160,407.6,-305.2
+2168,326.08,-306.56
+2176,244.56,-307.92
+2184,163.04,-309.28
+2192,81.52,-310.64
+2200,0,-312
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/325kW.vmap b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/325kW.vmap
new file mode 100644
index 0000000000000000000000000000000000000000..eea08f963f4b23b49f15d030db630b52edc1d4e3
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/325kW.vmap
@@ -0,0 +1,140 @@
+engine speed [rpm], torque [Nm], fuel consumption [g/h]
+500,-135.5,0
+500,0,1355
+500,213.4,3412.291
+500,426.8,5830.1
+500,640.2,8316.426
+500,853.6,10439.87
+500,1067,12823.69
+500,1188,14228.79
+500,1401.4,16628.66
+600,-138,0
+600,0,1355
+600,213.4,3412.291
+600,426.8,5830.1
+600,640.2,8316.426
+600,853.6,10439.87
+600,1067,12823.69
+600,1188,14228.79
+600,1401.4,16628.66
+751,-141.775,0
+750.9,0,1649.255
+750.9,213.4,4157.795
+750.9,426.8,7149.494
+750.9,640.2,10037.08
+750.9,853.6,12957.07
+750.9,1067,16055.22
+750.9,1280.4,19231.36
+750.9,1493.8,22400.17
+750.9,1544.879,23213.92
+751,1758.279,26392.93
+902,-147.59,0
+901.8,0,2210.735
+901.8,213.4,5204.867
+901.8,426.8,8515.462
+901.8,640.2,11804.75
+901.8,853.6,15410.55
+901.8,1067,19081.7
+901.8,1280.4,22742.96
+901.8,1493.8,26543.87
+901.8,1707.2,30534.68
+901.8,1901.757,34352.75
+902,2115.157,38403.27
+1053,-155.445,0
+1052.7,0,2768.035
+1052.7,213.4,6228.407
+1052.7,426.8,9836.041
+1052.7,640.2,13624.5
+1052.7,853.6,17854.95
+1052.7,1067,22072.71
+1052.7,1280.4,26161.13
+1052.7,1493.8,30525.55
+1052.7,1707.2,35019.18
+1052.7,1920.6,39913.3
+1052.7,2134,45438.16
+1053,2347.4,50542.53
+1204,-165.44,0
+1203.6,0,3086.704
+1203.6,213.4,6943.027
+1203.6,426.8,11040.37
+1203.6,640.2,15504.65
+1203.6,853.6,20335.89
+1203.6,1067,25176.6
+1203.6,1280.4,29782.22
+1203.6,1493.8,34642.24
+1203.6,1707.2,39786.14
+1203.6,1920.6,45254.8
+1203.6,2134,51129.03
+1204,2347.4,56732.88
+1367,-183.37,0
+1367.1,0,3845.344
+1367.1,213.4,7981.742
+1367.1,426.8,12796.69
+1367.1,640.2,17789.2
+1367.1,853.6,22854.21
+1367.1,1067,28302.84
+1367.1,1280.4,33739.91
+1367.1,1493.8,39393.87
+1367.1,1707.2,45836.33
+1367.1,1920.6,52078.71
+1367.1,2134,58296.41
+1367,2347.4,64530.56
+1490,-200.5,0
+1489.6,0,4373.424
+1489.6,213.4,8861.484
+1489.6,426.8,14090.86
+1489.6,640.2,19518.29
+1489.6,853.6,25092.8
+1489.6,1067,30873.69
+1489.6,1280.4,36865.42
+1489.6,1493.8,43095.57
+1489.6,1707.2,50249.81
+1489.6,1920.6,57035.25
+1489.6,2041.712,60609.5
+1490,2255.112,67311.83
+1612,-218.62,0
+1612.2,0,4904.015
+1612.2,213.4,9810.482
+1612.2,426.8,15403.9
+1612.2,640.2,21301.35
+1612.2,853.6,27492.32
+1612.2,1067,33580.96
+1612.2,1280.4,40114.61
+1612.2,1493.8,46914.77
+1612.2,1707.2,54666.14
+1612.2,1915.434,61862.91
+1612,2128.834,69491.99
+1735,-235.225,0
+1734.7,0,5586.953
+1734.7,213.4,11041.15
+1734.7,426.8,16949.24
+1734.7,640.2,23500.23
+1734.7,853.6,30159.59
+1734.7,1067,36741.18
+1734.7,1280.4,43923.85
+1734.7,1493.8,51295.21
+1734.7,1707.2,59469.31
+1734.7,1789.259,62731.31
+1735,2002.659,70935.23
+1857,-253.69,0
+1857.3,0,6673.839
+1857.3,213.4,12518.56
+1857.3,426.8,18687.88
+1857.3,640.2,25652.39
+1857.3,853.6,33003.08
+1857.3,1067,40438.09
+1857.3,1280.4,48117.52
+1857.3,1493.8,55848.59
+1857.3,1587.631,59434.17
+1857,1801.031,67215.39
+1957,-270.69,0
+1957.3,0,6673.839
+1957.3,213.4,12518.56
+1957.3,426.8,18687.88
+1957.3,640.2,25652.39
+1957.3,853.6,33003.08
+1957.3,1067,40438.09
+1957.3,1280.4,48117.52
+1957.3,1493.8,55848.59
+1957.3,1587.631,59434.17
+1957,1801.031,67215.39
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Axle_4x2_Tractor.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Axle_4x2_Tractor.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..e11cbf7cdde175e06ab8f6a0b79d46b84b3e0c1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Axle_4x2_Tractor.vtlm
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Default.vrlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Default.vrlm
new file mode 100644
index 0000000000000000000000000000000000000000..eb575b99973291e5414c4826da086c1f03a7f179
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Default.vrlm
@@ -0,0 +1,32 @@
+Retarder Speed [1/min],Torque Loss [Nm]
+0,10
+100,10
+200,10.1
+300,10.2
+400,10.3
+500,10.5
+600,10.7
+700,11
+800,11.3
+900,11.6
+1000,12
+1100,12.4
+1200,12.9
+1300,13.4
+1400,13.9
+1500,14.5
+1600,15.1
+1700,15.8
+1800,16.5
+1900,17.2
+2000,18
+2100,18.8
+2200,19.7
+2300,20.6
+2400,21.5
+2500,22.5
+2600,23.5
+2700,24.6
+2800,25.7
+2900,26.8
+3000,28
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Engine_325kW_12.7l.veng
new file mode 100644
index 0000000000000000000000000000000000000000..084062afccf57ee58c485634cb158fdf05647b86
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Engine_325kW_12.7l.veng
@@ -0,0 +1,35 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-08-21T09:24:04.0725494Z",
+ "AppVersion": "3",
+ "FileVersion": 5
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "325kW 12.7l Engine",
+ "Displacement": "12740",
+ "IdlingSpeed": 600.0,
+ "Inertia": 5.1498,
+ "Fuels": [
+ {
+ "WHTC-Urban": 0.0,
+ "WHTC-Rural": 0.0,
+ "WHTC-Motorway": 0.0,
+ "WHTC-Engineering": 1.0,
+ "ColdHotBalancingFactor": 0.0,
+ "CFRegPer": 1.0,
+ "FuelMap": "325kW.vmap",
+ "FuelType": "DieselCI"
+ }
+ ],
+ "RatedPower": 0.0,
+ "RatedSpeed": 0.0,
+ "MaxTorque": 0.0,
+ "FullLoadCurve": "325kW.vfld",
+ "WHRType": [
+ "None"
+ ],
+ "WHRCorrectionFactors": {}
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_1.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_1.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_1.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_10.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_10.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_10.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_11.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_11.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_11.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_12.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_12.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..d30c0dbb042ca6d2235b4febe01b31292e5593c0
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_12.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,74.2
+0,-5000.0,69.2
+0,-4500.0,59.2
+0,-4000.0,59.2
+0,-3500.0,54.2
+0,-3000.0,49.2
+0,-2500.0,44.2
+0,-2000.0,39.2
+0,-1600.0,35.2
+0,-1200.0,31.2
+0,-900.0,28.2
+0,-600.0,25.2
+0,-400.0,23.2
+0,-200.0,21.2
+0,0.0,21.2
+0,200.0,21.2
+0,400.0,23.2
+0,600.0,25.2
+0,900.0,28.2
+0,1200.0,31.2
+0,1600.0,35.2
+0,2000.0,39.2
+0,2500.0,44.2
+0,3000.0,49.2
+0,3500.0,54.2
+0,4000.0,59.2
+0,4500.0,64.2
+0,5000.0,69.2
+0,5500.0,74.2
+600,-5500.0,74.2
+600,-5000.0,69.2
+600,-4500.0,59.2
+600,-4000.0,59.2
+600,-3500.0,54.2
+600,-3000.0,49.2
+600,-2500.0,44.2
+600,-2000.0,39.2
+600,-1600.0,35.2
+600,-1200.0,31.2
+600,-900.0,28.2
+600,-600.0,25.2
+600,-400.0,23.2
+600,-200.0,21.2
+600,0.0,21.2
+600,200.0,21.2
+600,400.0,23.2
+600,600.0,25.2
+600,900.0,28.2
+600,1200.0,31.2
+600,1600.0,35.2
+600,2000.0,39.2
+600,2500.0,44.2
+600,3000.0,49.2
+600,3500.0,54.2
+600,4000.0,59.2
+600,4500.0,64.2
+600,5000.0,69.2
+600,5500.0,74.2
+900,-5500.0,77.8
+900,-5000.0,72.8
+900,-4500.0,62.8
+900,-4000.0,62.8
+900,-3500.0,57.8
+900,-3000.0,52.8
+900,-2500.0,47.8
+900,-2000.0,42.8
+900,-1600.0,38.8
+900,-1200.0,34.8
+900,-900.0,31.8
+900,-600.0,28.8
+900,-400.0,26.8
+900,-200.0,24.8
+900,0.0,24.8
+900,200.0,24.8
+900,400.0,26.8
+900,600.0,28.8
+900,900.0,31.8
+900,1200.0,34.8
+900,1600.0,38.8
+900,2000.0,42.8
+900,2500.0,47.8
+900,3000.0,52.8
+900,3500.0,57.8
+900,4000.0,62.8
+900,4500.0,67.8
+900,5000.0,72.8
+900,5500.0,77.8
+1200,-5500.0,81.4
+1200,-5000.0,76.4
+1200,-4500.0,66.4
+1200,-4000.0,66.4
+1200,-3500.0,61.4
+1200,-3000.0,56.4
+1200,-2500.0,51.4
+1200,-2000.0,46.4
+1200,-1600.0,42.4
+1200,-1200.0,38.4
+1200,-900.0,35.4
+1200,-600.0,32.4
+1200,-400.0,30.4
+1200,-200.0,28.4
+1200,0.0,28.4
+1200,200.0,28.4
+1200,400.0,30.4
+1200,600.0,32.4
+1200,900.0,35.4
+1200,1200.0,38.4
+1200,1600.0,42.4
+1200,2000.0,46.4
+1200,2500.0,51.4
+1200,3000.0,56.4
+1200,3500.0,61.4
+1200,4000.0,66.4
+1200,4500.0,71.4
+1200,5000.0,76.4
+1200,5500.0,81.4
+1600,-5500.0,86.2
+1600,-5000.0,81.2
+1600,-4500.0,71.2
+1600,-4000.0,71.2
+1600,-3500.0,66.2
+1600,-3000.0,61.2
+1600,-2500.0,56.2
+1600,-2000.0,51.2
+1600,-1600.0,47.2
+1600,-1200.0,43.2
+1600,-900.0,40.2
+1600,-600.0,37.2
+1600,-400.0,35.2
+1600,-200.0,33.2
+1600,0.0,33.2
+1600,200.0,33.2
+1600,400.0,35.2
+1600,600.0,37.2
+1600,900.0,40.2
+1600,1200.0,43.2
+1600,1600.0,47.2
+1600,2000.0,51.2
+1600,2500.0,56.2
+1600,3000.0,61.2
+1600,3500.0,66.2
+1600,4000.0,71.2
+1600,4500.0,76.2
+1600,5000.0,81.2
+1600,5500.0,86.2
+2000,-5500.0,91.0
+2000,-5000.0,86.0
+2000,-4500.0,76.0
+2000,-4000.0,76.0
+2000,-3500.0,71.0
+2000,-3000.0,66.0
+2000,-2500.0,61.0
+2000,-2000.0,56.0
+2000,-1600.0,52.0
+2000,-1200.0,48.0
+2000,-900.0,45.0
+2000,-600.0,42.0
+2000,-400.0,40.0
+2000,-200.0,38.0
+2000,0.0,38.0
+2000,200.0,38.0
+2000,400.0,40.0
+2000,600.0,42.0
+2000,900.0,45.0
+2000,1200.0,48.0
+2000,1600.0,52.0
+2000,2000.0,56.0
+2000,2500.0,61.0
+2000,3000.0,66.0
+2000,3500.0,71.0
+2000,4000.0,76.0
+2000,4500.0,81.0
+2000,5000.0,86.0
+2000,5500.0,91.0
+2500,-5500.0,97.0
+2500,-5000.0,92.0
+2500,-4500.0,82.0
+2500,-4000.0,82.0
+2500,-3500.0,77.0
+2500,-3000.0,72.0
+2500,-2500.0,67.0
+2500,-2000.0,62.0
+2500,-1600.0,58.0
+2500,-1200.0,54.0
+2500,-900.0,51.0
+2500,-600.0,48.0
+2500,-400.0,46.0
+2500,-200.0,44.0
+2500,0.0,44.0
+2500,200.0,44.0
+2500,400.0,46.0
+2500,600.0,48.0
+2500,900.0,51.0
+2500,1200.0,54.0
+2500,1600.0,58.0
+2500,2000.0,62.0
+2500,2500.0,67.0
+2500,3000.0,72.0
+2500,3500.0,77.0
+2500,4000.0,82.0
+2500,4500.0,87.0
+2500,5000.0,92.0
+2500,5500.0,97.0
+3000,-5500.0,103.0
+3000,-5000.0,98.0
+3000,-4500.0,88.0
+3000,-4000.0,88.0
+3000,-3500.0,83.0
+3000,-3000.0,78.0
+3000,-2500.0,73.0
+3000,-2000.0,68.0
+3000,-1600.0,64.0
+3000,-1200.0,60.0
+3000,-900.0,57.0
+3000,-600.0,54.0
+3000,-400.0,52.0
+3000,-200.0,50.0
+3000,0.0,50.0
+3000,200.0,50.0
+3000,400.0,52.0
+3000,600.0,54.0
+3000,900.0,57.0
+3000,1200.0,60.0
+3000,1600.0,64.0
+3000,2000.0,68.0
+3000,2500.0,73.0
+3000,3000.0,78.0
+3000,3500.0,83.0
+3000,4000.0,88.0
+3000,4500.0,93.0
+3000,5000.0,98.0
+3000,5500.0,103.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_2.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_2.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_2.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_3.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_3.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_3.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_4.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_4.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_4.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_5.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_5.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_5.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_6.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_6.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_6.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_7.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_7.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_7.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_8.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_8.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_8.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_9.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_9.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..ea00afe57cd1fa0d4f058cced560bd1bd482dd1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Gear_9.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,239.2
+0,-5000.0,219.2
+0,-4500.0,179.2
+0,-4000.0,179.2
+0,-3500.0,159.2
+0,-3000.0,139.2
+0,-2500.0,119.2
+0,-2000.0,99.2
+0,-1600.0,83.2
+0,-1200.0,67.2
+0,-900.0,55.2
+0,-600.0,43.2
+0,-400.0,35.2
+0,-200.0,27.2
+0,0.0,27.2
+0,200.0,27.2
+0,400.0,35.2
+0,600.0,43.2
+0,900.0,55.2
+0,1200.0,67.2
+0,1600.0,83.2
+0,2000.0,99.2
+0,2500.0,119.2
+0,3000.0,139.2
+0,3500.0,159.2
+0,4000.0,179.2
+0,4500.0,199.2
+0,5000.0,219.2
+0,5500.0,239.2
+600,-5500.0,239.2
+600,-5000.0,219.2
+600,-4500.0,179.2
+600,-4000.0,179.2
+600,-3500.0,159.2
+600,-3000.0,139.2
+600,-2500.0,119.2
+600,-2000.0,99.2
+600,-1600.0,83.2
+600,-1200.0,67.2
+600,-900.0,55.2
+600,-600.0,43.2
+600,-400.0,35.2
+600,-200.0,27.2
+600,0.0,27.2
+600,200.0,27.2
+600,400.0,35.2
+600,600.0,43.2
+600,900.0,55.2
+600,1200.0,67.2
+600,1600.0,83.2
+600,2000.0,99.2
+600,2500.0,119.2
+600,3000.0,139.2
+600,3500.0,159.2
+600,4000.0,179.2
+600,4500.0,199.2
+600,5000.0,219.2
+600,5500.0,239.2
+900,-5500.0,242.8
+900,-5000.0,222.8
+900,-4500.0,182.8
+900,-4000.0,182.8
+900,-3500.0,162.8
+900,-3000.0,142.8
+900,-2500.0,122.8
+900,-2000.0,102.8
+900,-1600.0,86.8
+900,-1200.0,70.8
+900,-900.0,58.8
+900,-600.0,46.8
+900,-400.0,38.8
+900,-200.0,30.8
+900,0.0,30.8
+900,200.0,30.8
+900,400.0,38.8
+900,600.0,46.8
+900,900.0,58.8
+900,1200.0,70.8
+900,1600.0,86.8
+900,2000.0,102.8
+900,2500.0,122.8
+900,3000.0,142.8
+900,3500.0,162.8
+900,4000.0,182.8
+900,4500.0,202.8
+900,5000.0,222.8
+900,5500.0,242.8
+1200,-5500.0,246.4
+1200,-5000.0,226.4
+1200,-4500.0,186.4
+1200,-4000.0,186.4
+1200,-3500.0,166.4
+1200,-3000.0,146.4
+1200,-2500.0,126.4
+1200,-2000.0,106.4
+1200,-1600.0,90.4
+1200,-1200.0,74.4
+1200,-900.0,62.4
+1200,-600.0,50.4
+1200,-400.0,42.4
+1200,-200.0,34.4
+1200,0.0,34.4
+1200,200.0,34.4
+1200,400.0,42.4
+1200,600.0,50.4
+1200,900.0,62.4
+1200,1200.0,74.4
+1200,1600.0,90.4
+1200,2000.0,106.4
+1200,2500.0,126.4
+1200,3000.0,146.4
+1200,3500.0,166.4
+1200,4000.0,186.4
+1200,4500.0,206.4
+1200,5000.0,226.4
+1200,5500.0,246.4
+1600,-5500.0,251.2
+1600,-5000.0,231.2
+1600,-4500.0,191.2
+1600,-4000.0,191.2
+1600,-3500.0,171.2
+1600,-3000.0,151.2
+1600,-2500.0,131.2
+1600,-2000.0,111.2
+1600,-1600.0,95.2
+1600,-1200.0,79.2
+1600,-900.0,67.2
+1600,-600.0,55.2
+1600,-400.0,47.2
+1600,-200.0,39.2
+1600,0.0,39.2
+1600,200.0,39.2
+1600,400.0,47.2
+1600,600.0,55.2
+1600,900.0,67.2
+1600,1200.0,79.2
+1600,1600.0,95.2
+1600,2000.0,111.2
+1600,2500.0,131.2
+1600,3000.0,151.2
+1600,3500.0,171.2
+1600,4000.0,191.2
+1600,4500.0,211.2
+1600,5000.0,231.2
+1600,5500.0,251.2
+2000,-5500.0,256.0
+2000,-5000.0,236.0
+2000,-4500.0,196.0
+2000,-4000.0,196.0
+2000,-3500.0,176.0
+2000,-3000.0,156.0
+2000,-2500.0,136.0
+2000,-2000.0,116.0
+2000,-1600.0,100.0
+2000,-1200.0,84.0
+2000,-900.0,72.0
+2000,-600.0,60.0
+2000,-400.0,52.0
+2000,-200.0,44.0
+2000,0.0,44.0
+2000,200.0,44.0
+2000,400.0,52.0
+2000,600.0,60.0
+2000,900.0,72.0
+2000,1200.0,84.0
+2000,1600.0,100.0
+2000,2000.0,116.0
+2000,2500.0,136.0
+2000,3000.0,156.0
+2000,3500.0,176.0
+2000,4000.0,196.0
+2000,4500.0,216.0
+2000,5000.0,236.0
+2000,5500.0,256.0
+2500,-5500.0,262.0
+2500,-5000.0,242.0
+2500,-4500.0,202.0
+2500,-4000.0,202.0
+2500,-3500.0,182.0
+2500,-3000.0,162.0
+2500,-2500.0,142.0
+2500,-2000.0,122.0
+2500,-1600.0,106.0
+2500,-1200.0,90.0
+2500,-900.0,78.0
+2500,-600.0,66.0
+2500,-400.0,58.0
+2500,-200.0,50.0
+2500,0.0,50.0
+2500,200.0,50.0
+2500,400.0,58.0
+2500,600.0,66.0
+2500,900.0,78.0
+2500,1200.0,90.0
+2500,1600.0,106.0
+2500,2000.0,122.0
+2500,2500.0,142.0
+2500,3000.0,162.0
+2500,3500.0,182.0
+2500,4000.0,202.0
+2500,4500.0,222.0
+2500,5000.0,242.0
+2500,5500.0,262.0
+3000,-5500.0,268.0
+3000,-5000.0,248.0
+3000,-4500.0,208.0
+3000,-4000.0,208.0
+3000,-3500.0,188.0
+3000,-3000.0,168.0
+3000,-2500.0,148.0
+3000,-2000.0,128.0
+3000,-1600.0,112.0
+3000,-1200.0,96.0
+3000,-900.0,84.0
+3000,-600.0,72.0
+3000,-400.0,64.0
+3000,-200.0,56.0
+3000,0.0,56.0
+3000,200.0,56.0
+3000,400.0,64.0
+3000,600.0,72.0
+3000,900.0,84.0
+3000,1200.0,96.0
+3000,1600.0,112.0
+3000,2000.0,128.0
+3000,2500.0,148.0
+3000,3000.0,168.0
+3000,3500.0,188.0
+3000,4000.0,208.0
+3000,4500.0,228.0
+3000,5000.0,248.0
+3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbat b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbat
new file mode 100644
index 0000000000000000000000000000000000000000..b63cc3aad2ae9a38a3f3d17146b5db01390e99ac
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbat
@@ -0,0 +1,18 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:28:30.2818342Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic Battery",
+ "Capacity": 14.0,
+ "SOC_min": 20.0,
+ "SOC_max": 80.0,
+ "MaxCurrentMap": "MaxCurrent.vimax",
+ "InternalResistanceCurve": "GenericBattery_10kWh_658V.vbatr",
+ "SoCCurve": "GenericBattery_10kWh_658V.vbatv"
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbatr b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbatr
new file mode 100644
index 0000000000000000000000000000000000000000..09c936221ae38d84265ae27ba5542834d407026a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbatr
@@ -0,0 +1,3 @@
+SoC, Ri
+0, 0.12
+100, 0.12
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbatv b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbatv
new file mode 100644
index 0000000000000000000000000000000000000000..8063e04c9379cce6870b2d71c99807f0ee73c3fa
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericBattery_10kWh_658V.vbatv
@@ -0,0 +1,12 @@
+SOC, V
+0, 590
+10, 614
+20, 626
+30, 632
+40, 638
+50, 640
+60, 640
+70, 642
+80, 646
+90, 650
+100, 658
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericEMotor_140kW_900Nm.vemp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericEMotor_140kW_900Nm.vemp
new file mode 100644
index 0000000000000000000000000000000000000000..dc507a3de87525ae3ff0d10ae580fd845bc3763f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericEMotor_140kW_900Nm.vemp
@@ -0,0 +1,74 @@
+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0,900,-900
+1485.446136,900,-900
+1480,900,-900
+1488.888889,897.93,-897.93
+1497.777778,892.5975,-892.5975
+1506.666667,887.3325,-887.3325
+1511.111111,884.7225,-884.7225
+1555.555556,859.4325,-859.4325
+1600,835.56,-835.56
+1644.444444,812.97,-812.97
+1688.888889,791.595,-791.595
+1733.333333,771.3,-771.3
+1777.777778,752.0175,-752.0175
+1822.222222,733.6575,-733.6575
+1866.666667,716.1975,-716.1975
+1911.111111,699.5475,-699.5475
+1955.555556,683.64,-683.64
+2000,668.4525,-668.4525
+2044.444444,653.9175,-653.9175
+2088.888889,640.0125,-640.0125
+2133.333333,626.67,-626.67
+2177.777778,613.89,-613.89
+2222.222222,601.605,-601.605
+2266.666667,589.815,-589.815
+2311.111111,578.475,-578.475
+2355.555556,567.5625,-567.5625
+2400,557.0325,-557.0325
+2444.444444,546.9075,-546.9075
+2488.888889,537.1425,-537.1425
+2533.333333,527.715,-527.715
+2577.777778,518.625,-518.625
+2622.222222,509.8275,-509.8275
+2666.666667,501.345,-501.345
+2711.111111,493.11,-493.11
+2755.555556,485.1675,-485.1675
+2800,477.4725,-477.4725
+2844.444444,470.0025,-470.0025
+2888.888889,462.78,-462.78
+2933.333333,455.76,-455.76
+2977.777778,448.965,-448.965
+3022.222222,442.35,-442.35
+3066.666667,435.9375,-435.9375
+3111.111111,429.7275,-429.7275
+3155.555556,423.675,-423.675
+3200,417.78,-417.78
+3244.444444,412.065,-412.065
+3288.888889,406.485,-406.485
+3333.333333,401.0625,-401.0625
+3377.777778,395.7975,-395.7975
+3422.222222,390.645,-390.645
+3466.666667,385.65,-385.65
+3511.111111,380.7675,-380.7675
+3555.555556,375.9975,-375.9975
+3600,371.3625,-371.3625
+3644.444444,366.84,-366.84
+3688.888889,362.4075,-362.4075
+3733.333333,358.0875,-358.0875
+3777.777778,353.88,-353.88
+3822.222222,349.7625,-349.7625
+3866.666667,345.7575,-345.7575
+3911.111111,341.82,-341.82
+3955.555556,337.9725,-337.9725
+4000,334.215,-334.215
+4044.444444,330.5475,-330.5475
+4088.888889,326.97,-326.97
+4133.333333,323.4375,-323.4375
+4177.777778,319.995,-319.995
+4222.222222,316.6425,-316.6425
+4266.666667,313.335,-313.335
+4311.111111,310.095,-310.095
+4355.555556,306.945,-306.945
+4400,303.84,-303.84
+4444.444444,300.8025,-300.8025
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericIHPCDrag.vemd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericIHPCDrag.vemd
new file mode 100644
index 0000000000000000000000000000000000000000..ea6b5cc3a57308f36d939ccc12b6b122899b3aa9
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericIHPCDrag.vemd
@@ -0,0 +1,3 @@
+n [rpm] , T_drag [Nm]
+0 , 0.0
+10000 , 0.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericIHPC_140kW_936Nm.vem b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericIHPC_140kW_936Nm.vem
new file mode 100644
index 0000000000000000000000000000000000000000..4ee8246760aa123e13fa136ff12f61f37defc3ca
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericIHPC_140kW_936Nm.vem
@@ -0,0 +1,63 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-10-09T08:18:42.8238326Z",
+ "AppVersion": "3",
+ "FileVersion": 5
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IHPC",
+ "DragCurve": "GenericIHPCDrag.vemd",
+ "Inertia": 0.5,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 13860.59,
+ "ContinuousTorqueSpeed": 166.99,
+ "OverloadTorque": 16517.20,
+ "OverloadTorqueSpeed": 166.01,
+ "OverloadTime": 312,
+ "FullLoadCurve": "GenericEMotor_140kW_900Nm.vemp",
+ "EfficiencyMap": {
+ "1": "GenericMap_140kW_936Nm.vemo",
+ "2": "GenericMap_140kW_936Nm.vemo",
+ "3": "GenericMap_140kW_936Nm.vemo",
+ "4": "GenericMap_140kW_936Nm.vemo",
+ "5": "GenericMap_140kW_936Nm.vemo",
+ "6": "GenericMap_140kW_936Nm.vemo",
+ "7": "GenericMap_140kW_936Nm.vemo",
+ "8": "GenericMap_140kW_936Nm.vemo",
+ "9": "GenericMap_140kW_936Nm.vemo",
+ "10": "GenericMap_140kW_936Nm.vemo",
+ "11": "GenericMap_140kW_936Nm.vemo",
+ "12": "GenericMap_140kW_936Nm.vemo"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 15015.63,
+ "ContinuousTorqueSpeed": 168.62,
+ "OverloadTorque": 17325.73,
+ "OverloadTorqueSpeed": 170.17,
+ "OverloadTime": 345,
+ "FullLoadCurve": "GenericEMotor_140kW_900Nm.vemp",
+ "EfficiencyMap": {
+ "1": "GenericMap_140kW_936Nm.vemo",
+ "2": "GenericMap_140kW_936Nm.vemo",
+ "3": "GenericMap_140kW_936Nm.vemo",
+ "4": "GenericMap_140kW_936Nm.vemo",
+ "5": "GenericMap_140kW_936Nm.vemo",
+ "6": "GenericMap_140kW_936Nm.vemo",
+ "7": "GenericMap_140kW_936Nm.vemo",
+ "8": "GenericMap_140kW_936Nm.vemo",
+ "9": "GenericMap_140kW_936Nm.vemo",
+ "10": "GenericMap_140kW_936Nm.vemo",
+ "11": "GenericMap_140kW_936Nm.vemo",
+ "12": "GenericMap_140kW_936Nm.vemo"
+ }
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericMap_140kW_936Nm.vemo b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericMap_140kW_936Nm.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..aaf978890c6fd20d74a852e50541bbc48c2933fb
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/GenericMap_140kW_936Nm.vemo
@@ -0,0 +1,2016 @@
+n [rpm] , T [Nm] , P_el [kW]
+0,-936,9.8449
+0,-906.75,9.2719
+0,-877.5,8.7161
+0,-848.25,8.1773
+0,-819,7.6558
+0,-789.75,7.1514
+0,-760.5,6.6641
+0,-731.25,6.194
+0,-702,5.741
+0,-672.75,5.3052
+0,-643.5,4.8866
+0,-614.25,4.4851
+0,-585,4.1007
+0,-555.75,3.7335
+0,-526.5,3.3834
+0,-497.25,3.0505
+0,-468,2.7348
+0,-438.75,2.4362
+0,-409.5,2.1547
+0,-380.25,1.8904
+0,-351,1.6433
+0,-321.75,1.4133
+0,-292.5,1.2004
+0,-263.25,1.0047
+0,-234,0.82617
+0,-204.75,0.66478
+0,-175.5,0.52053
+0,-146.25,0.39344
+0,-117,0.28349
+0,-87.75,0.1907
+0,-58.5,0.11506
+0,-29.25,0.056566
+0,0,0.0361
+0,29.25,0.086979
+0,58.5,0.15501
+0,87.75,0.24019
+0,117,0.34252
+0,146.25,0.462
+0,175.5,0.59864
+0,204.75,0.75242
+0,234,0.92335
+0,263.25,1.1114
+0,292.5,1.3167
+0,321.75,1.5391
+0,351,1.7786
+0,380.25,2.0353
+0,409.5,2.3091
+0,438.75,2.6001
+0,468,2.9083
+0,497.25,3.2336
+0,526.5,3.576
+0,555.75,3.9356
+0,585,4.3123
+0,614.25,4.7062
+0,643.5,5.1173
+0,672.75,5.5455
+0,702,5.9908
+0,731.25,6.4533
+0,760.5,6.933
+0,789.75,7.4298
+0,819,7.9437
+0,848.25,8.4748
+0,877.5,9.0231
+0,906.75,9.5885
+0,936,10.171
+40.80854701,-936,5.8367
+40.80854701,-906.75,5.3901
+40.80854701,-877.5,4.9606
+40.80854701,-848.25,4.5482
+40.80854701,-819,4.153
+40.80854701,-789.75,3.775
+40.80854701,-760.5,3.4141
+40.80854701,-731.25,3.0704
+40.80854701,-702,2.7438
+40.80854701,-672.75,2.4344
+40.80854701,-643.5,2.1421
+40.80854701,-614.25,1.8669
+40.80854701,-585,1.609
+40.80854701,-555.75,1.3681
+40.80854701,-526.5,1.1445
+40.80854701,-497.25,0.93793
+40.80854701,-468,0.74855
+40.80854701,-438.75,0.57729
+40.80854701,-409.5,0.4236
+40.80854701,-380.25,0.28766
+40.80854701,-351,0.16853
+40.80854701,-321.75,0.066217
+40.80854701,-292.5,-0.019286
+40.80854701,-263.25,-0.087979
+40.80854701,-234,-0.13986
+40.80854701,-204.75,-0.17493
+40.80854701,-175.5,-0.19319
+40.80854701,-146.25,-0.19464
+40.80854701,-117,-0.17927
+40.80854701,-87.75,-0.1471
+40.80854701,-58.5,-0.09811
+40.80854701,-29.25,-0.032313
+40.80854701,0,0.07245
+40.80854701,29.25,0.24971
+40.80854701,58.5,0.44411
+40.80854701,87.75,0.65567
+40.80854701,117,0.88437
+40.80854701,146.25,1.1302
+40.80854701,175.5,1.3932
+40.80854701,204.75,1.6734
+40.80854701,234,1.9707
+40.80854701,263.25,2.2852
+40.80854701,292.5,2.6168
+40.80854701,321.75,2.9655
+40.80854701,351,3.3315
+40.80854701,380.25,3.7145
+40.80854701,409.5,4.1147
+40.80854701,438.75,4.5321
+40.80854701,468,4.9666
+40.80854701,497.25,5.4183
+40.80854701,526.5,5.8871
+40.80854701,555.75,6.3731
+40.80854701,585,6.8762
+40.80854701,614.25,7.3965
+40.80854701,643.5,7.9339
+40.80854701,672.75,8.4885
+40.80854701,702,9.0602
+40.80854701,731.25,9.6491
+40.80854701,760.5,10.255
+40.80854701,789.75,10.878
+40.80854701,819,11.519
+40.80854701,848.25,12.176
+40.80854701,877.5,12.851
+40.80854701,906.75,13.542
+40.80854701,936,14.251
+81.61794872,-936,1.8303
+81.61794872,-906.75,1.5101
+81.61794872,-877.5,1.2075
+81.61794872,-848.25,0.92457
+81.61794872,-819,0.66034
+81.61794872,-789.75,0.41292
+81.61794872,-760.5,0.18231
+81.61794872,-731.25,-0.031493
+81.61794872,-702,-0.22848
+81.61794872,-672.75,-0.40866
+81.61794872,-643.5,-0.57202
+81.61794872,-614.25,-0.71858
+81.61794872,-585,-0.84832
+81.61794872,-555.75,-0.96125
+81.61794872,-526.5,-1.0574
+81.61794872,-497.25,-1.1367
+81.61794872,-468,-1.1992
+81.61794872,-438.75,-1.2449
+81.61794872,-409.5,-1.2737
+81.61794872,-380.25,-1.2858
+81.61794872,-351,-1.2811
+81.61794872,-321.75,-1.2595
+81.61794872,-292.5,-1.2211
+81.61794872,-263.25,-1.1659
+81.61794872,-234,-1.0939
+81.61794872,-204.75,-1.0051
+81.61794872,-175.5,-0.89953
+81.61794872,-146.25,-0.7771
+81.61794872,-117,-0.63787
+81.61794872,-87.75,-0.48182
+81.61794872,-58.5,-0.30896
+81.61794872,-29.25,-0.11929
+81.61794872,0,0.11065
+81.61794872,29.25,0.41428
+81.61794872,58.5,0.73507
+81.61794872,87.75,1.073
+81.61794872,117,1.4281
+81.61794872,146.25,1.8003
+81.61794872,175.5,2.1897
+81.61794872,204.75,2.5962
+81.61794872,234,3.0199
+81.61794872,263.25,3.4608
+81.61794872,292.5,3.9188
+81.61794872,321.75,4.3939
+81.61794872,351,4.8862
+81.61794872,380.25,5.3956
+81.61794872,409.5,5.9222
+81.61794872,438.75,6.466
+81.61794872,468,7.0269
+81.61794872,497.25,7.6049
+81.61794872,526.5,8.2001
+81.61794872,555.75,8.8124
+81.61794872,585,9.4419
+81.61794872,614.25,10.089
+81.61794872,643.5,10.752
+81.61794872,672.75,11.433
+81.61794872,702,12.131
+81.61794872,731.25,12.847
+81.61794872,760.5,13.579
+81.61794872,789.75,14.329
+81.61794872,819,15.095
+81.61794872,848.25,15.879
+81.61794872,877.5,16.68
+81.61794872,906.75,17.498
+81.61794872,936,18.334
+122.4273504,-936,-2.1071
+122.4273504,-906.75,-2.2979
+122.4273504,-877.5,-2.4719
+122.4273504,-848.25,-2.629
+122.4273504,-819,-2.7694
+122.4273504,-789.75,-2.8929
+122.4273504,-760.5,-2.9997
+122.4273504,-731.25,-3.0896
+122.4273504,-702,-3.1627
+122.4273504,-672.75,-3.219
+122.4273504,-643.5,-3.2585
+122.4273504,-614.25,-3.2812
+122.4273504,-585,-3.2871
+122.4273504,-555.75,-3.2761
+122.4273504,-526.5,-3.2484
+122.4273504,-497.25,-3.2038
+122.4273504,-468,-3.1424
+122.4273504,-438.75,-3.0642
+122.4273504,-409.5,-2.9692
+122.4273504,-380.25,-2.8574
+122.4273504,-351,-2.7288
+122.4273504,-321.75,-2.5834
+122.4273504,-292.5,-2.4211
+122.4273504,-263.25,-2.2421
+122.4273504,-234,-2.0462
+122.4273504,-204.75,-1.8335
+122.4273504,-175.5,-1.604
+122.4273504,-146.25,-1.3577
+122.4273504,-117,-1.0946
+122.4273504,-87.75,-0.81471
+122.4273504,-58.5,-0.51798
+122.4273504,-29.25,-0.20444
+122.4273504,0,0.15072
+122.4273504,29.25,0.58072
+122.4273504,58.5,1.0279
+122.4273504,87.75,1.4922
+122.4273504,117,1.9737
+122.4273504,146.25,2.4723
+122.4273504,175.5,2.988
+122.4273504,204.75,3.5209
+122.4273504,234,4.071
+122.4273504,263.25,4.6382
+122.4273504,292.5,5.2226
+122.4273504,321.75,5.8241
+122.4273504,351,6.4428
+122.4273504,380.25,7.0786
+122.4273504,409.5,7.7315
+122.4273504,438.75,8.4017
+122.4273504,468,9.0889
+122.4273504,497.25,9.7934
+122.4273504,526.5,10.515
+122.4273504,555.75,11.254
+122.4273504,585,12.01
+122.4273504,614.25,12.783
+122.4273504,643.5,13.573
+122.4273504,672.75,14.38
+122.4273504,702,15.205
+122.4273504,731.25,16.046
+122.4273504,760.5,16.905
+122.4273504,789.75,17.781
+122.4273504,819,18.674
+122.4273504,848.25,19.584
+122.4273504,877.5,20.512
+122.4273504,906.75,21.456
+122.4273504,936,22.418
+163.2393162,-936,-6.0305
+163.2393162,-906.75,-6.0974
+163.2393162,-877.5,-6.1475
+163.2393162,-848.25,-6.1808
+163.2393162,-819,-6.1973
+163.2393162,-789.75,-6.197
+163.2393162,-760.5,-6.1799
+163.2393162,-731.25,-6.1459
+163.2393162,-702,-6.0951
+163.2393162,-672.75,-6.0276
+163.2393162,-643.5,-5.9432
+163.2393162,-614.25,-5.842
+163.2393162,-585,-5.724
+163.2393162,-555.75,-5.5892
+163.2393162,-526.5,-5.4376
+163.2393162,-497.25,-5.2691
+163.2393162,-468,-5.0839
+163.2393162,-438.75,-4.8818
+163.2393162,-409.5,-4.6629
+163.2393162,-380.25,-4.4272
+163.2393162,-351,-4.1748
+163.2393162,-321.75,-3.9054
+163.2393162,-292.5,-3.6193
+163.2393162,-263.25,-3.3164
+163.2393162,-234,-2.9967
+163.2393162,-204.75,-2.6601
+163.2393162,-175.5,-2.3067
+163.2393162,-146.25,-1.9366
+163.2393162,-117,-1.5496
+163.2393162,-87.75,-1.1458
+163.2393162,-58.5,-0.72519
+163.2393162,-29.25,-0.28777
+163.2393162,0,0.19264
+163.2393162,29.25,0.74902
+163.2393162,58.5,1.3226
+163.2393162,87.75,1.9132
+163.2393162,117,2.5211
+163.2393162,146.25,3.1461
+163.2393162,175.5,3.7882
+163.2393162,204.75,4.4475
+163.2393162,234,5.1239
+163.2393162,263.25,5.8175
+163.2393162,292.5,6.5283
+163.2393162,321.75,7.2561
+163.2393162,351,8.0012
+163.2393162,380.25,8.7634
+163.2393162,409.5,9.5427
+163.2393162,438.75,10.339
+163.2393162,468,11.153
+163.2393162,497.25,11.984
+163.2393162,526.5,12.832
+163.2393162,555.75,13.697
+163.2393162,585,14.579
+163.2393162,614.25,15.478
+163.2393162,643.5,16.395
+163.2393162,672.75,17.329
+163.2393162,702,18.279
+163.2393162,731.25,19.247
+163.2393162,760.5,20.233
+163.2393162,789.75,21.235
+163.2393162,819,22.254
+163.2393162,848.25,23.291
+163.2393162,877.5,24.345
+163.2393162,906.75,25.416
+163.2393162,936,26.504
+204.042735,-936,-9.9521
+204.042735,-906.75,-9.8951
+204.042735,-877.5,-9.8214
+204.042735,-848.25,-9.7308
+204.042735,-819,-9.6234
+204.042735,-789.75,-9.4992
+204.042735,-760.5,-9.3582
+204.042735,-731.25,-9.2004
+204.042735,-702,-9.0258
+204.042735,-672.75,-8.8343
+204.042735,-643.5,-8.626
+204.042735,-614.25,-8.401
+204.042735,-585,-8.1591
+204.042735,-555.75,-7.9004
+204.042735,-526.5,-7.6249
+204.042735,-497.25,-7.3326
+204.042735,-468,-7.0235
+204.042735,-438.75,-6.6975
+204.042735,-409.5,-6.3548
+204.042735,-380.25,-5.9952
+204.042735,-351,-5.6189
+204.042735,-321.75,-5.2257
+204.042735,-292.5,-4.8157
+204.042735,-263.25,-4.3889
+204.042735,-234,-3.9453
+204.042735,-204.75,-3.4849
+204.042735,-175.5,-3.0076
+204.042735,-146.25,-2.5136
+204.042735,-117,-2.0027
+204.042735,-87.75,-1.475
+204.042735,-58.5,-0.93057
+204.042735,-29.25,-0.36928
+204.042735,0,0.23641
+204.042735,29.25,0.91917
+204.042735,58.5,1.6191
+204.042735,87.75,2.3361
+204.042735,117,3.0704
+204.042735,146.25,3.8217
+204.042735,175.5,4.5902
+204.042735,204.75,5.3759
+204.042735,234,6.1787
+204.042735,263.25,6.9987
+204.042735,292.5,7.8358
+204.042735,321.75,8.6901
+204.042735,351,9.5615
+204.042735,380.25,10.45
+204.042735,409.5,11.356
+204.042735,438.75,12.279
+204.042735,468,13.219
+204.042735,497.25,14.176
+204.042735,526.5,15.15
+204.042735,555.75,16.142
+204.042735,585,17.15
+204.042735,614.25,18.176
+204.042735,643.5,19.219
+204.042735,672.75,20.279
+204.042735,702,21.356
+204.042735,731.25,22.451
+204.042735,760.5,23.562
+204.042735,789.75,24.691
+204.042735,819,25.837
+204.042735,848.25,27
+204.042735,877.5,28.18
+204.042735,906.75,29.377
+204.042735,936,30.592
+244.8547009,-936,-13.872
+244.8547009,-906.75,-13.691
+244.8547009,-877.5,-13.493
+244.8547009,-848.25,-13.279
+244.8547009,-819,-13.048
+244.8547009,-789.75,-12.8
+244.8547009,-760.5,-12.535
+244.8547009,-731.25,-12.253
+244.8547009,-702,-11.955
+244.8547009,-672.75,-11.639
+244.8547009,-643.5,-11.307
+244.8547009,-614.25,-10.958
+244.8547009,-585,-10.592
+244.8547009,-555.75,-10.21
+244.8547009,-526.5,-9.8105
+244.8547009,-497.25,-9.3943
+244.8547009,-468,-8.9613
+244.8547009,-438.75,-8.5115
+244.8547009,-409.5,-8.0448
+244.8547009,-380.25,-7.5614
+244.8547009,-351,-7.0612
+244.8547009,-321.75,-6.5441
+244.8547009,-292.5,-6.0103
+244.8547009,-263.25,-5.4596
+244.8547009,-234,-4.8921
+244.8547009,-204.75,-4.3078
+244.8547009,-175.5,-3.7067
+244.8547009,-146.25,-3.0888
+244.8547009,-117,-2.454
+244.8547009,-87.75,-1.8025
+244.8547009,-58.5,-1.1341
+244.8547009,-29.25,-0.44896
+244.8547009,0,0.28205
+244.8547009,29.25,1.0912
+244.8547009,58.5,1.9175
+244.8547009,87.75,2.7609
+244.8547009,117,3.6215
+244.8547009,146.25,4.4992
+244.8547009,175.5,5.3941
+244.8547009,204.75,6.3062
+244.8547009,234,7.2354
+244.8547009,263.25,8.1817
+244.8547009,292.5,9.1452
+244.8547009,321.75,10.126
+244.8547009,351,11.124
+244.8547009,380.25,12.139
+244.8547009,409.5,13.171
+244.8547009,438.75,14.22
+244.8547009,468,15.286
+244.8547009,497.25,16.37
+244.8547009,526.5,17.471
+244.8547009,555.75,18.588
+244.8547009,585,19.723
+244.8547009,614.25,20.876
+244.8547009,643.5,22.045
+244.8547009,672.75,23.231
+244.8547009,702,24.435
+244.8547009,731.25,25.656
+244.8547009,760.5,26.894
+244.8547009,789.75,28.149
+244.8547009,819,29.421
+244.8547009,848.25,30.71
+244.8547009,877.5,32.017
+244.8547009,906.75,33.34
+244.8547009,936,34.681
+285.6666667,-936,-17.79
+285.6666667,-906.75,-17.485
+285.6666667,-877.5,-17.164
+285.6666667,-848.25,-16.825
+285.6666667,-819,-16.47
+285.6666667,-789.75,-16.098
+285.6666667,-760.5,-15.709
+285.6666667,-731.25,-15.304
+285.6666667,-702,-14.881
+285.6666667,-672.75,-14.442
+285.6666667,-643.5,-13.986
+285.6666667,-614.25,-13.513
+285.6666667,-585,-13.024
+285.6666667,-555.75,-12.517
+285.6666667,-526.5,-11.994
+285.6666667,-497.25,-11.454
+285.6666667,-468,-10.897
+285.6666667,-438.75,-10.324
+285.6666667,-409.5,-9.7331
+285.6666667,-380.25,-9.1258
+285.6666667,-351,-8.5016
+285.6666667,-321.75,-7.8607
+285.6666667,-292.5,-7.203
+285.6666667,-263.25,-6.5284
+285.6666667,-234,-5.8371
+285.6666667,-204.75,-5.1289
+285.6666667,-175.5,-4.4039
+285.6666667,-146.25,-3.6621
+285.6666667,-117,-2.9035
+285.6666667,-87.75,-2.1281
+285.6666667,-58.5,-1.3359
+285.6666667,-29.25,-0.52683
+285.6666667,0,0.32954
+285.6666667,29.25,1.2651
+285.6666667,58.5,2.2177
+285.6666667,87.75,3.1875
+285.6666667,117,4.1745
+285.6666667,146.25,5.1786
+285.6666667,175.5,6.1999
+285.6666667,204.75,7.2383
+285.6666667,234,8.2939
+285.6666667,263.25,9.3666
+285.6666667,292.5,10.456
+285.6666667,321.75,11.563
+285.6666667,351,12.688
+285.6666667,380.25,13.829
+285.6666667,409.5,14.987
+285.6666667,438.75,16.163
+285.6666667,468,17.356
+285.6666667,497.25,18.566
+285.6666667,526.5,19.793
+285.6666667,555.75,21.037
+285.6666667,585,22.298
+285.6666667,614.25,23.577
+285.6666667,643.5,24.873
+285.6666667,672.75,26.185
+285.6666667,702,27.515
+285.6666667,731.25,28.863
+285.6666667,760.5,30.227
+285.6666667,789.75,31.608
+285.6666667,819,33.007
+285.6666667,848.25,34.423
+285.6666667,877.5,35.856
+285.6666667,906.75,37.306
+285.6666667,936,38.773
+326.4700855,-936,-21.706
+326.4700855,-906.75,-21.277
+326.4700855,-877.5,-20.832
+326.4700855,-848.25,-20.37
+326.4700855,-819,-19.891
+326.4700855,-789.75,-19.395
+326.4700855,-760.5,-18.882
+326.4700855,-731.25,-18.353
+326.4700855,-702,-17.807
+326.4700855,-672.75,-17.244
+326.4700855,-643.5,-16.664
+326.4700855,-614.25,-16.067
+326.4700855,-585,-15.454
+326.4700855,-555.75,-14.823
+326.4700855,-526.5,-14.176
+326.4700855,-497.25,-13.512
+326.4700855,-468,-12.831
+326.4700855,-438.75,-12.134
+326.4700855,-409.5,-11.419
+326.4700855,-380.25,-10.688
+326.4700855,-351,-9.9403
+326.4700855,-321.75,-9.1755
+326.4700855,-292.5,-8.3939
+326.4700855,-263.25,-7.5955
+326.4700855,-234,-6.7802
+326.4700855,-204.75,-5.9482
+326.4700855,-175.5,-5.0993
+326.4700855,-146.25,-4.2337
+326.4700855,-117,-3.3512
+326.4700855,-87.75,-2.4519
+326.4700855,-58.5,-1.5358
+326.4700855,-29.25,-0.60288
+326.4700855,0,0.37889
+326.4700855,29.25,1.4408
+326.4700855,58.5,2.5198
+326.4700855,87.75,3.616
+326.4700855,117,4.7293
+326.4700855,146.25,5.8598
+326.4700855,175.5,7.0075
+326.4700855,204.75,8.1723
+326.4700855,234,9.3542
+326.4700855,263.25,10.553
+326.4700855,292.5,11.77
+326.4700855,321.75,13.003
+326.4700855,351,14.254
+326.4700855,380.25,15.521
+326.4700855,409.5,16.806
+326.4700855,438.75,18.108
+326.4700855,468,19.427
+326.4700855,497.25,20.764
+326.4700855,526.5,22.117
+326.4700855,555.75,23.488
+326.4700855,585,24.875
+326.4700855,614.25,26.28
+326.4700855,643.5,27.702
+326.4700855,672.75,29.141
+326.4700855,702,30.598
+326.4700855,731.25,32.071
+326.4700855,760.5,33.562
+326.4700855,789.75,35.07
+326.4700855,819,36.595
+326.4700855,848.25,38.137
+326.4700855,877.5,39.696
+326.4700855,906.75,41.273
+326.4700855,936,42.866
+367.2820513,-936,-25.62
+367.2820513,-906.75,-25.068
+367.2820513,-877.5,-24.499
+367.2820513,-848.25,-23.912
+367.2820513,-819,-23.31
+367.2820513,-789.75,-22.69
+367.2820513,-760.5,-22.053
+367.2820513,-731.25,-21.4
+367.2820513,-702,-20.73
+367.2820513,-672.75,-20.043
+367.2820513,-643.5,-19.339
+367.2820513,-614.25,-18.619
+367.2820513,-585,-17.881
+367.2820513,-555.75,-17.127
+367.2820513,-526.5,-16.356
+367.2820513,-497.25,-15.568
+367.2820513,-468,-14.764
+367.2820513,-438.75,-13.942
+367.2820513,-409.5,-13.104
+367.2820513,-380.25,-12.249
+367.2820513,-351,-11.377
+367.2820513,-321.75,-10.488
+367.2820513,-292.5,-9.583
+367.2820513,-263.25,-8.6607
+367.2820513,-234,-7.7216
+367.2820513,-204.75,-6.7657
+367.2820513,-175.5,-5.7929
+367.2820513,-146.25,-4.8034
+367.2820513,-117,-3.797
+367.2820513,-87.75,-2.7739
+367.2820513,-58.5,-1.7339
+367.2820513,-29.25,-0.67711
+367.2820513,0,0.4301
+367.2820513,29.25,1.6184
+367.2820513,58.5,2.8238
+367.2820513,87.75,4.0463
+367.2820513,117,5.2861
+367.2820513,146.25,6.5429
+367.2820513,175.5,7.8169
+367.2820513,204.75,9.1081
+367.2820513,234,10.416
+367.2820513,263.25,11.742
+367.2820513,292.5,13.085
+367.2820513,321.75,14.444
+367.2820513,351,15.821
+367.2820513,380.25,17.215
+367.2820513,409.5,18.627
+367.2820513,438.75,20.055
+367.2820513,468,21.5
+367.2820513,497.25,22.963
+367.2820513,526.5,24.443
+367.2820513,555.75,25.94
+367.2820513,585,27.454
+367.2820513,614.25,28.985
+367.2820513,643.5,30.534
+367.2820513,672.75,32.099
+367.2820513,702,33.682
+367.2820513,731.25,35.282
+367.2820513,760.5,36.899
+367.2820513,789.75,38.533
+367.2820513,819,40.185
+367.2820513,848.25,41.853
+367.2820513,877.5,43.539
+367.2820513,906.75,45.241
+367.2820513,936,46.961
+408.0854701,-936,-29.533
+408.0854701,-906.75,-28.856
+408.0854701,-877.5,-28.163
+408.0854701,-848.25,-27.453
+408.0854701,-819,-26.727
+408.0854701,-789.75,-25.983
+408.0854701,-760.5,-25.223
+408.0854701,-731.25,-24.445
+408.0854701,-702,-23.651
+408.0854701,-672.75,-22.841
+408.0854701,-643.5,-22.013
+408.0854701,-614.25,-21.169
+408.0854701,-585,-20.307
+408.0854701,-555.75,-19.429
+408.0854701,-526.5,-18.534
+408.0854701,-497.25,-17.623
+408.0854701,-468,-16.694
+408.0854701,-438.75,-15.749
+408.0854701,-409.5,-14.787
+408.0854701,-380.25,-13.808
+408.0854701,-351,-12.812
+408.0854701,-321.75,-11.8
+408.0854701,-292.5,-10.77
+408.0854701,-263.25,-9.7241
+408.0854701,-234,-8.6611
+408.0854701,-204.75,-7.5813
+408.0854701,-175.5,-6.4847
+408.0854701,-146.25,-5.3713
+408.0854701,-117,-4.2411
+408.0854701,-87.75,-3.094
+408.0854701,-58.5,-1.9302
+408.0854701,-29.25,-0.74951
+408.0854701,0,0.48317
+408.0854701,29.25,1.7978
+408.0854701,58.5,3.1296
+408.0854701,87.75,4.4785
+408.0854701,117,5.8446
+408.0854701,146.25,7.2279
+408.0854701,175.5,8.6283
+408.0854701,204.75,10.046
+408.0854701,234,11.481
+408.0854701,263.25,12.932
+408.0854701,292.5,14.401
+408.0854701,321.75,15.888
+408.0854701,351,17.391
+408.0854701,380.25,18.911
+408.0854701,409.5,20.449
+408.0854701,438.75,22.004
+408.0854701,468,23.576
+408.0854701,497.25,25.165
+408.0854701,526.5,26.771
+408.0854701,555.75,28.394
+408.0854701,585,30.035
+408.0854701,614.25,31.692
+408.0854701,643.5,33.367
+408.0854701,672.75,35.059
+408.0854701,702,36.768
+408.0854701,731.25,38.494
+408.0854701,760.5,40.238
+408.0854701,789.75,41.998
+408.0854701,819,43.776
+408.0854701,848.25,45.571
+408.0854701,877.5,47.383
+408.0854701,906.75,49.212
+408.0854701,936,51.058
+448.8974359,-936,-33.443
+448.8974359,-906.75,-32.643
+448.8974359,-877.5,-31.826
+448.8974359,-848.25,-30.992
+448.8974359,-819,-30.142
+448.8974359,-789.75,-29.274
+448.8974359,-760.5,-28.39
+448.8974359,-731.25,-27.489
+448.8974359,-702,-26.571
+448.8974359,-672.75,-25.636
+448.8974359,-643.5,-24.685
+448.8974359,-614.25,-23.717
+448.8974359,-585,-22.732
+448.8974359,-555.75,-21.73
+448.8974359,-526.5,-20.711
+448.8974359,-497.25,-19.675
+448.8974359,-468,-18.623
+448.8974359,-438.75,-17.554
+448.8974359,-409.5,-16.468
+448.8974359,-380.25,-15.365
+448.8974359,-351,-14.245
+448.8974359,-321.75,-13.109
+448.8974359,-292.5,-11.956
+448.8974359,-263.25,-10.786
+448.8974359,-234,-9.5988
+448.8974359,-204.75,-8.3951
+448.8974359,-175.5,-7.1747
+448.8974359,-146.25,-5.9374
+448.8974359,-117,-4.6833
+448.8974359,-87.75,-3.4124
+448.8974359,-58.5,-2.1246
+448.8974359,-29.25,-0.82009
+448.8974359,0,0.53809
+448.8974359,29.25,1.9791
+448.8974359,58.5,3.4373
+448.8974359,87.75,4.9126
+448.8974359,117,6.4051
+448.8974359,146.25,7.9147
+448.8974359,175.5,9.4414
+448.8974359,204.75,10.985
+448.8974359,234,12.546
+448.8974359,263.25,14.125
+448.8974359,292.5,15.72
+448.8974359,321.75,17.333
+448.8974359,351,18.962
+448.8974359,380.25,20.609
+448.8974359,409.5,22.273
+448.8974359,438.75,23.954
+448.8974359,468,25.652
+448.8974359,497.25,27.368
+448.8974359,526.5,29.1
+448.8974359,555.75,30.85
+448.8974359,585,32.617
+448.8974359,614.25,34.401
+448.8974359,643.5,36.202
+448.8974359,672.75,38.021
+448.8974359,702,39.856
+448.8974359,731.25,41.709
+448.8974359,760.5,43.579
+448.8974359,789.75,45.465
+448.8974359,819,47.37
+448.8974359,848.25,49.291
+448.8974359,877.5,51.229
+448.8974359,906.75,53.185
+448.8974359,936,55.157
+489.7094017,-936,-37.352
+489.7094017,-906.75,-36.428
+489.7094017,-877.5,-35.487
+489.7094017,-848.25,-34.53
+489.7094017,-819,-33.555
+489.7094017,-789.75,-32.564
+489.7094017,-760.5,-31.556
+489.7094017,-731.25,-30.531
+489.7094017,-702,-29.489
+489.7094017,-672.75,-28.43
+489.7094017,-643.5,-27.355
+489.7094017,-614.25,-26.263
+489.7094017,-585,-25.154
+489.7094017,-555.75,-24.028
+489.7094017,-526.5,-22.885
+489.7094017,-497.25,-21.726
+489.7094017,-468,-20.55
+489.7094017,-438.75,-19.357
+489.7094017,-409.5,-18.147
+489.7094017,-380.25,-16.92
+489.7094017,-351,-15.677
+489.7094017,-321.75,-14.416
+489.7094017,-292.5,-13.139
+489.7094017,-263.25,-11.845
+489.7094017,-234,-10.535
+489.7094017,-204.75,-9.2071
+489.7094017,-175.5,-7.8628
+489.7094017,-146.25,-6.5016
+489.7094017,-117,-5.1236
+489.7094017,-87.75,-3.7289
+489.7094017,-58.5,-2.3173
+489.7094017,-29.25,-0.88886
+489.7094017,0,0.59487
+489.7094017,29.25,2.1623
+489.7094017,58.5,3.7468
+489.7094017,87.75,5.3485
+489.7094017,117,6.9673
+489.7094017,146.25,8.6033
+489.7094017,175.5,10.256
+489.7094017,204.75,11.927
+489.7094017,234,13.614
+489.7094017,263.25,15.319
+489.7094017,292.5,17.041
+489.7094017,321.75,18.779
+489.7094017,351,20.536
+489.7094017,380.25,22.309
+489.7094017,409.5,24.099
+489.7094017,438.75,25.907
+489.7094017,468,27.731
+489.7094017,497.25,29.573
+489.7094017,526.5,31.432
+489.7094017,555.75,33.308
+489.7094017,585,35.201
+489.7094017,614.25,37.112
+489.7094017,643.5,39.039
+489.7094017,672.75,40.984
+489.7094017,702,42.946
+489.7094017,731.25,44.925
+489.7094017,760.5,46.921
+489.7094017,789.75,48.934
+489.7094017,819,50.965
+489.7094017,848.25,53.012
+489.7094017,877.5,55.077
+489.7094017,906.75,57.159
+489.7094017,936,59.258
+816.1794872,-936,-68.557
+816.1794872,-906.75,-66.642
+816.1794872,-877.5,-64.711
+816.1794872,-848.25,-62.762
+816.1794872,-819,-60.796
+816.1794872,-789.75,-58.814
+816.1794872,-760.5,-56.815
+816.1794872,-731.25,-54.799
+816.1794872,-702,-52.766
+816.1794872,-672.75,-50.717
+816.1794872,-643.5,-48.65
+816.1794872,-614.25,-46.567
+816.1794872,-585,-44.467
+816.1794872,-555.75,-42.35
+816.1794872,-526.5,-40.217
+816.1794872,-497.25,-38.066
+816.1794872,-468,-35.899
+816.1794872,-438.75,-33.715
+816.1794872,-409.5,-31.514
+816.1794872,-380.25,-29.297
+816.1794872,-351,-27.062
+816.1794872,-321.75,-24.811
+816.1794872,-292.5,-22.543
+816.1794872,-263.25,-20.258
+816.1794872,-234,-17.956
+816.1794872,-204.75,-15.638
+816.1794872,-175.5,-13.302
+816.1794872,-146.25,-10.95
+816.1794872,-117,-8.5812
+816.1794872,-87.75,-6.1954
+816.1794872,-58.5,-3.7928
+816.1794872,-29.25,-1.3734
+816.1794872,0,1.116
+816.1794872,29.25,3.6944
+816.1794872,58.5,6.29
+816.1794872,87.75,8.9027
+816.1794872,117,11.533
+816.1794872,146.25,14.18
+816.1794872,175.5,16.844
+816.1794872,204.75,19.525
+816.1794872,234,22.223
+816.1794872,263.25,24.939
+816.1794872,292.5,27.672
+816.1794872,321.75,30.422
+816.1794872,351,33.189
+816.1794872,380.25,35.973
+816.1794872,409.5,38.774
+816.1794872,438.75,41.593
+816.1794872,468,44.429
+816.1794872,497.25,47.281
+816.1794872,526.5,50.151
+816.1794872,555.75,53.038
+816.1794872,585,55.943
+816.1794872,614.25,58.864
+816.1794872,643.5,61.803
+816.1794872,672.75,64.758
+816.1794872,702,67.731
+816.1794872,731.25,70.721
+816.1794872,760.5,73.728
+816.1794872,789.75,76.753
+816.1794872,819,79.794
+816.1794872,848.25,82.853
+816.1794872,877.5,85.929
+816.1794872,906.75,89.022
+816.1794872,936,92.132
+1020.25641,-936,-88.002
+1020.25641,-906.75,-85.467
+1020.25641,-877.5,-82.916
+1020.25641,-848.25,-80.348
+1020.25641,-819,-77.763
+1020.25641,-789.75,-75.161
+1020.25641,-760.5,-72.543
+1020.25641,-731.25,-69.908
+1020.25641,-702,-67.255
+1020.25641,-672.75,-64.586
+1020.25641,-643.5,-61.901
+1020.25641,-614.25,-59.198
+1020.25641,-585,-56.479
+1020.25641,-555.75,-53.743
+1020.25641,-526.5,-50.99
+1020.25641,-497.25,-48.22
+1020.25641,-468,-45.433
+1020.25641,-438.75,-42.63
+1020.25641,-409.5,-39.81
+1020.25641,-380.25,-36.973
+1020.25641,-351,-34.119
+1020.25641,-321.75,-31.248
+1020.25641,-292.5,-28.361
+1020.25641,-263.25,-25.456
+1020.25641,-234,-22.535
+1020.25641,-204.75,-19.597
+1020.25641,-175.5,-16.643
+1020.25641,-146.25,-13.671
+1020.25641,-117,-10.683
+1020.25641,-87.75,-7.6778
+1020.25641,-58.5,-4.6558
+1020.25641,-29.25,-1.6171
+1020.25641,0,1.5021
+1020.25641,29.25,4.7124
+1020.25641,58.5,7.9398
+1020.25641,87.75,11.184
+1020.25641,117,14.446
+1020.25641,146.25,17.725
+1020.25641,175.5,21.021
+1020.25641,204.75,24.334
+1020.25641,234,27.665
+1020.25641,263.25,31.012
+1020.25641,292.5,34.377
+1020.25641,321.75,37.758
+1020.25641,351,41.157
+1020.25641,380.25,44.574
+1020.25641,409.5,48.007
+1020.25641,438.75,51.457
+1020.25641,468,54.925
+1020.25641,497.25,58.409
+1020.25641,526.5,61.911
+1020.25641,555.75,65.43
+1020.25641,585,68.966
+1020.25641,614.25,72.52
+1020.25641,643.5,76.09
+1020.25641,672.75,79.678
+1020.25641,702,83.282
+1020.25641,731.25,86.904
+1020.25641,760.5,90.543
+1020.25641,789.75,94.2
+1020.25641,819,97.873
+1020.25641,848.25,101.56
+1020.25641,877.5,105.27
+1020.25641,906.75,109
+1020.25641,936,112.74
+1224.273504,-936,-107.4
+1224.273504,-906.75,-104.25
+1224.273504,-877.5,-101.08
+1224.273504,-848.25,-97.888
+1224.273504,-819,-94.684
+1224.273504,-789.75,-91.463
+1224.273504,-760.5,-88.225
+1224.273504,-731.25,-84.97
+1224.273504,-702,-81.699
+1224.273504,-672.75,-78.411
+1224.273504,-643.5,-75.106
+1224.273504,-614.25,-71.784
+1224.273504,-585,-68.445
+1224.273504,-555.75,-65.089
+1224.273504,-526.5,-61.717
+1224.273504,-497.25,-58.328
+1224.273504,-468,-54.922
+1224.273504,-438.75,-51.499
+1224.273504,-409.5,-48.06
+1224.273504,-380.25,-44.603
+1224.273504,-351,-41.13
+1224.273504,-321.75,-37.64
+1224.273504,-292.5,-34.133
+1224.273504,-263.25,-30.61
+1224.273504,-234,-27.069
+1224.273504,-204.75,-23.512
+1224.273504,-175.5,-19.938
+1224.273504,-146.25,-16.347
+1224.273504,-117,-12.739
+1224.273504,-87.75,-9.1147
+1224.273504,-58.5,-5.4734
+1224.273504,-29.25,-1.8152
+1224.273504,0,1.9346
+1224.273504,29.25,5.7768
+1224.273504,58.5,9.6361
+1224.273504,87.75,13.513
+1224.273504,117,17.406
+1224.273504,146.25,21.317
+1224.273504,175.5,25.245
+1224.273504,204.75,29.19
+1224.273504,234,33.152
+1224.273504,263.25,37.131
+1224.273504,292.5,41.128
+1224.273504,321.75,45.142
+1224.273504,351,49.173
+1224.273504,380.25,53.22
+1224.273504,409.5,57.286
+1224.273504,438.75,61.368
+1224.273504,468,65.467
+1224.273504,497.25,69.584
+1224.273504,526.5,73.718
+1224.273504,555.75,77.868
+1224.273504,585,82.037
+1224.273504,614.25,86.222
+1224.273504,643.5,90.424
+1224.273504,672.75,94.644
+1224.273504,702,98.88
+1224.273504,731.25,103.13
+1224.273504,760.5,107.4
+1224.273504,789.75,111.69
+1224.273504,819,116
+1224.273504,848.25,120.32
+1224.273504,877.5,124.66
+1224.273504,906.75,129.02
+1224.273504,936,133.39
+1428.290598,-936,-126.75
+1428.290598,-906.75,-122.98
+1428.290598,-877.5,-119.19
+1428.290598,-848.25,-115.38
+1428.290598,-819,-111.56
+1428.290598,-789.75,-107.72
+1428.290598,-760.5,-103.86
+1428.290598,-731.25,-99.988
+1428.290598,-702,-96.097
+1428.290598,-672.75,-92.189
+1428.290598,-643.5,-88.265
+1428.290598,-614.25,-84.324
+1428.290598,-585,-80.366
+1428.290598,-555.75,-76.391
+1428.290598,-526.5,-72.399
+1428.290598,-497.25,-68.391
+1428.290598,-468,-64.365
+1428.290598,-438.75,-60.323
+1428.290598,-409.5,-56.264
+1428.290598,-380.25,-52.188
+1428.290598,-351,-48.096
+1428.290598,-321.75,-43.986
+1428.290598,-292.5,-39.86
+1428.290598,-263.25,-35.717
+1428.290598,-234,-31.557
+1428.290598,-204.75,-27.381
+1428.290598,-175.5,-23.187
+1428.290598,-146.25,-18.977
+1428.290598,-117,-14.75
+1428.290598,-87.75,-10.506
+1428.290598,-58.5,-6.2453
+1428.290598,-29.25,-1.9678
+1428.290598,0,2.4136
+1428.290598,29.25,6.8876
+1428.290598,58.5,11.379
+1428.290598,87.75,15.887
+1428.290598,117,20.413
+1428.290598,146.25,24.955
+1428.290598,175.5,29.515
+1428.290598,204.75,34.092
+1428.290598,234,38.686
+1428.290598,263.25,43.297
+1428.290598,292.5,47.926
+1428.290598,321.75,52.571
+1428.290598,351,57.234
+1428.290598,380.25,61.914
+1428.290598,409.5,66.611
+1428.290598,438.75,71.325
+1428.290598,468,76.056
+1428.290598,497.25,80.805
+1428.290598,526.5,85.57
+1428.290598,555.75,90.353
+1428.290598,585,95.153
+1428.290598,614.25,99.97
+1428.290598,643.5,104.8
+1428.290598,672.75,109.66
+1428.290598,702,114.52
+1428.290598,731.25,119.41
+1428.290598,760.5,124.31
+1428.290598,789.75,129.23
+1428.290598,819,134.17
+1428.290598,848.25,139.12
+1428.290598,877.5,144.1
+1428.290598,906.75,149.08
+1428.290598,936,154.09
+1632.393162,-936,-146.06
+1632.393162,-906.75,-141.67
+1632.393162,-877.5,-137.26
+1632.393162,-848.25,-132.83
+1632.393162,-819,-128.39
+1632.393162,-789.75,-123.93
+1632.393162,-760.5,-119.45
+1632.393162,-731.25,-114.96
+1632.393162,-702,-110.45
+1632.393162,-672.75,-105.92
+1632.393162,-643.5,-101.38
+1632.393162,-614.25,-96.818
+1632.393162,-585,-92.241
+1632.393162,-555.75,-87.646
+1632.393162,-526.5,-83.035
+1632.393162,-497.25,-78.407
+1632.393162,-468,-73.763
+1632.393162,-438.75,-69.101
+1632.393162,-409.5,-64.423
+1632.393162,-380.25,-59.728
+1632.393162,-351,-55.016
+1632.393162,-321.75,-50.287
+1632.393162,-292.5,-45.542
+1632.393162,-263.25,-40.779
+1632.393162,-234,-36
+1632.393162,-204.75,-31.204
+1632.393162,-175.5,-26.391
+1632.393162,-146.25,-21.562
+1632.393162,-117,-16.715
+1632.393162,-87.75,-11.852
+1632.393162,-58.5,-6.9718
+1632.393162,-29.25,-2.0749
+1632.393162,0,2.939
+1632.393162,29.25,8.0449
+1632.393162,58.5,13.168
+1632.393162,87.75,18.308
+1632.393162,117,23.466
+1632.393162,146.25,28.64
+1632.393162,175.5,33.832
+1632.393162,204.75,39.041
+1632.393162,234,44.267
+1632.393162,263.25,49.51
+1632.393162,292.5,54.77
+1632.393162,321.75,60.047
+1632.393162,351,65.342
+1632.393162,380.25,70.654
+1632.393162,409.5,75.983
+1632.393162,438.75,81.329
+1632.393162,468,86.692
+1632.393162,497.25,92.072
+1632.393162,526.5,97.47
+1632.393162,555.75,102.88
+1632.393162,585,108.32
+1632.393162,614.25,113.77
+1632.393162,643.5,119.23
+1632.393162,672.75,124.71
+1632.393162,702,130.21
+1632.393162,731.25,135.73
+1632.393162,760.5,141.27
+1632.393162,789.75,146.82
+1632.393162,819,152.39
+1632.393162,848.25,157.97
+1632.393162,877.5,163.58
+1632.393162,906.75,169.2
+1632.393162,936,174.84
+1836.410256,-936,-165.32
+1836.410256,-906.75,-160.31
+1836.410256,-877.5,-155.28
+1836.410256,-848.25,-150.24
+1836.410256,-819,-145.17
+1836.410256,-789.75,-140.1
+1836.410256,-760.5,-135
+1836.410256,-731.25,-129.89
+1836.410256,-702,-124.76
+1836.410256,-672.75,-119.61
+1836.410256,-643.5,-114.45
+1836.410256,-614.25,-109.27
+1836.410256,-585,-104.07
+1836.410256,-555.75,-98.857
+1836.410256,-526.5,-93.626
+1836.410256,-497.25,-88.379
+1836.410256,-468,-83.115
+1836.410256,-438.75,-77.834
+1836.410256,-409.5,-72.536
+1836.410256,-380.25,-67.222
+1836.410256,-351,-61.891
+1836.410256,-321.75,-56.542
+1836.410256,-292.5,-51.177
+1836.410256,-263.25,-45.796
+1836.410256,-234,-40.397
+1836.410256,-204.75,-34.982
+1836.410256,-175.5,-29.55
+1836.410256,-146.25,-24.101
+1836.410256,-117,-18.635
+1836.410256,-87.75,-13.152
+1836.410256,-58.5,-7.6528
+1836.410256,-29.25,-2.1365
+1836.410256,0,3.5108
+1836.410256,29.25,9.2486
+1836.410256,58.5,15.004
+1836.410256,87.75,20.776
+1836.410256,117,26.565
+1836.410256,146.25,32.371
+1836.410256,175.5,38.195
+1836.410256,204.75,44.036
+1836.410256,234,49.893
+1836.410256,263.25,55.768
+1836.410256,292.5,61.661
+1836.410256,321.75,67.57
+1836.410256,351,73.496
+1836.410256,380.25,79.44
+1836.410256,409.5,85.401
+1836.410256,438.75,91.379
+1836.410256,468,97.374
+1836.410256,497.25,103.39
+1836.410256,526.5,109.42
+1836.410256,555.75,115.46
+1836.410256,585,121.53
+1836.410256,614.25,127.61
+1836.410256,643.5,133.7
+1836.410256,672.75,139.82
+1836.410256,702,145.95
+1836.410256,731.25,152.1
+1836.410256,760.5,158.27
+1836.410256,789.75,164.45
+1836.410256,819,170.65
+1836.410256,848.25,176.87
+1836.410256,877.5,183.11
+1836.410256,906.75,189.36
+1836.410256,936,195.63
+2040.42735,-936,-184.54
+2040.42735,-906.75,-178.91
+2040.42735,-877.5,-173.26
+2040.42735,-848.25,-167.59
+2040.42735,-819,-161.91
+2040.42735,-789.75,-156.21
+2040.42735,-760.5,-150.5
+2040.42735,-731.25,-144.77
+2040.42735,-702,-139.02
+2040.42735,-672.75,-133.25
+2040.42735,-643.5,-127.47
+2040.42735,-614.25,-121.67
+2040.42735,-585,-115.85
+2040.42735,-555.75,-110.02
+2040.42735,-526.5,-104.17
+2040.42735,-497.25,-98.305
+2040.42735,-468,-92.421
+2040.42735,-438.75,-86.521
+2040.42735,-409.5,-80.604
+2040.42735,-380.25,-74.67
+2040.42735,-351,-68.72
+2040.42735,-321.75,-62.752
+2040.42735,-292.5,-56.768
+2040.42735,-263.25,-50.767
+2040.42735,-234,-44.749
+2040.42735,-204.75,-38.714
+2040.42735,-175.5,-32.662
+2040.42735,-146.25,-26.594
+2040.42735,-117,-20.509
+2040.42735,-87.75,-14.407
+2040.42735,-58.5,-8.2882
+2040.42735,-29.25,-2.1526
+2040.42735,0,4.1291
+2040.42735,29.25,10.499
+2040.42735,58.5,16.886
+2040.42735,87.75,23.29
+2040.42735,117,29.711
+2040.42735,146.25,36.149
+2040.42735,175.5,42.604
+2040.42735,204.75,49.077
+2040.42735,234,55.567
+2040.42735,263.25,62.074
+2040.42735,292.5,68.598
+2040.42735,321.75,75.139
+2040.42735,351,81.697
+2040.42735,380.25,88.273
+2040.42735,409.5,94.865
+2040.42735,438.75,101.48
+2040.42735,468,108.1
+2040.42735,497.25,114.75
+2040.42735,526.5,121.41
+2040.42735,555.75,128.09
+2040.42735,585,134.78
+2040.42735,614.25,141.49
+2040.42735,643.5,148.22
+2040.42735,672.75,154.97
+2040.42735,702,161.74
+2040.42735,731.25,168.52
+2040.42735,760.5,175.31
+2040.42735,789.75,182.13
+2040.42735,819,188.96
+2040.42735,848.25,195.81
+2040.42735,877.5,202.68
+2040.42735,906.75,209.56
+2040.42735,936,216.47
+2244.529915,-936,-203.71
+2244.529915,-906.75,-197.46
+2244.529915,-877.5,-191.19
+2244.529915,-848.25,-184.91
+2244.529915,-819,-178.61
+2244.529915,-789.75,-172.29
+2244.529915,-760.5,-165.95
+2244.529915,-731.25,-159.6
+2244.529915,-702,-153.23
+2244.529915,-672.75,-146.85
+2244.529915,-643.5,-140.45
+2244.529915,-614.25,-134.03
+2244.529915,-585,-127.59
+2244.529915,-555.75,-121.14
+2244.529915,-526.5,-114.67
+2244.529915,-497.25,-108.19
+2244.529915,-468,-101.68
+2244.529915,-438.75,-95.163
+2244.529915,-409.5,-88.626
+2244.529915,-380.25,-82.073
+2244.529915,-351,-75.503
+2244.529915,-321.75,-68.916
+2244.529915,-292.5,-62.313
+2244.529915,-263.25,-55.692
+2244.529915,-234,-49.055
+2244.529915,-204.75,-42.401
+2244.529915,-175.5,-35.73
+2244.529915,-146.25,-29.042
+2244.529915,-117,-22.338
+2244.529915,-87.75,-15.616
+2244.529915,-58.5,-8.8781
+2244.529915,-29.25,-2.1231
+2244.529915,0,4.7938
+2244.529915,29.25,11.795
+2244.529915,58.5,18.814
+2244.529915,87.75,25.85
+2244.529915,117,32.903
+2244.529915,146.25,39.973
+2244.529915,175.5,47.06
+2244.529915,204.75,54.165
+2244.529915,234,61.287
+2244.529915,263.25,68.425
+2244.529915,292.5,75.581
+2244.529915,321.75,82.754
+2244.529915,351,89.945
+2244.529915,380.25,97.152
+2244.529915,409.5,104.38
+2244.529915,438.75,111.62
+2244.529915,468,118.88
+2244.529915,497.25,126.15
+2244.529915,526.5,133.45
+2244.529915,555.75,140.76
+2244.529915,585,148.08
+2244.529915,614.25,155.43
+2244.529915,643.5,162.79
+2244.529915,672.75,170.17
+2244.529915,702,177.57
+2244.529915,731.25,184.98
+2244.529915,760.5,192.41
+2244.529915,789.75,199.86
+2244.529915,819,207.32
+2244.529915,848.25,214.8
+2244.529915,877.5,222.3
+2244.529915,906.75,229.82
+2244.529915,936,237.35
+2448.547009,-936,-222.84
+2448.547009,-906.75,-215.97
+2448.547009,-877.5,-209.08
+2448.547009,-848.25,-202.18
+2448.547009,-819,-195.25
+2448.547009,-789.75,-188.32
+2448.547009,-760.5,-181.36
+2448.547009,-731.25,-174.39
+2448.547009,-702,-167.4
+2448.547009,-672.75,-160.4
+2448.547009,-643.5,-153.38
+2448.547009,-614.25,-146.34
+2448.547009,-585,-139.29
+2448.547009,-555.75,-132.21
+2448.547009,-526.5,-125.13
+2448.547009,-497.25,-118.02
+2448.547009,-468,-110.9
+2448.547009,-438.75,-103.76
+2448.547009,-409.5,-96.603
+2448.547009,-380.25,-89.431
+2448.547009,-351,-82.241
+2448.547009,-321.75,-75.035
+2448.547009,-292.5,-67.812
+2448.547009,-263.25,-60.572
+2448.547009,-234,-53.315
+2448.547009,-204.75,-46.042
+2448.547009,-175.5,-38.752
+2448.547009,-146.25,-31.445
+2448.547009,-117,-24.121
+2448.547009,-87.75,-16.78
+2448.547009,-58.5,-9.4225
+2448.547009,-29.25,-2.0481
+2448.547009,0,5.505
+2448.547009,29.25,13.138
+2448.547009,58.5,20.789
+2448.547009,87.75,28.457
+2448.547009,117,36.142
+2448.547009,146.25,43.844
+2448.547009,175.5,51.563
+2448.547009,204.75,59.299
+2448.547009,234,67.053
+2448.547009,263.25,74.823
+2448.547009,292.5,82.611
+2448.547009,321.75,90.416
+2448.547009,351,98.238
+2448.547009,380.25,106.08
+2448.547009,409.5,113.93
+2448.547009,438.75,121.81
+2448.547009,468,129.7
+2448.547009,497.25,137.61
+2448.547009,526.5,145.53
+2448.547009,555.75,153.47
+2448.547009,585,161.43
+2448.547009,614.25,169.41
+2448.547009,643.5,177.4
+2448.547009,672.75,185.41
+2448.547009,702,193.44
+2448.547009,731.25,201.49
+2448.547009,760.5,209.55
+2448.547009,789.75,217.63
+2448.547009,819,225.72
+2448.547009,848.25,233.84
+2448.547009,877.5,241.97
+2448.547009,906.75,250.12
+2448.547009,936,258.28
+2652.564103,-936,-241.92
+2652.564103,-906.75,-234.43
+2652.564103,-877.5,-226.92
+2652.564103,-848.25,-219.4
+2652.564103,-819,-211.86
+2652.564103,-789.75,-204.3
+2652.564103,-760.5,-196.73
+2652.564103,-731.25,-189.14
+2652.564103,-702,-181.53
+2652.564103,-672.75,-173.91
+2652.564103,-643.5,-166.27
+2652.564103,-614.25,-158.61
+2652.564103,-585,-150.93
+2652.564103,-555.75,-143.24
+2652.564103,-526.5,-135.53
+2652.564103,-497.25,-127.81
+2652.564103,-468,-120.07
+2652.564103,-438.75,-112.31
+2652.564103,-409.5,-104.53
+2652.564103,-380.25,-96.743
+2652.564103,-351,-88.934
+2652.564103,-321.75,-81.108
+2652.564103,-292.5,-73.266
+2652.564103,-263.25,-65.407
+2652.564103,-234,-57.531
+2652.564103,-204.75,-49.638
+2652.564103,-175.5,-41.728
+2652.564103,-146.25,-33.802
+2652.564103,-117,-25.858
+2652.564103,-87.75,-17.898
+2652.564103,-58.5,-9.9213
+2652.564103,-29.25,-1.9276
+2652.564103,0,6.2626
+2652.564103,29.25,14.528
+2652.564103,58.5,22.81
+2652.564103,87.75,31.11
+2652.564103,117,39.427
+2652.564103,146.25,47.761
+2652.564103,175.5,56.112
+2652.564103,204.75,64.48
+2652.564103,234,72.865
+2652.564103,263.25,81.268
+2652.564103,292.5,89.688
+2652.564103,321.75,98.125
+2652.564103,351,106.58
+2652.564103,380.25,115.05
+2652.564103,409.5,123.54
+2652.564103,438.75,132.04
+2652.564103,468,140.57
+2652.564103,497.25,149.11
+2652.564103,526.5,157.66
+2652.564103,555.75,166.24
+2652.564103,585,174.83
+2652.564103,614.25,183.44
+2652.564103,643.5,192.06
+2652.564103,672.75,200.7
+2652.564103,702,209.36
+2652.564103,731.25,218.04
+2652.564103,760.5,226.74
+2652.564103,789.75,235.45
+2652.564103,819,244.17
+2652.564103,848.25,252.92
+2652.564103,877.5,261.68
+2652.564103,906.75,270.46
+2652.564103,936,279.26
+2856.666667,-936,-260.95
+2856.666667,-906.75,-252.84
+2856.666667,-877.5,-244.72
+2856.666667,-848.25,-236.57
+2856.666667,-819,-228.41
+2856.666667,-789.75,-220.24
+2856.666667,-760.5,-212.05
+2856.666667,-731.25,-203.84
+2856.666667,-702,-195.61
+2856.666667,-672.75,-187.37
+2856.666667,-643.5,-179.11
+2856.666667,-614.25,-170.83
+2856.666667,-585,-162.54
+2856.666667,-555.75,-154.22
+2856.666667,-526.5,-145.9
+2856.666667,-497.25,-137.55
+2856.666667,-468,-129.19
+2856.666667,-438.75,-120.81
+2856.666667,-409.5,-112.42
+2856.666667,-380.25,-104.01
+2856.666667,-351,-95.581
+2856.666667,-321.75,-87.136
+2856.666667,-292.5,-78.674
+2856.666667,-263.25,-70.195
+2856.666667,-234,-61.7
+2856.666667,-204.75,-53.188
+2856.666667,-175.5,-44.659
+2856.666667,-146.25,-36.113
+2856.666667,-117,-27.55
+2856.666667,-87.75,-18.971
+2856.666667,-58.5,-10.375
+2856.666667,-29.25,-1.7616
+2856.666667,0,7.0667
+2856.666667,29.25,15.964
+2856.666667,58.5,24.878
+2856.666667,87.75,33.81
+2856.666667,117,42.758
+2856.666667,146.25,51.724
+2856.666667,175.5,60.707
+2856.666667,204.75,69.707
+2856.666667,234,78.725
+2856.666667,263.25,87.759
+2856.666667,292.5,96.811
+2856.666667,321.75,105.88
+2856.666667,351,114.97
+2856.666667,380.25,124.07
+2856.666667,409.5,133.19
+2856.666667,438.75,142.33
+2856.666667,468,151.48
+2856.666667,497.25,160.65
+2856.666667,526.5,169.84
+2856.666667,555.75,179.05
+2856.666667,585,188.27
+2856.666667,614.25,197.51
+2856.666667,643.5,206.77
+2856.666667,672.75,216.04
+2856.666667,702,225.33
+2856.666667,731.25,234.64
+2856.666667,760.5,243.97
+2856.666667,789.75,253.31
+2856.666667,819,262.67
+2856.666667,848.25,272.05
+2856.666667,877.5,281.44
+2856.666667,906.75,290.86
+2856.666667,936,300.28
+3060.683761,-936,-279.94
+3060.683761,-906.75,-271.21
+3060.683761,-877.5,-262.47
+3060.683761,-848.25,-253.7
+3060.683761,-819,-244.93
+3060.683761,-789.75,-236.13
+3060.683761,-760.5,-227.32
+3060.683761,-731.25,-218.49
+3060.683761,-702,-209.64
+3060.683761,-672.75,-200.78
+3060.683761,-643.5,-191.9
+3060.683761,-614.25,-183
+3060.683761,-585,-174.09
+3060.683761,-555.75,-165.16
+3060.683761,-526.5,-156.22
+3060.683761,-497.25,-147.25
+3060.683761,-468,-138.27
+3060.683761,-438.75,-129.27
+3060.683761,-409.5,-120.26
+3060.683761,-380.25,-111.23
+3060.683761,-351,-102.18
+3060.683761,-321.75,-93.118
+3060.683761,-292.5,-84.037
+3060.683761,-263.25,-74.939
+3060.683761,-234,-65.824
+3060.683761,-204.75,-56.693
+3060.683761,-175.5,-47.544
+3060.683761,-146.25,-38.379
+3060.683761,-117,-29.197
+3060.683761,-87.75,-19.998
+3060.683761,-58.5,-10.782
+3060.683761,-29.25,-1.55
+3060.683761,0,7.9172
+3060.683761,29.25,17.446
+3060.683761,58.5,26.993
+3060.683761,87.75,36.556
+3060.683761,117,46.136
+3060.683761,146.25,55.734
+3060.683761,175.5,65.349
+3060.683761,204.75,74.981
+3060.683761,234,84.63
+3060.683761,263.25,94.296
+3060.683761,292.5,103.98
+3060.683761,321.75,113.68
+3060.683761,351,123.4
+3060.683761,380.25,133.13
+3060.683761,409.5,142.89
+3060.683761,438.75,152.65
+3060.683761,468,162.44
+3060.683761,497.25,172.24
+3060.683761,526.5,182.06
+3060.683761,555.75,191.9
+3060.683761,585,201.76
+3060.683761,614.25,211.63
+3060.683761,643.5,221.52
+3060.683761,672.75,231.43
+3060.683761,702,241.35
+3060.683761,731.25,251.29
+3060.683761,760.5,261.25
+3060.683761,789.75,271.22
+3060.683761,819,281.21
+3060.683761,848.25,291.22
+3060.683761,877.5,301.25
+3060.683761,906.75,311.29
+3060.683761,936,321.35
+3264.700855,-936,-298.88
+3264.700855,-906.75,-289.53
+3264.700855,-877.5,-280.17
+3264.700855,-848.25,-270.79
+3264.700855,-819,-261.39
+3264.700855,-789.75,-251.98
+3264.700855,-760.5,-242.54
+3264.700855,-731.25,-233.1
+3264.700855,-702,-223.63
+3264.700855,-672.75,-214.15
+3264.700855,-643.5,-204.65
+3264.700855,-614.25,-195.14
+3264.700855,-585,-185.6
+3264.700855,-555.75,-176.05
+3264.700855,-526.5,-166.49
+3264.700855,-497.25,-156.9
+3264.700855,-468,-147.3
+3264.700855,-438.75,-137.69
+3264.700855,-409.5,-128.06
+3264.700855,-380.25,-118.41
+3264.700855,-351,-108.74
+3264.700855,-321.75,-99.055
+3264.700855,-292.5,-89.354
+3264.700855,-263.25,-79.637
+3264.700855,-234,-69.903
+3264.700855,-204.75,-60.152
+3264.700855,-175.5,-50.384
+3264.700855,-146.25,-40.599
+3264.700855,-117,-30.798
+3264.700855,-87.75,-20.98
+3264.700855,-58.5,-11.145
+3264.700855,-29.25,-1.2929
+3264.700855,0,8.8141
+3264.700855,29.25,18.975
+3264.700855,58.5,29.153
+3264.700855,87.75,39.348
+3264.700855,117,49.561
+3264.700855,146.25,59.79
+3264.700855,175.5,70.037
+3264.700855,204.75,80.301
+3264.700855,234,90.582
+3264.700855,263.25,100.88
+3264.700855,292.5,111.2
+3264.700855,321.75,121.53
+3264.700855,351,131.88
+3264.700855,380.25,142.24
+3264.700855,409.5,152.63
+3264.700855,438.75,163.03
+3264.700855,468,173.45
+3264.700855,497.25,183.88
+3264.700855,526.5,194.34
+3264.700855,555.75,204.81
+3264.700855,585,215.29
+3264.700855,614.25,225.8
+3264.700855,643.5,236.32
+3264.700855,672.75,246.86
+3264.700855,702,257.41
+3264.700855,731.25,267.98
+3264.700855,760.5,278.57
+3264.700855,789.75,289.18
+3264.700855,819,299.8
+3264.700855,848.25,310.45
+3264.700855,877.5,321.1
+3264.700855,906.75,331.78
+3264.700855,936,342.47
+3468.803419,-936,-317.78
+3468.803419,-906.75,-307.81
+3468.803419,-877.5,-297.83
+3468.803419,-848.25,-287.83
+3468.803419,-819,-277.81
+3468.803419,-789.75,-267.78
+3468.803419,-760.5,-257.73
+3468.803419,-731.25,-247.66
+3468.803419,-702,-237.57
+3468.803419,-672.75,-227.47
+3468.803419,-643.5,-217.35
+3468.803419,-614.25,-207.22
+3468.803419,-585,-197.07
+3468.803419,-555.75,-186.9
+3468.803419,-526.5,-176.71
+3468.803419,-497.25,-166.51
+3468.803419,-468,-156.29
+3468.803419,-438.75,-146.06
+3468.803419,-409.5,-135.8
+3468.803419,-380.25,-125.53
+3468.803419,-351,-115.25
+3468.803419,-321.75,-104.95
+3468.803419,-292.5,-94.626
+3468.803419,-263.25,-84.289
+3468.803419,-234,-73.936
+3468.803419,-204.75,-63.565
+3468.803419,-175.5,-53.178
+3468.803419,-146.25,-42.774
+3468.803419,-117,-32.353
+3468.803419,-87.75,-21.916
+3468.803419,-58.5,-11.462
+3468.803419,-29.25,-0.99032
+3468.803419,0,9.7575
+3468.803419,29.25,20.55
+3468.803419,58.5,31.36
+3468.803419,87.75,42.188
+3468.803419,117,53.032
+3468.803419,146.25,63.893
+3468.803419,175.5,74.772
+3468.803419,204.75,85.668
+3468.803419,234,96.581
+3468.803419,263.25,107.51
+3468.803419,292.5,118.46
+3468.803419,321.75,129.42
+3468.803419,351,140.4
+3468.803419,380.25,151.4
+3468.803419,409.5,162.42
+3468.803419,438.75,173.45
+3468.803419,468,184.5
+3468.803419,497.25,195.57
+3468.803419,526.5,206.65
+3468.803419,555.75,217.75
+3468.803419,585,228.87
+3468.803419,614.25,240.01
+3468.803419,643.5,251.16
+3468.803419,672.75,262.33
+3468.803419,702,273.52
+3468.803419,731.25,284.72
+3468.803419,760.5,295.95
+3468.803419,789.75,307.18
+3468.803419,819,318.44
+3468.803419,848.25,329.71
+3468.803419,877.5,341
+3468.803419,906.75,352.31
+3468.803419,936,363.64
+3672.820513,-936,-336.63
+3672.820513,-906.75,-326.05
+3672.820513,-877.5,-315.44
+3672.820513,-848.25,-304.82
+3672.820513,-819,-294.19
+3672.820513,-789.75,-283.53
+3672.820513,-760.5,-272.86
+3672.820513,-731.25,-262.18
+3672.820513,-702,-251.47
+3672.820513,-672.75,-240.75
+3672.820513,-643.5,-230.01
+3672.820513,-614.25,-219.26
+3672.820513,-585,-208.49
+3672.820513,-555.75,-197.7
+3672.820513,-526.5,-186.9
+3672.820513,-497.25,-176.07
+3672.820513,-468,-165.24
+3672.820513,-438.75,-154.38
+3672.820513,-409.5,-143.51
+3672.820513,-380.25,-132.62
+3672.820513,-351,-121.71
+3672.820513,-321.75,-110.79
+3672.820513,-292.5,-99.852
+3672.820513,-263.25,-88.896
+3672.820513,-234,-77.923
+3672.820513,-204.75,-66.933
+3672.820513,-175.5,-55.927
+3672.820513,-146.25,-44.904
+3672.820513,-117,-33.863
+3672.820513,-87.75,-22.806
+3672.820513,-58.5,-11.733
+3672.820513,-29.25,-0.64219
+3672.820513,0,10.747
+3672.820513,29.25,22.172
+3672.820513,58.5,33.614
+3672.820513,87.75,45.073
+3672.820513,117,56.549
+3672.820513,146.25,68.043
+3672.820513,175.5,79.553
+3672.820513,204.75,91.081
+3672.820513,234,102.63
+3672.820513,263.25,114.19
+3672.820513,292.5,125.77
+3672.820513,321.75,137.36
+3672.820513,351,148.98
+3672.820513,380.25,160.61
+3672.820513,409.5,172.25
+3672.820513,438.75,183.92
+3672.820513,468,195.6
+3672.820513,497.25,207.3
+3672.820513,526.5,219.02
+3672.820513,555.75,230.75
+3672.820513,585,242.5
+3672.820513,614.25,254.27
+3672.820513,643.5,266.05
+3672.820513,672.75,277.86
+3672.820513,702,289.67
+3672.820513,731.25,301.51
+3672.820513,760.5,313.36
+3672.820513,789.75,325.23
+3672.820513,819,337.12
+3672.820513,848.25,349.03
+3672.820513,877.5,360.95
+3672.820513,906.75,372.89
+3672.820513,936,384.85
+3876.837607,-936,-355.44
+3876.837607,-906.75,-344.23
+3876.837607,-877.5,-333.01
+3876.837607,-848.25,-321.77
+3876.837607,-819,-310.52
+3876.837607,-789.75,-299.24
+3876.837607,-760.5,-287.95
+3876.837607,-731.25,-276.65
+3876.837607,-702,-265.32
+3876.837607,-672.75,-253.98
+3876.837607,-643.5,-242.63
+3876.837607,-614.25,-231.25
+3876.837607,-585,-219.86
+3876.837607,-555.75,-208.45
+3876.837607,-526.5,-197.03
+3876.837607,-497.25,-185.59
+3876.837607,-468,-174.13
+3876.837607,-438.75,-162.66
+3876.837607,-409.5,-151.17
+3876.837607,-380.25,-139.66
+3876.837607,-351,-128.13
+3876.837607,-321.75,-116.59
+3876.837607,-292.5,-105.03
+3876.837607,-263.25,-93.457
+3876.837607,-234,-81.865
+3876.837607,-204.75,-70.256
+3876.837607,-175.5,-58.63
+3876.837607,-146.25,-46.987
+3876.837607,-117,-35.328
+3876.837607,-87.75,-23.652
+3876.837607,-58.5,-11.958
+3876.837607,-29.25,-0.24855
+3876.837607,0,11.784
+3876.837607,29.25,23.84
+3876.837607,58.5,35.914
+3876.837607,87.75,48.005
+3876.837607,117,60.113
+3876.837607,146.25,72.238
+3876.837607,175.5,84.381
+3876.837607,204.75,96.54
+3876.837607,234,108.72
+3876.837607,263.25,120.91
+3876.837607,292.5,133.12
+3876.837607,321.75,145.35
+3876.837607,351,157.59
+3876.837607,380.25,169.86
+3876.837607,409.5,182.14
+3876.837607,438.75,194.43
+3876.837607,468,206.75
+3876.837607,497.25,219.08
+3876.837607,526.5,231.43
+3876.837607,555.75,243.79
+3876.837607,585,256.17
+3876.837607,614.25,268.57
+3876.837607,643.5,280.99
+3876.837607,672.75,293.42
+3876.837607,702,305.88
+3876.837607,731.25,318.34
+3876.837607,760.5,330.83
+3876.837607,789.75,343.33
+3876.837607,819,355.85
+3876.837607,848.25,368.39
+3876.837607,877.5,380.94
+3876.837607,906.75,393.51
+3876.837607,936,406.1
+4080.854701,-936,-374.2
+4080.854701,-906.75,-362.38
+4080.854701,-877.5,-350.53
+4080.854701,-848.25,-338.67
+4080.854701,-819,-326.8
+4080.854701,-789.75,-314.91
+4080.854701,-760.5,-303
+4080.854701,-731.25,-291.07
+4080.854701,-702,-279.13
+4080.854701,-672.75,-267.17
+4080.854701,-643.5,-255.19
+4080.854701,-614.25,-243.2
+4080.854701,-585,-231.19
+4080.854701,-555.75,-219.16
+4080.854701,-526.5,-207.12
+4080.854701,-497.25,-195.06
+4080.854701,-468,-182.98
+4080.854701,-438.75,-170.89
+4080.854701,-409.5,-158.78
+4080.854701,-380.25,-146.65
+4080.854701,-351,-134.51
+4080.854701,-321.75,-122.35
+4080.854701,-292.5,-110.17
+4080.854701,-263.25,-97.973
+4080.854701,-234,-85.761
+4080.854701,-204.75,-73.533
+4080.854701,-175.5,-61.288
+4080.854701,-146.25,-49.026
+4080.854701,-117,-36.747
+4080.854701,-87.75,-24.451
+4080.854701,-58.5,-12.139
+4080.854701,-29.25,0.19499
+4080.854701,0,12.866
+4080.854701,29.25,25.555
+4080.854701,58.5,38.26
+4080.854701,87.75,50.983
+4080.854701,117,63.723
+4080.854701,146.25,76.48
+4080.854701,175.5,89.255
+4080.854701,204.75,102.05
+4080.854701,234,114.85
+4080.854701,263.25,127.68
+4080.854701,292.5,140.52
+4080.854701,321.75,153.38
+4080.854701,351,166.26
+4080.854701,380.25,179.15
+4080.854701,409.5,192.07
+4080.854701,438.75,204.99
+4080.854701,468,217.94
+4080.854701,497.25,230.9
+4080.854701,526.5,243.88
+4080.854701,555.75,256.88
+4080.854701,585,269.89
+4080.854701,614.25,282.93
+4080.854701,643.5,295.97
+4080.854701,672.75,309.04
+4080.854701,702,322.12
+4080.854701,731.25,335.22
+4080.854701,760.5,348.34
+4080.854701,789.75,361.48
+4080.854701,819,374.63
+4080.854701,848.25,387.8
+4080.854701,877.5,400.98
+4080.854701,906.75,414.18
+4080.854701,936,427.4
+4268.632479,-936,-391.42
+4268.632479,-906.75,-379.03
+4268.632479,-877.5,-366.61
+4268.632479,-848.25,-354.19
+4268.632479,-819,-341.74
+4268.632479,-789.75,-329.28
+4268.632479,-760.5,-316.8
+4268.632479,-731.25,-304.3
+4268.632479,-702,-291.79
+4268.632479,-672.75,-279.26
+4268.632479,-643.5,-266.72
+4268.632479,-614.25,-254.15
+4268.632479,-585,-241.57
+4268.632479,-555.75,-228.98
+4268.632479,-526.5,-216.36
+4268.632479,-497.25,-203.73
+4268.632479,-468,-191.09
+4268.632479,-438.75,-178.42
+4268.632479,-409.5,-165.74
+4268.632479,-380.25,-153.04
+4268.632479,-351,-140.33
+4268.632479,-321.75,-127.6
+4268.632479,-292.5,-114.85
+4268.632479,-263.25,-102.09
+4268.632479,-234,-89.306
+4268.632479,-204.75,-76.508
+4268.632479,-175.5,-63.693
+4268.632479,-146.25,-50.861
+4268.632479,-117,-38.012
+4268.632479,-87.75,-25.147
+4268.632479,-58.5,-12.264
+4268.632479,-29.25,0.65077
+4268.632479,0,13.903
+4268.632479,29.25,27.173
+4268.632479,58.5,40.46
+4268.632479,87.75,53.764
+4268.632479,117,67.086
+4268.632479,146.25,80.424
+4268.632479,175.5,93.78
+4268.632479,204.75,107.15
+4268.632479,234,120.54
+4268.632479,263.25,133.95
+4268.632479,292.5,147.37
+4268.632479,321.75,160.81
+4268.632479,351,174.27
+4268.632479,380.25,187.75
+4268.632479,409.5,201.24
+4268.632479,438.75,214.75
+4268.632479,468,228.28
+4268.632479,497.25,241.82
+4268.632479,526.5,255.38
+4268.632479,555.75,268.96
+4268.632479,585,282.56
+4268.632479,614.25,296.17
+4268.632479,643.5,309.8
+4268.632479,672.75,323.45
+4268.632479,702,337.11
+4268.632479,731.25,350.79
+4268.632479,760.5,364.49
+4268.632479,789.75,378.21
+4268.632479,819,391.94
+4268.632479,848.25,405.69
+4268.632479,877.5,419.46
+4268.632479,906.75,433.24
+4268.632479,936,447.04
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Group5_HEV.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..f4d4c6d0cc21dd19d4c2053f73d1b608325f5a14
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Group5_HEV.vveh
@@ -0,0 +1,109 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:36:11.4469594Z",
+ "AppVersion": "3",
+ "FileVersion": 10
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "Tractor",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 8229.0,
+ "CurbWeightExtra": 7500.0,
+ "MassMax": 18.0,
+ "Loading": 19300.0,
+ "rdyn": 492.0,
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 33350.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": true,
+ "RRCISO": 0.0065,
+ "FzISO": 33350.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18333,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 41690.0,
+ "Type": "Trailer"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18333,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 41690.0,
+ "Type": "Trailer"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18334,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 41690.0,
+ "Type": "Trailer"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 5.3,
+ "VehicleHeight": 4.0,
+ "IdlingSpeed": 600.0,
+ "Retarder": {
+ "Type": "None",
+ "Ratio": 1.0,
+ "File": ""
+ },
+ "Angledrive": {
+ "Type": "None",
+ "Ratio": 0.0,
+ "LossMap": ""
+ },
+ "PTO": {
+ "Type": "None",
+ "LossMap": "",
+ "Cycle": ""
+ },
+ "TorqueLimits": {},
+ "MaxDrivetrainPower": 1000.0,
+ "InitialSoC": 50.0,
+ "PowertrainConfiguration": "IHPC",
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1.0,
+ "MechanicalEfficiency": 1.0,
+ "Position": "IHPC",
+ "MotorFile": "GenericIHPC_140kW_936Nm.vem"
+ }
+ ],
+ "Battery": {
+ "NumPacks": 1,
+ "BatteryFile": "GenericBattery_10kWh_658V.vbat"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Hybrid_Parameters.vhctl b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Hybrid_Parameters.vhctl
new file mode 100644
index 0000000000000000000000000000000000000000..a46aef1a05bf9df86bedf57572abe03a6de5fb23
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Hybrid_Parameters.vhctl
@@ -0,0 +1,17 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:28:08.3781385Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "EquivalenceFactor": 2.0,
+ "MinSoC": 20.0,
+ "MaxSoC": 80.0,
+ "TargetSoC": 50.0,
+ "AuxBufferTime": 5.0,
+ "AuxBufferChgTime": 5.0,
+ "MinICEOnTime": 10.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/IHPC Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/IHPC Group 5.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..0589d7a5bc82c48909847ab7cac7298c4de37a5a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/IHPC Group 5.vecto
@@ -0,0 +1,64 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-08-24T13:41:04.1591616Z",
+ "AppVersion": "3",
+ "FileVersion": 13
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "Group5_HEV.vveh",
+ "EngineFile": "Engine_325kW_12.7l.veng",
+ "GearboxFile": "IHPC_12.vgbx",
+ "TCU": "IHPC_12.vgbx",
+ "ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
+ "HybridStrategyParams": "Hybrid_Parameters.vhctl",
+ "AuxiliaryAssembly": "Classic",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
+ "Aux": [],
+ "Padd": 3000.0,
+ "Padd_electric": 0.0,
+ "VACC": "Truck.vacc",
+ "EngineStopStartAtVehicleStopThreshold": 0.0,
+ "EngineStopStartMaxOffTimespan": 1000.0,
+ "EngineStopStartUtilityFactor": 0.0,
+ "EcoRollMinSpeed": 0.0,
+ "EcoRollActivationDelay": 0.0,
+ "EcoRollUnderspeedThreshold": 0.0,
+ "EcoRollMaxAcceleration": 0.0,
+ "PCCEnableSpeed": 0.0,
+ "PCCMinSpeed": 0.0,
+ "PCCUnderspeed": 0.0,
+ "PCCOverSpeed": 5.0,
+ "PCCPreviewDistanceUC1": 0.0,
+ "PCCPreviewDistanceUC2": 0.0,
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": "",
+ "MinSpeed": 50.0
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Overspeed",
+ "MinSpeed": 50.0,
+ "OverSpeed": 2.5
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "MunicipalUtility",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/IHPC_12.vgbx b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/IHPC_12.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..1694cd4862afe907ee913ce8dd141c7a80d6f4b2
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/IHPC_12.vgbx
@@ -0,0 +1,117 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:26:44.5653903Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "tractor_12gear_example",
+ "Inertia": 0.0,
+ "TracInt": 1.0,
+ "Gears": [
+ {
+ "Ratio": 2.64,
+ "LossMap": "Axle_4x2_Tractor.vtlm"
+ },
+ {
+ "Ratio": 14.93,
+ "LossMap": "Gear_1.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 11.64,
+ "LossMap": "Gear_2.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 9.02,
+ "LossMap": "Gear_3.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 7.04,
+ "LossMap": "Gear_4.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 5.64,
+ "LossMap": "Gear_5.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 4.4,
+ "LossMap": "Gear_6.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 3.39,
+ "LossMap": "Gear_7.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 2.65,
+ "LossMap": "Gear_8.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 2.05,
+ "LossMap": "Gear_9.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.6,
+ "LossMap": "Gear_10.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.28,
+ "LossMap": "Gear_11.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.0,
+ "LossMap": "Gear_12.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ }
+ ],
+ "TqReserve": 20.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.0,
+ "StartAcc": 0.6,
+ "GearboxType": "IHPC",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAfterUpshiftDelay": 6.0,
+ "UpshiftAfterDownshiftDelay": 6.0,
+ "UpshiftMinAcceleration": 0.1,
+ "PowershiftShiftTime": 0.8
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/MaxCurrent.vimax
new file mode 100644
index 0000000000000000000000000000000000000000..5552bda2b03a9e6d5f0b2de49ea79b598013047f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/MaxCurrent.vimax
@@ -0,0 +1,3 @@
+SOC, I_charge, I_discharge
+0, 280, 280
+100, 280, 280
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Truck.vacc
new file mode 100644
index 0000000000000000000000000000000000000000..54e77864874d21d67e8f8d69a97b35c5c6031749
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/12SpeedGbx/Truck.vacc
@@ -0,0 +1,6 @@
+v [km/h],acc [m/s²],dec [m/s²]
+0,1,-1
+25,1,-1
+50,0.642857143,-1
+60,0.5,-0.5
+120,0.5,-0.5
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/325kW.vfld b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/325kW.vfld
new file mode 100644
index 0000000000000000000000000000000000000000..750d4048ef2da521d3c51bd0a8af39b6373c8575
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/325kW.vfld
@@ -0,0 +1,202 @@
+engine speed [1/min], full load torque [Nm], motoring torque [Nm]
+600,1188,-138
+608,1206.92,-138.2
+616,1225.84,-138.4
+624,1244.76,-138.6
+632,1263.68,-138.8
+640,1282.6,-139
+648,1301.52,-139.2
+656,1320.44,-139.4
+664,1339.36,-139.6
+672,1358.28,-139.8
+680,1377.2,-140
+688,1396.12,-140.2
+696,1415.04,-140.4
+704,1433.96,-140.6
+712,1452.88,-140.8
+720,1471.8,-141
+728,1490.72,-141.2
+736,1509.64,-141.4
+744,1528.56,-141.6
+752,1547.48,-141.8
+760,1566.4,-142
+768,1585.32,-142.2
+776,1604.24,-142.4
+784,1623.16,-142.6
+792,1642.08,-142.8
+800,1661,-143
+808,1679.92,-143.36
+816,1698.84,-143.72
+824,1717.76,-144.08
+832,1736.68,-144.44
+840,1755.6,-144.8
+848,1774.52,-145.16
+856,1793.44,-145.52
+864,1812.36,-145.88
+872,1831.28,-146.24
+880,1850.2,-146.6
+888,1869.12,-146.96
+896,1888.04,-147.32
+904,1906.96,-147.68
+912,1925.88,-148.04
+920,1944.8,-148.4
+928,1963.72,-148.76
+936,1982.64,-149.12
+944,2001.56,-149.48
+952,2020.48,-149.84
+960,2039.4,-150.2
+968,2058.32,-150.56
+976,2077.24,-150.92
+984,2096.16,-151.28
+992,2115.08,-151.64
+1000,2134,-152
+1008,2134,-152.52
+1016,2134,-153.04
+1024,2134,-153.56
+1032,2134,-154.08
+1040,2134,-154.6
+1048,2134,-155.12
+1056,2134,-155.64
+1064,2134,-156.16
+1072,2134,-156.68
+1080,2134,-157.2
+1088,2134,-157.72
+1096,2134,-158.24
+1104,2134,-158.76
+1112,2134,-159.28
+1120,2134,-159.8
+1128,2134,-160.32
+1136,2134,-160.84
+1144,2134,-161.36
+1152,2134,-161.88
+1160,2134,-162.4
+1168,2134,-162.92
+1176,2134,-163.44
+1184,2134,-163.96
+1192,2134,-164.48
+1200,2134,-165
+1208,2134,-165.88
+1216,2134,-166.76
+1224,2134,-167.64
+1232,2134,-168.52
+1240,2134,-169.4
+1248,2134,-170.28
+1256,2134,-171.16
+1264,2134,-172.04
+1272,2134,-172.92
+1280,2134,-173.8
+1288,2134,-174.68
+1296,2134,-175.56
+1304,2134,-176.44
+1312,2134,-177.32
+1320,2134,-178.2
+1328,2134,-179.08
+1336,2134,-179.96
+1344,2134,-180.84
+1352,2134,-181.72
+1360,2134,-182.6
+1368,2134,-183.48
+1376,2134,-184.36
+1384,2134,-185.24
+1392,2134,-186.12
+1400,2134,-187
+1408,2125.76,-188.2
+1416,2117.52,-189.4
+1424,2109.28,-190.6
+1432,2101.04,-191.8
+1440,2092.8,-193
+1448,2084.56,-194.2
+1456,2076.32,-195.4
+1464,2068.08,-196.6
+1472,2059.84,-197.8
+1480,2051.6,-199
+1488,2043.36,-200.2
+1496,2035.12,-201.3911
+1504,2026.88,-202.5793
+1512,2018.64,-203.7675
+1520,2010.4,-204.9557
+1528,2002.16,-206.1439
+1536,1993.92,-207.3321
+1544,1985.68,-208.5203
+1552,1977.44,-209.7085
+1560,1969.2,-210.8967
+1568,1960.96,-212.0849
+1576,1952.72,-213.2731
+1584,1944.48,-214.4613
+1592,1936.24,-215.6495
+1600,1928,-216.8377
+1608,1919.76,-218.0259
+1616,1911.52,-219.16
+1624,1903.28,-220.24
+1632,1895.04,-221.32
+1640,1886.8,-222.4
+1648,1878.56,-223.48
+1656,1870.32,-224.56
+1664,1862.08,-225.64
+1672,1853.84,-226.72
+1680,1845.6,-227.8
+1688,1837.36,-228.88
+1696,1829.12,-229.96
+1704,1820.88,-231.04
+1712,1812.64,-232.12
+1720,1804.4,-233.2
+1728,1796.16,-234.28
+1736,1787.92,-235.36
+1744,1779.68,-236.44
+1752,1771.44,-237.52
+1760,1763.2,-238.6
+1768,1754.96,-239.68
+1776,1746.72,-240.76
+1784,1738.48,-241.84
+1792,1730.24,-242.92
+1800,1722,-244
+1808,1703.24,-245.36
+1816,1684.48,-246.72
+1824,1665.72,-248.08
+1832,1646.96,-249.44
+1840,1628.2,-250.8
+1848,1609.44,-252.16
+1856,1590.68,-253.52
+1864,1571.92,-254.88
+1872,1553.16,-256.24
+1880,1534.4,-257.6
+1888,1515.64,-258.96
+1896,1496.88,-260.32
+1904,1478.12,-261.68
+1912,1459.36,-263.04
+1920,1440.6,-264.4
+1928,1421.84,-265.76
+1936,1403.08,-267.12
+1944,1384.32,-268.48
+1952,1365.56,-269.84
+1960,1346.8,-271.2
+1968,1328.04,-272.56
+1976,1309.28,-273.92
+1984,1290.52,-275.28
+1992,1271.76,-276.64
+2000,1253,-278
+2008,1234.28,-279.36
+2016,1215.56,-280.72
+2024,1196.84,-282.08
+2032,1178.12,-283.44
+2040,1159.4,-284.8
+2048,1140.68,-286.16
+2056,1121.96,-287.52
+2064,1103.24,-288.88
+2072,1084.52,-290.24
+2080,1065.8,-291.6
+2088,1047.08,-292.96
+2096,1028.36,-294.32
+2104,978.24,-295.68
+2112,896.72,-297.04
+2120,815.2,-298.4
+2128,733.68,-299.76
+2136,652.16,-301.12
+2144,570.64,-302.48
+2152,489.12,-303.84
+2160,407.6,-305.2
+2168,326.08,-306.56
+2176,244.56,-307.92
+2184,163.04,-309.28
+2192,81.52,-310.64
+2200,0,-312
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/325kW.vmap b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/325kW.vmap
new file mode 100644
index 0000000000000000000000000000000000000000..eea08f963f4b23b49f15d030db630b52edc1d4e3
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/325kW.vmap
@@ -0,0 +1,140 @@
+engine speed [rpm], torque [Nm], fuel consumption [g/h]
+500,-135.5,0
+500,0,1355
+500,213.4,3412.291
+500,426.8,5830.1
+500,640.2,8316.426
+500,853.6,10439.87
+500,1067,12823.69
+500,1188,14228.79
+500,1401.4,16628.66
+600,-138,0
+600,0,1355
+600,213.4,3412.291
+600,426.8,5830.1
+600,640.2,8316.426
+600,853.6,10439.87
+600,1067,12823.69
+600,1188,14228.79
+600,1401.4,16628.66
+751,-141.775,0
+750.9,0,1649.255
+750.9,213.4,4157.795
+750.9,426.8,7149.494
+750.9,640.2,10037.08
+750.9,853.6,12957.07
+750.9,1067,16055.22
+750.9,1280.4,19231.36
+750.9,1493.8,22400.17
+750.9,1544.879,23213.92
+751,1758.279,26392.93
+902,-147.59,0
+901.8,0,2210.735
+901.8,213.4,5204.867
+901.8,426.8,8515.462
+901.8,640.2,11804.75
+901.8,853.6,15410.55
+901.8,1067,19081.7
+901.8,1280.4,22742.96
+901.8,1493.8,26543.87
+901.8,1707.2,30534.68
+901.8,1901.757,34352.75
+902,2115.157,38403.27
+1053,-155.445,0
+1052.7,0,2768.035
+1052.7,213.4,6228.407
+1052.7,426.8,9836.041
+1052.7,640.2,13624.5
+1052.7,853.6,17854.95
+1052.7,1067,22072.71
+1052.7,1280.4,26161.13
+1052.7,1493.8,30525.55
+1052.7,1707.2,35019.18
+1052.7,1920.6,39913.3
+1052.7,2134,45438.16
+1053,2347.4,50542.53
+1204,-165.44,0
+1203.6,0,3086.704
+1203.6,213.4,6943.027
+1203.6,426.8,11040.37
+1203.6,640.2,15504.65
+1203.6,853.6,20335.89
+1203.6,1067,25176.6
+1203.6,1280.4,29782.22
+1203.6,1493.8,34642.24
+1203.6,1707.2,39786.14
+1203.6,1920.6,45254.8
+1203.6,2134,51129.03
+1204,2347.4,56732.88
+1367,-183.37,0
+1367.1,0,3845.344
+1367.1,213.4,7981.742
+1367.1,426.8,12796.69
+1367.1,640.2,17789.2
+1367.1,853.6,22854.21
+1367.1,1067,28302.84
+1367.1,1280.4,33739.91
+1367.1,1493.8,39393.87
+1367.1,1707.2,45836.33
+1367.1,1920.6,52078.71
+1367.1,2134,58296.41
+1367,2347.4,64530.56
+1490,-200.5,0
+1489.6,0,4373.424
+1489.6,213.4,8861.484
+1489.6,426.8,14090.86
+1489.6,640.2,19518.29
+1489.6,853.6,25092.8
+1489.6,1067,30873.69
+1489.6,1280.4,36865.42
+1489.6,1493.8,43095.57
+1489.6,1707.2,50249.81
+1489.6,1920.6,57035.25
+1489.6,2041.712,60609.5
+1490,2255.112,67311.83
+1612,-218.62,0
+1612.2,0,4904.015
+1612.2,213.4,9810.482
+1612.2,426.8,15403.9
+1612.2,640.2,21301.35
+1612.2,853.6,27492.32
+1612.2,1067,33580.96
+1612.2,1280.4,40114.61
+1612.2,1493.8,46914.77
+1612.2,1707.2,54666.14
+1612.2,1915.434,61862.91
+1612,2128.834,69491.99
+1735,-235.225,0
+1734.7,0,5586.953
+1734.7,213.4,11041.15
+1734.7,426.8,16949.24
+1734.7,640.2,23500.23
+1734.7,853.6,30159.59
+1734.7,1067,36741.18
+1734.7,1280.4,43923.85
+1734.7,1493.8,51295.21
+1734.7,1707.2,59469.31
+1734.7,1789.259,62731.31
+1735,2002.659,70935.23
+1857,-253.69,0
+1857.3,0,6673.839
+1857.3,213.4,12518.56
+1857.3,426.8,18687.88
+1857.3,640.2,25652.39
+1857.3,853.6,33003.08
+1857.3,1067,40438.09
+1857.3,1280.4,48117.52
+1857.3,1493.8,55848.59
+1857.3,1587.631,59434.17
+1857,1801.031,67215.39
+1957,-270.69,0
+1957.3,0,6673.839
+1957.3,213.4,12518.56
+1957.3,426.8,18687.88
+1957.3,640.2,25652.39
+1957.3,853.6,33003.08
+1957.3,1067,40438.09
+1957.3,1280.4,48117.52
+1957.3,1493.8,55848.59
+1957.3,1587.631,59434.17
+1957,1801.031,67215.39
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Axle_4x2_Tractor.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Axle_4x2_Tractor.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..e11cbf7cdde175e06ab8f6a0b79d46b84b3e0c1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Axle_4x2_Tractor.vtlm
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Default.vrlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Default.vrlm
new file mode 100644
index 0000000000000000000000000000000000000000..eb575b99973291e5414c4826da086c1f03a7f179
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Default.vrlm
@@ -0,0 +1,32 @@
+Retarder Speed [1/min],Torque Loss [Nm]
+0,10
+100,10
+200,10.1
+300,10.2
+400,10.3
+500,10.5
+600,10.7
+700,11
+800,11.3
+900,11.6
+1000,12
+1100,12.4
+1200,12.9
+1300,13.4
+1400,13.9
+1500,14.5
+1600,15.1
+1700,15.8
+1800,16.5
+1900,17.2
+2000,18
+2100,18.8
+2200,19.7
+2300,20.6
+2400,21.5
+2500,22.5
+2600,23.5
+2700,24.6
+2800,25.7
+2900,26.8
+3000,28
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Engine_325kW_12.7l.veng
new file mode 100644
index 0000000000000000000000000000000000000000..084062afccf57ee58c485634cb158fdf05647b86
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Engine_325kW_12.7l.veng
@@ -0,0 +1,35 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-08-21T09:24:04.0725494Z",
+ "AppVersion": "3",
+ "FileVersion": 5
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "325kW 12.7l Engine",
+ "Displacement": "12740",
+ "IdlingSpeed": 600.0,
+ "Inertia": 5.1498,
+ "Fuels": [
+ {
+ "WHTC-Urban": 0.0,
+ "WHTC-Rural": 0.0,
+ "WHTC-Motorway": 0.0,
+ "WHTC-Engineering": 1.0,
+ "ColdHotBalancingFactor": 0.0,
+ "CFRegPer": 1.0,
+ "FuelMap": "325kW.vmap",
+ "FuelType": "DieselCI"
+ }
+ ],
+ "RatedPower": 0.0,
+ "RatedSpeed": 0.0,
+ "MaxTorque": 0.0,
+ "FullLoadCurve": "325kW.vfld",
+ "WHRType": [
+ "None"
+ ],
+ "WHRCorrectionFactors": {}
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_1.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_1.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..b6e4f373d0cbc32c04b18ca49811dc4167db2eb7
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_1.vtlm
@@ -0,0 +1,2081 @@
+Input Speed [rpm] , Input Torque [Nm] , Torque Loss [Nm]
+0 , -6177.6 , 135.9072
+0 , -5984.55 , 131.08095
+0 , -5791.5 , 126.2547
+0 , -5598.45 , 121.42845
+0 , -5405.4 , 116.6022
+0 , -5212.35 , 111.77595
+0 , -5019.3 , 106.9497
+0 , -4826.25 , 102.12345
+0 , -4633.2 , 97.2972
+0 , -4440.15 , 92.47095
+0 , -4247.1 , 87.6447
+0 , -4054.05 , 82.81845
+0 , -3861 , 77.9922
+0 , -3667.95 , 73.16595
+0 , -3474.9 , 68.3397
+0 , -3281.85 , 63.51345
+0 , -3088.8 , 58.6872
+0 , -2895.75 , 53.86095
+0 , -2702.7 , 49.0347
+0 , -2509.65 , 44.20845
+0 , -2316.6 , 39.3822
+0 , -2123.55 , 34.55595
+0 , -1930.5 , 29.7297
+0 , -1737.45 , 24.90345
+0 , -1544.4 , 20.0772
+0 , -1351.35 , 15.25095
+0 , -1158.3 , 10.4247
+0 , -965.25 , 5.59845
+0 , -772.2 , 0.7722
+0 , -579.15 , 4.05405
+0 , -386.1 , 8.8803
+0 , -193.05 , 13.70655
+0 , 0 , 18.5328
+0 , 193.05 , 23.35905
+0 , 386.1 , 28.1853
+0 , 579.15 , 33.01155
+0 , 772.2 , 37.8378
+0 , 965.25 , 42.66405
+0 , 1158.3 , 47.4903
+0 , 1351.35 , 52.31655
+0 , 1544.4 , 57.1428
+0 , 1737.45 , 61.96905
+0 , 1930.5 , 66.7953
+0 , 2123.55 , 71.62155
+0 , 2316.6 , 76.4478
+0 , 2509.65 , 81.27405
+0 , 2702.7 , 86.1003
+0 , 2895.75 , 90.92655
+0 , 3088.8 , 95.7528
+0 , 3281.85 , 100.57905
+0 , 3474.9 , 105.4053
+0 , 3667.95 , 110.23155
+0 , 3861 , 115.0578
+0 , 4054.05 , 119.88405
+0 , 4247.1 , 124.7103
+0 , 4440.15 , 129.53655
+0 , 4633.2 , 134.3628
+0 , 4826.25 , 139.18905
+0 , 5019.3 , 144.0153
+0 , 5212.35 , 148.84155
+0 , 5405.4 , 153.6678
+0 , 5598.45 , 158.49405
+0 , 5791.5 , 163.3203
+0 , 5984.55 , 168.14655
+0 , 6177.6 , 172.9728
+40.80854701 , -6177.6 , 135.1509034
+40.80854701 , -5984.55 , 130.3246534
+40.80854701 , -5791.5 , 125.4984034
+40.80854701 , -5598.45 , 120.6721534
+40.80854701 , -5405.4 , 115.8459034
+40.80854701 , -5212.35 , 111.0196534
+40.80854701 , -5019.3 , 106.1934034
+40.80854701 , -4826.25 , 101.3671534
+40.80854701 , -4633.2 , 96.54090336
+40.80854701 , -4440.15 , 91.71465336
+40.80854701 , -4247.1 , 86.88840336
+40.80854701 , -4054.05 , 82.06215336
+40.80854701 , -3861 , 77.23590336
+40.80854701 , -3667.95 , 72.40965336
+40.80854701 , -3474.9 , 67.58340336
+40.80854701 , -3281.85 , 62.75715336
+40.80854701 , -3088.8 , 57.93090336
+40.80854701 , -2895.75 , 53.10465336
+40.80854701 , -2702.7 , 48.27840336
+40.80854701 , -2509.65 , 43.45215336
+40.80854701 , -2316.6 , 38.62590336
+40.80854701 , -2123.55 , 33.79965336
+40.80854701 , -1930.5 , 28.97340336
+40.80854701 , -1737.45 , 24.14715336
+40.80854701 , -1544.4 , 19.32090336
+40.80854701 , -1351.35 , 14.49465336
+40.80854701 , -1158.3 , 9.66840336
+40.80854701 , -965.25 , 4.84215336
+40.80854701 , -772.2 , 0.01590336
+40.80854701 , -579.15 , 4.81034664
+40.80854701 , -386.1 , 9.63659664
+40.80854701 , -193.05 , 14.46284664
+40.80854701 , 0 , 19.28909664
+40.80854701 , 193.05 , 24.11534664
+40.80854701 , 386.1 , 28.94159664
+40.80854701 , 579.15 , 33.76784664
+40.80854701 , 772.2 , 38.59409664
+40.80854701 , 965.25 , 43.42034664
+40.80854701 , 1158.3 , 48.24659664
+40.80854701 , 1351.35 , 53.07284664
+40.80854701 , 1544.4 , 57.89909664
+40.80854701 , 1737.45 , 62.72534664
+40.80854701 , 1930.5 , 67.55159664
+40.80854701 , 2123.55 , 72.37784664
+40.80854701 , 2316.6 , 77.20409664
+40.80854701 , 2509.65 , 82.03034664
+40.80854701 , 2702.7 , 86.85659664
+40.80854701 , 2895.75 , 91.68284664
+40.80854701 , 3088.8 , 96.50909664
+40.80854701 , 3281.85 , 101.3353466
+40.80854701 , 3474.9 , 106.1615966
+40.80854701 , 3667.95 , 110.9878466
+40.80854701 , 3861 , 115.8140966
+40.80854701 , 4054.05 , 120.6403466
+40.80854701 , 4247.1 , 125.4665966
+40.80854701 , 4440.15 , 130.2928466
+40.80854701 , 4633.2 , 135.1190966
+40.80854701 , 4826.25 , 139.9453466
+40.80854701 , 5019.3 , 144.7715966
+40.80854701 , 5212.35 , 149.5978466
+40.80854701 , 5405.4 , 154.4240966
+40.80854701 , 5598.45 , 159.2503466
+40.80854701 , 5791.5 , 164.0765966
+40.80854701 , 5984.55 , 168.9028466
+40.80854701 , 6177.6 , 173.7290966
+81.61794872 , -6177.6 , 134.3945909
+81.61794872 , -5984.55 , 129.5683409
+81.61794872 , -5791.5 , 124.7420909
+81.61794872 , -5598.45 , 119.9158409
+81.61794872 , -5405.4 , 115.0895909
+81.61794872 , -5212.35 , 110.2633409
+81.61794872 , -5019.3 , 105.4370909
+81.61794872 , -4826.25 , 100.6108409
+81.61794872 , -4633.2 , 95.78459088
+81.61794872 , -4440.15 , 90.95834088
+81.61794872 , -4247.1 , 86.13209088
+81.61794872 , -4054.05 , 81.30584088
+81.61794872 , -3861 , 76.47959088
+81.61794872 , -3667.95 , 71.65334088
+81.61794872 , -3474.9 , 66.82709088
+81.61794872 , -3281.85 , 62.00084088
+81.61794872 , -3088.8 , 57.17459088
+81.61794872 , -2895.75 , 52.34834088
+81.61794872 , -2702.7 , 47.52209088
+81.61794872 , -2509.65 , 42.69584088
+81.61794872 , -2316.6 , 37.86959088
+81.61794872 , -2123.55 , 33.04334088
+81.61794872 , -1930.5 , 28.21709088
+81.61794872 , -1737.45 , 23.39084088
+81.61794872 , -1544.4 , 18.56459088
+81.61794872 , -1351.35 , 13.73834088
+81.61794872 , -1158.3 , 8.91209088
+81.61794872 , -965.25 , 4.08584088
+81.61794872 , -772.2 , 0.74040912
+81.61794872 , -579.15 , 5.56665912
+81.61794872 , -386.1 , 10.39290912
+81.61794872 , -193.05 , 15.21915912
+81.61794872 , 0 , 20.04540912
+81.61794872 , 193.05 , 24.87165912
+81.61794872 , 386.1 , 29.69790912
+81.61794872 , 579.15 , 34.52415912
+81.61794872 , 772.2 , 39.35040912
+81.61794872 , 965.25 , 44.17665912
+81.61794872 , 1158.3 , 49.00290912
+81.61794872 , 1351.35 , 53.82915912
+81.61794872 , 1544.4 , 58.65540912
+81.61794872 , 1737.45 , 63.48165912
+81.61794872 , 1930.5 , 68.30790912
+81.61794872 , 2123.55 , 73.13415912
+81.61794872 , 2316.6 , 77.96040912
+81.61794872 , 2509.65 , 82.78665912
+81.61794872 , 2702.7 , 87.61290912
+81.61794872 , 2895.75 , 92.43915912
+81.61794872 , 3088.8 , 97.26540912
+81.61794872 , 3281.85 , 102.0916591
+81.61794872 , 3474.9 , 106.9179091
+81.61794872 , 3667.95 , 111.7441591
+81.61794872 , 3861 , 116.5704091
+81.61794872 , 4054.05 , 121.3966591
+81.61794872 , 4247.1 , 126.2229091
+81.61794872 , 4440.15 , 131.0491591
+81.61794872 , 4633.2 , 135.8754091
+81.61794872 , 4826.25 , 140.7016591
+81.61794872 , 5019.3 , 145.5279091
+81.61794872 , 5212.35 , 150.3541591
+81.61794872 , 5405.4 , 155.1804091
+81.61794872 , 5598.45 , 160.0066591
+81.61794872 , 5791.5 , 164.8329091
+81.61794872 , 5984.55 , 169.6591591
+81.61794872 , 6177.6 , 174.4854091
+122.4273504 , -6177.6 , 133.6382784
+122.4273504 , -5984.55 , 128.8120284
+122.4273504 , -5791.5 , 123.9857784
+122.4273504 , -5598.45 , 119.1595284
+122.4273504 , -5405.4 , 114.3332784
+122.4273504 , -5212.35 , 109.5070284
+122.4273504 , -5019.3 , 104.6807784
+122.4273504 , -4826.25 , 99.8545284
+122.4273504 , -4633.2 , 95.0282784
+122.4273504 , -4440.15 , 90.2020284
+122.4273504 , -4247.1 , 85.3757784
+122.4273504 , -4054.05 , 80.5495284
+122.4273504 , -3861 , 75.7232784
+122.4273504 , -3667.95 , 70.8970284
+122.4273504 , -3474.9 , 66.0707784
+122.4273504 , -3281.85 , 61.2445284
+122.4273504 , -3088.8 , 56.4182784
+122.4273504 , -2895.75 , 51.5920284
+122.4273504 , -2702.7 , 46.7657784
+122.4273504 , -2509.65 , 41.9395284
+122.4273504 , -2316.6 , 37.1132784
+122.4273504 , -2123.55 , 32.2870284
+122.4273504 , -1930.5 , 27.4607784
+122.4273504 , -1737.45 , 22.6345284
+122.4273504 , -1544.4 , 17.8082784
+122.4273504 , -1351.35 , 12.9820284
+122.4273504 , -1158.3 , 8.155778401
+122.4273504 , -965.25 , 3.329528401
+122.4273504 , -772.2 , 1.496721599
+122.4273504 , -579.15 , 6.322971599
+122.4273504 , -386.1 , 11.1492216
+122.4273504 , -193.05 , 15.9754716
+122.4273504 , 0 , 20.8017216
+122.4273504 , 193.05 , 25.6279716
+122.4273504 , 386.1 , 30.4542216
+122.4273504 , 579.15 , 35.2804716
+122.4273504 , 772.2 , 40.1067216
+122.4273504 , 965.25 , 44.9329716
+122.4273504 , 1158.3 , 49.7592216
+122.4273504 , 1351.35 , 54.5854716
+122.4273504 , 1544.4 , 59.4117216
+122.4273504 , 1737.45 , 64.2379716
+122.4273504 , 1930.5 , 69.0642216
+122.4273504 , 2123.55 , 73.8904716
+122.4273504 , 2316.6 , 78.7167216
+122.4273504 , 2509.65 , 83.5429716
+122.4273504 , 2702.7 , 88.3692216
+122.4273504 , 2895.75 , 93.1954716
+122.4273504 , 3088.8 , 98.0217216
+122.4273504 , 3281.85 , 102.8479716
+122.4273504 , 3474.9 , 107.6742216
+122.4273504 , 3667.95 , 112.5004716
+122.4273504 , 3861 , 117.3267216
+122.4273504 , 4054.05 , 122.1529716
+122.4273504 , 4247.1 , 126.9792216
+122.4273504 , 4440.15 , 131.8054716
+122.4273504 , 4633.2 , 136.6317216
+122.4273504 , 4826.25 , 141.4579716
+122.4273504 , 5019.3 , 146.2842216
+122.4273504 , 5212.35 , 151.1104716
+122.4273504 , 5405.4 , 155.9367216
+122.4273504 , 5598.45 , 160.7629716
+122.4273504 , 5791.5 , 165.5892216
+122.4273504 , 5984.55 , 170.4154716
+122.4273504 , 6177.6 , 175.2417216
+163.2393162 , -6177.6 , 132.8819184
+163.2393162 , -5984.55 , 128.0556684
+163.2393162 , -5791.5 , 123.2294184
+163.2393162 , -5598.45 , 118.4031684
+163.2393162 , -5405.4 , 113.5769184
+163.2393162 , -5212.35 , 108.7506684
+163.2393162 , -5019.3 , 103.9244184
+163.2393162 , -4826.25 , 99.0981684
+163.2393162 , -4633.2 , 94.2719184
+163.2393162 , -4440.15 , 89.4456684
+163.2393162 , -4247.1 , 84.6194184
+163.2393162 , -4054.05 , 79.7931684
+163.2393162 , -3861 , 74.9669184
+163.2393162 , -3667.95 , 70.1406684
+163.2393162 , -3474.9 , 65.3144184
+163.2393162 , -3281.85 , 60.4881684
+163.2393162 , -3088.8 , 55.6619184
+163.2393162 , -2895.75 , 50.8356684
+163.2393162 , -2702.7 , 46.0094184
+163.2393162 , -2509.65 , 41.1831684
+163.2393162 , -2316.6 , 36.3569184
+163.2393162 , -2123.55 , 31.5306684
+163.2393162 , -1930.5 , 26.7044184
+163.2393162 , -1737.45 , 21.8781684
+163.2393162 , -1544.4 , 17.0519184
+163.2393162 , -1351.35 , 12.2256684
+163.2393162 , -1158.3 , 7.399418401
+163.2393162 , -965.25 , 2.573168401
+163.2393162 , -772.2 , 2.253081599
+163.2393162 , -579.15 , 7.079331599
+163.2393162 , -386.1 , 11.9055816
+163.2393162 , -193.05 , 16.7318316
+163.2393162 , 0 , 21.5580816
+163.2393162 , 193.05 , 26.3843316
+163.2393162 , 386.1 , 31.2105816
+163.2393162 , 579.15 , 36.0368316
+163.2393162 , 772.2 , 40.8630816
+163.2393162 , 965.25 , 45.6893316
+163.2393162 , 1158.3 , 50.5155816
+163.2393162 , 1351.35 , 55.3418316
+163.2393162 , 1544.4 , 60.1680816
+163.2393162 , 1737.45 , 64.9943316
+163.2393162 , 1930.5 , 69.8205816
+163.2393162 , 2123.55 , 74.6468316
+163.2393162 , 2316.6 , 79.4730816
+163.2393162 , 2509.65 , 84.2993316
+163.2393162 , 2702.7 , 89.1255816
+163.2393162 , 2895.75 , 93.9518316
+163.2393162 , 3088.8 , 98.7780816
+163.2393162 , 3281.85 , 103.6043316
+163.2393162 , 3474.9 , 108.4305816
+163.2393162 , 3667.95 , 113.2568316
+163.2393162 , 3861 , 118.0830816
+163.2393162 , 4054.05 , 122.9093316
+163.2393162 , 4247.1 , 127.7355816
+163.2393162 , 4440.15 , 132.5618316
+163.2393162 , 4633.2 , 137.3880816
+163.2393162 , 4826.25 , 142.2143316
+163.2393162 , 5019.3 , 147.0405816
+163.2393162 , 5212.35 , 151.8668316
+163.2393162 , 5405.4 , 156.6930816
+163.2393162 , 5598.45 , 161.5193316
+163.2393162 , 5791.5 , 166.3455816
+163.2393162 , 5984.55 , 171.1718316
+163.2393162 , 6177.6 , 175.9980816
+204.042735 , -6177.6 , 132.1257168
+204.042735 , -5984.55 , 127.2994668
+204.042735 , -5791.5 , 122.4732168
+204.042735 , -5598.45 , 117.6469668
+204.042735 , -5405.4 , 112.8207168
+204.042735 , -5212.35 , 107.9944668
+204.042735 , -5019.3 , 103.1682168
+204.042735 , -4826.25 , 98.3419668
+204.042735 , -4633.2 , 93.5157168
+204.042735 , -4440.15 , 88.6894668
+204.042735 , -4247.1 , 83.8632168
+204.042735 , -4054.05 , 79.0369668
+204.042735 , -3861 , 74.2107168
+204.042735 , -3667.95 , 69.3844668
+204.042735 , -3474.9 , 64.5582168
+204.042735 , -3281.85 , 59.7319668
+204.042735 , -3088.8 , 54.9057168
+204.042735 , -2895.75 , 50.0794668
+204.042735 , -2702.7 , 45.2532168
+204.042735 , -2509.65 , 40.4269668
+204.042735 , -2316.6 , 35.6007168
+204.042735 , -2123.55 , 30.7744668
+204.042735 , -1930.5 , 25.9482168
+204.042735 , -1737.45 , 21.1219668
+204.042735 , -1544.4 , 16.2957168
+204.042735 , -1351.35 , 11.4694668
+204.042735 , -1158.3 , 6.643216801
+204.042735 , -965.25 , 1.816966801
+204.042735 , -772.2 , 3.009283199
+204.042735 , -579.15 , 7.835533199
+204.042735 , -386.1 , 12.6617832
+204.042735 , -193.05 , 17.4880332
+204.042735 , 0 , 22.3142832
+204.042735 , 193.05 , 27.1405332
+204.042735 , 386.1 , 31.9667832
+204.042735 , 579.15 , 36.7930332
+204.042735 , 772.2 , 41.6192832
+204.042735 , 965.25 , 46.4455332
+204.042735 , 1158.3 , 51.2717832
+204.042735 , 1351.35 , 56.0980332
+204.042735 , 1544.4 , 60.9242832
+204.042735 , 1737.45 , 65.7505332
+204.042735 , 1930.5 , 70.5767832
+204.042735 , 2123.55 , 75.4030332
+204.042735 , 2316.6 , 80.2292832
+204.042735 , 2509.65 , 85.0555332
+204.042735 , 2702.7 , 89.8817832
+204.042735 , 2895.75 , 94.7080332
+204.042735 , 3088.8 , 99.5342832
+204.042735 , 3281.85 , 104.3605332
+204.042735 , 3474.9 , 109.1867832
+204.042735 , 3667.95 , 114.0130332
+204.042735 , 3861 , 118.8392832
+204.042735 , 4054.05 , 123.6655332
+204.042735 , 4247.1 , 128.4917832
+204.042735 , 4440.15 , 133.3180332
+204.042735 , 4633.2 , 138.1442832
+204.042735 , 4826.25 , 142.9705332
+204.042735 , 5019.3 , 147.7967832
+204.042735 , 5212.35 , 152.6230332
+204.042735 , 5405.4 , 157.4492832
+204.042735 , 5598.45 , 162.2755332
+204.042735 , 5791.5 , 167.1017832
+204.042735 , 5984.55 , 171.9280332
+204.042735 , 6177.6 , 176.7542832
+244.8547009 , -6177.6 , 131.3693568
+244.8547009 , -5984.55 , 126.5431068
+244.8547009 , -5791.5 , 121.7168568
+244.8547009 , -5598.45 , 116.8906068
+244.8547009 , -5405.4 , 112.0643568
+244.8547009 , -5212.35 , 107.2381068
+244.8547009 , -5019.3 , 102.4118568
+244.8547009 , -4826.25 , 97.5856068
+244.8547009 , -4633.2 , 92.7593568
+244.8547009 , -4440.15 , 87.9331068
+244.8547009 , -4247.1 , 83.1068568
+244.8547009 , -4054.05 , 78.2806068
+244.8547009 , -3861 , 73.4543568
+244.8547009 , -3667.95 , 68.6281068
+244.8547009 , -3474.9 , 63.8018568
+244.8547009 , -3281.85 , 58.9756068
+244.8547009 , -3088.8 , 54.1493568
+244.8547009 , -2895.75 , 49.3231068
+244.8547009 , -2702.7 , 44.4968568
+244.8547009 , -2509.65 , 39.6706068
+244.8547009 , -2316.6 , 34.8443568
+244.8547009 , -2123.55 , 30.0181068
+244.8547009 , -1930.5 , 25.1918568
+244.8547009 , -1737.45 , 20.3656068
+244.8547009 , -1544.4 , 15.5393568
+244.8547009 , -1351.35 , 10.7131068
+244.8547009 , -1158.3 , 5.886856799
+244.8547009 , -965.25 , 1.060606799
+244.8547009 , -772.2 , 3.765643201
+244.8547009 , -579.15 , 8.591893201
+244.8547009 , -386.1 , 13.4181432
+244.8547009 , -193.05 , 18.2443932
+244.8547009 , 0 , 23.0706432
+244.8547009 , 193.05 , 27.8968932
+244.8547009 , 386.1 , 32.7231432
+244.8547009 , 579.15 , 37.5493932
+244.8547009 , 772.2 , 42.3756432
+244.8547009 , 965.25 , 47.2018932
+244.8547009 , 1158.3 , 52.0281432
+244.8547009 , 1351.35 , 56.8543932
+244.8547009 , 1544.4 , 61.6806432
+244.8547009 , 1737.45 , 66.5068932
+244.8547009 , 1930.5 , 71.3331432
+244.8547009 , 2123.55 , 76.1593932
+244.8547009 , 2316.6 , 80.9856432
+244.8547009 , 2509.65 , 85.8118932
+244.8547009 , 2702.7 , 90.6381432
+244.8547009 , 2895.75 , 95.4643932
+244.8547009 , 3088.8 , 100.2906432
+244.8547009 , 3281.85 , 105.1168932
+244.8547009 , 3474.9 , 109.9431432
+244.8547009 , 3667.95 , 114.7693932
+244.8547009 , 3861 , 119.5956432
+244.8547009 , 4054.05 , 124.4218932
+244.8547009 , 4247.1 , 129.2481432
+244.8547009 , 4440.15 , 134.0743932
+244.8547009 , 4633.2 , 138.9006432
+244.8547009 , 4826.25 , 143.7268932
+244.8547009 , 5019.3 , 148.5531432
+244.8547009 , 5212.35 , 153.3793932
+244.8547009 , 5405.4 , 158.2056432
+244.8547009 , 5598.45 , 163.0318932
+244.8547009 , 5791.5 , 167.8581432
+244.8547009 , 5984.55 , 172.6843932
+244.8547009 , 6177.6 , 177.5106432
+285.6666667 , -6177.6 , 130.6129968
+285.6666667 , -5984.55 , 125.7867468
+285.6666667 , -5791.5 , 120.9604968
+285.6666667 , -5598.45 , 116.1342468
+285.6666667 , -5405.4 , 111.3079968
+285.6666667 , -5212.35 , 106.4817468
+285.6666667 , -5019.3 , 101.6554968
+285.6666667 , -4826.25 , 96.8292468
+285.6666667 , -4633.2 , 92.0029968
+285.6666667 , -4440.15 , 87.1767468
+285.6666667 , -4247.1 , 82.3504968
+285.6666667 , -4054.05 , 77.5242468
+285.6666667 , -3861 , 72.6979968
+285.6666667 , -3667.95 , 67.8717468
+285.6666667 , -3474.9 , 63.0454968
+285.6666667 , -3281.85 , 58.2192468
+285.6666667 , -3088.8 , 53.3929968
+285.6666667 , -2895.75 , 48.5667468
+285.6666667 , -2702.7 , 43.7404968
+285.6666667 , -2509.65 , 38.9142468
+285.6666667 , -2316.6 , 34.0879968
+285.6666667 , -2123.55 , 29.2617468
+285.6666667 , -1930.5 , 24.4354968
+285.6666667 , -1737.45 , 19.6092468
+285.6666667 , -1544.4 , 14.7829968
+285.6666667 , -1351.35 , 9.956746799
+285.6666667 , -1158.3 , 5.130496799
+285.6666667 , -965.25 , 0.304246799
+285.6666667 , -772.2 , 4.522003201
+285.6666667 , -579.15 , 9.348253201
+285.6666667 , -386.1 , 14.1745032
+285.6666667 , -193.05 , 19.0007532
+285.6666667 , 0 , 23.8270032
+285.6666667 , 193.05 , 28.6532532
+285.6666667 , 386.1 , 33.4795032
+285.6666667 , 579.15 , 38.3057532
+285.6666667 , 772.2 , 43.1320032
+285.6666667 , 965.25 , 47.9582532
+285.6666667 , 1158.3 , 52.7845032
+285.6666667 , 1351.35 , 57.6107532
+285.6666667 , 1544.4 , 62.4370032
+285.6666667 , 1737.45 , 67.2632532
+285.6666667 , 1930.5 , 72.0895032
+285.6666667 , 2123.55 , 76.9157532
+285.6666667 , 2316.6 , 81.7420032
+285.6666667 , 2509.65 , 86.5682532
+285.6666667 , 2702.7 , 91.3945032
+285.6666667 , 2895.75 , 96.2207532
+285.6666667 , 3088.8 , 101.0470032
+285.6666667 , 3281.85 , 105.8732532
+285.6666667 , 3474.9 , 110.6995032
+285.6666667 , 3667.95 , 115.5257532
+285.6666667 , 3861 , 120.3520032
+285.6666667 , 4054.05 , 125.1782532
+285.6666667 , 4247.1 , 130.0045032
+285.6666667 , 4440.15 , 134.8307532
+285.6666667 , 4633.2 , 139.6570032
+285.6666667 , 4826.25 , 144.4832532
+285.6666667 , 5019.3 , 149.3095032
+285.6666667 , 5212.35 , 154.1357532
+285.6666667 , 5405.4 , 158.9620032
+285.6666667 , 5598.45 , 163.7882532
+285.6666667 , 5791.5 , 168.6145032
+285.6666667 , 5984.55 , 173.4407532
+285.6666667 , 6177.6 , 178.2670032
+326.4700855 , -6177.6 , 129.8567952
+326.4700855 , -5984.55 , 125.0305452
+326.4700855 , -5791.5 , 120.2042952
+326.4700855 , -5598.45 , 115.3780452
+326.4700855 , -5405.4 , 110.5517952
+326.4700855 , -5212.35 , 105.7255452
+326.4700855 , -5019.3 , 100.8992952
+326.4700855 , -4826.25 , 96.0730452
+326.4700855 , -4633.2 , 91.2467952
+326.4700855 , -4440.15 , 86.4205452
+326.4700855 , -4247.1 , 81.5942952
+326.4700855 , -4054.05 , 76.7680452
+326.4700855 , -3861 , 71.9417952
+326.4700855 , -3667.95 , 67.1155452
+326.4700855 , -3474.9 , 62.2892952
+326.4700855 , -3281.85 , 57.4630452
+326.4700855 , -3088.8 , 52.6367952
+326.4700855 , -2895.75 , 47.8105452
+326.4700855 , -2702.7 , 42.9842952
+326.4700855 , -2509.65 , 38.1580452
+326.4700855 , -2316.6 , 33.3317952
+326.4700855 , -2123.55 , 28.5055452
+326.4700855 , -1930.5 , 23.6792952
+326.4700855 , -1737.45 , 18.8530452
+326.4700855 , -1544.4 , 14.0267952
+326.4700855 , -1351.35 , 9.200545199
+326.4700855 , -1158.3 , 4.374295199
+326.4700855 , -965.25 , 0.451954801
+326.4700855 , -772.2 , 5.278204801
+326.4700855 , -579.15 , 10.1044548
+326.4700855 , -386.1 , 14.9307048
+326.4700855 , -193.05 , 19.7569548
+326.4700855 , 0 , 24.5832048
+326.4700855 , 193.05 , 29.4094548
+326.4700855 , 386.1 , 34.2357048
+326.4700855 , 579.15 , 39.0619548
+326.4700855 , 772.2 , 43.8882048
+326.4700855 , 965.25 , 48.7144548
+326.4700855 , 1158.3 , 53.5407048
+326.4700855 , 1351.35 , 58.3669548
+326.4700855 , 1544.4 , 63.1932048
+326.4700855 , 1737.45 , 68.0194548
+326.4700855 , 1930.5 , 72.8457048
+326.4700855 , 2123.55 , 77.6719548
+326.4700855 , 2316.6 , 82.4982048
+326.4700855 , 2509.65 , 87.3244548
+326.4700855 , 2702.7 , 92.1507048
+326.4700855 , 2895.75 , 96.9769548
+326.4700855 , 3088.8 , 101.8032048
+326.4700855 , 3281.85 , 106.6294548
+326.4700855 , 3474.9 , 111.4557048
+326.4700855 , 3667.95 , 116.2819548
+326.4700855 , 3861 , 121.1082048
+326.4700855 , 4054.05 , 125.9344548
+326.4700855 , 4247.1 , 130.7607048
+326.4700855 , 4440.15 , 135.5869548
+326.4700855 , 4633.2 , 140.4132048
+326.4700855 , 4826.25 , 145.2394548
+326.4700855 , 5019.3 , 150.0657048
+326.4700855 , 5212.35 , 154.8919548
+326.4700855 , 5405.4 , 159.7182048
+326.4700855 , 5598.45 , 164.5444548
+326.4700855 , 5791.5 , 169.3707048
+326.4700855 , 5984.55 , 174.1969548
+326.4700855 , 6177.6 , 179.0232048
+367.2820513 , -6177.6 , 129.1004352
+367.2820513 , -5984.55 , 124.2741852
+367.2820513 , -5791.5 , 119.4479352
+367.2820513 , -5598.45 , 114.6216852
+367.2820513 , -5405.4 , 109.7954352
+367.2820513 , -5212.35 , 104.9691852
+367.2820513 , -5019.3 , 100.1429352
+367.2820513 , -4826.25 , 95.3166852
+367.2820513 , -4633.2 , 90.4904352
+367.2820513 , -4440.15 , 85.6641852
+367.2820513 , -4247.1 , 80.8379352
+367.2820513 , -4054.05 , 76.0116852
+367.2820513 , -3861 , 71.1854352
+367.2820513 , -3667.95 , 66.3591852
+367.2820513 , -3474.9 , 61.5329352
+367.2820513 , -3281.85 , 56.7066852
+367.2820513 , -3088.8 , 51.8804352
+367.2820513 , -2895.75 , 47.0541852
+367.2820513 , -2702.7 , 42.2279352
+367.2820513 , -2509.65 , 37.4016852
+367.2820513 , -2316.6 , 32.5754352
+367.2820513 , -2123.55 , 27.7491852
+367.2820513 , -1930.5 , 22.9229352
+367.2820513 , -1737.45 , 18.0966852
+367.2820513 , -1544.4 , 13.2704352
+367.2820513 , -1351.35 , 8.4441852
+367.2820513 , -1158.3 , 3.6179352
+367.2820513 , -965.25 , 1.2083148
+367.2820513 , -772.2 , 6.0345648
+367.2820513 , -579.15 , 10.8608148
+367.2820513 , -386.1 , 15.6870648
+367.2820513 , -193.05 , 20.5133148
+367.2820513 , 0 , 25.3395648
+367.2820513 , 193.05 , 30.1658148
+367.2820513 , 386.1 , 34.9920648
+367.2820513 , 579.15 , 39.8183148
+367.2820513 , 772.2 , 44.6445648
+367.2820513 , 965.25 , 49.4708148
+367.2820513 , 1158.3 , 54.2970648
+367.2820513 , 1351.35 , 59.1233148
+367.2820513 , 1544.4 , 63.9495648
+367.2820513 , 1737.45 , 68.7758148
+367.2820513 , 1930.5 , 73.6020648
+367.2820513 , 2123.55 , 78.4283148
+367.2820513 , 2316.6 , 83.2545648
+367.2820513 , 2509.65 , 88.0808148
+367.2820513 , 2702.7 , 92.9070648
+367.2820513 , 2895.75 , 97.7333148
+367.2820513 , 3088.8 , 102.5595648
+367.2820513 , 3281.85 , 107.3858148
+367.2820513 , 3474.9 , 112.2120648
+367.2820513 , 3667.95 , 117.0383148
+367.2820513 , 3861 , 121.8645648
+367.2820513 , 4054.05 , 126.6908148
+367.2820513 , 4247.1 , 131.5170648
+367.2820513 , 4440.15 , 136.3433148
+367.2820513 , 4633.2 , 141.1695648
+367.2820513 , 4826.25 , 145.9958148
+367.2820513 , 5019.3 , 150.8220648
+367.2820513 , 5212.35 , 155.6483148
+367.2820513 , 5405.4 , 160.4745648
+367.2820513 , 5598.45 , 165.3008148
+367.2820513 , 5791.5 , 170.1270648
+367.2820513 , 5984.55 , 174.9533148
+367.2820513 , 6177.6 , 179.7795648
+408.0854701 , -6177.6 , 128.3442336
+408.0854701 , -5984.55 , 123.5179836
+408.0854701 , -5791.5 , 118.6917336
+408.0854701 , -5598.45 , 113.8654836
+408.0854701 , -5405.4 , 109.0392336
+408.0854701 , -5212.35 , 104.2129836
+408.0854701 , -5019.3 , 99.3867336
+408.0854701 , -4826.25 , 94.5604836
+408.0854701 , -4633.2 , 89.7342336
+408.0854701 , -4440.15 , 84.9079836
+408.0854701 , -4247.1 , 80.0817336
+408.0854701 , -4054.05 , 75.2554836
+408.0854701 , -3861 , 70.4292336
+408.0854701 , -3667.95 , 65.6029836
+408.0854701 , -3474.9 , 60.7767336
+408.0854701 , -3281.85 , 55.9504836
+408.0854701 , -3088.8 , 51.1242336
+408.0854701 , -2895.75 , 46.2979836
+408.0854701 , -2702.7 , 41.4717336
+408.0854701 , -2509.65 , 36.6454836
+408.0854701 , -2316.6 , 31.8192336
+408.0854701 , -2123.55 , 26.9929836
+408.0854701 , -1930.5 , 22.1667336
+408.0854701 , -1737.45 , 17.3404836
+408.0854701 , -1544.4 , 12.5142336
+408.0854701 , -1351.35 , 7.6879836
+408.0854701 , -1158.3 , 2.8617336
+408.0854701 , -965.25 , 1.9645164
+408.0854701 , -772.2 , 6.7907664
+408.0854701 , -579.15 , 11.6170164
+408.0854701 , -386.1 , 16.4432664
+408.0854701 , -193.05 , 21.2695164
+408.0854701 , 0 , 26.0957664
+408.0854701 , 193.05 , 30.9220164
+408.0854701 , 386.1 , 35.7482664
+408.0854701 , 579.15 , 40.5745164
+408.0854701 , 772.2 , 45.4007664
+408.0854701 , 965.25 , 50.2270164
+408.0854701 , 1158.3 , 55.0532664
+408.0854701 , 1351.35 , 59.8795164
+408.0854701 , 1544.4 , 64.7057664
+408.0854701 , 1737.45 , 69.5320164
+408.0854701 , 1930.5 , 74.3582664
+408.0854701 , 2123.55 , 79.1845164
+408.0854701 , 2316.6 , 84.0107664
+408.0854701 , 2509.65 , 88.8370164
+408.0854701 , 2702.7 , 93.6632664
+408.0854701 , 2895.75 , 98.4895164
+408.0854701 , 3088.8 , 103.3157664
+408.0854701 , 3281.85 , 108.1420164
+408.0854701 , 3474.9 , 112.9682664
+408.0854701 , 3667.95 , 117.7945164
+408.0854701 , 3861 , 122.6207664
+408.0854701 , 4054.05 , 127.4470164
+408.0854701 , 4247.1 , 132.2732664
+408.0854701 , 4440.15 , 137.0995164
+408.0854701 , 4633.2 , 141.9257664
+408.0854701 , 4826.25 , 146.7520164
+408.0854701 , 5019.3 , 151.5782664
+408.0854701 , 5212.35 , 156.4045164
+408.0854701 , 5405.4 , 161.2307664
+408.0854701 , 5598.45 , 166.0570164
+408.0854701 , 5791.5 , 170.8832664
+408.0854701 , 5984.55 , 175.7095164
+408.0854701 , 6177.6 , 180.5357664
+448.8974359 , -6177.6 , 127.5878736
+448.8974359 , -5984.55 , 122.7616236
+448.8974359 , -5791.5 , 117.9353736
+448.8974359 , -5598.45 , 113.1091236
+448.8974359 , -5405.4 , 108.2828736
+448.8974359 , -5212.35 , 103.4566236
+448.8974359 , -5019.3 , 98.6303736
+448.8974359 , -4826.25 , 93.8041236
+448.8974359 , -4633.2 , 88.9778736
+448.8974359 , -4440.15 , 84.1516236
+448.8974359 , -4247.1 , 79.3253736
+448.8974359 , -4054.05 , 74.4991236
+448.8974359 , -3861 , 69.6728736
+448.8974359 , -3667.95 , 64.8466236
+448.8974359 , -3474.9 , 60.0203736
+448.8974359 , -3281.85 , 55.1941236
+448.8974359 , -3088.8 , 50.3678736
+448.8974359 , -2895.75 , 45.5416236
+448.8974359 , -2702.7 , 40.7153736
+448.8974359 , -2509.65 , 35.8891236
+448.8974359 , -2316.6 , 31.0628736
+448.8974359 , -2123.55 , 26.2366236
+448.8974359 , -1930.5 , 21.4103736
+448.8974359 , -1737.45 , 16.5841236
+448.8974359 , -1544.4 , 11.7578736
+448.8974359 , -1351.35 , 6.9316236
+448.8974359 , -1158.3 , 2.1053736
+448.8974359 , -965.25 , 2.7208764
+448.8974359 , -772.2 , 7.5471264
+448.8974359 , -579.15 , 12.3733764
+448.8974359 , -386.1 , 17.1996264
+448.8974359 , -193.05 , 22.0258764
+448.8974359 , 0 , 26.8521264
+448.8974359 , 193.05 , 31.6783764
+448.8974359 , 386.1 , 36.5046264
+448.8974359 , 579.15 , 41.3308764
+448.8974359 , 772.2 , 46.1571264
+448.8974359 , 965.25 , 50.9833764
+448.8974359 , 1158.3 , 55.8096264
+448.8974359 , 1351.35 , 60.6358764
+448.8974359 , 1544.4 , 65.4621264
+448.8974359 , 1737.45 , 70.2883764
+448.8974359 , 1930.5 , 75.1146264
+448.8974359 , 2123.55 , 79.9408764
+448.8974359 , 2316.6 , 84.7671264
+448.8974359 , 2509.65 , 89.5933764
+448.8974359 , 2702.7 , 94.4196264
+448.8974359 , 2895.75 , 99.2458764
+448.8974359 , 3088.8 , 104.0721264
+448.8974359 , 3281.85 , 108.8983764
+448.8974359 , 3474.9 , 113.7246264
+448.8974359 , 3667.95 , 118.5508764
+448.8974359 , 3861 , 123.3771264
+448.8974359 , 4054.05 , 128.2033764
+448.8974359 , 4247.1 , 133.0296264
+448.8974359 , 4440.15 , 137.8558764
+448.8974359 , 4633.2 , 142.6821264
+448.8974359 , 4826.25 , 147.5083764
+448.8974359 , 5019.3 , 152.3346264
+448.8974359 , 5212.35 , 157.1608764
+448.8974359 , 5405.4 , 161.9871264
+448.8974359 , 5598.45 , 166.8133764
+448.8974359 , 5791.5 , 171.6396264
+448.8974359 , 5984.55 , 176.4658764
+448.8974359 , 6177.6 , 181.2921264
+489.7094017 , -6177.6 , 126.8315136
+489.7094017 , -5984.55 , 122.0052636
+489.7094017 , -5791.5 , 117.1790136
+489.7094017 , -5598.45 , 112.3527636
+489.7094017 , -5405.4 , 107.5265136
+489.7094017 , -5212.35 , 102.7002636
+489.7094017 , -5019.3 , 97.8740136
+489.7094017 , -4826.25 , 93.0477636
+489.7094017 , -4633.2 , 88.2215136
+489.7094017 , -4440.15 , 83.3952636
+489.7094017 , -4247.1 , 78.5690136
+489.7094017 , -4054.05 , 73.7427636
+489.7094017 , -3861 , 68.9165136
+489.7094017 , -3667.95 , 64.0902636
+489.7094017 , -3474.9 , 59.2640136
+489.7094017 , -3281.85 , 54.4377636
+489.7094017 , -3088.8 , 49.6115136
+489.7094017 , -2895.75 , 44.7852636
+489.7094017 , -2702.7 , 39.9590136
+489.7094017 , -2509.65 , 35.1327636
+489.7094017 , -2316.6 , 30.3065136
+489.7094017 , -2123.55 , 25.4802636
+489.7094017 , -1930.5 , 20.6540136
+489.7094017 , -1737.45 , 15.8277636
+489.7094017 , -1544.4 , 11.0015136
+489.7094017 , -1351.35 , 6.1752636
+489.7094017 , -1158.3 , 1.3490136
+489.7094017 , -965.25 , 3.4772364
+489.7094017 , -772.2 , 8.3034864
+489.7094017 , -579.15 , 13.1297364
+489.7094017 , -386.1 , 17.9559864
+489.7094017 , -193.05 , 22.7822364
+489.7094017 , 0 , 27.6084864
+489.7094017 , 193.05 , 32.4347364
+489.7094017 , 386.1 , 37.2609864
+489.7094017 , 579.15 , 42.0872364
+489.7094017 , 772.2 , 46.9134864
+489.7094017 , 965.25 , 51.7397364
+489.7094017 , 1158.3 , 56.5659864
+489.7094017 , 1351.35 , 61.3922364
+489.7094017 , 1544.4 , 66.2184864
+489.7094017 , 1737.45 , 71.0447364
+489.7094017 , 1930.5 , 75.8709864
+489.7094017 , 2123.55 , 80.6972364
+489.7094017 , 2316.6 , 85.5234864
+489.7094017 , 2509.65 , 90.3497364
+489.7094017 , 2702.7 , 95.1759864
+489.7094017 , 2895.75 , 100.0022364
+489.7094017 , 3088.8 , 104.8284864
+489.7094017 , 3281.85 , 109.6547364
+489.7094017 , 3474.9 , 114.4809864
+489.7094017 , 3667.95 , 119.3072364
+489.7094017 , 3861 , 124.1334864
+489.7094017 , 4054.05 , 128.9597364
+489.7094017 , 4247.1 , 133.7859864
+489.7094017 , 4440.15 , 138.6122364
+489.7094017 , 4633.2 , 143.4384864
+489.7094017 , 4826.25 , 148.2647364
+489.7094017 , 5019.3 , 153.0909864
+489.7094017 , 5212.35 , 157.9172364
+489.7094017 , 5405.4 , 162.7434864
+489.7094017 , 5598.45 , 167.5697364
+489.7094017 , 5791.5 , 172.3959864
+489.7094017 , 5984.55 , 177.2222364
+489.7094017 , 6177.6 , 182.0484864
+816.1794872 , -6177.6 , 120.7811088
+816.1794872 , -5984.55 , 115.9548588
+816.1794872 , -5791.5 , 111.1286088
+816.1794872 , -5598.45 , 106.3023588
+816.1794872 , -5405.4 , 101.4761088
+816.1794872 , -5212.35 , 96.6498588
+816.1794872 , -5019.3 , 91.8236088
+816.1794872 , -4826.25 , 86.9973588
+816.1794872 , -4633.2 , 82.1711088
+816.1794872 , -4440.15 , 77.3448588
+816.1794872 , -4247.1 , 72.5186088
+816.1794872 , -4054.05 , 67.6923588
+816.1794872 , -3861 , 62.8661088
+816.1794872 , -3667.95 , 58.0398588
+816.1794872 , -3474.9 , 53.2136088
+816.1794872 , -3281.85 , 48.3873588
+816.1794872 , -3088.8 , 43.5611088
+816.1794872 , -2895.75 , 38.7348588
+816.1794872 , -2702.7 , 33.9086088
+816.1794872 , -2509.65 , 29.0823588
+816.1794872 , -2316.6 , 24.2561088
+816.1794872 , -2123.55 , 19.4298588
+816.1794872 , -1930.5 , 14.6036088
+816.1794872 , -1737.45 , 9.7773588
+816.1794872 , -1544.4 , 4.9511088
+816.1794872 , -1351.35 , 0.1248588
+816.1794872 , -1158.3 , 4.7013912
+816.1794872 , -965.25 , 9.5276412
+816.1794872 , -772.2 , 14.3538912
+816.1794872 , -579.15 , 19.1801412
+816.1794872 , -386.1 , 24.0063912
+816.1794872 , -193.05 , 28.8326412
+816.1794872 , 0 , 33.6588912
+816.1794872 , 193.05 , 38.4851412
+816.1794872 , 386.1 , 43.3113912
+816.1794872 , 579.15 , 48.1376412
+816.1794872 , 772.2 , 52.9638912
+816.1794872 , 965.25 , 57.7901412
+816.1794872 , 1158.3 , 62.6163912
+816.1794872 , 1351.35 , 67.4426412
+816.1794872 , 1544.4 , 72.2688912
+816.1794872 , 1737.45 , 77.0951412
+816.1794872 , 1930.5 , 81.9213912
+816.1794872 , 2123.55 , 86.7476412
+816.1794872 , 2316.6 , 91.5738912
+816.1794872 , 2509.65 , 96.4001412
+816.1794872 , 2702.7 , 101.2263912
+816.1794872 , 2895.75 , 106.0526412
+816.1794872 , 3088.8 , 110.8788912
+816.1794872 , 3281.85 , 115.7051412
+816.1794872 , 3474.9 , 120.5313912
+816.1794872 , 3667.95 , 125.3576412
+816.1794872 , 3861 , 130.1838912
+816.1794872 , 4054.05 , 135.0101412
+816.1794872 , 4247.1 , 139.8363912
+816.1794872 , 4440.15 , 144.6626412
+816.1794872 , 4633.2 , 149.4888912
+816.1794872 , 4826.25 , 154.3151412
+816.1794872 , 5019.3 , 159.1413912
+816.1794872 , 5212.35 , 163.9676412
+816.1794872 , 5405.4 , 168.7938912
+816.1794872 , 5598.45 , 173.6201412
+816.1794872 , 5791.5 , 178.4463912
+816.1794872 , 5984.55 , 183.2726412
+816.1794872 , 6177.6 , 188.0988912
+1020.25641 , -6177.6 , 116.998992
+1020.25641 , -5984.55 , 112.172742
+1020.25641 , -5791.5 , 107.346492
+1020.25641 , -5598.45 , 102.520242
+1020.25641 , -5405.4 , 97.693992
+1020.25641 , -5212.35 , 92.867742
+1020.25641 , -5019.3 , 88.041492
+1020.25641 , -4826.25 , 83.215242
+1020.25641 , -4633.2 , 78.388992
+1020.25641 , -4440.15 , 73.562742
+1020.25641 , -4247.1 , 68.736492
+1020.25641 , -4054.05 , 63.910242
+1020.25641 , -3861 , 59.083992
+1020.25641 , -3667.95 , 54.257742
+1020.25641 , -3474.9 , 49.431492
+1020.25641 , -3281.85 , 44.605242
+1020.25641 , -3088.8 , 39.778992
+1020.25641 , -2895.75 , 34.952742
+1020.25641 , -2702.7 , 30.126492
+1020.25641 , -2509.65 , 25.300242
+1020.25641 , -2316.6 , 20.473992
+1020.25641 , -2123.55 , 15.647742
+1020.25641 , -1930.5 , 10.821492
+1020.25641 , -1737.45 , 5.995242005
+1020.25641 , -1544.4 , 1.168992005
+1020.25641 , -1351.35 , 3.657257995
+1020.25641 , -1158.3 , 8.483507995
+1020.25641 , -965.25 , 13.309758
+1020.25641 , -772.2 , 18.136008
+1020.25641 , -579.15 , 22.962258
+1020.25641 , -386.1 , 27.788508
+1020.25641 , -193.05 , 32.614758
+1020.25641 , 0 , 37.441008
+1020.25641 , 193.05 , 42.267258
+1020.25641 , 386.1 , 47.093508
+1020.25641 , 579.15 , 51.919758
+1020.25641 , 772.2 , 56.746008
+1020.25641 , 965.25 , 61.572258
+1020.25641 , 1158.3 , 66.398508
+1020.25641 , 1351.35 , 71.224758
+1020.25641 , 1544.4 , 76.051008
+1020.25641 , 1737.45 , 80.877258
+1020.25641 , 1930.5 , 85.703508
+1020.25641 , 2123.55 , 90.529758
+1020.25641 , 2316.6 , 95.356008
+1020.25641 , 2509.65 , 100.182258
+1020.25641 , 2702.7 , 105.008508
+1020.25641 , 2895.75 , 109.834758
+1020.25641 , 3088.8 , 114.661008
+1020.25641 , 3281.85 , 119.487258
+1020.25641 , 3474.9 , 124.313508
+1020.25641 , 3667.95 , 129.139758
+1020.25641 , 3861 , 133.966008
+1020.25641 , 4054.05 , 138.792258
+1020.25641 , 4247.1 , 143.618508
+1020.25641 , 4440.15 , 148.444758
+1020.25641 , 4633.2 , 153.271008
+1020.25641 , 4826.25 , 158.097258
+1020.25641 , 5019.3 , 162.923508
+1020.25641 , 5212.35 , 167.749758
+1020.25641 , 5405.4 , 172.576008
+1020.25641 , 5598.45 , 177.402258
+1020.25641 , 5791.5 , 182.228508
+1020.25641 , 5984.55 , 187.054758
+1020.25641 , 6177.6 , 191.881008
+1224.273504 , -6177.6 , 113.217984
+1224.273504 , -5984.55 , 108.391734
+1224.273504 , -5791.5 , 103.565484
+1224.273504 , -5598.45 , 98.73923401
+1224.273504 , -5405.4 , 93.91298401
+1224.273504 , -5212.35 , 89.08673401
+1224.273504 , -5019.3 , 84.26048401
+1224.273504 , -4826.25 , 79.43423401
+1224.273504 , -4633.2 , 74.60798401
+1224.273504 , -4440.15 , 69.78173401
+1224.273504 , -4247.1 , 64.95548401
+1224.273504 , -4054.05 , 60.12923401
+1224.273504 , -3861 , 55.30298401
+1224.273504 , -3667.95 , 50.47673401
+1224.273504 , -3474.9 , 45.65048401
+1224.273504 , -3281.85 , 40.82423401
+1224.273504 , -3088.8 , 35.99798401
+1224.273504 , -2895.75 , 31.17173401
+1224.273504 , -2702.7 , 26.34548401
+1224.273504 , -2509.65 , 21.51923401
+1224.273504 , -2316.6 , 16.69298401
+1224.273504 , -2123.55 , 11.86673401
+1224.273504 , -1930.5 , 7.040484005
+1224.273504 , -1737.45 , 2.214234005
+1224.273504 , -1544.4 , 2.612015995
+1224.273504 , -1351.35 , 7.438265995
+1224.273504 , -1158.3 , 12.26451599
+1224.273504 , -965.25 , 17.09076599
+1224.273504 , -772.2 , 21.91701599
+1224.273504 , -579.15 , 26.74326599
+1224.273504 , -386.1 , 31.56951599
+1224.273504 , -193.05 , 36.39576599
+1224.273504 , 0 , 41.22201599
+1224.273504 , 193.05 , 46.04826599
+1224.273504 , 386.1 , 50.87451599
+1224.273504 , 579.15 , 55.70076599
+1224.273504 , 772.2 , 60.52701599
+1224.273504 , 965.25 , 65.35326599
+1224.273504 , 1158.3 , 70.17951599
+1224.273504 , 1351.35 , 75.00576599
+1224.273504 , 1544.4 , 79.83201599
+1224.273504 , 1737.45 , 84.65826599
+1224.273504 , 1930.5 , 89.48451599
+1224.273504 , 2123.55 , 94.31076599
+1224.273504 , 2316.6 , 99.13701599
+1224.273504 , 2509.65 , 103.963266
+1224.273504 , 2702.7 , 108.789516
+1224.273504 , 2895.75 , 113.615766
+1224.273504 , 3088.8 , 118.442016
+1224.273504 , 3281.85 , 123.268266
+1224.273504 , 3474.9 , 128.094516
+1224.273504 , 3667.95 , 132.920766
+1224.273504 , 3861 , 137.747016
+1224.273504 , 4054.05 , 142.573266
+1224.273504 , 4247.1 , 147.399516
+1224.273504 , 4440.15 , 152.225766
+1224.273504 , 4633.2 , 157.052016
+1224.273504 , 4826.25 , 161.878266
+1224.273504 , 5019.3 , 166.704516
+1224.273504 , 5212.35 , 171.530766
+1224.273504 , 5405.4 , 176.357016
+1224.273504 , 5598.45 , 181.183266
+1224.273504 , 5791.5 , 186.009516
+1224.273504 , 5984.55 , 190.835766
+1224.273504 , 6177.6 , 195.662016
+1428.290598 , -6177.6 , 109.436976
+1428.290598 , -5984.55 , 104.610726
+1428.290598 , -5791.5 , 99.78447601
+1428.290598 , -5598.45 , 94.95822601
+1428.290598 , -5405.4 , 90.13197601
+1428.290598 , -5212.35 , 85.30572601
+1428.290598 , -5019.3 , 80.47947601
+1428.290598 , -4826.25 , 75.65322601
+1428.290598 , -4633.2 , 70.82697601
+1428.290598 , -4440.15 , 66.00072601
+1428.290598 , -4247.1 , 61.17447601
+1428.290598 , -4054.05 , 56.34822601
+1428.290598 , -3861 , 51.52197601
+1428.290598 , -3667.95 , 46.69572601
+1428.290598 , -3474.9 , 41.86947601
+1428.290598 , -3281.85 , 37.04322601
+1428.290598 , -3088.8 , 32.21697601
+1428.290598 , -2895.75 , 27.39072601
+1428.290598 , -2702.7 , 22.56447601
+1428.290598 , -2509.65 , 17.73822601
+1428.290598 , -2316.6 , 12.91197601
+1428.290598 , -2123.55 , 8.085726005
+1428.290598 , -1930.5 , 3.259476005
+1428.290598 , -1737.45 , 1.566773995
+1428.290598 , -1544.4 , 6.393023995
+1428.290598 , -1351.35 , 11.21927399
+1428.290598 , -1158.3 , 16.04552399
+1428.290598 , -965.25 , 20.87177399
+1428.290598 , -772.2 , 25.69802399
+1428.290598 , -579.15 , 30.52427399
+1428.290598 , -386.1 , 35.35052399
+1428.290598 , -193.05 , 40.17677399
+1428.290598 , 0 , 45.00302399
+1428.290598 , 193.05 , 49.82927399
+1428.290598 , 386.1 , 54.65552399
+1428.290598 , 579.15 , 59.48177399
+1428.290598 , 772.2 , 64.30802399
+1428.290598 , 965.25 , 69.13427399
+1428.290598 , 1158.3 , 73.96052399
+1428.290598 , 1351.35 , 78.78677399
+1428.290598 , 1544.4 , 83.61302399
+1428.290598 , 1737.45 , 88.43927399
+1428.290598 , 1930.5 , 93.26552399
+1428.290598 , 2123.55 , 98.09177399
+1428.290598 , 2316.6 , 102.918024
+1428.290598 , 2509.65 , 107.744274
+1428.290598 , 2702.7 , 112.570524
+1428.290598 , 2895.75 , 117.396774
+1428.290598 , 3088.8 , 122.223024
+1428.290598 , 3281.85 , 127.049274
+1428.290598 , 3474.9 , 131.875524
+1428.290598 , 3667.95 , 136.701774
+1428.290598 , 3861 , 141.528024
+1428.290598 , 4054.05 , 146.354274
+1428.290598 , 4247.1 , 151.180524
+1428.290598 , 4440.15 , 156.006774
+1428.290598 , 4633.2 , 160.833024
+1428.290598 , 4826.25 , 165.659274
+1428.290598 , 5019.3 , 170.485524
+1428.290598 , 5212.35 , 175.311774
+1428.290598 , 5405.4 , 180.138024
+1428.290598 , 5598.45 , 184.964274
+1428.290598 , 5791.5 , 189.790524
+1428.290598 , 5984.55 , 194.616774
+1428.290598 , 6177.6 , 199.443024
+1632.393162 , -6177.6 , 105.654384
+1632.393162 , -5984.55 , 100.828134
+1632.393162 , -5791.5 , 96.00188401
+1632.393162 , -5598.45 , 91.17563401
+1632.393162 , -5405.4 , 86.34938401
+1632.393162 , -5212.35 , 81.52313401
+1632.393162 , -5019.3 , 76.69688401
+1632.393162 , -4826.25 , 71.87063401
+1632.393162 , -4633.2 , 67.04438401
+1632.393162 , -4440.15 , 62.21813401
+1632.393162 , -4247.1 , 57.39188401
+1632.393162 , -4054.05 , 52.56563401
+1632.393162 , -3861 , 47.73938401
+1632.393162 , -3667.95 , 42.91313401
+1632.393162 , -3474.9 , 38.08688401
+1632.393162 , -3281.85 , 33.26063401
+1632.393162 , -3088.8 , 28.43438401
+1632.393162 , -2895.75 , 23.60813401
+1632.393162 , -2702.7 , 18.78188401
+1632.393162 , -2509.65 , 13.95563401
+1632.393162 , -2316.6 , 9.129384007
+1632.393162 , -2123.55 , 4.303134007
+1632.393162 , -1930.5 , 0.523115993
+1632.393162 , -1737.45 , 5.349365993
+1632.393162 , -1544.4 , 10.17561599
+1632.393162 , -1351.35 , 15.00186599
+1632.393162 , -1158.3 , 19.82811599
+1632.393162 , -965.25 , 24.65436599
+1632.393162 , -772.2 , 29.48061599
+1632.393162 , -579.15 , 34.30686599
+1632.393162 , -386.1 , 39.13311599
+1632.393162 , -193.05 , 43.95936599
+1632.393162 , 0 , 48.78561599
+1632.393162 , 193.05 , 53.61186599
+1632.393162 , 386.1 , 58.43811599
+1632.393162 , 579.15 , 63.26436599
+1632.393162 , 772.2 , 68.09061599
+1632.393162 , 965.25 , 72.91686599
+1632.393162 , 1158.3 , 77.74311599
+1632.393162 , 1351.35 , 82.56936599
+1632.393162 , 1544.4 , 87.39561599
+1632.393162 , 1737.45 , 92.22186599
+1632.393162 , 1930.5 , 97.04811599
+1632.393162 , 2123.55 , 101.874366
+1632.393162 , 2316.6 , 106.700616
+1632.393162 , 2509.65 , 111.526866
+1632.393162 , 2702.7 , 116.353116
+1632.393162 , 2895.75 , 121.179366
+1632.393162 , 3088.8 , 126.005616
+1632.393162 , 3281.85 , 130.831866
+1632.393162 , 3474.9 , 135.658116
+1632.393162 , 3667.95 , 140.484366
+1632.393162 , 3861 , 145.310616
+1632.393162 , 4054.05 , 150.136866
+1632.393162 , 4247.1 , 154.963116
+1632.393162 , 4440.15 , 159.789366
+1632.393162 , 4633.2 , 164.615616
+1632.393162 , 4826.25 , 169.441866
+1632.393162 , 5019.3 , 174.268116
+1632.393162 , 5212.35 , 179.094366
+1632.393162 , 5405.4 , 183.920616
+1632.393162 , 5598.45 , 188.746866
+1632.393162 , 5791.5 , 193.573116
+1632.393162 , 5984.55 , 198.399366
+1632.393162 , 6177.6 , 203.225616
+1836.410256 , -6177.6 , 101.873376
+1836.410256 , -5984.55 , 97.04712601
+1836.410256 , -5791.5 , 92.22087601
+1836.410256 , -5598.45 , 87.39462601
+1836.410256 , -5405.4 , 82.56837601
+1836.410256 , -5212.35 , 77.74212601
+1836.410256 , -5019.3 , 72.91587601
+1836.410256 , -4826.25 , 68.08962601
+1836.410256 , -4633.2 , 63.26337601
+1836.410256 , -4440.15 , 58.43712601
+1836.410256 , -4247.1 , 53.61087601
+1836.410256 , -4054.05 , 48.78462601
+1836.410256 , -3861 , 43.95837601
+1836.410256 , -3667.95 , 39.13212601
+1836.410256 , -3474.9 , 34.30587601
+1836.410256 , -3281.85 , 29.47962601
+1836.410256 , -3088.8 , 24.65337601
+1836.410256 , -2895.75 , 19.82712601
+1836.410256 , -2702.7 , 15.00087601
+1836.410256 , -2509.65 , 10.17462601
+1836.410256 , -2316.6 , 5.348376008
+1836.410256 , -2123.55 , 0.522126008
+1836.410256 , -1930.5 , 4.304123992
+1836.410256 , -1737.45 , 9.130373992
+1836.410256 , -1544.4 , 13.95662399
+1836.410256 , -1351.35 , 18.78287399
+1836.410256 , -1158.3 , 23.60912399
+1836.410256 , -965.25 , 28.43537399
+1836.410256 , -772.2 , 33.26162399
+1836.410256 , -579.15 , 38.08787399
+1836.410256 , -386.1 , 42.91412399
+1836.410256 , -193.05 , 47.74037399
+1836.410256 , 0 , 52.56662399
+1836.410256 , 193.05 , 57.39287399
+1836.410256 , 386.1 , 62.21912399
+1836.410256 , 579.15 , 67.04537399
+1836.410256 , 772.2 , 71.87162399
+1836.410256 , 965.25 , 76.69787399
+1836.410256 , 1158.3 , 81.52412399
+1836.410256 , 1351.35 , 86.35037399
+1836.410256 , 1544.4 , 91.17662399
+1836.410256 , 1737.45 , 96.00287399
+1836.410256 , 1930.5 , 100.829124
+1836.410256 , 2123.55 , 105.655374
+1836.410256 , 2316.6 , 110.481624
+1836.410256 , 2509.65 , 115.307874
+1836.410256 , 2702.7 , 120.134124
+1836.410256 , 2895.75 , 124.960374
+1836.410256 , 3088.8 , 129.786624
+1836.410256 , 3281.85 , 134.612874
+1836.410256 , 3474.9 , 139.439124
+1836.410256 , 3667.95 , 144.265374
+1836.410256 , 3861 , 149.091624
+1836.410256 , 4054.05 , 153.917874
+1836.410256 , 4247.1 , 158.744124
+1836.410256 , 4440.15 , 163.570374
+1836.410256 , 4633.2 , 168.396624
+1836.410256 , 4826.25 , 173.222874
+1836.410256 , 5019.3 , 178.049124
+1836.410256 , 5212.35 , 182.875374
+1836.410256 , 5405.4 , 187.701624
+1836.410256 , 5598.45 , 192.527874
+1836.410256 , 5791.5 , 197.354124
+1836.410256 , 5984.55 , 202.180374
+1836.410256 , 6177.6 , 207.006624
+2040.42735 , -6177.6 , 98.09236801
+2040.42735 , -5984.55 , 93.26611801
+2040.42735 , -5791.5 , 88.43986801
+2040.42735 , -5598.45 , 83.61361801
+2040.42735 , -5405.4 , 78.78736801
+2040.42735 , -5212.35 , 73.96111801
+2040.42735 , -5019.3 , 69.13486801
+2040.42735 , -4826.25 , 64.30861801
+2040.42735 , -4633.2 , 59.48236801
+2040.42735 , -4440.15 , 54.65611801
+2040.42735 , -4247.1 , 49.82986801
+2040.42735 , -4054.05 , 45.00361801
+2040.42735 , -3861 , 40.17736801
+2040.42735 , -3667.95 , 35.35111801
+2040.42735 , -3474.9 , 30.52486801
+2040.42735 , -3281.85 , 25.69861801
+2040.42735 , -3088.8 , 20.87236801
+2040.42735 , -2895.75 , 16.04611801
+2040.42735 , -2702.7 , 11.21986801
+2040.42735 , -2509.65 , 6.393618008
+2040.42735 , -2316.6 , 1.567368008
+2040.42735 , -2123.55 , 3.258881992
+2040.42735 , -1930.5 , 8.085131992
+2040.42735 , -1737.45 , 12.91138199
+2040.42735 , -1544.4 , 17.73763199
+2040.42735 , -1351.35 , 22.56388199
+2040.42735 , -1158.3 , 27.39013199
+2040.42735 , -965.25 , 32.21638199
+2040.42735 , -772.2 , 37.04263199
+2040.42735 , -579.15 , 41.86888199
+2040.42735 , -386.1 , 46.69513199
+2040.42735 , -193.05 , 51.52138199
+2040.42735 , 0 , 56.34763199
+2040.42735 , 193.05 , 61.17388199
+2040.42735 , 386.1 , 66.00013199
+2040.42735 , 579.15 , 70.82638199
+2040.42735 , 772.2 , 75.65263199
+2040.42735 , 965.25 , 80.47888199
+2040.42735 , 1158.3 , 85.30513199
+2040.42735 , 1351.35 , 90.13138199
+2040.42735 , 1544.4 , 94.95763199
+2040.42735 , 1737.45 , 99.78388199
+2040.42735 , 1930.5 , 104.610132
+2040.42735 , 2123.55 , 109.436382
+2040.42735 , 2316.6 , 114.262632
+2040.42735 , 2509.65 , 119.088882
+2040.42735 , 2702.7 , 123.915132
+2040.42735 , 2895.75 , 128.741382
+2040.42735 , 3088.8 , 133.567632
+2040.42735 , 3281.85 , 138.393882
+2040.42735 , 3474.9 , 143.220132
+2040.42735 , 3667.95 , 148.046382
+2040.42735 , 3861 , 152.872632
+2040.42735 , 4054.05 , 157.698882
+2040.42735 , 4247.1 , 162.525132
+2040.42735 , 4440.15 , 167.351382
+2040.42735 , 4633.2 , 172.177632
+2040.42735 , 4826.25 , 177.003882
+2040.42735 , 5019.3 , 181.830132
+2040.42735 , 5212.35 , 186.656382
+2040.42735 , 5405.4 , 191.482632
+2040.42735 , 5598.45 , 196.308882
+2040.42735 , 5791.5 , 201.135132
+2040.42735 , 5984.55 , 205.961382
+2040.42735 , 6177.6 , 210.787632
+2244.529915 , -6177.6 , 94.30977599
+2244.529915 , -5984.55 , 89.48352599
+2244.529915 , -5791.5 , 84.65727599
+2244.529915 , -5598.45 , 79.83102599
+2244.529915 , -5405.4 , 75.00477599
+2244.529915 , -5212.35 , 70.17852599
+2244.529915 , -5019.3 , 65.35227599
+2244.529915 , -4826.25 , 60.52602599
+2244.529915 , -4633.2 , 55.69977599
+2244.529915 , -4440.15 , 50.87352599
+2244.529915 , -4247.1 , 46.04727599
+2244.529915 , -4054.05 , 41.22102599
+2244.529915 , -3861 , 36.39477599
+2244.529915 , -3667.95 , 31.56852599
+2244.529915 , -3474.9 , 26.74227599
+2244.529915 , -3281.85 , 21.91602599
+2244.529915 , -3088.8 , 17.08977599
+2244.529915 , -2895.75 , 12.26352599
+2244.529915 , -2702.7 , 7.437275991
+2244.529915 , -2509.65 , 2.611025991
+2244.529915 , -2316.6 , 2.215224009
+2244.529915 , -2123.55 , 7.041474009
+2244.529915 , -1930.5 , 11.86772401
+2244.529915 , -1737.45 , 16.69397401
+2244.529915 , -1544.4 , 21.52022401
+2244.529915 , -1351.35 , 26.34647401
+2244.529915 , -1158.3 , 31.17272401
+2244.529915 , -965.25 , 35.99897401
+2244.529915 , -772.2 , 40.82522401
+2244.529915 , -579.15 , 45.65147401
+2244.529915 , -386.1 , 50.47772401
+2244.529915 , -193.05 , 55.30397401
+2244.529915 , 0 , 60.13022401
+2244.529915 , 193.05 , 64.95647401
+2244.529915 , 386.1 , 69.78272401
+2244.529915 , 579.15 , 74.60897401
+2244.529915 , 772.2 , 79.43522401
+2244.529915 , 965.25 , 84.26147401
+2244.529915 , 1158.3 , 89.08772401
+2244.529915 , 1351.35 , 93.91397401
+2244.529915 , 1544.4 , 98.74022401
+2244.529915 , 1737.45 , 103.566474
+2244.529915 , 1930.5 , 108.392724
+2244.529915 , 2123.55 , 113.218974
+2244.529915 , 2316.6 , 118.045224
+2244.529915 , 2509.65 , 122.871474
+2244.529915 , 2702.7 , 127.697724
+2244.529915 , 2895.75 , 132.523974
+2244.529915 , 3088.8 , 137.350224
+2244.529915 , 3281.85 , 142.176474
+2244.529915 , 3474.9 , 147.002724
+2244.529915 , 3667.95 , 151.828974
+2244.529915 , 3861 , 156.655224
+2244.529915 , 4054.05 , 161.481474
+2244.529915 , 4247.1 , 166.307724
+2244.529915 , 4440.15 , 171.133974
+2244.529915 , 4633.2 , 175.960224
+2244.529915 , 4826.25 , 180.786474
+2244.529915 , 5019.3 , 185.612724
+2244.529915 , 5212.35 , 190.438974
+2244.529915 , 5405.4 , 195.265224
+2244.529915 , 5598.45 , 200.091474
+2244.529915 , 5791.5 , 204.917724
+2244.529915 , 5984.55 , 209.743974
+2244.529915 , 6177.6 , 214.570224
+2448.547009 , -6177.6 , 90.52876799
+2448.547009 , -5984.55 , 85.70251799
+2448.547009 , -5791.5 , 80.87626799
+2448.547009 , -5598.45 , 76.05001799
+2448.547009 , -5405.4 , 71.22376799
+2448.547009 , -5212.35 , 66.39751799
+2448.547009 , -5019.3 , 61.57126799
+2448.547009 , -4826.25 , 56.74501799
+2448.547009 , -4633.2 , 51.91876799
+2448.547009 , -4440.15 , 47.09251799
+2448.547009 , -4247.1 , 42.26626799
+2448.547009 , -4054.05 , 37.44001799
+2448.547009 , -3861 , 32.61376799
+2448.547009 , -3667.95 , 27.78751799
+2448.547009 , -3474.9 , 22.96126799
+2448.547009 , -3281.85 , 18.13501799
+2448.547009 , -3088.8 , 13.30876799
+2448.547009 , -2895.75 , 8.482517992
+2448.547009 , -2702.7 , 3.656267992
+2448.547009 , -2509.65 , 1.169982008
+2448.547009 , -2316.6 , 5.996232008
+2448.547009 , -2123.55 , 10.82248201
+2448.547009 , -1930.5 , 15.64873201
+2448.547009 , -1737.45 , 20.47498201
+2448.547009 , -1544.4 , 25.30123201
+2448.547009 , -1351.35 , 30.12748201
+2448.547009 , -1158.3 , 34.95373201
+2448.547009 , -965.25 , 39.77998201
+2448.547009 , -772.2 , 44.60623201
+2448.547009 , -579.15 , 49.43248201
+2448.547009 , -386.1 , 54.25873201
+2448.547009 , -193.05 , 59.08498201
+2448.547009 , 0 , 63.91123201
+2448.547009 , 193.05 , 68.73748201
+2448.547009 , 386.1 , 73.56373201
+2448.547009 , 579.15 , 78.38998201
+2448.547009 , 772.2 , 83.21623201
+2448.547009 , 965.25 , 88.04248201
+2448.547009 , 1158.3 , 92.86873201
+2448.547009 , 1351.35 , 97.69498201
+2448.547009 , 1544.4 , 102.521232
+2448.547009 , 1737.45 , 107.347482
+2448.547009 , 1930.5 , 112.173732
+2448.547009 , 2123.55 , 116.999982
+2448.547009 , 2316.6 , 121.826232
+2448.547009 , 2509.65 , 126.652482
+2448.547009 , 2702.7 , 131.478732
+2448.547009 , 2895.75 , 136.304982
+2448.547009 , 3088.8 , 141.131232
+2448.547009 , 3281.85 , 145.957482
+2448.547009 , 3474.9 , 150.783732
+2448.547009 , 3667.95 , 155.609982
+2448.547009 , 3861 , 160.436232
+2448.547009 , 4054.05 , 165.262482
+2448.547009 , 4247.1 , 170.088732
+2448.547009 , 4440.15 , 174.914982
+2448.547009 , 4633.2 , 179.741232
+2448.547009 , 4826.25 , 184.567482
+2448.547009 , 5019.3 , 189.393732
+2448.547009 , 5212.35 , 194.219982
+2448.547009 , 5405.4 , 199.046232
+2448.547009 , 5598.45 , 203.872482
+2448.547009 , 5791.5 , 208.698732
+2448.547009 , 5984.55 , 213.524982
+2448.547009 , 6177.6 , 218.351232
+2652.564103 , -6177.6 , 86.74775999
+2652.564103 , -5984.55 , 81.92150999
+2652.564103 , -5791.5 , 77.09525999
+2652.564103 , -5598.45 , 72.26900999
+2652.564103 , -5405.4 , 67.44275999
+2652.564103 , -5212.35 , 62.61650999
+2652.564103 , -5019.3 , 57.79025999
+2652.564103 , -4826.25 , 52.96400999
+2652.564103 , -4633.2 , 48.13775999
+2652.564103 , -4440.15 , 43.31150999
+2652.564103 , -4247.1 , 38.48525999
+2652.564103 , -4054.05 , 33.65900999
+2652.564103 , -3861 , 28.83275999
+2652.564103 , -3667.95 , 24.00650999
+2652.564103 , -3474.9 , 19.18025999
+2652.564103 , -3281.85 , 14.35400999
+2652.564103 , -3088.8 , 9.527759992
+2652.564103 , -2895.75 , 4.701509992
+2652.564103 , -2702.7 , 0.124740008
+2652.564103 , -2509.65 , 4.950990008
+2652.564103 , -2316.6 , 9.777240008
+2652.564103 , -2123.55 , 14.60349001
+2652.564103 , -1930.5 , 19.42974001
+2652.564103 , -1737.45 , 24.25599001
+2652.564103 , -1544.4 , 29.08224001
+2652.564103 , -1351.35 , 33.90849001
+2652.564103 , -1158.3 , 38.73474001
+2652.564103 , -965.25 , 43.56099001
+2652.564103 , -772.2 , 48.38724001
+2652.564103 , -579.15 , 53.21349001
+2652.564103 , -386.1 , 58.03974001
+2652.564103 , -193.05 , 62.86599001
+2652.564103 , 0 , 67.69224001
+2652.564103 , 193.05 , 72.51849001
+2652.564103 , 386.1 , 77.34474001
+2652.564103 , 579.15 , 82.17099001
+2652.564103 , 772.2 , 86.99724001
+2652.564103 , 965.25 , 91.82349001
+2652.564103 , 1158.3 , 96.64974001
+2652.564103 , 1351.35 , 101.47599
+2652.564103 , 1544.4 , 106.30224
+2652.564103 , 1737.45 , 111.12849
+2652.564103 , 1930.5 , 115.95474
+2652.564103 , 2123.55 , 120.78099
+2652.564103 , 2316.6 , 125.60724
+2652.564103 , 2509.65 , 130.43349
+2652.564103 , 2702.7 , 135.25974
+2652.564103 , 2895.75 , 140.08599
+2652.564103 , 3088.8 , 144.91224
+2652.564103 , 3281.85 , 149.73849
+2652.564103 , 3474.9 , 154.56474
+2652.564103 , 3667.95 , 159.39099
+2652.564103 , 3861 , 164.21724
+2652.564103 , 4054.05 , 169.04349
+2652.564103 , 4247.1 , 173.86974
+2652.564103 , 4440.15 , 178.69599
+2652.564103 , 4633.2 , 183.52224
+2652.564103 , 4826.25 , 188.34849
+2652.564103 , 5019.3 , 193.17474
+2652.564103 , 5212.35 , 198.00099
+2652.564103 , 5405.4 , 202.82724
+2652.564103 , 5598.45 , 207.65349
+2652.564103 , 5791.5 , 212.47974
+2652.564103 , 5984.55 , 217.30599
+2652.564103 , 6177.6 , 222.13224
+2856.666667 , -6177.6 , 82.96516799
+2856.666667 , -5984.55 , 78.13891799
+2856.666667 , -5791.5 , 73.31266799
+2856.666667 , -5598.45 , 68.48641799
+2856.666667 , -5405.4 , 63.66016799
+2856.666667 , -5212.35 , 58.83391799
+2856.666667 , -5019.3 , 54.00766799
+2856.666667 , -4826.25 , 49.18141799
+2856.666667 , -4633.2 , 44.35516799
+2856.666667 , -4440.15 , 39.52891799
+2856.666667 , -4247.1 , 34.70266799
+2856.666667 , -4054.05 , 29.87641799
+2856.666667 , -3861 , 25.05016799
+2856.666667 , -3667.95 , 20.22391799
+2856.666667 , -3474.9 , 15.39766799
+2856.666667 , -3281.85 , 10.57141799
+2856.666667 , -3088.8 , 5.745167994
+2856.666667 , -2895.75 , 0.918917994
+2856.666667 , -2702.7 , 3.907332006
+2856.666667 , -2509.65 , 8.733582006
+2856.666667 , -2316.6 , 13.55983201
+2856.666667 , -2123.55 , 18.38608201
+2856.666667 , -1930.5 , 23.21233201
+2856.666667 , -1737.45 , 28.03858201
+2856.666667 , -1544.4 , 32.86483201
+2856.666667 , -1351.35 , 37.69108201
+2856.666667 , -1158.3 , 42.51733201
+2856.666667 , -965.25 , 47.34358201
+2856.666667 , -772.2 , 52.16983201
+2856.666667 , -579.15 , 56.99608201
+2856.666667 , -386.1 , 61.82233201
+2856.666667 , -193.05 , 66.64858201
+2856.666667 , 0 , 71.47483201
+2856.666667 , 193.05 , 76.30108201
+2856.666667 , 386.1 , 81.12733201
+2856.666667 , 579.15 , 85.95358201
+2856.666667 , 772.2 , 90.77983201
+2856.666667 , 965.25 , 95.60608201
+2856.666667 , 1158.3 , 100.432332
+2856.666667 , 1351.35 , 105.258582
+2856.666667 , 1544.4 , 110.084832
+2856.666667 , 1737.45 , 114.911082
+2856.666667 , 1930.5 , 119.737332
+2856.666667 , 2123.55 , 124.563582
+2856.666667 , 2316.6 , 129.389832
+2856.666667 , 2509.65 , 134.216082
+2856.666667 , 2702.7 , 139.042332
+2856.666667 , 2895.75 , 143.868582
+2856.666667 , 3088.8 , 148.694832
+2856.666667 , 3281.85 , 153.521082
+2856.666667 , 3474.9 , 158.347332
+2856.666667 , 3667.95 , 163.173582
+2856.666667 , 3861 , 167.999832
+2856.666667 , 4054.05 , 172.826082
+2856.666667 , 4247.1 , 177.652332
+2856.666667 , 4440.15 , 182.478582
+2856.666667 , 4633.2 , 187.304832
+2856.666667 , 4826.25 , 192.131082
+2856.666667 , 5019.3 , 196.957332
+2856.666667 , 5212.35 , 201.783582
+2856.666667 , 5405.4 , 206.609832
+2856.666667 , 5598.45 , 211.436082
+2856.666667 , 5791.5 , 216.262332
+2856.666667 , 5984.55 , 221.088582
+2856.666667 , 6177.6 , 225.914832
+3060.683761 , -6177.6 , 79.18415999
+3060.683761 , -5984.55 , 74.35790999
+3060.683761 , -5791.5 , 69.53165999
+3060.683761 , -5598.45 , 64.70540999
+3060.683761 , -5405.4 , 59.87915999
+3060.683761 , -5212.35 , 55.05290999
+3060.683761 , -5019.3 , 50.22665999
+3060.683761 , -4826.25 , 45.40040999
+3060.683761 , -4633.2 , 40.57415999
+3060.683761 , -4440.15 , 35.74790999
+3060.683761 , -4247.1 , 30.92165999
+3060.683761 , -4054.05 , 26.09540999
+3060.683761 , -3861 , 21.26915999
+3060.683761 , -3667.95 , 16.44290999
+3060.683761 , -3474.9 , 11.61665999
+3060.683761 , -3281.85 , 6.790409994
+3060.683761 , -3088.8 , 1.964159994
+3060.683761 , -2895.75 , 2.862090006
+3060.683761 , -2702.7 , 7.688340006
+3060.683761 , -2509.65 , 12.51459001
+3060.683761 , -2316.6 , 17.34084001
+3060.683761 , -2123.55 , 22.16709001
+3060.683761 , -1930.5 , 26.99334001
+3060.683761 , -1737.45 , 31.81959001
+3060.683761 , -1544.4 , 36.64584001
+3060.683761 , -1351.35 , 41.47209001
+3060.683761 , -1158.3 , 46.29834001
+3060.683761 , -965.25 , 51.12459001
+3060.683761 , -772.2 , 55.95084001
+3060.683761 , -579.15 , 60.77709001
+3060.683761 , -386.1 , 65.60334001
+3060.683761 , -193.05 , 70.42959001
+3060.683761 , 0 , 75.25584001
+3060.683761 , 193.05 , 80.08209001
+3060.683761 , 386.1 , 84.90834001
+3060.683761 , 579.15 , 89.73459001
+3060.683761 , 772.2 , 94.56084001
+3060.683761 , 965.25 , 99.38709001
+3060.683761 , 1158.3 , 104.21334
+3060.683761 , 1351.35 , 109.03959
+3060.683761 , 1544.4 , 113.86584
+3060.683761 , 1737.45 , 118.69209
+3060.683761 , 1930.5 , 123.51834
+3060.683761 , 2123.55 , 128.34459
+3060.683761 , 2316.6 , 133.17084
+3060.683761 , 2509.65 , 137.99709
+3060.683761 , 2702.7 , 142.82334
+3060.683761 , 2895.75 , 147.64959
+3060.683761 , 3088.8 , 152.47584
+3060.683761 , 3281.85 , 157.30209
+3060.683761 , 3474.9 , 162.12834
+3060.683761 , 3667.95 , 166.95459
+3060.683761 , 3861 , 171.78084
+3060.683761 , 4054.05 , 176.60709
+3060.683761 , 4247.1 , 181.43334
+3060.683761 , 4440.15 , 186.25959
+3060.683761 , 4633.2 , 191.08584
+3060.683761 , 4826.25 , 195.91209
+3060.683761 , 5019.3 , 200.73834
+3060.683761 , 5212.35 , 205.56459
+3060.683761 , 5405.4 , 210.39084
+3060.683761 , 5598.45 , 215.21709
+3060.683761 , 5791.5 , 220.04334
+3060.683761 , 5984.55 , 224.86959
+3060.683761 , 6177.6 , 229.69584
+3264.700855 , -6177.6 , 75.40315199
+3264.700855 , -5984.55 , 70.57690199
+3264.700855 , -5791.5 , 65.75065199
+3264.700855 , -5598.45 , 60.92440199
+3264.700855 , -5405.4 , 56.09815199
+3264.700855 , -5212.35 , 51.27190199
+3264.700855 , -5019.3 , 46.44565199
+3264.700855 , -4826.25 , 41.61940199
+3264.700855 , -4633.2 , 36.79315199
+3264.700855 , -4440.15 , 31.96690199
+3264.700855 , -4247.1 , 27.14065199
+3264.700855 , -4054.05 , 22.31440199
+3264.700855 , -3861 , 17.48815199
+3264.700855 , -3667.95 , 12.66190199
+3264.700855 , -3474.9 , 7.835651994
+3264.700855 , -3281.85 , 3.009401994
+3264.700855 , -3088.8 , 1.816848006
+3264.700855 , -2895.75 , 6.643098006
+3264.700855 , -2702.7 , 11.46934801
+3264.700855 , -2509.65 , 16.29559801
+3264.700855 , -2316.6 , 21.12184801
+3264.700855 , -2123.55 , 25.94809801
+3264.700855 , -1930.5 , 30.77434801
+3264.700855 , -1737.45 , 35.60059801
+3264.700855 , -1544.4 , 40.42684801
+3264.700855 , -1351.35 , 45.25309801
+3264.700855 , -1158.3 , 50.07934801
+3264.700855 , -965.25 , 54.90559801
+3264.700855 , -772.2 , 59.73184801
+3264.700855 , -579.15 , 64.55809801
+3264.700855 , -386.1 , 69.38434801
+3264.700855 , -193.05 , 74.21059801
+3264.700855 , 0 , 79.03684801
+3264.700855 , 193.05 , 83.86309801
+3264.700855 , 386.1 , 88.68934801
+3264.700855 , 579.15 , 93.51559801
+3264.700855 , 772.2 , 98.34184801
+3264.700855 , 965.25 , 103.168098
+3264.700855 , 1158.3 , 107.994348
+3264.700855 , 1351.35 , 112.820598
+3264.700855 , 1544.4 , 117.646848
+3264.700855 , 1737.45 , 122.473098
+3264.700855 , 1930.5 , 127.299348
+3264.700855 , 2123.55 , 132.125598
+3264.700855 , 2316.6 , 136.951848
+3264.700855 , 2509.65 , 141.778098
+3264.700855 , 2702.7 , 146.604348
+3264.700855 , 2895.75 , 151.430598
+3264.700855 , 3088.8 , 156.256848
+3264.700855 , 3281.85 , 161.083098
+3264.700855 , 3474.9 , 165.909348
+3264.700855 , 3667.95 , 170.735598
+3264.700855 , 3861 , 175.561848
+3264.700855 , 4054.05 , 180.388098
+3264.700855 , 4247.1 , 185.214348
+3264.700855 , 4440.15 , 190.040598
+3264.700855 , 4633.2 , 194.866848
+3264.700855 , 4826.25 , 199.693098
+3264.700855 , 5019.3 , 204.519348
+3264.700855 , 5212.35 , 209.345598
+3264.700855 , 5405.4 , 214.171848
+3264.700855 , 5598.45 , 218.998098
+3264.700855 , 5791.5 , 223.824348
+3264.700855 , 5984.55 , 228.650598
+3264.700855 , 6177.6 , 233.476848
+3468.803419 , -6177.6 , 71.62056
+3468.803419 , -5984.55 , 66.79431
+3468.803419 , -5791.5 , 61.96806
+3468.803419 , -5598.45 , 57.14181
+3468.803419 , -5405.4 , 52.31556
+3468.803419 , -5212.35 , 47.48931
+3468.803419 , -5019.3 , 42.66306
+3468.803419 , -4826.25 , 37.83681
+3468.803419 , -4633.2 , 33.01056
+3468.803419 , -4440.15 , 28.18431
+3468.803419 , -4247.1 , 23.35806
+3468.803419 , -4054.05 , 18.53181
+3468.803419 , -3861 , 13.70556
+3468.803419 , -3667.95 , 8.879309996
+3468.803419 , -3474.9 , 4.053059996
+3468.803419 , -3281.85 , 0.773190004
+3468.803419 , -3088.8 , 5.599440004
+3468.803419 , -2895.75 , 10.42569
+3468.803419 , -2702.7 , 15.25194
+3468.803419 , -2509.65 , 20.07819
+3468.803419 , -2316.6 , 24.90444
+3468.803419 , -2123.55 , 29.73069
+3468.803419 , -1930.5 , 34.55694
+3468.803419 , -1737.45 , 39.38319
+3468.803419 , -1544.4 , 44.20944
+3468.803419 , -1351.35 , 49.03569
+3468.803419 , -1158.3 , 53.86194
+3468.803419 , -965.25 , 58.68819
+3468.803419 , -772.2 , 63.51444
+3468.803419 , -579.15 , 68.34069
+3468.803419 , -386.1 , 73.16694
+3468.803419 , -193.05 , 77.99319
+3468.803419 , 0 , 82.81944
+3468.803419 , 193.05 , 87.64569
+3468.803419 , 386.1 , 92.47194
+3468.803419 , 579.15 , 97.29819
+3468.803419 , 772.2 , 102.12444
+3468.803419 , 965.25 , 106.95069
+3468.803419 , 1158.3 , 111.77694
+3468.803419 , 1351.35 , 116.60319
+3468.803419 , 1544.4 , 121.42944
+3468.803419 , 1737.45 , 126.25569
+3468.803419 , 1930.5 , 131.08194
+3468.803419 , 2123.55 , 135.90819
+3468.803419 , 2316.6 , 140.73444
+3468.803419 , 2509.65 , 145.56069
+3468.803419 , 2702.7 , 150.38694
+3468.803419 , 2895.75 , 155.21319
+3468.803419 , 3088.8 , 160.03944
+3468.803419 , 3281.85 , 164.86569
+3468.803419 , 3474.9 , 169.69194
+3468.803419 , 3667.95 , 174.51819
+3468.803419 , 3861 , 179.34444
+3468.803419 , 4054.05 , 184.17069
+3468.803419 , 4247.1 , 188.99694
+3468.803419 , 4440.15 , 193.82319
+3468.803419 , 4633.2 , 198.64944
+3468.803419 , 4826.25 , 203.47569
+3468.803419 , 5019.3 , 208.30194
+3468.803419 , 5212.35 , 213.12819
+3468.803419 , 5405.4 , 217.95444
+3468.803419 , 5598.45 , 222.78069
+3468.803419 , 5791.5 , 227.60694
+3468.803419 , 5984.55 , 232.43319
+3468.803419 , 6177.6 , 237.25944
+3672.820513 , -6177.6 , 67.839552
+3672.820513 , -5984.55 , 63.013302
+3672.820513 , -5791.5 , 58.187052
+3672.820513 , -5598.45 , 53.360802
+3672.820513 , -5405.4 , 48.534552
+3672.820513 , -5212.35 , 43.708302
+3672.820513 , -5019.3 , 38.882052
+3672.820513 , -4826.25 , 34.055802
+3672.820513 , -4633.2 , 29.229552
+3672.820513 , -4440.15 , 24.403302
+3672.820513 , -4247.1 , 19.577052
+3672.820513 , -4054.05 , 14.750802
+3672.820513 , -3861 , 9.924551997
+3672.820513 , -3667.95 , 5.098301997
+3672.820513 , -3474.9 , 0.272051997
+3672.820513 , -3281.85 , 4.554198003
+3672.820513 , -3088.8 , 9.380448003
+3672.820513 , -2895.75 , 14.206698
+3672.820513 , -2702.7 , 19.032948
+3672.820513 , -2509.65 , 23.859198
+3672.820513 , -2316.6 , 28.685448
+3672.820513 , -2123.55 , 33.511698
+3672.820513 , -1930.5 , 38.337948
+3672.820513 , -1737.45 , 43.164198
+3672.820513 , -1544.4 , 47.990448
+3672.820513 , -1351.35 , 52.816698
+3672.820513 , -1158.3 , 57.642948
+3672.820513 , -965.25 , 62.469198
+3672.820513 , -772.2 , 67.295448
+3672.820513 , -579.15 , 72.121698
+3672.820513 , -386.1 , 76.947948
+3672.820513 , -193.05 , 81.774198
+3672.820513 , 0 , 86.600448
+3672.820513 , 193.05 , 91.426698
+3672.820513 , 386.1 , 96.252948
+3672.820513 , 579.15 , 101.079198
+3672.820513 , 772.2 , 105.905448
+3672.820513 , 965.25 , 110.731698
+3672.820513 , 1158.3 , 115.557948
+3672.820513 , 1351.35 , 120.384198
+3672.820513 , 1544.4 , 125.210448
+3672.820513 , 1737.45 , 130.036698
+3672.820513 , 1930.5 , 134.862948
+3672.820513 , 2123.55 , 139.689198
+3672.820513 , 2316.6 , 144.515448
+3672.820513 , 2509.65 , 149.341698
+3672.820513 , 2702.7 , 154.167948
+3672.820513 , 2895.75 , 158.994198
+3672.820513 , 3088.8 , 163.820448
+3672.820513 , 3281.85 , 168.646698
+3672.820513 , 3474.9 , 173.472948
+3672.820513 , 3667.95 , 178.299198
+3672.820513 , 3861 , 183.125448
+3672.820513 , 4054.05 , 187.951698
+3672.820513 , 4247.1 , 192.777948
+3672.820513 , 4440.15 , 197.604198
+3672.820513 , 4633.2 , 202.430448
+3672.820513 , 4826.25 , 207.256698
+3672.820513 , 5019.3 , 212.082948
+3672.820513 , 5212.35 , 216.909198
+3672.820513 , 5405.4 , 221.735448
+3672.820513 , 5598.45 , 226.561698
+3672.820513 , 5791.5 , 231.387948
+3672.820513 , 5984.55 , 236.214198
+3672.820513 , 6177.6 , 241.040448
+3876.837607 , -6177.6 , 64.058544
+3876.837607 , -5984.55 , 59.232294
+3876.837607 , -5791.5 , 54.406044
+3876.837607 , -5598.45 , 49.579794
+3876.837607 , -5405.4 , 44.753544
+3876.837607 , -5212.35 , 39.927294
+3876.837607 , -5019.3 , 35.101044
+3876.837607 , -4826.25 , 30.274794
+3876.837607 , -4633.2 , 25.448544
+3876.837607 , -4440.15 , 20.622294
+3876.837607 , -4247.1 , 15.796044
+3876.837607 , -4054.05 , 10.969794
+3876.837607 , -3861 , 6.143543997
+3876.837607 , -3667.95 , 1.317293997
+3876.837607 , -3474.9 , 3.508956003
+3876.837607 , -3281.85 , 8.335206003
+3876.837607 , -3088.8 , 13.161456
+3876.837607 , -2895.75 , 17.987706
+3876.837607 , -2702.7 , 22.813956
+3876.837607 , -2509.65 , 27.640206
+3876.837607 , -2316.6 , 32.466456
+3876.837607 , -2123.55 , 37.292706
+3876.837607 , -1930.5 , 42.118956
+3876.837607 , -1737.45 , 46.945206
+3876.837607 , -1544.4 , 51.771456
+3876.837607 , -1351.35 , 56.597706
+3876.837607 , -1158.3 , 61.423956
+3876.837607 , -965.25 , 66.250206
+3876.837607 , -772.2 , 71.076456
+3876.837607 , -579.15 , 75.902706
+3876.837607 , -386.1 , 80.728956
+3876.837607 , -193.05 , 85.555206
+3876.837607 , 0 , 90.381456
+3876.837607 , 193.05 , 95.207706
+3876.837607 , 386.1 , 100.033956
+3876.837607 , 579.15 , 104.860206
+3876.837607 , 772.2 , 109.686456
+3876.837607 , 965.25 , 114.512706
+3876.837607 , 1158.3 , 119.338956
+3876.837607 , 1351.35 , 124.165206
+3876.837607 , 1544.4 , 128.991456
+3876.837607 , 1737.45 , 133.817706
+3876.837607 , 1930.5 , 138.643956
+3876.837607 , 2123.55 , 143.470206
+3876.837607 , 2316.6 , 148.296456
+3876.837607 , 2509.65 , 153.122706
+3876.837607 , 2702.7 , 157.948956
+3876.837607 , 2895.75 , 162.775206
+3876.837607 , 3088.8 , 167.601456
+3876.837607 , 3281.85 , 172.427706
+3876.837607 , 3474.9 , 177.253956
+3876.837607 , 3667.95 , 182.080206
+3876.837607 , 3861 , 186.906456
+3876.837607 , 4054.05 , 191.732706
+3876.837607 , 4247.1 , 196.558956
+3876.837607 , 4440.15 , 201.385206
+3876.837607 , 4633.2 , 206.211456
+3876.837607 , 4826.25 , 211.037706
+3876.837607 , 5019.3 , 215.863956
+3876.837607 , 5212.35 , 220.690206
+3876.837607 , 5405.4 , 225.516456
+3876.837607 , 5598.45 , 230.342706
+3876.837607 , 5791.5 , 235.168956
+3876.837607 , 5984.55 , 239.995206
+3876.837607 , 6177.6 , 244.821456
+4080.854701 , -6177.6 , 60.277536
+4080.854701 , -5984.55 , 55.451286
+4080.854701 , -5791.5 , 50.625036
+4080.854701 , -5598.45 , 45.798786
+4080.854701 , -5405.4 , 40.972536
+4080.854701 , -5212.35 , 36.146286
+4080.854701 , -5019.3 , 31.320036
+4080.854701 , -4826.25 , 26.493786
+4080.854701 , -4633.2 , 21.667536
+4080.854701 , -4440.15 , 16.841286
+4080.854701 , -4247.1 , 12.015036
+4080.854701 , -4054.05 , 7.188785997
+4080.854701 , -3861 , 2.362535997
+4080.854701 , -3667.95 , 2.463714003
+4080.854701 , -3474.9 , 7.289964003
+4080.854701 , -3281.85 , 12.116214
+4080.854701 , -3088.8 , 16.942464
+4080.854701 , -2895.75 , 21.768714
+4080.854701 , -2702.7 , 26.594964
+4080.854701 , -2509.65 , 31.421214
+4080.854701 , -2316.6 , 36.247464
+4080.854701 , -2123.55 , 41.073714
+4080.854701 , -1930.5 , 45.899964
+4080.854701 , -1737.45 , 50.726214
+4080.854701 , -1544.4 , 55.552464
+4080.854701 , -1351.35 , 60.378714
+4080.854701 , -1158.3 , 65.204964
+4080.854701 , -965.25 , 70.031214
+4080.854701 , -772.2 , 74.857464
+4080.854701 , -579.15 , 79.683714
+4080.854701 , -386.1 , 84.509964
+4080.854701 , -193.05 , 89.336214
+4080.854701 , 0 , 94.162464
+4080.854701 , 193.05 , 98.988714
+4080.854701 , 386.1 , 103.814964
+4080.854701 , 579.15 , 108.641214
+4080.854701 , 772.2 , 113.467464
+4080.854701 , 965.25 , 118.293714
+4080.854701 , 1158.3 , 123.119964
+4080.854701 , 1351.35 , 127.946214
+4080.854701 , 1544.4 , 132.772464
+4080.854701 , 1737.45 , 137.598714
+4080.854701 , 1930.5 , 142.424964
+4080.854701 , 2123.55 , 147.251214
+4080.854701 , 2316.6 , 152.077464
+4080.854701 , 2509.65 , 156.903714
+4080.854701 , 2702.7 , 161.729964
+4080.854701 , 2895.75 , 166.556214
+4080.854701 , 3088.8 , 171.382464
+4080.854701 , 3281.85 , 176.208714
+4080.854701 , 3474.9 , 181.034964
+4080.854701 , 3667.95 , 185.861214
+4080.854701 , 3861 , 190.687464
+4080.854701 , 4054.05 , 195.513714
+4080.854701 , 4247.1 , 200.339964
+4080.854701 , 4440.15 , 205.166214
+4080.854701 , 4633.2 , 209.992464
+4080.854701 , 4826.25 , 214.818714
+4080.854701 , 5019.3 , 219.644964
+4080.854701 , 5212.35 , 224.471214
+4080.854701 , 5405.4 , 229.297464
+4080.854701 , 5598.45 , 234.123714
+4080.854701 , 5791.5 , 238.949964
+4080.854701 , 5984.55 , 243.776214
+4080.854701 , 6177.6 , 248.602464
+4268.632479 , -6177.6 , 56.79748799
+4268.632479 , -5984.55 , 51.97123799
+4268.632479 , -5791.5 , 47.14498799
+4268.632479 , -5598.45 , 42.31873799
+4268.632479 , -5405.4 , 37.49248799
+4268.632479 , -5212.35 , 32.66623799
+4268.632479 , -5019.3 , 27.83998799
+4268.632479 , -4826.25 , 23.01373799
+4268.632479 , -4633.2 , 18.18748799
+4268.632479 , -4440.15 , 13.36123799
+4268.632479 , -4247.1 , 8.534987993
+4268.632479 , -4054.05 , 3.708737993
+4268.632479 , -3861 , 1.117512007
+4268.632479 , -3667.95 , 5.943762007
+4268.632479 , -3474.9 , 10.77001201
+4268.632479 , -3281.85 , 15.59626201
+4268.632479 , -3088.8 , 20.42251201
+4268.632479 , -2895.75 , 25.24876201
+4268.632479 , -2702.7 , 30.07501201
+4268.632479 , -2509.65 , 34.90126201
+4268.632479 , -2316.6 , 39.72751201
+4268.632479 , -2123.55 , 44.55376201
+4268.632479 , -1930.5 , 49.38001201
+4268.632479 , -1737.45 , 54.20626201
+4268.632479 , -1544.4 , 59.03251201
+4268.632479 , -1351.35 , 63.85876201
+4268.632479 , -1158.3 , 68.68501201
+4268.632479 , -965.25 , 73.51126201
+4268.632479 , -772.2 , 78.33751201
+4268.632479 , -579.15 , 83.16376201
+4268.632479 , -386.1 , 87.99001201
+4268.632479 , -193.05 , 92.81626201
+4268.632479 , 0 , 97.64251201
+4268.632479 , 193.05 , 102.468762
+4268.632479 , 386.1 , 107.295012
+4268.632479 , 579.15 , 112.121262
+4268.632479 , 772.2 , 116.947512
+4268.632479 , 965.25 , 121.773762
+4268.632479 , 1158.3 , 126.600012
+4268.632479 , 1351.35 , 131.426262
+4268.632479 , 1544.4 , 136.252512
+4268.632479 , 1737.45 , 141.078762
+4268.632479 , 1930.5 , 145.905012
+4268.632479 , 2123.55 , 150.731262
+4268.632479 , 2316.6 , 155.557512
+4268.632479 , 2509.65 , 160.383762
+4268.632479 , 2702.7 , 165.210012
+4268.632479 , 2895.75 , 170.036262
+4268.632479 , 3088.8 , 174.862512
+4268.632479 , 3281.85 , 179.688762
+4268.632479 , 3474.9 , 184.515012
+4268.632479 , 3667.95 , 189.341262
+4268.632479 , 3861 , 194.167512
+4268.632479 , 4054.05 , 198.993762
+4268.632479 , 4247.1 , 203.820012
+4268.632479 , 4440.15 , 208.646262
+4268.632479 , 4633.2 , 213.472512
+4268.632479 , 4826.25 , 218.298762
+4268.632479 , 5019.3 , 223.125012
+4268.632479 , 5212.35 , 227.951262
+4268.632479 , 5405.4 , 232.777512
+4268.632479 , 5598.45 , 237.603762
+4268.632479 , 5791.5 , 242.430012
+4268.632479 , 5984.55 , 247.256262
+4268.632479 , 6177.6 , 252.082512
+5000 , -6177.6 , 43.2432
+5000 , -5984.55 , 38.41695
+5000 , -5791.5 , 33.5907
+5000 , -5598.45 , 28.76445
+5000 , -5405.4 , 23.9382
+5000 , -5212.35 , 19.11195
+5000 , -5019.3 , 14.2857
+5000 , -4826.25 , 9.45945
+5000 , -4633.2 , 4.6332
+5000 , -4440.15 , 0.19305
+5000 , -4247.1 , 5.0193
+5000 , -4054.05 , 9.84555
+5000 , -3861 , 14.6718
+5000 , -3667.95 , 19.49805
+5000 , -3474.9 , 24.3243
+5000 , -3281.85 , 29.15055
+5000 , -3088.8 , 33.9768
+5000 , -2895.75 , 38.80305
+5000 , -2702.7 , 43.6293
+5000 , -2509.65 , 48.45555
+5000 , -2316.6 , 53.2818
+5000 , -2123.55 , 58.10805
+5000 , -1930.5 , 62.9343
+5000 , -1737.45 , 67.76055
+5000 , -1544.4 , 72.5868
+5000 , -1351.35 , 77.41305
+5000 , -1158.3 , 82.2393
+5000 , -965.25 , 87.06555
+5000 , -772.2 , 91.8918
+5000 , -579.15 , 96.71805
+5000 , -386.1 , 101.5443
+5000 , -193.05 , 106.37055
+5000 , 0 , 111.1968
+5000 , 193.05 , 116.02305
+5000 , 386.1 , 120.8493
+5000 , 579.15 , 125.67555
+5000 , 772.2 , 130.5018
+5000 , 965.25 , 135.32805
+5000 , 1158.3 , 140.1543
+5000 , 1351.35 , 144.98055
+5000 , 1544.4 , 149.8068
+5000 , 1737.45 , 154.63305
+5000 , 1930.5 , 159.4593
+5000 , 2123.55 , 164.28555
+5000 , 2316.6 , 169.1118
+5000 , 2509.65 , 173.93805
+5000 , 2702.7 , 178.7643
+5000 , 2895.75 , 183.59055
+5000 , 3088.8 , 188.4168
+5000 , 3281.85 , 193.24305
+5000 , 3474.9 , 198.0693
+5000 , 3667.95 , 202.89555
+5000 , 3861 , 207.7218
+5000 , 4054.05 , 212.54805
+5000 , 4247.1 , 217.3743
+5000 , 4440.15 , 222.20055
+5000 , 4633.2 , 227.0268
+5000 , 4826.25 , 231.85305
+5000 , 5019.3 , 236.6793
+5000 , 5212.35 , 241.50555
+5000 , 5405.4 , 246.3318
+5000 , 5598.45 , 251.15805
+5000 , 5791.5 , 255.9843
+5000 , 5984.55 , 260.81055
+5000 , 6177.6 , 265.6368
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_2.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_2.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..c377504c83eb00e4d10a618b109d33ddc4a8e478
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_2.vtlm
@@ -0,0 +1,2081 @@
+Input Speed [rpm] , Input Torque [Nm] , Torque Loss [Nm]
+0 , -6177.6 , 119.22768
+0 , -5984.55 , 114.98058
+0 , -5791.5 , 110.73348
+0 , -5598.45 , 106.48638
+0 , -5405.4 , 102.23928
+0 , -5212.35 , 97.99218
+0 , -5019.3 , 93.74508
+0 , -4826.25 , 89.49798
+0 , -4633.2 , 85.25088
+0 , -4440.15 , 81.00378
+0 , -4247.1 , 76.75668
+0 , -4054.05 , 72.50958
+0 , -3861 , 68.26248
+0 , -3667.95 , 64.01538
+0 , -3474.9 , 59.76828
+0 , -3281.85 , 55.52118
+0 , -3088.8 , 51.27408
+0 , -2895.75 , 47.02698
+0 , -2702.7 , 42.77988
+0 , -2509.65 , 38.53278
+0 , -2316.6 , 34.28568
+0 , -2123.55 , 30.03858
+0 , -1930.5 , 25.79148
+0 , -1737.45 , 21.54438
+0 , -1544.4 , 17.29728
+0 , -1351.35 , 13.05018
+0 , -1158.3 , 8.80308
+0 , -965.25 , 4.55598
+0 , -772.2 , 0.30888
+0 , -579.15 , 3.93822
+0 , -386.1 , 8.18532
+0 , -193.05 , 12.43242
+0 , 0 , 16.67952
+0 , 193.05 , 20.92662
+0 , 386.1 , 25.17372
+0 , 579.15 , 29.42082
+0 , 772.2 , 33.66792
+0 , 965.25 , 37.91502
+0 , 1158.3 , 42.16212
+0 , 1351.35 , 46.40922
+0 , 1544.4 , 50.65632
+0 , 1737.45 , 54.90342
+0 , 1930.5 , 59.15052
+0 , 2123.55 , 63.39762
+0 , 2316.6 , 67.64472
+0 , 2509.65 , 71.89182
+0 , 2702.7 , 76.13892
+0 , 2895.75 , 80.38602
+0 , 3088.8 , 84.63312
+0 , 3281.85 , 88.88022
+0 , 3474.9 , 93.12732
+0 , 3667.95 , 97.37442
+0 , 3861 , 101.62152
+0 , 4054.05 , 105.86862
+0 , 4247.1 , 110.11572
+0 , 4440.15 , 114.36282
+0 , 4633.2 , 118.60992
+0 , 4826.25 , 122.85702
+0 , 5019.3 , 127.10412
+0 , 5212.35 , 131.35122
+0 , 5405.4 , 135.59832
+0 , 5598.45 , 139.84542
+0 , 5791.5 , 144.09252
+0 , 5984.55 , 148.33962
+0 , 6177.6 , 152.58672
+40.80854701 , -6177.6 , 118.547013
+40.80854701 , -5984.55 , 114.299913
+40.80854701 , -5791.5 , 110.052813
+40.80854701 , -5598.45 , 105.805713
+40.80854701 , -5405.4 , 101.558613
+40.80854701 , -5212.35 , 97.31151302
+40.80854701 , -5019.3 , 93.06441302
+40.80854701 , -4826.25 , 88.81731302
+40.80854701 , -4633.2 , 84.57021302
+40.80854701 , -4440.15 , 80.32311302
+40.80854701 , -4247.1 , 76.07601302
+40.80854701 , -4054.05 , 71.82891302
+40.80854701 , -3861 , 67.58181302
+40.80854701 , -3667.95 , 63.33471302
+40.80854701 , -3474.9 , 59.08761302
+40.80854701 , -3281.85 , 54.84051302
+40.80854701 , -3088.8 , 50.59341302
+40.80854701 , -2895.75 , 46.34631302
+40.80854701 , -2702.7 , 42.09921302
+40.80854701 , -2509.65 , 37.85211302
+40.80854701 , -2316.6 , 33.60501302
+40.80854701 , -2123.55 , 29.35791302
+40.80854701 , -1930.5 , 25.11081302
+40.80854701 , -1737.45 , 20.86371302
+40.80854701 , -1544.4 , 16.61661302
+40.80854701 , -1351.35 , 12.36951302
+40.80854701 , -1158.3 , 8.122413024
+40.80854701 , -965.25 , 3.875313024
+40.80854701 , -772.2 , 0.371786976
+40.80854701 , -579.15 , 4.618886976
+40.80854701 , -386.1 , 8.865986976
+40.80854701 , -193.05 , 13.11308698
+40.80854701 , 0 , 17.36018698
+40.80854701 , 193.05 , 21.60728698
+40.80854701 , 386.1 , 25.85438698
+40.80854701 , 579.15 , 30.10148698
+40.80854701 , 772.2 , 34.34858698
+40.80854701 , 965.25 , 38.59568698
+40.80854701 , 1158.3 , 42.84278698
+40.80854701 , 1351.35 , 47.08988698
+40.80854701 , 1544.4 , 51.33698698
+40.80854701 , 1737.45 , 55.58408698
+40.80854701 , 1930.5 , 59.83118698
+40.80854701 , 2123.55 , 64.07828698
+40.80854701 , 2316.6 , 68.32538698
+40.80854701 , 2509.65 , 72.57248698
+40.80854701 , 2702.7 , 76.81958698
+40.80854701 , 2895.75 , 81.06668698
+40.80854701 , 3088.8 , 85.31378698
+40.80854701 , 3281.85 , 89.56088698
+40.80854701 , 3474.9 , 93.80798698
+40.80854701 , 3667.95 , 98.05508698
+40.80854701 , 3861 , 102.302187
+40.80854701 , 4054.05 , 106.549287
+40.80854701 , 4247.1 , 110.796387
+40.80854701 , 4440.15 , 115.043487
+40.80854701 , 4633.2 , 119.290587
+40.80854701 , 4826.25 , 123.537687
+40.80854701 , 5019.3 , 127.784787
+40.80854701 , 5212.35 , 132.031887
+40.80854701 , 5405.4 , 136.278987
+40.80854701 , 5598.45 , 140.526087
+40.80854701 , 5791.5 , 144.773187
+40.80854701 , 5984.55 , 149.020287
+40.80854701 , 6177.6 , 153.267387
+81.61794872 , -6177.6 , 117.8663318
+81.61794872 , -5984.55 , 113.6192318
+81.61794872 , -5791.5 , 109.3721318
+81.61794872 , -5598.45 , 105.1250318
+81.61794872 , -5405.4 , 100.8779318
+81.61794872 , -5212.35 , 96.63083179
+81.61794872 , -5019.3 , 92.38373179
+81.61794872 , -4826.25 , 88.13663179
+81.61794872 , -4633.2 , 83.88953179
+81.61794872 , -4440.15 , 79.64243179
+81.61794872 , -4247.1 , 75.39533179
+81.61794872 , -4054.05 , 71.14823179
+81.61794872 , -3861 , 66.90113179
+81.61794872 , -3667.95 , 62.65403179
+81.61794872 , -3474.9 , 58.40693179
+81.61794872 , -3281.85 , 54.15983179
+81.61794872 , -3088.8 , 49.91273179
+81.61794872 , -2895.75 , 45.66563179
+81.61794872 , -2702.7 , 41.41853179
+81.61794872 , -2509.65 , 37.17143179
+81.61794872 , -2316.6 , 32.92433179
+81.61794872 , -2123.55 , 28.67723179
+81.61794872 , -1930.5 , 24.43013179
+81.61794872 , -1737.45 , 20.18303179
+81.61794872 , -1544.4 , 15.93593179
+81.61794872 , -1351.35 , 11.68883179
+81.61794872 , -1158.3 , 7.441731792
+81.61794872 , -965.25 , 3.194631792
+81.61794872 , -772.2 , 1.052468208
+81.61794872 , -579.15 , 5.299568208
+81.61794872 , -386.1 , 9.546668208
+81.61794872 , -193.05 , 13.79376821
+81.61794872 , 0 , 18.04086821
+81.61794872 , 193.05 , 22.28796821
+81.61794872 , 386.1 , 26.53506821
+81.61794872 , 579.15 , 30.78216821
+81.61794872 , 772.2 , 35.02926821
+81.61794872 , 965.25 , 39.27636821
+81.61794872 , 1158.3 , 43.52346821
+81.61794872 , 1351.35 , 47.77056821
+81.61794872 , 1544.4 , 52.01766821
+81.61794872 , 1737.45 , 56.26476821
+81.61794872 , 1930.5 , 60.51186821
+81.61794872 , 2123.55 , 64.75896821
+81.61794872 , 2316.6 , 69.00606821
+81.61794872 , 2509.65 , 73.25316821
+81.61794872 , 2702.7 , 77.50026821
+81.61794872 , 2895.75 , 81.74736821
+81.61794872 , 3088.8 , 85.99446821
+81.61794872 , 3281.85 , 90.24156821
+81.61794872 , 3474.9 , 94.48866821
+81.61794872 , 3667.95 , 98.73576821
+81.61794872 , 3861 , 102.9828682
+81.61794872 , 4054.05 , 107.2299682
+81.61794872 , 4247.1 , 111.4770682
+81.61794872 , 4440.15 , 115.7241682
+81.61794872 , 4633.2 , 119.9712682
+81.61794872 , 4826.25 , 124.2183682
+81.61794872 , 5019.3 , 128.4654682
+81.61794872 , 5212.35 , 132.7125682
+81.61794872 , 5405.4 , 136.9596682
+81.61794872 , 5598.45 , 141.2067682
+81.61794872 , 5791.5 , 145.4538682
+81.61794872 , 5984.55 , 149.7009682
+81.61794872 , 6177.6 , 153.9480682
+122.4273504 , -6177.6 , 117.1856506
+122.4273504 , -5984.55 , 112.9385506
+122.4273504 , -5791.5 , 108.6914506
+122.4273504 , -5598.45 , 104.4443506
+122.4273504 , -5405.4 , 100.1972506
+122.4273504 , -5212.35 , 95.95015056
+122.4273504 , -5019.3 , 91.70305056
+122.4273504 , -4826.25 , 87.45595056
+122.4273504 , -4633.2 , 83.20885056
+122.4273504 , -4440.15 , 78.96175056
+122.4273504 , -4247.1 , 74.71465056
+122.4273504 , -4054.05 , 70.46755056
+122.4273504 , -3861 , 66.22045056
+122.4273504 , -3667.95 , 61.97335056
+122.4273504 , -3474.9 , 57.72625056
+122.4273504 , -3281.85 , 53.47915056
+122.4273504 , -3088.8 , 49.23205056
+122.4273504 , -2895.75 , 44.98495056
+122.4273504 , -2702.7 , 40.73785056
+122.4273504 , -2509.65 , 36.49075056
+122.4273504 , -2316.6 , 32.24365056
+122.4273504 , -2123.55 , 27.99655056
+122.4273504 , -1930.5 , 23.74945056
+122.4273504 , -1737.45 , 19.50235056
+122.4273504 , -1544.4 , 15.25525056
+122.4273504 , -1351.35 , 11.00815056
+122.4273504 , -1158.3 , 6.76105056
+122.4273504 , -965.25 , 2.51395056
+122.4273504 , -772.2 , 1.73314944
+122.4273504 , -579.15 , 5.98024944
+122.4273504 , -386.1 , 10.22734944
+122.4273504 , -193.05 , 14.47444944
+122.4273504 , 0 , 18.72154944
+122.4273504 , 193.05 , 22.96864944
+122.4273504 , 386.1 , 27.21574944
+122.4273504 , 579.15 , 31.46284944
+122.4273504 , 772.2 , 35.70994944
+122.4273504 , 965.25 , 39.95704944
+122.4273504 , 1158.3 , 44.20414944
+122.4273504 , 1351.35 , 48.45124944
+122.4273504 , 1544.4 , 52.69834944
+122.4273504 , 1737.45 , 56.94544944
+122.4273504 , 1930.5 , 61.19254944
+122.4273504 , 2123.55 , 65.43964944
+122.4273504 , 2316.6 , 69.68674944
+122.4273504 , 2509.65 , 73.93384944
+122.4273504 , 2702.7 , 78.18094944
+122.4273504 , 2895.75 , 82.42804944
+122.4273504 , 3088.8 , 86.67514944
+122.4273504 , 3281.85 , 90.92224944
+122.4273504 , 3474.9 , 95.16934944
+122.4273504 , 3667.95 , 99.41644944
+122.4273504 , 3861 , 103.6635494
+122.4273504 , 4054.05 , 107.9106494
+122.4273504 , 4247.1 , 112.1577494
+122.4273504 , 4440.15 , 116.4048494
+122.4273504 , 4633.2 , 120.6519494
+122.4273504 , 4826.25 , 124.8990494
+122.4273504 , 5019.3 , 129.1461494
+122.4273504 , 5212.35 , 133.3932494
+122.4273504 , 5405.4 , 137.6403494
+122.4273504 , 5598.45 , 141.8874494
+122.4273504 , 5791.5 , 146.1345494
+122.4273504 , 5984.55 , 150.3816494
+122.4273504 , 6177.6 , 154.6287494
+163.2393162 , -6177.6 , 116.5049266
+163.2393162 , -5984.55 , 112.2578266
+163.2393162 , -5791.5 , 108.0107266
+163.2393162 , -5598.45 , 103.7636266
+163.2393162 , -5405.4 , 99.51652656
+163.2393162 , -5212.35 , 95.26942656
+163.2393162 , -5019.3 , 91.02232656
+163.2393162 , -4826.25 , 86.77522656
+163.2393162 , -4633.2 , 82.52812656
+163.2393162 , -4440.15 , 78.28102656
+163.2393162 , -4247.1 , 74.03392656
+163.2393162 , -4054.05 , 69.78682656
+163.2393162 , -3861 , 65.53972656
+163.2393162 , -3667.95 , 61.29262656
+163.2393162 , -3474.9 , 57.04552656
+163.2393162 , -3281.85 , 52.79842656
+163.2393162 , -3088.8 , 48.55132656
+163.2393162 , -2895.75 , 44.30422656
+163.2393162 , -2702.7 , 40.05712656
+163.2393162 , -2509.65 , 35.81002656
+163.2393162 , -2316.6 , 31.56292656
+163.2393162 , -2123.55 , 27.31582656
+163.2393162 , -1930.5 , 23.06872656
+163.2393162 , -1737.45 , 18.82162656
+163.2393162 , -1544.4 , 14.57452656
+163.2393162 , -1351.35 , 10.32742656
+163.2393162 , -1158.3 , 6.080326561
+163.2393162 , -965.25 , 1.833226561
+163.2393162 , -772.2 , 2.413873439
+163.2393162 , -579.15 , 6.660973439
+163.2393162 , -386.1 , 10.90807344
+163.2393162 , -193.05 , 15.15517344
+163.2393162 , 0 , 19.40227344
+163.2393162 , 193.05 , 23.64937344
+163.2393162 , 386.1 , 27.89647344
+163.2393162 , 579.15 , 32.14357344
+163.2393162 , 772.2 , 36.39067344
+163.2393162 , 965.25 , 40.63777344
+163.2393162 , 1158.3 , 44.88487344
+163.2393162 , 1351.35 , 49.13197344
+163.2393162 , 1544.4 , 53.37907344
+163.2393162 , 1737.45 , 57.62617344
+163.2393162 , 1930.5 , 61.87327344
+163.2393162 , 2123.55 , 66.12037344
+163.2393162 , 2316.6 , 70.36747344
+163.2393162 , 2509.65 , 74.61457344
+163.2393162 , 2702.7 , 78.86167344
+163.2393162 , 2895.75 , 83.10877344
+163.2393162 , 3088.8 , 87.35587344
+163.2393162 , 3281.85 , 91.60297344
+163.2393162 , 3474.9 , 95.85007344
+163.2393162 , 3667.95 , 100.0971734
+163.2393162 , 3861 , 104.3442734
+163.2393162 , 4054.05 , 108.5913734
+163.2393162 , 4247.1 , 112.8384734
+163.2393162 , 4440.15 , 117.0855734
+163.2393162 , 4633.2 , 121.3326734
+163.2393162 , 4826.25 , 125.5797734
+163.2393162 , 5019.3 , 129.8268734
+163.2393162 , 5212.35 , 134.0739734
+163.2393162 , 5405.4 , 138.3210734
+163.2393162 , 5598.45 , 142.5681734
+163.2393162 , 5791.5 , 146.8152734
+163.2393162 , 5984.55 , 151.0623734
+163.2393162 , 6177.6 , 155.3094734
+204.042735 , -6177.6 , 115.8243451
+204.042735 , -5984.55 , 111.5772451
+204.042735 , -5791.5 , 107.3301451
+204.042735 , -5598.45 , 103.0830451
+204.042735 , -5405.4 , 98.83594512
+204.042735 , -5212.35 , 94.58884512
+204.042735 , -5019.3 , 90.34174512
+204.042735 , -4826.25 , 86.09464512
+204.042735 , -4633.2 , 81.84754512
+204.042735 , -4440.15 , 77.60044512
+204.042735 , -4247.1 , 73.35334512
+204.042735 , -4054.05 , 69.10624512
+204.042735 , -3861 , 64.85914512
+204.042735 , -3667.95 , 60.61204512
+204.042735 , -3474.9 , 56.36494512
+204.042735 , -3281.85 , 52.11784512
+204.042735 , -3088.8 , 47.87074512
+204.042735 , -2895.75 , 43.62364512
+204.042735 , -2702.7 , 39.37654512
+204.042735 , -2509.65 , 35.12944512
+204.042735 , -2316.6 , 30.88234512
+204.042735 , -2123.55 , 26.63524512
+204.042735 , -1930.5 , 22.38814512
+204.042735 , -1737.45 , 18.14104512
+204.042735 , -1544.4 , 13.89394512
+204.042735 , -1351.35 , 9.646845121
+204.042735 , -1158.3 , 5.399745121
+204.042735 , -965.25 , 1.152645121
+204.042735 , -772.2 , 3.094454879
+204.042735 , -579.15 , 7.341554879
+204.042735 , -386.1 , 11.58865488
+204.042735 , -193.05 , 15.83575488
+204.042735 , 0 , 20.08285488
+204.042735 , 193.05 , 24.32995488
+204.042735 , 386.1 , 28.57705488
+204.042735 , 579.15 , 32.82415488
+204.042735 , 772.2 , 37.07125488
+204.042735 , 965.25 , 41.31835488
+204.042735 , 1158.3 , 45.56545488
+204.042735 , 1351.35 , 49.81255488
+204.042735 , 1544.4 , 54.05965488
+204.042735 , 1737.45 , 58.30675488
+204.042735 , 1930.5 , 62.55385488
+204.042735 , 2123.55 , 66.80095488
+204.042735 , 2316.6 , 71.04805488
+204.042735 , 2509.65 , 75.29515488
+204.042735 , 2702.7 , 79.54225488
+204.042735 , 2895.75 , 83.78935488
+204.042735 , 3088.8 , 88.03645488
+204.042735 , 3281.85 , 92.28355488
+204.042735 , 3474.9 , 96.53065488
+204.042735 , 3667.95 , 100.7777549
+204.042735 , 3861 , 105.0248549
+204.042735 , 4054.05 , 109.2719549
+204.042735 , 4247.1 , 113.5190549
+204.042735 , 4440.15 , 117.7661549
+204.042735 , 4633.2 , 122.0132549
+204.042735 , 4826.25 , 126.2603549
+204.042735 , 5019.3 , 130.5074549
+204.042735 , 5212.35 , 134.7545549
+204.042735 , 5405.4 , 139.0016549
+204.042735 , 5598.45 , 143.2487549
+204.042735 , 5791.5 , 147.4958549
+204.042735 , 5984.55 , 151.7429549
+204.042735 , 6177.6 , 155.9900549
+244.8547009 , -6177.6 , 115.1436211
+244.8547009 , -5984.55 , 110.8965211
+244.8547009 , -5791.5 , 106.6494211
+244.8547009 , -5598.45 , 102.4023211
+244.8547009 , -5405.4 , 98.15522112
+244.8547009 , -5212.35 , 93.90812112
+244.8547009 , -5019.3 , 89.66102112
+244.8547009 , -4826.25 , 85.41392112
+244.8547009 , -4633.2 , 81.16682112
+244.8547009 , -4440.15 , 76.91972112
+244.8547009 , -4247.1 , 72.67262112
+244.8547009 , -4054.05 , 68.42552112
+244.8547009 , -3861 , 64.17842112
+244.8547009 , -3667.95 , 59.93132112
+244.8547009 , -3474.9 , 55.68422112
+244.8547009 , -3281.85 , 51.43712112
+244.8547009 , -3088.8 , 47.19002112
+244.8547009 , -2895.75 , 42.94292112
+244.8547009 , -2702.7 , 38.69582112
+244.8547009 , -2509.65 , 34.44872112
+244.8547009 , -2316.6 , 30.20162112
+244.8547009 , -2123.55 , 25.95452112
+244.8547009 , -1930.5 , 21.70742112
+244.8547009 , -1737.45 , 17.46032112
+244.8547009 , -1544.4 , 13.21322112
+244.8547009 , -1351.35 , 8.966121119
+244.8547009 , -1158.3 , 4.719021119
+244.8547009 , -965.25 , 0.471921119
+244.8547009 , -772.2 , 3.775178881
+244.8547009 , -579.15 , 8.022278881
+244.8547009 , -386.1 , 12.26937888
+244.8547009 , -193.05 , 16.51647888
+244.8547009 , 0 , 20.76357888
+244.8547009 , 193.05 , 25.01067888
+244.8547009 , 386.1 , 29.25777888
+244.8547009 , 579.15 , 33.50487888
+244.8547009 , 772.2 , 37.75197888
+244.8547009 , 965.25 , 41.99907888
+244.8547009 , 1158.3 , 46.24617888
+244.8547009 , 1351.35 , 50.49327888
+244.8547009 , 1544.4 , 54.74037888
+244.8547009 , 1737.45 , 58.98747888
+244.8547009 , 1930.5 , 63.23457888
+244.8547009 , 2123.55 , 67.48167888
+244.8547009 , 2316.6 , 71.72877888
+244.8547009 , 2509.65 , 75.97587888
+244.8547009 , 2702.7 , 80.22297888
+244.8547009 , 2895.75 , 84.47007888
+244.8547009 , 3088.8 , 88.71717888
+244.8547009 , 3281.85 , 92.96427888
+244.8547009 , 3474.9 , 97.21137888
+244.8547009 , 3667.95 , 101.4584789
+244.8547009 , 3861 , 105.7055789
+244.8547009 , 4054.05 , 109.9526789
+244.8547009 , 4247.1 , 114.1997789
+244.8547009 , 4440.15 , 118.4468789
+244.8547009 , 4633.2 , 122.6939789
+244.8547009 , 4826.25 , 126.9410789
+244.8547009 , 5019.3 , 131.1881789
+244.8547009 , 5212.35 , 135.4352789
+244.8547009 , 5405.4 , 139.6823789
+244.8547009 , 5598.45 , 143.9294789
+244.8547009 , 5791.5 , 148.1765789
+244.8547009 , 5984.55 , 152.4236789
+244.8547009 , 6177.6 , 156.6707789
+285.6666667 , -6177.6 , 114.4628971
+285.6666667 , -5984.55 , 110.2157971
+285.6666667 , -5791.5 , 105.9686971
+285.6666667 , -5598.45 , 101.7215971
+285.6666667 , -5405.4 , 97.47449712
+285.6666667 , -5212.35 , 93.22739712
+285.6666667 , -5019.3 , 88.98029712
+285.6666667 , -4826.25 , 84.73319712
+285.6666667 , -4633.2 , 80.48609712
+285.6666667 , -4440.15 , 76.23899712
+285.6666667 , -4247.1 , 71.99189712
+285.6666667 , -4054.05 , 67.74479712
+285.6666667 , -3861 , 63.49769712
+285.6666667 , -3667.95 , 59.25059712
+285.6666667 , -3474.9 , 55.00349712
+285.6666667 , -3281.85 , 50.75639712
+285.6666667 , -3088.8 , 46.50929712
+285.6666667 , -2895.75 , 42.26219712
+285.6666667 , -2702.7 , 38.01509712
+285.6666667 , -2509.65 , 33.76799712
+285.6666667 , -2316.6 , 29.52089712
+285.6666667 , -2123.55 , 25.27379712
+285.6666667 , -1930.5 , 21.02669712
+285.6666667 , -1737.45 , 16.77959712
+285.6666667 , -1544.4 , 12.53249712
+285.6666667 , -1351.35 , 8.285397119
+285.6666667 , -1158.3 , 4.038297119
+285.6666667 , -965.25 , 0.208802881
+285.6666667 , -772.2 , 4.455902881
+285.6666667 , -579.15 , 8.703002881
+285.6666667 , -386.1 , 12.95010288
+285.6666667 , -193.05 , 17.19720288
+285.6666667 , 0 , 21.44430288
+285.6666667 , 193.05 , 25.69140288
+285.6666667 , 386.1 , 29.93850288
+285.6666667 , 579.15 , 34.18560288
+285.6666667 , 772.2 , 38.43270288
+285.6666667 , 965.25 , 42.67980288
+285.6666667 , 1158.3 , 46.92690288
+285.6666667 , 1351.35 , 51.17400288
+285.6666667 , 1544.4 , 55.42110288
+285.6666667 , 1737.45 , 59.66820288
+285.6666667 , 1930.5 , 63.91530288
+285.6666667 , 2123.55 , 68.16240288
+285.6666667 , 2316.6 , 72.40950288
+285.6666667 , 2509.65 , 76.65660288
+285.6666667 , 2702.7 , 80.90370288
+285.6666667 , 2895.75 , 85.15080288
+285.6666667 , 3088.8 , 89.39790288
+285.6666667 , 3281.85 , 93.64500288
+285.6666667 , 3474.9 , 97.89210288
+285.6666667 , 3667.95 , 102.1392029
+285.6666667 , 3861 , 106.3863029
+285.6666667 , 4054.05 , 110.6334029
+285.6666667 , 4247.1 , 114.8805029
+285.6666667 , 4440.15 , 119.1276029
+285.6666667 , 4633.2 , 123.3747029
+285.6666667 , 4826.25 , 127.6218029
+285.6666667 , 5019.3 , 131.8689029
+285.6666667 , 5212.35 , 136.1160029
+285.6666667 , 5405.4 , 140.3631029
+285.6666667 , 5598.45 , 144.6102029
+285.6666667 , 5791.5 , 148.8573029
+285.6666667 , 5984.55 , 153.1044029
+285.6666667 , 6177.6 , 157.3515029
+326.4700855 , -6177.6 , 113.7823157
+326.4700855 , -5984.55 , 109.5352157
+326.4700855 , -5791.5 , 105.2881157
+326.4700855 , -5598.45 , 101.0410157
+326.4700855 , -5405.4 , 96.79391568
+326.4700855 , -5212.35 , 92.54681568
+326.4700855 , -5019.3 , 88.29971568
+326.4700855 , -4826.25 , 84.05261568
+326.4700855 , -4633.2 , 79.80551568
+326.4700855 , -4440.15 , 75.55841568
+326.4700855 , -4247.1 , 71.31131568
+326.4700855 , -4054.05 , 67.06421568
+326.4700855 , -3861 , 62.81711568
+326.4700855 , -3667.95 , 58.57001568
+326.4700855 , -3474.9 , 54.32291568
+326.4700855 , -3281.85 , 50.07581568
+326.4700855 , -3088.8 , 45.82871568
+326.4700855 , -2895.75 , 41.58161568
+326.4700855 , -2702.7 , 37.33451568
+326.4700855 , -2509.65 , 33.08741568
+326.4700855 , -2316.6 , 28.84031568
+326.4700855 , -2123.55 , 24.59321568
+326.4700855 , -1930.5 , 20.34611568
+326.4700855 , -1737.45 , 16.09901568
+326.4700855 , -1544.4 , 11.85191568
+326.4700855 , -1351.35 , 7.60481568
+326.4700855 , -1158.3 , 3.35771568
+326.4700855 , -965.25 , 0.88938432
+326.4700855 , -772.2 , 5.13648432
+326.4700855 , -579.15 , 9.38358432
+326.4700855 , -386.1 , 13.63068432
+326.4700855 , -193.05 , 17.87778432
+326.4700855 , 0 , 22.12488432
+326.4700855 , 193.05 , 26.37198432
+326.4700855 , 386.1 , 30.61908432
+326.4700855 , 579.15 , 34.86618432
+326.4700855 , 772.2 , 39.11328432
+326.4700855 , 965.25 , 43.36038432
+326.4700855 , 1158.3 , 47.60748432
+326.4700855 , 1351.35 , 51.85458432
+326.4700855 , 1544.4 , 56.10168432
+326.4700855 , 1737.45 , 60.34878432
+326.4700855 , 1930.5 , 64.59588432
+326.4700855 , 2123.55 , 68.84298432
+326.4700855 , 2316.6 , 73.09008432
+326.4700855 , 2509.65 , 77.33718432
+326.4700855 , 2702.7 , 81.58428432
+326.4700855 , 2895.75 , 85.83138432
+326.4700855 , 3088.8 , 90.07848432
+326.4700855 , 3281.85 , 94.32558432
+326.4700855 , 3474.9 , 98.57268432
+326.4700855 , 3667.95 , 102.8197843
+326.4700855 , 3861 , 107.0668843
+326.4700855 , 4054.05 , 111.3139843
+326.4700855 , 4247.1 , 115.5610843
+326.4700855 , 4440.15 , 119.8081843
+326.4700855 , 4633.2 , 124.0552843
+326.4700855 , 4826.25 , 128.3023843
+326.4700855 , 5019.3 , 132.5494843
+326.4700855 , 5212.35 , 136.7965843
+326.4700855 , 5405.4 , 141.0436843
+326.4700855 , 5598.45 , 145.2907843
+326.4700855 , 5791.5 , 149.5378843
+326.4700855 , 5984.55 , 153.7849843
+326.4700855 , 6177.6 , 158.0320843
+367.2820513 , -6177.6 , 113.1015917
+367.2820513 , -5984.55 , 108.8544917
+367.2820513 , -5791.5 , 104.6073917
+367.2820513 , -5598.45 , 100.3602917
+367.2820513 , -5405.4 , 96.11319168
+367.2820513 , -5212.35 , 91.86609168
+367.2820513 , -5019.3 , 87.61899168
+367.2820513 , -4826.25 , 83.37189168
+367.2820513 , -4633.2 , 79.12479168
+367.2820513 , -4440.15 , 74.87769168
+367.2820513 , -4247.1 , 70.63059168
+367.2820513 , -4054.05 , 66.38349168
+367.2820513 , -3861 , 62.13639168
+367.2820513 , -3667.95 , 57.88929168
+367.2820513 , -3474.9 , 53.64219168
+367.2820513 , -3281.85 , 49.39509168
+367.2820513 , -3088.8 , 45.14799168
+367.2820513 , -2895.75 , 40.90089168
+367.2820513 , -2702.7 , 36.65379168
+367.2820513 , -2509.65 , 32.40669168
+367.2820513 , -2316.6 , 28.15959168
+367.2820513 , -2123.55 , 23.91249168
+367.2820513 , -1930.5 , 19.66539168
+367.2820513 , -1737.45 , 15.41829168
+367.2820513 , -1544.4 , 11.17119168
+367.2820513 , -1351.35 , 6.92409168
+367.2820513 , -1158.3 , 2.67699168
+367.2820513 , -965.25 , 1.57010832
+367.2820513 , -772.2 , 5.81720832
+367.2820513 , -579.15 , 10.06430832
+367.2820513 , -386.1 , 14.31140832
+367.2820513 , -193.05 , 18.55850832
+367.2820513 , 0 , 22.80560832
+367.2820513 , 193.05 , 27.05270832
+367.2820513 , 386.1 , 31.29980832
+367.2820513 , 579.15 , 35.54690832
+367.2820513 , 772.2 , 39.79400832
+367.2820513 , 965.25 , 44.04110832
+367.2820513 , 1158.3 , 48.28820832
+367.2820513 , 1351.35 , 52.53530832
+367.2820513 , 1544.4 , 56.78240832
+367.2820513 , 1737.45 , 61.02950832
+367.2820513 , 1930.5 , 65.27660832
+367.2820513 , 2123.55 , 69.52370832
+367.2820513 , 2316.6 , 73.77080832
+367.2820513 , 2509.65 , 78.01790832
+367.2820513 , 2702.7 , 82.26500832
+367.2820513 , 2895.75 , 86.51210832
+367.2820513 , 3088.8 , 90.75920832
+367.2820513 , 3281.85 , 95.00630832
+367.2820513 , 3474.9 , 99.25340832
+367.2820513 , 3667.95 , 103.5005083
+367.2820513 , 3861 , 107.7476083
+367.2820513 , 4054.05 , 111.9947083
+367.2820513 , 4247.1 , 116.2418083
+367.2820513 , 4440.15 , 120.4889083
+367.2820513 , 4633.2 , 124.7360083
+367.2820513 , 4826.25 , 128.9831083
+367.2820513 , 5019.3 , 133.2302083
+367.2820513 , 5212.35 , 137.4773083
+367.2820513 , 5405.4 , 141.7244083
+367.2820513 , 5598.45 , 145.9715083
+367.2820513 , 5791.5 , 150.2186083
+367.2820513 , 5984.55 , 154.4657083
+367.2820513 , 6177.6 , 158.7128083
+408.0854701 , -6177.6 , 112.4210102
+408.0854701 , -5984.55 , 108.1739102
+408.0854701 , -5791.5 , 103.9268102
+408.0854701 , -5598.45 , 99.67971024
+408.0854701 , -5405.4 , 95.43261024
+408.0854701 , -5212.35 , 91.18551024
+408.0854701 , -5019.3 , 86.93841024
+408.0854701 , -4826.25 , 82.69131024
+408.0854701 , -4633.2 , 78.44421024
+408.0854701 , -4440.15 , 74.19711024
+408.0854701 , -4247.1 , 69.95001024
+408.0854701 , -4054.05 , 65.70291024
+408.0854701 , -3861 , 61.45581024
+408.0854701 , -3667.95 , 57.20871024
+408.0854701 , -3474.9 , 52.96161024
+408.0854701 , -3281.85 , 48.71451024
+408.0854701 , -3088.8 , 44.46741024
+408.0854701 , -2895.75 , 40.22031024
+408.0854701 , -2702.7 , 35.97321024
+408.0854701 , -2509.65 , 31.72611024
+408.0854701 , -2316.6 , 27.47901024
+408.0854701 , -2123.55 , 23.23191024
+408.0854701 , -1930.5 , 18.98481024
+408.0854701 , -1737.45 , 14.73771024
+408.0854701 , -1544.4 , 10.49061024
+408.0854701 , -1351.35 , 6.24351024
+408.0854701 , -1158.3 , 1.99641024
+408.0854701 , -965.25 , 2.25068976
+408.0854701 , -772.2 , 6.49778976
+408.0854701 , -579.15 , 10.74488976
+408.0854701 , -386.1 , 14.99198976
+408.0854701 , -193.05 , 19.23908976
+408.0854701 , 0 , 23.48618976
+408.0854701 , 193.05 , 27.73328976
+408.0854701 , 386.1 , 31.98038976
+408.0854701 , 579.15 , 36.22748976
+408.0854701 , 772.2 , 40.47458976
+408.0854701 , 965.25 , 44.72168976
+408.0854701 , 1158.3 , 48.96878976
+408.0854701 , 1351.35 , 53.21588976
+408.0854701 , 1544.4 , 57.46298976
+408.0854701 , 1737.45 , 61.71008976
+408.0854701 , 1930.5 , 65.95718976
+408.0854701 , 2123.55 , 70.20428976
+408.0854701 , 2316.6 , 74.45138976
+408.0854701 , 2509.65 , 78.69848976
+408.0854701 , 2702.7 , 82.94558976
+408.0854701 , 2895.75 , 87.19268976
+408.0854701 , 3088.8 , 91.43978976
+408.0854701 , 3281.85 , 95.68688976
+408.0854701 , 3474.9 , 99.93398976
+408.0854701 , 3667.95 , 104.1810898
+408.0854701 , 3861 , 108.4281898
+408.0854701 , 4054.05 , 112.6752898
+408.0854701 , 4247.1 , 116.9223898
+408.0854701 , 4440.15 , 121.1694898
+408.0854701 , 4633.2 , 125.4165898
+408.0854701 , 4826.25 , 129.6636898
+408.0854701 , 5019.3 , 133.9107898
+408.0854701 , 5212.35 , 138.1578898
+408.0854701 , 5405.4 , 142.4049898
+408.0854701 , 5598.45 , 146.6520898
+408.0854701 , 5791.5 , 150.8991898
+408.0854701 , 5984.55 , 155.1462898
+408.0854701 , 6177.6 , 159.3933898
+448.8974359 , -6177.6 , 111.7402862
+448.8974359 , -5984.55 , 107.4931862
+448.8974359 , -5791.5 , 103.2460862
+448.8974359 , -5598.45 , 98.99898624
+448.8974359 , -5405.4 , 94.75188624
+448.8974359 , -5212.35 , 90.50478624
+448.8974359 , -5019.3 , 86.25768624
+448.8974359 , -4826.25 , 82.01058624
+448.8974359 , -4633.2 , 77.76348624
+448.8974359 , -4440.15 , 73.51638624
+448.8974359 , -4247.1 , 69.26928624
+448.8974359 , -4054.05 , 65.02218624
+448.8974359 , -3861 , 60.77508624
+448.8974359 , -3667.95 , 56.52798624
+448.8974359 , -3474.9 , 52.28088624
+448.8974359 , -3281.85 , 48.03378624
+448.8974359 , -3088.8 , 43.78668624
+448.8974359 , -2895.75 , 39.53958624
+448.8974359 , -2702.7 , 35.29248624
+448.8974359 , -2509.65 , 31.04538624
+448.8974359 , -2316.6 , 26.79828624
+448.8974359 , -2123.55 , 22.55118624
+448.8974359 , -1930.5 , 18.30408624
+448.8974359 , -1737.45 , 14.05698624
+448.8974359 , -1544.4 , 9.80988624
+448.8974359 , -1351.35 , 5.56278624
+448.8974359 , -1158.3 , 1.31568624
+448.8974359 , -965.25 , 2.93141376
+448.8974359 , -772.2 , 7.17851376
+448.8974359 , -579.15 , 11.42561376
+448.8974359 , -386.1 , 15.67271376
+448.8974359 , -193.05 , 19.91981376
+448.8974359 , 0 , 24.16691376
+448.8974359 , 193.05 , 28.41401376
+448.8974359 , 386.1 , 32.66111376
+448.8974359 , 579.15 , 36.90821376
+448.8974359 , 772.2 , 41.15531376
+448.8974359 , 965.25 , 45.40241376
+448.8974359 , 1158.3 , 49.64951376
+448.8974359 , 1351.35 , 53.89661376
+448.8974359 , 1544.4 , 58.14371376
+448.8974359 , 1737.45 , 62.39081376
+448.8974359 , 1930.5 , 66.63791376
+448.8974359 , 2123.55 , 70.88501376
+448.8974359 , 2316.6 , 75.13211376
+448.8974359 , 2509.65 , 79.37921376
+448.8974359 , 2702.7 , 83.62631376
+448.8974359 , 2895.75 , 87.87341376
+448.8974359 , 3088.8 , 92.12051376
+448.8974359 , 3281.85 , 96.36761376
+448.8974359 , 3474.9 , 100.6147138
+448.8974359 , 3667.95 , 104.8618138
+448.8974359 , 3861 , 109.1089138
+448.8974359 , 4054.05 , 113.3560138
+448.8974359 , 4247.1 , 117.6031138
+448.8974359 , 4440.15 , 121.8502138
+448.8974359 , 4633.2 , 126.0973138
+448.8974359 , 4826.25 , 130.3444138
+448.8974359 , 5019.3 , 134.5915138
+448.8974359 , 5212.35 , 138.8386138
+448.8974359 , 5405.4 , 143.0857138
+448.8974359 , 5598.45 , 147.3328138
+448.8974359 , 5791.5 , 151.5799138
+448.8974359 , 5984.55 , 155.8270138
+448.8974359 , 6177.6 , 160.0741138
+489.7094017 , -6177.6 , 111.0595622
+489.7094017 , -5984.55 , 106.8124622
+489.7094017 , -5791.5 , 102.5653622
+489.7094017 , -5598.45 , 98.31826224
+489.7094017 , -5405.4 , 94.07116224
+489.7094017 , -5212.35 , 89.82406224
+489.7094017 , -5019.3 , 85.57696224
+489.7094017 , -4826.25 , 81.32986224
+489.7094017 , -4633.2 , 77.08276224
+489.7094017 , -4440.15 , 72.83566224
+489.7094017 , -4247.1 , 68.58856224
+489.7094017 , -4054.05 , 64.34146224
+489.7094017 , -3861 , 60.09436224
+489.7094017 , -3667.95 , 55.84726224
+489.7094017 , -3474.9 , 51.60016224
+489.7094017 , -3281.85 , 47.35306224
+489.7094017 , -3088.8 , 43.10596224
+489.7094017 , -2895.75 , 38.85886224
+489.7094017 , -2702.7 , 34.61176224
+489.7094017 , -2509.65 , 30.36466224
+489.7094017 , -2316.6 , 26.11756224
+489.7094017 , -2123.55 , 21.87046224
+489.7094017 , -1930.5 , 17.62336224
+489.7094017 , -1737.45 , 13.37626224
+489.7094017 , -1544.4 , 9.12916224
+489.7094017 , -1351.35 , 4.88206224
+489.7094017 , -1158.3 , 0.63496224
+489.7094017 , -965.25 , 3.61213776
+489.7094017 , -772.2 , 7.85923776
+489.7094017 , -579.15 , 12.10633776
+489.7094017 , -386.1 , 16.35343776
+489.7094017 , -193.05 , 20.60053776
+489.7094017 , 0 , 24.84763776
+489.7094017 , 193.05 , 29.09473776
+489.7094017 , 386.1 , 33.34183776
+489.7094017 , 579.15 , 37.58893776
+489.7094017 , 772.2 , 41.83603776
+489.7094017 , 965.25 , 46.08313776
+489.7094017 , 1158.3 , 50.33023776
+489.7094017 , 1351.35 , 54.57733776
+489.7094017 , 1544.4 , 58.82443776
+489.7094017 , 1737.45 , 63.07153776
+489.7094017 , 1930.5 , 67.31863776
+489.7094017 , 2123.55 , 71.56573776
+489.7094017 , 2316.6 , 75.81283776
+489.7094017 , 2509.65 , 80.05993776
+489.7094017 , 2702.7 , 84.30703776
+489.7094017 , 2895.75 , 88.55413776
+489.7094017 , 3088.8 , 92.80123776
+489.7094017 , 3281.85 , 97.04833776
+489.7094017 , 3474.9 , 101.2954378
+489.7094017 , 3667.95 , 105.5425378
+489.7094017 , 3861 , 109.7896378
+489.7094017 , 4054.05 , 114.0367378
+489.7094017 , 4247.1 , 118.2838378
+489.7094017 , 4440.15 , 122.5309378
+489.7094017 , 4633.2 , 126.7780378
+489.7094017 , 4826.25 , 131.0251378
+489.7094017 , 5019.3 , 135.2722378
+489.7094017 , 5212.35 , 139.5193378
+489.7094017 , 5405.4 , 143.7664378
+489.7094017 , 5598.45 , 148.0135378
+489.7094017 , 5791.5 , 152.2606378
+489.7094017 , 5984.55 , 156.5077378
+489.7094017 , 6177.6 , 160.7548378
+816.1794872 , -6177.6 , 105.6141979
+816.1794872 , -5984.55 , 101.3670979
+816.1794872 , -5791.5 , 97.11999792
+816.1794872 , -5598.45 , 92.87289792
+816.1794872 , -5405.4 , 88.62579792
+816.1794872 , -5212.35 , 84.37869792
+816.1794872 , -5019.3 , 80.13159792
+816.1794872 , -4826.25 , 75.88449792
+816.1794872 , -4633.2 , 71.63739792
+816.1794872 , -4440.15 , 67.39029792
+816.1794872 , -4247.1 , 63.14319792
+816.1794872 , -4054.05 , 58.89609792
+816.1794872 , -3861 , 54.64899792
+816.1794872 , -3667.95 , 50.40189792
+816.1794872 , -3474.9 , 46.15479792
+816.1794872 , -3281.85 , 41.90769792
+816.1794872 , -3088.8 , 37.66059792
+816.1794872 , -2895.75 , 33.41349792
+816.1794872 , -2702.7 , 29.16639792
+816.1794872 , -2509.65 , 24.91929792
+816.1794872 , -2316.6 , 20.67219792
+816.1794872 , -2123.55 , 16.42509792
+816.1794872 , -1930.5 , 12.17799792
+816.1794872 , -1737.45 , 7.93089792
+816.1794872 , -1544.4 , 3.68379792
+816.1794872 , -1351.35 , 0.56330208
+816.1794872 , -1158.3 , 4.81040208
+816.1794872 , -965.25 , 9.05750208
+816.1794872 , -772.2 , 13.30460208
+816.1794872 , -579.15 , 17.55170208
+816.1794872 , -386.1 , 21.79880208
+816.1794872 , -193.05 , 26.04590208
+816.1794872 , 0 , 30.29300208
+816.1794872 , 193.05 , 34.54010208
+816.1794872 , 386.1 , 38.78720208
+816.1794872 , 579.15 , 43.03430208
+816.1794872 , 772.2 , 47.28140208
+816.1794872 , 965.25 , 51.52850208
+816.1794872 , 1158.3 , 55.77560208
+816.1794872 , 1351.35 , 60.02270208
+816.1794872 , 1544.4 , 64.26980208
+816.1794872 , 1737.45 , 68.51690208
+816.1794872 , 1930.5 , 72.76400208
+816.1794872 , 2123.55 , 77.01110208
+816.1794872 , 2316.6 , 81.25820208
+816.1794872 , 2509.65 , 85.50530208
+816.1794872 , 2702.7 , 89.75240208
+816.1794872 , 2895.75 , 93.99950208
+816.1794872 , 3088.8 , 98.24660208
+816.1794872 , 3281.85 , 102.4937021
+816.1794872 , 3474.9 , 106.7408021
+816.1794872 , 3667.95 , 110.9879021
+816.1794872 , 3861 , 115.2350021
+816.1794872 , 4054.05 , 119.4821021
+816.1794872 , 4247.1 , 123.7292021
+816.1794872 , 4440.15 , 127.9763021
+816.1794872 , 4633.2 , 132.2234021
+816.1794872 , 4826.25 , 136.4705021
+816.1794872 , 5019.3 , 140.7176021
+816.1794872 , 5212.35 , 144.9647021
+816.1794872 , 5405.4 , 149.2118021
+816.1794872 , 5598.45 , 153.4589021
+816.1794872 , 5791.5 , 157.7060021
+816.1794872 , 5984.55 , 161.9531021
+816.1794872 , 6177.6 , 166.2002021
+1020.25641 , -6177.6 , 102.2102928
+1020.25641 , -5984.55 , 97.9631928
+1020.25641 , -5791.5 , 93.7160928
+1020.25641 , -5598.45 , 89.4689928
+1020.25641 , -5405.4 , 85.2218928
+1020.25641 , -5212.35 , 80.9747928
+1020.25641 , -5019.3 , 76.7276928
+1020.25641 , -4826.25 , 72.4805928
+1020.25641 , -4633.2 , 68.2334928
+1020.25641 , -4440.15 , 63.9863928
+1020.25641 , -4247.1 , 59.7392928
+1020.25641 , -4054.05 , 55.4921928
+1020.25641 , -3861 , 51.2450928
+1020.25641 , -3667.95 , 46.9979928
+1020.25641 , -3474.9 , 42.7508928
+1020.25641 , -3281.85 , 38.5037928
+1020.25641 , -3088.8 , 34.2566928
+1020.25641 , -2895.75 , 30.0095928
+1020.25641 , -2702.7 , 25.7624928
+1020.25641 , -2509.65 , 21.5153928
+1020.25641 , -2316.6 , 17.2682928
+1020.25641 , -2123.55 , 13.0211928
+1020.25641 , -1930.5 , 8.774092804
+1020.25641 , -1737.45 , 4.526992804
+1020.25641 , -1544.4 , 0.279892804
+1020.25641 , -1351.35 , 3.967207196
+1020.25641 , -1158.3 , 8.214307196
+1020.25641 , -965.25 , 12.4614072
+1020.25641 , -772.2 , 16.7085072
+1020.25641 , -579.15 , 20.9556072
+1020.25641 , -386.1 , 25.2027072
+1020.25641 , -193.05 , 29.4498072
+1020.25641 , 0 , 33.6969072
+1020.25641 , 193.05 , 37.9440072
+1020.25641 , 386.1 , 42.1911072
+1020.25641 , 579.15 , 46.4382072
+1020.25641 , 772.2 , 50.6853072
+1020.25641 , 965.25 , 54.9324072
+1020.25641 , 1158.3 , 59.1795072
+1020.25641 , 1351.35 , 63.4266072
+1020.25641 , 1544.4 , 67.6737072
+1020.25641 , 1737.45 , 71.9208072
+1020.25641 , 1930.5 , 76.1679072
+1020.25641 , 2123.55 , 80.4150072
+1020.25641 , 2316.6 , 84.6621072
+1020.25641 , 2509.65 , 88.9092072
+1020.25641 , 2702.7 , 93.1563072
+1020.25641 , 2895.75 , 97.4034072
+1020.25641 , 3088.8 , 101.6505072
+1020.25641 , 3281.85 , 105.8976072
+1020.25641 , 3474.9 , 110.1447072
+1020.25641 , 3667.95 , 114.3918072
+1020.25641 , 3861 , 118.6389072
+1020.25641 , 4054.05 , 122.8860072
+1020.25641 , 4247.1 , 127.1331072
+1020.25641 , 4440.15 , 131.3802072
+1020.25641 , 4633.2 , 135.6273072
+1020.25641 , 4826.25 , 139.8744072
+1020.25641 , 5019.3 , 144.1215072
+1020.25641 , 5212.35 , 148.3686072
+1020.25641 , 5405.4 , 152.6157072
+1020.25641 , 5598.45 , 156.8628072
+1020.25641 , 5791.5 , 161.1099072
+1020.25641 , 5984.55 , 165.3570072
+1020.25641 , 6177.6 , 169.6041072
+1224.273504 , -6177.6 , 98.8073856
+1224.273504 , -5984.55 , 94.5602856
+1224.273504 , -5791.5 , 90.3131856
+1224.273504 , -5598.45 , 86.0660856
+1224.273504 , -5405.4 , 81.8189856
+1224.273504 , -5212.35 , 77.5718856
+1224.273504 , -5019.3 , 73.3247856
+1224.273504 , -4826.25 , 69.0776856
+1224.273504 , -4633.2 , 64.8305856
+1224.273504 , -4440.15 , 60.5834856
+1224.273504 , -4247.1 , 56.3363856
+1224.273504 , -4054.05 , 52.0892856
+1224.273504 , -3861 , 47.8421856
+1224.273504 , -3667.95 , 43.5950856
+1224.273504 , -3474.9 , 39.3479856
+1224.273504 , -3281.85 , 35.1008856
+1224.273504 , -3088.8 , 30.8537856
+1224.273504 , -2895.75 , 26.6066856
+1224.273504 , -2702.7 , 22.3595856
+1224.273504 , -2509.65 , 18.1124856
+1224.273504 , -2316.6 , 13.8653856
+1224.273504 , -2123.55 , 9.618285605
+1224.273504 , -1930.5 , 5.371185605
+1224.273504 , -1737.45 , 1.124085605
+1224.273504 , -1544.4 , 3.123014395
+1224.273504 , -1351.35 , 7.370114395
+1224.273504 , -1158.3 , 11.6172144
+1224.273504 , -965.25 , 15.8643144
+1224.273504 , -772.2 , 20.1114144
+1224.273504 , -579.15 , 24.3585144
+1224.273504 , -386.1 , 28.6056144
+1224.273504 , -193.05 , 32.8527144
+1224.273504 , 0 , 37.0998144
+1224.273504 , 193.05 , 41.3469144
+1224.273504 , 386.1 , 45.5940144
+1224.273504 , 579.15 , 49.8411144
+1224.273504 , 772.2 , 54.0882144
+1224.273504 , 965.25 , 58.3353144
+1224.273504 , 1158.3 , 62.5824144
+1224.273504 , 1351.35 , 66.8295144
+1224.273504 , 1544.4 , 71.0766144
+1224.273504 , 1737.45 , 75.3237144
+1224.273504 , 1930.5 , 79.5708144
+1224.273504 , 2123.55 , 83.8179144
+1224.273504 , 2316.6 , 88.0650144
+1224.273504 , 2509.65 , 92.3121144
+1224.273504 , 2702.7 , 96.5592144
+1224.273504 , 2895.75 , 100.8063144
+1224.273504 , 3088.8 , 105.0534144
+1224.273504 , 3281.85 , 109.3005144
+1224.273504 , 3474.9 , 113.5476144
+1224.273504 , 3667.95 , 117.7947144
+1224.273504 , 3861 , 122.0418144
+1224.273504 , 4054.05 , 126.2889144
+1224.273504 , 4247.1 , 130.5360144
+1224.273504 , 4440.15 , 134.7831144
+1224.273504 , 4633.2 , 139.0302144
+1224.273504 , 4826.25 , 143.2773144
+1224.273504 , 5019.3 , 147.5244144
+1224.273504 , 5212.35 , 151.7715144
+1224.273504 , 5405.4 , 156.0186144
+1224.273504 , 5598.45 , 160.2657144
+1224.273504 , 5791.5 , 164.5128144
+1224.273504 , 5984.55 , 168.7599144
+1224.273504 , 6177.6 , 173.0070144
+1428.290598 , -6177.6 , 95.4044784
+1428.290598 , -5984.55 , 91.1573784
+1428.290598 , -5791.5 , 86.9102784
+1428.290598 , -5598.45 , 82.6631784
+1428.290598 , -5405.4 , 78.4160784
+1428.290598 , -5212.35 , 74.1689784
+1428.290598 , -5019.3 , 69.9218784
+1428.290598 , -4826.25 , 65.6747784
+1428.290598 , -4633.2 , 61.4276784
+1428.290598 , -4440.15 , 57.1805784
+1428.290598 , -4247.1 , 52.9334784
+1428.290598 , -4054.05 , 48.6863784
+1428.290598 , -3861 , 44.4392784
+1428.290598 , -3667.95 , 40.1921784
+1428.290598 , -3474.9 , 35.9450784
+1428.290598 , -3281.85 , 31.6979784
+1428.290598 , -3088.8 , 27.4508784
+1428.290598 , -2895.75 , 23.2037784
+1428.290598 , -2702.7 , 18.9566784
+1428.290598 , -2509.65 , 14.7095784
+1428.290598 , -2316.6 , 10.4624784
+1428.290598 , -2123.55 , 6.215378405
+1428.290598 , -1930.5 , 1.968278405
+1428.290598 , -1737.45 , 2.278821595
+1428.290598 , -1544.4 , 6.525921595
+1428.290598 , -1351.35 , 10.7730216
+1428.290598 , -1158.3 , 15.0201216
+1428.290598 , -965.25 , 19.2672216
+1428.290598 , -772.2 , 23.5143216
+1428.290598 , -579.15 , 27.7614216
+1428.290598 , -386.1 , 32.0085216
+1428.290598 , -193.05 , 36.2556216
+1428.290598 , 0 , 40.5027216
+1428.290598 , 193.05 , 44.7498216
+1428.290598 , 386.1 , 48.9969216
+1428.290598 , 579.15 , 53.2440216
+1428.290598 , 772.2 , 57.4911216
+1428.290598 , 965.25 , 61.7382216
+1428.290598 , 1158.3 , 65.9853216
+1428.290598 , 1351.35 , 70.2324216
+1428.290598 , 1544.4 , 74.4795216
+1428.290598 , 1737.45 , 78.7266216
+1428.290598 , 1930.5 , 82.9737216
+1428.290598 , 2123.55 , 87.2208216
+1428.290598 , 2316.6 , 91.4679216
+1428.290598 , 2509.65 , 95.7150216
+1428.290598 , 2702.7 , 99.9621216
+1428.290598 , 2895.75 , 104.2092216
+1428.290598 , 3088.8 , 108.4563216
+1428.290598 , 3281.85 , 112.7034216
+1428.290598 , 3474.9 , 116.9505216
+1428.290598 , 3667.95 , 121.1976216
+1428.290598 , 3861 , 125.4447216
+1428.290598 , 4054.05 , 129.6918216
+1428.290598 , 4247.1 , 133.9389216
+1428.290598 , 4440.15 , 138.1860216
+1428.290598 , 4633.2 , 142.4331216
+1428.290598 , 4826.25 , 146.6802216
+1428.290598 , 5019.3 , 150.9273216
+1428.290598 , 5212.35 , 155.1744216
+1428.290598 , 5405.4 , 159.4215216
+1428.290598 , 5598.45 , 163.6686216
+1428.290598 , 5791.5 , 167.9157216
+1428.290598 , 5984.55 , 172.1628216
+1428.290598 , 6177.6 , 176.4099216
+1632.393162 , -6177.6 , 92.00014561
+1632.393162 , -5984.55 , 87.75304561
+1632.393162 , -5791.5 , 83.50594561
+1632.393162 , -5598.45 , 79.25884561
+1632.393162 , -5405.4 , 75.01174561
+1632.393162 , -5212.35 , 70.76464561
+1632.393162 , -5019.3 , 66.51754561
+1632.393162 , -4826.25 , 62.27044561
+1632.393162 , -4633.2 , 58.02334561
+1632.393162 , -4440.15 , 53.77624561
+1632.393162 , -4247.1 , 49.52914561
+1632.393162 , -4054.05 , 45.28204561
+1632.393162 , -3861 , 41.03494561
+1632.393162 , -3667.95 , 36.78784561
+1632.393162 , -3474.9 , 32.54074561
+1632.393162 , -3281.85 , 28.29364561
+1632.393162 , -3088.8 , 24.04654561
+1632.393162 , -2895.75 , 19.79944561
+1632.393162 , -2702.7 , 15.55234561
+1632.393162 , -2509.65 , 11.30524561
+1632.393162 , -2316.6 , 7.058145607
+1632.393162 , -2123.55 , 2.811045607
+1632.393162 , -1930.5 , 1.436054393
+1632.393162 , -1737.45 , 5.683154393
+1632.393162 , -1544.4 , 9.930254393
+1632.393162 , -1351.35 , 14.17735439
+1632.393162 , -1158.3 , 18.42445439
+1632.393162 , -965.25 , 22.67155439
+1632.393162 , -772.2 , 26.91865439
+1632.393162 , -579.15 , 31.16575439
+1632.393162 , -386.1 , 35.41285439
+1632.393162 , -193.05 , 39.65995439
+1632.393162 , 0 , 43.90705439
+1632.393162 , 193.05 , 48.15415439
+1632.393162 , 386.1 , 52.40125439
+1632.393162 , 579.15 , 56.64835439
+1632.393162 , 772.2 , 60.89545439
+1632.393162 , 965.25 , 65.14255439
+1632.393162 , 1158.3 , 69.38965439
+1632.393162 , 1351.35 , 73.63675439
+1632.393162 , 1544.4 , 77.88385439
+1632.393162 , 1737.45 , 82.13095439
+1632.393162 , 1930.5 , 86.37805439
+1632.393162 , 2123.55 , 90.62515439
+1632.393162 , 2316.6 , 94.87225439
+1632.393162 , 2509.65 , 99.11935439
+1632.393162 , 2702.7 , 103.3664544
+1632.393162 , 2895.75 , 107.6135544
+1632.393162 , 3088.8 , 111.8606544
+1632.393162 , 3281.85 , 116.1077544
+1632.393162 , 3474.9 , 120.3548544
+1632.393162 , 3667.95 , 124.6019544
+1632.393162 , 3861 , 128.8490544
+1632.393162 , 4054.05 , 133.0961544
+1632.393162 , 4247.1 , 137.3432544
+1632.393162 , 4440.15 , 141.5903544
+1632.393162 , 4633.2 , 145.8374544
+1632.393162 , 4826.25 , 150.0845544
+1632.393162 , 5019.3 , 154.3316544
+1632.393162 , 5212.35 , 158.5787544
+1632.393162 , 5405.4 , 162.8258544
+1632.393162 , 5598.45 , 167.0729544
+1632.393162 , 5791.5 , 171.3200544
+1632.393162 , 5984.55 , 175.5671544
+1632.393162 , 6177.6 , 179.8142544
+1836.410256 , -6177.6 , 88.59723841
+1836.410256 , -5984.55 , 84.35013841
+1836.410256 , -5791.5 , 80.10303841
+1836.410256 , -5598.45 , 75.85593841
+1836.410256 , -5405.4 , 71.60883841
+1836.410256 , -5212.35 , 67.36173841
+1836.410256 , -5019.3 , 63.11463841
+1836.410256 , -4826.25 , 58.86753841
+1836.410256 , -4633.2 , 54.62043841
+1836.410256 , -4440.15 , 50.37333841
+1836.410256 , -4247.1 , 46.12623841
+1836.410256 , -4054.05 , 41.87913841
+1836.410256 , -3861 , 37.63203841
+1836.410256 , -3667.95 , 33.38493841
+1836.410256 , -3474.9 , 29.13783841
+1836.410256 , -3281.85 , 24.89073841
+1836.410256 , -3088.8 , 20.64363841
+1836.410256 , -2895.75 , 16.39653841
+1836.410256 , -2702.7 , 12.14943841
+1836.410256 , -2509.65 , 7.902338407
+1836.410256 , -2316.6 , 3.655238407
+1836.410256 , -2123.55 , 0.591861593
+1836.410256 , -1930.5 , 4.838961593
+1836.410256 , -1737.45 , 9.086061593
+1836.410256 , -1544.4 , 13.33316159
+1836.410256 , -1351.35 , 17.58026159
+1836.410256 , -1158.3 , 21.82736159
+1836.410256 , -965.25 , 26.07446159
+1836.410256 , -772.2 , 30.32156159
+1836.410256 , -579.15 , 34.56866159
+1836.410256 , -386.1 , 38.81576159
+1836.410256 , -193.05 , 43.06286159
+1836.410256 , 0 , 47.30996159
+1836.410256 , 193.05 , 51.55706159
+1836.410256 , 386.1 , 55.80416159
+1836.410256 , 579.15 , 60.05126159
+1836.410256 , 772.2 , 64.29836159
+1836.410256 , 965.25 , 68.54546159
+1836.410256 , 1158.3 , 72.79256159
+1836.410256 , 1351.35 , 77.03966159
+1836.410256 , 1544.4 , 81.28676159
+1836.410256 , 1737.45 , 85.53386159
+1836.410256 , 1930.5 , 89.78096159
+1836.410256 , 2123.55 , 94.02806159
+1836.410256 , 2316.6 , 98.27516159
+1836.410256 , 2509.65 , 102.5222616
+1836.410256 , 2702.7 , 106.7693616
+1836.410256 , 2895.75 , 111.0164616
+1836.410256 , 3088.8 , 115.2635616
+1836.410256 , 3281.85 , 119.5106616
+1836.410256 , 3474.9 , 123.7577616
+1836.410256 , 3667.95 , 128.0048616
+1836.410256 , 3861 , 132.2519616
+1836.410256 , 4054.05 , 136.4990616
+1836.410256 , 4247.1 , 140.7461616
+1836.410256 , 4440.15 , 144.9932616
+1836.410256 , 4633.2 , 149.2403616
+1836.410256 , 4826.25 , 153.4874616
+1836.410256 , 5019.3 , 157.7345616
+1836.410256 , 5212.35 , 161.9816616
+1836.410256 , 5405.4 , 166.2287616
+1836.410256 , 5598.45 , 170.4758616
+1836.410256 , 5791.5 , 174.7229616
+1836.410256 , 5984.55 , 178.9700616
+1836.410256 , 6177.6 , 183.2171616
+2040.42735 , -6177.6 , 85.19433121
+2040.42735 , -5984.55 , 80.94723121
+2040.42735 , -5791.5 , 76.70013121
+2040.42735 , -5598.45 , 72.45303121
+2040.42735 , -5405.4 , 68.20593121
+2040.42735 , -5212.35 , 63.95883121
+2040.42735 , -5019.3 , 59.71173121
+2040.42735 , -4826.25 , 55.46463121
+2040.42735 , -4633.2 , 51.21753121
+2040.42735 , -4440.15 , 46.97043121
+2040.42735 , -4247.1 , 42.72333121
+2040.42735 , -4054.05 , 38.47623121
+2040.42735 , -3861 , 34.22913121
+2040.42735 , -3667.95 , 29.98203121
+2040.42735 , -3474.9 , 25.73493121
+2040.42735 , -3281.85 , 21.48783121
+2040.42735 , -3088.8 , 17.24073121
+2040.42735 , -2895.75 , 12.99363121
+2040.42735 , -2702.7 , 8.746531207
+2040.42735 , -2509.65 , 4.499431207
+2040.42735 , -2316.6 , 0.252331207
+2040.42735 , -2123.55 , 3.994768793
+2040.42735 , -1930.5 , 8.241868793
+2040.42735 , -1737.45 , 12.48896879
+2040.42735 , -1544.4 , 16.73606879
+2040.42735 , -1351.35 , 20.98316879
+2040.42735 , -1158.3 , 25.23026879
+2040.42735 , -965.25 , 29.47736879
+2040.42735 , -772.2 , 33.72446879
+2040.42735 , -579.15 , 37.97156879
+2040.42735 , -386.1 , 42.21866879
+2040.42735 , -193.05 , 46.46576879
+2040.42735 , 0 , 50.71286879
+2040.42735 , 193.05 , 54.95996879
+2040.42735 , 386.1 , 59.20706879
+2040.42735 , 579.15 , 63.45416879
+2040.42735 , 772.2 , 67.70126879
+2040.42735 , 965.25 , 71.94836879
+2040.42735 , 1158.3 , 76.19546879
+2040.42735 , 1351.35 , 80.44256879
+2040.42735 , 1544.4 , 84.68966879
+2040.42735 , 1737.45 , 88.93676879
+2040.42735 , 1930.5 , 93.18386879
+2040.42735 , 2123.55 , 97.43096879
+2040.42735 , 2316.6 , 101.6780688
+2040.42735 , 2509.65 , 105.9251688
+2040.42735 , 2702.7 , 110.1722688
+2040.42735 , 2895.75 , 114.4193688
+2040.42735 , 3088.8 , 118.6664688
+2040.42735 , 3281.85 , 122.9135688
+2040.42735 , 3474.9 , 127.1606688
+2040.42735 , 3667.95 , 131.4077688
+2040.42735 , 3861 , 135.6548688
+2040.42735 , 4054.05 , 139.9019688
+2040.42735 , 4247.1 , 144.1490688
+2040.42735 , 4440.15 , 148.3961688
+2040.42735 , 4633.2 , 152.6432688
+2040.42735 , 4826.25 , 156.8903688
+2040.42735 , 5019.3 , 161.1374688
+2040.42735 , 5212.35 , 165.3845688
+2040.42735 , 5405.4 , 169.6316688
+2040.42735 , 5598.45 , 173.8787688
+2040.42735 , 5791.5 , 178.1258688
+2040.42735 , 5984.55 , 182.3729688
+2040.42735 , 6177.6 , 186.6200688
+2244.529915 , -6177.6 , 81.78999839
+2244.529915 , -5984.55 , 77.54289839
+2244.529915 , -5791.5 , 73.29579839
+2244.529915 , -5598.45 , 69.04869839
+2244.529915 , -5405.4 , 64.80159839
+2244.529915 , -5212.35 , 60.55449839
+2244.529915 , -5019.3 , 56.30739839
+2244.529915 , -4826.25 , 52.06029839
+2244.529915 , -4633.2 , 47.81319839
+2244.529915 , -4440.15 , 43.56609839
+2244.529915 , -4247.1 , 39.31899839
+2244.529915 , -4054.05 , 35.07189839
+2244.529915 , -3861 , 30.82479839
+2244.529915 , -3667.95 , 26.57769839
+2244.529915 , -3474.9 , 22.33059839
+2244.529915 , -3281.85 , 18.08349839
+2244.529915 , -3088.8 , 13.83639839
+2244.529915 , -2895.75 , 9.589298392
+2244.529915 , -2702.7 , 5.342198392
+2244.529915 , -2509.65 , 1.095098392
+2244.529915 , -2316.6 , 3.152001608
+2244.529915 , -2123.55 , 7.399101608
+2244.529915 , -1930.5 , 11.64620161
+2244.529915 , -1737.45 , 15.89330161
+2244.529915 , -1544.4 , 20.14040161
+2244.529915 , -1351.35 , 24.38750161
+2244.529915 , -1158.3 , 28.63460161
+2244.529915 , -965.25 , 32.88170161
+2244.529915 , -772.2 , 37.12880161
+2244.529915 , -579.15 , 41.37590161
+2244.529915 , -386.1 , 45.62300161
+2244.529915 , -193.05 , 49.87010161
+2244.529915 , 0 , 54.11720161
+2244.529915 , 193.05 , 58.36430161
+2244.529915 , 386.1 , 62.61140161
+2244.529915 , 579.15 , 66.85850161
+2244.529915 , 772.2 , 71.10560161
+2244.529915 , 965.25 , 75.35270161
+2244.529915 , 1158.3 , 79.59980161
+2244.529915 , 1351.35 , 83.84690161
+2244.529915 , 1544.4 , 88.09400161
+2244.529915 , 1737.45 , 92.34110161
+2244.529915 , 1930.5 , 96.58820161
+2244.529915 , 2123.55 , 100.8353016
+2244.529915 , 2316.6 , 105.0824016
+2244.529915 , 2509.65 , 109.3295016
+2244.529915 , 2702.7 , 113.5766016
+2244.529915 , 2895.75 , 117.8237016
+2244.529915 , 3088.8 , 122.0708016
+2244.529915 , 3281.85 , 126.3179016
+2244.529915 , 3474.9 , 130.5650016
+2244.529915 , 3667.95 , 134.8121016
+2244.529915 , 3861 , 139.0592016
+2244.529915 , 4054.05 , 143.3063016
+2244.529915 , 4247.1 , 147.5534016
+2244.529915 , 4440.15 , 151.8005016
+2244.529915 , 4633.2 , 156.0476016
+2244.529915 , 4826.25 , 160.2947016
+2244.529915 , 5019.3 , 164.5418016
+2244.529915 , 5212.35 , 168.7889016
+2244.529915 , 5405.4 , 173.0360016
+2244.529915 , 5598.45 , 177.2831016
+2244.529915 , 5791.5 , 181.5302016
+2244.529915 , 5984.55 , 185.7773016
+2244.529915 , 6177.6 , 190.0244016
+2448.547009 , -6177.6 , 78.38709119
+2448.547009 , -5984.55 , 74.13999119
+2448.547009 , -5791.5 , 69.89289119
+2448.547009 , -5598.45 , 65.64579119
+2448.547009 , -5405.4 , 61.39869119
+2448.547009 , -5212.35 , 57.15159119
+2448.547009 , -5019.3 , 52.90449119
+2448.547009 , -4826.25 , 48.65739119
+2448.547009 , -4633.2 , 44.41029119
+2448.547009 , -4440.15 , 40.16319119
+2448.547009 , -4247.1 , 35.91609119
+2448.547009 , -4054.05 , 31.66899119
+2448.547009 , -3861 , 27.42189119
+2448.547009 , -3667.95 , 23.17479119
+2448.547009 , -3474.9 , 18.92769119
+2448.547009 , -3281.85 , 14.68059119
+2448.547009 , -3088.8 , 10.43349119
+2448.547009 , -2895.75 , 6.186391192
+2448.547009 , -2702.7 , 1.939291192
+2448.547009 , -2509.65 , 2.307808808
+2448.547009 , -2316.6 , 6.554908808
+2448.547009 , -2123.55 , 10.80200881
+2448.547009 , -1930.5 , 15.04910881
+2448.547009 , -1737.45 , 19.29620881
+2448.547009 , -1544.4 , 23.54330881
+2448.547009 , -1351.35 , 27.79040881
+2448.547009 , -1158.3 , 32.03750881
+2448.547009 , -965.25 , 36.28460881
+2448.547009 , -772.2 , 40.53170881
+2448.547009 , -579.15 , 44.77880881
+2448.547009 , -386.1 , 49.02590881
+2448.547009 , -193.05 , 53.27300881
+2448.547009 , 0 , 57.52010881
+2448.547009 , 193.05 , 61.76720881
+2448.547009 , 386.1 , 66.01430881
+2448.547009 , 579.15 , 70.26140881
+2448.547009 , 772.2 , 74.50850881
+2448.547009 , 965.25 , 78.75560881
+2448.547009 , 1158.3 , 83.00270881
+2448.547009 , 1351.35 , 87.24980881
+2448.547009 , 1544.4 , 91.49690881
+2448.547009 , 1737.45 , 95.74400881
+2448.547009 , 1930.5 , 99.99110881
+2448.547009 , 2123.55 , 104.2382088
+2448.547009 , 2316.6 , 108.4853088
+2448.547009 , 2509.65 , 112.7324088
+2448.547009 , 2702.7 , 116.9795088
+2448.547009 , 2895.75 , 121.2266088
+2448.547009 , 3088.8 , 125.4737088
+2448.547009 , 3281.85 , 129.7208088
+2448.547009 , 3474.9 , 133.9679088
+2448.547009 , 3667.95 , 138.2150088
+2448.547009 , 3861 , 142.4621088
+2448.547009 , 4054.05 , 146.7092088
+2448.547009 , 4247.1 , 150.9563088
+2448.547009 , 4440.15 , 155.2034088
+2448.547009 , 4633.2 , 159.4505088
+2448.547009 , 4826.25 , 163.6976088
+2448.547009 , 5019.3 , 167.9447088
+2448.547009 , 5212.35 , 172.1918088
+2448.547009 , 5405.4 , 176.4389088
+2448.547009 , 5598.45 , 180.6860088
+2448.547009 , 5791.5 , 184.9331088
+2448.547009 , 5984.55 , 189.1802088
+2448.547009 , 6177.6 , 193.4273088
+2652.564103 , -6177.6 , 74.98418399
+2652.564103 , -5984.55 , 70.73708399
+2652.564103 , -5791.5 , 66.48998399
+2652.564103 , -5598.45 , 62.24288399
+2652.564103 , -5405.4 , 57.99578399
+2652.564103 , -5212.35 , 53.74868399
+2652.564103 , -5019.3 , 49.50158399
+2652.564103 , -4826.25 , 45.25448399
+2652.564103 , -4633.2 , 41.00738399
+2652.564103 , -4440.15 , 36.76028399
+2652.564103 , -4247.1 , 32.51318399
+2652.564103 , -4054.05 , 28.26608399
+2652.564103 , -3861 , 24.01898399
+2652.564103 , -3667.95 , 19.77188399
+2652.564103 , -3474.9 , 15.52478399
+2652.564103 , -3281.85 , 11.27768399
+2652.564103 , -3088.8 , 7.030583993
+2652.564103 , -2895.75 , 2.783483993
+2652.564103 , -2702.7 , 1.463616007
+2652.564103 , -2509.65 , 5.710716007
+2652.564103 , -2316.6 , 9.957816007
+2652.564103 , -2123.55 , 14.20491601
+2652.564103 , -1930.5 , 18.45201601
+2652.564103 , -1737.45 , 22.69911601
+2652.564103 , -1544.4 , 26.94621601
+2652.564103 , -1351.35 , 31.19331601
+2652.564103 , -1158.3 , 35.44041601
+2652.564103 , -965.25 , 39.68751601
+2652.564103 , -772.2 , 43.93461601
+2652.564103 , -579.15 , 48.18171601
+2652.564103 , -386.1 , 52.42881601
+2652.564103 , -193.05 , 56.67591601
+2652.564103 , 0 , 60.92301601
+2652.564103 , 193.05 , 65.17011601
+2652.564103 , 386.1 , 69.41721601
+2652.564103 , 579.15 , 73.66431601
+2652.564103 , 772.2 , 77.91141601
+2652.564103 , 965.25 , 82.15851601
+2652.564103 , 1158.3 , 86.40561601
+2652.564103 , 1351.35 , 90.65271601
+2652.564103 , 1544.4 , 94.89981601
+2652.564103 , 1737.45 , 99.14691601
+2652.564103 , 1930.5 , 103.394016
+2652.564103 , 2123.55 , 107.641116
+2652.564103 , 2316.6 , 111.888216
+2652.564103 , 2509.65 , 116.135316
+2652.564103 , 2702.7 , 120.382416
+2652.564103 , 2895.75 , 124.629516
+2652.564103 , 3088.8 , 128.876616
+2652.564103 , 3281.85 , 133.123716
+2652.564103 , 3474.9 , 137.370816
+2652.564103 , 3667.95 , 141.617916
+2652.564103 , 3861 , 145.865016
+2652.564103 , 4054.05 , 150.112116
+2652.564103 , 4247.1 , 154.359216
+2652.564103 , 4440.15 , 158.606316
+2652.564103 , 4633.2 , 162.853416
+2652.564103 , 4826.25 , 167.100516
+2652.564103 , 5019.3 , 171.347616
+2652.564103 , 5212.35 , 175.594716
+2652.564103 , 5405.4 , 179.841816
+2652.564103 , 5598.45 , 184.088916
+2652.564103 , 5791.5 , 188.336016
+2652.564103 , 5984.55 , 192.583116
+2652.564103 , 6177.6 , 196.830216
+2856.666667 , -6177.6 , 71.57985119
+2856.666667 , -5984.55 , 67.33275119
+2856.666667 , -5791.5 , 63.08565119
+2856.666667 , -5598.45 , 58.83855119
+2856.666667 , -5405.4 , 54.59145119
+2856.666667 , -5212.35 , 50.34435119
+2856.666667 , -5019.3 , 46.09725119
+2856.666667 , -4826.25 , 41.85015119
+2856.666667 , -4633.2 , 37.60305119
+2856.666667 , -4440.15 , 33.35595119
+2856.666667 , -4247.1 , 29.10885119
+2856.666667 , -4054.05 , 24.86175119
+2856.666667 , -3861 , 20.61465119
+2856.666667 , -3667.95 , 16.36755119
+2856.666667 , -3474.9 , 12.12045119
+2856.666667 , -3281.85 , 7.873351194
+2856.666667 , -3088.8 , 3.626251194
+2856.666667 , -2895.75 , 0.620848806
+2856.666667 , -2702.7 , 4.867948806
+2856.666667 , -2509.65 , 9.115048806
+2856.666667 , -2316.6 , 13.36214881
+2856.666667 , -2123.55 , 17.60924881
+2856.666667 , -1930.5 , 21.85634881
+2856.666667 , -1737.45 , 26.10344881
+2856.666667 , -1544.4 , 30.35054881
+2856.666667 , -1351.35 , 34.59764881
+2856.666667 , -1158.3 , 38.84474881
+2856.666667 , -965.25 , 43.09184881
+2856.666667 , -772.2 , 47.33894881
+2856.666667 , -579.15 , 51.58604881
+2856.666667 , -386.1 , 55.83314881
+2856.666667 , -193.05 , 60.08024881
+2856.666667 , 0 , 64.32734881
+2856.666667 , 193.05 , 68.57444881
+2856.666667 , 386.1 , 72.82154881
+2856.666667 , 579.15 , 77.06864881
+2856.666667 , 772.2 , 81.31574881
+2856.666667 , 965.25 , 85.56284881
+2856.666667 , 1158.3 , 89.80994881
+2856.666667 , 1351.35 , 94.05704881
+2856.666667 , 1544.4 , 98.30414881
+2856.666667 , 1737.45 , 102.5512488
+2856.666667 , 1930.5 , 106.7983488
+2856.666667 , 2123.55 , 111.0454488
+2856.666667 , 2316.6 , 115.2925488
+2856.666667 , 2509.65 , 119.5396488
+2856.666667 , 2702.7 , 123.7867488
+2856.666667 , 2895.75 , 128.0338488
+2856.666667 , 3088.8 , 132.2809488
+2856.666667 , 3281.85 , 136.5280488
+2856.666667 , 3474.9 , 140.7751488
+2856.666667 , 3667.95 , 145.0222488
+2856.666667 , 3861 , 149.2693488
+2856.666667 , 4054.05 , 153.5164488
+2856.666667 , 4247.1 , 157.7635488
+2856.666667 , 4440.15 , 162.0106488
+2856.666667 , 4633.2 , 166.2577488
+2856.666667 , 4826.25 , 170.5048488
+2856.666667 , 5019.3 , 174.7519488
+2856.666667 , 5212.35 , 178.9990488
+2856.666667 , 5405.4 , 183.2461488
+2856.666667 , 5598.45 , 187.4932488
+2856.666667 , 5791.5 , 191.7403488
+2856.666667 , 5984.55 , 195.9874488
+2856.666667 , 6177.6 , 200.2345488
+3060.683761 , -6177.6 , 68.17694399
+3060.683761 , -5984.55 , 63.92984399
+3060.683761 , -5791.5 , 59.68274399
+3060.683761 , -5598.45 , 55.43564399
+3060.683761 , -5405.4 , 51.18854399
+3060.683761 , -5212.35 , 46.94144399
+3060.683761 , -5019.3 , 42.69434399
+3060.683761 , -4826.25 , 38.44724399
+3060.683761 , -4633.2 , 34.20014399
+3060.683761 , -4440.15 , 29.95304399
+3060.683761 , -4247.1 , 25.70594399
+3060.683761 , -4054.05 , 21.45884399
+3060.683761 , -3861 , 17.21174399
+3060.683761 , -3667.95 , 12.96464399
+3060.683761 , -3474.9 , 8.717543995
+3060.683761 , -3281.85 , 4.470443995
+3060.683761 , -3088.8 , 0.223343995
+3060.683761 , -2895.75 , 4.023756005
+3060.683761 , -2702.7 , 8.270856005
+3060.683761 , -2509.65 , 12.51795601
+3060.683761 , -2316.6 , 16.76505601
+3060.683761 , -2123.55 , 21.01215601
+3060.683761 , -1930.5 , 25.25925601
+3060.683761 , -1737.45 , 29.50635601
+3060.683761 , -1544.4 , 33.75345601
+3060.683761 , -1351.35 , 38.00055601
+3060.683761 , -1158.3 , 42.24765601
+3060.683761 , -965.25 , 46.49475601
+3060.683761 , -772.2 , 50.74185601
+3060.683761 , -579.15 , 54.98895601
+3060.683761 , -386.1 , 59.23605601
+3060.683761 , -193.05 , 63.48315601
+3060.683761 , 0 , 67.73025601
+3060.683761 , 193.05 , 71.97735601
+3060.683761 , 386.1 , 76.22445601
+3060.683761 , 579.15 , 80.47155601
+3060.683761 , 772.2 , 84.71865601
+3060.683761 , 965.25 , 88.96575601
+3060.683761 , 1158.3 , 93.21285601
+3060.683761 , 1351.35 , 97.45995601
+3060.683761 , 1544.4 , 101.707056
+3060.683761 , 1737.45 , 105.954156
+3060.683761 , 1930.5 , 110.201256
+3060.683761 , 2123.55 , 114.448356
+3060.683761 , 2316.6 , 118.695456
+3060.683761 , 2509.65 , 122.942556
+3060.683761 , 2702.7 , 127.189656
+3060.683761 , 2895.75 , 131.436756
+3060.683761 , 3088.8 , 135.683856
+3060.683761 , 3281.85 , 139.930956
+3060.683761 , 3474.9 , 144.178056
+3060.683761 , 3667.95 , 148.425156
+3060.683761 , 3861 , 152.672256
+3060.683761 , 4054.05 , 156.919356
+3060.683761 , 4247.1 , 161.166456
+3060.683761 , 4440.15 , 165.413556
+3060.683761 , 4633.2 , 169.660656
+3060.683761 , 4826.25 , 173.907756
+3060.683761 , 5019.3 , 178.154856
+3060.683761 , 5212.35 , 182.401956
+3060.683761 , 5405.4 , 186.649056
+3060.683761 , 5598.45 , 190.896156
+3060.683761 , 5791.5 , 195.143256
+3060.683761 , 5984.55 , 199.390356
+3060.683761 , 6177.6 , 203.637456
+3264.700855 , -6177.6 , 64.7740368
+3264.700855 , -5984.55 , 60.5269368
+3264.700855 , -5791.5 , 56.2798368
+3264.700855 , -5598.45 , 52.0327368
+3264.700855 , -5405.4 , 47.7856368
+3264.700855 , -5212.35 , 43.5385368
+3264.700855 , -5019.3 , 39.2914368
+3264.700855 , -4826.25 , 35.0443368
+3264.700855 , -4633.2 , 30.7972368
+3264.700855 , -4440.15 , 26.5501368
+3264.700855 , -4247.1 , 22.3030368
+3264.700855 , -4054.05 , 18.0559368
+3264.700855 , -3861 , 13.8088368
+3264.700855 , -3667.95 , 9.561736795
+3264.700855 , -3474.9 , 5.314636795
+3264.700855 , -3281.85 , 1.067536795
+3264.700855 , -3088.8 , 3.179563205
+3264.700855 , -2895.75 , 7.426663205
+3264.700855 , -2702.7 , 11.6737632
+3264.700855 , -2509.65 , 15.9208632
+3264.700855 , -2316.6 , 20.1679632
+3264.700855 , -2123.55 , 24.4150632
+3264.700855 , -1930.5 , 28.6621632
+3264.700855 , -1737.45 , 32.9092632
+3264.700855 , -1544.4 , 37.1563632
+3264.700855 , -1351.35 , 41.4034632
+3264.700855 , -1158.3 , 45.6505632
+3264.700855 , -965.25 , 49.8976632
+3264.700855 , -772.2 , 54.1447632
+3264.700855 , -579.15 , 58.3918632
+3264.700855 , -386.1 , 62.6389632
+3264.700855 , -193.05 , 66.8860632
+3264.700855 , 0 , 71.1331632
+3264.700855 , 193.05 , 75.3802632
+3264.700855 , 386.1 , 79.6273632
+3264.700855 , 579.15 , 83.8744632
+3264.700855 , 772.2 , 88.1215632
+3264.700855 , 965.25 , 92.3686632
+3264.700855 , 1158.3 , 96.6157632
+3264.700855 , 1351.35 , 100.8628632
+3264.700855 , 1544.4 , 105.1099632
+3264.700855 , 1737.45 , 109.3570632
+3264.700855 , 1930.5 , 113.6041632
+3264.700855 , 2123.55 , 117.8512632
+3264.700855 , 2316.6 , 122.0983632
+3264.700855 , 2509.65 , 126.3454632
+3264.700855 , 2702.7 , 130.5925632
+3264.700855 , 2895.75 , 134.8396632
+3264.700855 , 3088.8 , 139.0867632
+3264.700855 , 3281.85 , 143.3338632
+3264.700855 , 3474.9 , 147.5809632
+3264.700855 , 3667.95 , 151.8280632
+3264.700855 , 3861 , 156.0751632
+3264.700855 , 4054.05 , 160.3222632
+3264.700855 , 4247.1 , 164.5693632
+3264.700855 , 4440.15 , 168.8164632
+3264.700855 , 4633.2 , 173.0635632
+3264.700855 , 4826.25 , 177.3106632
+3264.700855 , 5019.3 , 181.5577632
+3264.700855 , 5212.35 , 185.8048632
+3264.700855 , 5405.4 , 190.0519632
+3264.700855 , 5598.45 , 194.2990632
+3264.700855 , 5791.5 , 198.5461632
+3264.700855 , 5984.55 , 202.7932632
+3264.700855 , 6177.6 , 207.0403632
+3468.803419 , -6177.6 , 61.369704
+3468.803419 , -5984.55 , 57.122604
+3468.803419 , -5791.5 , 52.875504
+3468.803419 , -5598.45 , 48.628404
+3468.803419 , -5405.4 , 44.381304
+3468.803419 , -5212.35 , 40.134204
+3468.803419 , -5019.3 , 35.887104
+3468.803419 , -4826.25 , 31.640004
+3468.803419 , -4633.2 , 27.392904
+3468.803419 , -4440.15 , 23.145804
+3468.803419 , -4247.1 , 18.898704
+3468.803419 , -4054.05 , 14.651604
+3468.803419 , -3861 , 10.404504
+3468.803419 , -3667.95 , 6.157403997
+3468.803419 , -3474.9 , 1.910303997
+3468.803419 , -3281.85 , 2.336796003
+3468.803419 , -3088.8 , 6.583896003
+3468.803419 , -2895.75 , 10.830996
+3468.803419 , -2702.7 , 15.078096
+3468.803419 , -2509.65 , 19.325196
+3468.803419 , -2316.6 , 23.572296
+3468.803419 , -2123.55 , 27.819396
+3468.803419 , -1930.5 , 32.066496
+3468.803419 , -1737.45 , 36.313596
+3468.803419 , -1544.4 , 40.560696
+3468.803419 , -1351.35 , 44.807796
+3468.803419 , -1158.3 , 49.054896
+3468.803419 , -965.25 , 53.301996
+3468.803419 , -772.2 , 57.549096
+3468.803419 , -579.15 , 61.796196
+3468.803419 , -386.1 , 66.043296
+3468.803419 , -193.05 , 70.290396
+3468.803419 , 0 , 74.537496
+3468.803419 , 193.05 , 78.784596
+3468.803419 , 386.1 , 83.031696
+3468.803419 , 579.15 , 87.278796
+3468.803419 , 772.2 , 91.525896
+3468.803419 , 965.25 , 95.772996
+3468.803419 , 1158.3 , 100.020096
+3468.803419 , 1351.35 , 104.267196
+3468.803419 , 1544.4 , 108.514296
+3468.803419 , 1737.45 , 112.761396
+3468.803419 , 1930.5 , 117.008496
+3468.803419 , 2123.55 , 121.255596
+3468.803419 , 2316.6 , 125.502696
+3468.803419 , 2509.65 , 129.749796
+3468.803419 , 2702.7 , 133.996896
+3468.803419 , 2895.75 , 138.243996
+3468.803419 , 3088.8 , 142.491096
+3468.803419 , 3281.85 , 146.738196
+3468.803419 , 3474.9 , 150.985296
+3468.803419 , 3667.95 , 155.232396
+3468.803419 , 3861 , 159.479496
+3468.803419 , 4054.05 , 163.726596
+3468.803419 , 4247.1 , 167.973696
+3468.803419 , 4440.15 , 172.220796
+3468.803419 , 4633.2 , 176.467896
+3468.803419 , 4826.25 , 180.714996
+3468.803419 , 5019.3 , 184.962096
+3468.803419 , 5212.35 , 189.209196
+3468.803419 , 5405.4 , 193.456296
+3468.803419 , 5598.45 , 197.703396
+3468.803419 , 5791.5 , 201.950496
+3468.803419 , 5984.55 , 206.197596
+3468.803419 , 6177.6 , 210.444696
+3672.820513 , -6177.6 , 57.9667968
+3672.820513 , -5984.55 , 53.7196968
+3672.820513 , -5791.5 , 49.4725968
+3672.820513 , -5598.45 , 45.2254968
+3672.820513 , -5405.4 , 40.9783968
+3672.820513 , -5212.35 , 36.7312968
+3672.820513 , -5019.3 , 32.4841968
+3672.820513 , -4826.25 , 28.2370968
+3672.820513 , -4633.2 , 23.9899968
+3672.820513 , -4440.15 , 19.7428968
+3672.820513 , -4247.1 , 15.4957968
+3672.820513 , -4054.05 , 11.2486968
+3672.820513 , -3861 , 7.001596797
+3672.820513 , -3667.95 , 2.754496797
+3672.820513 , -3474.9 , 1.492603203
+3672.820513 , -3281.85 , 5.739703203
+3672.820513 , -3088.8 , 9.986803203
+3672.820513 , -2895.75 , 14.2339032
+3672.820513 , -2702.7 , 18.4810032
+3672.820513 , -2509.65 , 22.7281032
+3672.820513 , -2316.6 , 26.9752032
+3672.820513 , -2123.55 , 31.2223032
+3672.820513 , -1930.5 , 35.4694032
+3672.820513 , -1737.45 , 39.7165032
+3672.820513 , -1544.4 , 43.9636032
+3672.820513 , -1351.35 , 48.2107032
+3672.820513 , -1158.3 , 52.4578032
+3672.820513 , -965.25 , 56.7049032
+3672.820513 , -772.2 , 60.9520032
+3672.820513 , -579.15 , 65.1991032
+3672.820513 , -386.1 , 69.4462032
+3672.820513 , -193.05 , 73.6933032
+3672.820513 , 0 , 77.9404032
+3672.820513 , 193.05 , 82.1875032
+3672.820513 , 386.1 , 86.4346032
+3672.820513 , 579.15 , 90.6817032
+3672.820513 , 772.2 , 94.9288032
+3672.820513 , 965.25 , 99.1759032
+3672.820513 , 1158.3 , 103.4230032
+3672.820513 , 1351.35 , 107.6701032
+3672.820513 , 1544.4 , 111.9172032
+3672.820513 , 1737.45 , 116.1643032
+3672.820513 , 1930.5 , 120.4114032
+3672.820513 , 2123.55 , 124.6585032
+3672.820513 , 2316.6 , 128.9056032
+3672.820513 , 2509.65 , 133.1527032
+3672.820513 , 2702.7 , 137.3998032
+3672.820513 , 2895.75 , 141.6469032
+3672.820513 , 3088.8 , 145.8940032
+3672.820513 , 3281.85 , 150.1411032
+3672.820513 , 3474.9 , 154.3882032
+3672.820513 , 3667.95 , 158.6353032
+3672.820513 , 3861 , 162.8824032
+3672.820513 , 4054.05 , 167.1295032
+3672.820513 , 4247.1 , 171.3766032
+3672.820513 , 4440.15 , 175.6237032
+3672.820513 , 4633.2 , 179.8708032
+3672.820513 , 4826.25 , 184.1179032
+3672.820513 , 5019.3 , 188.3650032
+3672.820513 , 5212.35 , 192.6121032
+3672.820513 , 5405.4 , 196.8592032
+3672.820513 , 5598.45 , 201.1063032
+3672.820513 , 5791.5 , 205.3534032
+3672.820513 , 5984.55 , 209.6005032
+3672.820513 , 6177.6 , 213.8476032
+3876.837607 , -6177.6 , 54.5638896
+3876.837607 , -5984.55 , 50.3167896
+3876.837607 , -5791.5 , 46.0696896
+3876.837607 , -5598.45 , 41.8225896
+3876.837607 , -5405.4 , 37.5754896
+3876.837607 , -5212.35 , 33.3283896
+3876.837607 , -5019.3 , 29.0812896
+3876.837607 , -4826.25 , 24.8341896
+3876.837607 , -4633.2 , 20.5870896
+3876.837607 , -4440.15 , 16.3399896
+3876.837607 , -4247.1 , 12.0928896
+3876.837607 , -4054.05 , 7.845789597
+3876.837607 , -3861 , 3.598689597
+3876.837607 , -3667.95 , 0.648410403
+3876.837607 , -3474.9 , 4.895510403
+3876.837607 , -3281.85 , 9.142610403
+3876.837607 , -3088.8 , 13.3897104
+3876.837607 , -2895.75 , 17.6368104
+3876.837607 , -2702.7 , 21.8839104
+3876.837607 , -2509.65 , 26.1310104
+3876.837607 , -2316.6 , 30.3781104
+3876.837607 , -2123.55 , 34.6252104
+3876.837607 , -1930.5 , 38.8723104
+3876.837607 , -1737.45 , 43.1194104
+3876.837607 , -1544.4 , 47.3665104
+3876.837607 , -1351.35 , 51.6136104
+3876.837607 , -1158.3 , 55.8607104
+3876.837607 , -965.25 , 60.1078104
+3876.837607 , -772.2 , 64.3549104
+3876.837607 , -579.15 , 68.6020104
+3876.837607 , -386.1 , 72.8491104
+3876.837607 , -193.05 , 77.0962104
+3876.837607 , 0 , 81.3433104
+3876.837607 , 193.05 , 85.5904104
+3876.837607 , 386.1 , 89.8375104
+3876.837607 , 579.15 , 94.0846104
+3876.837607 , 772.2 , 98.3317104
+3876.837607 , 965.25 , 102.5788104
+3876.837607 , 1158.3 , 106.8259104
+3876.837607 , 1351.35 , 111.0730104
+3876.837607 , 1544.4 , 115.3201104
+3876.837607 , 1737.45 , 119.5672104
+3876.837607 , 1930.5 , 123.8143104
+3876.837607 , 2123.55 , 128.0614104
+3876.837607 , 2316.6 , 132.3085104
+3876.837607 , 2509.65 , 136.5556104
+3876.837607 , 2702.7 , 140.8027104
+3876.837607 , 2895.75 , 145.0498104
+3876.837607 , 3088.8 , 149.2969104
+3876.837607 , 3281.85 , 153.5440104
+3876.837607 , 3474.9 , 157.7911104
+3876.837607 , 3667.95 , 162.0382104
+3876.837607 , 3861 , 166.2853104
+3876.837607 , 4054.05 , 170.5324104
+3876.837607 , 4247.1 , 174.7795104
+3876.837607 , 4440.15 , 179.0266104
+3876.837607 , 4633.2 , 183.2737104
+3876.837607 , 4826.25 , 187.5208104
+3876.837607 , 5019.3 , 191.7679104
+3876.837607 , 5212.35 , 196.0150104
+3876.837607 , 5405.4 , 200.2621104
+3876.837607 , 5598.45 , 204.5092104
+3876.837607 , 5791.5 , 208.7563104
+3876.837607 , 5984.55 , 213.0034104
+3876.837607 , 6177.6 , 217.2505104
+4080.854701 , -6177.6 , 51.1609824
+4080.854701 , -5984.55 , 46.9138824
+4080.854701 , -5791.5 , 42.6667824
+4080.854701 , -5598.45 , 38.4196824
+4080.854701 , -5405.4 , 34.1725824
+4080.854701 , -5212.35 , 29.9254824
+4080.854701 , -5019.3 , 25.6783824
+4080.854701 , -4826.25 , 21.4312824
+4080.854701 , -4633.2 , 17.1841824
+4080.854701 , -4440.15 , 12.9370824
+4080.854701 , -4247.1 , 8.689982398
+4080.854701 , -4054.05 , 4.442882398
+4080.854701 , -3861 , 0.195782398
+4080.854701 , -3667.95 , 4.051317602
+4080.854701 , -3474.9 , 8.298417602
+4080.854701 , -3281.85 , 12.5455176
+4080.854701 , -3088.8 , 16.7926176
+4080.854701 , -2895.75 , 21.0397176
+4080.854701 , -2702.7 , 25.2868176
+4080.854701 , -2509.65 , 29.5339176
+4080.854701 , -2316.6 , 33.7810176
+4080.854701 , -2123.55 , 38.0281176
+4080.854701 , -1930.5 , 42.2752176
+4080.854701 , -1737.45 , 46.5223176
+4080.854701 , -1544.4 , 50.7694176
+4080.854701 , -1351.35 , 55.0165176
+4080.854701 , -1158.3 , 59.2636176
+4080.854701 , -965.25 , 63.5107176
+4080.854701 , -772.2 , 67.7578176
+4080.854701 , -579.15 , 72.0049176
+4080.854701 , -386.1 , 76.2520176
+4080.854701 , -193.05 , 80.4991176
+4080.854701 , 0 , 84.7462176
+4080.854701 , 193.05 , 88.9933176
+4080.854701 , 386.1 , 93.2404176
+4080.854701 , 579.15 , 97.4875176
+4080.854701 , 772.2 , 101.7346176
+4080.854701 , 965.25 , 105.9817176
+4080.854701 , 1158.3 , 110.2288176
+4080.854701 , 1351.35 , 114.4759176
+4080.854701 , 1544.4 , 118.7230176
+4080.854701 , 1737.45 , 122.9701176
+4080.854701 , 1930.5 , 127.2172176
+4080.854701 , 2123.55 , 131.4643176
+4080.854701 , 2316.6 , 135.7114176
+4080.854701 , 2509.65 , 139.9585176
+4080.854701 , 2702.7 , 144.2056176
+4080.854701 , 2895.75 , 148.4527176
+4080.854701 , 3088.8 , 152.6998176
+4080.854701 , 3281.85 , 156.9469176
+4080.854701 , 3474.9 , 161.1940176
+4080.854701 , 3667.95 , 165.4411176
+4080.854701 , 3861 , 169.6882176
+4080.854701 , 4054.05 , 173.9353176
+4080.854701 , 4247.1 , 178.1824176
+4080.854701 , 4440.15 , 182.4295176
+4080.854701 , 4633.2 , 186.6766176
+4080.854701 , 4826.25 , 190.9237176
+4080.854701 , 5019.3 , 195.1708176
+4080.854701 , 5212.35 , 199.4179176
+4080.854701 , 5405.4 , 203.6650176
+4080.854701 , 5598.45 , 207.9121176
+4080.854701 , 5791.5 , 212.1592176
+4080.854701 , 5984.55 , 216.4063176
+4080.854701 , 6177.6 , 220.6534176
+4268.632479 , -6177.6 , 48.02893919
+4268.632479 , -5984.55 , 43.78183919
+4268.632479 , -5791.5 , 39.53473919
+4268.632479 , -5598.45 , 35.28763919
+4268.632479 , -5405.4 , 31.04053919
+4268.632479 , -5212.35 , 26.79343919
+4268.632479 , -5019.3 , 22.54633919
+4268.632479 , -4826.25 , 18.29923919
+4268.632479 , -4633.2 , 14.05213919
+4268.632479 , -4440.15 , 9.805039194
+4268.632479 , -4247.1 , 5.557939194
+4268.632479 , -4054.05 , 1.310839194
+4268.632479 , -3861 , 2.936260806
+4268.632479 , -3667.95 , 7.183360806
+4268.632479 , -3474.9 , 11.43046081
+4268.632479 , -3281.85 , 15.67756081
+4268.632479 , -3088.8 , 19.92466081
+4268.632479 , -2895.75 , 24.17176081
+4268.632479 , -2702.7 , 28.41886081
+4268.632479 , -2509.65 , 32.66596081
+4268.632479 , -2316.6 , 36.91306081
+4268.632479 , -2123.55 , 41.16016081
+4268.632479 , -1930.5 , 45.40726081
+4268.632479 , -1737.45 , 49.65436081
+4268.632479 , -1544.4 , 53.90146081
+4268.632479 , -1351.35 , 58.14856081
+4268.632479 , -1158.3 , 62.39566081
+4268.632479 , -965.25 , 66.64276081
+4268.632479 , -772.2 , 70.88986081
+4268.632479 , -579.15 , 75.13696081
+4268.632479 , -386.1 , 79.38406081
+4268.632479 , -193.05 , 83.63116081
+4268.632479 , 0 , 87.87826081
+4268.632479 , 193.05 , 92.12536081
+4268.632479 , 386.1 , 96.37246081
+4268.632479 , 579.15 , 100.6195608
+4268.632479 , 772.2 , 104.8666608
+4268.632479 , 965.25 , 109.1137608
+4268.632479 , 1158.3 , 113.3608608
+4268.632479 , 1351.35 , 117.6079608
+4268.632479 , 1544.4 , 121.8550608
+4268.632479 , 1737.45 , 126.1021608
+4268.632479 , 1930.5 , 130.3492608
+4268.632479 , 2123.55 , 134.5963608
+4268.632479 , 2316.6 , 138.8434608
+4268.632479 , 2509.65 , 143.0905608
+4268.632479 , 2702.7 , 147.3376608
+4268.632479 , 2895.75 , 151.5847608
+4268.632479 , 3088.8 , 155.8318608
+4268.632479 , 3281.85 , 160.0789608
+4268.632479 , 3474.9 , 164.3260608
+4268.632479 , 3667.95 , 168.5731608
+4268.632479 , 3861 , 172.8202608
+4268.632479 , 4054.05 , 177.0673608
+4268.632479 , 4247.1 , 181.3144608
+4268.632479 , 4440.15 , 185.5615608
+4268.632479 , 4633.2 , 189.8086608
+4268.632479 , 4826.25 , 194.0557608
+4268.632479 , 5019.3 , 198.3028608
+4268.632479 , 5212.35 , 202.5499608
+4268.632479 , 5405.4 , 206.7970608
+4268.632479 , 5598.45 , 211.0441608
+4268.632479 , 5791.5 , 215.2912608
+4268.632479 , 5984.55 , 219.5383608
+4268.632479 , 6177.6 , 223.7854608
+5000 , -6177.6 , 35.83008
+5000 , -5984.55 , 31.58298
+5000 , -5791.5 , 27.33588
+5000 , -5598.45 , 23.08878
+5000 , -5405.4 , 18.84168
+5000 , -5212.35 , 14.59458
+5000 , -5019.3 , 10.34748
+5000 , -4826.25 , 6.10038
+5000 , -4633.2 , 1.85328
+5000 , -4440.15 , 2.39382
+5000 , -4247.1 , 6.64092
+5000 , -4054.05 , 10.88802
+5000 , -3861 , 15.13512
+5000 , -3667.95 , 19.38222
+5000 , -3474.9 , 23.62932
+5000 , -3281.85 , 27.87642
+5000 , -3088.8 , 32.12352
+5000 , -2895.75 , 36.37062
+5000 , -2702.7 , 40.61772
+5000 , -2509.65 , 44.86482
+5000 , -2316.6 , 49.11192
+5000 , -2123.55 , 53.35902
+5000 , -1930.5 , 57.60612
+5000 , -1737.45 , 61.85322
+5000 , -1544.4 , 66.10032
+5000 , -1351.35 , 70.34742
+5000 , -1158.3 , 74.59452
+5000 , -965.25 , 78.84162
+5000 , -772.2 , 83.08872
+5000 , -579.15 , 87.33582
+5000 , -386.1 , 91.58292
+5000 , -193.05 , 95.83002
+5000 , 0 , 100.07712
+5000 , 193.05 , 104.32422
+5000 , 386.1 , 108.57132
+5000 , 579.15 , 112.81842
+5000 , 772.2 , 117.06552
+5000 , 965.25 , 121.31262
+5000 , 1158.3 , 125.55972
+5000 , 1351.35 , 129.80682
+5000 , 1544.4 , 134.05392
+5000 , 1737.45 , 138.30102
+5000 , 1930.5 , 142.54812
+5000 , 2123.55 , 146.79522
+5000 , 2316.6 , 151.04232
+5000 , 2509.65 , 155.28942
+5000 , 2702.7 , 159.53652
+5000 , 2895.75 , 163.78362
+5000 , 3088.8 , 168.03072
+5000 , 3281.85 , 172.27782
+5000 , 3474.9 , 176.52492
+5000 , 3667.95 , 180.77202
+5000 , 3861 , 185.01912
+5000 , 4054.05 , 189.26622
+5000 , 4247.1 , 193.51332
+5000 , 4440.15 , 197.76042
+5000 , 4633.2 , 202.00752
+5000 , 4826.25 , 206.25462
+5000 , 5019.3 , 210.50172
+5000 , 5212.35 , 214.74882
+5000 , 5405.4 , 218.99592
+5000 , 5598.45 , 223.24302
+5000 , 5791.5 , 227.49012
+5000 , 5984.55 , 231.73722
+5000 , 6177.6 , 235.98432
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_3.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_3.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..4f5fc52723c711eeaaff6e4d70eff7e296291c5d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_3.vtlm
@@ -0,0 +1,2081 @@
+Input Speed [rpm] , Input Torque [Nm] , Torque Loss [Nm]
+0 , -6177.6 , 113.66784
+0 , -5984.55 , 109.61379
+0 , -5791.5 , 105.55974
+0 , -5598.45 , 101.50569
+0 , -5405.4 , 97.45164
+0 , -5212.35 , 93.39759
+0 , -5019.3 , 89.34354
+0 , -4826.25 , 85.28949
+0 , -4633.2 , 81.23544
+0 , -4440.15 , 77.18139
+0 , -4247.1 , 73.12734
+0 , -4054.05 , 69.07329
+0 , -3861 , 65.01924
+0 , -3667.95 , 60.96519
+0 , -3474.9 , 56.91114
+0 , -3281.85 , 52.85709
+0 , -3088.8 , 48.80304
+0 , -2895.75 , 44.74899
+0 , -2702.7 , 40.69494
+0 , -2509.65 , 36.64089
+0 , -2316.6 , 32.58684
+0 , -2123.55 , 28.53279
+0 , -1930.5 , 24.47874
+0 , -1737.45 , 20.42469
+0 , -1544.4 , 16.37064
+0 , -1351.35 , 12.31659
+0 , -1158.3 , 8.26254
+0 , -965.25 , 4.20849
+0 , -772.2 , 0.15444
+0 , -579.15 , 3.89961
+0 , -386.1 , 7.95366
+0 , -193.05 , 12.00771
+0 , 0 , 16.06176
+0 , 193.05 , 20.11581
+0 , 386.1 , 24.16986
+0 , 579.15 , 28.22391
+0 , 772.2 , 32.27796
+0 , 965.25 , 36.33201
+0 , 1158.3 , 40.38606
+0 , 1351.35 , 44.44011
+0 , 1544.4 , 48.49416
+0 , 1737.45 , 52.54821
+0 , 1930.5 , 56.60226
+0 , 2123.55 , 60.65631
+0 , 2316.6 , 64.71036
+0 , 2509.65 , 68.76441
+0 , 2702.7 , 72.81846
+0 , 2895.75 , 76.87251
+0 , 3088.8 , 80.92656
+0 , 3281.85 , 84.98061
+0 , 3474.9 , 89.03466
+0 , 3667.95 , 93.08871
+0 , 3861 , 97.14276
+0 , 4054.05 , 101.19681
+0 , 4247.1 , 105.25086
+0 , 4440.15 , 109.30491
+0 , 4633.2 , 113.35896
+0 , 4826.25 , 117.41301
+0 , 5019.3 , 121.46706
+0 , 5212.35 , 125.52111
+0 , 5405.4 , 129.57516
+0 , 5598.45 , 133.62921
+0 , 5791.5 , 137.68326
+0 , 5984.55 , 141.73731
+0 , 6177.6 , 145.79136
+40.80854701 , -6177.6 , 113.0123829
+40.80854701 , -5984.55 , 108.9583329
+40.80854701 , -5791.5 , 104.9042829
+40.80854701 , -5598.45 , 100.8502329
+40.80854701 , -5405.4 , 96.79618291
+40.80854701 , -5212.35 , 92.74213291
+40.80854701 , -5019.3 , 88.68808291
+40.80854701 , -4826.25 , 84.63403291
+40.80854701 , -4633.2 , 80.57998291
+40.80854701 , -4440.15 , 76.52593291
+40.80854701 , -4247.1 , 72.47188291
+40.80854701 , -4054.05 , 68.41783291
+40.80854701 , -3861 , 64.36378291
+40.80854701 , -3667.95 , 60.30973291
+40.80854701 , -3474.9 , 56.25568291
+40.80854701 , -3281.85 , 52.20163291
+40.80854701 , -3088.8 , 48.14758291
+40.80854701 , -2895.75 , 44.09353291
+40.80854701 , -2702.7 , 40.03948291
+40.80854701 , -2509.65 , 35.98543291
+40.80854701 , -2316.6 , 31.93138291
+40.80854701 , -2123.55 , 27.87733291
+40.80854701 , -1930.5 , 23.82328291
+40.80854701 , -1737.45 , 19.76923291
+40.80854701 , -1544.4 , 15.71518291
+40.80854701 , -1351.35 , 11.66113291
+40.80854701 , -1158.3 , 7.607082912
+40.80854701 , -965.25 , 3.553032912
+40.80854701 , -772.2 , 0.501017088
+40.80854701 , -579.15 , 4.555067088
+40.80854701 , -386.1 , 8.609117088
+40.80854701 , -193.05 , 12.66316709
+40.80854701 , 0 , 16.71721709
+40.80854701 , 193.05 , 20.77126709
+40.80854701 , 386.1 , 24.82531709
+40.80854701 , 579.15 , 28.87936709
+40.80854701 , 772.2 , 32.93341709
+40.80854701 , 965.25 , 36.98746709
+40.80854701 , 1158.3 , 41.04151709
+40.80854701 , 1351.35 , 45.09556709
+40.80854701 , 1544.4 , 49.14961709
+40.80854701 , 1737.45 , 53.20366709
+40.80854701 , 1930.5 , 57.25771709
+40.80854701 , 2123.55 , 61.31176709
+40.80854701 , 2316.6 , 65.36581709
+40.80854701 , 2509.65 , 69.41986709
+40.80854701 , 2702.7 , 73.47391709
+40.80854701 , 2895.75 , 77.52796709
+40.80854701 , 3088.8 , 81.58201709
+40.80854701 , 3281.85 , 85.63606709
+40.80854701 , 3474.9 , 89.69011709
+40.80854701 , 3667.95 , 93.74416709
+40.80854701 , 3861 , 97.79821709
+40.80854701 , 4054.05 , 101.8522671
+40.80854701 , 4247.1 , 105.9063171
+40.80854701 , 4440.15 , 109.9603671
+40.80854701 , 4633.2 , 114.0144171
+40.80854701 , 4826.25 , 118.0684671
+40.80854701 , 5019.3 , 122.1225171
+40.80854701 , 5212.35 , 126.1765671
+40.80854701 , 5405.4 , 130.2306171
+40.80854701 , 5598.45 , 134.2846671
+40.80854701 , 5791.5 , 138.3387171
+40.80854701 , 5984.55 , 142.3927671
+40.80854701 , 6177.6 , 146.4468171
+81.61794872 , -6177.6 , 112.3569121
+81.61794872 , -5984.55 , 108.3028621
+81.61794872 , -5791.5 , 104.2488121
+81.61794872 , -5598.45 , 100.1947621
+81.61794872 , -5405.4 , 96.1407121
+81.61794872 , -5212.35 , 92.0866621
+81.61794872 , -5019.3 , 88.0326121
+81.61794872 , -4826.25 , 83.9785621
+81.61794872 , -4633.2 , 79.9245121
+81.61794872 , -4440.15 , 75.8704621
+81.61794872 , -4247.1 , 71.8164121
+81.61794872 , -4054.05 , 67.7623621
+81.61794872 , -3861 , 63.7083121
+81.61794872 , -3667.95 , 59.6542621
+81.61794872 , -3474.9 , 55.6002121
+81.61794872 , -3281.85 , 51.5461621
+81.61794872 , -3088.8 , 47.4921121
+81.61794872 , -2895.75 , 43.4380621
+81.61794872 , -2702.7 , 39.3840121
+81.61794872 , -2509.65 , 35.3299621
+81.61794872 , -2316.6 , 31.2759121
+81.61794872 , -2123.55 , 27.2218621
+81.61794872 , -1930.5 , 23.1678121
+81.61794872 , -1737.45 , 19.1137621
+81.61794872 , -1544.4 , 15.0597121
+81.61794872 , -1351.35 , 11.0056621
+81.61794872 , -1158.3 , 6.951612096
+81.61794872 , -965.25 , 2.897562096
+81.61794872 , -772.2 , 1.156487904
+81.61794872 , -579.15 , 5.210537904
+81.61794872 , -386.1 , 9.264587904
+81.61794872 , -193.05 , 13.3186379
+81.61794872 , 0 , 17.3726879
+81.61794872 , 193.05 , 21.4267379
+81.61794872 , 386.1 , 25.4807879
+81.61794872 , 579.15 , 29.5348379
+81.61794872 , 772.2 , 33.5888879
+81.61794872 , 965.25 , 37.6429379
+81.61794872 , 1158.3 , 41.6969879
+81.61794872 , 1351.35 , 45.7510379
+81.61794872 , 1544.4 , 49.8050879
+81.61794872 , 1737.45 , 53.8591379
+81.61794872 , 1930.5 , 57.9131879
+81.61794872 , 2123.55 , 61.9672379
+81.61794872 , 2316.6 , 66.0212879
+81.61794872 , 2509.65 , 70.0753379
+81.61794872 , 2702.7 , 74.1293879
+81.61794872 , 2895.75 , 78.1834379
+81.61794872 , 3088.8 , 82.2374879
+81.61794872 , 3281.85 , 86.2915379
+81.61794872 , 3474.9 , 90.3455879
+81.61794872 , 3667.95 , 94.3996379
+81.61794872 , 3861 , 98.4536879
+81.61794872 , 4054.05 , 102.5077379
+81.61794872 , 4247.1 , 106.5617879
+81.61794872 , 4440.15 , 110.6158379
+81.61794872 , 4633.2 , 114.6698879
+81.61794872 , 4826.25 , 118.7239379
+81.61794872 , 5019.3 , 122.7779879
+81.61794872 , 5212.35 , 126.8320379
+81.61794872 , 5405.4 , 130.8860879
+81.61794872 , 5598.45 , 134.9401379
+81.61794872 , 5791.5 , 138.9941879
+81.61794872 , 5984.55 , 143.0482379
+81.61794872 , 6177.6 , 147.1022879
+122.4273504 , -6177.6 , 111.7014413
+122.4273504 , -5984.55 , 107.6473913
+122.4273504 , -5791.5 , 103.5933413
+122.4273504 , -5598.45 , 99.53929128
+122.4273504 , -5405.4 , 95.48524128
+122.4273504 , -5212.35 , 91.43119128
+122.4273504 , -5019.3 , 87.37714128
+122.4273504 , -4826.25 , 83.32309128
+122.4273504 , -4633.2 , 79.26904128
+122.4273504 , -4440.15 , 75.21499128
+122.4273504 , -4247.1 , 71.16094128
+122.4273504 , -4054.05 , 67.10689128
+122.4273504 , -3861 , 63.05284128
+122.4273504 , -3667.95 , 58.99879128
+122.4273504 , -3474.9 , 54.94474128
+122.4273504 , -3281.85 , 50.89069128
+122.4273504 , -3088.8 , 46.83664128
+122.4273504 , -2895.75 , 42.78259128
+122.4273504 , -2702.7 , 38.72854128
+122.4273504 , -2509.65 , 34.67449128
+122.4273504 , -2316.6 , 30.62044128
+122.4273504 , -2123.55 , 26.56639128
+122.4273504 , -1930.5 , 22.51234128
+122.4273504 , -1737.45 , 18.45829128
+122.4273504 , -1544.4 , 14.40424128
+122.4273504 , -1351.35 , 10.35019128
+122.4273504 , -1158.3 , 6.29614128
+122.4273504 , -965.25 , 2.24209128
+122.4273504 , -772.2 , 1.81195872
+122.4273504 , -579.15 , 5.86600872
+122.4273504 , -386.1 , 9.92005872
+122.4273504 , -193.05 , 13.97410872
+122.4273504 , 0 , 18.02815872
+122.4273504 , 193.05 , 22.08220872
+122.4273504 , 386.1 , 26.13625872
+122.4273504 , 579.15 , 30.19030872
+122.4273504 , 772.2 , 34.24435872
+122.4273504 , 965.25 , 38.29840872
+122.4273504 , 1158.3 , 42.35245872
+122.4273504 , 1351.35 , 46.40650872
+122.4273504 , 1544.4 , 50.46055872
+122.4273504 , 1737.45 , 54.51460872
+122.4273504 , 1930.5 , 58.56865872
+122.4273504 , 2123.55 , 62.62270872
+122.4273504 , 2316.6 , 66.67675872
+122.4273504 , 2509.65 , 70.73080872
+122.4273504 , 2702.7 , 74.78485872
+122.4273504 , 2895.75 , 78.83890872
+122.4273504 , 3088.8 , 82.89295872
+122.4273504 , 3281.85 , 86.94700872
+122.4273504 , 3474.9 , 91.00105872
+122.4273504 , 3667.95 , 95.05510872
+122.4273504 , 3861 , 99.10915872
+122.4273504 , 4054.05 , 103.1632087
+122.4273504 , 4247.1 , 107.2172587
+122.4273504 , 4440.15 , 111.2713087
+122.4273504 , 4633.2 , 115.3253587
+122.4273504 , 4826.25 , 119.3794087
+122.4273504 , 5019.3 , 123.4334587
+122.4273504 , 5212.35 , 127.4875087
+122.4273504 , 5405.4 , 131.5415587
+122.4273504 , 5598.45 , 135.5956087
+122.4273504 , 5791.5 , 139.6496587
+122.4273504 , 5984.55 , 143.7037087
+122.4273504 , 6177.6 , 147.7577587
+163.2393162 , -6177.6 , 111.0459293
+163.2393162 , -5984.55 , 106.9918793
+163.2393162 , -5791.5 , 102.9378293
+163.2393162 , -5598.45 , 98.88377928
+163.2393162 , -5405.4 , 94.82972928
+163.2393162 , -5212.35 , 90.77567928
+163.2393162 , -5019.3 , 86.72162928
+163.2393162 , -4826.25 , 82.66757928
+163.2393162 , -4633.2 , 78.61352928
+163.2393162 , -4440.15 , 74.55947928
+163.2393162 , -4247.1 , 70.50542928
+163.2393162 , -4054.05 , 66.45137928
+163.2393162 , -3861 , 62.39732928
+163.2393162 , -3667.95 , 58.34327928
+163.2393162 , -3474.9 , 54.28922928
+163.2393162 , -3281.85 , 50.23517928
+163.2393162 , -3088.8 , 46.18112928
+163.2393162 , -2895.75 , 42.12707928
+163.2393162 , -2702.7 , 38.07302928
+163.2393162 , -2509.65 , 34.01897928
+163.2393162 , -2316.6 , 29.96492928
+163.2393162 , -2123.55 , 25.91087928
+163.2393162 , -1930.5 , 21.85682928
+163.2393162 , -1737.45 , 17.80277928
+163.2393162 , -1544.4 , 13.74872928
+163.2393162 , -1351.35 , 9.694679281
+163.2393162 , -1158.3 , 5.640629281
+163.2393162 , -965.25 , 1.586579281
+163.2393162 , -772.2 , 2.467470719
+163.2393162 , -579.15 , 6.521520719
+163.2393162 , -386.1 , 10.57557072
+163.2393162 , -193.05 , 14.62962072
+163.2393162 , 0 , 18.68367072
+163.2393162 , 193.05 , 22.73772072
+163.2393162 , 386.1 , 26.79177072
+163.2393162 , 579.15 , 30.84582072
+163.2393162 , 772.2 , 34.89987072
+163.2393162 , 965.25 , 38.95392072
+163.2393162 , 1158.3 , 43.00797072
+163.2393162 , 1351.35 , 47.06202072
+163.2393162 , 1544.4 , 51.11607072
+163.2393162 , 1737.45 , 55.17012072
+163.2393162 , 1930.5 , 59.22417072
+163.2393162 , 2123.55 , 63.27822072
+163.2393162 , 2316.6 , 67.33227072
+163.2393162 , 2509.65 , 71.38632072
+163.2393162 , 2702.7 , 75.44037072
+163.2393162 , 2895.75 , 79.49442072
+163.2393162 , 3088.8 , 83.54847072
+163.2393162 , 3281.85 , 87.60252072
+163.2393162 , 3474.9 , 91.65657072
+163.2393162 , 3667.95 , 95.71062072
+163.2393162 , 3861 , 99.76467072
+163.2393162 , 4054.05 , 103.8187207
+163.2393162 , 4247.1 , 107.8727707
+163.2393162 , 4440.15 , 111.9268207
+163.2393162 , 4633.2 , 115.9808707
+163.2393162 , 4826.25 , 120.0349207
+163.2393162 , 5019.3 , 124.0889707
+163.2393162 , 5212.35 , 128.1430207
+163.2393162 , 5405.4 , 132.1970707
+163.2393162 , 5598.45 , 136.2511207
+163.2393162 , 5791.5 , 140.3051707
+163.2393162 , 5984.55 , 144.3592207
+163.2393162 , 6177.6 , 148.4132707
+204.042735 , -6177.6 , 110.3905546
+204.042735 , -5984.55 , 106.3365046
+204.042735 , -5791.5 , 102.2824546
+204.042735 , -5598.45 , 98.22840456
+204.042735 , -5405.4 , 94.17435456
+204.042735 , -5212.35 , 90.12030456
+204.042735 , -5019.3 , 86.06625456
+204.042735 , -4826.25 , 82.01220456
+204.042735 , -4633.2 , 77.95815456
+204.042735 , -4440.15 , 73.90410456
+204.042735 , -4247.1 , 69.85005456
+204.042735 , -4054.05 , 65.79600456
+204.042735 , -3861 , 61.74195456
+204.042735 , -3667.95 , 57.68790456
+204.042735 , -3474.9 , 53.63385456
+204.042735 , -3281.85 , 49.57980456
+204.042735 , -3088.8 , 45.52575456
+204.042735 , -2895.75 , 41.47170456
+204.042735 , -2702.7 , 37.41765456
+204.042735 , -2509.65 , 33.36360456
+204.042735 , -2316.6 , 29.30955456
+204.042735 , -2123.55 , 25.25550456
+204.042735 , -1930.5 , 21.20145456
+204.042735 , -1737.45 , 17.14740456
+204.042735 , -1544.4 , 13.09335456
+204.042735 , -1351.35 , 9.039304561
+204.042735 , -1158.3 , 4.985254561
+204.042735 , -965.25 , 0.931204561
+204.042735 , -772.2 , 3.122845439
+204.042735 , -579.15 , 7.176895439
+204.042735 , -386.1 , 11.23094544
+204.042735 , -193.05 , 15.28499544
+204.042735 , 0 , 19.33904544
+204.042735 , 193.05 , 23.39309544
+204.042735 , 386.1 , 27.44714544
+204.042735 , 579.15 , 31.50119544
+204.042735 , 772.2 , 35.55524544
+204.042735 , 965.25 , 39.60929544
+204.042735 , 1158.3 , 43.66334544
+204.042735 , 1351.35 , 47.71739544
+204.042735 , 1544.4 , 51.77144544
+204.042735 , 1737.45 , 55.82549544
+204.042735 , 1930.5 , 59.87954544
+204.042735 , 2123.55 , 63.93359544
+204.042735 , 2316.6 , 67.98764544
+204.042735 , 2509.65 , 72.04169544
+204.042735 , 2702.7 , 76.09574544
+204.042735 , 2895.75 , 80.14979544
+204.042735 , 3088.8 , 84.20384544
+204.042735 , 3281.85 , 88.25789544
+204.042735 , 3474.9 , 92.31194544
+204.042735 , 3667.95 , 96.36599544
+204.042735 , 3861 , 100.4200454
+204.042735 , 4054.05 , 104.4740954
+204.042735 , 4247.1 , 108.5281454
+204.042735 , 4440.15 , 112.5821954
+204.042735 , 4633.2 , 116.6362454
+204.042735 , 4826.25 , 120.6902954
+204.042735 , 5019.3 , 124.7443454
+204.042735 , 5212.35 , 128.7983954
+204.042735 , 5405.4 , 132.8524454
+204.042735 , 5598.45 , 136.9064954
+204.042735 , 5791.5 , 140.9605454
+204.042735 , 5984.55 , 145.0145954
+204.042735 , 6177.6 , 149.0686454
+244.8547009 , -6177.6 , 109.7350426
+244.8547009 , -5984.55 , 105.6809926
+244.8547009 , -5791.5 , 101.6269426
+244.8547009 , -5598.45 , 97.57289256
+244.8547009 , -5405.4 , 93.51884256
+244.8547009 , -5212.35 , 89.46479256
+244.8547009 , -5019.3 , 85.41074256
+244.8547009 , -4826.25 , 81.35669256
+244.8547009 , -4633.2 , 77.30264256
+244.8547009 , -4440.15 , 73.24859256
+244.8547009 , -4247.1 , 69.19454256
+244.8547009 , -4054.05 , 65.14049256
+244.8547009 , -3861 , 61.08644256
+244.8547009 , -3667.95 , 57.03239256
+244.8547009 , -3474.9 , 52.97834256
+244.8547009 , -3281.85 , 48.92429256
+244.8547009 , -3088.8 , 44.87024256
+244.8547009 , -2895.75 , 40.81619256
+244.8547009 , -2702.7 , 36.76214256
+244.8547009 , -2509.65 , 32.70809256
+244.8547009 , -2316.6 , 28.65404256
+244.8547009 , -2123.55 , 24.59999256
+244.8547009 , -1930.5 , 20.54594256
+244.8547009 , -1737.45 , 16.49189256
+244.8547009 , -1544.4 , 12.43784256
+244.8547009 , -1351.35 , 8.383792559
+244.8547009 , -1158.3 , 4.329742559
+244.8547009 , -965.25 , 0.275692559
+244.8547009 , -772.2 , 3.778357441
+244.8547009 , -579.15 , 7.832407441
+244.8547009 , -386.1 , 11.88645744
+244.8547009 , -193.05 , 15.94050744
+244.8547009 , 0 , 19.99455744
+244.8547009 , 193.05 , 24.04860744
+244.8547009 , 386.1 , 28.10265744
+244.8547009 , 579.15 , 32.15670744
+244.8547009 , 772.2 , 36.21075744
+244.8547009 , 965.25 , 40.26480744
+244.8547009 , 1158.3 , 44.31885744
+244.8547009 , 1351.35 , 48.37290744
+244.8547009 , 1544.4 , 52.42695744
+244.8547009 , 1737.45 , 56.48100744
+244.8547009 , 1930.5 , 60.53505744
+244.8547009 , 2123.55 , 64.58910744
+244.8547009 , 2316.6 , 68.64315744
+244.8547009 , 2509.65 , 72.69720744
+244.8547009 , 2702.7 , 76.75125744
+244.8547009 , 2895.75 , 80.80530744
+244.8547009 , 3088.8 , 84.85935744
+244.8547009 , 3281.85 , 88.91340744
+244.8547009 , 3474.9 , 92.96745744
+244.8547009 , 3667.95 , 97.02150744
+244.8547009 , 3861 , 101.0755574
+244.8547009 , 4054.05 , 105.1296074
+244.8547009 , 4247.1 , 109.1836574
+244.8547009 , 4440.15 , 113.2377074
+244.8547009 , 4633.2 , 117.2917574
+244.8547009 , 4826.25 , 121.3458074
+244.8547009 , 5019.3 , 125.3998574
+244.8547009 , 5212.35 , 129.4539074
+244.8547009 , 5405.4 , 133.5079574
+244.8547009 , 5598.45 , 137.5620074
+244.8547009 , 5791.5 , 141.6160574
+244.8547009 , 5984.55 , 145.6701074
+244.8547009 , 6177.6 , 149.7241574
+285.6666667 , -6177.6 , 109.0795306
+285.6666667 , -5984.55 , 105.0254806
+285.6666667 , -5791.5 , 100.9714306
+285.6666667 , -5598.45 , 96.91738056
+285.6666667 , -5405.4 , 92.86333056
+285.6666667 , -5212.35 , 88.80928056
+285.6666667 , -5019.3 , 84.75523056
+285.6666667 , -4826.25 , 80.70118056
+285.6666667 , -4633.2 , 76.64713056
+285.6666667 , -4440.15 , 72.59308056
+285.6666667 , -4247.1 , 68.53903056
+285.6666667 , -4054.05 , 64.48498056
+285.6666667 , -3861 , 60.43093056
+285.6666667 , -3667.95 , 56.37688056
+285.6666667 , -3474.9 , 52.32283056
+285.6666667 , -3281.85 , 48.26878056
+285.6666667 , -3088.8 , 44.21473056
+285.6666667 , -2895.75 , 40.16068056
+285.6666667 , -2702.7 , 36.10663056
+285.6666667 , -2509.65 , 32.05258056
+285.6666667 , -2316.6 , 27.99853056
+285.6666667 , -2123.55 , 23.94448056
+285.6666667 , -1930.5 , 19.89043056
+285.6666667 , -1737.45 , 15.83638056
+285.6666667 , -1544.4 , 11.78233056
+285.6666667 , -1351.35 , 7.728280559
+285.6666667 , -1158.3 , 3.674230559
+285.6666667 , -965.25 , 0.379819441
+285.6666667 , -772.2 , 4.433869441
+285.6666667 , -579.15 , 8.487919441
+285.6666667 , -386.1 , 12.54196944
+285.6666667 , -193.05 , 16.59601944
+285.6666667 , 0 , 20.65006944
+285.6666667 , 193.05 , 24.70411944
+285.6666667 , 386.1 , 28.75816944
+285.6666667 , 579.15 , 32.81221944
+285.6666667 , 772.2 , 36.86626944
+285.6666667 , 965.25 , 40.92031944
+285.6666667 , 1158.3 , 44.97436944
+285.6666667 , 1351.35 , 49.02841944
+285.6666667 , 1544.4 , 53.08246944
+285.6666667 , 1737.45 , 57.13651944
+285.6666667 , 1930.5 , 61.19056944
+285.6666667 , 2123.55 , 65.24461944
+285.6666667 , 2316.6 , 69.29866944
+285.6666667 , 2509.65 , 73.35271944
+285.6666667 , 2702.7 , 77.40676944
+285.6666667 , 2895.75 , 81.46081944
+285.6666667 , 3088.8 , 85.51486944
+285.6666667 , 3281.85 , 89.56891944
+285.6666667 , 3474.9 , 93.62296944
+285.6666667 , 3667.95 , 97.67701944
+285.6666667 , 3861 , 101.7310694
+285.6666667 , 4054.05 , 105.7851194
+285.6666667 , 4247.1 , 109.8391694
+285.6666667 , 4440.15 , 113.8932194
+285.6666667 , 4633.2 , 117.9472694
+285.6666667 , 4826.25 , 122.0013194
+285.6666667 , 5019.3 , 126.0553694
+285.6666667 , 5212.35 , 130.1094194
+285.6666667 , 5405.4 , 134.1634694
+285.6666667 , 5598.45 , 138.2175194
+285.6666667 , 5791.5 , 142.2715694
+285.6666667 , 5984.55 , 146.3256194
+285.6666667 , 6177.6 , 150.3796694
+326.4700855 , -6177.6 , 108.4241558
+326.4700855 , -5984.55 , 104.3701058
+326.4700855 , -5791.5 , 100.3160558
+326.4700855 , -5598.45 , 96.26200584
+326.4700855 , -5405.4 , 92.20795584
+326.4700855 , -5212.35 , 88.15390584
+326.4700855 , -5019.3 , 84.09985584
+326.4700855 , -4826.25 , 80.04580584
+326.4700855 , -4633.2 , 75.99175584
+326.4700855 , -4440.15 , 71.93770584
+326.4700855 , -4247.1 , 67.88365584
+326.4700855 , -4054.05 , 63.82960584
+326.4700855 , -3861 , 59.77555584
+326.4700855 , -3667.95 , 55.72150584
+326.4700855 , -3474.9 , 51.66745584
+326.4700855 , -3281.85 , 47.61340584
+326.4700855 , -3088.8 , 43.55935584
+326.4700855 , -2895.75 , 39.50530584
+326.4700855 , -2702.7 , 35.45125584
+326.4700855 , -2509.65 , 31.39720584
+326.4700855 , -2316.6 , 27.34315584
+326.4700855 , -2123.55 , 23.28910584
+326.4700855 , -1930.5 , 19.23505584
+326.4700855 , -1737.45 , 15.18100584
+326.4700855 , -1544.4 , 11.12695584
+326.4700855 , -1351.35 , 7.07290584
+326.4700855 , -1158.3 , 3.01885584
+326.4700855 , -965.25 , 1.03519416
+326.4700855 , -772.2 , 5.08924416
+326.4700855 , -579.15 , 9.14329416
+326.4700855 , -386.1 , 13.19734416
+326.4700855 , -193.05 , 17.25139416
+326.4700855 , 0 , 21.30544416
+326.4700855 , 193.05 , 25.35949416
+326.4700855 , 386.1 , 29.41354416
+326.4700855 , 579.15 , 33.46759416
+326.4700855 , 772.2 , 37.52164416
+326.4700855 , 965.25 , 41.57569416
+326.4700855 , 1158.3 , 45.62974416
+326.4700855 , 1351.35 , 49.68379416
+326.4700855 , 1544.4 , 53.73784416
+326.4700855 , 1737.45 , 57.79189416
+326.4700855 , 1930.5 , 61.84594416
+326.4700855 , 2123.55 , 65.89999416
+326.4700855 , 2316.6 , 69.95404416
+326.4700855 , 2509.65 , 74.00809416
+326.4700855 , 2702.7 , 78.06214416
+326.4700855 , 2895.75 , 82.11619416
+326.4700855 , 3088.8 , 86.17024416
+326.4700855 , 3281.85 , 90.22429416
+326.4700855 , 3474.9 , 94.27834416
+326.4700855 , 3667.95 , 98.33239416
+326.4700855 , 3861 , 102.3864442
+326.4700855 , 4054.05 , 106.4404942
+326.4700855 , 4247.1 , 110.4945442
+326.4700855 , 4440.15 , 114.5485942
+326.4700855 , 4633.2 , 118.6026442
+326.4700855 , 4826.25 , 122.6566942
+326.4700855 , 5019.3 , 126.7107442
+326.4700855 , 5212.35 , 130.7647942
+326.4700855 , 5405.4 , 134.8188442
+326.4700855 , 5598.45 , 138.8728942
+326.4700855 , 5791.5 , 142.9269442
+326.4700855 , 5984.55 , 146.9809942
+326.4700855 , 6177.6 , 151.0350442
+367.2820513 , -6177.6 , 107.7686438
+367.2820513 , -5984.55 , 103.7145938
+367.2820513 , -5791.5 , 99.66054384
+367.2820513 , -5598.45 , 95.60649384
+367.2820513 , -5405.4 , 91.55244384
+367.2820513 , -5212.35 , 87.49839384
+367.2820513 , -5019.3 , 83.44434384
+367.2820513 , -4826.25 , 79.39029384
+367.2820513 , -4633.2 , 75.33624384
+367.2820513 , -4440.15 , 71.28219384
+367.2820513 , -4247.1 , 67.22814384
+367.2820513 , -4054.05 , 63.17409384
+367.2820513 , -3861 , 59.12004384
+367.2820513 , -3667.95 , 55.06599384
+367.2820513 , -3474.9 , 51.01194384
+367.2820513 , -3281.85 , 46.95789384
+367.2820513 , -3088.8 , 42.90384384
+367.2820513 , -2895.75 , 38.84979384
+367.2820513 , -2702.7 , 34.79574384
+367.2820513 , -2509.65 , 30.74169384
+367.2820513 , -2316.6 , 26.68764384
+367.2820513 , -2123.55 , 22.63359384
+367.2820513 , -1930.5 , 18.57954384
+367.2820513 , -1737.45 , 14.52549384
+367.2820513 , -1544.4 , 10.47144384
+367.2820513 , -1351.35 , 6.41739384
+367.2820513 , -1158.3 , 2.36334384
+367.2820513 , -965.25 , 1.69070616
+367.2820513 , -772.2 , 5.74475616
+367.2820513 , -579.15 , 9.79880616
+367.2820513 , -386.1 , 13.85285616
+367.2820513 , -193.05 , 17.90690616
+367.2820513 , 0 , 21.96095616
+367.2820513 , 193.05 , 26.01500616
+367.2820513 , 386.1 , 30.06905616
+367.2820513 , 579.15 , 34.12310616
+367.2820513 , 772.2 , 38.17715616
+367.2820513 , 965.25 , 42.23120616
+367.2820513 , 1158.3 , 46.28525616
+367.2820513 , 1351.35 , 50.33930616
+367.2820513 , 1544.4 , 54.39335616
+367.2820513 , 1737.45 , 58.44740616
+367.2820513 , 1930.5 , 62.50145616
+367.2820513 , 2123.55 , 66.55550616
+367.2820513 , 2316.6 , 70.60955616
+367.2820513 , 2509.65 , 74.66360616
+367.2820513 , 2702.7 , 78.71765616
+367.2820513 , 2895.75 , 82.77170616
+367.2820513 , 3088.8 , 86.82575616
+367.2820513 , 3281.85 , 90.87980616
+367.2820513 , 3474.9 , 94.93385616
+367.2820513 , 3667.95 , 98.98790616
+367.2820513 , 3861 , 103.0419562
+367.2820513 , 4054.05 , 107.0960062
+367.2820513 , 4247.1 , 111.1500562
+367.2820513 , 4440.15 , 115.2041062
+367.2820513 , 4633.2 , 119.2581562
+367.2820513 , 4826.25 , 123.3122062
+367.2820513 , 5019.3 , 127.3662562
+367.2820513 , 5212.35 , 131.4203062
+367.2820513 , 5405.4 , 135.4743562
+367.2820513 , 5598.45 , 139.5284062
+367.2820513 , 5791.5 , 143.5824562
+367.2820513 , 5984.55 , 147.6365062
+367.2820513 , 6177.6 , 151.6905562
+408.0854701 , -6177.6 , 107.1132691
+408.0854701 , -5984.55 , 103.0592191
+408.0854701 , -5791.5 , 99.00516912
+408.0854701 , -5598.45 , 94.95111912
+408.0854701 , -5405.4 , 90.89706912
+408.0854701 , -5212.35 , 86.84301912
+408.0854701 , -5019.3 , 82.78896912
+408.0854701 , -4826.25 , 78.73491912
+408.0854701 , -4633.2 , 74.68086912
+408.0854701 , -4440.15 , 70.62681912
+408.0854701 , -4247.1 , 66.57276912
+408.0854701 , -4054.05 , 62.51871912
+408.0854701 , -3861 , 58.46466912
+408.0854701 , -3667.95 , 54.41061912
+408.0854701 , -3474.9 , 50.35656912
+408.0854701 , -3281.85 , 46.30251912
+408.0854701 , -3088.8 , 42.24846912
+408.0854701 , -2895.75 , 38.19441912
+408.0854701 , -2702.7 , 34.14036912
+408.0854701 , -2509.65 , 30.08631912
+408.0854701 , -2316.6 , 26.03226912
+408.0854701 , -2123.55 , 21.97821912
+408.0854701 , -1930.5 , 17.92416912
+408.0854701 , -1737.45 , 13.87011912
+408.0854701 , -1544.4 , 9.81606912
+408.0854701 , -1351.35 , 5.76201912
+408.0854701 , -1158.3 , 1.70796912
+408.0854701 , -965.25 , 2.34608088
+408.0854701 , -772.2 , 6.40013088
+408.0854701 , -579.15 , 10.45418088
+408.0854701 , -386.1 , 14.50823088
+408.0854701 , -193.05 , 18.56228088
+408.0854701 , 0 , 22.61633088
+408.0854701 , 193.05 , 26.67038088
+408.0854701 , 386.1 , 30.72443088
+408.0854701 , 579.15 , 34.77848088
+408.0854701 , 772.2 , 38.83253088
+408.0854701 , 965.25 , 42.88658088
+408.0854701 , 1158.3 , 46.94063088
+408.0854701 , 1351.35 , 50.99468088
+408.0854701 , 1544.4 , 55.04873088
+408.0854701 , 1737.45 , 59.10278088
+408.0854701 , 1930.5 , 63.15683088
+408.0854701 , 2123.55 , 67.21088088
+408.0854701 , 2316.6 , 71.26493088
+408.0854701 , 2509.65 , 75.31898088
+408.0854701 , 2702.7 , 79.37303088
+408.0854701 , 2895.75 , 83.42708088
+408.0854701 , 3088.8 , 87.48113088
+408.0854701 , 3281.85 , 91.53518088
+408.0854701 , 3474.9 , 95.58923088
+408.0854701 , 3667.95 , 99.64328088
+408.0854701 , 3861 , 103.6973309
+408.0854701 , 4054.05 , 107.7513809
+408.0854701 , 4247.1 , 111.8054309
+408.0854701 , 4440.15 , 115.8594809
+408.0854701 , 4633.2 , 119.9135309
+408.0854701 , 4826.25 , 123.9675809
+408.0854701 , 5019.3 , 128.0216309
+408.0854701 , 5212.35 , 132.0756809
+408.0854701 , 5405.4 , 136.1297309
+408.0854701 , 5598.45 , 140.1837809
+408.0854701 , 5791.5 , 144.2378309
+408.0854701 , 5984.55 , 148.2918809
+408.0854701 , 6177.6 , 152.3459309
+448.8974359 , -6177.6 , 106.4577571
+448.8974359 , -5984.55 , 102.4037071
+448.8974359 , -5791.5 , 98.34965712
+448.8974359 , -5598.45 , 94.29560712
+448.8974359 , -5405.4 , 90.24155712
+448.8974359 , -5212.35 , 86.18750712
+448.8974359 , -5019.3 , 82.13345712
+448.8974359 , -4826.25 , 78.07940712
+448.8974359 , -4633.2 , 74.02535712
+448.8974359 , -4440.15 , 69.97130712
+448.8974359 , -4247.1 , 65.91725712
+448.8974359 , -4054.05 , 61.86320712
+448.8974359 , -3861 , 57.80915712
+448.8974359 , -3667.95 , 53.75510712
+448.8974359 , -3474.9 , 49.70105712
+448.8974359 , -3281.85 , 45.64700712
+448.8974359 , -3088.8 , 41.59295712
+448.8974359 , -2895.75 , 37.53890712
+448.8974359 , -2702.7 , 33.48485712
+448.8974359 , -2509.65 , 29.43080712
+448.8974359 , -2316.6 , 25.37675712
+448.8974359 , -2123.55 , 21.32270712
+448.8974359 , -1930.5 , 17.26865712
+448.8974359 , -1737.45 , 13.21460712
+448.8974359 , -1544.4 , 9.16055712
+448.8974359 , -1351.35 , 5.10650712
+448.8974359 , -1158.3 , 1.05245712
+448.8974359 , -965.25 , 3.00159288
+448.8974359 , -772.2 , 7.05564288
+448.8974359 , -579.15 , 11.10969288
+448.8974359 , -386.1 , 15.16374288
+448.8974359 , -193.05 , 19.21779288
+448.8974359 , 0 , 23.27184288
+448.8974359 , 193.05 , 27.32589288
+448.8974359 , 386.1 , 31.37994288
+448.8974359 , 579.15 , 35.43399288
+448.8974359 , 772.2 , 39.48804288
+448.8974359 , 965.25 , 43.54209288
+448.8974359 , 1158.3 , 47.59614288
+448.8974359 , 1351.35 , 51.65019288
+448.8974359 , 1544.4 , 55.70424288
+448.8974359 , 1737.45 , 59.75829288
+448.8974359 , 1930.5 , 63.81234288
+448.8974359 , 2123.55 , 67.86639288
+448.8974359 , 2316.6 , 71.92044288
+448.8974359 , 2509.65 , 75.97449288
+448.8974359 , 2702.7 , 80.02854288
+448.8974359 , 2895.75 , 84.08259288
+448.8974359 , 3088.8 , 88.13664288
+448.8974359 , 3281.85 , 92.19069288
+448.8974359 , 3474.9 , 96.24474288
+448.8974359 , 3667.95 , 100.2987929
+448.8974359 , 3861 , 104.3528429
+448.8974359 , 4054.05 , 108.4068929
+448.8974359 , 4247.1 , 112.4609429
+448.8974359 , 4440.15 , 116.5149929
+448.8974359 , 4633.2 , 120.5690429
+448.8974359 , 4826.25 , 124.6230929
+448.8974359 , 5019.3 , 128.6771429
+448.8974359 , 5212.35 , 132.7311929
+448.8974359 , 5405.4 , 136.7852429
+448.8974359 , 5598.45 , 140.8392929
+448.8974359 , 5791.5 , 144.8933429
+448.8974359 , 5984.55 , 148.9473929
+448.8974359 , 6177.6 , 153.0014429
+489.7094017 , -6177.6 , 105.8022451
+489.7094017 , -5984.55 , 101.7481951
+489.7094017 , -5791.5 , 97.69414512
+489.7094017 , -5598.45 , 93.64009512
+489.7094017 , -5405.4 , 89.58604512
+489.7094017 , -5212.35 , 85.53199512
+489.7094017 , -5019.3 , 81.47794512
+489.7094017 , -4826.25 , 77.42389512
+489.7094017 , -4633.2 , 73.36984512
+489.7094017 , -4440.15 , 69.31579512
+489.7094017 , -4247.1 , 65.26174512
+489.7094017 , -4054.05 , 61.20769512
+489.7094017 , -3861 , 57.15364512
+489.7094017 , -3667.95 , 53.09959512
+489.7094017 , -3474.9 , 49.04554512
+489.7094017 , -3281.85 , 44.99149512
+489.7094017 , -3088.8 , 40.93744512
+489.7094017 , -2895.75 , 36.88339512
+489.7094017 , -2702.7 , 32.82934512
+489.7094017 , -2509.65 , 28.77529512
+489.7094017 , -2316.6 , 24.72124512
+489.7094017 , -2123.55 , 20.66719512
+489.7094017 , -1930.5 , 16.61314512
+489.7094017 , -1737.45 , 12.55909512
+489.7094017 , -1544.4 , 8.50504512
+489.7094017 , -1351.35 , 4.45099512
+489.7094017 , -1158.3 , 0.39694512
+489.7094017 , -965.25 , 3.65710488
+489.7094017 , -772.2 , 7.71115488
+489.7094017 , -579.15 , 11.76520488
+489.7094017 , -386.1 , 15.81925488
+489.7094017 , -193.05 , 19.87330488
+489.7094017 , 0 , 23.92735488
+489.7094017 , 193.05 , 27.98140488
+489.7094017 , 386.1 , 32.03545488
+489.7094017 , 579.15 , 36.08950488
+489.7094017 , 772.2 , 40.14355488
+489.7094017 , 965.25 , 44.19760488
+489.7094017 , 1158.3 , 48.25165488
+489.7094017 , 1351.35 , 52.30570488
+489.7094017 , 1544.4 , 56.35975488
+489.7094017 , 1737.45 , 60.41380488
+489.7094017 , 1930.5 , 64.46785488
+489.7094017 , 2123.55 , 68.52190488
+489.7094017 , 2316.6 , 72.57595488
+489.7094017 , 2509.65 , 76.63000488
+489.7094017 , 2702.7 , 80.68405488
+489.7094017 , 2895.75 , 84.73810488
+489.7094017 , 3088.8 , 88.79215488
+489.7094017 , 3281.85 , 92.84620488
+489.7094017 , 3474.9 , 96.90025488
+489.7094017 , 3667.95 , 100.9543049
+489.7094017 , 3861 , 105.0083549
+489.7094017 , 4054.05 , 109.0624049
+489.7094017 , 4247.1 , 113.1164549
+489.7094017 , 4440.15 , 117.1705049
+489.7094017 , 4633.2 , 121.2245549
+489.7094017 , 4826.25 , 125.2786049
+489.7094017 , 5019.3 , 129.3326549
+489.7094017 , 5212.35 , 133.3867049
+489.7094017 , 5405.4 , 137.4407549
+489.7094017 , 5598.45 , 141.4948049
+489.7094017 , 5791.5 , 145.5488549
+489.7094017 , 5984.55 , 149.6029049
+489.7094017 , 6177.6 , 153.6569549
+816.1794872 , -6177.6 , 100.558561
+816.1794872 , -5984.55 , 96.50451096
+816.1794872 , -5791.5 , 92.45046096
+816.1794872 , -5598.45 , 88.39641096
+816.1794872 , -5405.4 , 84.34236096
+816.1794872 , -5212.35 , 80.28831096
+816.1794872 , -5019.3 , 76.23426096
+816.1794872 , -4826.25 , 72.18021096
+816.1794872 , -4633.2 , 68.12616096
+816.1794872 , -4440.15 , 64.07211096
+816.1794872 , -4247.1 , 60.01806096
+816.1794872 , -4054.05 , 55.96401096
+816.1794872 , -3861 , 51.90996096
+816.1794872 , -3667.95 , 47.85591096
+816.1794872 , -3474.9 , 43.80186096
+816.1794872 , -3281.85 , 39.74781096
+816.1794872 , -3088.8 , 35.69376096
+816.1794872 , -2895.75 , 31.63971096
+816.1794872 , -2702.7 , 27.58566096
+816.1794872 , -2509.65 , 23.53161096
+816.1794872 , -2316.6 , 19.47756096
+816.1794872 , -2123.55 , 15.42351096
+816.1794872 , -1930.5 , 11.36946096
+816.1794872 , -1737.45 , 7.31541096
+816.1794872 , -1544.4 , 3.26136096
+816.1794872 , -1351.35 , 0.79268904
+816.1794872 , -1158.3 , 4.84673904
+816.1794872 , -965.25 , 8.90078904
+816.1794872 , -772.2 , 12.95483904
+816.1794872 , -579.15 , 17.00888904
+816.1794872 , -386.1 , 21.06293904
+816.1794872 , -193.05 , 25.11698904
+816.1794872 , 0 , 29.17103904
+816.1794872 , 193.05 , 33.22508904
+816.1794872 , 386.1 , 37.27913904
+816.1794872 , 579.15 , 41.33318904
+816.1794872 , 772.2 , 45.38723904
+816.1794872 , 965.25 , 49.44128904
+816.1794872 , 1158.3 , 53.49533904
+816.1794872 , 1351.35 , 57.54938904
+816.1794872 , 1544.4 , 61.60343904
+816.1794872 , 1737.45 , 65.65748904
+816.1794872 , 1930.5 , 69.71153904
+816.1794872 , 2123.55 , 73.76558904
+816.1794872 , 2316.6 , 77.81963904
+816.1794872 , 2509.65 , 81.87368904
+816.1794872 , 2702.7 , 85.92773904
+816.1794872 , 2895.75 , 89.98178904
+816.1794872 , 3088.8 , 94.03583904
+816.1794872 , 3281.85 , 98.08988904
+816.1794872 , 3474.9 , 102.143939
+816.1794872 , 3667.95 , 106.197989
+816.1794872 , 3861 , 110.252039
+816.1794872 , 4054.05 , 114.306089
+816.1794872 , 4247.1 , 118.360139
+816.1794872 , 4440.15 , 122.414189
+816.1794872 , 4633.2 , 126.468239
+816.1794872 , 4826.25 , 130.522289
+816.1794872 , 5019.3 , 134.576339
+816.1794872 , 5212.35 , 138.630389
+816.1794872 , 5405.4 , 142.684439
+816.1794872 , 5598.45 , 146.738489
+816.1794872 , 5791.5 , 150.792539
+816.1794872 , 5984.55 , 154.846589
+816.1794872 , 6177.6 , 158.900639
+1020.25641 , -6177.6 , 97.2807264
+1020.25641 , -5984.55 , 93.2266764
+1020.25641 , -5791.5 , 89.1726264
+1020.25641 , -5598.45 , 85.1185764
+1020.25641 , -5405.4 , 81.0645264
+1020.25641 , -5212.35 , 77.0104764
+1020.25641 , -5019.3 , 72.9564264
+1020.25641 , -4826.25 , 68.9023764
+1020.25641 , -4633.2 , 64.8483264
+1020.25641 , -4440.15 , 60.7942764
+1020.25641 , -4247.1 , 56.7402264
+1020.25641 , -4054.05 , 52.6861764
+1020.25641 , -3861 , 48.6321264
+1020.25641 , -3667.95 , 44.5780764
+1020.25641 , -3474.9 , 40.5240264
+1020.25641 , -3281.85 , 36.4699764
+1020.25641 , -3088.8 , 32.4159264
+1020.25641 , -2895.75 , 28.3618764
+1020.25641 , -2702.7 , 24.3078264
+1020.25641 , -2509.65 , 20.2537764
+1020.25641 , -2316.6 , 16.1997264
+1020.25641 , -2123.55 , 12.1456764
+1020.25641 , -1930.5 , 8.091626404
+1020.25641 , -1737.45 , 4.037576404
+1020.25641 , -1544.4 , 0.016473596
+1020.25641 , -1351.35 , 4.070523596
+1020.25641 , -1158.3 , 8.124573596
+1020.25641 , -965.25 , 12.1786236
+1020.25641 , -772.2 , 16.2326736
+1020.25641 , -579.15 , 20.2867236
+1020.25641 , -386.1 , 24.3407736
+1020.25641 , -193.05 , 28.3948236
+1020.25641 , 0 , 32.4488736
+1020.25641 , 193.05 , 36.5029236
+1020.25641 , 386.1 , 40.5569736
+1020.25641 , 579.15 , 44.6110236
+1020.25641 , 772.2 , 48.6650736
+1020.25641 , 965.25 , 52.7191236
+1020.25641 , 1158.3 , 56.7731736
+1020.25641 , 1351.35 , 60.8272236
+1020.25641 , 1544.4 , 64.8812736
+1020.25641 , 1737.45 , 68.9353236
+1020.25641 , 1930.5 , 72.9893736
+1020.25641 , 2123.55 , 77.0434236
+1020.25641 , 2316.6 , 81.0974736
+1020.25641 , 2509.65 , 85.1515236
+1020.25641 , 2702.7 , 89.2055736
+1020.25641 , 2895.75 , 93.2596236
+1020.25641 , 3088.8 , 97.3136736
+1020.25641 , 3281.85 , 101.3677236
+1020.25641 , 3474.9 , 105.4217736
+1020.25641 , 3667.95 , 109.4758236
+1020.25641 , 3861 , 113.5298736
+1020.25641 , 4054.05 , 117.5839236
+1020.25641 , 4247.1 , 121.6379736
+1020.25641 , 4440.15 , 125.6920236
+1020.25641 , 4633.2 , 129.7460736
+1020.25641 , 4826.25 , 133.8001236
+1020.25641 , 5019.3 , 137.8541736
+1020.25641 , 5212.35 , 141.9082236
+1020.25641 , 5405.4 , 145.9622736
+1020.25641 , 5598.45 , 150.0163236
+1020.25641 , 5791.5 , 154.0703736
+1020.25641 , 5984.55 , 158.1244236
+1020.25641 , 6177.6 , 162.1784736
+1224.273504 , -6177.6 , 94.0038528
+1224.273504 , -5984.55 , 89.9498028
+1224.273504 , -5791.5 , 85.8957528
+1224.273504 , -5598.45 , 81.8417028
+1224.273504 , -5405.4 , 77.7876528
+1224.273504 , -5212.35 , 73.7336028
+1224.273504 , -5019.3 , 69.6795528
+1224.273504 , -4826.25 , 65.6255028
+1224.273504 , -4633.2 , 61.5714528
+1224.273504 , -4440.15 , 57.5174028
+1224.273504 , -4247.1 , 53.4633528
+1224.273504 , -4054.05 , 49.4093028
+1224.273504 , -3861 , 45.3552528
+1224.273504 , -3667.95 , 41.3012028
+1224.273504 , -3474.9 , 37.2471528
+1224.273504 , -3281.85 , 33.1931028
+1224.273504 , -3088.8 , 29.1390528
+1224.273504 , -2895.75 , 25.0850028
+1224.273504 , -2702.7 , 21.0309528
+1224.273504 , -2509.65 , 16.9769028
+1224.273504 , -2316.6 , 12.9228528
+1224.273504 , -2123.55 , 8.868802804
+1224.273504 , -1930.5 , 4.814752804
+1224.273504 , -1737.45 , 0.760702804
+1224.273504 , -1544.4 , 3.293347196
+1224.273504 , -1351.35 , 7.347397196
+1224.273504 , -1158.3 , 11.4014472
+1224.273504 , -965.25 , 15.4554972
+1224.273504 , -772.2 , 19.5095472
+1224.273504 , -579.15 , 23.5635972
+1224.273504 , -386.1 , 27.6176472
+1224.273504 , -193.05 , 31.6716972
+1224.273504 , 0 , 35.7257472
+1224.273504 , 193.05 , 39.7797972
+1224.273504 , 386.1 , 43.8338472
+1224.273504 , 579.15 , 47.8878972
+1224.273504 , 772.2 , 51.9419472
+1224.273504 , 965.25 , 55.9959972
+1224.273504 , 1158.3 , 60.0500472
+1224.273504 , 1351.35 , 64.1040972
+1224.273504 , 1544.4 , 68.1581472
+1224.273504 , 1737.45 , 72.2121972
+1224.273504 , 1930.5 , 76.2662472
+1224.273504 , 2123.55 , 80.3202972
+1224.273504 , 2316.6 , 84.3743472
+1224.273504 , 2509.65 , 88.4283972
+1224.273504 , 2702.7 , 92.4824472
+1224.273504 , 2895.75 , 96.5364972
+1224.273504 , 3088.8 , 100.5905472
+1224.273504 , 3281.85 , 104.6445972
+1224.273504 , 3474.9 , 108.6986472
+1224.273504 , 3667.95 , 112.7526972
+1224.273504 , 3861 , 116.8067472
+1224.273504 , 4054.05 , 120.8607972
+1224.273504 , 4247.1 , 124.9148472
+1224.273504 , 4440.15 , 128.9688972
+1224.273504 , 4633.2 , 133.0229472
+1224.273504 , 4826.25 , 137.0769972
+1224.273504 , 5019.3 , 141.1310472
+1224.273504 , 5212.35 , 145.1850972
+1224.273504 , 5405.4 , 149.2391472
+1224.273504 , 5598.45 , 153.2931972
+1224.273504 , 5791.5 , 157.3472472
+1224.273504 , 5984.55 , 161.4012972
+1224.273504 , 6177.6 , 165.4553472
+1428.290598 , -6177.6 , 90.7269792
+1428.290598 , -5984.55 , 86.6729292
+1428.290598 , -5791.5 , 82.6188792
+1428.290598 , -5598.45 , 78.5648292
+1428.290598 , -5405.4 , 74.5107792
+1428.290598 , -5212.35 , 70.4567292
+1428.290598 , -5019.3 , 66.4026792
+1428.290598 , -4826.25 , 62.3486292
+1428.290598 , -4633.2 , 58.2945792
+1428.290598 , -4440.15 , 54.2405292
+1428.290598 , -4247.1 , 50.1864792
+1428.290598 , -4054.05 , 46.1324292
+1428.290598 , -3861 , 42.0783792
+1428.290598 , -3667.95 , 38.0243292
+1428.290598 , -3474.9 , 33.9702792
+1428.290598 , -3281.85 , 29.9162292
+1428.290598 , -3088.8 , 25.8621792
+1428.290598 , -2895.75 , 21.8081292
+1428.290598 , -2702.7 , 17.7540792
+1428.290598 , -2509.65 , 13.7000292
+1428.290598 , -2316.6 , 9.645979205
+1428.290598 , -2123.55 , 5.591929205
+1428.290598 , -1930.5 , 1.537879205
+1428.290598 , -1737.45 , 2.516170795
+1428.290598 , -1544.4 , 6.570220795
+1428.290598 , -1351.35 , 10.6242708
+1428.290598 , -1158.3 , 14.6783208
+1428.290598 , -965.25 , 18.7323708
+1428.290598 , -772.2 , 22.7864208
+1428.290598 , -579.15 , 26.8404708
+1428.290598 , -386.1 , 30.8945208
+1428.290598 , -193.05 , 34.9485708
+1428.290598 , 0 , 39.0026208
+1428.290598 , 193.05 , 43.0566708
+1428.290598 , 386.1 , 47.1107208
+1428.290598 , 579.15 , 51.1647708
+1428.290598 , 772.2 , 55.2188208
+1428.290598 , 965.25 , 59.2728708
+1428.290598 , 1158.3 , 63.3269208
+1428.290598 , 1351.35 , 67.3809708
+1428.290598 , 1544.4 , 71.4350208
+1428.290598 , 1737.45 , 75.4890708
+1428.290598 , 1930.5 , 79.5431208
+1428.290598 , 2123.55 , 83.5971708
+1428.290598 , 2316.6 , 87.6512208
+1428.290598 , 2509.65 , 91.7052708
+1428.290598 , 2702.7 , 95.7593208
+1428.290598 , 2895.75 , 99.8133708
+1428.290598 , 3088.8 , 103.8674208
+1428.290598 , 3281.85 , 107.9214708
+1428.290598 , 3474.9 , 111.9755208
+1428.290598 , 3667.95 , 116.0295708
+1428.290598 , 3861 , 120.0836208
+1428.290598 , 4054.05 , 124.1376708
+1428.290598 , 4247.1 , 128.1917208
+1428.290598 , 4440.15 , 132.2457708
+1428.290598 , 4633.2 , 136.2998208
+1428.290598 , 4826.25 , 140.3538708
+1428.290598 , 5019.3 , 144.4079208
+1428.290598 , 5212.35 , 148.4619708
+1428.290598 , 5405.4 , 152.5160208
+1428.290598 , 5598.45 , 156.5700708
+1428.290598 , 5791.5 , 160.6241208
+1428.290598 , 5984.55 , 164.6781708
+1428.290598 , 6177.6 , 168.7322208
+1632.393162 , -6177.6 , 87.44873281
+1632.393162 , -5984.55 , 83.39468281
+1632.393162 , -5791.5 , 79.34063281
+1632.393162 , -5598.45 , 75.28658281
+1632.393162 , -5405.4 , 71.23253281
+1632.393162 , -5212.35 , 67.17848281
+1632.393162 , -5019.3 , 63.12443281
+1632.393162 , -4826.25 , 59.07038281
+1632.393162 , -4633.2 , 55.01633281
+1632.393162 , -4440.15 , 50.96228281
+1632.393162 , -4247.1 , 46.90823281
+1632.393162 , -4054.05 , 42.85418281
+1632.393162 , -3861 , 38.80013281
+1632.393162 , -3667.95 , 34.74608281
+1632.393162 , -3474.9 , 30.69203281
+1632.393162 , -3281.85 , 26.63798281
+1632.393162 , -3088.8 , 22.58393281
+1632.393162 , -2895.75 , 18.52988281
+1632.393162 , -2702.7 , 14.47583281
+1632.393162 , -2509.65 , 10.42178281
+1632.393162 , -2316.6 , 6.367732806
+1632.393162 , -2123.55 , 2.313682806
+1632.393162 , -1930.5 , 1.740367194
+1632.393162 , -1737.45 , 5.794417194
+1632.393162 , -1544.4 , 9.848467194
+1632.393162 , -1351.35 , 13.90251719
+1632.393162 , -1158.3 , 17.95656719
+1632.393162 , -965.25 , 22.01061719
+1632.393162 , -772.2 , 26.06466719
+1632.393162 , -579.15 , 30.11871719
+1632.393162 , -386.1 , 34.17276719
+1632.393162 , -193.05 , 38.22681719
+1632.393162 , 0 , 42.28086719
+1632.393162 , 193.05 , 46.33491719
+1632.393162 , 386.1 , 50.38896719
+1632.393162 , 579.15 , 54.44301719
+1632.393162 , 772.2 , 58.49706719
+1632.393162 , 965.25 , 62.55111719
+1632.393162 , 1158.3 , 66.60516719
+1632.393162 , 1351.35 , 70.65921719
+1632.393162 , 1544.4 , 74.71326719
+1632.393162 , 1737.45 , 78.76731719
+1632.393162 , 1930.5 , 82.82136719
+1632.393162 , 2123.55 , 86.87541719
+1632.393162 , 2316.6 , 90.92946719
+1632.393162 , 2509.65 , 94.98351719
+1632.393162 , 2702.7 , 99.03756719
+1632.393162 , 2895.75 , 103.0916172
+1632.393162 , 3088.8 , 107.1456672
+1632.393162 , 3281.85 , 111.1997172
+1632.393162 , 3474.9 , 115.2537672
+1632.393162 , 3667.95 , 119.3078172
+1632.393162 , 3861 , 123.3618672
+1632.393162 , 4054.05 , 127.4159172
+1632.393162 , 4247.1 , 131.4699672
+1632.393162 , 4440.15 , 135.5240172
+1632.393162 , 4633.2 , 139.5780672
+1632.393162 , 4826.25 , 143.6321172
+1632.393162 , 5019.3 , 147.6861672
+1632.393162 , 5212.35 , 151.7402172
+1632.393162 , 5405.4 , 155.7942672
+1632.393162 , 5598.45 , 159.8483172
+1632.393162 , 5791.5 , 163.9023672
+1632.393162 , 5984.55 , 167.9564172
+1632.393162 , 6177.6 , 172.0104672
+1836.410256 , -6177.6 , 84.17185921
+1836.410256 , -5984.55 , 80.11780921
+1836.410256 , -5791.5 , 76.06375921
+1836.410256 , -5598.45 , 72.00970921
+1836.410256 , -5405.4 , 67.95565921
+1836.410256 , -5212.35 , 63.90160921
+1836.410256 , -5019.3 , 59.84755921
+1836.410256 , -4826.25 , 55.79350921
+1836.410256 , -4633.2 , 51.73945921
+1836.410256 , -4440.15 , 47.68540921
+1836.410256 , -4247.1 , 43.63135921
+1836.410256 , -4054.05 , 39.57730921
+1836.410256 , -3861 , 35.52325921
+1836.410256 , -3667.95 , 31.46920921
+1836.410256 , -3474.9 , 27.41515921
+1836.410256 , -3281.85 , 23.36110921
+1836.410256 , -3088.8 , 19.30705921
+1836.410256 , -2895.75 , 15.25300921
+1836.410256 , -2702.7 , 11.19895921
+1836.410256 , -2509.65 , 7.144909207
+1836.410256 , -2316.6 , 3.090859207
+1836.410256 , -2123.55 , 0.963190793
+1836.410256 , -1930.5 , 5.017240793
+1836.410256 , -1737.45 , 9.071290793
+1836.410256 , -1544.4 , 13.12534079
+1836.410256 , -1351.35 , 17.17939079
+1836.410256 , -1158.3 , 21.23344079
+1836.410256 , -965.25 , 25.28749079
+1836.410256 , -772.2 , 29.34154079
+1836.410256 , -579.15 , 33.39559079
+1836.410256 , -386.1 , 37.44964079
+1836.410256 , -193.05 , 41.50369079
+1836.410256 , 0 , 45.55774079
+1836.410256 , 193.05 , 49.61179079
+1836.410256 , 386.1 , 53.66584079
+1836.410256 , 579.15 , 57.71989079
+1836.410256 , 772.2 , 61.77394079
+1836.410256 , 965.25 , 65.82799079
+1836.410256 , 1158.3 , 69.88204079
+1836.410256 , 1351.35 , 73.93609079
+1836.410256 , 1544.4 , 77.99014079
+1836.410256 , 1737.45 , 82.04419079
+1836.410256 , 1930.5 , 86.09824079
+1836.410256 , 2123.55 , 90.15229079
+1836.410256 , 2316.6 , 94.20634079
+1836.410256 , 2509.65 , 98.26039079
+1836.410256 , 2702.7 , 102.3144408
+1836.410256 , 2895.75 , 106.3684908
+1836.410256 , 3088.8 , 110.4225408
+1836.410256 , 3281.85 , 114.4765908
+1836.410256 , 3474.9 , 118.5306408
+1836.410256 , 3667.95 , 122.5846908
+1836.410256 , 3861 , 126.6387408
+1836.410256 , 4054.05 , 130.6927908
+1836.410256 , 4247.1 , 134.7468408
+1836.410256 , 4440.15 , 138.8008908
+1836.410256 , 4633.2 , 142.8549408
+1836.410256 , 4826.25 , 146.9089908
+1836.410256 , 5019.3 , 150.9630408
+1836.410256 , 5212.35 , 155.0170908
+1836.410256 , 5405.4 , 159.0711408
+1836.410256 , 5598.45 , 163.1251908
+1836.410256 , 5791.5 , 167.1792408
+1836.410256 , 5984.55 , 171.2332908
+1836.410256 , 6177.6 , 175.2873408
+2040.42735 , -6177.6 , 80.89498561
+2040.42735 , -5984.55 , 76.84093561
+2040.42735 , -5791.5 , 72.78688561
+2040.42735 , -5598.45 , 68.73283561
+2040.42735 , -5405.4 , 64.67878561
+2040.42735 , -5212.35 , 60.62473561
+2040.42735 , -5019.3 , 56.57068561
+2040.42735 , -4826.25 , 52.51663561
+2040.42735 , -4633.2 , 48.46258561
+2040.42735 , -4440.15 , 44.40853561
+2040.42735 , -4247.1 , 40.35448561
+2040.42735 , -4054.05 , 36.30043561
+2040.42735 , -3861 , 32.24638561
+2040.42735 , -3667.95 , 28.19233561
+2040.42735 , -3474.9 , 24.13828561
+2040.42735 , -3281.85 , 20.08423561
+2040.42735 , -3088.8 , 16.03018561
+2040.42735 , -2895.75 , 11.97613561
+2040.42735 , -2702.7 , 7.922085607
+2040.42735 , -2509.65 , 3.868035607
+2040.42735 , -2316.6 , 0.186014393
+2040.42735 , -2123.55 , 4.240064393
+2040.42735 , -1930.5 , 8.294114393
+2040.42735 , -1737.45 , 12.34816439
+2040.42735 , -1544.4 , 16.40221439
+2040.42735 , -1351.35 , 20.45626439
+2040.42735 , -1158.3 , 24.51031439
+2040.42735 , -965.25 , 28.56436439
+2040.42735 , -772.2 , 32.61841439
+2040.42735 , -579.15 , 36.67246439
+2040.42735 , -386.1 , 40.72651439
+2040.42735 , -193.05 , 44.78056439
+2040.42735 , 0 , 48.83461439
+2040.42735 , 193.05 , 52.88866439
+2040.42735 , 386.1 , 56.94271439
+2040.42735 , 579.15 , 60.99676439
+2040.42735 , 772.2 , 65.05081439
+2040.42735 , 965.25 , 69.10486439
+2040.42735 , 1158.3 , 73.15891439
+2040.42735 , 1351.35 , 77.21296439
+2040.42735 , 1544.4 , 81.26701439
+2040.42735 , 1737.45 , 85.32106439
+2040.42735 , 1930.5 , 89.37511439
+2040.42735 , 2123.55 , 93.42916439
+2040.42735 , 2316.6 , 97.48321439
+2040.42735 , 2509.65 , 101.5372644
+2040.42735 , 2702.7 , 105.5913144
+2040.42735 , 2895.75 , 109.6453644
+2040.42735 , 3088.8 , 113.6994144
+2040.42735 , 3281.85 , 117.7534644
+2040.42735 , 3474.9 , 121.8075144
+2040.42735 , 3667.95 , 125.8615644
+2040.42735 , 3861 , 129.9156144
+2040.42735 , 4054.05 , 133.9696644
+2040.42735 , 4247.1 , 138.0237144
+2040.42735 , 4440.15 , 142.0777644
+2040.42735 , 4633.2 , 146.1318144
+2040.42735 , 4826.25 , 150.1858644
+2040.42735 , 5019.3 , 154.2399144
+2040.42735 , 5212.35 , 158.2939644
+2040.42735 , 5405.4 , 162.3480144
+2040.42735 , 5598.45 , 166.4020644
+2040.42735 , 5791.5 , 170.4561144
+2040.42735 , 5984.55 , 174.5101644
+2040.42735 , 6177.6 , 178.5642144
+2244.529915 , -6177.6 , 77.61673919
+2244.529915 , -5984.55 , 73.56268919
+2244.529915 , -5791.5 , 69.50863919
+2244.529915 , -5598.45 , 65.45458919
+2244.529915 , -5405.4 , 61.40053919
+2244.529915 , -5212.35 , 57.34648919
+2244.529915 , -5019.3 , 53.29243919
+2244.529915 , -4826.25 , 49.23838919
+2244.529915 , -4633.2 , 45.18433919
+2244.529915 , -4440.15 , 41.13028919
+2244.529915 , -4247.1 , 37.07623919
+2244.529915 , -4054.05 , 33.02218919
+2244.529915 , -3861 , 28.96813919
+2244.529915 , -3667.95 , 24.91408919
+2244.529915 , -3474.9 , 20.86003919
+2244.529915 , -3281.85 , 16.80598919
+2244.529915 , -3088.8 , 12.75193919
+2244.529915 , -2895.75 , 8.697889192
+2244.529915 , -2702.7 , 4.643839192
+2244.529915 , -2509.65 , 0.589789192
+2244.529915 , -2316.6 , 3.464260808
+2244.529915 , -2123.55 , 7.518310808
+2244.529915 , -1930.5 , 11.57236081
+2244.529915 , -1737.45 , 15.62641081
+2244.529915 , -1544.4 , 19.68046081
+2244.529915 , -1351.35 , 23.73451081
+2244.529915 , -1158.3 , 27.78856081
+2244.529915 , -965.25 , 31.84261081
+2244.529915 , -772.2 , 35.89666081
+2244.529915 , -579.15 , 39.95071081
+2244.529915 , -386.1 , 44.00476081
+2244.529915 , -193.05 , 48.05881081
+2244.529915 , 0 , 52.11286081
+2244.529915 , 193.05 , 56.16691081
+2244.529915 , 386.1 , 60.22096081
+2244.529915 , 579.15 , 64.27501081
+2244.529915 , 772.2 , 68.32906081
+2244.529915 , 965.25 , 72.38311081
+2244.529915 , 1158.3 , 76.43716081
+2244.529915 , 1351.35 , 80.49121081
+2244.529915 , 1544.4 , 84.54526081
+2244.529915 , 1737.45 , 88.59931081
+2244.529915 , 1930.5 , 92.65336081
+2244.529915 , 2123.55 , 96.70741081
+2244.529915 , 2316.6 , 100.7614608
+2244.529915 , 2509.65 , 104.8155108
+2244.529915 , 2702.7 , 108.8695608
+2244.529915 , 2895.75 , 112.9236108
+2244.529915 , 3088.8 , 116.9776608
+2244.529915 , 3281.85 , 121.0317108
+2244.529915 , 3474.9 , 125.0857608
+2244.529915 , 3667.95 , 129.1398108
+2244.529915 , 3861 , 133.1938608
+2244.529915 , 4054.05 , 137.2479108
+2244.529915 , 4247.1 , 141.3019608
+2244.529915 , 4440.15 , 145.3560108
+2244.529915 , 4633.2 , 149.4100608
+2244.529915 , 4826.25 , 153.4641108
+2244.529915 , 5019.3 , 157.5181608
+2244.529915 , 5212.35 , 161.5722108
+2244.529915 , 5405.4 , 165.6262608
+2244.529915 , 5598.45 , 169.6803108
+2244.529915 , 5791.5 , 173.7343608
+2244.529915 , 5984.55 , 177.7884108
+2244.529915 , 6177.6 , 181.8424608
+2448.547009 , -6177.6 , 74.33986559
+2448.547009 , -5984.55 , 70.28581559
+2448.547009 , -5791.5 , 66.23176559
+2448.547009 , -5598.45 , 62.17771559
+2448.547009 , -5405.4 , 58.12366559
+2448.547009 , -5212.35 , 54.06961559
+2448.547009 , -5019.3 , 50.01556559
+2448.547009 , -4826.25 , 45.96151559
+2448.547009 , -4633.2 , 41.90746559
+2448.547009 , -4440.15 , 37.85341559
+2448.547009 , -4247.1 , 33.79936559
+2448.547009 , -4054.05 , 29.74531559
+2448.547009 , -3861 , 25.69126559
+2448.547009 , -3667.95 , 21.63721559
+2448.547009 , -3474.9 , 17.58316559
+2448.547009 , -3281.85 , 13.52911559
+2448.547009 , -3088.8 , 9.475065593
+2448.547009 , -2895.75 , 5.421015593
+2448.547009 , -2702.7 , 1.366965593
+2448.547009 , -2509.65 , 2.687084407
+2448.547009 , -2316.6 , 6.741134407
+2448.547009 , -2123.55 , 10.79518441
+2448.547009 , -1930.5 , 14.84923441
+2448.547009 , -1737.45 , 18.90328441
+2448.547009 , -1544.4 , 22.95733441
+2448.547009 , -1351.35 , 27.01138441
+2448.547009 , -1158.3 , 31.06543441
+2448.547009 , -965.25 , 35.11948441
+2448.547009 , -772.2 , 39.17353441
+2448.547009 , -579.15 , 43.22758441
+2448.547009 , -386.1 , 47.28163441
+2448.547009 , -193.05 , 51.33568441
+2448.547009 , 0 , 55.38973441
+2448.547009 , 193.05 , 59.44378441
+2448.547009 , 386.1 , 63.49783441
+2448.547009 , 579.15 , 67.55188441
+2448.547009 , 772.2 , 71.60593441
+2448.547009 , 965.25 , 75.65998441
+2448.547009 , 1158.3 , 79.71403441
+2448.547009 , 1351.35 , 83.76808441
+2448.547009 , 1544.4 , 87.82213441
+2448.547009 , 1737.45 , 91.87618441
+2448.547009 , 1930.5 , 95.93023441
+2448.547009 , 2123.55 , 99.98428441
+2448.547009 , 2316.6 , 104.0383344
+2448.547009 , 2509.65 , 108.0923844
+2448.547009 , 2702.7 , 112.1464344
+2448.547009 , 2895.75 , 116.2004844
+2448.547009 , 3088.8 , 120.2545344
+2448.547009 , 3281.85 , 124.3085844
+2448.547009 , 3474.9 , 128.3626344
+2448.547009 , 3667.95 , 132.4166844
+2448.547009 , 3861 , 136.4707344
+2448.547009 , 4054.05 , 140.5247844
+2448.547009 , 4247.1 , 144.5788344
+2448.547009 , 4440.15 , 148.6328844
+2448.547009 , 4633.2 , 152.6869344
+2448.547009 , 4826.25 , 156.7409844
+2448.547009 , 5019.3 , 160.7950344
+2448.547009 , 5212.35 , 164.8490844
+2448.547009 , 5405.4 , 168.9031344
+2448.547009 , 5598.45 , 172.9571844
+2448.547009 , 5791.5 , 177.0112344
+2448.547009 , 5984.55 , 181.0652844
+2448.547009 , 6177.6 , 185.1193344
+2652.564103 , -6177.6 , 71.06299199
+2652.564103 , -5984.55 , 67.00894199
+2652.564103 , -5791.5 , 62.95489199
+2652.564103 , -5598.45 , 58.90084199
+2652.564103 , -5405.4 , 54.84679199
+2652.564103 , -5212.35 , 50.79274199
+2652.564103 , -5019.3 , 46.73869199
+2652.564103 , -4826.25 , 42.68464199
+2652.564103 , -4633.2 , 38.63059199
+2652.564103 , -4440.15 , 34.57654199
+2652.564103 , -4247.1 , 30.52249199
+2652.564103 , -4054.05 , 26.46844199
+2652.564103 , -3861 , 22.41439199
+2652.564103 , -3667.95 , 18.36034199
+2652.564103 , -3474.9 , 14.30629199
+2652.564103 , -3281.85 , 10.25224199
+2652.564103 , -3088.8 , 6.198191993
+2652.564103 , -2895.75 , 2.144141993
+2652.564103 , -2702.7 , 1.909908007
+2652.564103 , -2509.65 , 5.963958007
+2652.564103 , -2316.6 , 10.01800801
+2652.564103 , -2123.55 , 14.07205801
+2652.564103 , -1930.5 , 18.12610801
+2652.564103 , -1737.45 , 22.18015801
+2652.564103 , -1544.4 , 26.23420801
+2652.564103 , -1351.35 , 30.28825801
+2652.564103 , -1158.3 , 34.34230801
+2652.564103 , -965.25 , 38.39635801
+2652.564103 , -772.2 , 42.45040801
+2652.564103 , -579.15 , 46.50445801
+2652.564103 , -386.1 , 50.55850801
+2652.564103 , -193.05 , 54.61255801
+2652.564103 , 0 , 58.66660801
+2652.564103 , 193.05 , 62.72065801
+2652.564103 , 386.1 , 66.77470801
+2652.564103 , 579.15 , 70.82875801
+2652.564103 , 772.2 , 74.88280801
+2652.564103 , 965.25 , 78.93685801
+2652.564103 , 1158.3 , 82.99090801
+2652.564103 , 1351.35 , 87.04495801
+2652.564103 , 1544.4 , 91.09900801
+2652.564103 , 1737.45 , 95.15305801
+2652.564103 , 1930.5 , 99.20710801
+2652.564103 , 2123.55 , 103.261158
+2652.564103 , 2316.6 , 107.315208
+2652.564103 , 2509.65 , 111.369258
+2652.564103 , 2702.7 , 115.423308
+2652.564103 , 2895.75 , 119.477358
+2652.564103 , 3088.8 , 123.531408
+2652.564103 , 3281.85 , 127.585458
+2652.564103 , 3474.9 , 131.639508
+2652.564103 , 3667.95 , 135.693558
+2652.564103 , 3861 , 139.747608
+2652.564103 , 4054.05 , 143.801658
+2652.564103 , 4247.1 , 147.855708
+2652.564103 , 4440.15 , 151.909758
+2652.564103 , 4633.2 , 155.963808
+2652.564103 , 4826.25 , 160.017858
+2652.564103 , 5019.3 , 164.071908
+2652.564103 , 5212.35 , 168.125958
+2652.564103 , 5405.4 , 172.180008
+2652.564103 , 5598.45 , 176.234058
+2652.564103 , 5791.5 , 180.288108
+2652.564103 , 5984.55 , 184.342158
+2652.564103 , 6177.6 , 188.396208
+2856.666667 , -6177.6 , 67.78474559
+2856.666667 , -5984.55 , 63.73069559
+2856.666667 , -5791.5 , 59.67664559
+2856.666667 , -5598.45 , 55.62259559
+2856.666667 , -5405.4 , 51.56854559
+2856.666667 , -5212.35 , 47.51449559
+2856.666667 , -5019.3 , 43.46044559
+2856.666667 , -4826.25 , 39.40639559
+2856.666667 , -4633.2 , 35.35234559
+2856.666667 , -4440.15 , 31.29829559
+2856.666667 , -4247.1 , 27.24424559
+2856.666667 , -4054.05 , 23.19019559
+2856.666667 , -3861 , 19.13614559
+2856.666667 , -3667.95 , 15.08209559
+2856.666667 , -3474.9 , 11.02804559
+2856.666667 , -3281.85 , 6.973995595
+2856.666667 , -3088.8 , 2.919945595
+2856.666667 , -2895.75 , 1.134104405
+2856.666667 , -2702.7 , 5.188154405
+2856.666667 , -2509.65 , 9.242204405
+2856.666667 , -2316.6 , 13.29625441
+2856.666667 , -2123.55 , 17.35030441
+2856.666667 , -1930.5 , 21.40435441
+2856.666667 , -1737.45 , 25.45840441
+2856.666667 , -1544.4 , 29.51245441
+2856.666667 , -1351.35 , 33.56650441
+2856.666667 , -1158.3 , 37.62055441
+2856.666667 , -965.25 , 41.67460441
+2856.666667 , -772.2 , 45.72865441
+2856.666667 , -579.15 , 49.78270441
+2856.666667 , -386.1 , 53.83675441
+2856.666667 , -193.05 , 57.89080441
+2856.666667 , 0 , 61.94485441
+2856.666667 , 193.05 , 65.99890441
+2856.666667 , 386.1 , 70.05295441
+2856.666667 , 579.15 , 74.10700441
+2856.666667 , 772.2 , 78.16105441
+2856.666667 , 965.25 , 82.21510441
+2856.666667 , 1158.3 , 86.26915441
+2856.666667 , 1351.35 , 90.32320441
+2856.666667 , 1544.4 , 94.37725441
+2856.666667 , 1737.45 , 98.43130441
+2856.666667 , 1930.5 , 102.4853544
+2856.666667 , 2123.55 , 106.5394044
+2856.666667 , 2316.6 , 110.5934544
+2856.666667 , 2509.65 , 114.6475044
+2856.666667 , 2702.7 , 118.7015544
+2856.666667 , 2895.75 , 122.7556044
+2856.666667 , 3088.8 , 126.8096544
+2856.666667 , 3281.85 , 130.8637044
+2856.666667 , 3474.9 , 134.9177544
+2856.666667 , 3667.95 , 138.9718044
+2856.666667 , 3861 , 143.0258544
+2856.666667 , 4054.05 , 147.0799044
+2856.666667 , 4247.1 , 151.1339544
+2856.666667 , 4440.15 , 155.1880044
+2856.666667 , 4633.2 , 159.2420544
+2856.666667 , 4826.25 , 163.2961044
+2856.666667 , 5019.3 , 167.3501544
+2856.666667 , 5212.35 , 171.4042044
+2856.666667 , 5405.4 , 175.4582544
+2856.666667 , 5598.45 , 179.5123044
+2856.666667 , 5791.5 , 183.5663544
+2856.666667 , 5984.55 , 187.6204044
+2856.666667 , 6177.6 , 191.6744544
+3060.683761 , -6177.6 , 64.50787199
+3060.683761 , -5984.55 , 60.45382199
+3060.683761 , -5791.5 , 56.39977199
+3060.683761 , -5598.45 , 52.34572199
+3060.683761 , -5405.4 , 48.29167199
+3060.683761 , -5212.35 , 44.23762199
+3060.683761 , -5019.3 , 40.18357199
+3060.683761 , -4826.25 , 36.12952199
+3060.683761 , -4633.2 , 32.07547199
+3060.683761 , -4440.15 , 28.02142199
+3060.683761 , -4247.1 , 23.96737199
+3060.683761 , -4054.05 , 19.91332199
+3060.683761 , -3861 , 15.85927199
+3060.683761 , -3667.95 , 11.80522199
+3060.683761 , -3474.9 , 7.751171995
+3060.683761 , -3281.85 , 3.697121995
+3060.683761 , -3088.8 , 0.356928005
+3060.683761 , -2895.75 , 4.410978005
+3060.683761 , -2702.7 , 8.465028005
+3060.683761 , -2509.65 , 12.51907801
+3060.683761 , -2316.6 , 16.57312801
+3060.683761 , -2123.55 , 20.62717801
+3060.683761 , -1930.5 , 24.68122801
+3060.683761 , -1737.45 , 28.73527801
+3060.683761 , -1544.4 , 32.78932801
+3060.683761 , -1351.35 , 36.84337801
+3060.683761 , -1158.3 , 40.89742801
+3060.683761 , -965.25 , 44.95147801
+3060.683761 , -772.2 , 49.00552801
+3060.683761 , -579.15 , 53.05957801
+3060.683761 , -386.1 , 57.11362801
+3060.683761 , -193.05 , 61.16767801
+3060.683761 , 0 , 65.22172801
+3060.683761 , 193.05 , 69.27577801
+3060.683761 , 386.1 , 73.32982801
+3060.683761 , 579.15 , 77.38387801
+3060.683761 , 772.2 , 81.43792801
+3060.683761 , 965.25 , 85.49197801
+3060.683761 , 1158.3 , 89.54602801
+3060.683761 , 1351.35 , 93.60007801
+3060.683761 , 1544.4 , 97.65412801
+3060.683761 , 1737.45 , 101.708178
+3060.683761 , 1930.5 , 105.762228
+3060.683761 , 2123.55 , 109.816278
+3060.683761 , 2316.6 , 113.870328
+3060.683761 , 2509.65 , 117.924378
+3060.683761 , 2702.7 , 121.978428
+3060.683761 , 2895.75 , 126.032478
+3060.683761 , 3088.8 , 130.086528
+3060.683761 , 3281.85 , 134.140578
+3060.683761 , 3474.9 , 138.194628
+3060.683761 , 3667.95 , 142.248678
+3060.683761 , 3861 , 146.302728
+3060.683761 , 4054.05 , 150.356778
+3060.683761 , 4247.1 , 154.410828
+3060.683761 , 4440.15 , 158.464878
+3060.683761 , 4633.2 , 162.518928
+3060.683761 , 4826.25 , 166.572978
+3060.683761 , 5019.3 , 170.627028
+3060.683761 , 5212.35 , 174.681078
+3060.683761 , 5405.4 , 178.735128
+3060.683761 , 5598.45 , 182.789178
+3060.683761 , 5791.5 , 186.843228
+3060.683761 , 5984.55 , 190.897278
+3060.683761 , 6177.6 , 194.951328
+3264.700855 , -6177.6 , 61.2309984
+3264.700855 , -5984.55 , 57.1769484
+3264.700855 , -5791.5 , 53.1228984
+3264.700855 , -5598.45 , 49.0688484
+3264.700855 , -5405.4 , 45.0147984
+3264.700855 , -5212.35 , 40.9607484
+3264.700855 , -5019.3 , 36.9066984
+3264.700855 , -4826.25 , 32.8526484
+3264.700855 , -4633.2 , 28.7985984
+3264.700855 , -4440.15 , 24.7445484
+3264.700855 , -4247.1 , 20.6904984
+3264.700855 , -4054.05 , 16.6364484
+3264.700855 , -3861 , 12.5823984
+3264.700855 , -3667.95 , 8.528348395
+3264.700855 , -3474.9 , 4.474298395
+3264.700855 , -3281.85 , 0.420248395
+3264.700855 , -3088.8 , 3.633801605
+3264.700855 , -2895.75 , 7.687851605
+3264.700855 , -2702.7 , 11.7419016
+3264.700855 , -2509.65 , 15.7959516
+3264.700855 , -2316.6 , 19.8500016
+3264.700855 , -2123.55 , 23.9040516
+3264.700855 , -1930.5 , 27.9581016
+3264.700855 , -1737.45 , 32.0121516
+3264.700855 , -1544.4 , 36.0662016
+3264.700855 , -1351.35 , 40.1202516
+3264.700855 , -1158.3 , 44.1743016
+3264.700855 , -965.25 , 48.2283516
+3264.700855 , -772.2 , 52.2824016
+3264.700855 , -579.15 , 56.3364516
+3264.700855 , -386.1 , 60.3905016
+3264.700855 , -193.05 , 64.4445516
+3264.700855 , 0 , 68.4986016
+3264.700855 , 193.05 , 72.5526516
+3264.700855 , 386.1 , 76.6067016
+3264.700855 , 579.15 , 80.6607516
+3264.700855 , 772.2 , 84.7148016
+3264.700855 , 965.25 , 88.7688516
+3264.700855 , 1158.3 , 92.8229016
+3264.700855 , 1351.35 , 96.8769516
+3264.700855 , 1544.4 , 100.9310016
+3264.700855 , 1737.45 , 104.9850516
+3264.700855 , 1930.5 , 109.0391016
+3264.700855 , 2123.55 , 113.0931516
+3264.700855 , 2316.6 , 117.1472016
+3264.700855 , 2509.65 , 121.2012516
+3264.700855 , 2702.7 , 125.2553016
+3264.700855 , 2895.75 , 129.3093516
+3264.700855 , 3088.8 , 133.3634016
+3264.700855 , 3281.85 , 137.4174516
+3264.700855 , 3474.9 , 141.4715016
+3264.700855 , 3667.95 , 145.5255516
+3264.700855 , 3861 , 149.5796016
+3264.700855 , 4054.05 , 153.6336516
+3264.700855 , 4247.1 , 157.6877016
+3264.700855 , 4440.15 , 161.7417516
+3264.700855 , 4633.2 , 165.7958016
+3264.700855 , 4826.25 , 169.8498516
+3264.700855 , 5019.3 , 173.9039016
+3264.700855 , 5212.35 , 177.9579516
+3264.700855 , 5405.4 , 182.0120016
+3264.700855 , 5598.45 , 186.0660516
+3264.700855 , 5791.5 , 190.1201016
+3264.700855 , 5984.55 , 194.1741516
+3264.700855 , 6177.6 , 198.2282016
+3468.803419 , -6177.6 , 57.952752
+3468.803419 , -5984.55 , 53.898702
+3468.803419 , -5791.5 , 49.844652
+3468.803419 , -5598.45 , 45.790602
+3468.803419 , -5405.4 , 41.736552
+3468.803419 , -5212.35 , 37.682502
+3468.803419 , -5019.3 , 33.628452
+3468.803419 , -4826.25 , 29.574402
+3468.803419 , -4633.2 , 25.520352
+3468.803419 , -4440.15 , 21.466302
+3468.803419 , -4247.1 , 17.412252
+3468.803419 , -4054.05 , 13.358202
+3468.803419 , -3861 , 9.304151997
+3468.803419 , -3667.95 , 5.250101997
+3468.803419 , -3474.9 , 1.196051997
+3468.803419 , -3281.85 , 2.857998003
+3468.803419 , -3088.8 , 6.912048003
+3468.803419 , -2895.75 , 10.966098
+3468.803419 , -2702.7 , 15.020148
+3468.803419 , -2509.65 , 19.074198
+3468.803419 , -2316.6 , 23.128248
+3468.803419 , -2123.55 , 27.182298
+3468.803419 , -1930.5 , 31.236348
+3468.803419 , -1737.45 , 35.290398
+3468.803419 , -1544.4 , 39.344448
+3468.803419 , -1351.35 , 43.398498
+3468.803419 , -1158.3 , 47.452548
+3468.803419 , -965.25 , 51.506598
+3468.803419 , -772.2 , 55.560648
+3468.803419 , -579.15 , 59.614698
+3468.803419 , -386.1 , 63.668748
+3468.803419 , -193.05 , 67.722798
+3468.803419 , 0 , 71.776848
+3468.803419 , 193.05 , 75.830898
+3468.803419 , 386.1 , 79.884948
+3468.803419 , 579.15 , 83.938998
+3468.803419 , 772.2 , 87.993048
+3468.803419 , 965.25 , 92.047098
+3468.803419 , 1158.3 , 96.101148
+3468.803419 , 1351.35 , 100.155198
+3468.803419 , 1544.4 , 104.209248
+3468.803419 , 1737.45 , 108.263298
+3468.803419 , 1930.5 , 112.317348
+3468.803419 , 2123.55 , 116.371398
+3468.803419 , 2316.6 , 120.425448
+3468.803419 , 2509.65 , 124.479498
+3468.803419 , 2702.7 , 128.533548
+3468.803419 , 2895.75 , 132.587598
+3468.803419 , 3088.8 , 136.641648
+3468.803419 , 3281.85 , 140.695698
+3468.803419 , 3474.9 , 144.749748
+3468.803419 , 3667.95 , 148.803798
+3468.803419 , 3861 , 152.857848
+3468.803419 , 4054.05 , 156.911898
+3468.803419 , 4247.1 , 160.965948
+3468.803419 , 4440.15 , 165.019998
+3468.803419 , 4633.2 , 169.074048
+3468.803419 , 4826.25 , 173.128098
+3468.803419 , 5019.3 , 177.182148
+3468.803419 , 5212.35 , 181.236198
+3468.803419 , 5405.4 , 185.290248
+3468.803419 , 5598.45 , 189.344298
+3468.803419 , 5791.5 , 193.398348
+3468.803419 , 5984.55 , 197.452398
+3468.803419 , 6177.6 , 201.506448
+3672.820513 , -6177.6 , 54.6758784
+3672.820513 , -5984.55 , 50.6218284
+3672.820513 , -5791.5 , 46.5677784
+3672.820513 , -5598.45 , 42.5137284
+3672.820513 , -5405.4 , 38.4596784
+3672.820513 , -5212.35 , 34.4056284
+3672.820513 , -5019.3 , 30.3515784
+3672.820513 , -4826.25 , 26.2975284
+3672.820513 , -4633.2 , 22.2434784
+3672.820513 , -4440.15 , 18.1894284
+3672.820513 , -4247.1 , 14.1353784
+3672.820513 , -4054.05 , 10.0813284
+3672.820513 , -3861 , 6.027278397
+3672.820513 , -3667.95 , 1.973228397
+3672.820513 , -3474.9 , 2.080821603
+3672.820513 , -3281.85 , 6.134871603
+3672.820513 , -3088.8 , 10.1889216
+3672.820513 , -2895.75 , 14.2429716
+3672.820513 , -2702.7 , 18.2970216
+3672.820513 , -2509.65 , 22.3510716
+3672.820513 , -2316.6 , 26.4051216
+3672.820513 , -2123.55 , 30.4591716
+3672.820513 , -1930.5 , 34.5132216
+3672.820513 , -1737.45 , 38.5672716
+3672.820513 , -1544.4 , 42.6213216
+3672.820513 , -1351.35 , 46.6753716
+3672.820513 , -1158.3 , 50.7294216
+3672.820513 , -965.25 , 54.7834716
+3672.820513 , -772.2 , 58.8375216
+3672.820513 , -579.15 , 62.8915716
+3672.820513 , -386.1 , 66.9456216
+3672.820513 , -193.05 , 70.9996716
+3672.820513 , 0 , 75.0537216
+3672.820513 , 193.05 , 79.1077716
+3672.820513 , 386.1 , 83.1618216
+3672.820513 , 579.15 , 87.2158716
+3672.820513 , 772.2 , 91.2699216
+3672.820513 , 965.25 , 95.3239716
+3672.820513 , 1158.3 , 99.3780216
+3672.820513 , 1351.35 , 103.4320716
+3672.820513 , 1544.4 , 107.4861216
+3672.820513 , 1737.45 , 111.5401716
+3672.820513 , 1930.5 , 115.5942216
+3672.820513 , 2123.55 , 119.6482716
+3672.820513 , 2316.6 , 123.7023216
+3672.820513 , 2509.65 , 127.7563716
+3672.820513 , 2702.7 , 131.8104216
+3672.820513 , 2895.75 , 135.8644716
+3672.820513 , 3088.8 , 139.9185216
+3672.820513 , 3281.85 , 143.9725716
+3672.820513 , 3474.9 , 148.0266216
+3672.820513 , 3667.95 , 152.0806716
+3672.820513 , 3861 , 156.1347216
+3672.820513 , 4054.05 , 160.1887716
+3672.820513 , 4247.1 , 164.2428216
+3672.820513 , 4440.15 , 168.2968716
+3672.820513 , 4633.2 , 172.3509216
+3672.820513 , 4826.25 , 176.4049716
+3672.820513 , 5019.3 , 180.4590216
+3672.820513 , 5212.35 , 184.5130716
+3672.820513 , 5405.4 , 188.5671216
+3672.820513 , 5598.45 , 192.6211716
+3672.820513 , 5791.5 , 196.6752216
+3672.820513 , 5984.55 , 200.7292716
+3672.820513 , 6177.6 , 204.7833216
+3876.837607 , -6177.6 , 51.3990048
+3876.837607 , -5984.55 , 47.3449548
+3876.837607 , -5791.5 , 43.2909048
+3876.837607 , -5598.45 , 39.2368548
+3876.837607 , -5405.4 , 35.1828048
+3876.837607 , -5212.35 , 31.1287548
+3876.837607 , -5019.3 , 27.0747048
+3876.837607 , -4826.25 , 23.0206548
+3876.837607 , -4633.2 , 18.9666048
+3876.837607 , -4440.15 , 14.9125548
+3876.837607 , -4247.1 , 10.8585048
+3876.837607 , -4054.05 , 6.804454797
+3876.837607 , -3861 , 2.750404797
+3876.837607 , -3667.95 , 1.303645203
+3876.837607 , -3474.9 , 5.357695203
+3876.837607 , -3281.85 , 9.411745203
+3876.837607 , -3088.8 , 13.4657952
+3876.837607 , -2895.75 , 17.5198452
+3876.837607 , -2702.7 , 21.5738952
+3876.837607 , -2509.65 , 25.6279452
+3876.837607 , -2316.6 , 29.6819952
+3876.837607 , -2123.55 , 33.7360452
+3876.837607 , -1930.5 , 37.7900952
+3876.837607 , -1737.45 , 41.8441452
+3876.837607 , -1544.4 , 45.8981952
+3876.837607 , -1351.35 , 49.9522452
+3876.837607 , -1158.3 , 54.0062952
+3876.837607 , -965.25 , 58.0603452
+3876.837607 , -772.2 , 62.1143952
+3876.837607 , -579.15 , 66.1684452
+3876.837607 , -386.1 , 70.2224952
+3876.837607 , -193.05 , 74.2765452
+3876.837607 , 0 , 78.3305952
+3876.837607 , 193.05 , 82.3846452
+3876.837607 , 386.1 , 86.4386952
+3876.837607 , 579.15 , 90.4927452
+3876.837607 , 772.2 , 94.5467952
+3876.837607 , 965.25 , 98.6008452
+3876.837607 , 1158.3 , 102.6548952
+3876.837607 , 1351.35 , 106.7089452
+3876.837607 , 1544.4 , 110.7629952
+3876.837607 , 1737.45 , 114.8170452
+3876.837607 , 1930.5 , 118.8710952
+3876.837607 , 2123.55 , 122.9251452
+3876.837607 , 2316.6 , 126.9791952
+3876.837607 , 2509.65 , 131.0332452
+3876.837607 , 2702.7 , 135.0872952
+3876.837607 , 2895.75 , 139.1413452
+3876.837607 , 3088.8 , 143.1953952
+3876.837607 , 3281.85 , 147.2494452
+3876.837607 , 3474.9 , 151.3034952
+3876.837607 , 3667.95 , 155.3575452
+3876.837607 , 3861 , 159.4115952
+3876.837607 , 4054.05 , 163.4656452
+3876.837607 , 4247.1 , 167.5196952
+3876.837607 , 4440.15 , 171.5737452
+3876.837607 , 4633.2 , 175.6277952
+3876.837607 , 4826.25 , 179.6818452
+3876.837607 , 5019.3 , 183.7358952
+3876.837607 , 5212.35 , 187.7899452
+3876.837607 , 5405.4 , 191.8439952
+3876.837607 , 5598.45 , 195.8980452
+3876.837607 , 5791.5 , 199.9520952
+3876.837607 , 5984.55 , 204.0061452
+3876.837607 , 6177.6 , 208.0601952
+4080.854701 , -6177.6 , 48.1221312
+4080.854701 , -5984.55 , 44.0680812
+4080.854701 , -5791.5 , 40.0140312
+4080.854701 , -5598.45 , 35.9599812
+4080.854701 , -5405.4 , 31.9059312
+4080.854701 , -5212.35 , 27.8518812
+4080.854701 , -5019.3 , 23.7978312
+4080.854701 , -4826.25 , 19.7437812
+4080.854701 , -4633.2 , 15.6897312
+4080.854701 , -4440.15 , 11.6356812
+4080.854701 , -4247.1 , 7.581631198
+4080.854701 , -4054.05 , 3.527581198
+4080.854701 , -3861 , 0.526468802
+4080.854701 , -3667.95 , 4.580518802
+4080.854701 , -3474.9 , 8.634568802
+4080.854701 , -3281.85 , 12.6886188
+4080.854701 , -3088.8 , 16.7426688
+4080.854701 , -2895.75 , 20.7967188
+4080.854701 , -2702.7 , 24.8507688
+4080.854701 , -2509.65 , 28.9048188
+4080.854701 , -2316.6 , 32.9588688
+4080.854701 , -2123.55 , 37.0129188
+4080.854701 , -1930.5 , 41.0669688
+4080.854701 , -1737.45 , 45.1210188
+4080.854701 , -1544.4 , 49.1750688
+4080.854701 , -1351.35 , 53.2291188
+4080.854701 , -1158.3 , 57.2831688
+4080.854701 , -965.25 , 61.3372188
+4080.854701 , -772.2 , 65.3912688
+4080.854701 , -579.15 , 69.4453188
+4080.854701 , -386.1 , 73.4993688
+4080.854701 , -193.05 , 77.5534188
+4080.854701 , 0 , 81.6074688
+4080.854701 , 193.05 , 85.6615188
+4080.854701 , 386.1 , 89.7155688
+4080.854701 , 579.15 , 93.7696188
+4080.854701 , 772.2 , 97.8236688
+4080.854701 , 965.25 , 101.8777188
+4080.854701 , 1158.3 , 105.9317688
+4080.854701 , 1351.35 , 109.9858188
+4080.854701 , 1544.4 , 114.0398688
+4080.854701 , 1737.45 , 118.0939188
+4080.854701 , 1930.5 , 122.1479688
+4080.854701 , 2123.55 , 126.2020188
+4080.854701 , 2316.6 , 130.2560688
+4080.854701 , 2509.65 , 134.3101188
+4080.854701 , 2702.7 , 138.3641688
+4080.854701 , 2895.75 , 142.4182188
+4080.854701 , 3088.8 , 146.4722688
+4080.854701 , 3281.85 , 150.5263188
+4080.854701 , 3474.9 , 154.5803688
+4080.854701 , 3667.95 , 158.6344188
+4080.854701 , 3861 , 162.6884688
+4080.854701 , 4054.05 , 166.7425188
+4080.854701 , 4247.1 , 170.7965688
+4080.854701 , 4440.15 , 174.8506188
+4080.854701 , 4633.2 , 178.9046688
+4080.854701 , 4826.25 , 182.9587188
+4080.854701 , 5019.3 , 187.0127688
+4080.854701 , 5212.35 , 191.0668188
+4080.854701 , 5405.4 , 195.1208688
+4080.854701 , 5598.45 , 199.1749188
+4080.854701 , 5791.5 , 203.2289688
+4080.854701 , 5984.55 , 207.2830188
+4080.854701 , 6177.6 , 211.3370688
+4268.632479 , -6177.6 , 45.10608959
+4268.632479 , -5984.55 , 41.05203959
+4268.632479 , -5791.5 , 36.99798959
+4268.632479 , -5598.45 , 32.94393959
+4268.632479 , -5405.4 , 28.88988959
+4268.632479 , -5212.35 , 24.83583959
+4268.632479 , -5019.3 , 20.78178959
+4268.632479 , -4826.25 , 16.72773959
+4268.632479 , -4633.2 , 12.67368959
+4268.632479 , -4440.15 , 8.619639594
+4268.632479 , -4247.1 , 4.565589594
+4268.632479 , -4054.05 , 0.511539594
+4268.632479 , -3861 , 3.542510406
+4268.632479 , -3667.95 , 7.596560406
+4268.632479 , -3474.9 , 11.65061041
+4268.632479 , -3281.85 , 15.70466041
+4268.632479 , -3088.8 , 19.75871041
+4268.632479 , -2895.75 , 23.81276041
+4268.632479 , -2702.7 , 27.86681041
+4268.632479 , -2509.65 , 31.92086041
+4268.632479 , -2316.6 , 35.97491041
+4268.632479 , -2123.55 , 40.02896041
+4268.632479 , -1930.5 , 44.08301041
+4268.632479 , -1737.45 , 48.13706041
+4268.632479 , -1544.4 , 52.19111041
+4268.632479 , -1351.35 , 56.24516041
+4268.632479 , -1158.3 , 60.29921041
+4268.632479 , -965.25 , 64.35326041
+4268.632479 , -772.2 , 68.40731041
+4268.632479 , -579.15 , 72.46136041
+4268.632479 , -386.1 , 76.51541041
+4268.632479 , -193.05 , 80.56946041
+4268.632479 , 0 , 84.62351041
+4268.632479 , 193.05 , 88.67756041
+4268.632479 , 386.1 , 92.73161041
+4268.632479 , 579.15 , 96.78566041
+4268.632479 , 772.2 , 100.8397104
+4268.632479 , 965.25 , 104.8937604
+4268.632479 , 1158.3 , 108.9478104
+4268.632479 , 1351.35 , 113.0018604
+4268.632479 , 1544.4 , 117.0559104
+4268.632479 , 1737.45 , 121.1099604
+4268.632479 , 1930.5 , 125.1640104
+4268.632479 , 2123.55 , 129.2180604
+4268.632479 , 2316.6 , 133.2721104
+4268.632479 , 2509.65 , 137.3261604
+4268.632479 , 2702.7 , 141.3802104
+4268.632479 , 2895.75 , 145.4342604
+4268.632479 , 3088.8 , 149.4883104
+4268.632479 , 3281.85 , 153.5423604
+4268.632479 , 3474.9 , 157.5964104
+4268.632479 , 3667.95 , 161.6504604
+4268.632479 , 3861 , 165.7045104
+4268.632479 , 4054.05 , 169.7585604
+4268.632479 , 4247.1 , 173.8126104
+4268.632479 , 4440.15 , 177.8666604
+4268.632479 , 4633.2 , 181.9207104
+4268.632479 , 4826.25 , 185.9747604
+4268.632479 , 5019.3 , 190.0288104
+4268.632479 , 5212.35 , 194.0828604
+4268.632479 , 5405.4 , 198.1369104
+4268.632479 , 5598.45 , 202.1909604
+4268.632479 , 5791.5 , 206.2450104
+4268.632479 , 5984.55 , 210.2990604
+4268.632479 , 6177.6 , 214.3531104
+5000 , -6177.6 , 33.35904
+5000 , -5984.55 , 29.30499
+5000 , -5791.5 , 25.25094
+5000 , -5598.45 , 21.19689
+5000 , -5405.4 , 17.14284
+5000 , -5212.35 , 13.08879
+5000 , -5019.3 , 9.03474
+5000 , -4826.25 , 4.98069
+5000 , -4633.2 , 0.92664
+5000 , -4440.15 , 3.12741
+5000 , -4247.1 , 7.18146
+5000 , -4054.05 , 11.23551
+5000 , -3861 , 15.28956
+5000 , -3667.95 , 19.34361
+5000 , -3474.9 , 23.39766
+5000 , -3281.85 , 27.45171
+5000 , -3088.8 , 31.50576
+5000 , -2895.75 , 35.55981
+5000 , -2702.7 , 39.61386
+5000 , -2509.65 , 43.66791
+5000 , -2316.6 , 47.72196
+5000 , -2123.55 , 51.77601
+5000 , -1930.5 , 55.83006
+5000 , -1737.45 , 59.88411
+5000 , -1544.4 , 63.93816
+5000 , -1351.35 , 67.99221
+5000 , -1158.3 , 72.04626
+5000 , -965.25 , 76.10031
+5000 , -772.2 , 80.15436
+5000 , -579.15 , 84.20841
+5000 , -386.1 , 88.26246
+5000 , -193.05 , 92.31651
+5000 , 0 , 96.37056
+5000 , 193.05 , 100.42461
+5000 , 386.1 , 104.47866
+5000 , 579.15 , 108.53271
+5000 , 772.2 , 112.58676
+5000 , 965.25 , 116.64081
+5000 , 1158.3 , 120.69486
+5000 , 1351.35 , 124.74891
+5000 , 1544.4 , 128.80296
+5000 , 1737.45 , 132.85701
+5000 , 1930.5 , 136.91106
+5000 , 2123.55 , 140.96511
+5000 , 2316.6 , 145.01916
+5000 , 2509.65 , 149.07321
+5000 , 2702.7 , 153.12726
+5000 , 2895.75 , 157.18131
+5000 , 3088.8 , 161.23536
+5000 , 3281.85 , 165.28941
+5000 , 3474.9 , 169.34346
+5000 , 3667.95 , 173.39751
+5000 , 3861 , 177.45156
+5000 , 4054.05 , 181.50561
+5000 , 4247.1 , 185.55966
+5000 , 4440.15 , 189.61371
+5000 , 4633.2 , 193.66776
+5000 , 4826.25 , 197.72181
+5000 , 5019.3 , 201.77586
+5000 , 5212.35 , 205.82991
+5000 , 5405.4 , 209.88396
+5000 , 5598.45 , 213.93801
+5000 , 5791.5 , 217.99206
+5000 , 5984.55 , 222.04611
+5000 , 6177.6 , 226.10016
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_4.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_4.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..75f259c18b538dd9de02bdc7b9a8b087fd93c558
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_4.vtlm
@@ -0,0 +1,2081 @@
+Input Speed [rpm] , Input Torque [Nm] , Torque Loss [Nm]
+0 , -6177.6 , 108.108
+0 , -5984.55 , 104.247
+0 , -5791.5 , 100.386
+0 , -5598.45 , 96.525
+0 , -5405.4 , 92.664
+0 , -5212.35 , 88.803
+0 , -5019.3 , 84.942
+0 , -4826.25 , 81.081
+0 , -4633.2 , 77.22
+0 , -4440.15 , 73.359
+0 , -4247.1 , 69.498
+0 , -4054.05 , 65.637
+0 , -3861 , 61.776
+0 , -3667.95 , 57.915
+0 , -3474.9 , 54.054
+0 , -3281.85 , 50.193
+0 , -3088.8 , 46.332
+0 , -2895.75 , 42.471
+0 , -2702.7 , 38.61
+0 , -2509.65 , 34.749
+0 , -2316.6 , 30.888
+0 , -2123.55 , 27.027
+0 , -1930.5 , 23.166
+0 , -1737.45 , 19.305
+0 , -1544.4 , 15.444
+0 , -1351.35 , 11.583
+0 , -1158.3 , 7.722
+0 , -965.25 , 3.861
+0 , -772.2 , 0
+0 , -579.15 , 3.861
+0 , -386.1 , 7.722
+0 , -193.05 , 11.583
+0 , 0 , 15.444
+0 , 193.05 , 19.305
+0 , 386.1 , 23.166
+0 , 579.15 , 27.027
+0 , 772.2 , 30.888
+0 , 965.25 , 34.749
+0 , 1158.3 , 38.61
+0 , 1351.35 , 42.471
+0 , 1544.4 , 46.332
+0 , 1737.45 , 50.193
+0 , 1930.5 , 54.054
+0 , 2123.55 , 57.915
+0 , 2316.6 , 61.776
+0 , 2509.65 , 65.637
+0 , 2702.7 , 69.498
+0 , 2895.75 , 73.359
+0 , 3088.8 , 77.22
+0 , 3281.85 , 81.081
+0 , 3474.9 , 84.942
+0 , 3667.95 , 88.803
+0 , 3861 , 92.664
+0 , 4054.05 , 96.525
+0 , 4247.1 , 100.386
+0 , 4440.15 , 104.247
+0 , 4633.2 , 108.108
+0 , 4826.25 , 111.969
+0 , 5019.3 , 115.83
+0 , 5212.35 , 119.691
+0 , 5405.4 , 123.552
+0 , 5598.45 , 127.413
+0 , 5791.5 , 131.274
+0 , 5984.55 , 135.135
+0 , 6177.6 , 138.996
+40.80854701 , -6177.6 , 107.4777528
+40.80854701 , -5984.55 , 103.6167528
+40.80854701 , -5791.5 , 99.7557528
+40.80854701 , -5598.45 , 95.8947528
+40.80854701 , -5405.4 , 92.0337528
+40.80854701 , -5212.35 , 88.1727528
+40.80854701 , -5019.3 , 84.3117528
+40.80854701 , -4826.25 , 80.4507528
+40.80854701 , -4633.2 , 76.5897528
+40.80854701 , -4440.15 , 72.7287528
+40.80854701 , -4247.1 , 68.8677528
+40.80854701 , -4054.05 , 65.0067528
+40.80854701 , -3861 , 61.1457528
+40.80854701 , -3667.95 , 57.2847528
+40.80854701 , -3474.9 , 53.4237528
+40.80854701 , -3281.85 , 49.5627528
+40.80854701 , -3088.8 , 45.7017528
+40.80854701 , -2895.75 , 41.8407528
+40.80854701 , -2702.7 , 37.9797528
+40.80854701 , -2509.65 , 34.1187528
+40.80854701 , -2316.6 , 30.2577528
+40.80854701 , -2123.55 , 26.3967528
+40.80854701 , -1930.5 , 22.5357528
+40.80854701 , -1737.45 , 18.6747528
+40.80854701 , -1544.4 , 14.8137528
+40.80854701 , -1351.35 , 10.9527528
+40.80854701 , -1158.3 , 7.0917528
+40.80854701 , -965.25 , 3.2307528
+40.80854701 , -772.2 , 0.6302472
+40.80854701 , -579.15 , 4.4912472
+40.80854701 , -386.1 , 8.3522472
+40.80854701 , -193.05 , 12.2132472
+40.80854701 , 0 , 16.0742472
+40.80854701 , 193.05 , 19.9352472
+40.80854701 , 386.1 , 23.7962472
+40.80854701 , 579.15 , 27.6572472
+40.80854701 , 772.2 , 31.5182472
+40.80854701 , 965.25 , 35.3792472
+40.80854701 , 1158.3 , 39.2402472
+40.80854701 , 1351.35 , 43.1012472
+40.80854701 , 1544.4 , 46.9622472
+40.80854701 , 1737.45 , 50.8232472
+40.80854701 , 1930.5 , 54.6842472
+40.80854701 , 2123.55 , 58.5452472
+40.80854701 , 2316.6 , 62.4062472
+40.80854701 , 2509.65 , 66.2672472
+40.80854701 , 2702.7 , 70.1282472
+40.80854701 , 2895.75 , 73.9892472
+40.80854701 , 3088.8 , 77.8502472
+40.80854701 , 3281.85 , 81.7112472
+40.80854701 , 3474.9 , 85.5722472
+40.80854701 , 3667.95 , 89.4332472
+40.80854701 , 3861 , 93.2942472
+40.80854701 , 4054.05 , 97.1552472
+40.80854701 , 4247.1 , 101.0162472
+40.80854701 , 4440.15 , 104.8772472
+40.80854701 , 4633.2 , 108.7382472
+40.80854701 , 4826.25 , 112.5992472
+40.80854701 , 5019.3 , 116.4602472
+40.80854701 , 5212.35 , 120.3212472
+40.80854701 , 5405.4 , 124.1822472
+40.80854701 , 5598.45 , 128.0432472
+40.80854701 , 5791.5 , 131.9042472
+40.80854701 , 5984.55 , 135.7652472
+40.80854701 , 6177.6 , 139.6262472
+81.61794872 , -6177.6 , 106.8474924
+81.61794872 , -5984.55 , 102.9864924
+81.61794872 , -5791.5 , 99.1254924
+81.61794872 , -5598.45 , 95.2644924
+81.61794872 , -5405.4 , 91.4034924
+81.61794872 , -5212.35 , 87.5424924
+81.61794872 , -5019.3 , 83.6814924
+81.61794872 , -4826.25 , 79.8204924
+81.61794872 , -4633.2 , 75.9594924
+81.61794872 , -4440.15 , 72.0984924
+81.61794872 , -4247.1 , 68.2374924
+81.61794872 , -4054.05 , 64.3764924
+81.61794872 , -3861 , 60.5154924
+81.61794872 , -3667.95 , 56.6544924
+81.61794872 , -3474.9 , 52.7934924
+81.61794872 , -3281.85 , 48.9324924
+81.61794872 , -3088.8 , 45.0714924
+81.61794872 , -2895.75 , 41.2104924
+81.61794872 , -2702.7 , 37.3494924
+81.61794872 , -2509.65 , 33.4884924
+81.61794872 , -2316.6 , 29.6274924
+81.61794872 , -2123.55 , 25.7664924
+81.61794872 , -1930.5 , 21.9054924
+81.61794872 , -1737.45 , 18.0444924
+81.61794872 , -1544.4 , 14.1834924
+81.61794872 , -1351.35 , 10.3224924
+81.61794872 , -1158.3 , 6.4614924
+81.61794872 , -965.25 , 2.6004924
+81.61794872 , -772.2 , 1.2605076
+81.61794872 , -579.15 , 5.1215076
+81.61794872 , -386.1 , 8.9825076
+81.61794872 , -193.05 , 12.8435076
+81.61794872 , 0 , 16.7045076
+81.61794872 , 193.05 , 20.5655076
+81.61794872 , 386.1 , 24.4265076
+81.61794872 , 579.15 , 28.2875076
+81.61794872 , 772.2 , 32.1485076
+81.61794872 , 965.25 , 36.0095076
+81.61794872 , 1158.3 , 39.8705076
+81.61794872 , 1351.35 , 43.7315076
+81.61794872 , 1544.4 , 47.5925076
+81.61794872 , 1737.45 , 51.4535076
+81.61794872 , 1930.5 , 55.3145076
+81.61794872 , 2123.55 , 59.1755076
+81.61794872 , 2316.6 , 63.0365076
+81.61794872 , 2509.65 , 66.8975076
+81.61794872 , 2702.7 , 70.7585076
+81.61794872 , 2895.75 , 74.6195076
+81.61794872 , 3088.8 , 78.4805076
+81.61794872 , 3281.85 , 82.3415076
+81.61794872 , 3474.9 , 86.2025076
+81.61794872 , 3667.95 , 90.0635076
+81.61794872 , 3861 , 93.9245076
+81.61794872 , 4054.05 , 97.7855076
+81.61794872 , 4247.1 , 101.6465076
+81.61794872 , 4440.15 , 105.5075076
+81.61794872 , 4633.2 , 109.3685076
+81.61794872 , 4826.25 , 113.2295076
+81.61794872 , 5019.3 , 117.0905076
+81.61794872 , 5212.35 , 120.9515076
+81.61794872 , 5405.4 , 124.8125076
+81.61794872 , 5598.45 , 128.6735076
+81.61794872 , 5791.5 , 132.5345076
+81.61794872 , 5984.55 , 136.3955076
+81.61794872 , 6177.6 , 140.2565076
+122.4273504 , -6177.6 , 106.217232
+122.4273504 , -5984.55 , 102.356232
+122.4273504 , -5791.5 , 98.495232
+122.4273504 , -5598.45 , 94.634232
+122.4273504 , -5405.4 , 90.773232
+122.4273504 , -5212.35 , 86.912232
+122.4273504 , -5019.3 , 83.051232
+122.4273504 , -4826.25 , 79.190232
+122.4273504 , -4633.2 , 75.329232
+122.4273504 , -4440.15 , 71.468232
+122.4273504 , -4247.1 , 67.607232
+122.4273504 , -4054.05 , 63.746232
+122.4273504 , -3861 , 59.885232
+122.4273504 , -3667.95 , 56.024232
+122.4273504 , -3474.9 , 52.163232
+122.4273504 , -3281.85 , 48.302232
+122.4273504 , -3088.8 , 44.441232
+122.4273504 , -2895.75 , 40.580232
+122.4273504 , -2702.7 , 36.719232
+122.4273504 , -2509.65 , 32.858232
+122.4273504 , -2316.6 , 28.997232
+122.4273504 , -2123.55 , 25.136232
+122.4273504 , -1930.5 , 21.275232
+122.4273504 , -1737.45 , 17.414232
+122.4273504 , -1544.4 , 13.553232
+122.4273504 , -1351.35 , 9.692232
+122.4273504 , -1158.3 , 5.831232
+122.4273504 , -965.25 , 1.970232
+122.4273504 , -772.2 , 1.890768
+122.4273504 , -579.15 , 5.751768
+122.4273504 , -386.1 , 9.612768
+122.4273504 , -193.05 , 13.473768
+122.4273504 , 0 , 17.334768
+122.4273504 , 193.05 , 21.195768
+122.4273504 , 386.1 , 25.056768
+122.4273504 , 579.15 , 28.917768
+122.4273504 , 772.2 , 32.778768
+122.4273504 , 965.25 , 36.639768
+122.4273504 , 1158.3 , 40.500768
+122.4273504 , 1351.35 , 44.361768
+122.4273504 , 1544.4 , 48.222768
+122.4273504 , 1737.45 , 52.083768
+122.4273504 , 1930.5 , 55.944768
+122.4273504 , 2123.55 , 59.805768
+122.4273504 , 2316.6 , 63.666768
+122.4273504 , 2509.65 , 67.527768
+122.4273504 , 2702.7 , 71.388768
+122.4273504 , 2895.75 , 75.249768
+122.4273504 , 3088.8 , 79.110768
+122.4273504 , 3281.85 , 82.971768
+122.4273504 , 3474.9 , 86.832768
+122.4273504 , 3667.95 , 90.693768
+122.4273504 , 3861 , 94.554768
+122.4273504 , 4054.05 , 98.415768
+122.4273504 , 4247.1 , 102.276768
+122.4273504 , 4440.15 , 106.137768
+122.4273504 , 4633.2 , 109.998768
+122.4273504 , 4826.25 , 113.859768
+122.4273504 , 5019.3 , 117.720768
+122.4273504 , 5212.35 , 121.581768
+122.4273504 , 5405.4 , 125.442768
+122.4273504 , 5598.45 , 129.303768
+122.4273504 , 5791.5 , 133.164768
+122.4273504 , 5984.55 , 137.025768
+122.4273504 , 6177.6 , 140.886768
+163.2393162 , -6177.6 , 105.586932
+163.2393162 , -5984.55 , 101.725932
+163.2393162 , -5791.5 , 97.864932
+163.2393162 , -5598.45 , 94.003932
+163.2393162 , -5405.4 , 90.142932
+163.2393162 , -5212.35 , 86.281932
+163.2393162 , -5019.3 , 82.420932
+163.2393162 , -4826.25 , 78.559932
+163.2393162 , -4633.2 , 74.698932
+163.2393162 , -4440.15 , 70.837932
+163.2393162 , -4247.1 , 66.976932
+163.2393162 , -4054.05 , 63.115932
+163.2393162 , -3861 , 59.254932
+163.2393162 , -3667.95 , 55.393932
+163.2393162 , -3474.9 , 51.532932
+163.2393162 , -3281.85 , 47.671932
+163.2393162 , -3088.8 , 43.810932
+163.2393162 , -2895.75 , 39.949932
+163.2393162 , -2702.7 , 36.088932
+163.2393162 , -2509.65 , 32.227932
+163.2393162 , -2316.6 , 28.366932
+163.2393162 , -2123.55 , 24.505932
+163.2393162 , -1930.5 , 20.644932
+163.2393162 , -1737.45 , 16.783932
+163.2393162 , -1544.4 , 12.922932
+163.2393162 , -1351.35 , 9.061932001
+163.2393162 , -1158.3 , 5.200932001
+163.2393162 , -965.25 , 1.339932001
+163.2393162 , -772.2 , 2.521067999
+163.2393162 , -579.15 , 6.382067999
+163.2393162 , -386.1 , 10.243068
+163.2393162 , -193.05 , 14.104068
+163.2393162 , 0 , 17.965068
+163.2393162 , 193.05 , 21.826068
+163.2393162 , 386.1 , 25.687068
+163.2393162 , 579.15 , 29.548068
+163.2393162 , 772.2 , 33.409068
+163.2393162 , 965.25 , 37.270068
+163.2393162 , 1158.3 , 41.131068
+163.2393162 , 1351.35 , 44.992068
+163.2393162 , 1544.4 , 48.853068
+163.2393162 , 1737.45 , 52.714068
+163.2393162 , 1930.5 , 56.575068
+163.2393162 , 2123.55 , 60.436068
+163.2393162 , 2316.6 , 64.297068
+163.2393162 , 2509.65 , 68.158068
+163.2393162 , 2702.7 , 72.019068
+163.2393162 , 2895.75 , 75.880068
+163.2393162 , 3088.8 , 79.741068
+163.2393162 , 3281.85 , 83.602068
+163.2393162 , 3474.9 , 87.463068
+163.2393162 , 3667.95 , 91.324068
+163.2393162 , 3861 , 95.185068
+163.2393162 , 4054.05 , 99.046068
+163.2393162 , 4247.1 , 102.907068
+163.2393162 , 4440.15 , 106.768068
+163.2393162 , 4633.2 , 110.629068
+163.2393162 , 4826.25 , 114.490068
+163.2393162 , 5019.3 , 118.351068
+163.2393162 , 5212.35 , 122.212068
+163.2393162 , 5405.4 , 126.073068
+163.2393162 , 5598.45 , 129.934068
+163.2393162 , 5791.5 , 133.795068
+163.2393162 , 5984.55 , 137.656068
+163.2393162 , 6177.6 , 141.517068
+204.042735 , -6177.6 , 104.956764
+204.042735 , -5984.55 , 101.095764
+204.042735 , -5791.5 , 97.234764
+204.042735 , -5598.45 , 93.373764
+204.042735 , -5405.4 , 89.512764
+204.042735 , -5212.35 , 85.651764
+204.042735 , -5019.3 , 81.790764
+204.042735 , -4826.25 , 77.929764
+204.042735 , -4633.2 , 74.068764
+204.042735 , -4440.15 , 70.207764
+204.042735 , -4247.1 , 66.346764
+204.042735 , -4054.05 , 62.485764
+204.042735 , -3861 , 58.624764
+204.042735 , -3667.95 , 54.763764
+204.042735 , -3474.9 , 50.902764
+204.042735 , -3281.85 , 47.041764
+204.042735 , -3088.8 , 43.180764
+204.042735 , -2895.75 , 39.319764
+204.042735 , -2702.7 , 35.458764
+204.042735 , -2509.65 , 31.597764
+204.042735 , -2316.6 , 27.736764
+204.042735 , -2123.55 , 23.875764
+204.042735 , -1930.5 , 20.014764
+204.042735 , -1737.45 , 16.153764
+204.042735 , -1544.4 , 12.292764
+204.042735 , -1351.35 , 8.431764001
+204.042735 , -1158.3 , 4.570764001
+204.042735 , -965.25 , 0.709764001
+204.042735 , -772.2 , 3.151235999
+204.042735 , -579.15 , 7.012235999
+204.042735 , -386.1 , 10.873236
+204.042735 , -193.05 , 14.734236
+204.042735 , 0 , 18.595236
+204.042735 , 193.05 , 22.456236
+204.042735 , 386.1 , 26.317236
+204.042735 , 579.15 , 30.178236
+204.042735 , 772.2 , 34.039236
+204.042735 , 965.25 , 37.900236
+204.042735 , 1158.3 , 41.761236
+204.042735 , 1351.35 , 45.622236
+204.042735 , 1544.4 , 49.483236
+204.042735 , 1737.45 , 53.344236
+204.042735 , 1930.5 , 57.205236
+204.042735 , 2123.55 , 61.066236
+204.042735 , 2316.6 , 64.927236
+204.042735 , 2509.65 , 68.788236
+204.042735 , 2702.7 , 72.649236
+204.042735 , 2895.75 , 76.510236
+204.042735 , 3088.8 , 80.371236
+204.042735 , 3281.85 , 84.232236
+204.042735 , 3474.9 , 88.093236
+204.042735 , 3667.95 , 91.954236
+204.042735 , 3861 , 95.815236
+204.042735 , 4054.05 , 99.676236
+204.042735 , 4247.1 , 103.537236
+204.042735 , 4440.15 , 107.398236
+204.042735 , 4633.2 , 111.259236
+204.042735 , 4826.25 , 115.120236
+204.042735 , 5019.3 , 118.981236
+204.042735 , 5212.35 , 122.842236
+204.042735 , 5405.4 , 126.703236
+204.042735 , 5598.45 , 130.564236
+204.042735 , 5791.5 , 134.425236
+204.042735 , 5984.55 , 138.286236
+204.042735 , 6177.6 , 142.147236
+244.8547009 , -6177.6 , 104.326464
+244.8547009 , -5984.55 , 100.465464
+244.8547009 , -5791.5 , 96.604464
+244.8547009 , -5598.45 , 92.743464
+244.8547009 , -5405.4 , 88.882464
+244.8547009 , -5212.35 , 85.021464
+244.8547009 , -5019.3 , 81.160464
+244.8547009 , -4826.25 , 77.299464
+244.8547009 , -4633.2 , 73.438464
+244.8547009 , -4440.15 , 69.577464
+244.8547009 , -4247.1 , 65.716464
+244.8547009 , -4054.05 , 61.855464
+244.8547009 , -3861 , 57.994464
+244.8547009 , -3667.95 , 54.133464
+244.8547009 , -3474.9 , 50.272464
+244.8547009 , -3281.85 , 46.411464
+244.8547009 , -3088.8 , 42.550464
+244.8547009 , -2895.75 , 38.689464
+244.8547009 , -2702.7 , 34.828464
+244.8547009 , -2509.65 , 30.967464
+244.8547009 , -2316.6 , 27.106464
+244.8547009 , -2123.55 , 23.245464
+244.8547009 , -1930.5 , 19.384464
+244.8547009 , -1737.45 , 15.523464
+244.8547009 , -1544.4 , 11.662464
+244.8547009 , -1351.35 , 7.801463999
+244.8547009 , -1158.3 , 3.940463999
+244.8547009 , -965.25 , 0.079463999
+244.8547009 , -772.2 , 3.781536001
+244.8547009 , -579.15 , 7.642536001
+244.8547009 , -386.1 , 11.503536
+244.8547009 , -193.05 , 15.364536
+244.8547009 , 0 , 19.225536
+244.8547009 , 193.05 , 23.086536
+244.8547009 , 386.1 , 26.947536
+244.8547009 , 579.15 , 30.808536
+244.8547009 , 772.2 , 34.669536
+244.8547009 , 965.25 , 38.530536
+244.8547009 , 1158.3 , 42.391536
+244.8547009 , 1351.35 , 46.252536
+244.8547009 , 1544.4 , 50.113536
+244.8547009 , 1737.45 , 53.974536
+244.8547009 , 1930.5 , 57.835536
+244.8547009 , 2123.55 , 61.696536
+244.8547009 , 2316.6 , 65.557536
+244.8547009 , 2509.65 , 69.418536
+244.8547009 , 2702.7 , 73.279536
+244.8547009 , 2895.75 , 77.140536
+244.8547009 , 3088.8 , 81.001536
+244.8547009 , 3281.85 , 84.862536
+244.8547009 , 3474.9 , 88.723536
+244.8547009 , 3667.95 , 92.584536
+244.8547009 , 3861 , 96.445536
+244.8547009 , 4054.05 , 100.306536
+244.8547009 , 4247.1 , 104.167536
+244.8547009 , 4440.15 , 108.028536
+244.8547009 , 4633.2 , 111.889536
+244.8547009 , 4826.25 , 115.750536
+244.8547009 , 5019.3 , 119.611536
+244.8547009 , 5212.35 , 123.472536
+244.8547009 , 5405.4 , 127.333536
+244.8547009 , 5598.45 , 131.194536
+244.8547009 , 5791.5 , 135.055536
+244.8547009 , 5984.55 , 138.916536
+244.8547009 , 6177.6 , 142.777536
+285.6666667 , -6177.6 , 103.696164
+285.6666667 , -5984.55 , 99.835164
+285.6666667 , -5791.5 , 95.974164
+285.6666667 , -5598.45 , 92.113164
+285.6666667 , -5405.4 , 88.252164
+285.6666667 , -5212.35 , 84.391164
+285.6666667 , -5019.3 , 80.530164
+285.6666667 , -4826.25 , 76.669164
+285.6666667 , -4633.2 , 72.808164
+285.6666667 , -4440.15 , 68.947164
+285.6666667 , -4247.1 , 65.086164
+285.6666667 , -4054.05 , 61.225164
+285.6666667 , -3861 , 57.364164
+285.6666667 , -3667.95 , 53.503164
+285.6666667 , -3474.9 , 49.642164
+285.6666667 , -3281.85 , 45.781164
+285.6666667 , -3088.8 , 41.920164
+285.6666667 , -2895.75 , 38.059164
+285.6666667 , -2702.7 , 34.198164
+285.6666667 , -2509.65 , 30.337164
+285.6666667 , -2316.6 , 26.476164
+285.6666667 , -2123.55 , 22.615164
+285.6666667 , -1930.5 , 18.754164
+285.6666667 , -1737.45 , 14.893164
+285.6666667 , -1544.4 , 11.032164
+285.6666667 , -1351.35 , 7.171163999
+285.6666667 , -1158.3 , 3.310163999
+285.6666667 , -965.25 , 0.550836001
+285.6666667 , -772.2 , 4.411836001
+285.6666667 , -579.15 , 8.272836001
+285.6666667 , -386.1 , 12.133836
+285.6666667 , -193.05 , 15.994836
+285.6666667 , 0 , 19.855836
+285.6666667 , 193.05 , 23.716836
+285.6666667 , 386.1 , 27.577836
+285.6666667 , 579.15 , 31.438836
+285.6666667 , 772.2 , 35.299836
+285.6666667 , 965.25 , 39.160836
+285.6666667 , 1158.3 , 43.021836
+285.6666667 , 1351.35 , 46.882836
+285.6666667 , 1544.4 , 50.743836
+285.6666667 , 1737.45 , 54.604836
+285.6666667 , 1930.5 , 58.465836
+285.6666667 , 2123.55 , 62.326836
+285.6666667 , 2316.6 , 66.187836
+285.6666667 , 2509.65 , 70.048836
+285.6666667 , 2702.7 , 73.909836
+285.6666667 , 2895.75 , 77.770836
+285.6666667 , 3088.8 , 81.631836
+285.6666667 , 3281.85 , 85.492836
+285.6666667 , 3474.9 , 89.353836
+285.6666667 , 3667.95 , 93.214836
+285.6666667 , 3861 , 97.075836
+285.6666667 , 4054.05 , 100.936836
+285.6666667 , 4247.1 , 104.797836
+285.6666667 , 4440.15 , 108.658836
+285.6666667 , 4633.2 , 112.519836
+285.6666667 , 4826.25 , 116.380836
+285.6666667 , 5019.3 , 120.241836
+285.6666667 , 5212.35 , 124.102836
+285.6666667 , 5405.4 , 127.963836
+285.6666667 , 5598.45 , 131.824836
+285.6666667 , 5791.5 , 135.685836
+285.6666667 , 5984.55 , 139.546836
+285.6666667 , 6177.6 , 143.407836
+326.4700855 , -6177.6 , 103.065996
+326.4700855 , -5984.55 , 99.204996
+326.4700855 , -5791.5 , 95.343996
+326.4700855 , -5598.45 , 91.482996
+326.4700855 , -5405.4 , 87.621996
+326.4700855 , -5212.35 , 83.760996
+326.4700855 , -5019.3 , 79.899996
+326.4700855 , -4826.25 , 76.038996
+326.4700855 , -4633.2 , 72.177996
+326.4700855 , -4440.15 , 68.316996
+326.4700855 , -4247.1 , 64.455996
+326.4700855 , -4054.05 , 60.594996
+326.4700855 , -3861 , 56.733996
+326.4700855 , -3667.95 , 52.872996
+326.4700855 , -3474.9 , 49.011996
+326.4700855 , -3281.85 , 45.150996
+326.4700855 , -3088.8 , 41.289996
+326.4700855 , -2895.75 , 37.428996
+326.4700855 , -2702.7 , 33.567996
+326.4700855 , -2509.65 , 29.706996
+326.4700855 , -2316.6 , 25.845996
+326.4700855 , -2123.55 , 21.984996
+326.4700855 , -1930.5 , 18.123996
+326.4700855 , -1737.45 , 14.262996
+326.4700855 , -1544.4 , 10.401996
+326.4700855 , -1351.35 , 6.540996
+326.4700855 , -1158.3 , 2.679996
+326.4700855 , -965.25 , 1.181004
+326.4700855 , -772.2 , 5.042004
+326.4700855 , -579.15 , 8.903004
+326.4700855 , -386.1 , 12.764004
+326.4700855 , -193.05 , 16.625004
+326.4700855 , 0 , 20.486004
+326.4700855 , 193.05 , 24.347004
+326.4700855 , 386.1 , 28.208004
+326.4700855 , 579.15 , 32.069004
+326.4700855 , 772.2 , 35.930004
+326.4700855 , 965.25 , 39.791004
+326.4700855 , 1158.3 , 43.652004
+326.4700855 , 1351.35 , 47.513004
+326.4700855 , 1544.4 , 51.374004
+326.4700855 , 1737.45 , 55.235004
+326.4700855 , 1930.5 , 59.096004
+326.4700855 , 2123.55 , 62.957004
+326.4700855 , 2316.6 , 66.818004
+326.4700855 , 2509.65 , 70.679004
+326.4700855 , 2702.7 , 74.540004
+326.4700855 , 2895.75 , 78.401004
+326.4700855 , 3088.8 , 82.262004
+326.4700855 , 3281.85 , 86.123004
+326.4700855 , 3474.9 , 89.984004
+326.4700855 , 3667.95 , 93.845004
+326.4700855 , 3861 , 97.706004
+326.4700855 , 4054.05 , 101.567004
+326.4700855 , 4247.1 , 105.428004
+326.4700855 , 4440.15 , 109.289004
+326.4700855 , 4633.2 , 113.150004
+326.4700855 , 4826.25 , 117.011004
+326.4700855 , 5019.3 , 120.872004
+326.4700855 , 5212.35 , 124.733004
+326.4700855 , 5405.4 , 128.594004
+326.4700855 , 5598.45 , 132.455004
+326.4700855 , 5791.5 , 136.316004
+326.4700855 , 5984.55 , 140.177004
+326.4700855 , 6177.6 , 144.038004
+367.2820513 , -6177.6 , 102.435696
+367.2820513 , -5984.55 , 98.574696
+367.2820513 , -5791.5 , 94.713696
+367.2820513 , -5598.45 , 90.852696
+367.2820513 , -5405.4 , 86.991696
+367.2820513 , -5212.35 , 83.130696
+367.2820513 , -5019.3 , 79.269696
+367.2820513 , -4826.25 , 75.408696
+367.2820513 , -4633.2 , 71.547696
+367.2820513 , -4440.15 , 67.686696
+367.2820513 , -4247.1 , 63.825696
+367.2820513 , -4054.05 , 59.964696
+367.2820513 , -3861 , 56.103696
+367.2820513 , -3667.95 , 52.242696
+367.2820513 , -3474.9 , 48.381696
+367.2820513 , -3281.85 , 44.520696
+367.2820513 , -3088.8 , 40.659696
+367.2820513 , -2895.75 , 36.798696
+367.2820513 , -2702.7 , 32.937696
+367.2820513 , -2509.65 , 29.076696
+367.2820513 , -2316.6 , 25.215696
+367.2820513 , -2123.55 , 21.354696
+367.2820513 , -1930.5 , 17.493696
+367.2820513 , -1737.45 , 13.632696
+367.2820513 , -1544.4 , 9.771696
+367.2820513 , -1351.35 , 5.910696
+367.2820513 , -1158.3 , 2.049696
+367.2820513 , -965.25 , 1.811304
+367.2820513 , -772.2 , 5.672304
+367.2820513 , -579.15 , 9.533304
+367.2820513 , -386.1 , 13.394304
+367.2820513 , -193.05 , 17.255304
+367.2820513 , 0 , 21.116304
+367.2820513 , 193.05 , 24.977304
+367.2820513 , 386.1 , 28.838304
+367.2820513 , 579.15 , 32.699304
+367.2820513 , 772.2 , 36.560304
+367.2820513 , 965.25 , 40.421304
+367.2820513 , 1158.3 , 44.282304
+367.2820513 , 1351.35 , 48.143304
+367.2820513 , 1544.4 , 52.004304
+367.2820513 , 1737.45 , 55.865304
+367.2820513 , 1930.5 , 59.726304
+367.2820513 , 2123.55 , 63.587304
+367.2820513 , 2316.6 , 67.448304
+367.2820513 , 2509.65 , 71.309304
+367.2820513 , 2702.7 , 75.170304
+367.2820513 , 2895.75 , 79.031304
+367.2820513 , 3088.8 , 82.892304
+367.2820513 , 3281.85 , 86.753304
+367.2820513 , 3474.9 , 90.614304
+367.2820513 , 3667.95 , 94.475304
+367.2820513 , 3861 , 98.336304
+367.2820513 , 4054.05 , 102.197304
+367.2820513 , 4247.1 , 106.058304
+367.2820513 , 4440.15 , 109.919304
+367.2820513 , 4633.2 , 113.780304
+367.2820513 , 4826.25 , 117.641304
+367.2820513 , 5019.3 , 121.502304
+367.2820513 , 5212.35 , 125.363304
+367.2820513 , 5405.4 , 129.224304
+367.2820513 , 5598.45 , 133.085304
+367.2820513 , 5791.5 , 136.946304
+367.2820513 , 5984.55 , 140.807304
+367.2820513 , 6177.6 , 144.668304
+408.0854701 , -6177.6 , 101.805528
+408.0854701 , -5984.55 , 97.944528
+408.0854701 , -5791.5 , 94.083528
+408.0854701 , -5598.45 , 90.222528
+408.0854701 , -5405.4 , 86.361528
+408.0854701 , -5212.35 , 82.500528
+408.0854701 , -5019.3 , 78.639528
+408.0854701 , -4826.25 , 74.778528
+408.0854701 , -4633.2 , 70.917528
+408.0854701 , -4440.15 , 67.056528
+408.0854701 , -4247.1 , 63.195528
+408.0854701 , -4054.05 , 59.334528
+408.0854701 , -3861 , 55.473528
+408.0854701 , -3667.95 , 51.612528
+408.0854701 , -3474.9 , 47.751528
+408.0854701 , -3281.85 , 43.890528
+408.0854701 , -3088.8 , 40.029528
+408.0854701 , -2895.75 , 36.168528
+408.0854701 , -2702.7 , 32.307528
+408.0854701 , -2509.65 , 28.446528
+408.0854701 , -2316.6 , 24.585528
+408.0854701 , -2123.55 , 20.724528
+408.0854701 , -1930.5 , 16.863528
+408.0854701 , -1737.45 , 13.002528
+408.0854701 , -1544.4 , 9.141528
+408.0854701 , -1351.35 , 5.280528
+408.0854701 , -1158.3 , 1.419528
+408.0854701 , -965.25 , 2.441472
+408.0854701 , -772.2 , 6.302472
+408.0854701 , -579.15 , 10.163472
+408.0854701 , -386.1 , 14.024472
+408.0854701 , -193.05 , 17.885472
+408.0854701 , 0 , 21.746472
+408.0854701 , 193.05 , 25.607472
+408.0854701 , 386.1 , 29.468472
+408.0854701 , 579.15 , 33.329472
+408.0854701 , 772.2 , 37.190472
+408.0854701 , 965.25 , 41.051472
+408.0854701 , 1158.3 , 44.912472
+408.0854701 , 1351.35 , 48.773472
+408.0854701 , 1544.4 , 52.634472
+408.0854701 , 1737.45 , 56.495472
+408.0854701 , 1930.5 , 60.356472
+408.0854701 , 2123.55 , 64.217472
+408.0854701 , 2316.6 , 68.078472
+408.0854701 , 2509.65 , 71.939472
+408.0854701 , 2702.7 , 75.800472
+408.0854701 , 2895.75 , 79.661472
+408.0854701 , 3088.8 , 83.522472
+408.0854701 , 3281.85 , 87.383472
+408.0854701 , 3474.9 , 91.244472
+408.0854701 , 3667.95 , 95.105472
+408.0854701 , 3861 , 98.966472
+408.0854701 , 4054.05 , 102.827472
+408.0854701 , 4247.1 , 106.688472
+408.0854701 , 4440.15 , 110.549472
+408.0854701 , 4633.2 , 114.410472
+408.0854701 , 4826.25 , 118.271472
+408.0854701 , 5019.3 , 122.132472
+408.0854701 , 5212.35 , 125.993472
+408.0854701 , 5405.4 , 129.854472
+408.0854701 , 5598.45 , 133.715472
+408.0854701 , 5791.5 , 137.576472
+408.0854701 , 5984.55 , 141.437472
+408.0854701 , 6177.6 , 145.298472
+448.8974359 , -6177.6 , 101.175228
+448.8974359 , -5984.55 , 97.314228
+448.8974359 , -5791.5 , 93.453228
+448.8974359 , -5598.45 , 89.592228
+448.8974359 , -5405.4 , 85.731228
+448.8974359 , -5212.35 , 81.870228
+448.8974359 , -5019.3 , 78.009228
+448.8974359 , -4826.25 , 74.148228
+448.8974359 , -4633.2 , 70.287228
+448.8974359 , -4440.15 , 66.426228
+448.8974359 , -4247.1 , 62.565228
+448.8974359 , -4054.05 , 58.704228
+448.8974359 , -3861 , 54.843228
+448.8974359 , -3667.95 , 50.982228
+448.8974359 , -3474.9 , 47.121228
+448.8974359 , -3281.85 , 43.260228
+448.8974359 , -3088.8 , 39.399228
+448.8974359 , -2895.75 , 35.538228
+448.8974359 , -2702.7 , 31.677228
+448.8974359 , -2509.65 , 27.816228
+448.8974359 , -2316.6 , 23.955228
+448.8974359 , -2123.55 , 20.094228
+448.8974359 , -1930.5 , 16.233228
+448.8974359 , -1737.45 , 12.372228
+448.8974359 , -1544.4 , 8.511228
+448.8974359 , -1351.35 , 4.650228
+448.8974359 , -1158.3 , 0.789228
+448.8974359 , -965.25 , 3.071772
+448.8974359 , -772.2 , 6.932772
+448.8974359 , -579.15 , 10.793772
+448.8974359 , -386.1 , 14.654772
+448.8974359 , -193.05 , 18.515772
+448.8974359 , 0 , 22.376772
+448.8974359 , 193.05 , 26.237772
+448.8974359 , 386.1 , 30.098772
+448.8974359 , 579.15 , 33.959772
+448.8974359 , 772.2 , 37.820772
+448.8974359 , 965.25 , 41.681772
+448.8974359 , 1158.3 , 45.542772
+448.8974359 , 1351.35 , 49.403772
+448.8974359 , 1544.4 , 53.264772
+448.8974359 , 1737.45 , 57.125772
+448.8974359 , 1930.5 , 60.986772
+448.8974359 , 2123.55 , 64.847772
+448.8974359 , 2316.6 , 68.708772
+448.8974359 , 2509.65 , 72.569772
+448.8974359 , 2702.7 , 76.430772
+448.8974359 , 2895.75 , 80.291772
+448.8974359 , 3088.8 , 84.152772
+448.8974359 , 3281.85 , 88.013772
+448.8974359 , 3474.9 , 91.874772
+448.8974359 , 3667.95 , 95.735772
+448.8974359 , 3861 , 99.596772
+448.8974359 , 4054.05 , 103.457772
+448.8974359 , 4247.1 , 107.318772
+448.8974359 , 4440.15 , 111.179772
+448.8974359 , 4633.2 , 115.040772
+448.8974359 , 4826.25 , 118.901772
+448.8974359 , 5019.3 , 122.762772
+448.8974359 , 5212.35 , 126.623772
+448.8974359 , 5405.4 , 130.484772
+448.8974359 , 5598.45 , 134.345772
+448.8974359 , 5791.5 , 138.206772
+448.8974359 , 5984.55 , 142.067772
+448.8974359 , 6177.6 , 145.928772
+489.7094017 , -6177.6 , 100.544928
+489.7094017 , -5984.55 , 96.683928
+489.7094017 , -5791.5 , 92.822928
+489.7094017 , -5598.45 , 88.961928
+489.7094017 , -5405.4 , 85.100928
+489.7094017 , -5212.35 , 81.239928
+489.7094017 , -5019.3 , 77.378928
+489.7094017 , -4826.25 , 73.517928
+489.7094017 , -4633.2 , 69.656928
+489.7094017 , -4440.15 , 65.795928
+489.7094017 , -4247.1 , 61.934928
+489.7094017 , -4054.05 , 58.073928
+489.7094017 , -3861 , 54.212928
+489.7094017 , -3667.95 , 50.351928
+489.7094017 , -3474.9 , 46.490928
+489.7094017 , -3281.85 , 42.629928
+489.7094017 , -3088.8 , 38.768928
+489.7094017 , -2895.75 , 34.907928
+489.7094017 , -2702.7 , 31.046928
+489.7094017 , -2509.65 , 27.185928
+489.7094017 , -2316.6 , 23.324928
+489.7094017 , -2123.55 , 19.463928
+489.7094017 , -1930.5 , 15.602928
+489.7094017 , -1737.45 , 11.741928
+489.7094017 , -1544.4 , 7.880928
+489.7094017 , -1351.35 , 4.019928
+489.7094017 , -1158.3 , 0.158928
+489.7094017 , -965.25 , 3.702072
+489.7094017 , -772.2 , 7.563072
+489.7094017 , -579.15 , 11.424072
+489.7094017 , -386.1 , 15.285072
+489.7094017 , -193.05 , 19.146072
+489.7094017 , 0 , 23.007072
+489.7094017 , 193.05 , 26.868072
+489.7094017 , 386.1 , 30.729072
+489.7094017 , 579.15 , 34.590072
+489.7094017 , 772.2 , 38.451072
+489.7094017 , 965.25 , 42.312072
+489.7094017 , 1158.3 , 46.173072
+489.7094017 , 1351.35 , 50.034072
+489.7094017 , 1544.4 , 53.895072
+489.7094017 , 1737.45 , 57.756072
+489.7094017 , 1930.5 , 61.617072
+489.7094017 , 2123.55 , 65.478072
+489.7094017 , 2316.6 , 69.339072
+489.7094017 , 2509.65 , 73.200072
+489.7094017 , 2702.7 , 77.061072
+489.7094017 , 2895.75 , 80.922072
+489.7094017 , 3088.8 , 84.783072
+489.7094017 , 3281.85 , 88.644072
+489.7094017 , 3474.9 , 92.505072
+489.7094017 , 3667.95 , 96.366072
+489.7094017 , 3861 , 100.227072
+489.7094017 , 4054.05 , 104.088072
+489.7094017 , 4247.1 , 107.949072
+489.7094017 , 4440.15 , 111.810072
+489.7094017 , 4633.2 , 115.671072
+489.7094017 , 4826.25 , 119.532072
+489.7094017 , 5019.3 , 123.393072
+489.7094017 , 5212.35 , 127.254072
+489.7094017 , 5405.4 , 131.115072
+489.7094017 , 5598.45 , 134.976072
+489.7094017 , 5791.5 , 138.837072
+489.7094017 , 5984.55 , 142.698072
+489.7094017 , 6177.6 , 146.559072
+816.1794872 , -6177.6 , 95.502924
+816.1794872 , -5984.55 , 91.641924
+816.1794872 , -5791.5 , 87.780924
+816.1794872 , -5598.45 , 83.919924
+816.1794872 , -5405.4 , 80.058924
+816.1794872 , -5212.35 , 76.197924
+816.1794872 , -5019.3 , 72.336924
+816.1794872 , -4826.25 , 68.475924
+816.1794872 , -4633.2 , 64.614924
+816.1794872 , -4440.15 , 60.753924
+816.1794872 , -4247.1 , 56.892924
+816.1794872 , -4054.05 , 53.031924
+816.1794872 , -3861 , 49.170924
+816.1794872 , -3667.95 , 45.309924
+816.1794872 , -3474.9 , 41.448924
+816.1794872 , -3281.85 , 37.587924
+816.1794872 , -3088.8 , 33.726924
+816.1794872 , -2895.75 , 29.865924
+816.1794872 , -2702.7 , 26.004924
+816.1794872 , -2509.65 , 22.143924
+816.1794872 , -2316.6 , 18.282924
+816.1794872 , -2123.55 , 14.421924
+816.1794872 , -1930.5 , 10.560924
+816.1794872 , -1737.45 , 6.699924
+816.1794872 , -1544.4 , 2.838924
+816.1794872 , -1351.35 , 1.022076
+816.1794872 , -1158.3 , 4.883076
+816.1794872 , -965.25 , 8.744076
+816.1794872 , -772.2 , 12.605076
+816.1794872 , -579.15 , 16.466076
+816.1794872 , -386.1 , 20.327076
+816.1794872 , -193.05 , 24.188076
+816.1794872 , 0 , 28.049076
+816.1794872 , 193.05 , 31.910076
+816.1794872 , 386.1 , 35.771076
+816.1794872 , 579.15 , 39.632076
+816.1794872 , 772.2 , 43.493076
+816.1794872 , 965.25 , 47.354076
+816.1794872 , 1158.3 , 51.215076
+816.1794872 , 1351.35 , 55.076076
+816.1794872 , 1544.4 , 58.937076
+816.1794872 , 1737.45 , 62.798076
+816.1794872 , 1930.5 , 66.659076
+816.1794872 , 2123.55 , 70.520076
+816.1794872 , 2316.6 , 74.381076
+816.1794872 , 2509.65 , 78.242076
+816.1794872 , 2702.7 , 82.103076
+816.1794872 , 2895.75 , 85.964076
+816.1794872 , 3088.8 , 89.825076
+816.1794872 , 3281.85 , 93.686076
+816.1794872 , 3474.9 , 97.547076
+816.1794872 , 3667.95 , 101.408076
+816.1794872 , 3861 , 105.269076
+816.1794872 , 4054.05 , 109.130076
+816.1794872 , 4247.1 , 112.991076
+816.1794872 , 4440.15 , 116.852076
+816.1794872 , 4633.2 , 120.713076
+816.1794872 , 4826.25 , 124.574076
+816.1794872 , 5019.3 , 128.435076
+816.1794872 , 5212.35 , 132.296076
+816.1794872 , 5405.4 , 136.157076
+816.1794872 , 5598.45 , 140.018076
+816.1794872 , 5791.5 , 143.879076
+816.1794872 , 5984.55 , 147.740076
+816.1794872 , 6177.6 , 151.601076
+1020.25641 , -6177.6 , 92.35116
+1020.25641 , -5984.55 , 88.49016
+1020.25641 , -5791.5 , 84.62916
+1020.25641 , -5598.45 , 80.76816
+1020.25641 , -5405.4 , 76.90716
+1020.25641 , -5212.35 , 73.04616
+1020.25641 , -5019.3 , 69.18516
+1020.25641 , -4826.25 , 65.32416
+1020.25641 , -4633.2 , 61.46316
+1020.25641 , -4440.15 , 57.60216
+1020.25641 , -4247.1 , 53.74116
+1020.25641 , -4054.05 , 49.88016
+1020.25641 , -3861 , 46.01916
+1020.25641 , -3667.95 , 42.15816
+1020.25641 , -3474.9 , 38.29716
+1020.25641 , -3281.85 , 34.43616
+1020.25641 , -3088.8 , 30.57516
+1020.25641 , -2895.75 , 26.71416
+1020.25641 , -2702.7 , 22.85316
+1020.25641 , -2509.65 , 18.99216
+1020.25641 , -2316.6 , 15.13116
+1020.25641 , -2123.55 , 11.27016
+1020.25641 , -1930.5 , 7.409160004
+1020.25641 , -1737.45 , 3.548160004
+1020.25641 , -1544.4 , 0.312839996
+1020.25641 , -1351.35 , 4.173839996
+1020.25641 , -1158.3 , 8.034839996
+1020.25641 , -965.25 , 11.89584
+1020.25641 , -772.2 , 15.75684
+1020.25641 , -579.15 , 19.61784
+1020.25641 , -386.1 , 23.47884
+1020.25641 , -193.05 , 27.33984
+1020.25641 , 0 , 31.20084
+1020.25641 , 193.05 , 35.06184
+1020.25641 , 386.1 , 38.92284
+1020.25641 , 579.15 , 42.78384
+1020.25641 , 772.2 , 46.64484
+1020.25641 , 965.25 , 50.50584
+1020.25641 , 1158.3 , 54.36684
+1020.25641 , 1351.35 , 58.22784
+1020.25641 , 1544.4 , 62.08884
+1020.25641 , 1737.45 , 65.94984
+1020.25641 , 1930.5 , 69.81084
+1020.25641 , 2123.55 , 73.67184
+1020.25641 , 2316.6 , 77.53284
+1020.25641 , 2509.65 , 81.39384
+1020.25641 , 2702.7 , 85.25484
+1020.25641 , 2895.75 , 89.11584
+1020.25641 , 3088.8 , 92.97684
+1020.25641 , 3281.85 , 96.83784
+1020.25641 , 3474.9 , 100.69884
+1020.25641 , 3667.95 , 104.55984
+1020.25641 , 3861 , 108.42084
+1020.25641 , 4054.05 , 112.28184
+1020.25641 , 4247.1 , 116.14284
+1020.25641 , 4440.15 , 120.00384
+1020.25641 , 4633.2 , 123.86484
+1020.25641 , 4826.25 , 127.72584
+1020.25641 , 5019.3 , 131.58684
+1020.25641 , 5212.35 , 135.44784
+1020.25641 , 5405.4 , 139.30884
+1020.25641 , 5598.45 , 143.16984
+1020.25641 , 5791.5 , 147.03084
+1020.25641 , 5984.55 , 150.89184
+1020.25641 , 6177.6 , 154.75284
+1224.273504 , -6177.6 , 89.20032
+1224.273504 , -5984.55 , 85.33932
+1224.273504 , -5791.5 , 81.47832
+1224.273504 , -5598.45 , 77.61732
+1224.273504 , -5405.4 , 73.75632
+1224.273504 , -5212.35 , 69.89532
+1224.273504 , -5019.3 , 66.03432
+1224.273504 , -4826.25 , 62.17332
+1224.273504 , -4633.2 , 58.31232
+1224.273504 , -4440.15 , 54.45132
+1224.273504 , -4247.1 , 50.59032
+1224.273504 , -4054.05 , 46.72932
+1224.273504 , -3861 , 42.86832
+1224.273504 , -3667.95 , 39.00732
+1224.273504 , -3474.9 , 35.14632
+1224.273504 , -3281.85 , 31.28532
+1224.273504 , -3088.8 , 27.42432
+1224.273504 , -2895.75 , 23.56332
+1224.273504 , -2702.7 , 19.70232
+1224.273504 , -2509.65 , 15.84132
+1224.273504 , -2316.6 , 11.98032
+1224.273504 , -2123.55 , 8.119320004
+1224.273504 , -1930.5 , 4.258320004
+1224.273504 , -1737.45 , 0.397320004
+1224.273504 , -1544.4 , 3.463679996
+1224.273504 , -1351.35 , 7.324679996
+1224.273504 , -1158.3 , 11.18568
+1224.273504 , -965.25 , 15.04668
+1224.273504 , -772.2 , 18.90768
+1224.273504 , -579.15 , 22.76868
+1224.273504 , -386.1 , 26.62968
+1224.273504 , -193.05 , 30.49068
+1224.273504 , 0 , 34.35168
+1224.273504 , 193.05 , 38.21268
+1224.273504 , 386.1 , 42.07368
+1224.273504 , 579.15 , 45.93468
+1224.273504 , 772.2 , 49.79568
+1224.273504 , 965.25 , 53.65668
+1224.273504 , 1158.3 , 57.51768
+1224.273504 , 1351.35 , 61.37868
+1224.273504 , 1544.4 , 65.23968
+1224.273504 , 1737.45 , 69.10068
+1224.273504 , 1930.5 , 72.96168
+1224.273504 , 2123.55 , 76.82268
+1224.273504 , 2316.6 , 80.68368
+1224.273504 , 2509.65 , 84.54468
+1224.273504 , 2702.7 , 88.40568
+1224.273504 , 2895.75 , 92.26668
+1224.273504 , 3088.8 , 96.12768
+1224.273504 , 3281.85 , 99.98868
+1224.273504 , 3474.9 , 103.84968
+1224.273504 , 3667.95 , 107.71068
+1224.273504 , 3861 , 111.57168
+1224.273504 , 4054.05 , 115.43268
+1224.273504 , 4247.1 , 119.29368
+1224.273504 , 4440.15 , 123.15468
+1224.273504 , 4633.2 , 127.01568
+1224.273504 , 4826.25 , 130.87668
+1224.273504 , 5019.3 , 134.73768
+1224.273504 , 5212.35 , 138.59868
+1224.273504 , 5405.4 , 142.45968
+1224.273504 , 5598.45 , 146.32068
+1224.273504 , 5791.5 , 150.18168
+1224.273504 , 5984.55 , 154.04268
+1224.273504 , 6177.6 , 157.90368
+1428.290598 , -6177.6 , 86.04948
+1428.290598 , -5984.55 , 82.18848
+1428.290598 , -5791.5 , 78.32748
+1428.290598 , -5598.45 , 74.46648
+1428.290598 , -5405.4 , 70.60548
+1428.290598 , -5212.35 , 66.74448
+1428.290598 , -5019.3 , 62.88348
+1428.290598 , -4826.25 , 59.02248
+1428.290598 , -4633.2 , 55.16148
+1428.290598 , -4440.15 , 51.30048
+1428.290598 , -4247.1 , 47.43948
+1428.290598 , -4054.05 , 43.57848
+1428.290598 , -3861 , 39.71748
+1428.290598 , -3667.95 , 35.85648
+1428.290598 , -3474.9 , 31.99548
+1428.290598 , -3281.85 , 28.13448
+1428.290598 , -3088.8 , 24.27348
+1428.290598 , -2895.75 , 20.41248
+1428.290598 , -2702.7 , 16.55148
+1428.290598 , -2509.65 , 12.69048
+1428.290598 , -2316.6 , 8.829480004
+1428.290598 , -2123.55 , 4.968480004
+1428.290598 , -1930.5 , 1.107480004
+1428.290598 , -1737.45 , 2.753519996
+1428.290598 , -1544.4 , 6.614519996
+1428.290598 , -1351.35 , 10.47552
+1428.290598 , -1158.3 , 14.33652
+1428.290598 , -965.25 , 18.19752
+1428.290598 , -772.2 , 22.05852
+1428.290598 , -579.15 , 25.91952
+1428.290598 , -386.1 , 29.78052
+1428.290598 , -193.05 , 33.64152
+1428.290598 , 0 , 37.50252
+1428.290598 , 193.05 , 41.36352
+1428.290598 , 386.1 , 45.22452
+1428.290598 , 579.15 , 49.08552
+1428.290598 , 772.2 , 52.94652
+1428.290598 , 965.25 , 56.80752
+1428.290598 , 1158.3 , 60.66852
+1428.290598 , 1351.35 , 64.52952
+1428.290598 , 1544.4 , 68.39052
+1428.290598 , 1737.45 , 72.25152
+1428.290598 , 1930.5 , 76.11252
+1428.290598 , 2123.55 , 79.97352
+1428.290598 , 2316.6 , 83.83452
+1428.290598 , 2509.65 , 87.69552
+1428.290598 , 2702.7 , 91.55652
+1428.290598 , 2895.75 , 95.41752
+1428.290598 , 3088.8 , 99.27852
+1428.290598 , 3281.85 , 103.13952
+1428.290598 , 3474.9 , 107.00052
+1428.290598 , 3667.95 , 110.86152
+1428.290598 , 3861 , 114.72252
+1428.290598 , 4054.05 , 118.58352
+1428.290598 , 4247.1 , 122.44452
+1428.290598 , 4440.15 , 126.30552
+1428.290598 , 4633.2 , 130.16652
+1428.290598 , 4826.25 , 134.02752
+1428.290598 , 5019.3 , 137.88852
+1428.290598 , 5212.35 , 141.74952
+1428.290598 , 5405.4 , 145.61052
+1428.290598 , 5598.45 , 149.47152
+1428.290598 , 5791.5 , 153.33252
+1428.290598 , 5984.55 , 157.19352
+1428.290598 , 6177.6 , 161.05452
+1632.393162 , -6177.6 , 82.89732001
+1632.393162 , -5984.55 , 79.03632001
+1632.393162 , -5791.5 , 75.17532001
+1632.393162 , -5598.45 , 71.31432001
+1632.393162 , -5405.4 , 67.45332001
+1632.393162 , -5212.35 , 63.59232001
+1632.393162 , -5019.3 , 59.73132001
+1632.393162 , -4826.25 , 55.87032001
+1632.393162 , -4633.2 , 52.00932001
+1632.393162 , -4440.15 , 48.14832001
+1632.393162 , -4247.1 , 44.28732001
+1632.393162 , -4054.05 , 40.42632001
+1632.393162 , -3861 , 36.56532001
+1632.393162 , -3667.95 , 32.70432001
+1632.393162 , -3474.9 , 28.84332001
+1632.393162 , -3281.85 , 24.98232001
+1632.393162 , -3088.8 , 21.12132001
+1632.393162 , -2895.75 , 17.26032001
+1632.393162 , -2702.7 , 13.39932001
+1632.393162 , -2509.65 , 9.538320006
+1632.393162 , -2316.6 , 5.677320006
+1632.393162 , -2123.55 , 1.816320006
+1632.393162 , -1930.5 , 2.044679994
+1632.393162 , -1737.45 , 5.905679994
+1632.393162 , -1544.4 , 9.766679994
+1632.393162 , -1351.35 , 13.62767999
+1632.393162 , -1158.3 , 17.48867999
+1632.393162 , -965.25 , 21.34967999
+1632.393162 , -772.2 , 25.21067999
+1632.393162 , -579.15 , 29.07167999
+1632.393162 , -386.1 , 32.93267999
+1632.393162 , -193.05 , 36.79367999
+1632.393162 , 0 , 40.65467999
+1632.393162 , 193.05 , 44.51567999
+1632.393162 , 386.1 , 48.37667999
+1632.393162 , 579.15 , 52.23767999
+1632.393162 , 772.2 , 56.09867999
+1632.393162 , 965.25 , 59.95967999
+1632.393162 , 1158.3 , 63.82067999
+1632.393162 , 1351.35 , 67.68167999
+1632.393162 , 1544.4 , 71.54267999
+1632.393162 , 1737.45 , 75.40367999
+1632.393162 , 1930.5 , 79.26467999
+1632.393162 , 2123.55 , 83.12567999
+1632.393162 , 2316.6 , 86.98667999
+1632.393162 , 2509.65 , 90.84767999
+1632.393162 , 2702.7 , 94.70867999
+1632.393162 , 2895.75 , 98.56967999
+1632.393162 , 3088.8 , 102.43068
+1632.393162 , 3281.85 , 106.29168
+1632.393162 , 3474.9 , 110.15268
+1632.393162 , 3667.95 , 114.01368
+1632.393162 , 3861 , 117.87468
+1632.393162 , 4054.05 , 121.73568
+1632.393162 , 4247.1 , 125.59668
+1632.393162 , 4440.15 , 129.45768
+1632.393162 , 4633.2 , 133.31868
+1632.393162 , 4826.25 , 137.17968
+1632.393162 , 5019.3 , 141.04068
+1632.393162 , 5212.35 , 144.90168
+1632.393162 , 5405.4 , 148.76268
+1632.393162 , 5598.45 , 152.62368
+1632.393162 , 5791.5 , 156.48468
+1632.393162 , 5984.55 , 160.34568
+1632.393162 , 6177.6 , 164.20668
+1836.410256 , -6177.6 , 79.74648001
+1836.410256 , -5984.55 , 75.88548001
+1836.410256 , -5791.5 , 72.02448001
+1836.410256 , -5598.45 , 68.16348001
+1836.410256 , -5405.4 , 64.30248001
+1836.410256 , -5212.35 , 60.44148001
+1836.410256 , -5019.3 , 56.58048001
+1836.410256 , -4826.25 , 52.71948001
+1836.410256 , -4633.2 , 48.85848001
+1836.410256 , -4440.15 , 44.99748001
+1836.410256 , -4247.1 , 41.13648001
+1836.410256 , -4054.05 , 37.27548001
+1836.410256 , -3861 , 33.41448001
+1836.410256 , -3667.95 , 29.55348001
+1836.410256 , -3474.9 , 25.69248001
+1836.410256 , -3281.85 , 21.83148001
+1836.410256 , -3088.8 , 17.97048001
+1836.410256 , -2895.75 , 14.10948001
+1836.410256 , -2702.7 , 10.24848001
+1836.410256 , -2509.65 , 6.387480006
+1836.410256 , -2316.6 , 2.526480006
+1836.410256 , -2123.55 , 1.334519994
+1836.410256 , -1930.5 , 5.195519994
+1836.410256 , -1737.45 , 9.056519994
+1836.410256 , -1544.4 , 12.91751999
+1836.410256 , -1351.35 , 16.77851999
+1836.410256 , -1158.3 , 20.63951999
+1836.410256 , -965.25 , 24.50051999
+1836.410256 , -772.2 , 28.36151999
+1836.410256 , -579.15 , 32.22251999
+1836.410256 , -386.1 , 36.08351999
+1836.410256 , -193.05 , 39.94451999
+1836.410256 , 0 , 43.80551999
+1836.410256 , 193.05 , 47.66651999
+1836.410256 , 386.1 , 51.52751999
+1836.410256 , 579.15 , 55.38851999
+1836.410256 , 772.2 , 59.24951999
+1836.410256 , 965.25 , 63.11051999
+1836.410256 , 1158.3 , 66.97151999
+1836.410256 , 1351.35 , 70.83251999
+1836.410256 , 1544.4 , 74.69351999
+1836.410256 , 1737.45 , 78.55451999
+1836.410256 , 1930.5 , 82.41551999
+1836.410256 , 2123.55 , 86.27651999
+1836.410256 , 2316.6 , 90.13751999
+1836.410256 , 2509.65 , 93.99851999
+1836.410256 , 2702.7 , 97.85951999
+1836.410256 , 2895.75 , 101.72052
+1836.410256 , 3088.8 , 105.58152
+1836.410256 , 3281.85 , 109.44252
+1836.410256 , 3474.9 , 113.30352
+1836.410256 , 3667.95 , 117.16452
+1836.410256 , 3861 , 121.02552
+1836.410256 , 4054.05 , 124.88652
+1836.410256 , 4247.1 , 128.74752
+1836.410256 , 4440.15 , 132.60852
+1836.410256 , 4633.2 , 136.46952
+1836.410256 , 4826.25 , 140.33052
+1836.410256 , 5019.3 , 144.19152
+1836.410256 , 5212.35 , 148.05252
+1836.410256 , 5405.4 , 151.91352
+1836.410256 , 5598.45 , 155.77452
+1836.410256 , 5791.5 , 159.63552
+1836.410256 , 5984.55 , 163.49652
+1836.410256 , 6177.6 , 167.35752
+2040.42735 , -6177.6 , 76.59564001
+2040.42735 , -5984.55 , 72.73464001
+2040.42735 , -5791.5 , 68.87364001
+2040.42735 , -5598.45 , 65.01264001
+2040.42735 , -5405.4 , 61.15164001
+2040.42735 , -5212.35 , 57.29064001
+2040.42735 , -5019.3 , 53.42964001
+2040.42735 , -4826.25 , 49.56864001
+2040.42735 , -4633.2 , 45.70764001
+2040.42735 , -4440.15 , 41.84664001
+2040.42735 , -4247.1 , 37.98564001
+2040.42735 , -4054.05 , 34.12464001
+2040.42735 , -3861 , 30.26364001
+2040.42735 , -3667.95 , 26.40264001
+2040.42735 , -3474.9 , 22.54164001
+2040.42735 , -3281.85 , 18.68064001
+2040.42735 , -3088.8 , 14.81964001
+2040.42735 , -2895.75 , 10.95864001
+2040.42735 , -2702.7 , 7.097640007
+2040.42735 , -2509.65 , 3.236640007
+2040.42735 , -2316.6 , 0.624359993
+2040.42735 , -2123.55 , 4.485359993
+2040.42735 , -1930.5 , 8.346359993
+2040.42735 , -1737.45 , 12.20735999
+2040.42735 , -1544.4 , 16.06835999
+2040.42735 , -1351.35 , 19.92935999
+2040.42735 , -1158.3 , 23.79035999
+2040.42735 , -965.25 , 27.65135999
+2040.42735 , -772.2 , 31.51235999
+2040.42735 , -579.15 , 35.37335999
+2040.42735 , -386.1 , 39.23435999
+2040.42735 , -193.05 , 43.09535999
+2040.42735 , 0 , 46.95635999
+2040.42735 , 193.05 , 50.81735999
+2040.42735 , 386.1 , 54.67835999
+2040.42735 , 579.15 , 58.53935999
+2040.42735 , 772.2 , 62.40035999
+2040.42735 , 965.25 , 66.26135999
+2040.42735 , 1158.3 , 70.12235999
+2040.42735 , 1351.35 , 73.98335999
+2040.42735 , 1544.4 , 77.84435999
+2040.42735 , 1737.45 , 81.70535999
+2040.42735 , 1930.5 , 85.56635999
+2040.42735 , 2123.55 , 89.42735999
+2040.42735 , 2316.6 , 93.28835999
+2040.42735 , 2509.65 , 97.14935999
+2040.42735 , 2702.7 , 101.01036
+2040.42735 , 2895.75 , 104.87136
+2040.42735 , 3088.8 , 108.73236
+2040.42735 , 3281.85 , 112.59336
+2040.42735 , 3474.9 , 116.45436
+2040.42735 , 3667.95 , 120.31536
+2040.42735 , 3861 , 124.17636
+2040.42735 , 4054.05 , 128.03736
+2040.42735 , 4247.1 , 131.89836
+2040.42735 , 4440.15 , 135.75936
+2040.42735 , 4633.2 , 139.62036
+2040.42735 , 4826.25 , 143.48136
+2040.42735 , 5019.3 , 147.34236
+2040.42735 , 5212.35 , 151.20336
+2040.42735 , 5405.4 , 155.06436
+2040.42735 , 5598.45 , 158.92536
+2040.42735 , 5791.5 , 162.78636
+2040.42735 , 5984.55 , 166.64736
+2040.42735 , 6177.6 , 170.50836
+2244.529915 , -6177.6 , 73.44347999
+2244.529915 , -5984.55 , 69.58247999
+2244.529915 , -5791.5 , 65.72147999
+2244.529915 , -5598.45 , 61.86047999
+2244.529915 , -5405.4 , 57.99947999
+2244.529915 , -5212.35 , 54.13847999
+2244.529915 , -5019.3 , 50.27747999
+2244.529915 , -4826.25 , 46.41647999
+2244.529915 , -4633.2 , 42.55547999
+2244.529915 , -4440.15 , 38.69447999
+2244.529915 , -4247.1 , 34.83347999
+2244.529915 , -4054.05 , 30.97247999
+2244.529915 , -3861 , 27.11147999
+2244.529915 , -3667.95 , 23.25047999
+2244.529915 , -3474.9 , 19.38947999
+2244.529915 , -3281.85 , 15.52847999
+2244.529915 , -3088.8 , 11.66747999
+2244.529915 , -2895.75 , 7.806479993
+2244.529915 , -2702.7 , 3.945479993
+2244.529915 , -2509.65 , 0.084479993
+2244.529915 , -2316.6 , 3.776520007
+2244.529915 , -2123.55 , 7.637520007
+2244.529915 , -1930.5 , 11.49852001
+2244.529915 , -1737.45 , 15.35952001
+2244.529915 , -1544.4 , 19.22052001
+2244.529915 , -1351.35 , 23.08152001
+2244.529915 , -1158.3 , 26.94252001
+2244.529915 , -965.25 , 30.80352001
+2244.529915 , -772.2 , 34.66452001
+2244.529915 , -579.15 , 38.52552001
+2244.529915 , -386.1 , 42.38652001
+2244.529915 , -193.05 , 46.24752001
+2244.529915 , 0 , 50.10852001
+2244.529915 , 193.05 , 53.96952001
+2244.529915 , 386.1 , 57.83052001
+2244.529915 , 579.15 , 61.69152001
+2244.529915 , 772.2 , 65.55252001
+2244.529915 , 965.25 , 69.41352001
+2244.529915 , 1158.3 , 73.27452001
+2244.529915 , 1351.35 , 77.13552001
+2244.529915 , 1544.4 , 80.99652001
+2244.529915 , 1737.45 , 84.85752001
+2244.529915 , 1930.5 , 88.71852001
+2244.529915 , 2123.55 , 92.57952001
+2244.529915 , 2316.6 , 96.44052001
+2244.529915 , 2509.65 , 100.30152
+2244.529915 , 2702.7 , 104.16252
+2244.529915 , 2895.75 , 108.02352
+2244.529915 , 3088.8 , 111.88452
+2244.529915 , 3281.85 , 115.74552
+2244.529915 , 3474.9 , 119.60652
+2244.529915 , 3667.95 , 123.46752
+2244.529915 , 3861 , 127.32852
+2244.529915 , 4054.05 , 131.18952
+2244.529915 , 4247.1 , 135.05052
+2244.529915 , 4440.15 , 138.91152
+2244.529915 , 4633.2 , 142.77252
+2244.529915 , 4826.25 , 146.63352
+2244.529915 , 5019.3 , 150.49452
+2244.529915 , 5212.35 , 154.35552
+2244.529915 , 5405.4 , 158.21652
+2244.529915 , 5598.45 , 162.07752
+2244.529915 , 5791.5 , 165.93852
+2244.529915 , 5984.55 , 169.79952
+2244.529915 , 6177.6 , 173.66052
+2448.547009 , -6177.6 , 70.29263999
+2448.547009 , -5984.55 , 66.43163999
+2448.547009 , -5791.5 , 62.57063999
+2448.547009 , -5598.45 , 58.70963999
+2448.547009 , -5405.4 , 54.84863999
+2448.547009 , -5212.35 , 50.98763999
+2448.547009 , -5019.3 , 47.12663999
+2448.547009 , -4826.25 , 43.26563999
+2448.547009 , -4633.2 , 39.40463999
+2448.547009 , -4440.15 , 35.54363999
+2448.547009 , -4247.1 , 31.68263999
+2448.547009 , -4054.05 , 27.82163999
+2448.547009 , -3861 , 23.96063999
+2448.547009 , -3667.95 , 20.09963999
+2448.547009 , -3474.9 , 16.23863999
+2448.547009 , -3281.85 , 12.37763999
+2448.547009 , -3088.8 , 8.516639993
+2448.547009 , -2895.75 , 4.655639993
+2448.547009 , -2702.7 , 0.794639993
+2448.547009 , -2509.65 , 3.066360007
+2448.547009 , -2316.6 , 6.927360007
+2448.547009 , -2123.55 , 10.78836001
+2448.547009 , -1930.5 , 14.64936001
+2448.547009 , -1737.45 , 18.51036001
+2448.547009 , -1544.4 , 22.37136001
+2448.547009 , -1351.35 , 26.23236001
+2448.547009 , -1158.3 , 30.09336001
+2448.547009 , -965.25 , 33.95436001
+2448.547009 , -772.2 , 37.81536001
+2448.547009 , -579.15 , 41.67636001
+2448.547009 , -386.1 , 45.53736001
+2448.547009 , -193.05 , 49.39836001
+2448.547009 , 0 , 53.25936001
+2448.547009 , 193.05 , 57.12036001
+2448.547009 , 386.1 , 60.98136001
+2448.547009 , 579.15 , 64.84236001
+2448.547009 , 772.2 , 68.70336001
+2448.547009 , 965.25 , 72.56436001
+2448.547009 , 1158.3 , 76.42536001
+2448.547009 , 1351.35 , 80.28636001
+2448.547009 , 1544.4 , 84.14736001
+2448.547009 , 1737.45 , 88.00836001
+2448.547009 , 1930.5 , 91.86936001
+2448.547009 , 2123.55 , 95.73036001
+2448.547009 , 2316.6 , 99.59136001
+2448.547009 , 2509.65 , 103.45236
+2448.547009 , 2702.7 , 107.31336
+2448.547009 , 2895.75 , 111.17436
+2448.547009 , 3088.8 , 115.03536
+2448.547009 , 3281.85 , 118.89636
+2448.547009 , 3474.9 , 122.75736
+2448.547009 , 3667.95 , 126.61836
+2448.547009 , 3861 , 130.47936
+2448.547009 , 4054.05 , 134.34036
+2448.547009 , 4247.1 , 138.20136
+2448.547009 , 4440.15 , 142.06236
+2448.547009 , 4633.2 , 145.92336
+2448.547009 , 4826.25 , 149.78436
+2448.547009 , 5019.3 , 153.64536
+2448.547009 , 5212.35 , 157.50636
+2448.547009 , 5405.4 , 161.36736
+2448.547009 , 5598.45 , 165.22836
+2448.547009 , 5791.5 , 169.08936
+2448.547009 , 5984.55 , 172.95036
+2448.547009 , 6177.6 , 176.81136
+2652.564103 , -6177.6 , 67.14179999
+2652.564103 , -5984.55 , 63.28079999
+2652.564103 , -5791.5 , 59.41979999
+2652.564103 , -5598.45 , 55.55879999
+2652.564103 , -5405.4 , 51.69779999
+2652.564103 , -5212.35 , 47.83679999
+2652.564103 , -5019.3 , 43.97579999
+2652.564103 , -4826.25 , 40.11479999
+2652.564103 , -4633.2 , 36.25379999
+2652.564103 , -4440.15 , 32.39279999
+2652.564103 , -4247.1 , 28.53179999
+2652.564103 , -4054.05 , 24.67079999
+2652.564103 , -3861 , 20.80979999
+2652.564103 , -3667.95 , 16.94879999
+2652.564103 , -3474.9 , 13.08779999
+2652.564103 , -3281.85 , 9.226799993
+2652.564103 , -3088.8 , 5.365799993
+2652.564103 , -2895.75 , 1.504799993
+2652.564103 , -2702.7 , 2.356200007
+2652.564103 , -2509.65 , 6.217200007
+2652.564103 , -2316.6 , 10.07820001
+2652.564103 , -2123.55 , 13.93920001
+2652.564103 , -1930.5 , 17.80020001
+2652.564103 , -1737.45 , 21.66120001
+2652.564103 , -1544.4 , 25.52220001
+2652.564103 , -1351.35 , 29.38320001
+2652.564103 , -1158.3 , 33.24420001
+2652.564103 , -965.25 , 37.10520001
+2652.564103 , -772.2 , 40.96620001
+2652.564103 , -579.15 , 44.82720001
+2652.564103 , -386.1 , 48.68820001
+2652.564103 , -193.05 , 52.54920001
+2652.564103 , 0 , 56.41020001
+2652.564103 , 193.05 , 60.27120001
+2652.564103 , 386.1 , 64.13220001
+2652.564103 , 579.15 , 67.99320001
+2652.564103 , 772.2 , 71.85420001
+2652.564103 , 965.25 , 75.71520001
+2652.564103 , 1158.3 , 79.57620001
+2652.564103 , 1351.35 , 83.43720001
+2652.564103 , 1544.4 , 87.29820001
+2652.564103 , 1737.45 , 91.15920001
+2652.564103 , 1930.5 , 95.02020001
+2652.564103 , 2123.55 , 98.88120001
+2652.564103 , 2316.6 , 102.7422
+2652.564103 , 2509.65 , 106.6032
+2652.564103 , 2702.7 , 110.4642
+2652.564103 , 2895.75 , 114.3252
+2652.564103 , 3088.8 , 118.1862
+2652.564103 , 3281.85 , 122.0472
+2652.564103 , 3474.9 , 125.9082
+2652.564103 , 3667.95 , 129.7692
+2652.564103 , 3861 , 133.6302
+2652.564103 , 4054.05 , 137.4912
+2652.564103 , 4247.1 , 141.3522
+2652.564103 , 4440.15 , 145.2132
+2652.564103 , 4633.2 , 149.0742
+2652.564103 , 4826.25 , 152.9352
+2652.564103 , 5019.3 , 156.7962
+2652.564103 , 5212.35 , 160.6572
+2652.564103 , 5405.4 , 164.5182
+2652.564103 , 5598.45 , 168.3792
+2652.564103 , 5791.5 , 172.2402
+2652.564103 , 5984.55 , 176.1012
+2652.564103 , 6177.6 , 179.9622
+2856.666667 , -6177.6 , 63.98963999
+2856.666667 , -5984.55 , 60.12863999
+2856.666667 , -5791.5 , 56.26763999
+2856.666667 , -5598.45 , 52.40663999
+2856.666667 , -5405.4 , 48.54563999
+2856.666667 , -5212.35 , 44.68463999
+2856.666667 , -5019.3 , 40.82363999
+2856.666667 , -4826.25 , 36.96263999
+2856.666667 , -4633.2 , 33.10163999
+2856.666667 , -4440.15 , 29.24063999
+2856.666667 , -4247.1 , 25.37963999
+2856.666667 , -4054.05 , 21.51863999
+2856.666667 , -3861 , 17.65763999
+2856.666667 , -3667.95 , 13.79663999
+2856.666667 , -3474.9 , 9.935639995
+2856.666667 , -3281.85 , 6.074639995
+2856.666667 , -3088.8 , 2.213639995
+2856.666667 , -2895.75 , 1.647360005
+2856.666667 , -2702.7 , 5.508360005
+2856.666667 , -2509.65 , 9.369360005
+2856.666667 , -2316.6 , 13.23036001
+2856.666667 , -2123.55 , 17.09136001
+2856.666667 , -1930.5 , 20.95236001
+2856.666667 , -1737.45 , 24.81336001
+2856.666667 , -1544.4 , 28.67436001
+2856.666667 , -1351.35 , 32.53536001
+2856.666667 , -1158.3 , 36.39636001
+2856.666667 , -965.25 , 40.25736001
+2856.666667 , -772.2 , 44.11836001
+2856.666667 , -579.15 , 47.97936001
+2856.666667 , -386.1 , 51.84036001
+2856.666667 , -193.05 , 55.70136001
+2856.666667 , 0 , 59.56236001
+2856.666667 , 193.05 , 63.42336001
+2856.666667 , 386.1 , 67.28436001
+2856.666667 , 579.15 , 71.14536001
+2856.666667 , 772.2 , 75.00636001
+2856.666667 , 965.25 , 78.86736001
+2856.666667 , 1158.3 , 82.72836001
+2856.666667 , 1351.35 , 86.58936001
+2856.666667 , 1544.4 , 90.45036001
+2856.666667 , 1737.45 , 94.31136001
+2856.666667 , 1930.5 , 98.17236001
+2856.666667 , 2123.55 , 102.03336
+2856.666667 , 2316.6 , 105.89436
+2856.666667 , 2509.65 , 109.75536
+2856.666667 , 2702.7 , 113.61636
+2856.666667 , 2895.75 , 117.47736
+2856.666667 , 3088.8 , 121.33836
+2856.666667 , 3281.85 , 125.19936
+2856.666667 , 3474.9 , 129.06036
+2856.666667 , 3667.95 , 132.92136
+2856.666667 , 3861 , 136.78236
+2856.666667 , 4054.05 , 140.64336
+2856.666667 , 4247.1 , 144.50436
+2856.666667 , 4440.15 , 148.36536
+2856.666667 , 4633.2 , 152.22636
+2856.666667 , 4826.25 , 156.08736
+2856.666667 , 5019.3 , 159.94836
+2856.666667 , 5212.35 , 163.80936
+2856.666667 , 5405.4 , 167.67036
+2856.666667 , 5598.45 , 171.53136
+2856.666667 , 5791.5 , 175.39236
+2856.666667 , 5984.55 , 179.25336
+2856.666667 , 6177.6 , 183.11436
+3060.683761 , -6177.6 , 60.8388
+3060.683761 , -5984.55 , 56.9778
+3060.683761 , -5791.5 , 53.1168
+3060.683761 , -5598.45 , 49.2558
+3060.683761 , -5405.4 , 45.3948
+3060.683761 , -5212.35 , 41.5338
+3060.683761 , -5019.3 , 37.6728
+3060.683761 , -4826.25 , 33.8118
+3060.683761 , -4633.2 , 29.9508
+3060.683761 , -4440.15 , 26.0898
+3060.683761 , -4247.1 , 22.2288
+3060.683761 , -4054.05 , 18.3678
+3060.683761 , -3861 , 14.5068
+3060.683761 , -3667.95 , 10.6458
+3060.683761 , -3474.9 , 6.784799995
+3060.683761 , -3281.85 , 2.923799995
+3060.683761 , -3088.8 , 0.937200005
+3060.683761 , -2895.75 , 4.798200005
+3060.683761 , -2702.7 , 8.659200005
+3060.683761 , -2509.65 , 12.5202
+3060.683761 , -2316.6 , 16.3812
+3060.683761 , -2123.55 , 20.2422
+3060.683761 , -1930.5 , 24.1032
+3060.683761 , -1737.45 , 27.9642
+3060.683761 , -1544.4 , 31.8252
+3060.683761 , -1351.35 , 35.6862
+3060.683761 , -1158.3 , 39.5472
+3060.683761 , -965.25 , 43.4082
+3060.683761 , -772.2 , 47.2692
+3060.683761 , -579.15 , 51.1302
+3060.683761 , -386.1 , 54.9912
+3060.683761 , -193.05 , 58.8522
+3060.683761 , 0 , 62.7132
+3060.683761 , 193.05 , 66.5742
+3060.683761 , 386.1 , 70.4352
+3060.683761 , 579.15 , 74.2962
+3060.683761 , 772.2 , 78.1572
+3060.683761 , 965.25 , 82.0182
+3060.683761 , 1158.3 , 85.8792
+3060.683761 , 1351.35 , 89.7402
+3060.683761 , 1544.4 , 93.6012
+3060.683761 , 1737.45 , 97.4622
+3060.683761 , 1930.5 , 101.3232
+3060.683761 , 2123.55 , 105.1842
+3060.683761 , 2316.6 , 109.0452
+3060.683761 , 2509.65 , 112.9062
+3060.683761 , 2702.7 , 116.7672
+3060.683761 , 2895.75 , 120.6282
+3060.683761 , 3088.8 , 124.4892
+3060.683761 , 3281.85 , 128.3502
+3060.683761 , 3474.9 , 132.2112
+3060.683761 , 3667.95 , 136.0722
+3060.683761 , 3861 , 139.9332
+3060.683761 , 4054.05 , 143.7942
+3060.683761 , 4247.1 , 147.6552
+3060.683761 , 4440.15 , 151.5162
+3060.683761 , 4633.2 , 155.3772
+3060.683761 , 4826.25 , 159.2382
+3060.683761 , 5019.3 , 163.0992
+3060.683761 , 5212.35 , 166.9602
+3060.683761 , 5405.4 , 170.8212
+3060.683761 , 5598.45 , 174.6822
+3060.683761 , 5791.5 , 178.5432
+3060.683761 , 5984.55 , 182.4042
+3060.683761 , 6177.6 , 186.2652
+3264.700855 , -6177.6 , 57.68796
+3264.700855 , -5984.55 , 53.82696
+3264.700855 , -5791.5 , 49.96596
+3264.700855 , -5598.45 , 46.10496
+3264.700855 , -5405.4 , 42.24396
+3264.700855 , -5212.35 , 38.38296
+3264.700855 , -5019.3 , 34.52196
+3264.700855 , -4826.25 , 30.66096
+3264.700855 , -4633.2 , 26.79996
+3264.700855 , -4440.15 , 22.93896
+3264.700855 , -4247.1 , 19.07796
+3264.700855 , -4054.05 , 15.21696
+3264.700855 , -3861 , 11.35596
+3264.700855 , -3667.95 , 7.494959995
+3264.700855 , -3474.9 , 3.633959995
+3264.700855 , -3281.85 , 0.227040005
+3264.700855 , -3088.8 , 4.088040005
+3264.700855 , -2895.75 , 7.949040005
+3264.700855 , -2702.7 , 11.81004
+3264.700855 , -2509.65 , 15.67104
+3264.700855 , -2316.6 , 19.53204
+3264.700855 , -2123.55 , 23.39304
+3264.700855 , -1930.5 , 27.25404
+3264.700855 , -1737.45 , 31.11504
+3264.700855 , -1544.4 , 34.97604
+3264.700855 , -1351.35 , 38.83704
+3264.700855 , -1158.3 , 42.69804
+3264.700855 , -965.25 , 46.55904
+3264.700855 , -772.2 , 50.42004
+3264.700855 , -579.15 , 54.28104
+3264.700855 , -386.1 , 58.14204
+3264.700855 , -193.05 , 62.00304
+3264.700855 , 0 , 65.86404
+3264.700855 , 193.05 , 69.72504
+3264.700855 , 386.1 , 73.58604
+3264.700855 , 579.15 , 77.44704
+3264.700855 , 772.2 , 81.30804
+3264.700855 , 965.25 , 85.16904
+3264.700855 , 1158.3 , 89.03004
+3264.700855 , 1351.35 , 92.89104
+3264.700855 , 1544.4 , 96.75204
+3264.700855 , 1737.45 , 100.61304
+3264.700855 , 1930.5 , 104.47404
+3264.700855 , 2123.55 , 108.33504
+3264.700855 , 2316.6 , 112.19604
+3264.700855 , 2509.65 , 116.05704
+3264.700855 , 2702.7 , 119.91804
+3264.700855 , 2895.75 , 123.77904
+3264.700855 , 3088.8 , 127.64004
+3264.700855 , 3281.85 , 131.50104
+3264.700855 , 3474.9 , 135.36204
+3264.700855 , 3667.95 , 139.22304
+3264.700855 , 3861 , 143.08404
+3264.700855 , 4054.05 , 146.94504
+3264.700855 , 4247.1 , 150.80604
+3264.700855 , 4440.15 , 154.66704
+3264.700855 , 4633.2 , 158.52804
+3264.700855 , 4826.25 , 162.38904
+3264.700855 , 5019.3 , 166.25004
+3264.700855 , 5212.35 , 170.11104
+3264.700855 , 5405.4 , 173.97204
+3264.700855 , 5598.45 , 177.83304
+3264.700855 , 5791.5 , 181.69404
+3264.700855 , 5984.55 , 185.55504
+3264.700855 , 6177.6 , 189.41604
+3468.803419 , -6177.6 , 54.5358
+3468.803419 , -5984.55 , 50.6748
+3468.803419 , -5791.5 , 46.8138
+3468.803419 , -5598.45 , 42.9528
+3468.803419 , -5405.4 , 39.0918
+3468.803419 , -5212.35 , 35.2308
+3468.803419 , -5019.3 , 31.3698
+3468.803419 , -4826.25 , 27.5088
+3468.803419 , -4633.2 , 23.6478
+3468.803419 , -4440.15 , 19.7868
+3468.803419 , -4247.1 , 15.9258
+3468.803419 , -4054.05 , 12.0648
+3468.803419 , -3861 , 8.203799997
+3468.803419 , -3667.95 , 4.342799997
+3468.803419 , -3474.9 , 0.481799997
+3468.803419 , -3281.85 , 3.379200003
+3468.803419 , -3088.8 , 7.240200003
+3468.803419 , -2895.75 , 11.1012
+3468.803419 , -2702.7 , 14.9622
+3468.803419 , -2509.65 , 18.8232
+3468.803419 , -2316.6 , 22.6842
+3468.803419 , -2123.55 , 26.5452
+3468.803419 , -1930.5 , 30.4062
+3468.803419 , -1737.45 , 34.2672
+3468.803419 , -1544.4 , 38.1282
+3468.803419 , -1351.35 , 41.9892
+3468.803419 , -1158.3 , 45.8502
+3468.803419 , -965.25 , 49.7112
+3468.803419 , -772.2 , 53.5722
+3468.803419 , -579.15 , 57.4332
+3468.803419 , -386.1 , 61.2942
+3468.803419 , -193.05 , 65.1552
+3468.803419 , 0 , 69.0162
+3468.803419 , 193.05 , 72.8772
+3468.803419 , 386.1 , 76.7382
+3468.803419 , 579.15 , 80.5992
+3468.803419 , 772.2 , 84.4602
+3468.803419 , 965.25 , 88.3212
+3468.803419 , 1158.3 , 92.1822
+3468.803419 , 1351.35 , 96.0432
+3468.803419 , 1544.4 , 99.9042
+3468.803419 , 1737.45 , 103.7652
+3468.803419 , 1930.5 , 107.6262
+3468.803419 , 2123.55 , 111.4872
+3468.803419 , 2316.6 , 115.3482
+3468.803419 , 2509.65 , 119.2092
+3468.803419 , 2702.7 , 123.0702
+3468.803419 , 2895.75 , 126.9312
+3468.803419 , 3088.8 , 130.7922
+3468.803419 , 3281.85 , 134.6532
+3468.803419 , 3474.9 , 138.5142
+3468.803419 , 3667.95 , 142.3752
+3468.803419 , 3861 , 146.2362
+3468.803419 , 4054.05 , 150.0972
+3468.803419 , 4247.1 , 153.9582
+3468.803419 , 4440.15 , 157.8192
+3468.803419 , 4633.2 , 161.6802
+3468.803419 , 4826.25 , 165.5412
+3468.803419 , 5019.3 , 169.4022
+3468.803419 , 5212.35 , 173.2632
+3468.803419 , 5405.4 , 177.1242
+3468.803419 , 5598.45 , 180.9852
+3468.803419 , 5791.5 , 184.8462
+3468.803419 , 5984.55 , 188.7072
+3468.803419 , 6177.6 , 192.5682
+3672.820513 , -6177.6 , 51.38496
+3672.820513 , -5984.55 , 47.52396
+3672.820513 , -5791.5 , 43.66296
+3672.820513 , -5598.45 , 39.80196
+3672.820513 , -5405.4 , 35.94096
+3672.820513 , -5212.35 , 32.07996
+3672.820513 , -5019.3 , 28.21896
+3672.820513 , -4826.25 , 24.35796
+3672.820513 , -4633.2 , 20.49696
+3672.820513 , -4440.15 , 16.63596
+3672.820513 , -4247.1 , 12.77496
+3672.820513 , -4054.05 , 8.913959997
+3672.820513 , -3861 , 5.052959997
+3672.820513 , -3667.95 , 1.191959997
+3672.820513 , -3474.9 , 2.669040003
+3672.820513 , -3281.85 , 6.530040003
+3672.820513 , -3088.8 , 10.39104
+3672.820513 , -2895.75 , 14.25204
+3672.820513 , -2702.7 , 18.11304
+3672.820513 , -2509.65 , 21.97404
+3672.820513 , -2316.6 , 25.83504
+3672.820513 , -2123.55 , 29.69604
+3672.820513 , -1930.5 , 33.55704
+3672.820513 , -1737.45 , 37.41804
+3672.820513 , -1544.4 , 41.27904
+3672.820513 , -1351.35 , 45.14004
+3672.820513 , -1158.3 , 49.00104
+3672.820513 , -965.25 , 52.86204
+3672.820513 , -772.2 , 56.72304
+3672.820513 , -579.15 , 60.58404
+3672.820513 , -386.1 , 64.44504
+3672.820513 , -193.05 , 68.30604
+3672.820513 , 0 , 72.16704
+3672.820513 , 193.05 , 76.02804
+3672.820513 , 386.1 , 79.88904
+3672.820513 , 579.15 , 83.75004
+3672.820513 , 772.2 , 87.61104
+3672.820513 , 965.25 , 91.47204
+3672.820513 , 1158.3 , 95.33304
+3672.820513 , 1351.35 , 99.19404
+3672.820513 , 1544.4 , 103.05504
+3672.820513 , 1737.45 , 106.91604
+3672.820513 , 1930.5 , 110.77704
+3672.820513 , 2123.55 , 114.63804
+3672.820513 , 2316.6 , 118.49904
+3672.820513 , 2509.65 , 122.36004
+3672.820513 , 2702.7 , 126.22104
+3672.820513 , 2895.75 , 130.08204
+3672.820513 , 3088.8 , 133.94304
+3672.820513 , 3281.85 , 137.80404
+3672.820513 , 3474.9 , 141.66504
+3672.820513 , 3667.95 , 145.52604
+3672.820513 , 3861 , 149.38704
+3672.820513 , 4054.05 , 153.24804
+3672.820513 , 4247.1 , 157.10904
+3672.820513 , 4440.15 , 160.97004
+3672.820513 , 4633.2 , 164.83104
+3672.820513 , 4826.25 , 168.69204
+3672.820513 , 5019.3 , 172.55304
+3672.820513 , 5212.35 , 176.41404
+3672.820513 , 5405.4 , 180.27504
+3672.820513 , 5598.45 , 184.13604
+3672.820513 , 5791.5 , 187.99704
+3672.820513 , 5984.55 , 191.85804
+3672.820513 , 6177.6 , 195.71904
+3876.837607 , -6177.6 , 48.23412
+3876.837607 , -5984.55 , 44.37312
+3876.837607 , -5791.5 , 40.51212
+3876.837607 , -5598.45 , 36.65112
+3876.837607 , -5405.4 , 32.79012
+3876.837607 , -5212.35 , 28.92912
+3876.837607 , -5019.3 , 25.06812
+3876.837607 , -4826.25 , 21.20712
+3876.837607 , -4633.2 , 17.34612
+3876.837607 , -4440.15 , 13.48512
+3876.837607 , -4247.1 , 9.624119997
+3876.837607 , -4054.05 , 5.763119997
+3876.837607 , -3861 , 1.902119997
+3876.837607 , -3667.95 , 1.958880003
+3876.837607 , -3474.9 , 5.819880003
+3876.837607 , -3281.85 , 9.680880003
+3876.837607 , -3088.8 , 13.54188
+3876.837607 , -2895.75 , 17.40288
+3876.837607 , -2702.7 , 21.26388
+3876.837607 , -2509.65 , 25.12488
+3876.837607 , -2316.6 , 28.98588
+3876.837607 , -2123.55 , 32.84688
+3876.837607 , -1930.5 , 36.70788
+3876.837607 , -1737.45 , 40.56888
+3876.837607 , -1544.4 , 44.42988
+3876.837607 , -1351.35 , 48.29088
+3876.837607 , -1158.3 , 52.15188
+3876.837607 , -965.25 , 56.01288
+3876.837607 , -772.2 , 59.87388
+3876.837607 , -579.15 , 63.73488
+3876.837607 , -386.1 , 67.59588
+3876.837607 , -193.05 , 71.45688
+3876.837607 , 0 , 75.31788
+3876.837607 , 193.05 , 79.17888
+3876.837607 , 386.1 , 83.03988
+3876.837607 , 579.15 , 86.90088
+3876.837607 , 772.2 , 90.76188
+3876.837607 , 965.25 , 94.62288
+3876.837607 , 1158.3 , 98.48388
+3876.837607 , 1351.35 , 102.34488
+3876.837607 , 1544.4 , 106.20588
+3876.837607 , 1737.45 , 110.06688
+3876.837607 , 1930.5 , 113.92788
+3876.837607 , 2123.55 , 117.78888
+3876.837607 , 2316.6 , 121.64988
+3876.837607 , 2509.65 , 125.51088
+3876.837607 , 2702.7 , 129.37188
+3876.837607 , 2895.75 , 133.23288
+3876.837607 , 3088.8 , 137.09388
+3876.837607 , 3281.85 , 140.95488
+3876.837607 , 3474.9 , 144.81588
+3876.837607 , 3667.95 , 148.67688
+3876.837607 , 3861 , 152.53788
+3876.837607 , 4054.05 , 156.39888
+3876.837607 , 4247.1 , 160.25988
+3876.837607 , 4440.15 , 164.12088
+3876.837607 , 4633.2 , 167.98188
+3876.837607 , 4826.25 , 171.84288
+3876.837607 , 5019.3 , 175.70388
+3876.837607 , 5212.35 , 179.56488
+3876.837607 , 5405.4 , 183.42588
+3876.837607 , 5598.45 , 187.28688
+3876.837607 , 5791.5 , 191.14788
+3876.837607 , 5984.55 , 195.00888
+3876.837607 , 6177.6 , 198.86988
+4080.854701 , -6177.6 , 45.08328
+4080.854701 , -5984.55 , 41.22228
+4080.854701 , -5791.5 , 37.36128
+4080.854701 , -5598.45 , 33.50028
+4080.854701 , -5405.4 , 29.63928
+4080.854701 , -5212.35 , 25.77828
+4080.854701 , -5019.3 , 21.91728
+4080.854701 , -4826.25 , 18.05628
+4080.854701 , -4633.2 , 14.19528
+4080.854701 , -4440.15 , 10.33428
+4080.854701 , -4247.1 , 6.473279998
+4080.854701 , -4054.05 , 2.612279998
+4080.854701 , -3861 , 1.248720002
+4080.854701 , -3667.95 , 5.109720002
+4080.854701 , -3474.9 , 8.970720002
+4080.854701 , -3281.85 , 12.83172
+4080.854701 , -3088.8 , 16.69272
+4080.854701 , -2895.75 , 20.55372
+4080.854701 , -2702.7 , 24.41472
+4080.854701 , -2509.65 , 28.27572
+4080.854701 , -2316.6 , 32.13672
+4080.854701 , -2123.55 , 35.99772
+4080.854701 , -1930.5 , 39.85872
+4080.854701 , -1737.45 , 43.71972
+4080.854701 , -1544.4 , 47.58072
+4080.854701 , -1351.35 , 51.44172
+4080.854701 , -1158.3 , 55.30272
+4080.854701 , -965.25 , 59.16372
+4080.854701 , -772.2 , 63.02472
+4080.854701 , -579.15 , 66.88572
+4080.854701 , -386.1 , 70.74672
+4080.854701 , -193.05 , 74.60772
+4080.854701 , 0 , 78.46872
+4080.854701 , 193.05 , 82.32972
+4080.854701 , 386.1 , 86.19072
+4080.854701 , 579.15 , 90.05172
+4080.854701 , 772.2 , 93.91272
+4080.854701 , 965.25 , 97.77372
+4080.854701 , 1158.3 , 101.63472
+4080.854701 , 1351.35 , 105.49572
+4080.854701 , 1544.4 , 109.35672
+4080.854701 , 1737.45 , 113.21772
+4080.854701 , 1930.5 , 117.07872
+4080.854701 , 2123.55 , 120.93972
+4080.854701 , 2316.6 , 124.80072
+4080.854701 , 2509.65 , 128.66172
+4080.854701 , 2702.7 , 132.52272
+4080.854701 , 2895.75 , 136.38372
+4080.854701 , 3088.8 , 140.24472
+4080.854701 , 3281.85 , 144.10572
+4080.854701 , 3474.9 , 147.96672
+4080.854701 , 3667.95 , 151.82772
+4080.854701 , 3861 , 155.68872
+4080.854701 , 4054.05 , 159.54972
+4080.854701 , 4247.1 , 163.41072
+4080.854701 , 4440.15 , 167.27172
+4080.854701 , 4633.2 , 171.13272
+4080.854701 , 4826.25 , 174.99372
+4080.854701 , 5019.3 , 178.85472
+4080.854701 , 5212.35 , 182.71572
+4080.854701 , 5405.4 , 186.57672
+4080.854701 , 5598.45 , 190.43772
+4080.854701 , 5791.5 , 194.29872
+4080.854701 , 5984.55 , 198.15972
+4080.854701 , 6177.6 , 202.02072
+4268.632479 , -6177.6 , 42.18323999
+4268.632479 , -5984.55 , 38.32223999
+4268.632479 , -5791.5 , 34.46123999
+4268.632479 , -5598.45 , 30.60023999
+4268.632479 , -5405.4 , 26.73923999
+4268.632479 , -5212.35 , 22.87823999
+4268.632479 , -5019.3 , 19.01723999
+4268.632479 , -4826.25 , 15.15623999
+4268.632479 , -4633.2 , 11.29523999
+4268.632479 , -4440.15 , 7.434239994
+4268.632479 , -4247.1 , 3.573239994
+4268.632479 , -4054.05 , 0.287760006
+4268.632479 , -3861 , 4.148760006
+4268.632479 , -3667.95 , 8.009760006
+4268.632479 , -3474.9 , 11.87076001
+4268.632479 , -3281.85 , 15.73176001
+4268.632479 , -3088.8 , 19.59276001
+4268.632479 , -2895.75 , 23.45376001
+4268.632479 , -2702.7 , 27.31476001
+4268.632479 , -2509.65 , 31.17576001
+4268.632479 , -2316.6 , 35.03676001
+4268.632479 , -2123.55 , 38.89776001
+4268.632479 , -1930.5 , 42.75876001
+4268.632479 , -1737.45 , 46.61976001
+4268.632479 , -1544.4 , 50.48076001
+4268.632479 , -1351.35 , 54.34176001
+4268.632479 , -1158.3 , 58.20276001
+4268.632479 , -965.25 , 62.06376001
+4268.632479 , -772.2 , 65.92476001
+4268.632479 , -579.15 , 69.78576001
+4268.632479 , -386.1 , 73.64676001
+4268.632479 , -193.05 , 77.50776001
+4268.632479 , 0 , 81.36876001
+4268.632479 , 193.05 , 85.22976001
+4268.632479 , 386.1 , 89.09076001
+4268.632479 , 579.15 , 92.95176001
+4268.632479 , 772.2 , 96.81276001
+4268.632479 , 965.25 , 100.67376
+4268.632479 , 1158.3 , 104.53476
+4268.632479 , 1351.35 , 108.39576
+4268.632479 , 1544.4 , 112.25676
+4268.632479 , 1737.45 , 116.11776
+4268.632479 , 1930.5 , 119.97876
+4268.632479 , 2123.55 , 123.83976
+4268.632479 , 2316.6 , 127.70076
+4268.632479 , 2509.65 , 131.56176
+4268.632479 , 2702.7 , 135.42276
+4268.632479 , 2895.75 , 139.28376
+4268.632479 , 3088.8 , 143.14476
+4268.632479 , 3281.85 , 147.00576
+4268.632479 , 3474.9 , 150.86676
+4268.632479 , 3667.95 , 154.72776
+4268.632479 , 3861 , 158.58876
+4268.632479 , 4054.05 , 162.44976
+4268.632479 , 4247.1 , 166.31076
+4268.632479 , 4440.15 , 170.17176
+4268.632479 , 4633.2 , 174.03276
+4268.632479 , 4826.25 , 177.89376
+4268.632479 , 5019.3 , 181.75476
+4268.632479 , 5212.35 , 185.61576
+4268.632479 , 5405.4 , 189.47676
+4268.632479 , 5598.45 , 193.33776
+4268.632479 , 5791.5 , 197.19876
+4268.632479 , 5984.55 , 201.05976
+4268.632479 , 6177.6 , 204.92076
+5000 , -6177.6 , 30.888
+5000 , -5984.55 , 27.027
+5000 , -5791.5 , 23.166
+5000 , -5598.45 , 19.305
+5000 , -5405.4 , 15.444
+5000 , -5212.35 , 11.583
+5000 , -5019.3 , 7.722
+5000 , -4826.25 , 3.861
+5000 , -4633.2 , 0
+5000 , -4440.15 , 3.861
+5000 , -4247.1 , 7.722
+5000 , -4054.05 , 11.583
+5000 , -3861 , 15.444
+5000 , -3667.95 , 19.305
+5000 , -3474.9 , 23.166
+5000 , -3281.85 , 27.027
+5000 , -3088.8 , 30.888
+5000 , -2895.75 , 34.749
+5000 , -2702.7 , 38.61
+5000 , -2509.65 , 42.471
+5000 , -2316.6 , 46.332
+5000 , -2123.55 , 50.193
+5000 , -1930.5 , 54.054
+5000 , -1737.45 , 57.915
+5000 , -1544.4 , 61.776
+5000 , -1351.35 , 65.637
+5000 , -1158.3 , 69.498
+5000 , -965.25 , 73.359
+5000 , -772.2 , 77.22
+5000 , -579.15 , 81.081
+5000 , -386.1 , 84.942
+5000 , -193.05 , 88.803
+5000 , 0 , 92.664
+5000 , 193.05 , 96.525
+5000 , 386.1 , 100.386
+5000 , 579.15 , 104.247
+5000 , 772.2 , 108.108
+5000 , 965.25 , 111.969
+5000 , 1158.3 , 115.83
+5000 , 1351.35 , 119.691
+5000 , 1544.4 , 123.552
+5000 , 1737.45 , 127.413
+5000 , 1930.5 , 131.274
+5000 , 2123.55 , 135.135
+5000 , 2316.6 , 138.996
+5000 , 2509.65 , 142.857
+5000 , 2702.7 , 146.718
+5000 , 2895.75 , 150.579
+5000 , 3088.8 , 154.44
+5000 , 3281.85 , 158.301
+5000 , 3474.9 , 162.162
+5000 , 3667.95 , 166.023
+5000 , 3861 , 169.884
+5000 , 4054.05 , 173.745
+5000 , 4247.1 , 177.606
+5000 , 4440.15 , 181.467
+5000 , 4633.2 , 185.328
+5000 , 4826.25 , 189.189
+5000 , 5019.3 , 193.05
+5000 , 5212.35 , 196.911
+5000 , 5405.4 , 200.772
+5000 , 5598.45 , 204.633
+5000 , 5791.5 , 208.494
+5000 , 5984.55 , 212.355
+5000 , 6177.6 , 216.216
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_5.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_5.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..0c62b96aa49736cc08eb39594ba2585d1ce4bb92
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_5.vtlm
@@ -0,0 +1,2081 @@
+Input Speed [rpm] , Input Torque [Nm] , Torque Loss [Nm]
+0 , -6177.6 , 103.16592
+0 , -5984.55 , 99.49797
+0 , -5791.5 , 95.83002
+0 , -5598.45 , 92.16207
+0 , -5405.4 , 88.49412
+0 , -5212.35 , 84.82617
+0 , -5019.3 , 81.15822
+0 , -4826.25 , 77.49027
+0 , -4633.2 , 73.82232
+0 , -4440.15 , 70.15437
+0 , -4247.1 , 66.48642
+0 , -4054.05 , 62.81847
+0 , -3861 , 59.15052
+0 , -3667.95 , 55.48257
+0 , -3474.9 , 51.81462
+0 , -3281.85 , 48.14667
+0 , -3088.8 , 44.47872
+0 , -2895.75 , 40.81077
+0 , -2702.7 , 37.14282
+0 , -2509.65 , 33.47487
+0 , -2316.6 , 29.80692
+0 , -2123.55 , 26.13897
+0 , -1930.5 , 22.47102
+0 , -1737.45 , 18.80307
+0 , -1544.4 , 15.13512
+0 , -1351.35 , 11.46717
+0 , -1158.3 , 7.79922
+0 , -965.25 , 4.13127
+0 , -772.2 , 0.46332
+0 , -579.15 , 3.20463
+0 , -386.1 , 6.87258
+0 , -193.05 , 10.54053
+0 , 0 , 14.20848
+0 , 193.05 , 17.87643
+0 , 386.1 , 21.54438
+0 , 579.15 , 25.21233
+0 , 772.2 , 28.88028
+0 , 965.25 , 32.54823
+0 , 1158.3 , 36.21618
+0 , 1351.35 , 39.88413
+0 , 1544.4 , 43.55208
+0 , 1737.45 , 47.22003
+0 , 1930.5 , 50.88798
+0 , 2123.55 , 54.55593
+0 , 2316.6 , 58.22388
+0 , 2509.65 , 61.89183
+0 , 2702.7 , 65.55978
+0 , 2895.75 , 69.22773
+0 , 3088.8 , 72.89568
+0 , 3281.85 , 76.56363
+0 , 3474.9 , 80.23158
+0 , 3667.95 , 83.89953
+0 , 3861 , 87.56748
+0 , 4054.05 , 91.23543
+0 , 4247.1 , 94.90338
+0 , 4440.15 , 98.57133
+0 , 4633.2 , 102.23928
+0 , 4826.25 , 105.90723
+0 , 5019.3 , 109.57518
+0 , 5212.35 , 113.24313
+0 , 5405.4 , 116.91108
+0 , 5598.45 , 120.57903
+0 , 5791.5 , 124.24698
+0 , 5984.55 , 127.91493
+0 , 6177.6 , 131.58288
+40.80854701 , -6177.6 , 102.5860926
+40.80854701 , -5984.55 , 98.91814258
+40.80854701 , -5791.5 , 95.25019258
+40.80854701 , -5598.45 , 91.58224258
+40.80854701 , -5405.4 , 87.91429258
+40.80854701 , -5212.35 , 84.24634258
+40.80854701 , -5019.3 , 80.57839258
+40.80854701 , -4826.25 , 76.91044258
+40.80854701 , -4633.2 , 73.24249258
+40.80854701 , -4440.15 , 69.57454258
+40.80854701 , -4247.1 , 65.90659258
+40.80854701 , -4054.05 , 62.23864258
+40.80854701 , -3861 , 58.57069258
+40.80854701 , -3667.95 , 54.90274258
+40.80854701 , -3474.9 , 51.23479258
+40.80854701 , -3281.85 , 47.56684258
+40.80854701 , -3088.8 , 43.89889258
+40.80854701 , -2895.75 , 40.23094258
+40.80854701 , -2702.7 , 36.56299258
+40.80854701 , -2509.65 , 32.89504258
+40.80854701 , -2316.6 , 29.22709258
+40.80854701 , -2123.55 , 25.55914258
+40.80854701 , -1930.5 , 21.89119258
+40.80854701 , -1737.45 , 18.22324258
+40.80854701 , -1544.4 , 14.55529258
+40.80854701 , -1351.35 , 10.88734258
+40.80854701 , -1158.3 , 7.219392576
+40.80854701 , -965.25 , 3.551442576
+40.80854701 , -772.2 , 0.116507424
+40.80854701 , -579.15 , 3.784457424
+40.80854701 , -386.1 , 7.452407424
+40.80854701 , -193.05 , 11.12035742
+40.80854701 , 0 , 14.78830742
+40.80854701 , 193.05 , 18.45625742
+40.80854701 , 386.1 , 22.12420742
+40.80854701 , 579.15 , 25.79215742
+40.80854701 , 772.2 , 29.46010742
+40.80854701 , 965.25 , 33.12805742
+40.80854701 , 1158.3 , 36.79600742
+40.80854701 , 1351.35 , 40.46395742
+40.80854701 , 1544.4 , 44.13190742
+40.80854701 , 1737.45 , 47.79985742
+40.80854701 , 1930.5 , 51.46780742
+40.80854701 , 2123.55 , 55.13575742
+40.80854701 , 2316.6 , 58.80370742
+40.80854701 , 2509.65 , 62.47165742
+40.80854701 , 2702.7 , 66.13960742
+40.80854701 , 2895.75 , 69.80755742
+40.80854701 , 3088.8 , 73.47550742
+40.80854701 , 3281.85 , 77.14345742
+40.80854701 , 3474.9 , 80.81140742
+40.80854701 , 3667.95 , 84.47935742
+40.80854701 , 3861 , 88.14730742
+40.80854701 , 4054.05 , 91.81525742
+40.80854701 , 4247.1 , 95.48320742
+40.80854701 , 4440.15 , 99.15115742
+40.80854701 , 4633.2 , 102.8191074
+40.80854701 , 4826.25 , 106.4870574
+40.80854701 , 5019.3 , 110.1550074
+40.80854701 , 5212.35 , 113.8229574
+40.80854701 , 5405.4 , 117.4909074
+40.80854701 , 5598.45 , 121.1588574
+40.80854701 , 5791.5 , 124.8268074
+40.80854701 , 5984.55 , 128.4947574
+40.80854701 , 6177.6 , 132.1627074
+81.61794872 , -6177.6 , 102.006253
+81.61794872 , -5984.55 , 98.33830301
+81.61794872 , -5791.5 , 94.67035301
+81.61794872 , -5598.45 , 91.00240301
+81.61794872 , -5405.4 , 87.33445301
+81.61794872 , -5212.35 , 83.66650301
+81.61794872 , -5019.3 , 79.99855301
+81.61794872 , -4826.25 , 76.33060301
+81.61794872 , -4633.2 , 72.66265301
+81.61794872 , -4440.15 , 68.99470301
+81.61794872 , -4247.1 , 65.32675301
+81.61794872 , -4054.05 , 61.65880301
+81.61794872 , -3861 , 57.99085301
+81.61794872 , -3667.95 , 54.32290301
+81.61794872 , -3474.9 , 50.65495301
+81.61794872 , -3281.85 , 46.98700301
+81.61794872 , -3088.8 , 43.31905301
+81.61794872 , -2895.75 , 39.65110301
+81.61794872 , -2702.7 , 35.98315301
+81.61794872 , -2509.65 , 32.31520301
+81.61794872 , -2316.6 , 28.64725301
+81.61794872 , -2123.55 , 24.97930301
+81.61794872 , -1930.5 , 21.31135301
+81.61794872 , -1737.45 , 17.64340301
+81.61794872 , -1544.4 , 13.97545301
+81.61794872 , -1351.35 , 10.30750301
+81.61794872 , -1158.3 , 6.639553008
+81.61794872 , -965.25 , 2.971603008
+81.61794872 , -772.2 , 0.696346992
+81.61794872 , -579.15 , 4.364296992
+81.61794872 , -386.1 , 8.032246992
+81.61794872 , -193.05 , 11.70019699
+81.61794872 , 0 , 15.36814699
+81.61794872 , 193.05 , 19.03609699
+81.61794872 , 386.1 , 22.70404699
+81.61794872 , 579.15 , 26.37199699
+81.61794872 , 772.2 , 30.03994699
+81.61794872 , 965.25 , 33.70789699
+81.61794872 , 1158.3 , 37.37584699
+81.61794872 , 1351.35 , 41.04379699
+81.61794872 , 1544.4 , 44.71174699
+81.61794872 , 1737.45 , 48.37969699
+81.61794872 , 1930.5 , 52.04764699
+81.61794872 , 2123.55 , 55.71559699
+81.61794872 , 2316.6 , 59.38354699
+81.61794872 , 2509.65 , 63.05149699
+81.61794872 , 2702.7 , 66.71944699
+81.61794872 , 2895.75 , 70.38739699
+81.61794872 , 3088.8 , 74.05534699
+81.61794872 , 3281.85 , 77.72329699
+81.61794872 , 3474.9 , 81.39124699
+81.61794872 , 3667.95 , 85.05919699
+81.61794872 , 3861 , 88.72714699
+81.61794872 , 4054.05 , 92.39509699
+81.61794872 , 4247.1 , 96.06304699
+81.61794872 , 4440.15 , 99.73099699
+81.61794872 , 4633.2 , 103.398947
+81.61794872 , 4826.25 , 107.066897
+81.61794872 , 5019.3 , 110.734847
+81.61794872 , 5212.35 , 114.402797
+81.61794872 , 5405.4 , 118.070747
+81.61794872 , 5598.45 , 121.738697
+81.61794872 , 5791.5 , 125.406647
+81.61794872 , 5984.55 , 129.074597
+81.61794872 , 6177.6 , 132.742547
+122.4273504 , -6177.6 , 101.4264134
+122.4273504 , -5984.55 , 97.75846344
+122.4273504 , -5791.5 , 94.09051344
+122.4273504 , -5598.45 , 90.42256344
+122.4273504 , -5405.4 , 86.75461344
+122.4273504 , -5212.35 , 83.08666344
+122.4273504 , -5019.3 , 79.41871344
+122.4273504 , -4826.25 , 75.75076344
+122.4273504 , -4633.2 , 72.08281344
+122.4273504 , -4440.15 , 68.41486344
+122.4273504 , -4247.1 , 64.74691344
+122.4273504 , -4054.05 , 61.07896344
+122.4273504 , -3861 , 57.41101344
+122.4273504 , -3667.95 , 53.74306344
+122.4273504 , -3474.9 , 50.07511344
+122.4273504 , -3281.85 , 46.40716344
+122.4273504 , -3088.8 , 42.73921344
+122.4273504 , -2895.75 , 39.07126344
+122.4273504 , -2702.7 , 35.40331344
+122.4273504 , -2509.65 , 31.73536344
+122.4273504 , -2316.6 , 28.06741344
+122.4273504 , -2123.55 , 24.39946344
+122.4273504 , -1930.5 , 20.73151344
+122.4273504 , -1737.45 , 17.06356344
+122.4273504 , -1544.4 , 13.39561344
+122.4273504 , -1351.35 , 9.72766344
+122.4273504 , -1158.3 , 6.05971344
+122.4273504 , -965.25 , 2.39176344
+122.4273504 , -772.2 , 1.27618656
+122.4273504 , -579.15 , 4.94413656
+122.4273504 , -386.1 , 8.61208656
+122.4273504 , -193.05 , 12.28003656
+122.4273504 , 0 , 15.94798656
+122.4273504 , 193.05 , 19.61593656
+122.4273504 , 386.1 , 23.28388656
+122.4273504 , 579.15 , 26.95183656
+122.4273504 , 772.2 , 30.61978656
+122.4273504 , 965.25 , 34.28773656
+122.4273504 , 1158.3 , 37.95568656
+122.4273504 , 1351.35 , 41.62363656
+122.4273504 , 1544.4 , 45.29158656
+122.4273504 , 1737.45 , 48.95953656
+122.4273504 , 1930.5 , 52.62748656
+122.4273504 , 2123.55 , 56.29543656
+122.4273504 , 2316.6 , 59.96338656
+122.4273504 , 2509.65 , 63.63133656
+122.4273504 , 2702.7 , 67.29928656
+122.4273504 , 2895.75 , 70.96723656
+122.4273504 , 3088.8 , 74.63518656
+122.4273504 , 3281.85 , 78.30313656
+122.4273504 , 3474.9 , 81.97108656
+122.4273504 , 3667.95 , 85.63903656
+122.4273504 , 3861 , 89.30698656
+122.4273504 , 4054.05 , 92.97493656
+122.4273504 , 4247.1 , 96.64288656
+122.4273504 , 4440.15 , 100.3108366
+122.4273504 , 4633.2 , 103.9787866
+122.4273504 , 4826.25 , 107.6467366
+122.4273504 , 5019.3 , 111.3146866
+122.4273504 , 5212.35 , 114.9826366
+122.4273504 , 5405.4 , 118.6505866
+122.4273504 , 5598.45 , 122.3185366
+122.4273504 , 5791.5 , 125.9864866
+122.4273504 , 5984.55 , 129.6544366
+122.4273504 , 6177.6 , 133.3223866
+163.2393162 , -6177.6 , 100.8465374
+163.2393162 , -5984.55 , 97.17858744
+163.2393162 , -5791.5 , 93.51063744
+163.2393162 , -5598.45 , 89.84268744
+163.2393162 , -5405.4 , 86.17473744
+163.2393162 , -5212.35 , 82.50678744
+163.2393162 , -5019.3 , 78.83883744
+163.2393162 , -4826.25 , 75.17088744
+163.2393162 , -4633.2 , 71.50293744
+163.2393162 , -4440.15 , 67.83498744
+163.2393162 , -4247.1 , 64.16703744
+163.2393162 , -4054.05 , 60.49908744
+163.2393162 , -3861 , 56.83113744
+163.2393162 , -3667.95 , 53.16318744
+163.2393162 , -3474.9 , 49.49523744
+163.2393162 , -3281.85 , 45.82728744
+163.2393162 , -3088.8 , 42.15933744
+163.2393162 , -2895.75 , 38.49138744
+163.2393162 , -2702.7 , 34.82343744
+163.2393162 , -2509.65 , 31.15548744
+163.2393162 , -2316.6 , 27.48753744
+163.2393162 , -2123.55 , 23.81958744
+163.2393162 , -1930.5 , 20.15163744
+163.2393162 , -1737.45 , 16.48368744
+163.2393162 , -1544.4 , 12.81573744
+163.2393162 , -1351.35 , 9.147787441
+163.2393162 , -1158.3 , 5.479837441
+163.2393162 , -965.25 , 1.811887441
+163.2393162 , -772.2 , 1.856062559
+163.2393162 , -579.15 , 5.524012559
+163.2393162 , -386.1 , 9.191962559
+163.2393162 , -193.05 , 12.85991256
+163.2393162 , 0 , 16.52786256
+163.2393162 , 193.05 , 20.19581256
+163.2393162 , 386.1 , 23.86376256
+163.2393162 , 579.15 , 27.53171256
+163.2393162 , 772.2 , 31.19966256
+163.2393162 , 965.25 , 34.86761256
+163.2393162 , 1158.3 , 38.53556256
+163.2393162 , 1351.35 , 42.20351256
+163.2393162 , 1544.4 , 45.87146256
+163.2393162 , 1737.45 , 49.53941256
+163.2393162 , 1930.5 , 53.20736256
+163.2393162 , 2123.55 , 56.87531256
+163.2393162 , 2316.6 , 60.54326256
+163.2393162 , 2509.65 , 64.21121256
+163.2393162 , 2702.7 , 67.87916256
+163.2393162 , 2895.75 , 71.54711256
+163.2393162 , 3088.8 , 75.21506256
+163.2393162 , 3281.85 , 78.88301256
+163.2393162 , 3474.9 , 82.55096256
+163.2393162 , 3667.95 , 86.21891256
+163.2393162 , 3861 , 89.88686256
+163.2393162 , 4054.05 , 93.55481256
+163.2393162 , 4247.1 , 97.22276256
+163.2393162 , 4440.15 , 100.8907126
+163.2393162 , 4633.2 , 104.5586626
+163.2393162 , 4826.25 , 108.2266126
+163.2393162 , 5019.3 , 111.8945626
+163.2393162 , 5212.35 , 115.5625126
+163.2393162 , 5405.4 , 119.2304626
+163.2393162 , 5598.45 , 122.8984126
+163.2393162 , 5791.5 , 126.5663626
+163.2393162 , 5984.55 , 130.2343126
+163.2393162 , 6177.6 , 133.9022626
+204.042735 , -6177.6 , 100.2667829
+204.042735 , -5984.55 , 96.59883288
+204.042735 , -5791.5 , 92.93088288
+204.042735 , -5598.45 , 89.26293288
+204.042735 , -5405.4 , 85.59498288
+204.042735 , -5212.35 , 81.92703288
+204.042735 , -5019.3 , 78.25908288
+204.042735 , -4826.25 , 74.59113288
+204.042735 , -4633.2 , 70.92318288
+204.042735 , -4440.15 , 67.25523288
+204.042735 , -4247.1 , 63.58728288
+204.042735 , -4054.05 , 59.91933288
+204.042735 , -3861 , 56.25138288
+204.042735 , -3667.95 , 52.58343288
+204.042735 , -3474.9 , 48.91548288
+204.042735 , -3281.85 , 45.24753288
+204.042735 , -3088.8 , 41.57958288
+204.042735 , -2895.75 , 37.91163288
+204.042735 , -2702.7 , 34.24368288
+204.042735 , -2509.65 , 30.57573288
+204.042735 , -2316.6 , 26.90778288
+204.042735 , -2123.55 , 23.23983288
+204.042735 , -1930.5 , 19.57188288
+204.042735 , -1737.45 , 15.90393288
+204.042735 , -1544.4 , 12.23598288
+204.042735 , -1351.35 , 8.568032881
+204.042735 , -1158.3 , 4.900082881
+204.042735 , -965.25 , 1.232132881
+204.042735 , -772.2 , 2.435817119
+204.042735 , -579.15 , 6.103767119
+204.042735 , -386.1 , 9.771717119
+204.042735 , -193.05 , 13.43966712
+204.042735 , 0 , 17.10761712
+204.042735 , 193.05 , 20.77556712
+204.042735 , 386.1 , 24.44351712
+204.042735 , 579.15 , 28.11146712
+204.042735 , 772.2 , 31.77941712
+204.042735 , 965.25 , 35.44736712
+204.042735 , 1158.3 , 39.11531712
+204.042735 , 1351.35 , 42.78326712
+204.042735 , 1544.4 , 46.45121712
+204.042735 , 1737.45 , 50.11916712
+204.042735 , 1930.5 , 53.78711712
+204.042735 , 2123.55 , 57.45506712
+204.042735 , 2316.6 , 61.12301712
+204.042735 , 2509.65 , 64.79096712
+204.042735 , 2702.7 , 68.45891712
+204.042735 , 2895.75 , 72.12686712
+204.042735 , 3088.8 , 75.79481712
+204.042735 , 3281.85 , 79.46276712
+204.042735 , 3474.9 , 83.13071712
+204.042735 , 3667.95 , 86.79866712
+204.042735 , 3861 , 90.46661712
+204.042735 , 4054.05 , 94.13456712
+204.042735 , 4247.1 , 97.80251712
+204.042735 , 4440.15 , 101.4704671
+204.042735 , 4633.2 , 105.1384171
+204.042735 , 4826.25 , 108.8063671
+204.042735 , 5019.3 , 112.4743171
+204.042735 , 5212.35 , 116.1422671
+204.042735 , 5405.4 , 119.8102171
+204.042735 , 5598.45 , 123.4781671
+204.042735 , 5791.5 , 127.1461171
+204.042735 , 5984.55 , 130.8140671
+204.042735 , 6177.6 , 134.4820171
+244.8547009 , -6177.6 , 99.68690688
+244.8547009 , -5984.55 , 96.01895688
+244.8547009 , -5791.5 , 92.35100688
+244.8547009 , -5598.45 , 88.68305688
+244.8547009 , -5405.4 , 85.01510688
+244.8547009 , -5212.35 , 81.34715688
+244.8547009 , -5019.3 , 77.67920688
+244.8547009 , -4826.25 , 74.01125688
+244.8547009 , -4633.2 , 70.34330688
+244.8547009 , -4440.15 , 66.67535688
+244.8547009 , -4247.1 , 63.00740688
+244.8547009 , -4054.05 , 59.33945688
+244.8547009 , -3861 , 55.67150688
+244.8547009 , -3667.95 , 52.00355688
+244.8547009 , -3474.9 , 48.33560688
+244.8547009 , -3281.85 , 44.66765688
+244.8547009 , -3088.8 , 40.99970688
+244.8547009 , -2895.75 , 37.33175688
+244.8547009 , -2702.7 , 33.66380688
+244.8547009 , -2509.65 , 29.99585688
+244.8547009 , -2316.6 , 26.32790688
+244.8547009 , -2123.55 , 22.65995688
+244.8547009 , -1930.5 , 18.99200688
+244.8547009 , -1737.45 , 15.32405688
+244.8547009 , -1544.4 , 11.65610688
+244.8547009 , -1351.35 , 7.988156879
+244.8547009 , -1158.3 , 4.320206879
+244.8547009 , -965.25 , 0.652256879
+244.8547009 , -772.2 , 3.015693121
+244.8547009 , -579.15 , 6.683643121
+244.8547009 , -386.1 , 10.35159312
+244.8547009 , -193.05 , 14.01954312
+244.8547009 , 0 , 17.68749312
+244.8547009 , 193.05 , 21.35544312
+244.8547009 , 386.1 , 25.02339312
+244.8547009 , 579.15 , 28.69134312
+244.8547009 , 772.2 , 32.35929312
+244.8547009 , 965.25 , 36.02724312
+244.8547009 , 1158.3 , 39.69519312
+244.8547009 , 1351.35 , 43.36314312
+244.8547009 , 1544.4 , 47.03109312
+244.8547009 , 1737.45 , 50.69904312
+244.8547009 , 1930.5 , 54.36699312
+244.8547009 , 2123.55 , 58.03494312
+244.8547009 , 2316.6 , 61.70289312
+244.8547009 , 2509.65 , 65.37084312
+244.8547009 , 2702.7 , 69.03879312
+244.8547009 , 2895.75 , 72.70674312
+244.8547009 , 3088.8 , 76.37469312
+244.8547009 , 3281.85 , 80.04264312
+244.8547009 , 3474.9 , 83.71059312
+244.8547009 , 3667.95 , 87.37854312
+244.8547009 , 3861 , 91.04649312
+244.8547009 , 4054.05 , 94.71444312
+244.8547009 , 4247.1 , 98.38239312
+244.8547009 , 4440.15 , 102.0503431
+244.8547009 , 4633.2 , 105.7182931
+244.8547009 , 4826.25 , 109.3862431
+244.8547009 , 5019.3 , 113.0541931
+244.8547009 , 5212.35 , 116.7221431
+244.8547009 , 5405.4 , 120.3900931
+244.8547009 , 5598.45 , 124.0580431
+244.8547009 , 5791.5 , 127.7259931
+244.8547009 , 5984.55 , 131.3939431
+244.8547009 , 6177.6 , 135.0618931
+285.6666667 , -6177.6 , 99.10703088
+285.6666667 , -5984.55 , 95.43908088
+285.6666667 , -5791.5 , 91.77113088
+285.6666667 , -5598.45 , 88.10318088
+285.6666667 , -5405.4 , 84.43523088
+285.6666667 , -5212.35 , 80.76728088
+285.6666667 , -5019.3 , 77.09933088
+285.6666667 , -4826.25 , 73.43138088
+285.6666667 , -4633.2 , 69.76343088
+285.6666667 , -4440.15 , 66.09548088
+285.6666667 , -4247.1 , 62.42753088
+285.6666667 , -4054.05 , 58.75958088
+285.6666667 , -3861 , 55.09163088
+285.6666667 , -3667.95 , 51.42368088
+285.6666667 , -3474.9 , 47.75573088
+285.6666667 , -3281.85 , 44.08778088
+285.6666667 , -3088.8 , 40.41983088
+285.6666667 , -2895.75 , 36.75188088
+285.6666667 , -2702.7 , 33.08393088
+285.6666667 , -2509.65 , 29.41598088
+285.6666667 , -2316.6 , 25.74803088
+285.6666667 , -2123.55 , 22.08008088
+285.6666667 , -1930.5 , 18.41213088
+285.6666667 , -1737.45 , 14.74418088
+285.6666667 , -1544.4 , 11.07623088
+285.6666667 , -1351.35 , 7.40828088
+285.6666667 , -1158.3 , 3.74033088
+285.6666667 , -965.25 , 0.07238088
+285.6666667 , -772.2 , 3.59556912
+285.6666667 , -579.15 , 7.26351912
+285.6666667 , -386.1 , 10.93146912
+285.6666667 , -193.05 , 14.59941912
+285.6666667 , 0 , 18.26736912
+285.6666667 , 193.05 , 21.93531912
+285.6666667 , 386.1 , 25.60326912
+285.6666667 , 579.15 , 29.27121912
+285.6666667 , 772.2 , 32.93916912
+285.6666667 , 965.25 , 36.60711912
+285.6666667 , 1158.3 , 40.27506912
+285.6666667 , 1351.35 , 43.94301912
+285.6666667 , 1544.4 , 47.61096912
+285.6666667 , 1737.45 , 51.27891912
+285.6666667 , 1930.5 , 54.94686912
+285.6666667 , 2123.55 , 58.61481912
+285.6666667 , 2316.6 , 62.28276912
+285.6666667 , 2509.65 , 65.95071912
+285.6666667 , 2702.7 , 69.61866912
+285.6666667 , 2895.75 , 73.28661912
+285.6666667 , 3088.8 , 76.95456912
+285.6666667 , 3281.85 , 80.62251912
+285.6666667 , 3474.9 , 84.29046912
+285.6666667 , 3667.95 , 87.95841912
+285.6666667 , 3861 , 91.62636912
+285.6666667 , 4054.05 , 95.29431912
+285.6666667 , 4247.1 , 98.96226912
+285.6666667 , 4440.15 , 102.6302191
+285.6666667 , 4633.2 , 106.2981691
+285.6666667 , 4826.25 , 109.9661191
+285.6666667 , 5019.3 , 113.6340691
+285.6666667 , 5212.35 , 117.3020191
+285.6666667 , 5405.4 , 120.9699691
+285.6666667 , 5598.45 , 124.6379191
+285.6666667 , 5791.5 , 128.3058691
+285.6666667 , 5984.55 , 131.9738191
+285.6666667 , 6177.6 , 135.6417691
+326.4700855 , -6177.6 , 98.52727632
+326.4700855 , -5984.55 , 94.85932632
+326.4700855 , -5791.5 , 91.19137632
+326.4700855 , -5598.45 , 87.52342632
+326.4700855 , -5405.4 , 83.85547632
+326.4700855 , -5212.35 , 80.18752632
+326.4700855 , -5019.3 , 76.51957632
+326.4700855 , -4826.25 , 72.85162632
+326.4700855 , -4633.2 , 69.18367632
+326.4700855 , -4440.15 , 65.51572632
+326.4700855 , -4247.1 , 61.84777632
+326.4700855 , -4054.05 , 58.17982632
+326.4700855 , -3861 , 54.51187632
+326.4700855 , -3667.95 , 50.84392632
+326.4700855 , -3474.9 , 47.17597632
+326.4700855 , -3281.85 , 43.50802632
+326.4700855 , -3088.8 , 39.84007632
+326.4700855 , -2895.75 , 36.17212632
+326.4700855 , -2702.7 , 32.50417632
+326.4700855 , -2509.65 , 28.83622632
+326.4700855 , -2316.6 , 25.16827632
+326.4700855 , -2123.55 , 21.50032632
+326.4700855 , -1930.5 , 17.83237632
+326.4700855 , -1737.45 , 14.16442632
+326.4700855 , -1544.4 , 10.49647632
+326.4700855 , -1351.35 , 6.82852632
+326.4700855 , -1158.3 , 3.16057632
+326.4700855 , -965.25 , 0.50737368
+326.4700855 , -772.2 , 4.17532368
+326.4700855 , -579.15 , 7.84327368
+326.4700855 , -386.1 , 11.51122368
+326.4700855 , -193.05 , 15.17917368
+326.4700855 , 0 , 18.84712368
+326.4700855 , 193.05 , 22.51507368
+326.4700855 , 386.1 , 26.18302368
+326.4700855 , 579.15 , 29.85097368
+326.4700855 , 772.2 , 33.51892368
+326.4700855 , 965.25 , 37.18687368
+326.4700855 , 1158.3 , 40.85482368
+326.4700855 , 1351.35 , 44.52277368
+326.4700855 , 1544.4 , 48.19072368
+326.4700855 , 1737.45 , 51.85867368
+326.4700855 , 1930.5 , 55.52662368
+326.4700855 , 2123.55 , 59.19457368
+326.4700855 , 2316.6 , 62.86252368
+326.4700855 , 2509.65 , 66.53047368
+326.4700855 , 2702.7 , 70.19842368
+326.4700855 , 2895.75 , 73.86637368
+326.4700855 , 3088.8 , 77.53432368
+326.4700855 , 3281.85 , 81.20227368
+326.4700855 , 3474.9 , 84.87022368
+326.4700855 , 3667.95 , 88.53817368
+326.4700855 , 3861 , 92.20612368
+326.4700855 , 4054.05 , 95.87407368
+326.4700855 , 4247.1 , 99.54202368
+326.4700855 , 4440.15 , 103.2099737
+326.4700855 , 4633.2 , 106.8779237
+326.4700855 , 4826.25 , 110.5458737
+326.4700855 , 5019.3 , 114.2138237
+326.4700855 , 5212.35 , 117.8817737
+326.4700855 , 5405.4 , 121.5497237
+326.4700855 , 5598.45 , 125.2176737
+326.4700855 , 5791.5 , 128.8856237
+326.4700855 , 5984.55 , 132.5535737
+326.4700855 , 6177.6 , 136.2215237
+367.2820513 , -6177.6 , 97.94740032
+367.2820513 , -5984.55 , 94.27945032
+367.2820513 , -5791.5 , 90.61150032
+367.2820513 , -5598.45 , 86.94355032
+367.2820513 , -5405.4 , 83.27560032
+367.2820513 , -5212.35 , 79.60765032
+367.2820513 , -5019.3 , 75.93970032
+367.2820513 , -4826.25 , 72.27175032
+367.2820513 , -4633.2 , 68.60380032
+367.2820513 , -4440.15 , 64.93585032
+367.2820513 , -4247.1 , 61.26790032
+367.2820513 , -4054.05 , 57.59995032
+367.2820513 , -3861 , 53.93200032
+367.2820513 , -3667.95 , 50.26405032
+367.2820513 , -3474.9 , 46.59610032
+367.2820513 , -3281.85 , 42.92815032
+367.2820513 , -3088.8 , 39.26020032
+367.2820513 , -2895.75 , 35.59225032
+367.2820513 , -2702.7 , 31.92430032
+367.2820513 , -2509.65 , 28.25635032
+367.2820513 , -2316.6 , 24.58840032
+367.2820513 , -2123.55 , 20.92045032
+367.2820513 , -1930.5 , 17.25250032
+367.2820513 , -1737.45 , 13.58455032
+367.2820513 , -1544.4 , 9.91660032
+367.2820513 , -1351.35 , 6.24865032
+367.2820513 , -1158.3 , 2.58070032
+367.2820513 , -965.25 , 1.08724968
+367.2820513 , -772.2 , 4.75519968
+367.2820513 , -579.15 , 8.42314968
+367.2820513 , -386.1 , 12.09109968
+367.2820513 , -193.05 , 15.75904968
+367.2820513 , 0 , 19.42699968
+367.2820513 , 193.05 , 23.09494968
+367.2820513 , 386.1 , 26.76289968
+367.2820513 , 579.15 , 30.43084968
+367.2820513 , 772.2 , 34.09879968
+367.2820513 , 965.25 , 37.76674968
+367.2820513 , 1158.3 , 41.43469968
+367.2820513 , 1351.35 , 45.10264968
+367.2820513 , 1544.4 , 48.77059968
+367.2820513 , 1737.45 , 52.43854968
+367.2820513 , 1930.5 , 56.10649968
+367.2820513 , 2123.55 , 59.77444968
+367.2820513 , 2316.6 , 63.44239968
+367.2820513 , 2509.65 , 67.11034968
+367.2820513 , 2702.7 , 70.77829968
+367.2820513 , 2895.75 , 74.44624968
+367.2820513 , 3088.8 , 78.11419968
+367.2820513 , 3281.85 , 81.78214968
+367.2820513 , 3474.9 , 85.45009968
+367.2820513 , 3667.95 , 89.11804968
+367.2820513 , 3861 , 92.78599968
+367.2820513 , 4054.05 , 96.45394968
+367.2820513 , 4247.1 , 100.1218997
+367.2820513 , 4440.15 , 103.7898497
+367.2820513 , 4633.2 , 107.4577997
+367.2820513 , 4826.25 , 111.1257497
+367.2820513 , 5019.3 , 114.7936997
+367.2820513 , 5212.35 , 118.4616497
+367.2820513 , 5405.4 , 122.1295997
+367.2820513 , 5598.45 , 125.7975497
+367.2820513 , 5791.5 , 129.4654997
+367.2820513 , 5984.55 , 133.1334497
+367.2820513 , 6177.6 , 136.8013997
+408.0854701 , -6177.6 , 97.36764576
+408.0854701 , -5984.55 , 93.69969576
+408.0854701 , -5791.5 , 90.03174576
+408.0854701 , -5598.45 , 86.36379576
+408.0854701 , -5405.4 , 82.69584576
+408.0854701 , -5212.35 , 79.02789576
+408.0854701 , -5019.3 , 75.35994576
+408.0854701 , -4826.25 , 71.69199576
+408.0854701 , -4633.2 , 68.02404576
+408.0854701 , -4440.15 , 64.35609576
+408.0854701 , -4247.1 , 60.68814576
+408.0854701 , -4054.05 , 57.02019576
+408.0854701 , -3861 , 53.35224576
+408.0854701 , -3667.95 , 49.68429576
+408.0854701 , -3474.9 , 46.01634576
+408.0854701 , -3281.85 , 42.34839576
+408.0854701 , -3088.8 , 38.68044576
+408.0854701 , -2895.75 , 35.01249576
+408.0854701 , -2702.7 , 31.34454576
+408.0854701 , -2509.65 , 27.67659576
+408.0854701 , -2316.6 , 24.00864576
+408.0854701 , -2123.55 , 20.34069576
+408.0854701 , -1930.5 , 16.67274576
+408.0854701 , -1737.45 , 13.00479576
+408.0854701 , -1544.4 , 9.33684576
+408.0854701 , -1351.35 , 5.66889576
+408.0854701 , -1158.3 , 2.00094576
+408.0854701 , -965.25 , 1.66700424
+408.0854701 , -772.2 , 5.33495424
+408.0854701 , -579.15 , 9.00290424
+408.0854701 , -386.1 , 12.67085424
+408.0854701 , -193.05 , 16.33880424
+408.0854701 , 0 , 20.00675424
+408.0854701 , 193.05 , 23.67470424
+408.0854701 , 386.1 , 27.34265424
+408.0854701 , 579.15 , 31.01060424
+408.0854701 , 772.2 , 34.67855424
+408.0854701 , 965.25 , 38.34650424
+408.0854701 , 1158.3 , 42.01445424
+408.0854701 , 1351.35 , 45.68240424
+408.0854701 , 1544.4 , 49.35035424
+408.0854701 , 1737.45 , 53.01830424
+408.0854701 , 1930.5 , 56.68625424
+408.0854701 , 2123.55 , 60.35420424
+408.0854701 , 2316.6 , 64.02215424
+408.0854701 , 2509.65 , 67.69010424
+408.0854701 , 2702.7 , 71.35805424
+408.0854701 , 2895.75 , 75.02600424
+408.0854701 , 3088.8 , 78.69395424
+408.0854701 , 3281.85 , 82.36190424
+408.0854701 , 3474.9 , 86.02985424
+408.0854701 , 3667.95 , 89.69780424
+408.0854701 , 3861 , 93.36575424
+408.0854701 , 4054.05 , 97.03370424
+408.0854701 , 4247.1 , 100.7016542
+408.0854701 , 4440.15 , 104.3696042
+408.0854701 , 4633.2 , 108.0375542
+408.0854701 , 4826.25 , 111.7055042
+408.0854701 , 5019.3 , 115.3734542
+408.0854701 , 5212.35 , 119.0414042
+408.0854701 , 5405.4 , 122.7093542
+408.0854701 , 5598.45 , 126.3773042
+408.0854701 , 5791.5 , 130.0452542
+408.0854701 , 5984.55 , 133.7132042
+408.0854701 , 6177.6 , 137.3811542
+448.8974359 , -6177.6 , 96.78776976
+448.8974359 , -5984.55 , 93.11981976
+448.8974359 , -5791.5 , 89.45186976
+448.8974359 , -5598.45 , 85.78391976
+448.8974359 , -5405.4 , 82.11596976
+448.8974359 , -5212.35 , 78.44801976
+448.8974359 , -5019.3 , 74.78006976
+448.8974359 , -4826.25 , 71.11211976
+448.8974359 , -4633.2 , 67.44416976
+448.8974359 , -4440.15 , 63.77621976
+448.8974359 , -4247.1 , 60.10826976
+448.8974359 , -4054.05 , 56.44031976
+448.8974359 , -3861 , 52.77236976
+448.8974359 , -3667.95 , 49.10441976
+448.8974359 , -3474.9 , 45.43646976
+448.8974359 , -3281.85 , 41.76851976
+448.8974359 , -3088.8 , 38.10056976
+448.8974359 , -2895.75 , 34.43261976
+448.8974359 , -2702.7 , 30.76466976
+448.8974359 , -2509.65 , 27.09671976
+448.8974359 , -2316.6 , 23.42876976
+448.8974359 , -2123.55 , 19.76081976
+448.8974359 , -1930.5 , 16.09286976
+448.8974359 , -1737.45 , 12.42491976
+448.8974359 , -1544.4 , 8.75696976
+448.8974359 , -1351.35 , 5.08901976
+448.8974359 , -1158.3 , 1.42106976
+448.8974359 , -965.25 , 2.24688024
+448.8974359 , -772.2 , 5.91483024
+448.8974359 , -579.15 , 9.58278024
+448.8974359 , -386.1 , 13.25073024
+448.8974359 , -193.05 , 16.91868024
+448.8974359 , 0 , 20.58663024
+448.8974359 , 193.05 , 24.25458024
+448.8974359 , 386.1 , 27.92253024
+448.8974359 , 579.15 , 31.59048024
+448.8974359 , 772.2 , 35.25843024
+448.8974359 , 965.25 , 38.92638024
+448.8974359 , 1158.3 , 42.59433024
+448.8974359 , 1351.35 , 46.26228024
+448.8974359 , 1544.4 , 49.93023024
+448.8974359 , 1737.45 , 53.59818024
+448.8974359 , 1930.5 , 57.26613024
+448.8974359 , 2123.55 , 60.93408024
+448.8974359 , 2316.6 , 64.60203024
+448.8974359 , 2509.65 , 68.26998024
+448.8974359 , 2702.7 , 71.93793024
+448.8974359 , 2895.75 , 75.60588024
+448.8974359 , 3088.8 , 79.27383024
+448.8974359 , 3281.85 , 82.94178024
+448.8974359 , 3474.9 , 86.60973024
+448.8974359 , 3667.95 , 90.27768024
+448.8974359 , 3861 , 93.94563024
+448.8974359 , 4054.05 , 97.61358024
+448.8974359 , 4247.1 , 101.2815302
+448.8974359 , 4440.15 , 104.9494802
+448.8974359 , 4633.2 , 108.6174302
+448.8974359 , 4826.25 , 112.2853802
+448.8974359 , 5019.3 , 115.9533302
+448.8974359 , 5212.35 , 119.6212802
+448.8974359 , 5405.4 , 123.2892302
+448.8974359 , 5598.45 , 126.9571802
+448.8974359 , 5791.5 , 130.6251302
+448.8974359 , 5984.55 , 134.2930802
+448.8974359 , 6177.6 , 137.9610302
+489.7094017 , -6177.6 , 96.20789376
+489.7094017 , -5984.55 , 92.53994376
+489.7094017 , -5791.5 , 88.87199376
+489.7094017 , -5598.45 , 85.20404376
+489.7094017 , -5405.4 , 81.53609376
+489.7094017 , -5212.35 , 77.86814376
+489.7094017 , -5019.3 , 74.20019376
+489.7094017 , -4826.25 , 70.53224376
+489.7094017 , -4633.2 , 66.86429376
+489.7094017 , -4440.15 , 63.19634376
+489.7094017 , -4247.1 , 59.52839376
+489.7094017 , -4054.05 , 55.86044376
+489.7094017 , -3861 , 52.19249376
+489.7094017 , -3667.95 , 48.52454376
+489.7094017 , -3474.9 , 44.85659376
+489.7094017 , -3281.85 , 41.18864376
+489.7094017 , -3088.8 , 37.52069376
+489.7094017 , -2895.75 , 33.85274376
+489.7094017 , -2702.7 , 30.18479376
+489.7094017 , -2509.65 , 26.51684376
+489.7094017 , -2316.6 , 22.84889376
+489.7094017 , -2123.55 , 19.18094376
+489.7094017 , -1930.5 , 15.51299376
+489.7094017 , -1737.45 , 11.84504376
+489.7094017 , -1544.4 , 8.17709376
+489.7094017 , -1351.35 , 4.50914376
+489.7094017 , -1158.3 , 0.84119376
+489.7094017 , -965.25 , 2.82675624
+489.7094017 , -772.2 , 6.49470624
+489.7094017 , -579.15 , 10.16265624
+489.7094017 , -386.1 , 13.83060624
+489.7094017 , -193.05 , 17.49855624
+489.7094017 , 0 , 21.16650624
+489.7094017 , 193.05 , 24.83445624
+489.7094017 , 386.1 , 28.50240624
+489.7094017 , 579.15 , 32.17035624
+489.7094017 , 772.2 , 35.83830624
+489.7094017 , 965.25 , 39.50625624
+489.7094017 , 1158.3 , 43.17420624
+489.7094017 , 1351.35 , 46.84215624
+489.7094017 , 1544.4 , 50.51010624
+489.7094017 , 1737.45 , 54.17805624
+489.7094017 , 1930.5 , 57.84600624
+489.7094017 , 2123.55 , 61.51395624
+489.7094017 , 2316.6 , 65.18190624
+489.7094017 , 2509.65 , 68.84985624
+489.7094017 , 2702.7 , 72.51780624
+489.7094017 , 2895.75 , 76.18575624
+489.7094017 , 3088.8 , 79.85370624
+489.7094017 , 3281.85 , 83.52165624
+489.7094017 , 3474.9 , 87.18960624
+489.7094017 , 3667.95 , 90.85755624
+489.7094017 , 3861 , 94.52550624
+489.7094017 , 4054.05 , 98.19345624
+489.7094017 , 4247.1 , 101.8614062
+489.7094017 , 4440.15 , 105.5293562
+489.7094017 , 4633.2 , 109.1973062
+489.7094017 , 4826.25 , 112.8652562
+489.7094017 , 5019.3 , 116.5332062
+489.7094017 , 5212.35 , 120.2011562
+489.7094017 , 5405.4 , 123.8691062
+489.7094017 , 5598.45 , 127.5370562
+489.7094017 , 5791.5 , 131.2050062
+489.7094017 , 5984.55 , 134.8729562
+489.7094017 , 6177.6 , 138.5409062
+816.1794872 , -6177.6 , 91.56925008
+816.1794872 , -5984.55 , 87.90130008
+816.1794872 , -5791.5 , 84.23335008
+816.1794872 , -5598.45 , 80.56540008
+816.1794872 , -5405.4 , 76.89745008
+816.1794872 , -5212.35 , 73.22950008
+816.1794872 , -5019.3 , 69.56155008
+816.1794872 , -4826.25 , 65.89360008
+816.1794872 , -4633.2 , 62.22565008
+816.1794872 , -4440.15 , 58.55770008
+816.1794872 , -4247.1 , 54.88975008
+816.1794872 , -4054.05 , 51.22180008
+816.1794872 , -3861 , 47.55385008
+816.1794872 , -3667.95 , 43.88590008
+816.1794872 , -3474.9 , 40.21795008
+816.1794872 , -3281.85 , 36.55000008
+816.1794872 , -3088.8 , 32.88205008
+816.1794872 , -2895.75 , 29.21410008
+816.1794872 , -2702.7 , 25.54615008
+816.1794872 , -2509.65 , 21.87820008
+816.1794872 , -2316.6 , 18.21025008
+816.1794872 , -2123.55 , 14.54230008
+816.1794872 , -1930.5 , 10.87435008
+816.1794872 , -1737.45 , 7.20640008
+816.1794872 , -1544.4 , 3.53845008
+816.1794872 , -1351.35 , 0.12949992
+816.1794872 , -1158.3 , 3.79744992
+816.1794872 , -965.25 , 7.46539992
+816.1794872 , -772.2 , 11.13334992
+816.1794872 , -579.15 , 14.80129992
+816.1794872 , -386.1 , 18.46924992
+816.1794872 , -193.05 , 22.13719992
+816.1794872 , 0 , 25.80514992
+816.1794872 , 193.05 , 29.47309992
+816.1794872 , 386.1 , 33.14104992
+816.1794872 , 579.15 , 36.80899992
+816.1794872 , 772.2 , 40.47694992
+816.1794872 , 965.25 , 44.14489992
+816.1794872 , 1158.3 , 47.81284992
+816.1794872 , 1351.35 , 51.48079992
+816.1794872 , 1544.4 , 55.14874992
+816.1794872 , 1737.45 , 58.81669992
+816.1794872 , 1930.5 , 62.48464992
+816.1794872 , 2123.55 , 66.15259992
+816.1794872 , 2316.6 , 69.82054992
+816.1794872 , 2509.65 , 73.48849992
+816.1794872 , 2702.7 , 77.15644992
+816.1794872 , 2895.75 , 80.82439992
+816.1794872 , 3088.8 , 84.49234992
+816.1794872 , 3281.85 , 88.16029992
+816.1794872 , 3474.9 , 91.82824992
+816.1794872 , 3667.95 , 95.49619992
+816.1794872 , 3861 , 99.16414992
+816.1794872 , 4054.05 , 102.8320999
+816.1794872 , 4247.1 , 106.5000499
+816.1794872 , 4440.15 , 110.1679999
+816.1794872 , 4633.2 , 113.8359499
+816.1794872 , 4826.25 , 117.5038999
+816.1794872 , 5019.3 , 121.1718499
+816.1794872 , 5212.35 , 124.8397999
+816.1794872 , 5405.4 , 128.5077499
+816.1794872 , 5598.45 , 132.1756999
+816.1794872 , 5791.5 , 135.8436499
+816.1794872 , 5984.55 , 139.5115999
+816.1794872 , 6177.6 , 143.1795499
+1020.25641 , -6177.6 , 88.6696272
+1020.25641 , -5984.55 , 85.0016772
+1020.25641 , -5791.5 , 81.3337272
+1020.25641 , -5598.45 , 77.6657772
+1020.25641 , -5405.4 , 73.9978272
+1020.25641 , -5212.35 , 70.3298772
+1020.25641 , -5019.3 , 66.6619272
+1020.25641 , -4826.25 , 62.9939772
+1020.25641 , -4633.2 , 59.3260272
+1020.25641 , -4440.15 , 55.6580772
+1020.25641 , -4247.1 , 51.9901272
+1020.25641 , -4054.05 , 48.3221772
+1020.25641 , -3861 , 44.6542272
+1020.25641 , -3667.95 , 40.9862772
+1020.25641 , -3474.9 , 37.3183272
+1020.25641 , -3281.85 , 33.6503772
+1020.25641 , -3088.8 , 29.9824272
+1020.25641 , -2895.75 , 26.3144772
+1020.25641 , -2702.7 , 22.6465272
+1020.25641 , -2509.65 , 18.9785772
+1020.25641 , -2316.6 , 15.3106272
+1020.25641 , -2123.55 , 11.6426772
+1020.25641 , -1930.5 , 7.974727204
+1020.25641 , -1737.45 , 4.306777204
+1020.25641 , -1544.4 , 0.638827204
+1020.25641 , -1351.35 , 3.029122796
+1020.25641 , -1158.3 , 6.697072796
+1020.25641 , -965.25 , 10.3650228
+1020.25641 , -772.2 , 14.0329728
+1020.25641 , -579.15 , 17.7009228
+1020.25641 , -386.1 , 21.3688728
+1020.25641 , -193.05 , 25.0368228
+1020.25641 , 0 , 28.7047728
+1020.25641 , 193.05 , 32.3727228
+1020.25641 , 386.1 , 36.0406728
+1020.25641 , 579.15 , 39.7086228
+1020.25641 , 772.2 , 43.3765728
+1020.25641 , 965.25 , 47.0445228
+1020.25641 , 1158.3 , 50.7124728
+1020.25641 , 1351.35 , 54.3804228
+1020.25641 , 1544.4 , 58.0483728
+1020.25641 , 1737.45 , 61.7163228
+1020.25641 , 1930.5 , 65.3842728
+1020.25641 , 2123.55 , 69.0522228
+1020.25641 , 2316.6 , 72.7201728
+1020.25641 , 2509.65 , 76.3881228
+1020.25641 , 2702.7 , 80.0560728
+1020.25641 , 2895.75 , 83.7240228
+1020.25641 , 3088.8 , 87.3919728
+1020.25641 , 3281.85 , 91.0599228
+1020.25641 , 3474.9 , 94.7278728
+1020.25641 , 3667.95 , 98.3958228
+1020.25641 , 3861 , 102.0637728
+1020.25641 , 4054.05 , 105.7317228
+1020.25641 , 4247.1 , 109.3996728
+1020.25641 , 4440.15 , 113.0676228
+1020.25641 , 4633.2 , 116.7355728
+1020.25641 , 4826.25 , 120.4035228
+1020.25641 , 5019.3 , 124.0714728
+1020.25641 , 5212.35 , 127.7394228
+1020.25641 , 5405.4 , 131.4073728
+1020.25641 , 5598.45 , 135.0753228
+1020.25641 , 5791.5 , 138.7432728
+1020.25641 , 5984.55 , 142.4112228
+1020.25641 , 6177.6 , 146.0791728
+1224.273504 , -6177.6 , 85.7708544
+1224.273504 , -5984.55 , 82.1029044
+1224.273504 , -5791.5 , 78.4349544
+1224.273504 , -5598.45 , 74.7670044
+1224.273504 , -5405.4 , 71.0990544
+1224.273504 , -5212.35 , 67.4311044
+1224.273504 , -5019.3 , 63.7631544
+1224.273504 , -4826.25 , 60.0952044
+1224.273504 , -4633.2 , 56.4272544
+1224.273504 , -4440.15 , 52.7593044
+1224.273504 , -4247.1 , 49.0913544
+1224.273504 , -4054.05 , 45.4234044
+1224.273504 , -3861 , 41.7554544
+1224.273504 , -3667.95 , 38.0875044
+1224.273504 , -3474.9 , 34.4195544
+1224.273504 , -3281.85 , 30.7516044
+1224.273504 , -3088.8 , 27.0836544
+1224.273504 , -2895.75 , 23.4157044
+1224.273504 , -2702.7 , 19.7477544
+1224.273504 , -2509.65 , 16.0798044
+1224.273504 , -2316.6 , 12.4118544
+1224.273504 , -2123.55 , 8.743904404
+1224.273504 , -1930.5 , 5.075954404
+1224.273504 , -1737.45 , 1.408004404
+1224.273504 , -1544.4 , 2.259945596
+1224.273504 , -1351.35 , 5.927895596
+1224.273504 , -1158.3 , 9.595845596
+1224.273504 , -965.25 , 13.2637956
+1224.273504 , -772.2 , 16.9317456
+1224.273504 , -579.15 , 20.5996956
+1224.273504 , -386.1 , 24.2676456
+1224.273504 , -193.05 , 27.9355956
+1224.273504 , 0 , 31.6035456
+1224.273504 , 193.05 , 35.2714956
+1224.273504 , 386.1 , 38.9394456
+1224.273504 , 579.15 , 42.6073956
+1224.273504 , 772.2 , 46.2753456
+1224.273504 , 965.25 , 49.9432956
+1224.273504 , 1158.3 , 53.6112456
+1224.273504 , 1351.35 , 57.2791956
+1224.273504 , 1544.4 , 60.9471456
+1224.273504 , 1737.45 , 64.6150956
+1224.273504 , 1930.5 , 68.2830456
+1224.273504 , 2123.55 , 71.9509956
+1224.273504 , 2316.6 , 75.6189456
+1224.273504 , 2509.65 , 79.2868956
+1224.273504 , 2702.7 , 82.9548456
+1224.273504 , 2895.75 , 86.6227956
+1224.273504 , 3088.8 , 90.2907456
+1224.273504 , 3281.85 , 93.9586956
+1224.273504 , 3474.9 , 97.6266456
+1224.273504 , 3667.95 , 101.2945956
+1224.273504 , 3861 , 104.9625456
+1224.273504 , 4054.05 , 108.6304956
+1224.273504 , 4247.1 , 112.2984456
+1224.273504 , 4440.15 , 115.9663956
+1224.273504 , 4633.2 , 119.6343456
+1224.273504 , 4826.25 , 123.3022956
+1224.273504 , 5019.3 , 126.9702456
+1224.273504 , 5212.35 , 130.6381956
+1224.273504 , 5405.4 , 134.3061456
+1224.273504 , 5598.45 , 137.9740956
+1224.273504 , 5791.5 , 141.6420456
+1224.273504 , 5984.55 , 145.3099956
+1224.273504 , 6177.6 , 148.9779456
+1428.290598 , -6177.6 , 82.8720816
+1428.290598 , -5984.55 , 79.2041316
+1428.290598 , -5791.5 , 75.5361816
+1428.290598 , -5598.45 , 71.8682316
+1428.290598 , -5405.4 , 68.2002816
+1428.290598 , -5212.35 , 64.5323316
+1428.290598 , -5019.3 , 60.8643816
+1428.290598 , -4826.25 , 57.1964316
+1428.290598 , -4633.2 , 53.5284816
+1428.290598 , -4440.15 , 49.8605316
+1428.290598 , -4247.1 , 46.1925816
+1428.290598 , -4054.05 , 42.5246316
+1428.290598 , -3861 , 38.8566816
+1428.290598 , -3667.95 , 35.1887316
+1428.290598 , -3474.9 , 31.5207816
+1428.290598 , -3281.85 , 27.8528316
+1428.290598 , -3088.8 , 24.1848816
+1428.290598 , -2895.75 , 20.5169316
+1428.290598 , -2702.7 , 16.8489816
+1428.290598 , -2509.65 , 13.1810316
+1428.290598 , -2316.6 , 9.513081604
+1428.290598 , -2123.55 , 5.845131604
+1428.290598 , -1930.5 , 2.177181604
+1428.290598 , -1737.45 , 1.490768396
+1428.290598 , -1544.4 , 5.158718396
+1428.290598 , -1351.35 , 8.826668396
+1428.290598 , -1158.3 , 12.4946184
+1428.290598 , -965.25 , 16.1625684
+1428.290598 , -772.2 , 19.8305184
+1428.290598 , -579.15 , 23.4984684
+1428.290598 , -386.1 , 27.1664184
+1428.290598 , -193.05 , 30.8343684
+1428.290598 , 0 , 34.5023184
+1428.290598 , 193.05 , 38.1702684
+1428.290598 , 386.1 , 41.8382184
+1428.290598 , 579.15 , 45.5061684
+1428.290598 , 772.2 , 49.1741184
+1428.290598 , 965.25 , 52.8420684
+1428.290598 , 1158.3 , 56.5100184
+1428.290598 , 1351.35 , 60.1779684
+1428.290598 , 1544.4 , 63.8459184
+1428.290598 , 1737.45 , 67.5138684
+1428.290598 , 1930.5 , 71.1818184
+1428.290598 , 2123.55 , 74.8497684
+1428.290598 , 2316.6 , 78.5177184
+1428.290598 , 2509.65 , 82.1856684
+1428.290598 , 2702.7 , 85.8536184
+1428.290598 , 2895.75 , 89.5215684
+1428.290598 , 3088.8 , 93.1895184
+1428.290598 , 3281.85 , 96.8574684
+1428.290598 , 3474.9 , 100.5254184
+1428.290598 , 3667.95 , 104.1933684
+1428.290598 , 3861 , 107.8613184
+1428.290598 , 4054.05 , 111.5292684
+1428.290598 , 4247.1 , 115.1972184
+1428.290598 , 4440.15 , 118.8651684
+1428.290598 , 4633.2 , 122.5331184
+1428.290598 , 4826.25 , 126.2010684
+1428.290598 , 5019.3 , 129.8690184
+1428.290598 , 5212.35 , 133.5369684
+1428.290598 , 5405.4 , 137.2049184
+1428.290598 , 5598.45 , 140.8728684
+1428.290598 , 5791.5 , 144.5408184
+1428.290598 , 5984.55 , 148.2087684
+1428.290598 , 6177.6 , 151.8767184
+1632.393162 , -6177.6 , 79.97209441
+1632.393162 , -5984.55 , 76.30414441
+1632.393162 , -5791.5 , 72.63619441
+1632.393162 , -5598.45 , 68.96824441
+1632.393162 , -5405.4 , 65.30029441
+1632.393162 , -5212.35 , 61.63234441
+1632.393162 , -5019.3 , 57.96439441
+1632.393162 , -4826.25 , 54.29644441
+1632.393162 , -4633.2 , 50.62849441
+1632.393162 , -4440.15 , 46.96054441
+1632.393162 , -4247.1 , 43.29259441
+1632.393162 , -4054.05 , 39.62464441
+1632.393162 , -3861 , 35.95669441
+1632.393162 , -3667.95 , 32.28874441
+1632.393162 , -3474.9 , 28.62079441
+1632.393162 , -3281.85 , 24.95284441
+1632.393162 , -3088.8 , 21.28489441
+1632.393162 , -2895.75 , 17.61694441
+1632.393162 , -2702.7 , 13.94899441
+1632.393162 , -2509.65 , 10.28104441
+1632.393162 , -2316.6 , 6.613094406
+1632.393162 , -2123.55 , 2.945144406
+1632.393162 , -1930.5 , 0.722805594
+1632.393162 , -1737.45 , 4.390755594
+1632.393162 , -1544.4 , 8.058705594
+1632.393162 , -1351.35 , 11.72665559
+1632.393162 , -1158.3 , 15.39460559
+1632.393162 , -965.25 , 19.06255559
+1632.393162 , -772.2 , 22.73050559
+1632.393162 , -579.15 , 26.39845559
+1632.393162 , -386.1 , 30.06640559
+1632.393162 , -193.05 , 33.73435559
+1632.393162 , 0 , 37.40230559
+1632.393162 , 193.05 , 41.07025559
+1632.393162 , 386.1 , 44.73820559
+1632.393162 , 579.15 , 48.40615559
+1632.393162 , 772.2 , 52.07410559
+1632.393162 , 965.25 , 55.74205559
+1632.393162 , 1158.3 , 59.41000559
+1632.393162 , 1351.35 , 63.07795559
+1632.393162 , 1544.4 , 66.74590559
+1632.393162 , 1737.45 , 70.41385559
+1632.393162 , 1930.5 , 74.08180559
+1632.393162 , 2123.55 , 77.74975559
+1632.393162 , 2316.6 , 81.41770559
+1632.393162 , 2509.65 , 85.08565559
+1632.393162 , 2702.7 , 88.75360559
+1632.393162 , 2895.75 , 92.42155559
+1632.393162 , 3088.8 , 96.08950559
+1632.393162 , 3281.85 , 99.75745559
+1632.393162 , 3474.9 , 103.4254056
+1632.393162 , 3667.95 , 107.0933556
+1632.393162 , 3861 , 110.7613056
+1632.393162 , 4054.05 , 114.4292556
+1632.393162 , 4247.1 , 118.0972056
+1632.393162 , 4440.15 , 121.7651556
+1632.393162 , 4633.2 , 125.4331056
+1632.393162 , 4826.25 , 129.1010556
+1632.393162 , 5019.3 , 132.7690056
+1632.393162 , 5212.35 , 136.4369556
+1632.393162 , 5405.4 , 140.1049056
+1632.393162 , 5598.45 , 143.7728556
+1632.393162 , 5791.5 , 147.4408056
+1632.393162 , 5984.55 , 151.1087556
+1632.393162 , 6177.6 , 154.7767056
+1836.410256 , -6177.6 , 77.07332161
+1836.410256 , -5984.55 , 73.40537161
+1836.410256 , -5791.5 , 69.73742161
+1836.410256 , -5598.45 , 66.06947161
+1836.410256 , -5405.4 , 62.40152161
+1836.410256 , -5212.35 , 58.73357161
+1836.410256 , -5019.3 , 55.06562161
+1836.410256 , -4826.25 , 51.39767161
+1836.410256 , -4633.2 , 47.72972161
+1836.410256 , -4440.15 , 44.06177161
+1836.410256 , -4247.1 , 40.39382161
+1836.410256 , -4054.05 , 36.72587161
+1836.410256 , -3861 , 33.05792161
+1836.410256 , -3667.95 , 29.38997161
+1836.410256 , -3474.9 , 25.72202161
+1836.410256 , -3281.85 , 22.05407161
+1836.410256 , -3088.8 , 18.38612161
+1836.410256 , -2895.75 , 14.71817161
+1836.410256 , -2702.7 , 11.05022161
+1836.410256 , -2509.65 , 7.382271606
+1836.410256 , -2316.6 , 3.714321606
+1836.410256 , -2123.55 , 0.046371606
+1836.410256 , -1930.5 , 3.621578394
+1836.410256 , -1737.45 , 7.289528394
+1836.410256 , -1544.4 , 10.95747839
+1836.410256 , -1351.35 , 14.62542839
+1836.410256 , -1158.3 , 18.29337839
+1836.410256 , -965.25 , 21.96132839
+1836.410256 , -772.2 , 25.62927839
+1836.410256 , -579.15 , 29.29722839
+1836.410256 , -386.1 , 32.96517839
+1836.410256 , -193.05 , 36.63312839
+1836.410256 , 0 , 40.30107839
+1836.410256 , 193.05 , 43.96902839
+1836.410256 , 386.1 , 47.63697839
+1836.410256 , 579.15 , 51.30492839
+1836.410256 , 772.2 , 54.97287839
+1836.410256 , 965.25 , 58.64082839
+1836.410256 , 1158.3 , 62.30877839
+1836.410256 , 1351.35 , 65.97672839
+1836.410256 , 1544.4 , 69.64467839
+1836.410256 , 1737.45 , 73.31262839
+1836.410256 , 1930.5 , 76.98057839
+1836.410256 , 2123.55 , 80.64852839
+1836.410256 , 2316.6 , 84.31647839
+1836.410256 , 2509.65 , 87.98442839
+1836.410256 , 2702.7 , 91.65237839
+1836.410256 , 2895.75 , 95.32032839
+1836.410256 , 3088.8 , 98.98827839
+1836.410256 , 3281.85 , 102.6562284
+1836.410256 , 3474.9 , 106.3241784
+1836.410256 , 3667.95 , 109.9921284
+1836.410256 , 3861 , 113.6600784
+1836.410256 , 4054.05 , 117.3280284
+1836.410256 , 4247.1 , 120.9959784
+1836.410256 , 4440.15 , 124.6639284
+1836.410256 , 4633.2 , 128.3318784
+1836.410256 , 4826.25 , 131.9998284
+1836.410256 , 5019.3 , 135.6677784
+1836.410256 , 5212.35 , 139.3357284
+1836.410256 , 5405.4 , 143.0036784
+1836.410256 , 5598.45 , 146.6716284
+1836.410256 , 5791.5 , 150.3395784
+1836.410256 , 5984.55 , 154.0075284
+1836.410256 , 6177.6 , 157.6754784
+2040.42735 , -6177.6 , 74.17454881
+2040.42735 , -5984.55 , 70.50659881
+2040.42735 , -5791.5 , 66.83864881
+2040.42735 , -5598.45 , 63.17069881
+2040.42735 , -5405.4 , 59.50274881
+2040.42735 , -5212.35 , 55.83479881
+2040.42735 , -5019.3 , 52.16684881
+2040.42735 , -4826.25 , 48.49889881
+2040.42735 , -4633.2 , 44.83094881
+2040.42735 , -4440.15 , 41.16299881
+2040.42735 , -4247.1 , 37.49504881
+2040.42735 , -4054.05 , 33.82709881
+2040.42735 , -3861 , 30.15914881
+2040.42735 , -3667.95 , 26.49119881
+2040.42735 , -3474.9 , 22.82324881
+2040.42735 , -3281.85 , 19.15529881
+2040.42735 , -3088.8 , 15.48734881
+2040.42735 , -2895.75 , 11.81939881
+2040.42735 , -2702.7 , 8.151448806
+2040.42735 , -2509.65 , 4.483498806
+2040.42735 , -2316.6 , 0.815548806
+2040.42735 , -2123.55 , 2.852401194
+2040.42735 , -1930.5 , 6.520351194
+2040.42735 , -1737.45 , 10.18830119
+2040.42735 , -1544.4 , 13.85625119
+2040.42735 , -1351.35 , 17.52420119
+2040.42735 , -1158.3 , 21.19215119
+2040.42735 , -965.25 , 24.86010119
+2040.42735 , -772.2 , 28.52805119
+2040.42735 , -579.15 , 32.19600119
+2040.42735 , -386.1 , 35.86395119
+2040.42735 , -193.05 , 39.53190119
+2040.42735 , 0 , 43.19985119
+2040.42735 , 193.05 , 46.86780119
+2040.42735 , 386.1 , 50.53575119
+2040.42735 , 579.15 , 54.20370119
+2040.42735 , 772.2 , 57.87165119
+2040.42735 , 965.25 , 61.53960119
+2040.42735 , 1158.3 , 65.20755119
+2040.42735 , 1351.35 , 68.87550119
+2040.42735 , 1544.4 , 72.54345119
+2040.42735 , 1737.45 , 76.21140119
+2040.42735 , 1930.5 , 79.87935119
+2040.42735 , 2123.55 , 83.54730119
+2040.42735 , 2316.6 , 87.21525119
+2040.42735 , 2509.65 , 90.88320119
+2040.42735 , 2702.7 , 94.55115119
+2040.42735 , 2895.75 , 98.21910119
+2040.42735 , 3088.8 , 101.8870512
+2040.42735 , 3281.85 , 105.5550012
+2040.42735 , 3474.9 , 109.2229512
+2040.42735 , 3667.95 , 112.8909012
+2040.42735 , 3861 , 116.5588512
+2040.42735 , 4054.05 , 120.2268012
+2040.42735 , 4247.1 , 123.8947512
+2040.42735 , 4440.15 , 127.5627012
+2040.42735 , 4633.2 , 131.2306512
+2040.42735 , 4826.25 , 134.8986012
+2040.42735 , 5019.3 , 138.5665512
+2040.42735 , 5212.35 , 142.2345012
+2040.42735 , 5405.4 , 145.9024512
+2040.42735 , 5598.45 , 149.5704012
+2040.42735 , 5791.5 , 153.2383512
+2040.42735 , 5984.55 , 156.9063012
+2040.42735 , 6177.6 , 160.5742512
+2244.529915 , -6177.6 , 71.27456159
+2244.529915 , -5984.55 , 67.60661159
+2244.529915 , -5791.5 , 63.93866159
+2244.529915 , -5598.45 , 60.27071159
+2244.529915 , -5405.4 , 56.60276159
+2244.529915 , -5212.35 , 52.93481159
+2244.529915 , -5019.3 , 49.26686159
+2244.529915 , -4826.25 , 45.59891159
+2244.529915 , -4633.2 , 41.93096159
+2244.529915 , -4440.15 , 38.26301159
+2244.529915 , -4247.1 , 34.59506159
+2244.529915 , -4054.05 , 30.92711159
+2244.529915 , -3861 , 27.25916159
+2244.529915 , -3667.95 , 23.59121159
+2244.529915 , -3474.9 , 19.92326159
+2244.529915 , -3281.85 , 16.25531159
+2244.529915 , -3088.8 , 12.58736159
+2244.529915 , -2895.75 , 8.919411593
+2244.529915 , -2702.7 , 5.251461593
+2244.529915 , -2509.65 , 1.583511593
+2244.529915 , -2316.6 , 2.084438407
+2244.529915 , -2123.55 , 5.752388407
+2244.529915 , -1930.5 , 9.420338407
+2244.529915 , -1737.45 , 13.08828841
+2244.529915 , -1544.4 , 16.75623841
+2244.529915 , -1351.35 , 20.42418841
+2244.529915 , -1158.3 , 24.09213841
+2244.529915 , -965.25 , 27.76008841
+2244.529915 , -772.2 , 31.42803841
+2244.529915 , -579.15 , 35.09598841
+2244.529915 , -386.1 , 38.76393841
+2244.529915 , -193.05 , 42.43188841
+2244.529915 , 0 , 46.09983841
+2244.529915 , 193.05 , 49.76778841
+2244.529915 , 386.1 , 53.43573841
+2244.529915 , 579.15 , 57.10368841
+2244.529915 , 772.2 , 60.77163841
+2244.529915 , 965.25 , 64.43958841
+2244.529915 , 1158.3 , 68.10753841
+2244.529915 , 1351.35 , 71.77548841
+2244.529915 , 1544.4 , 75.44343841
+2244.529915 , 1737.45 , 79.11138841
+2244.529915 , 1930.5 , 82.77933841
+2244.529915 , 2123.55 , 86.44728841
+2244.529915 , 2316.6 , 90.11523841
+2244.529915 , 2509.65 , 93.78318841
+2244.529915 , 2702.7 , 97.45113841
+2244.529915 , 2895.75 , 101.1190884
+2244.529915 , 3088.8 , 104.7870384
+2244.529915 , 3281.85 , 108.4549884
+2244.529915 , 3474.9 , 112.1229384
+2244.529915 , 3667.95 , 115.7908884
+2244.529915 , 3861 , 119.4588384
+2244.529915 , 4054.05 , 123.1267884
+2244.529915 , 4247.1 , 126.7947384
+2244.529915 , 4440.15 , 130.4626884
+2244.529915 , 4633.2 , 134.1306384
+2244.529915 , 4826.25 , 137.7985884
+2244.529915 , 5019.3 , 141.4665384
+2244.529915 , 5212.35 , 145.1344884
+2244.529915 , 5405.4 , 148.8024384
+2244.529915 , 5598.45 , 152.4703884
+2244.529915 , 5791.5 , 156.1383384
+2244.529915 , 5984.55 , 159.8062884
+2244.529915 , 6177.6 , 163.4742384
+2448.547009 , -6177.6 , 68.37578879
+2448.547009 , -5984.55 , 64.70783879
+2448.547009 , -5791.5 , 61.03988879
+2448.547009 , -5598.45 , 57.37193879
+2448.547009 , -5405.4 , 53.70398879
+2448.547009 , -5212.35 , 50.03603879
+2448.547009 , -5019.3 , 46.36808879
+2448.547009 , -4826.25 , 42.70013879
+2448.547009 , -4633.2 , 39.03218879
+2448.547009 , -4440.15 , 35.36423879
+2448.547009 , -4247.1 , 31.69628879
+2448.547009 , -4054.05 , 28.02833879
+2448.547009 , -3861 , 24.36038879
+2448.547009 , -3667.95 , 20.69243879
+2448.547009 , -3474.9 , 17.02448879
+2448.547009 , -3281.85 , 13.35653879
+2448.547009 , -3088.8 , 9.688588794
+2448.547009 , -2895.75 , 6.020638794
+2448.547009 , -2702.7 , 2.352688794
+2448.547009 , -2509.65 , 1.315261206
+2448.547009 , -2316.6 , 4.983211206
+2448.547009 , -2123.55 , 8.651161206
+2448.547009 , -1930.5 , 12.31911121
+2448.547009 , -1737.45 , 15.98706121
+2448.547009 , -1544.4 , 19.65501121
+2448.547009 , -1351.35 , 23.32296121
+2448.547009 , -1158.3 , 26.99091121
+2448.547009 , -965.25 , 30.65886121
+2448.547009 , -772.2 , 34.32681121
+2448.547009 , -579.15 , 37.99476121
+2448.547009 , -386.1 , 41.66271121
+2448.547009 , -193.05 , 45.33066121
+2448.547009 , 0 , 48.99861121
+2448.547009 , 193.05 , 52.66656121
+2448.547009 , 386.1 , 56.33451121
+2448.547009 , 579.15 , 60.00246121
+2448.547009 , 772.2 , 63.67041121
+2448.547009 , 965.25 , 67.33836121
+2448.547009 , 1158.3 , 71.00631121
+2448.547009 , 1351.35 , 74.67426121
+2448.547009 , 1544.4 , 78.34221121
+2448.547009 , 1737.45 , 82.01016121
+2448.547009 , 1930.5 , 85.67811121
+2448.547009 , 2123.55 , 89.34606121
+2448.547009 , 2316.6 , 93.01401121
+2448.547009 , 2509.65 , 96.68196121
+2448.547009 , 2702.7 , 100.3499112
+2448.547009 , 2895.75 , 104.0178612
+2448.547009 , 3088.8 , 107.6858112
+2448.547009 , 3281.85 , 111.3537612
+2448.547009 , 3474.9 , 115.0217112
+2448.547009 , 3667.95 , 118.6896612
+2448.547009 , 3861 , 122.3576112
+2448.547009 , 4054.05 , 126.0255612
+2448.547009 , 4247.1 , 129.6935112
+2448.547009 , 4440.15 , 133.3614612
+2448.547009 , 4633.2 , 137.0294112
+2448.547009 , 4826.25 , 140.6973612
+2448.547009 , 5019.3 , 144.3653112
+2448.547009 , 5212.35 , 148.0332612
+2448.547009 , 5405.4 , 151.7012112
+2448.547009 , 5598.45 , 155.3691612
+2448.547009 , 5791.5 , 159.0371112
+2448.547009 , 5984.55 , 162.7050612
+2448.547009 , 6177.6 , 166.3730112
+2652.564103 , -6177.6 , 65.47701599
+2652.564103 , -5984.55 , 61.80906599
+2652.564103 , -5791.5 , 58.14111599
+2652.564103 , -5598.45 , 54.47316599
+2652.564103 , -5405.4 , 50.80521599
+2652.564103 , -5212.35 , 47.13726599
+2652.564103 , -5019.3 , 43.46931599
+2652.564103 , -4826.25 , 39.80136599
+2652.564103 , -4633.2 , 36.13341599
+2652.564103 , -4440.15 , 32.46546599
+2652.564103 , -4247.1 , 28.79751599
+2652.564103 , -4054.05 , 25.12956599
+2652.564103 , -3861 , 21.46161599
+2652.564103 , -3667.95 , 17.79366599
+2652.564103 , -3474.9 , 14.12571599
+2652.564103 , -3281.85 , 10.45776599
+2652.564103 , -3088.8 , 6.789815994
+2652.564103 , -2895.75 , 3.121865994
+2652.564103 , -2702.7 , 0.546084006
+2652.564103 , -2509.65 , 4.214034006
+2652.564103 , -2316.6 , 7.881984006
+2652.564103 , -2123.55 , 11.54993401
+2652.564103 , -1930.5 , 15.21788401
+2652.564103 , -1737.45 , 18.88583401
+2652.564103 , -1544.4 , 22.55378401
+2652.564103 , -1351.35 , 26.22173401
+2652.564103 , -1158.3 , 29.88968401
+2652.564103 , -965.25 , 33.55763401
+2652.564103 , -772.2 , 37.22558401
+2652.564103 , -579.15 , 40.89353401
+2652.564103 , -386.1 , 44.56148401
+2652.564103 , -193.05 , 48.22943401
+2652.564103 , 0 , 51.89738401
+2652.564103 , 193.05 , 55.56533401
+2652.564103 , 386.1 , 59.23328401
+2652.564103 , 579.15 , 62.90123401
+2652.564103 , 772.2 , 66.56918401
+2652.564103 , 965.25 , 70.23713401
+2652.564103 , 1158.3 , 73.90508401
+2652.564103 , 1351.35 , 77.57303401
+2652.564103 , 1544.4 , 81.24098401
+2652.564103 , 1737.45 , 84.90893401
+2652.564103 , 1930.5 , 88.57688401
+2652.564103 , 2123.55 , 92.24483401
+2652.564103 , 2316.6 , 95.91278401
+2652.564103 , 2509.65 , 99.58073401
+2652.564103 , 2702.7 , 103.248684
+2652.564103 , 2895.75 , 106.916634
+2652.564103 , 3088.8 , 110.584584
+2652.564103 , 3281.85 , 114.252534
+2652.564103 , 3474.9 , 117.920484
+2652.564103 , 3667.95 , 121.588434
+2652.564103 , 3861 , 125.256384
+2652.564103 , 4054.05 , 128.924334
+2652.564103 , 4247.1 , 132.592284
+2652.564103 , 4440.15 , 136.260234
+2652.564103 , 4633.2 , 139.928184
+2652.564103 , 4826.25 , 143.596134
+2652.564103 , 5019.3 , 147.264084
+2652.564103 , 5212.35 , 150.932034
+2652.564103 , 5405.4 , 154.599984
+2652.564103 , 5598.45 , 158.267934
+2652.564103 , 5791.5 , 161.935884
+2652.564103 , 5984.55 , 165.603834
+2652.564103 , 6177.6 , 169.271784
+2856.666667 , -6177.6 , 62.5770288
+2856.666667 , -5984.55 , 58.9090788
+2856.666667 , -5791.5 , 55.2411288
+2856.666667 , -5598.45 , 51.5731788
+2856.666667 , -5405.4 , 47.9052288
+2856.666667 , -5212.35 , 44.2372788
+2856.666667 , -5019.3 , 40.5693288
+2856.666667 , -4826.25 , 36.9013788
+2856.666667 , -4633.2 , 33.2334288
+2856.666667 , -4440.15 , 29.5654788
+2856.666667 , -4247.1 , 25.8975288
+2856.666667 , -4054.05 , 22.2295788
+2856.666667 , -3861 , 18.5616288
+2856.666667 , -3667.95 , 14.8936788
+2856.666667 , -3474.9 , 11.2257288
+2856.666667 , -3281.85 , 7.557778795
+2856.666667 , -3088.8 , 3.889828795
+2856.666667 , -2895.75 , 0.221878795
+2856.666667 , -2702.7 , 3.446071205
+2856.666667 , -2509.65 , 7.114021205
+2856.666667 , -2316.6 , 10.7819712
+2856.666667 , -2123.55 , 14.4499212
+2856.666667 , -1930.5 , 18.1178712
+2856.666667 , -1737.45 , 21.7858212
+2856.666667 , -1544.4 , 25.4537712
+2856.666667 , -1351.35 , 29.1217212
+2856.666667 , -1158.3 , 32.7896712
+2856.666667 , -965.25 , 36.4576212
+2856.666667 , -772.2 , 40.1255712
+2856.666667 , -579.15 , 43.7935212
+2856.666667 , -386.1 , 47.4614712
+2856.666667 , -193.05 , 51.1294212
+2856.666667 , 0 , 54.7973712
+2856.666667 , 193.05 , 58.4653212
+2856.666667 , 386.1 , 62.1332712
+2856.666667 , 579.15 , 65.8012212
+2856.666667 , 772.2 , 69.4691712
+2856.666667 , 965.25 , 73.1371212
+2856.666667 , 1158.3 , 76.8050712
+2856.666667 , 1351.35 , 80.4730212
+2856.666667 , 1544.4 , 84.1409712
+2856.666667 , 1737.45 , 87.8089212
+2856.666667 , 1930.5 , 91.4768712
+2856.666667 , 2123.55 , 95.1448212
+2856.666667 , 2316.6 , 98.8127712
+2856.666667 , 2509.65 , 102.4807212
+2856.666667 , 2702.7 , 106.1486712
+2856.666667 , 2895.75 , 109.8166212
+2856.666667 , 3088.8 , 113.4845712
+2856.666667 , 3281.85 , 117.1525212
+2856.666667 , 3474.9 , 120.8204712
+2856.666667 , 3667.95 , 124.4884212
+2856.666667 , 3861 , 128.1563712
+2856.666667 , 4054.05 , 131.8243212
+2856.666667 , 4247.1 , 135.4922712
+2856.666667 , 4440.15 , 139.1602212
+2856.666667 , 4633.2 , 142.8281712
+2856.666667 , 4826.25 , 146.4961212
+2856.666667 , 5019.3 , 150.1640712
+2856.666667 , 5212.35 , 153.8320212
+2856.666667 , 5405.4 , 157.4999712
+2856.666667 , 5598.45 , 161.1679212
+2856.666667 , 5791.5 , 164.8358712
+2856.666667 , 5984.55 , 168.5038212
+2856.666667 , 6177.6 , 172.1717712
+3060.683761 , -6177.6 , 59.678256
+3060.683761 , -5984.55 , 56.010306
+3060.683761 , -5791.5 , 52.342356
+3060.683761 , -5598.45 , 48.674406
+3060.683761 , -5405.4 , 45.006456
+3060.683761 , -5212.35 , 41.338506
+3060.683761 , -5019.3 , 37.670556
+3060.683761 , -4826.25 , 34.002606
+3060.683761 , -4633.2 , 30.334656
+3060.683761 , -4440.15 , 26.666706
+3060.683761 , -4247.1 , 22.998756
+3060.683761 , -4054.05 , 19.330806
+3060.683761 , -3861 , 15.662856
+3060.683761 , -3667.95 , 11.994906
+3060.683761 , -3474.9 , 8.326955996
+3060.683761 , -3281.85 , 4.659005996
+3060.683761 , -3088.8 , 0.991055996
+3060.683761 , -2895.75 , 2.676894004
+3060.683761 , -2702.7 , 6.344844004
+3060.683761 , -2509.65 , 10.012794
+3060.683761 , -2316.6 , 13.680744
+3060.683761 , -2123.55 , 17.348694
+3060.683761 , -1930.5 , 21.016644
+3060.683761 , -1737.45 , 24.684594
+3060.683761 , -1544.4 , 28.352544
+3060.683761 , -1351.35 , 32.020494
+3060.683761 , -1158.3 , 35.688444
+3060.683761 , -965.25 , 39.356394
+3060.683761 , -772.2 , 43.024344
+3060.683761 , -579.15 , 46.692294
+3060.683761 , -386.1 , 50.360244
+3060.683761 , -193.05 , 54.028194
+3060.683761 , 0 , 57.696144
+3060.683761 , 193.05 , 61.364094
+3060.683761 , 386.1 , 65.032044
+3060.683761 , 579.15 , 68.699994
+3060.683761 , 772.2 , 72.367944
+3060.683761 , 965.25 , 76.035894
+3060.683761 , 1158.3 , 79.703844
+3060.683761 , 1351.35 , 83.371794
+3060.683761 , 1544.4 , 87.039744
+3060.683761 , 1737.45 , 90.707694
+3060.683761 , 1930.5 , 94.375644
+3060.683761 , 2123.55 , 98.043594
+3060.683761 , 2316.6 , 101.711544
+3060.683761 , 2509.65 , 105.379494
+3060.683761 , 2702.7 , 109.047444
+3060.683761 , 2895.75 , 112.715394
+3060.683761 , 3088.8 , 116.383344
+3060.683761 , 3281.85 , 120.051294
+3060.683761 , 3474.9 , 123.719244
+3060.683761 , 3667.95 , 127.387194
+3060.683761 , 3861 , 131.055144
+3060.683761 , 4054.05 , 134.723094
+3060.683761 , 4247.1 , 138.391044
+3060.683761 , 4440.15 , 142.058994
+3060.683761 , 4633.2 , 145.726944
+3060.683761 , 4826.25 , 149.394894
+3060.683761 , 5019.3 , 153.062844
+3060.683761 , 5212.35 , 156.730794
+3060.683761 , 5405.4 , 160.398744
+3060.683761 , 5598.45 , 164.066694
+3060.683761 , 5791.5 , 167.734644
+3060.683761 , 5984.55 , 171.402594
+3060.683761 , 6177.6 , 175.070544
+3264.700855 , -6177.6 , 56.7794832
+3264.700855 , -5984.55 , 53.1115332
+3264.700855 , -5791.5 , 49.4435832
+3264.700855 , -5598.45 , 45.7756332
+3264.700855 , -5405.4 , 42.1076832
+3264.700855 , -5212.35 , 38.4397332
+3264.700855 , -5019.3 , 34.7717832
+3264.700855 , -4826.25 , 31.1038332
+3264.700855 , -4633.2 , 27.4358832
+3264.700855 , -4440.15 , 23.7679332
+3264.700855 , -4247.1 , 20.0999832
+3264.700855 , -4054.05 , 16.4320332
+3264.700855 , -3861 , 12.7640832
+3264.700855 , -3667.95 , 9.096133196
+3264.700855 , -3474.9 , 5.428183196
+3264.700855 , -3281.85 , 1.760233196
+3264.700855 , -3088.8 , 1.907716804
+3264.700855 , -2895.75 , 5.575666804
+3264.700855 , -2702.7 , 9.243616804
+3264.700855 , -2509.65 , 12.9115668
+3264.700855 , -2316.6 , 16.5795168
+3264.700855 , -2123.55 , 20.2474668
+3264.700855 , -1930.5 , 23.9154168
+3264.700855 , -1737.45 , 27.5833668
+3264.700855 , -1544.4 , 31.2513168
+3264.700855 , -1351.35 , 34.9192668
+3264.700855 , -1158.3 , 38.5872168
+3264.700855 , -965.25 , 42.2551668
+3264.700855 , -772.2 , 45.9231168
+3264.700855 , -579.15 , 49.5910668
+3264.700855 , -386.1 , 53.2590168
+3264.700855 , -193.05 , 56.9269668
+3264.700855 , 0 , 60.5949168
+3264.700855 , 193.05 , 64.2628668
+3264.700855 , 386.1 , 67.9308168
+3264.700855 , 579.15 , 71.5987668
+3264.700855 , 772.2 , 75.2667168
+3264.700855 , 965.25 , 78.9346668
+3264.700855 , 1158.3 , 82.6026168
+3264.700855 , 1351.35 , 86.2705668
+3264.700855 , 1544.4 , 89.9385168
+3264.700855 , 1737.45 , 93.6064668
+3264.700855 , 1930.5 , 97.2744168
+3264.700855 , 2123.55 , 100.9423668
+3264.700855 , 2316.6 , 104.6103168
+3264.700855 , 2509.65 , 108.2782668
+3264.700855 , 2702.7 , 111.9462168
+3264.700855 , 2895.75 , 115.6141668
+3264.700855 , 3088.8 , 119.2821168
+3264.700855 , 3281.85 , 122.9500668
+3264.700855 , 3474.9 , 126.6180168
+3264.700855 , 3667.95 , 130.2859668
+3264.700855 , 3861 , 133.9539168
+3264.700855 , 4054.05 , 137.6218668
+3264.700855 , 4247.1 , 141.2898168
+3264.700855 , 4440.15 , 144.9577668
+3264.700855 , 4633.2 , 148.6257168
+3264.700855 , 4826.25 , 152.2936668
+3264.700855 , 5019.3 , 155.9616168
+3264.700855 , 5212.35 , 159.6295668
+3264.700855 , 5405.4 , 163.2975168
+3264.700855 , 5598.45 , 166.9654668
+3264.700855 , 5791.5 , 170.6334168
+3264.700855 , 5984.55 , 174.3013668
+3264.700855 , 6177.6 , 177.9693168
+3468.803419 , -6177.6 , 53.879496
+3468.803419 , -5984.55 , 50.211546
+3468.803419 , -5791.5 , 46.543596
+3468.803419 , -5598.45 , 42.875646
+3468.803419 , -5405.4 , 39.207696
+3468.803419 , -5212.35 , 35.539746
+3468.803419 , -5019.3 , 31.871796
+3468.803419 , -4826.25 , 28.203846
+3468.803419 , -4633.2 , 24.535896
+3468.803419 , -4440.15 , 20.867946
+3468.803419 , -4247.1 , 17.199996
+3468.803419 , -4054.05 , 13.532046
+3468.803419 , -3861 , 9.864095997
+3468.803419 , -3667.95 , 6.196145997
+3468.803419 , -3474.9 , 2.528195997
+3468.803419 , -3281.85 , 1.139754003
+3468.803419 , -3088.8 , 4.807704003
+3468.803419 , -2895.75 , 8.475654003
+3468.803419 , -2702.7 , 12.143604
+3468.803419 , -2509.65 , 15.811554
+3468.803419 , -2316.6 , 19.479504
+3468.803419 , -2123.55 , 23.147454
+3468.803419 , -1930.5 , 26.815404
+3468.803419 , -1737.45 , 30.483354
+3468.803419 , -1544.4 , 34.151304
+3468.803419 , -1351.35 , 37.819254
+3468.803419 , -1158.3 , 41.487204
+3468.803419 , -965.25 , 45.155154
+3468.803419 , -772.2 , 48.823104
+3468.803419 , -579.15 , 52.491054
+3468.803419 , -386.1 , 56.159004
+3468.803419 , -193.05 , 59.826954
+3468.803419 , 0 , 63.494904
+3468.803419 , 193.05 , 67.162854
+3468.803419 , 386.1 , 70.830804
+3468.803419 , 579.15 , 74.498754
+3468.803419 , 772.2 , 78.166704
+3468.803419 , 965.25 , 81.834654
+3468.803419 , 1158.3 , 85.502604
+3468.803419 , 1351.35 , 89.170554
+3468.803419 , 1544.4 , 92.838504
+3468.803419 , 1737.45 , 96.506454
+3468.803419 , 1930.5 , 100.174404
+3468.803419 , 2123.55 , 103.842354
+3468.803419 , 2316.6 , 107.510304
+3468.803419 , 2509.65 , 111.178254
+3468.803419 , 2702.7 , 114.846204
+3468.803419 , 2895.75 , 118.514154
+3468.803419 , 3088.8 , 122.182104
+3468.803419 , 3281.85 , 125.850054
+3468.803419 , 3474.9 , 129.518004
+3468.803419 , 3667.95 , 133.185954
+3468.803419 , 3861 , 136.853904
+3468.803419 , 4054.05 , 140.521854
+3468.803419 , 4247.1 , 144.189804
+3468.803419 , 4440.15 , 147.857754
+3468.803419 , 4633.2 , 151.525704
+3468.803419 , 4826.25 , 155.193654
+3468.803419 , 5019.3 , 158.861604
+3468.803419 , 5212.35 , 162.529554
+3468.803419 , 5405.4 , 166.197504
+3468.803419 , 5598.45 , 169.865454
+3468.803419 , 5791.5 , 173.533404
+3468.803419 , 5984.55 , 177.201354
+3468.803419 , 6177.6 , 180.869304
+3672.820513 , -6177.6 , 50.9807232
+3672.820513 , -5984.55 , 47.3127732
+3672.820513 , -5791.5 , 43.6448232
+3672.820513 , -5598.45 , 39.9768732
+3672.820513 , -5405.4 , 36.3089232
+3672.820513 , -5212.35 , 32.6409732
+3672.820513 , -5019.3 , 28.9730232
+3672.820513 , -4826.25 , 25.3050732
+3672.820513 , -4633.2 , 21.6371232
+3672.820513 , -4440.15 , 17.9691732
+3672.820513 , -4247.1 , 14.3012232
+3672.820513 , -4054.05 , 10.6332732
+3672.820513 , -3861 , 6.965323197
+3672.820513 , -3667.95 , 3.297373197
+3672.820513 , -3474.9 , 0.370576803
+3672.820513 , -3281.85 , 4.038526803
+3672.820513 , -3088.8 , 7.706476803
+3672.820513 , -2895.75 , 11.3744268
+3672.820513 , -2702.7 , 15.0423768
+3672.820513 , -2509.65 , 18.7103268
+3672.820513 , -2316.6 , 22.3782768
+3672.820513 , -2123.55 , 26.0462268
+3672.820513 , -1930.5 , 29.7141768
+3672.820513 , -1737.45 , 33.3821268
+3672.820513 , -1544.4 , 37.0500768
+3672.820513 , -1351.35 , 40.7180268
+3672.820513 , -1158.3 , 44.3859768
+3672.820513 , -965.25 , 48.0539268
+3672.820513 , -772.2 , 51.7218768
+3672.820513 , -579.15 , 55.3898268
+3672.820513 , -386.1 , 59.0577768
+3672.820513 , -193.05 , 62.7257268
+3672.820513 , 0 , 66.3936768
+3672.820513 , 193.05 , 70.0616268
+3672.820513 , 386.1 , 73.7295768
+3672.820513 , 579.15 , 77.3975268
+3672.820513 , 772.2 , 81.0654768
+3672.820513 , 965.25 , 84.7334268
+3672.820513 , 1158.3 , 88.4013768
+3672.820513 , 1351.35 , 92.0693268
+3672.820513 , 1544.4 , 95.7372768
+3672.820513 , 1737.45 , 99.4052268
+3672.820513 , 1930.5 , 103.0731768
+3672.820513 , 2123.55 , 106.7411268
+3672.820513 , 2316.6 , 110.4090768
+3672.820513 , 2509.65 , 114.0770268
+3672.820513 , 2702.7 , 117.7449768
+3672.820513 , 2895.75 , 121.4129268
+3672.820513 , 3088.8 , 125.0808768
+3672.820513 , 3281.85 , 128.7488268
+3672.820513 , 3474.9 , 132.4167768
+3672.820513 , 3667.95 , 136.0847268
+3672.820513 , 3861 , 139.7526768
+3672.820513 , 4054.05 , 143.4206268
+3672.820513 , 4247.1 , 147.0885768
+3672.820513 , 4440.15 , 150.7565268
+3672.820513 , 4633.2 , 154.4244768
+3672.820513 , 4826.25 , 158.0924268
+3672.820513 , 5019.3 , 161.7603768
+3672.820513 , 5212.35 , 165.4283268
+3672.820513 , 5405.4 , 169.0962768
+3672.820513 , 5598.45 , 172.7642268
+3672.820513 , 5791.5 , 176.4321768
+3672.820513 , 5984.55 , 180.1001268
+3672.820513 , 6177.6 , 183.7680768
+3876.837607 , -6177.6 , 48.0819504
+3876.837607 , -5984.55 , 44.4140004
+3876.837607 , -5791.5 , 40.7460504
+3876.837607 , -5598.45 , 37.0781004
+3876.837607 , -5405.4 , 33.4101504
+3876.837607 , -5212.35 , 29.7422004
+3876.837607 , -5019.3 , 26.0742504
+3876.837607 , -4826.25 , 22.4063004
+3876.837607 , -4633.2 , 18.7383504
+3876.837607 , -4440.15 , 15.0704004
+3876.837607 , -4247.1 , 11.4024504
+3876.837607 , -4054.05 , 7.734500398
+3876.837607 , -3861 , 4.066550398
+3876.837607 , -3667.95 , 0.398600398
+3876.837607 , -3474.9 , 3.269349602
+3876.837607 , -3281.85 , 6.937299602
+3876.837607 , -3088.8 , 10.6052496
+3876.837607 , -2895.75 , 14.2731996
+3876.837607 , -2702.7 , 17.9411496
+3876.837607 , -2509.65 , 21.6090996
+3876.837607 , -2316.6 , 25.2770496
+3876.837607 , -2123.55 , 28.9449996
+3876.837607 , -1930.5 , 32.6129496
+3876.837607 , -1737.45 , 36.2808996
+3876.837607 , -1544.4 , 39.9488496
+3876.837607 , -1351.35 , 43.6167996
+3876.837607 , -1158.3 , 47.2847496
+3876.837607 , -965.25 , 50.9526996
+3876.837607 , -772.2 , 54.6206496
+3876.837607 , -579.15 , 58.2885996
+3876.837607 , -386.1 , 61.9565496
+3876.837607 , -193.05 , 65.6244996
+3876.837607 , 0 , 69.2924496
+3876.837607 , 193.05 , 72.9603996
+3876.837607 , 386.1 , 76.6283496
+3876.837607 , 579.15 , 80.2962996
+3876.837607 , 772.2 , 83.9642496
+3876.837607 , 965.25 , 87.6321996
+3876.837607 , 1158.3 , 91.3001496
+3876.837607 , 1351.35 , 94.9680996
+3876.837607 , 1544.4 , 98.6360496
+3876.837607 , 1737.45 , 102.3039996
+3876.837607 , 1930.5 , 105.9719496
+3876.837607 , 2123.55 , 109.6398996
+3876.837607 , 2316.6 , 113.3078496
+3876.837607 , 2509.65 , 116.9757996
+3876.837607 , 2702.7 , 120.6437496
+3876.837607 , 2895.75 , 124.3116996
+3876.837607 , 3088.8 , 127.9796496
+3876.837607 , 3281.85 , 131.6475996
+3876.837607 , 3474.9 , 135.3155496
+3876.837607 , 3667.95 , 138.9834996
+3876.837607 , 3861 , 142.6514496
+3876.837607 , 4054.05 , 146.3193996
+3876.837607 , 4247.1 , 149.9873496
+3876.837607 , 4440.15 , 153.6552996
+3876.837607 , 4633.2 , 157.3232496
+3876.837607 , 4826.25 , 160.9911996
+3876.837607 , 5019.3 , 164.6591496
+3876.837607 , 5212.35 , 168.3270996
+3876.837607 , 5405.4 , 171.9950496
+3876.837607 , 5598.45 , 175.6629996
+3876.837607 , 5791.5 , 179.3309496
+3876.837607 , 5984.55 , 182.9988996
+3876.837607 , 6177.6 , 186.6668496
+4080.854701 , -6177.6 , 45.1831776
+4080.854701 , -5984.55 , 41.5152276
+4080.854701 , -5791.5 , 37.8472776
+4080.854701 , -5598.45 , 34.1793276
+4080.854701 , -5405.4 , 30.5113776
+4080.854701 , -5212.35 , 26.8434276
+4080.854701 , -5019.3 , 23.1754776
+4080.854701 , -4826.25 , 19.5075276
+4080.854701 , -4633.2 , 15.8395776
+4080.854701 , -4440.15 , 12.1716276
+4080.854701 , -4247.1 , 8.503677598
+4080.854701 , -4054.05 , 4.835727598
+4080.854701 , -3861 , 1.167777598
+4080.854701 , -3667.95 , 2.500172402
+4080.854701 , -3474.9 , 6.168122402
+4080.854701 , -3281.85 , 9.836072402
+4080.854701 , -3088.8 , 13.5040224
+4080.854701 , -2895.75 , 17.1719724
+4080.854701 , -2702.7 , 20.8399224
+4080.854701 , -2509.65 , 24.5078724
+4080.854701 , -2316.6 , 28.1758224
+4080.854701 , -2123.55 , 31.8437724
+4080.854701 , -1930.5 , 35.5117224
+4080.854701 , -1737.45 , 39.1796724
+4080.854701 , -1544.4 , 42.8476224
+4080.854701 , -1351.35 , 46.5155724
+4080.854701 , -1158.3 , 50.1835224
+4080.854701 , -965.25 , 53.8514724
+4080.854701 , -772.2 , 57.5194224
+4080.854701 , -579.15 , 61.1873724
+4080.854701 , -386.1 , 64.8553224
+4080.854701 , -193.05 , 68.5232724
+4080.854701 , 0 , 72.1912224
+4080.854701 , 193.05 , 75.8591724
+4080.854701 , 386.1 , 79.5271224
+4080.854701 , 579.15 , 83.1950724
+4080.854701 , 772.2 , 86.8630224
+4080.854701 , 965.25 , 90.5309724
+4080.854701 , 1158.3 , 94.1989224
+4080.854701 , 1351.35 , 97.8668724
+4080.854701 , 1544.4 , 101.5348224
+4080.854701 , 1737.45 , 105.2027724
+4080.854701 , 1930.5 , 108.8707224
+4080.854701 , 2123.55 , 112.5386724
+4080.854701 , 2316.6 , 116.2066224
+4080.854701 , 2509.65 , 119.8745724
+4080.854701 , 2702.7 , 123.5425224
+4080.854701 , 2895.75 , 127.2104724
+4080.854701 , 3088.8 , 130.8784224
+4080.854701 , 3281.85 , 134.5463724
+4080.854701 , 3474.9 , 138.2143224
+4080.854701 , 3667.95 , 141.8822724
+4080.854701 , 3861 , 145.5502224
+4080.854701 , 4054.05 , 149.2181724
+4080.854701 , 4247.1 , 152.8861224
+4080.854701 , 4440.15 , 156.5540724
+4080.854701 , 4633.2 , 160.2220224
+4080.854701 , 4826.25 , 163.8899724
+4080.854701 , 5019.3 , 167.5579224
+4080.854701 , 5212.35 , 171.2258724
+4080.854701 , 5405.4 , 174.8938224
+4080.854701 , 5598.45 , 178.5617724
+4080.854701 , 5791.5 , 182.2297224
+4080.854701 , 5984.55 , 185.8976724
+4080.854701 , 6177.6 , 189.5656224
+4268.632479 , -6177.6 , 42.51514079
+4268.632479 , -5984.55 , 38.84719079
+4268.632479 , -5791.5 , 35.17924079
+4268.632479 , -5598.45 , 31.51129079
+4268.632479 , -5405.4 , 27.84334079
+4268.632479 , -5212.35 , 24.17539079
+4268.632479 , -5019.3 , 20.50744079
+4268.632479 , -4826.25 , 16.83949079
+4268.632479 , -4633.2 , 13.17154079
+4268.632479 , -4440.15 , 9.503590795
+4268.632479 , -4247.1 , 5.835640795
+4268.632479 , -4054.05 , 2.167690795
+4268.632479 , -3861 , 1.500259205
+4268.632479 , -3667.95 , 5.168209205
+4268.632479 , -3474.9 , 8.836159205
+4268.632479 , -3281.85 , 12.50410921
+4268.632479 , -3088.8 , 16.17205921
+4268.632479 , -2895.75 , 19.84000921
+4268.632479 , -2702.7 , 23.50795921
+4268.632479 , -2509.65 , 27.17590921
+4268.632479 , -2316.6 , 30.84385921
+4268.632479 , -2123.55 , 34.51180921
+4268.632479 , -1930.5 , 38.17975921
+4268.632479 , -1737.45 , 41.84770921
+4268.632479 , -1544.4 , 45.51565921
+4268.632479 , -1351.35 , 49.18360921
+4268.632479 , -1158.3 , 52.85155921
+4268.632479 , -965.25 , 56.51950921
+4268.632479 , -772.2 , 60.18745921
+4268.632479 , -579.15 , 63.85540921
+4268.632479 , -386.1 , 67.52335921
+4268.632479 , -193.05 , 71.19130921
+4268.632479 , 0 , 74.85925921
+4268.632479 , 193.05 , 78.52720921
+4268.632479 , 386.1 , 82.19515921
+4268.632479 , 579.15 , 85.86310921
+4268.632479 , 772.2 , 89.53105921
+4268.632479 , 965.25 , 93.19900921
+4268.632479 , 1158.3 , 96.86695921
+4268.632479 , 1351.35 , 100.5349092
+4268.632479 , 1544.4 , 104.2028592
+4268.632479 , 1737.45 , 107.8708092
+4268.632479 , 1930.5 , 111.5387592
+4268.632479 , 2123.55 , 115.2067092
+4268.632479 , 2316.6 , 118.8746592
+4268.632479 , 2509.65 , 122.5426092
+4268.632479 , 2702.7 , 126.2105592
+4268.632479 , 2895.75 , 129.8785092
+4268.632479 , 3088.8 , 133.5464592
+4268.632479 , 3281.85 , 137.2144092
+4268.632479 , 3474.9 , 140.8823592
+4268.632479 , 3667.95 , 144.5503092
+4268.632479 , 3861 , 148.2182592
+4268.632479 , 4054.05 , 151.8862092
+4268.632479 , 4247.1 , 155.5541592
+4268.632479 , 4440.15 , 159.2221092
+4268.632479 , 4633.2 , 162.8900592
+4268.632479 , 4826.25 , 166.5580092
+4268.632479 , 5019.3 , 170.2259592
+4268.632479 , 5212.35 , 173.8939092
+4268.632479 , 5405.4 , 177.5618592
+4268.632479 , 5598.45 , 181.2298092
+4268.632479 , 5791.5 , 184.8977592
+4268.632479 , 5984.55 , 188.5657092
+4268.632479 , 6177.6 , 192.2336592
+5000 , -6177.6 , 32.12352
+5000 , -5984.55 , 28.45557
+5000 , -5791.5 , 24.78762
+5000 , -5598.45 , 21.11967
+5000 , -5405.4 , 17.45172
+5000 , -5212.35 , 13.78377
+5000 , -5019.3 , 10.11582
+5000 , -4826.25 , 6.44787
+5000 , -4633.2 , 2.77992
+5000 , -4440.15 , 0.88803
+5000 , -4247.1 , 4.55598
+5000 , -4054.05 , 8.22393
+5000 , -3861 , 11.89188
+5000 , -3667.95 , 15.55983
+5000 , -3474.9 , 19.22778
+5000 , -3281.85 , 22.89573
+5000 , -3088.8 , 26.56368
+5000 , -2895.75 , 30.23163
+5000 , -2702.7 , 33.89958
+5000 , -2509.65 , 37.56753
+5000 , -2316.6 , 41.23548
+5000 , -2123.55 , 44.90343
+5000 , -1930.5 , 48.57138
+5000 , -1737.45 , 52.23933
+5000 , -1544.4 , 55.90728
+5000 , -1351.35 , 59.57523
+5000 , -1158.3 , 63.24318
+5000 , -965.25 , 66.91113
+5000 , -772.2 , 70.57908
+5000 , -579.15 , 74.24703
+5000 , -386.1 , 77.91498
+5000 , -193.05 , 81.58293
+5000 , 0 , 85.25088
+5000 , 193.05 , 88.91883
+5000 , 386.1 , 92.58678
+5000 , 579.15 , 96.25473
+5000 , 772.2 , 99.92268
+5000 , 965.25 , 103.59063
+5000 , 1158.3 , 107.25858
+5000 , 1351.35 , 110.92653
+5000 , 1544.4 , 114.59448
+5000 , 1737.45 , 118.26243
+5000 , 1930.5 , 121.93038
+5000 , 2123.55 , 125.59833
+5000 , 2316.6 , 129.26628
+5000 , 2509.65 , 132.93423
+5000 , 2702.7 , 136.60218
+5000 , 2895.75 , 140.27013
+5000 , 3088.8 , 143.93808
+5000 , 3281.85 , 147.60603
+5000 , 3474.9 , 151.27398
+5000 , 3667.95 , 154.94193
+5000 , 3861 , 158.60988
+5000 , 4054.05 , 162.27783
+5000 , 4247.1 , 165.94578
+5000 , 4440.15 , 169.61373
+5000 , 4633.2 , 173.28168
+5000 , 4826.25 , 176.94963
+5000 , 5019.3 , 180.61758
+5000 , 5212.35 , 184.28553
+5000 , 5405.4 , 187.95348
+5000 , 5598.45 , 191.62143
+5000 , 5791.5 , 195.28938
+5000 , 5984.55 , 198.95733
+5000 , 6177.6 , 202.62528
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_6.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_6.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..3166c1b361f4022cc02f04fd2f4ec6021d57c763
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Gear_6.vtlm
@@ -0,0 +1,2081 @@
+Input Speed [rpm] , Input Torque [Nm] , Torque Loss [Nm]
+0 , -6177.6 , 98.22384
+0 , -5984.55 , 94.74894
+0 , -5791.5 , 91.27404
+0 , -5598.45 , 87.79914
+0 , -5405.4 , 84.32424
+0 , -5212.35 , 80.84934
+0 , -5019.3 , 77.37444
+0 , -4826.25 , 73.89954
+0 , -4633.2 , 70.42464
+0 , -4440.15 , 66.94974
+0 , -4247.1 , 63.47484
+0 , -4054.05 , 59.99994
+0 , -3861 , 56.52504
+0 , -3667.95 , 53.05014
+0 , -3474.9 , 49.57524
+0 , -3281.85 , 46.10034
+0 , -3088.8 , 42.62544
+0 , -2895.75 , 39.15054
+0 , -2702.7 , 35.67564
+0 , -2509.65 , 32.20074
+0 , -2316.6 , 28.72584
+0 , -2123.55 , 25.25094
+0 , -1930.5 , 21.77604
+0 , -1737.45 , 18.30114
+0 , -1544.4 , 14.82624
+0 , -1351.35 , 11.35134
+0 , -1158.3 , 7.87644
+0 , -965.25 , 4.40154
+0 , -772.2 , 0.92664
+0 , -579.15 , 2.54826
+0 , -386.1 , 6.02316
+0 , -193.05 , 9.49806
+0 , 0 , 12.97296
+0 , 193.05 , 16.44786
+0 , 386.1 , 19.92276
+0 , 579.15 , 23.39766
+0 , 772.2 , 26.87256
+0 , 965.25 , 30.34746
+0 , 1158.3 , 33.82236
+0 , 1351.35 , 37.29726
+0 , 1544.4 , 40.77216
+0 , 1737.45 , 44.24706
+0 , 1930.5 , 47.72196
+0 , 2123.55 , 51.19686
+0 , 2316.6 , 54.67176
+0 , 2509.65 , 58.14666
+0 , 2702.7 , 61.62156
+0 , 2895.75 , 65.09646
+0 , 3088.8 , 68.57136
+0 , 3281.85 , 72.04626
+0 , 3474.9 , 75.52116
+0 , 3667.95 , 78.99606
+0 , 3861 , 82.47096
+0 , 4054.05 , 85.94586
+0 , 4247.1 , 89.42076
+0 , 4440.15 , 92.89566
+0 , 4633.2 , 96.37056
+0 , 4826.25 , 99.84546
+0 , 5019.3 , 103.32036
+0 , 5212.35 , 106.79526
+0 , 5405.4 , 110.27016
+0 , 5598.45 , 113.74506
+0 , 5791.5 , 117.21996
+0 , 5984.55 , 120.69486
+0 , 6177.6 , 124.16976
+40.80854701 , -6177.6 , 97.69443235
+40.80854701 , -5984.55 , 94.21953235
+40.80854701 , -5791.5 , 90.74463235
+40.80854701 , -5598.45 , 87.26973235
+40.80854701 , -5405.4 , 83.79483235
+40.80854701 , -5212.35 , 80.31993235
+40.80854701 , -5019.3 , 76.84503235
+40.80854701 , -4826.25 , 73.37013235
+40.80854701 , -4633.2 , 69.89523235
+40.80854701 , -4440.15 , 66.42033235
+40.80854701 , -4247.1 , 62.94543235
+40.80854701 , -4054.05 , 59.47053235
+40.80854701 , -3861 , 55.99563235
+40.80854701 , -3667.95 , 52.52073235
+40.80854701 , -3474.9 , 49.04583235
+40.80854701 , -3281.85 , 45.57093235
+40.80854701 , -3088.8 , 42.09603235
+40.80854701 , -2895.75 , 38.62113235
+40.80854701 , -2702.7 , 35.14623235
+40.80854701 , -2509.65 , 31.67133235
+40.80854701 , -2316.6 , 28.19643235
+40.80854701 , -2123.55 , 24.72153235
+40.80854701 , -1930.5 , 21.24663235
+40.80854701 , -1737.45 , 17.77173235
+40.80854701 , -1544.4 , 14.29683235
+40.80854701 , -1351.35 , 10.82193235
+40.80854701 , -1158.3 , 7.347032352
+40.80854701 , -965.25 , 3.872132352
+40.80854701 , -772.2 , 0.397232352
+40.80854701 , -579.15 , 3.077667648
+40.80854701 , -386.1 , 6.552567648
+40.80854701 , -193.05 , 10.02746765
+40.80854701 , 0 , 13.50236765
+40.80854701 , 193.05 , 16.97726765
+40.80854701 , 386.1 , 20.45216765
+40.80854701 , 579.15 , 23.92706765
+40.80854701 , 772.2 , 27.40196765
+40.80854701 , 965.25 , 30.87686765
+40.80854701 , 1158.3 , 34.35176765
+40.80854701 , 1351.35 , 37.82666765
+40.80854701 , 1544.4 , 41.30156765
+40.80854701 , 1737.45 , 44.77646765
+40.80854701 , 1930.5 , 48.25136765
+40.80854701 , 2123.55 , 51.72626765
+40.80854701 , 2316.6 , 55.20116765
+40.80854701 , 2509.65 , 58.67606765
+40.80854701 , 2702.7 , 62.15096765
+40.80854701 , 2895.75 , 65.62586765
+40.80854701 , 3088.8 , 69.10076765
+40.80854701 , 3281.85 , 72.57566765
+40.80854701 , 3474.9 , 76.05056765
+40.80854701 , 3667.95 , 79.52546765
+40.80854701 , 3861 , 83.00036765
+40.80854701 , 4054.05 , 86.47526765
+40.80854701 , 4247.1 , 89.95016765
+40.80854701 , 4440.15 , 93.42506765
+40.80854701 , 4633.2 , 96.89996765
+40.80854701 , 4826.25 , 100.3748676
+40.80854701 , 5019.3 , 103.8497676
+40.80854701 , 5212.35 , 107.3246676
+40.80854701 , 5405.4 , 110.7995676
+40.80854701 , 5598.45 , 114.2744676
+40.80854701 , 5791.5 , 117.7493676
+40.80854701 , 5984.55 , 121.2242676
+40.80854701 , 6177.6 , 124.6991676
+81.61794872 , -6177.6 , 97.16501362
+81.61794872 , -5984.55 , 93.69011362
+81.61794872 , -5791.5 , 90.21521362
+81.61794872 , -5598.45 , 86.74031362
+81.61794872 , -5405.4 , 83.26541362
+81.61794872 , -5212.35 , 79.79051362
+81.61794872 , -5019.3 , 76.31561362
+81.61794872 , -4826.25 , 72.84071362
+81.61794872 , -4633.2 , 69.36581362
+81.61794872 , -4440.15 , 65.89091362
+81.61794872 , -4247.1 , 62.41601362
+81.61794872 , -4054.05 , 58.94111362
+81.61794872 , -3861 , 55.46621362
+81.61794872 , -3667.95 , 51.99131362
+81.61794872 , -3474.9 , 48.51641362
+81.61794872 , -3281.85 , 45.04151362
+81.61794872 , -3088.8 , 41.56661362
+81.61794872 , -2895.75 , 38.09171362
+81.61794872 , -2702.7 , 34.61681362
+81.61794872 , -2509.65 , 31.14191362
+81.61794872 , -2316.6 , 27.66701362
+81.61794872 , -2123.55 , 24.19211362
+81.61794872 , -1930.5 , 20.71721362
+81.61794872 , -1737.45 , 17.24231362
+81.61794872 , -1544.4 , 13.76741362
+81.61794872 , -1351.35 , 10.29251362
+81.61794872 , -1158.3 , 6.817613616
+81.61794872 , -965.25 , 3.342713616
+81.61794872 , -772.2 , 0.132186384
+81.61794872 , -579.15 , 3.607086384
+81.61794872 , -386.1 , 7.081986384
+81.61794872 , -193.05 , 10.55688638
+81.61794872 , 0 , 14.03178638
+81.61794872 , 193.05 , 17.50668638
+81.61794872 , 386.1 , 20.98158638
+81.61794872 , 579.15 , 24.45648638
+81.61794872 , 772.2 , 27.93138638
+81.61794872 , 965.25 , 31.40628638
+81.61794872 , 1158.3 , 34.88118638
+81.61794872 , 1351.35 , 38.35608638
+81.61794872 , 1544.4 , 41.83098638
+81.61794872 , 1737.45 , 45.30588638
+81.61794872 , 1930.5 , 48.78078638
+81.61794872 , 2123.55 , 52.25568638
+81.61794872 , 2316.6 , 55.73058638
+81.61794872 , 2509.65 , 59.20548638
+81.61794872 , 2702.7 , 62.68038638
+81.61794872 , 2895.75 , 66.15528638
+81.61794872 , 3088.8 , 69.63018638
+81.61794872 , 3281.85 , 73.10508638
+81.61794872 , 3474.9 , 76.57998638
+81.61794872 , 3667.95 , 80.05488638
+81.61794872 , 3861 , 83.52978638
+81.61794872 , 4054.05 , 87.00468638
+81.61794872 , 4247.1 , 90.47958638
+81.61794872 , 4440.15 , 93.95448638
+81.61794872 , 4633.2 , 97.42938638
+81.61794872 , 4826.25 , 100.9042864
+81.61794872 , 5019.3 , 104.3791864
+81.61794872 , 5212.35 , 107.8540864
+81.61794872 , 5405.4 , 111.3289864
+81.61794872 , 5598.45 , 114.8038864
+81.61794872 , 5791.5 , 118.2787864
+81.61794872 , 5984.55 , 121.7536864
+81.61794872 , 6177.6 , 125.2285864
+122.4273504 , -6177.6 , 96.63559488
+122.4273504 , -5984.55 , 93.16069488
+122.4273504 , -5791.5 , 89.68579488
+122.4273504 , -5598.45 , 86.21089488
+122.4273504 , -5405.4 , 82.73599488
+122.4273504 , -5212.35 , 79.26109488
+122.4273504 , -5019.3 , 75.78619488
+122.4273504 , -4826.25 , 72.31129488
+122.4273504 , -4633.2 , 68.83639488
+122.4273504 , -4440.15 , 65.36149488
+122.4273504 , -4247.1 , 61.88659488
+122.4273504 , -4054.05 , 58.41169488
+122.4273504 , -3861 , 54.93679488
+122.4273504 , -3667.95 , 51.46189488
+122.4273504 , -3474.9 , 47.98699488
+122.4273504 , -3281.85 , 44.51209488
+122.4273504 , -3088.8 , 41.03719488
+122.4273504 , -2895.75 , 37.56229488
+122.4273504 , -2702.7 , 34.08739488
+122.4273504 , -2509.65 , 30.61249488
+122.4273504 , -2316.6 , 27.13759488
+122.4273504 , -2123.55 , 23.66269488
+122.4273504 , -1930.5 , 20.18779488
+122.4273504 , -1737.45 , 16.71289488
+122.4273504 , -1544.4 , 13.23799488
+122.4273504 , -1351.35 , 9.76309488
+122.4273504 , -1158.3 , 6.28819488
+122.4273504 , -965.25 , 2.81329488
+122.4273504 , -772.2 , 0.66160512
+122.4273504 , -579.15 , 4.13650512
+122.4273504 , -386.1 , 7.61140512
+122.4273504 , -193.05 , 11.08630512
+122.4273504 , 0 , 14.56120512
+122.4273504 , 193.05 , 18.03610512
+122.4273504 , 386.1 , 21.51100512
+122.4273504 , 579.15 , 24.98590512
+122.4273504 , 772.2 , 28.46080512
+122.4273504 , 965.25 , 31.93570512
+122.4273504 , 1158.3 , 35.41060512
+122.4273504 , 1351.35 , 38.88550512
+122.4273504 , 1544.4 , 42.36040512
+122.4273504 , 1737.45 , 45.83530512
+122.4273504 , 1930.5 , 49.31020512
+122.4273504 , 2123.55 , 52.78510512
+122.4273504 , 2316.6 , 56.26000512
+122.4273504 , 2509.65 , 59.73490512
+122.4273504 , 2702.7 , 63.20980512
+122.4273504 , 2895.75 , 66.68470512
+122.4273504 , 3088.8 , 70.15960512
+122.4273504 , 3281.85 , 73.63450512
+122.4273504 , 3474.9 , 77.10940512
+122.4273504 , 3667.95 , 80.58430512
+122.4273504 , 3861 , 84.05920512
+122.4273504 , 4054.05 , 87.53410512
+122.4273504 , 4247.1 , 91.00900512
+122.4273504 , 4440.15 , 94.48390512
+122.4273504 , 4633.2 , 97.95880512
+122.4273504 , 4826.25 , 101.4337051
+122.4273504 , 5019.3 , 104.9086051
+122.4273504 , 5212.35 , 108.3835051
+122.4273504 , 5405.4 , 111.8584051
+122.4273504 , 5598.45 , 115.3333051
+122.4273504 , 5791.5 , 118.8082051
+122.4273504 , 5984.55 , 122.2831051
+122.4273504 , 6177.6 , 125.7580051
+163.2393162 , -6177.6 , 96.10614288
+163.2393162 , -5984.55 , 92.63124288
+163.2393162 , -5791.5 , 89.15634288
+163.2393162 , -5598.45 , 85.68144288
+163.2393162 , -5405.4 , 82.20654288
+163.2393162 , -5212.35 , 78.73164288
+163.2393162 , -5019.3 , 75.25674288
+163.2393162 , -4826.25 , 71.78184288
+163.2393162 , -4633.2 , 68.30694288
+163.2393162 , -4440.15 , 64.83204288
+163.2393162 , -4247.1 , 61.35714288
+163.2393162 , -4054.05 , 57.88224288
+163.2393162 , -3861 , 54.40734288
+163.2393162 , -3667.95 , 50.93244288
+163.2393162 , -3474.9 , 47.45754288
+163.2393162 , -3281.85 , 43.98264288
+163.2393162 , -3088.8 , 40.50774288
+163.2393162 , -2895.75 , 37.03284288
+163.2393162 , -2702.7 , 33.55794288
+163.2393162 , -2509.65 , 30.08304288
+163.2393162 , -2316.6 , 26.60814288
+163.2393162 , -2123.55 , 23.13324288
+163.2393162 , -1930.5 , 19.65834288
+163.2393162 , -1737.45 , 16.18344288
+163.2393162 , -1544.4 , 12.70854288
+163.2393162 , -1351.35 , 9.233642881
+163.2393162 , -1158.3 , 5.758742881
+163.2393162 , -965.25 , 2.283842881
+163.2393162 , -772.2 , 1.191057119
+163.2393162 , -579.15 , 4.665957119
+163.2393162 , -386.1 , 8.140857119
+163.2393162 , -193.05 , 11.61575712
+163.2393162 , 0 , 15.09065712
+163.2393162 , 193.05 , 18.56555712
+163.2393162 , 386.1 , 22.04045712
+163.2393162 , 579.15 , 25.51535712
+163.2393162 , 772.2 , 28.99025712
+163.2393162 , 965.25 , 32.46515712
+163.2393162 , 1158.3 , 35.94005712
+163.2393162 , 1351.35 , 39.41495712
+163.2393162 , 1544.4 , 42.88985712
+163.2393162 , 1737.45 , 46.36475712
+163.2393162 , 1930.5 , 49.83965712
+163.2393162 , 2123.55 , 53.31455712
+163.2393162 , 2316.6 , 56.78945712
+163.2393162 , 2509.65 , 60.26435712
+163.2393162 , 2702.7 , 63.73925712
+163.2393162 , 2895.75 , 67.21415712
+163.2393162 , 3088.8 , 70.68905712
+163.2393162 , 3281.85 , 74.16395712
+163.2393162 , 3474.9 , 77.63885712
+163.2393162 , 3667.95 , 81.11375712
+163.2393162 , 3861 , 84.58865712
+163.2393162 , 4054.05 , 88.06355712
+163.2393162 , 4247.1 , 91.53845712
+163.2393162 , 4440.15 , 95.01335712
+163.2393162 , 4633.2 , 98.48825712
+163.2393162 , 4826.25 , 101.9631571
+163.2393162 , 5019.3 , 105.4380571
+163.2393162 , 5212.35 , 108.9129571
+163.2393162 , 5405.4 , 112.3878571
+163.2393162 , 5598.45 , 115.8627571
+163.2393162 , 5791.5 , 119.3376571
+163.2393162 , 5984.55 , 122.8125571
+163.2393162 , 6177.6 , 126.2874571
+204.042735 , -6177.6 , 95.57680176
+204.042735 , -5984.55 , 92.10190176
+204.042735 , -5791.5 , 88.62700176
+204.042735 , -5598.45 , 85.15210176
+204.042735 , -5405.4 , 81.67720176
+204.042735 , -5212.35 , 78.20230176
+204.042735 , -5019.3 , 74.72740176
+204.042735 , -4826.25 , 71.25250176
+204.042735 , -4633.2 , 67.77760176
+204.042735 , -4440.15 , 64.30270176
+204.042735 , -4247.1 , 60.82780176
+204.042735 , -4054.05 , 57.35290176
+204.042735 , -3861 , 53.87800176
+204.042735 , -3667.95 , 50.40310176
+204.042735 , -3474.9 , 46.92820176
+204.042735 , -3281.85 , 43.45330176
+204.042735 , -3088.8 , 39.97840176
+204.042735 , -2895.75 , 36.50350176
+204.042735 , -2702.7 , 33.02860176
+204.042735 , -2509.65 , 29.55370176
+204.042735 , -2316.6 , 26.07880176
+204.042735 , -2123.55 , 22.60390176
+204.042735 , -1930.5 , 19.12900176
+204.042735 , -1737.45 , 15.65410176
+204.042735 , -1544.4 , 12.17920176
+204.042735 , -1351.35 , 8.704301761
+204.042735 , -1158.3 , 5.229401761
+204.042735 , -965.25 , 1.754501761
+204.042735 , -772.2 , 1.720398239
+204.042735 , -579.15 , 5.195298239
+204.042735 , -386.1 , 8.670198239
+204.042735 , -193.05 , 12.14509824
+204.042735 , 0 , 15.61999824
+204.042735 , 193.05 , 19.09489824
+204.042735 , 386.1 , 22.56979824
+204.042735 , 579.15 , 26.04469824
+204.042735 , 772.2 , 29.51959824
+204.042735 , 965.25 , 32.99449824
+204.042735 , 1158.3 , 36.46939824
+204.042735 , 1351.35 , 39.94429824
+204.042735 , 1544.4 , 43.41919824
+204.042735 , 1737.45 , 46.89409824
+204.042735 , 1930.5 , 50.36899824
+204.042735 , 2123.55 , 53.84389824
+204.042735 , 2316.6 , 57.31879824
+204.042735 , 2509.65 , 60.79369824
+204.042735 , 2702.7 , 64.26859824
+204.042735 , 2895.75 , 67.74349824
+204.042735 , 3088.8 , 71.21839824
+204.042735 , 3281.85 , 74.69329824
+204.042735 , 3474.9 , 78.16819824
+204.042735 , 3667.95 , 81.64309824
+204.042735 , 3861 , 85.11799824
+204.042735 , 4054.05 , 88.59289824
+204.042735 , 4247.1 , 92.06779824
+204.042735 , 4440.15 , 95.54269824
+204.042735 , 4633.2 , 99.01759824
+204.042735 , 4826.25 , 102.4924982
+204.042735 , 5019.3 , 105.9673982
+204.042735 , 5212.35 , 109.4422982
+204.042735 , 5405.4 , 112.9171982
+204.042735 , 5598.45 , 116.3920982
+204.042735 , 5791.5 , 119.8669982
+204.042735 , 5984.55 , 123.3418982
+204.042735 , 6177.6 , 126.8167982
+244.8547009 , -6177.6 , 95.04734976
+244.8547009 , -5984.55 , 91.57244976
+244.8547009 , -5791.5 , 88.09754976
+244.8547009 , -5598.45 , 84.62264976
+244.8547009 , -5405.4 , 81.14774976
+244.8547009 , -5212.35 , 77.67284976
+244.8547009 , -5019.3 , 74.19794976
+244.8547009 , -4826.25 , 70.72304976
+244.8547009 , -4633.2 , 67.24814976
+244.8547009 , -4440.15 , 63.77324976
+244.8547009 , -4247.1 , 60.29834976
+244.8547009 , -4054.05 , 56.82344976
+244.8547009 , -3861 , 53.34854976
+244.8547009 , -3667.95 , 49.87364976
+244.8547009 , -3474.9 , 46.39874976
+244.8547009 , -3281.85 , 42.92384976
+244.8547009 , -3088.8 , 39.44894976
+244.8547009 , -2895.75 , 35.97404976
+244.8547009 , -2702.7 , 32.49914976
+244.8547009 , -2509.65 , 29.02424976
+244.8547009 , -2316.6 , 25.54934976
+244.8547009 , -2123.55 , 22.07444976
+244.8547009 , -1930.5 , 18.59954976
+244.8547009 , -1737.45 , 15.12464976
+244.8547009 , -1544.4 , 11.64974976
+244.8547009 , -1351.35 , 8.174849759
+244.8547009 , -1158.3 , 4.699949759
+244.8547009 , -965.25 , 1.225049759
+244.8547009 , -772.2 , 2.249850241
+244.8547009 , -579.15 , 5.724750241
+244.8547009 , -386.1 , 9.199650241
+244.8547009 , -193.05 , 12.67455024
+244.8547009 , 0 , 16.14945024
+244.8547009 , 193.05 , 19.62435024
+244.8547009 , 386.1 , 23.09925024
+244.8547009 , 579.15 , 26.57415024
+244.8547009 , 772.2 , 30.04905024
+244.8547009 , 965.25 , 33.52395024
+244.8547009 , 1158.3 , 36.99885024
+244.8547009 , 1351.35 , 40.47375024
+244.8547009 , 1544.4 , 43.94865024
+244.8547009 , 1737.45 , 47.42355024
+244.8547009 , 1930.5 , 50.89845024
+244.8547009 , 2123.55 , 54.37335024
+244.8547009 , 2316.6 , 57.84825024
+244.8547009 , 2509.65 , 61.32315024
+244.8547009 , 2702.7 , 64.79805024
+244.8547009 , 2895.75 , 68.27295024
+244.8547009 , 3088.8 , 71.74785024
+244.8547009 , 3281.85 , 75.22275024
+244.8547009 , 3474.9 , 78.69765024
+244.8547009 , 3667.95 , 82.17255024
+244.8547009 , 3861 , 85.64745024
+244.8547009 , 4054.05 , 89.12235024
+244.8547009 , 4247.1 , 92.59725024
+244.8547009 , 4440.15 , 96.07215024
+244.8547009 , 4633.2 , 99.54705024
+244.8547009 , 4826.25 , 103.0219502
+244.8547009 , 5019.3 , 106.4968502
+244.8547009 , 5212.35 , 109.9717502
+244.8547009 , 5405.4 , 113.4466502
+244.8547009 , 5598.45 , 116.9215502
+244.8547009 , 5791.5 , 120.3964502
+244.8547009 , 5984.55 , 123.8713502
+244.8547009 , 6177.6 , 127.3462502
+285.6666667 , -6177.6 , 94.51789776
+285.6666667 , -5984.55 , 91.04299776
+285.6666667 , -5791.5 , 87.56809776
+285.6666667 , -5598.45 , 84.09319776
+285.6666667 , -5405.4 , 80.61829776
+285.6666667 , -5212.35 , 77.14339776
+285.6666667 , -5019.3 , 73.66849776
+285.6666667 , -4826.25 , 70.19359776
+285.6666667 , -4633.2 , 66.71869776
+285.6666667 , -4440.15 , 63.24379776
+285.6666667 , -4247.1 , 59.76889776
+285.6666667 , -4054.05 , 56.29399776
+285.6666667 , -3861 , 52.81909776
+285.6666667 , -3667.95 , 49.34419776
+285.6666667 , -3474.9 , 45.86929776
+285.6666667 , -3281.85 , 42.39439776
+285.6666667 , -3088.8 , 38.91949776
+285.6666667 , -2895.75 , 35.44459776
+285.6666667 , -2702.7 , 31.96969776
+285.6666667 , -2509.65 , 28.49479776
+285.6666667 , -2316.6 , 25.01989776
+285.6666667 , -2123.55 , 21.54499776
+285.6666667 , -1930.5 , 18.07009776
+285.6666667 , -1737.45 , 14.59519776
+285.6666667 , -1544.4 , 11.12029776
+285.6666667 , -1351.35 , 7.64539776
+285.6666667 , -1158.3 , 4.17049776
+285.6666667 , -965.25 , 0.69559776
+285.6666667 , -772.2 , 2.77930224
+285.6666667 , -579.15 , 6.25420224
+285.6666667 , -386.1 , 9.72910224
+285.6666667 , -193.05 , 13.20400224
+285.6666667 , 0 , 16.67890224
+285.6666667 , 193.05 , 20.15380224
+285.6666667 , 386.1 , 23.62870224
+285.6666667 , 579.15 , 27.10360224
+285.6666667 , 772.2 , 30.57850224
+285.6666667 , 965.25 , 34.05340224
+285.6666667 , 1158.3 , 37.52830224
+285.6666667 , 1351.35 , 41.00320224
+285.6666667 , 1544.4 , 44.47810224
+285.6666667 , 1737.45 , 47.95300224
+285.6666667 , 1930.5 , 51.42790224
+285.6666667 , 2123.55 , 54.90280224
+285.6666667 , 2316.6 , 58.37770224
+285.6666667 , 2509.65 , 61.85260224
+285.6666667 , 2702.7 , 65.32750224
+285.6666667 , 2895.75 , 68.80240224
+285.6666667 , 3088.8 , 72.27730224
+285.6666667 , 3281.85 , 75.75220224
+285.6666667 , 3474.9 , 79.22710224
+285.6666667 , 3667.95 , 82.70200224
+285.6666667 , 3861 , 86.17690224
+285.6666667 , 4054.05 , 89.65180224
+285.6666667 , 4247.1 , 93.12670224
+285.6666667 , 4440.15 , 96.60160224
+285.6666667 , 4633.2 , 100.0765022
+285.6666667 , 4826.25 , 103.5514022
+285.6666667 , 5019.3 , 107.0263022
+285.6666667 , 5212.35 , 110.5012022
+285.6666667 , 5405.4 , 113.9761022
+285.6666667 , 5598.45 , 117.4510022
+285.6666667 , 5791.5 , 120.9259022
+285.6666667 , 5984.55 , 124.4008022
+285.6666667 , 6177.6 , 127.8757022
+326.4700855 , -6177.6 , 93.98855664
+326.4700855 , -5984.55 , 90.51365664
+326.4700855 , -5791.5 , 87.03875664
+326.4700855 , -5598.45 , 83.56385664
+326.4700855 , -5405.4 , 80.08895664
+326.4700855 , -5212.35 , 76.61405664
+326.4700855 , -5019.3 , 73.13915664
+326.4700855 , -4826.25 , 69.66425664
+326.4700855 , -4633.2 , 66.18935664
+326.4700855 , -4440.15 , 62.71445664
+326.4700855 , -4247.1 , 59.23955664
+326.4700855 , -4054.05 , 55.76465664
+326.4700855 , -3861 , 52.28975664
+326.4700855 , -3667.95 , 48.81485664
+326.4700855 , -3474.9 , 45.33995664
+326.4700855 , -3281.85 , 41.86505664
+326.4700855 , -3088.8 , 38.39015664
+326.4700855 , -2895.75 , 34.91525664
+326.4700855 , -2702.7 , 31.44035664
+326.4700855 , -2509.65 , 27.96545664
+326.4700855 , -2316.6 , 24.49055664
+326.4700855 , -2123.55 , 21.01565664
+326.4700855 , -1930.5 , 17.54075664
+326.4700855 , -1737.45 , 14.06585664
+326.4700855 , -1544.4 , 10.59095664
+326.4700855 , -1351.35 , 7.11605664
+326.4700855 , -1158.3 , 3.64115664
+326.4700855 , -965.25 , 0.16625664
+326.4700855 , -772.2 , 3.30864336
+326.4700855 , -579.15 , 6.78354336
+326.4700855 , -386.1 , 10.25844336
+326.4700855 , -193.05 , 13.73334336
+326.4700855 , 0 , 17.20824336
+326.4700855 , 193.05 , 20.68314336
+326.4700855 , 386.1 , 24.15804336
+326.4700855 , 579.15 , 27.63294336
+326.4700855 , 772.2 , 31.10784336
+326.4700855 , 965.25 , 34.58274336
+326.4700855 , 1158.3 , 38.05764336
+326.4700855 , 1351.35 , 41.53254336
+326.4700855 , 1544.4 , 45.00744336
+326.4700855 , 1737.45 , 48.48234336
+326.4700855 , 1930.5 , 51.95724336
+326.4700855 , 2123.55 , 55.43214336
+326.4700855 , 2316.6 , 58.90704336
+326.4700855 , 2509.65 , 62.38194336
+326.4700855 , 2702.7 , 65.85684336
+326.4700855 , 2895.75 , 69.33174336
+326.4700855 , 3088.8 , 72.80664336
+326.4700855 , 3281.85 , 76.28154336
+326.4700855 , 3474.9 , 79.75644336
+326.4700855 , 3667.95 , 83.23134336
+326.4700855 , 3861 , 86.70624336
+326.4700855 , 4054.05 , 90.18114336
+326.4700855 , 4247.1 , 93.65604336
+326.4700855 , 4440.15 , 97.13094336
+326.4700855 , 4633.2 , 100.6058434
+326.4700855 , 4826.25 , 104.0807434
+326.4700855 , 5019.3 , 107.5556434
+326.4700855 , 5212.35 , 111.0305434
+326.4700855 , 5405.4 , 114.5054434
+326.4700855 , 5598.45 , 117.9803434
+326.4700855 , 5791.5 , 121.4552434
+326.4700855 , 5984.55 , 124.9301434
+326.4700855 , 6177.6 , 128.4050434
+367.2820513 , -6177.6 , 93.45910464
+367.2820513 , -5984.55 , 89.98420464
+367.2820513 , -5791.5 , 86.50930464
+367.2820513 , -5598.45 , 83.03440464
+367.2820513 , -5405.4 , 79.55950464
+367.2820513 , -5212.35 , 76.08460464
+367.2820513 , -5019.3 , 72.60970464
+367.2820513 , -4826.25 , 69.13480464
+367.2820513 , -4633.2 , 65.65990464
+367.2820513 , -4440.15 , 62.18500464
+367.2820513 , -4247.1 , 58.71010464
+367.2820513 , -4054.05 , 55.23520464
+367.2820513 , -3861 , 51.76030464
+367.2820513 , -3667.95 , 48.28540464
+367.2820513 , -3474.9 , 44.81050464
+367.2820513 , -3281.85 , 41.33560464
+367.2820513 , -3088.8 , 37.86070464
+367.2820513 , -2895.75 , 34.38580464
+367.2820513 , -2702.7 , 30.91090464
+367.2820513 , -2509.65 , 27.43600464
+367.2820513 , -2316.6 , 23.96110464
+367.2820513 , -2123.55 , 20.48620464
+367.2820513 , -1930.5 , 17.01130464
+367.2820513 , -1737.45 , 13.53640464
+367.2820513 , -1544.4 , 10.06150464
+367.2820513 , -1351.35 , 6.58660464
+367.2820513 , -1158.3 , 3.11170464
+367.2820513 , -965.25 , 0.36319536
+367.2820513 , -772.2 , 3.83809536
+367.2820513 , -579.15 , 7.31299536
+367.2820513 , -386.1 , 10.78789536
+367.2820513 , -193.05 , 14.26279536
+367.2820513 , 0 , 17.73769536
+367.2820513 , 193.05 , 21.21259536
+367.2820513 , 386.1 , 24.68749536
+367.2820513 , 579.15 , 28.16239536
+367.2820513 , 772.2 , 31.63729536
+367.2820513 , 965.25 , 35.11219536
+367.2820513 , 1158.3 , 38.58709536
+367.2820513 , 1351.35 , 42.06199536
+367.2820513 , 1544.4 , 45.53689536
+367.2820513 , 1737.45 , 49.01179536
+367.2820513 , 1930.5 , 52.48669536
+367.2820513 , 2123.55 , 55.96159536
+367.2820513 , 2316.6 , 59.43649536
+367.2820513 , 2509.65 , 62.91139536
+367.2820513 , 2702.7 , 66.38629536
+367.2820513 , 2895.75 , 69.86119536
+367.2820513 , 3088.8 , 73.33609536
+367.2820513 , 3281.85 , 76.81099536
+367.2820513 , 3474.9 , 80.28589536
+367.2820513 , 3667.95 , 83.76079536
+367.2820513 , 3861 , 87.23569536
+367.2820513 , 4054.05 , 90.71059536
+367.2820513 , 4247.1 , 94.18549536
+367.2820513 , 4440.15 , 97.66039536
+367.2820513 , 4633.2 , 101.1352954
+367.2820513 , 4826.25 , 104.6101954
+367.2820513 , 5019.3 , 108.0850954
+367.2820513 , 5212.35 , 111.5599954
+367.2820513 , 5405.4 , 115.0348954
+367.2820513 , 5598.45 , 118.5097954
+367.2820513 , 5791.5 , 121.9846954
+367.2820513 , 5984.55 , 125.4595954
+367.2820513 , 6177.6 , 128.9344954
+408.0854701 , -6177.6 , 92.92976352
+408.0854701 , -5984.55 , 89.45486352
+408.0854701 , -5791.5 , 85.97996352
+408.0854701 , -5598.45 , 82.50506352
+408.0854701 , -5405.4 , 79.03016352
+408.0854701 , -5212.35 , 75.55526352
+408.0854701 , -5019.3 , 72.08036352
+408.0854701 , -4826.25 , 68.60546352
+408.0854701 , -4633.2 , 65.13056352
+408.0854701 , -4440.15 , 61.65566352
+408.0854701 , -4247.1 , 58.18076352
+408.0854701 , -4054.05 , 54.70586352
+408.0854701 , -3861 , 51.23096352
+408.0854701 , -3667.95 , 47.75606352
+408.0854701 , -3474.9 , 44.28116352
+408.0854701 , -3281.85 , 40.80626352
+408.0854701 , -3088.8 , 37.33136352
+408.0854701 , -2895.75 , 33.85646352
+408.0854701 , -2702.7 , 30.38156352
+408.0854701 , -2509.65 , 26.90666352
+408.0854701 , -2316.6 , 23.43176352
+408.0854701 , -2123.55 , 19.95686352
+408.0854701 , -1930.5 , 16.48196352
+408.0854701 , -1737.45 , 13.00706352
+408.0854701 , -1544.4 , 9.53216352
+408.0854701 , -1351.35 , 6.05726352
+408.0854701 , -1158.3 , 2.58236352
+408.0854701 , -965.25 , 0.89253648
+408.0854701 , -772.2 , 4.36743648
+408.0854701 , -579.15 , 7.84233648
+408.0854701 , -386.1 , 11.31723648
+408.0854701 , -193.05 , 14.79213648
+408.0854701 , 0 , 18.26703648
+408.0854701 , 193.05 , 21.74193648
+408.0854701 , 386.1 , 25.21683648
+408.0854701 , 579.15 , 28.69173648
+408.0854701 , 772.2 , 32.16663648
+408.0854701 , 965.25 , 35.64153648
+408.0854701 , 1158.3 , 39.11643648
+408.0854701 , 1351.35 , 42.59133648
+408.0854701 , 1544.4 , 46.06623648
+408.0854701 , 1737.45 , 49.54113648
+408.0854701 , 1930.5 , 53.01603648
+408.0854701 , 2123.55 , 56.49093648
+408.0854701 , 2316.6 , 59.96583648
+408.0854701 , 2509.65 , 63.44073648
+408.0854701 , 2702.7 , 66.91563648
+408.0854701 , 2895.75 , 70.39053648
+408.0854701 , 3088.8 , 73.86543648
+408.0854701 , 3281.85 , 77.34033648
+408.0854701 , 3474.9 , 80.81523648
+408.0854701 , 3667.95 , 84.29013648
+408.0854701 , 3861 , 87.76503648
+408.0854701 , 4054.05 , 91.23993648
+408.0854701 , 4247.1 , 94.71483648
+408.0854701 , 4440.15 , 98.18973648
+408.0854701 , 4633.2 , 101.6646365
+408.0854701 , 4826.25 , 105.1395365
+408.0854701 , 5019.3 , 108.6144365
+408.0854701 , 5212.35 , 112.0893365
+408.0854701 , 5405.4 , 115.5642365
+408.0854701 , 5598.45 , 119.0391365
+408.0854701 , 5791.5 , 122.5140365
+408.0854701 , 5984.55 , 125.9889365
+408.0854701 , 6177.6 , 129.4638365
+448.8974359 , -6177.6 , 92.40031152
+448.8974359 , -5984.55 , 88.92541152
+448.8974359 , -5791.5 , 85.45051152
+448.8974359 , -5598.45 , 81.97561152
+448.8974359 , -5405.4 , 78.50071152
+448.8974359 , -5212.35 , 75.02581152
+448.8974359 , -5019.3 , 71.55091152
+448.8974359 , -4826.25 , 68.07601152
+448.8974359 , -4633.2 , 64.60111152
+448.8974359 , -4440.15 , 61.12621152
+448.8974359 , -4247.1 , 57.65131152
+448.8974359 , -4054.05 , 54.17641152
+448.8974359 , -3861 , 50.70151152
+448.8974359 , -3667.95 , 47.22661152
+448.8974359 , -3474.9 , 43.75171152
+448.8974359 , -3281.85 , 40.27681152
+448.8974359 , -3088.8 , 36.80191152
+448.8974359 , -2895.75 , 33.32701152
+448.8974359 , -2702.7 , 29.85211152
+448.8974359 , -2509.65 , 26.37721152
+448.8974359 , -2316.6 , 22.90231152
+448.8974359 , -2123.55 , 19.42741152
+448.8974359 , -1930.5 , 15.95251152
+448.8974359 , -1737.45 , 12.47761152
+448.8974359 , -1544.4 , 9.00271152
+448.8974359 , -1351.35 , 5.52781152
+448.8974359 , -1158.3 , 2.05291152
+448.8974359 , -965.25 , 1.42198848
+448.8974359 , -772.2 , 4.89688848
+448.8974359 , -579.15 , 8.37178848
+448.8974359 , -386.1 , 11.84668848
+448.8974359 , -193.05 , 15.32158848
+448.8974359 , 0 , 18.79648848
+448.8974359 , 193.05 , 22.27138848
+448.8974359 , 386.1 , 25.74628848
+448.8974359 , 579.15 , 29.22118848
+448.8974359 , 772.2 , 32.69608848
+448.8974359 , 965.25 , 36.17098848
+448.8974359 , 1158.3 , 39.64588848
+448.8974359 , 1351.35 , 43.12078848
+448.8974359 , 1544.4 , 46.59568848
+448.8974359 , 1737.45 , 50.07058848
+448.8974359 , 1930.5 , 53.54548848
+448.8974359 , 2123.55 , 57.02038848
+448.8974359 , 2316.6 , 60.49528848
+448.8974359 , 2509.65 , 63.97018848
+448.8974359 , 2702.7 , 67.44508848
+448.8974359 , 2895.75 , 70.91998848
+448.8974359 , 3088.8 , 74.39488848
+448.8974359 , 3281.85 , 77.86978848
+448.8974359 , 3474.9 , 81.34468848
+448.8974359 , 3667.95 , 84.81958848
+448.8974359 , 3861 , 88.29448848
+448.8974359 , 4054.05 , 91.76938848
+448.8974359 , 4247.1 , 95.24428848
+448.8974359 , 4440.15 , 98.71918848
+448.8974359 , 4633.2 , 102.1940885
+448.8974359 , 4826.25 , 105.6689885
+448.8974359 , 5019.3 , 109.1438885
+448.8974359 , 5212.35 , 112.6187885
+448.8974359 , 5405.4 , 116.0936885
+448.8974359 , 5598.45 , 119.5685885
+448.8974359 , 5791.5 , 123.0434885
+448.8974359 , 5984.55 , 126.5183885
+448.8974359 , 6177.6 , 129.9932885
+489.7094017 , -6177.6 , 91.87085952
+489.7094017 , -5984.55 , 88.39595952
+489.7094017 , -5791.5 , 84.92105952
+489.7094017 , -5598.45 , 81.44615952
+489.7094017 , -5405.4 , 77.97125952
+489.7094017 , -5212.35 , 74.49635952
+489.7094017 , -5019.3 , 71.02145952
+489.7094017 , -4826.25 , 67.54655952
+489.7094017 , -4633.2 , 64.07165952
+489.7094017 , -4440.15 , 60.59675952
+489.7094017 , -4247.1 , 57.12185952
+489.7094017 , -4054.05 , 53.64695952
+489.7094017 , -3861 , 50.17205952
+489.7094017 , -3667.95 , 46.69715952
+489.7094017 , -3474.9 , 43.22225952
+489.7094017 , -3281.85 , 39.74735952
+489.7094017 , -3088.8 , 36.27245952
+489.7094017 , -2895.75 , 32.79755952
+489.7094017 , -2702.7 , 29.32265952
+489.7094017 , -2509.65 , 25.84775952
+489.7094017 , -2316.6 , 22.37285952
+489.7094017 , -2123.55 , 18.89795952
+489.7094017 , -1930.5 , 15.42305952
+489.7094017 , -1737.45 , 11.94815952
+489.7094017 , -1544.4 , 8.47325952
+489.7094017 , -1351.35 , 4.99835952
+489.7094017 , -1158.3 , 1.52345952
+489.7094017 , -965.25 , 1.95144048
+489.7094017 , -772.2 , 5.42634048
+489.7094017 , -579.15 , 8.90124048
+489.7094017 , -386.1 , 12.37614048
+489.7094017 , -193.05 , 15.85104048
+489.7094017 , 0 , 19.32594048
+489.7094017 , 193.05 , 22.80084048
+489.7094017 , 386.1 , 26.27574048
+489.7094017 , 579.15 , 29.75064048
+489.7094017 , 772.2 , 33.22554048
+489.7094017 , 965.25 , 36.70044048
+489.7094017 , 1158.3 , 40.17534048
+489.7094017 , 1351.35 , 43.65024048
+489.7094017 , 1544.4 , 47.12514048
+489.7094017 , 1737.45 , 50.60004048
+489.7094017 , 1930.5 , 54.07494048
+489.7094017 , 2123.55 , 57.54984048
+489.7094017 , 2316.6 , 61.02474048
+489.7094017 , 2509.65 , 64.49964048
+489.7094017 , 2702.7 , 67.97454048
+489.7094017 , 2895.75 , 71.44944048
+489.7094017 , 3088.8 , 74.92434048
+489.7094017 , 3281.85 , 78.39924048
+489.7094017 , 3474.9 , 81.87414048
+489.7094017 , 3667.95 , 85.34904048
+489.7094017 , 3861 , 88.82394048
+489.7094017 , 4054.05 , 92.29884048
+489.7094017 , 4247.1 , 95.77374048
+489.7094017 , 4440.15 , 99.24864048
+489.7094017 , 4633.2 , 102.7235405
+489.7094017 , 4826.25 , 106.1984405
+489.7094017 , 5019.3 , 109.6733405
+489.7094017 , 5212.35 , 113.1482405
+489.7094017 , 5405.4 , 116.6231405
+489.7094017 , 5598.45 , 120.0980405
+489.7094017 , 5791.5 , 123.5729405
+489.7094017 , 5984.55 , 127.0478405
+489.7094017 , 6177.6 , 130.5227405
+816.1794872 , -6177.6 , 87.63557616
+816.1794872 , -5984.55 , 84.16067616
+816.1794872 , -5791.5 , 80.68577616
+816.1794872 , -5598.45 , 77.21087616
+816.1794872 , -5405.4 , 73.73597616
+816.1794872 , -5212.35 , 70.26107616
+816.1794872 , -5019.3 , 66.78617616
+816.1794872 , -4826.25 , 63.31127616
+816.1794872 , -4633.2 , 59.83637616
+816.1794872 , -4440.15 , 56.36147616
+816.1794872 , -4247.1 , 52.88657616
+816.1794872 , -4054.05 , 49.41167616
+816.1794872 , -3861 , 45.93677616
+816.1794872 , -3667.95 , 42.46187616
+816.1794872 , -3474.9 , 38.98697616
+816.1794872 , -3281.85 , 35.51207616
+816.1794872 , -3088.8 , 32.03717616
+816.1794872 , -2895.75 , 28.56227616
+816.1794872 , -2702.7 , 25.08737616
+816.1794872 , -2509.65 , 21.61247616
+816.1794872 , -2316.6 , 18.13757616
+816.1794872 , -2123.55 , 14.66267616
+816.1794872 , -1930.5 , 11.18777616
+816.1794872 , -1737.45 , 7.71287616
+816.1794872 , -1544.4 , 4.23797616
+816.1794872 , -1351.35 , 0.76307616
+816.1794872 , -1158.3 , 2.71182384
+816.1794872 , -965.25 , 6.18672384
+816.1794872 , -772.2 , 9.66162384
+816.1794872 , -579.15 , 13.13652384
+816.1794872 , -386.1 , 16.61142384
+816.1794872 , -193.05 , 20.08632384
+816.1794872 , 0 , 23.56122384
+816.1794872 , 193.05 , 27.03612384
+816.1794872 , 386.1 , 30.51102384
+816.1794872 , 579.15 , 33.98592384
+816.1794872 , 772.2 , 37.46082384
+816.1794872 , 965.25 , 40.93572384
+816.1794872 , 1158.3 , 44.41062384
+816.1794872 , 1351.35 , 47.88552384
+816.1794872 , 1544.4 , 51.36042384
+816.1794872 , 1737.45 , 54.83532384
+816.1794872 , 1930.5 , 58.31022384
+816.1794872 , 2123.55 , 61.78512384
+816.1794872 , 2316.6 , 65.26002384
+816.1794872 , 2509.65 , 68.73492384
+816.1794872 , 2702.7 , 72.20982384
+816.1794872 , 2895.75 , 75.68472384
+816.1794872 , 3088.8 , 79.15962384
+816.1794872 , 3281.85 , 82.63452384
+816.1794872 , 3474.9 , 86.10942384
+816.1794872 , 3667.95 , 89.58432384
+816.1794872 , 3861 , 93.05922384
+816.1794872 , 4054.05 , 96.53412384
+816.1794872 , 4247.1 , 100.0090238
+816.1794872 , 4440.15 , 103.4839238
+816.1794872 , 4633.2 , 106.9588238
+816.1794872 , 4826.25 , 110.4337238
+816.1794872 , 5019.3 , 113.9086238
+816.1794872 , 5212.35 , 117.3835238
+816.1794872 , 5405.4 , 120.8584238
+816.1794872 , 5598.45 , 124.3333238
+816.1794872 , 5791.5 , 127.8082238
+816.1794872 , 5984.55 , 131.2831238
+816.1794872 , 6177.6 , 134.7580238
+1020.25641 , -6177.6 , 84.9880944
+1020.25641 , -5984.55 , 81.5131944
+1020.25641 , -5791.5 , 78.0382944
+1020.25641 , -5598.45 , 74.5633944
+1020.25641 , -5405.4 , 71.0884944
+1020.25641 , -5212.35 , 67.6135944
+1020.25641 , -5019.3 , 64.1386944
+1020.25641 , -4826.25 , 60.6637944
+1020.25641 , -4633.2 , 57.1888944
+1020.25641 , -4440.15 , 53.7139944
+1020.25641 , -4247.1 , 50.2390944
+1020.25641 , -4054.05 , 46.7641944
+1020.25641 , -3861 , 43.2892944
+1020.25641 , -3667.95 , 39.8143944
+1020.25641 , -3474.9 , 36.3394944
+1020.25641 , -3281.85 , 32.8645944
+1020.25641 , -3088.8 , 29.3896944
+1020.25641 , -2895.75 , 25.9147944
+1020.25641 , -2702.7 , 22.4398944
+1020.25641 , -2509.65 , 18.9649944
+1020.25641 , -2316.6 , 15.4900944
+1020.25641 , -2123.55 , 12.0151944
+1020.25641 , -1930.5 , 8.540294403
+1020.25641 , -1737.45 , 5.065394403
+1020.25641 , -1544.4 , 1.590494403
+1020.25641 , -1351.35 , 1.884405597
+1020.25641 , -1158.3 , 5.359305597
+1020.25641 , -965.25 , 8.834205597
+1020.25641 , -772.2 , 12.3091056
+1020.25641 , -579.15 , 15.7840056
+1020.25641 , -386.1 , 19.2589056
+1020.25641 , -193.05 , 22.7338056
+1020.25641 , 0 , 26.2087056
+1020.25641 , 193.05 , 29.6836056
+1020.25641 , 386.1 , 33.1585056
+1020.25641 , 579.15 , 36.6334056
+1020.25641 , 772.2 , 40.1083056
+1020.25641 , 965.25 , 43.5832056
+1020.25641 , 1158.3 , 47.0581056
+1020.25641 , 1351.35 , 50.5330056
+1020.25641 , 1544.4 , 54.0079056
+1020.25641 , 1737.45 , 57.4828056
+1020.25641 , 1930.5 , 60.9577056
+1020.25641 , 2123.55 , 64.4326056
+1020.25641 , 2316.6 , 67.9075056
+1020.25641 , 2509.65 , 71.3824056
+1020.25641 , 2702.7 , 74.8573056
+1020.25641 , 2895.75 , 78.3322056
+1020.25641 , 3088.8 , 81.8071056
+1020.25641 , 3281.85 , 85.2820056
+1020.25641 , 3474.9 , 88.7569056
+1020.25641 , 3667.95 , 92.2318056
+1020.25641 , 3861 , 95.7067056
+1020.25641 , 4054.05 , 99.1816056
+1020.25641 , 4247.1 , 102.6565056
+1020.25641 , 4440.15 , 106.1314056
+1020.25641 , 4633.2 , 109.6063056
+1020.25641 , 4826.25 , 113.0812056
+1020.25641 , 5019.3 , 116.5561056
+1020.25641 , 5212.35 , 120.0310056
+1020.25641 , 5405.4 , 123.5059056
+1020.25641 , 5598.45 , 126.9808056
+1020.25641 , 5791.5 , 130.4557056
+1020.25641 , 5984.55 , 133.9306056
+1020.25641 , 6177.6 , 137.4055056
+1224.273504 , -6177.6 , 82.3413888
+1224.273504 , -5984.55 , 78.8664888
+1224.273504 , -5791.5 , 75.3915888
+1224.273504 , -5598.45 , 71.9166888
+1224.273504 , -5405.4 , 68.4417888
+1224.273504 , -5212.35 , 64.9668888
+1224.273504 , -5019.3 , 61.4919888
+1224.273504 , -4826.25 , 58.0170888
+1224.273504 , -4633.2 , 54.5421888
+1224.273504 , -4440.15 , 51.0672888
+1224.273504 , -4247.1 , 47.5923888
+1224.273504 , -4054.05 , 44.1174888
+1224.273504 , -3861 , 40.6425888
+1224.273504 , -3667.95 , 37.1676888
+1224.273504 , -3474.9 , 33.6927888
+1224.273504 , -3281.85 , 30.2178888
+1224.273504 , -3088.8 , 26.7429888
+1224.273504 , -2895.75 , 23.2680888
+1224.273504 , -2702.7 , 19.7931888
+1224.273504 , -2509.65 , 16.3182888
+1224.273504 , -2316.6 , 12.8433888
+1224.273504 , -2123.55 , 9.368488804
+1224.273504 , -1930.5 , 5.893588804
+1224.273504 , -1737.45 , 2.418688804
+1224.273504 , -1544.4 , 1.056211196
+1224.273504 , -1351.35 , 4.531111196
+1224.273504 , -1158.3 , 8.006011196
+1224.273504 , -965.25 , 11.4809112
+1224.273504 , -772.2 , 14.9558112
+1224.273504 , -579.15 , 18.4307112
+1224.273504 , -386.1 , 21.9056112
+1224.273504 , -193.05 , 25.3805112
+1224.273504 , 0 , 28.8554112
+1224.273504 , 193.05 , 32.3303112
+1224.273504 , 386.1 , 35.8052112
+1224.273504 , 579.15 , 39.2801112
+1224.273504 , 772.2 , 42.7550112
+1224.273504 , 965.25 , 46.2299112
+1224.273504 , 1158.3 , 49.7048112
+1224.273504 , 1351.35 , 53.1797112
+1224.273504 , 1544.4 , 56.6546112
+1224.273504 , 1737.45 , 60.1295112
+1224.273504 , 1930.5 , 63.6044112
+1224.273504 , 2123.55 , 67.0793112
+1224.273504 , 2316.6 , 70.5542112
+1224.273504 , 2509.65 , 74.0291112
+1224.273504 , 2702.7 , 77.5040112
+1224.273504 , 2895.75 , 80.9789112
+1224.273504 , 3088.8 , 84.4538112
+1224.273504 , 3281.85 , 87.9287112
+1224.273504 , 3474.9 , 91.4036112
+1224.273504 , 3667.95 , 94.8785112
+1224.273504 , 3861 , 98.3534112
+1224.273504 , 4054.05 , 101.8283112
+1224.273504 , 4247.1 , 105.3032112
+1224.273504 , 4440.15 , 108.7781112
+1224.273504 , 4633.2 , 112.2530112
+1224.273504 , 4826.25 , 115.7279112
+1224.273504 , 5019.3 , 119.2028112
+1224.273504 , 5212.35 , 122.6777112
+1224.273504 , 5405.4 , 126.1526112
+1224.273504 , 5598.45 , 129.6275112
+1224.273504 , 5791.5 , 133.1024112
+1224.273504 , 5984.55 , 136.5773112
+1224.273504 , 6177.6 , 140.0522112
+1428.290598 , -6177.6 , 79.6946832
+1428.290598 , -5984.55 , 76.2197832
+1428.290598 , -5791.5 , 72.7448832
+1428.290598 , -5598.45 , 69.2699832
+1428.290598 , -5405.4 , 65.7950832
+1428.290598 , -5212.35 , 62.3201832
+1428.290598 , -5019.3 , 58.8452832
+1428.290598 , -4826.25 , 55.3703832
+1428.290598 , -4633.2 , 51.8954832
+1428.290598 , -4440.15 , 48.4205832
+1428.290598 , -4247.1 , 44.9456832
+1428.290598 , -4054.05 , 41.4707832
+1428.290598 , -3861 , 37.9958832
+1428.290598 , -3667.95 , 34.5209832
+1428.290598 , -3474.9 , 31.0460832
+1428.290598 , -3281.85 , 27.5711832
+1428.290598 , -3088.8 , 24.0962832
+1428.290598 , -2895.75 , 20.6213832
+1428.290598 , -2702.7 , 17.1464832
+1428.290598 , -2509.65 , 13.6715832
+1428.290598 , -2316.6 , 10.1966832
+1428.290598 , -2123.55 , 6.721783204
+1428.290598 , -1930.5 , 3.246883204
+1428.290598 , -1737.45 , 0.228016796
+1428.290598 , -1544.4 , 3.702916796
+1428.290598 , -1351.35 , 7.177816796
+1428.290598 , -1158.3 , 10.6527168
+1428.290598 , -965.25 , 14.1276168
+1428.290598 , -772.2 , 17.6025168
+1428.290598 , -579.15 , 21.0774168
+1428.290598 , -386.1 , 24.5523168
+1428.290598 , -193.05 , 28.0272168
+1428.290598 , 0 , 31.5021168
+1428.290598 , 193.05 , 34.9770168
+1428.290598 , 386.1 , 38.4519168
+1428.290598 , 579.15 , 41.9268168
+1428.290598 , 772.2 , 45.4017168
+1428.290598 , 965.25 , 48.8766168
+1428.290598 , 1158.3 , 52.3515168
+1428.290598 , 1351.35 , 55.8264168
+1428.290598 , 1544.4 , 59.3013168
+1428.290598 , 1737.45 , 62.7762168
+1428.290598 , 1930.5 , 66.2511168
+1428.290598 , 2123.55 , 69.7260168
+1428.290598 , 2316.6 , 73.2009168
+1428.290598 , 2509.65 , 76.6758168
+1428.290598 , 2702.7 , 80.1507168
+1428.290598 , 2895.75 , 83.6256168
+1428.290598 , 3088.8 , 87.1005168
+1428.290598 , 3281.85 , 90.5754168
+1428.290598 , 3474.9 , 94.0503168
+1428.290598 , 3667.95 , 97.5252168
+1428.290598 , 3861 , 101.0001168
+1428.290598 , 4054.05 , 104.4750168
+1428.290598 , 4247.1 , 107.9499168
+1428.290598 , 4440.15 , 111.4248168
+1428.290598 , 4633.2 , 114.8997168
+1428.290598 , 4826.25 , 118.3746168
+1428.290598 , 5019.3 , 121.8495168
+1428.290598 , 5212.35 , 125.3244168
+1428.290598 , 5405.4 , 128.7993168
+1428.290598 , 5598.45 , 132.2742168
+1428.290598 , 5791.5 , 135.7491168
+1428.290598 , 5984.55 , 139.2240168
+1428.290598 , 6177.6 , 142.6989168
+1632.393162 , -6177.6 , 77.04686881
+1632.393162 , -5984.55 , 73.57196881
+1632.393162 , -5791.5 , 70.09706881
+1632.393162 , -5598.45 , 66.62216881
+1632.393162 , -5405.4 , 63.14726881
+1632.393162 , -5212.35 , 59.67236881
+1632.393162 , -5019.3 , 56.19746881
+1632.393162 , -4826.25 , 52.72256881
+1632.393162 , -4633.2 , 49.24766881
+1632.393162 , -4440.15 , 45.77276881
+1632.393162 , -4247.1 , 42.29786881
+1632.393162 , -4054.05 , 38.82296881
+1632.393162 , -3861 , 35.34806881
+1632.393162 , -3667.95 , 31.87316881
+1632.393162 , -3474.9 , 28.39826881
+1632.393162 , -3281.85 , 24.92336881
+1632.393162 , -3088.8 , 21.44846881
+1632.393162 , -2895.75 , 17.97356881
+1632.393162 , -2702.7 , 14.49866881
+1632.393162 , -2509.65 , 11.02376881
+1632.393162 , -2316.6 , 7.548868805
+1632.393162 , -2123.55 , 4.073968805
+1632.393162 , -1930.5 , 0.599068805
+1632.393162 , -1737.45 , 2.875831195
+1632.393162 , -1544.4 , 6.350731195
+1632.393162 , -1351.35 , 9.825631195
+1632.393162 , -1158.3 , 13.30053119
+1632.393162 , -965.25 , 16.77543119
+1632.393162 , -772.2 , 20.25033119
+1632.393162 , -579.15 , 23.72523119
+1632.393162 , -386.1 , 27.20013119
+1632.393162 , -193.05 , 30.67503119
+1632.393162 , 0 , 34.14993119
+1632.393162 , 193.05 , 37.62483119
+1632.393162 , 386.1 , 41.09973119
+1632.393162 , 579.15 , 44.57463119
+1632.393162 , 772.2 , 48.04953119
+1632.393162 , 965.25 , 51.52443119
+1632.393162 , 1158.3 , 54.99933119
+1632.393162 , 1351.35 , 58.47423119
+1632.393162 , 1544.4 , 61.94913119
+1632.393162 , 1737.45 , 65.42403119
+1632.393162 , 1930.5 , 68.89893119
+1632.393162 , 2123.55 , 72.37383119
+1632.393162 , 2316.6 , 75.84873119
+1632.393162 , 2509.65 , 79.32363119
+1632.393162 , 2702.7 , 82.79853119
+1632.393162 , 2895.75 , 86.27343119
+1632.393162 , 3088.8 , 89.74833119
+1632.393162 , 3281.85 , 93.22323119
+1632.393162 , 3474.9 , 96.69813119
+1632.393162 , 3667.95 , 100.1730312
+1632.393162 , 3861 , 103.6479312
+1632.393162 , 4054.05 , 107.1228312
+1632.393162 , 4247.1 , 110.5977312
+1632.393162 , 4440.15 , 114.0726312
+1632.393162 , 4633.2 , 117.5475312
+1632.393162 , 4826.25 , 121.0224312
+1632.393162 , 5019.3 , 124.4973312
+1632.393162 , 5212.35 , 127.9722312
+1632.393162 , 5405.4 , 131.4471312
+1632.393162 , 5598.45 , 134.9220312
+1632.393162 , 5791.5 , 138.3969312
+1632.393162 , 5984.55 , 141.8718312
+1632.393162 , 6177.6 , 145.3467312
+1836.410256 , -6177.6 , 74.40016321
+1836.410256 , -5984.55 , 70.92526321
+1836.410256 , -5791.5 , 67.45036321
+1836.410256 , -5598.45 , 63.97546321
+1836.410256 , -5405.4 , 60.50056321
+1836.410256 , -5212.35 , 57.02566321
+1836.410256 , -5019.3 , 53.55076321
+1836.410256 , -4826.25 , 50.07586321
+1836.410256 , -4633.2 , 46.60096321
+1836.410256 , -4440.15 , 43.12606321
+1836.410256 , -4247.1 , 39.65116321
+1836.410256 , -4054.05 , 36.17626321
+1836.410256 , -3861 , 32.70136321
+1836.410256 , -3667.95 , 29.22646321
+1836.410256 , -3474.9 , 25.75156321
+1836.410256 , -3281.85 , 22.27666321
+1836.410256 , -3088.8 , 18.80176321
+1836.410256 , -2895.75 , 15.32686321
+1836.410256 , -2702.7 , 11.85196321
+1836.410256 , -2509.65 , 8.377063205
+1836.410256 , -2316.6 , 4.902163205
+1836.410256 , -2123.55 , 1.427263205
+1836.410256 , -1930.5 , 2.047636795
+1836.410256 , -1737.45 , 5.522536795
+1836.410256 , -1544.4 , 8.997436795
+1836.410256 , -1351.35 , 12.47233679
+1836.410256 , -1158.3 , 15.94723679
+1836.410256 , -965.25 , 19.42213679
+1836.410256 , -772.2 , 22.89703679
+1836.410256 , -579.15 , 26.37193679
+1836.410256 , -386.1 , 29.84683679
+1836.410256 , -193.05 , 33.32173679
+1836.410256 , 0 , 36.79663679
+1836.410256 , 193.05 , 40.27153679
+1836.410256 , 386.1 , 43.74643679
+1836.410256 , 579.15 , 47.22133679
+1836.410256 , 772.2 , 50.69623679
+1836.410256 , 965.25 , 54.17113679
+1836.410256 , 1158.3 , 57.64603679
+1836.410256 , 1351.35 , 61.12093679
+1836.410256 , 1544.4 , 64.59583679
+1836.410256 , 1737.45 , 68.07073679
+1836.410256 , 1930.5 , 71.54563679
+1836.410256 , 2123.55 , 75.02053679
+1836.410256 , 2316.6 , 78.49543679
+1836.410256 , 2509.65 , 81.97033679
+1836.410256 , 2702.7 , 85.44523679
+1836.410256 , 2895.75 , 88.92013679
+1836.410256 , 3088.8 , 92.39503679
+1836.410256 , 3281.85 , 95.86993679
+1836.410256 , 3474.9 , 99.34483679
+1836.410256 , 3667.95 , 102.8197368
+1836.410256 , 3861 , 106.2946368
+1836.410256 , 4054.05 , 109.7695368
+1836.410256 , 4247.1 , 113.2444368
+1836.410256 , 4440.15 , 116.7193368
+1836.410256 , 4633.2 , 120.1942368
+1836.410256 , 4826.25 , 123.6691368
+1836.410256 , 5019.3 , 127.1440368
+1836.410256 , 5212.35 , 130.6189368
+1836.410256 , 5405.4 , 134.0938368
+1836.410256 , 5598.45 , 137.5687368
+1836.410256 , 5791.5 , 141.0436368
+1836.410256 , 5984.55 , 144.5185368
+1836.410256 , 6177.6 , 147.9934368
+2040.42735 , -6177.6 , 71.75345761
+2040.42735 , -5984.55 , 68.27855761
+2040.42735 , -5791.5 , 64.80365761
+2040.42735 , -5598.45 , 61.32875761
+2040.42735 , -5405.4 , 57.85385761
+2040.42735 , -5212.35 , 54.37895761
+2040.42735 , -5019.3 , 50.90405761
+2040.42735 , -4826.25 , 47.42915761
+2040.42735 , -4633.2 , 43.95425761
+2040.42735 , -4440.15 , 40.47935761
+2040.42735 , -4247.1 , 37.00445761
+2040.42735 , -4054.05 , 33.52955761
+2040.42735 , -3861 , 30.05465761
+2040.42735 , -3667.95 , 26.57975761
+2040.42735 , -3474.9 , 23.10485761
+2040.42735 , -3281.85 , 19.62995761
+2040.42735 , -3088.8 , 16.15505761
+2040.42735 , -2895.75 , 12.68015761
+2040.42735 , -2702.7 , 9.205257606
+2040.42735 , -2509.65 , 5.730357606
+2040.42735 , -2316.6 , 2.255457606
+2040.42735 , -2123.55 , 1.219442394
+2040.42735 , -1930.5 , 4.694342394
+2040.42735 , -1737.45 , 8.169242394
+2040.42735 , -1544.4 , 11.64414239
+2040.42735 , -1351.35 , 15.11904239
+2040.42735 , -1158.3 , 18.59394239
+2040.42735 , -965.25 , 22.06884239
+2040.42735 , -772.2 , 25.54374239
+2040.42735 , -579.15 , 29.01864239
+2040.42735 , -386.1 , 32.49354239
+2040.42735 , -193.05 , 35.96844239
+2040.42735 , 0 , 39.44334239
+2040.42735 , 193.05 , 42.91824239
+2040.42735 , 386.1 , 46.39314239
+2040.42735 , 579.15 , 49.86804239
+2040.42735 , 772.2 , 53.34294239
+2040.42735 , 965.25 , 56.81784239
+2040.42735 , 1158.3 , 60.29274239
+2040.42735 , 1351.35 , 63.76764239
+2040.42735 , 1544.4 , 67.24254239
+2040.42735 , 1737.45 , 70.71744239
+2040.42735 , 1930.5 , 74.19234239
+2040.42735 , 2123.55 , 77.66724239
+2040.42735 , 2316.6 , 81.14214239
+2040.42735 , 2509.65 , 84.61704239
+2040.42735 , 2702.7 , 88.09194239
+2040.42735 , 2895.75 , 91.56684239
+2040.42735 , 3088.8 , 95.04174239
+2040.42735 , 3281.85 , 98.51664239
+2040.42735 , 3474.9 , 101.9915424
+2040.42735 , 3667.95 , 105.4664424
+2040.42735 , 3861 , 108.9413424
+2040.42735 , 4054.05 , 112.4162424
+2040.42735 , 4247.1 , 115.8911424
+2040.42735 , 4440.15 , 119.3660424
+2040.42735 , 4633.2 , 122.8409424
+2040.42735 , 4826.25 , 126.3158424
+2040.42735 , 5019.3 , 129.7907424
+2040.42735 , 5212.35 , 133.2656424
+2040.42735 , 5405.4 , 136.7405424
+2040.42735 , 5598.45 , 140.2154424
+2040.42735 , 5791.5 , 143.6903424
+2040.42735 , 5984.55 , 147.1652424
+2040.42735 , 6177.6 , 150.6401424
+2244.529915 , -6177.6 , 69.10564319
+2244.529915 , -5984.55 , 65.63074319
+2244.529915 , -5791.5 , 62.15584319
+2244.529915 , -5598.45 , 58.68094319
+2244.529915 , -5405.4 , 55.20604319
+2244.529915 , -5212.35 , 51.73114319
+2244.529915 , -5019.3 , 48.25624319
+2244.529915 , -4826.25 , 44.78134319
+2244.529915 , -4633.2 , 41.30644319
+2244.529915 , -4440.15 , 37.83154319
+2244.529915 , -4247.1 , 34.35664319
+2244.529915 , -4054.05 , 30.88174319
+2244.529915 , -3861 , 27.40684319
+2244.529915 , -3667.95 , 23.93194319
+2244.529915 , -3474.9 , 20.45704319
+2244.529915 , -3281.85 , 16.98214319
+2244.529915 , -3088.8 , 13.50724319
+2244.529915 , -2895.75 , 10.03234319
+2244.529915 , -2702.7 , 6.557443194
+2244.529915 , -2509.65 , 3.082543194
+2244.529915 , -2316.6 , 0.392356806
+2244.529915 , -2123.55 , 3.867256806
+2244.529915 , -1930.5 , 7.342156806
+2244.529915 , -1737.45 , 10.81705681
+2244.529915 , -1544.4 , 14.29195681
+2244.529915 , -1351.35 , 17.76685681
+2244.529915 , -1158.3 , 21.24175681
+2244.529915 , -965.25 , 24.71665681
+2244.529915 , -772.2 , 28.19155681
+2244.529915 , -579.15 , 31.66645681
+2244.529915 , -386.1 , 35.14135681
+2244.529915 , -193.05 , 38.61625681
+2244.529915 , 0 , 42.09115681
+2244.529915 , 193.05 , 45.56605681
+2244.529915 , 386.1 , 49.04095681
+2244.529915 , 579.15 , 52.51585681
+2244.529915 , 772.2 , 55.99075681
+2244.529915 , 965.25 , 59.46565681
+2244.529915 , 1158.3 , 62.94055681
+2244.529915 , 1351.35 , 66.41545681
+2244.529915 , 1544.4 , 69.89035681
+2244.529915 , 1737.45 , 73.36525681
+2244.529915 , 1930.5 , 76.84015681
+2244.529915 , 2123.55 , 80.31505681
+2244.529915 , 2316.6 , 83.78995681
+2244.529915 , 2509.65 , 87.26485681
+2244.529915 , 2702.7 , 90.73975681
+2244.529915 , 2895.75 , 94.21465681
+2244.529915 , 3088.8 , 97.68955681
+2244.529915 , 3281.85 , 101.1644568
+2244.529915 , 3474.9 , 104.6393568
+2244.529915 , 3667.95 , 108.1142568
+2244.529915 , 3861 , 111.5891568
+2244.529915 , 4054.05 , 115.0640568
+2244.529915 , 4247.1 , 118.5389568
+2244.529915 , 4440.15 , 122.0138568
+2244.529915 , 4633.2 , 125.4887568
+2244.529915 , 4826.25 , 128.9636568
+2244.529915 , 5019.3 , 132.4385568
+2244.529915 , 5212.35 , 135.9134568
+2244.529915 , 5405.4 , 139.3883568
+2244.529915 , 5598.45 , 142.8632568
+2244.529915 , 5791.5 , 146.3381568
+2244.529915 , 5984.55 , 149.8130568
+2244.529915 , 6177.6 , 153.2879568
+2448.547009 , -6177.6 , 66.45893759
+2448.547009 , -5984.55 , 62.98403759
+2448.547009 , -5791.5 , 59.50913759
+2448.547009 , -5598.45 , 56.03423759
+2448.547009 , -5405.4 , 52.55933759
+2448.547009 , -5212.35 , 49.08443759
+2448.547009 , -5019.3 , 45.60953759
+2448.547009 , -4826.25 , 42.13463759
+2448.547009 , -4633.2 , 38.65973759
+2448.547009 , -4440.15 , 35.18483759
+2448.547009 , -4247.1 , 31.70993759
+2448.547009 , -4054.05 , 28.23503759
+2448.547009 , -3861 , 24.76013759
+2448.547009 , -3667.95 , 21.28523759
+2448.547009 , -3474.9 , 17.81033759
+2448.547009 , -3281.85 , 14.33543759
+2448.547009 , -3088.8 , 10.86053759
+2448.547009 , -2895.75 , 7.385637594
+2448.547009 , -2702.7 , 3.910737594
+2448.547009 , -2509.65 , 0.435837594
+2448.547009 , -2316.6 , 3.039062406
+2448.547009 , -2123.55 , 6.513962406
+2448.547009 , -1930.5 , 9.988862406
+2448.547009 , -1737.45 , 13.46376241
+2448.547009 , -1544.4 , 16.93866241
+2448.547009 , -1351.35 , 20.41356241
+2448.547009 , -1158.3 , 23.88846241
+2448.547009 , -965.25 , 27.36336241
+2448.547009 , -772.2 , 30.83826241
+2448.547009 , -579.15 , 34.31316241
+2448.547009 , -386.1 , 37.78806241
+2448.547009 , -193.05 , 41.26296241
+2448.547009 , 0 , 44.73786241
+2448.547009 , 193.05 , 48.21276241
+2448.547009 , 386.1 , 51.68766241
+2448.547009 , 579.15 , 55.16256241
+2448.547009 , 772.2 , 58.63746241
+2448.547009 , 965.25 , 62.11236241
+2448.547009 , 1158.3 , 65.58726241
+2448.547009 , 1351.35 , 69.06216241
+2448.547009 , 1544.4 , 72.53706241
+2448.547009 , 1737.45 , 76.01196241
+2448.547009 , 1930.5 , 79.48686241
+2448.547009 , 2123.55 , 82.96176241
+2448.547009 , 2316.6 , 86.43666241
+2448.547009 , 2509.65 , 89.91156241
+2448.547009 , 2702.7 , 93.38646241
+2448.547009 , 2895.75 , 96.86136241
+2448.547009 , 3088.8 , 100.3362624
+2448.547009 , 3281.85 , 103.8111624
+2448.547009 , 3474.9 , 107.2860624
+2448.547009 , 3667.95 , 110.7609624
+2448.547009 , 3861 , 114.2358624
+2448.547009 , 4054.05 , 117.7107624
+2448.547009 , 4247.1 , 121.1856624
+2448.547009 , 4440.15 , 124.6605624
+2448.547009 , 4633.2 , 128.1354624
+2448.547009 , 4826.25 , 131.6103624
+2448.547009 , 5019.3 , 135.0852624
+2448.547009 , 5212.35 , 138.5601624
+2448.547009 , 5405.4 , 142.0350624
+2448.547009 , 5598.45 , 145.5099624
+2448.547009 , 5791.5 , 148.9848624
+2448.547009 , 5984.55 , 152.4597624
+2448.547009 , 6177.6 , 155.9346624
+2652.564103 , -6177.6 , 63.81223199
+2652.564103 , -5984.55 , 60.33733199
+2652.564103 , -5791.5 , 56.86243199
+2652.564103 , -5598.45 , 53.38753199
+2652.564103 , -5405.4 , 49.91263199
+2652.564103 , -5212.35 , 46.43773199
+2652.564103 , -5019.3 , 42.96283199
+2652.564103 , -4826.25 , 39.48793199
+2652.564103 , -4633.2 , 36.01303199
+2652.564103 , -4440.15 , 32.53813199
+2652.564103 , -4247.1 , 29.06323199
+2652.564103 , -4054.05 , 25.58833199
+2652.564103 , -3861 , 22.11343199
+2652.564103 , -3667.95 , 18.63853199
+2652.564103 , -3474.9 , 15.16363199
+2652.564103 , -3281.85 , 11.68873199
+2652.564103 , -3088.8 , 8.213831994
+2652.564103 , -2895.75 , 4.738931994
+2652.564103 , -2702.7 , 1.264031994
+2652.564103 , -2509.65 , 2.210868006
+2652.564103 , -2316.6 , 5.685768006
+2652.564103 , -2123.55 , 9.160668006
+2652.564103 , -1930.5 , 12.63556801
+2652.564103 , -1737.45 , 16.11046801
+2652.564103 , -1544.4 , 19.58536801
+2652.564103 , -1351.35 , 23.06026801
+2652.564103 , -1158.3 , 26.53516801
+2652.564103 , -965.25 , 30.01006801
+2652.564103 , -772.2 , 33.48496801
+2652.564103 , -579.15 , 36.95986801
+2652.564103 , -386.1 , 40.43476801
+2652.564103 , -193.05 , 43.90966801
+2652.564103 , 0 , 47.38456801
+2652.564103 , 193.05 , 50.85946801
+2652.564103 , 386.1 , 54.33436801
+2652.564103 , 579.15 , 57.80926801
+2652.564103 , 772.2 , 61.28416801
+2652.564103 , 965.25 , 64.75906801
+2652.564103 , 1158.3 , 68.23396801
+2652.564103 , 1351.35 , 71.70886801
+2652.564103 , 1544.4 , 75.18376801
+2652.564103 , 1737.45 , 78.65866801
+2652.564103 , 1930.5 , 82.13356801
+2652.564103 , 2123.55 , 85.60846801
+2652.564103 , 2316.6 , 89.08336801
+2652.564103 , 2509.65 , 92.55826801
+2652.564103 , 2702.7 , 96.03316801
+2652.564103 , 2895.75 , 99.50806801
+2652.564103 , 3088.8 , 102.982968
+2652.564103 , 3281.85 , 106.457868
+2652.564103 , 3474.9 , 109.932768
+2652.564103 , 3667.95 , 113.407668
+2652.564103 , 3861 , 116.882568
+2652.564103 , 4054.05 , 120.357468
+2652.564103 , 4247.1 , 123.832368
+2652.564103 , 4440.15 , 127.307268
+2652.564103 , 4633.2 , 130.782168
+2652.564103 , 4826.25 , 134.257068
+2652.564103 , 5019.3 , 137.731968
+2652.564103 , 5212.35 , 141.206868
+2652.564103 , 5405.4 , 144.681768
+2652.564103 , 5598.45 , 148.156668
+2652.564103 , 5791.5 , 151.631568
+2652.564103 , 5984.55 , 155.106468
+2652.564103 , 6177.6 , 158.581368
+2856.666667 , -6177.6 , 61.1644176
+2856.666667 , -5984.55 , 57.6895176
+2856.666667 , -5791.5 , 54.2146176
+2856.666667 , -5598.45 , 50.7397176
+2856.666667 , -5405.4 , 47.2648176
+2856.666667 , -5212.35 , 43.7899176
+2856.666667 , -5019.3 , 40.3150176
+2856.666667 , -4826.25 , 36.8401176
+2856.666667 , -4633.2 , 33.3652176
+2856.666667 , -4440.15 , 29.8903176
+2856.666667 , -4247.1 , 26.4154176
+2856.666667 , -4054.05 , 22.9405176
+2856.666667 , -3861 , 19.4656176
+2856.666667 , -3667.95 , 15.9907176
+2856.666667 , -3474.9 , 12.5158176
+2856.666667 , -3281.85 , 9.040917596
+2856.666667 , -3088.8 , 5.566017596
+2856.666667 , -2895.75 , 2.091117596
+2856.666667 , -2702.7 , 1.383782404
+2856.666667 , -2509.65 , 4.858682404
+2856.666667 , -2316.6 , 8.333582404
+2856.666667 , -2123.55 , 11.8084824
+2856.666667 , -1930.5 , 15.2833824
+2856.666667 , -1737.45 , 18.7582824
+2856.666667 , -1544.4 , 22.2331824
+2856.666667 , -1351.35 , 25.7080824
+2856.666667 , -1158.3 , 29.1829824
+2856.666667 , -965.25 , 32.6578824
+2856.666667 , -772.2 , 36.1327824
+2856.666667 , -579.15 , 39.6076824
+2856.666667 , -386.1 , 43.0825824
+2856.666667 , -193.05 , 46.5574824
+2856.666667 , 0 , 50.0323824
+2856.666667 , 193.05 , 53.5072824
+2856.666667 , 386.1 , 56.9821824
+2856.666667 , 579.15 , 60.4570824
+2856.666667 , 772.2 , 63.9319824
+2856.666667 , 965.25 , 67.4068824
+2856.666667 , 1158.3 , 70.8817824
+2856.666667 , 1351.35 , 74.3566824
+2856.666667 , 1544.4 , 77.8315824
+2856.666667 , 1737.45 , 81.3064824
+2856.666667 , 1930.5 , 84.7813824
+2856.666667 , 2123.55 , 88.2562824
+2856.666667 , 2316.6 , 91.7311824
+2856.666667 , 2509.65 , 95.2060824
+2856.666667 , 2702.7 , 98.6809824
+2856.666667 , 2895.75 , 102.1558824
+2856.666667 , 3088.8 , 105.6307824
+2856.666667 , 3281.85 , 109.1056824
+2856.666667 , 3474.9 , 112.5805824
+2856.666667 , 3667.95 , 116.0554824
+2856.666667 , 3861 , 119.5303824
+2856.666667 , 4054.05 , 123.0052824
+2856.666667 , 4247.1 , 126.4801824
+2856.666667 , 4440.15 , 129.9550824
+2856.666667 , 4633.2 , 133.4299824
+2856.666667 , 4826.25 , 136.9048824
+2856.666667 , 5019.3 , 140.3797824
+2856.666667 , 5212.35 , 143.8546824
+2856.666667 , 5405.4 , 147.3295824
+2856.666667 , 5598.45 , 150.8044824
+2856.666667 , 5791.5 , 154.2793824
+2856.666667 , 5984.55 , 157.7542824
+2856.666667 , 6177.6 , 161.2291824
+3060.683761 , -6177.6 , 58.517712
+3060.683761 , -5984.55 , 55.042812
+3060.683761 , -5791.5 , 51.567912
+3060.683761 , -5598.45 , 48.093012
+3060.683761 , -5405.4 , 44.618112
+3060.683761 , -5212.35 , 41.143212
+3060.683761 , -5019.3 , 37.668312
+3060.683761 , -4826.25 , 34.193412
+3060.683761 , -4633.2 , 30.718512
+3060.683761 , -4440.15 , 27.243612
+3060.683761 , -4247.1 , 23.768712
+3060.683761 , -4054.05 , 20.293812
+3060.683761 , -3861 , 16.818912
+3060.683761 , -3667.95 , 13.344012
+3060.683761 , -3474.9 , 9.869111996
+3060.683761 , -3281.85 , 6.394211996
+3060.683761 , -3088.8 , 2.919311996
+3060.683761 , -2895.75 , 0.555588004
+3060.683761 , -2702.7 , 4.030488004
+3060.683761 , -2509.65 , 7.505388004
+3060.683761 , -2316.6 , 10.980288
+3060.683761 , -2123.55 , 14.455188
+3060.683761 , -1930.5 , 17.930088
+3060.683761 , -1737.45 , 21.404988
+3060.683761 , -1544.4 , 24.879888
+3060.683761 , -1351.35 , 28.354788
+3060.683761 , -1158.3 , 31.829688
+3060.683761 , -965.25 , 35.304588
+3060.683761 , -772.2 , 38.779488
+3060.683761 , -579.15 , 42.254388
+3060.683761 , -386.1 , 45.729288
+3060.683761 , -193.05 , 49.204188
+3060.683761 , 0 , 52.679088
+3060.683761 , 193.05 , 56.153988
+3060.683761 , 386.1 , 59.628888
+3060.683761 , 579.15 , 63.103788
+3060.683761 , 772.2 , 66.578688
+3060.683761 , 965.25 , 70.053588
+3060.683761 , 1158.3 , 73.528488
+3060.683761 , 1351.35 , 77.003388
+3060.683761 , 1544.4 , 80.478288
+3060.683761 , 1737.45 , 83.953188
+3060.683761 , 1930.5 , 87.428088
+3060.683761 , 2123.55 , 90.902988
+3060.683761 , 2316.6 , 94.377888
+3060.683761 , 2509.65 , 97.852788
+3060.683761 , 2702.7 , 101.327688
+3060.683761 , 2895.75 , 104.802588
+3060.683761 , 3088.8 , 108.277488
+3060.683761 , 3281.85 , 111.752388
+3060.683761 , 3474.9 , 115.227288
+3060.683761 , 3667.95 , 118.702188
+3060.683761 , 3861 , 122.177088
+3060.683761 , 4054.05 , 125.651988
+3060.683761 , 4247.1 , 129.126888
+3060.683761 , 4440.15 , 132.601788
+3060.683761 , 4633.2 , 136.076688
+3060.683761 , 4826.25 , 139.551588
+3060.683761 , 5019.3 , 143.026488
+3060.683761 , 5212.35 , 146.501388
+3060.683761 , 5405.4 , 149.976288
+3060.683761 , 5598.45 , 153.451188
+3060.683761 , 5791.5 , 156.926088
+3060.683761 , 5984.55 , 160.400988
+3060.683761 , 6177.6 , 163.875888
+3264.700855 , -6177.6 , 55.8710064
+3264.700855 , -5984.55 , 52.3961064
+3264.700855 , -5791.5 , 48.9212064
+3264.700855 , -5598.45 , 45.4463064
+3264.700855 , -5405.4 , 41.9714064
+3264.700855 , -5212.35 , 38.4965064
+3264.700855 , -5019.3 , 35.0216064
+3264.700855 , -4826.25 , 31.5467064
+3264.700855 , -4633.2 , 28.0718064
+3264.700855 , -4440.15 , 24.5969064
+3264.700855 , -4247.1 , 21.1220064
+3264.700855 , -4054.05 , 17.6471064
+3264.700855 , -3861 , 14.1722064
+3264.700855 , -3667.95 , 10.6973064
+3264.700855 , -3474.9 , 7.222406396
+3264.700855 , -3281.85 , 3.747506396
+3264.700855 , -3088.8 , 0.272606396
+3264.700855 , -2895.75 , 3.202293604
+3264.700855 , -2702.7 , 6.677193604
+3264.700855 , -2509.65 , 10.1520936
+3264.700855 , -2316.6 , 13.6269936
+3264.700855 , -2123.55 , 17.1018936
+3264.700855 , -1930.5 , 20.5767936
+3264.700855 , -1737.45 , 24.0516936
+3264.700855 , -1544.4 , 27.5265936
+3264.700855 , -1351.35 , 31.0014936
+3264.700855 , -1158.3 , 34.4763936
+3264.700855 , -965.25 , 37.9512936
+3264.700855 , -772.2 , 41.4261936
+3264.700855 , -579.15 , 44.9010936
+3264.700855 , -386.1 , 48.3759936
+3264.700855 , -193.05 , 51.8508936
+3264.700855 , 0 , 55.3257936
+3264.700855 , 193.05 , 58.8006936
+3264.700855 , 386.1 , 62.2755936
+3264.700855 , 579.15 , 65.7504936
+3264.700855 , 772.2 , 69.2253936
+3264.700855 , 965.25 , 72.7002936
+3264.700855 , 1158.3 , 76.1751936
+3264.700855 , 1351.35 , 79.6500936
+3264.700855 , 1544.4 , 83.1249936
+3264.700855 , 1737.45 , 86.5998936
+3264.700855 , 1930.5 , 90.0747936
+3264.700855 , 2123.55 , 93.5496936
+3264.700855 , 2316.6 , 97.0245936
+3264.700855 , 2509.65 , 100.4994936
+3264.700855 , 2702.7 , 103.9743936
+3264.700855 , 2895.75 , 107.4492936
+3264.700855 , 3088.8 , 110.9241936
+3264.700855 , 3281.85 , 114.3990936
+3264.700855 , 3474.9 , 117.8739936
+3264.700855 , 3667.95 , 121.3488936
+3264.700855 , 3861 , 124.8237936
+3264.700855 , 4054.05 , 128.2986936
+3264.700855 , 4247.1 , 131.7735936
+3264.700855 , 4440.15 , 135.2484936
+3264.700855 , 4633.2 , 138.7233936
+3264.700855 , 4826.25 , 142.1982936
+3264.700855 , 5019.3 , 145.6731936
+3264.700855 , 5212.35 , 149.1480936
+3264.700855 , 5405.4 , 152.6229936
+3264.700855 , 5598.45 , 156.0978936
+3264.700855 , 5791.5 , 159.5727936
+3264.700855 , 5984.55 , 163.0476936
+3264.700855 , 6177.6 , 166.5225936
+3468.803419 , -6177.6 , 53.223192
+3468.803419 , -5984.55 , 49.748292
+3468.803419 , -5791.5 , 46.273392
+3468.803419 , -5598.45 , 42.798492
+3468.803419 , -5405.4 , 39.323592
+3468.803419 , -5212.35 , 35.848692
+3468.803419 , -5019.3 , 32.373792
+3468.803419 , -4826.25 , 28.898892
+3468.803419 , -4633.2 , 25.423992
+3468.803419 , -4440.15 , 21.949092
+3468.803419 , -4247.1 , 18.474192
+3468.803419 , -4054.05 , 14.999292
+3468.803419 , -3861 , 11.524392
+3468.803419 , -3667.95 , 8.049491997
+3468.803419 , -3474.9 , 4.574591997
+3468.803419 , -3281.85 , 1.099691997
+3468.803419 , -3088.8 , 2.375208003
+3468.803419 , -2895.75 , 5.850108003
+3468.803419 , -2702.7 , 9.325008003
+3468.803419 , -2509.65 , 12.799908
+3468.803419 , -2316.6 , 16.274808
+3468.803419 , -2123.55 , 19.749708
+3468.803419 , -1930.5 , 23.224608
+3468.803419 , -1737.45 , 26.699508
+3468.803419 , -1544.4 , 30.174408
+3468.803419 , -1351.35 , 33.649308
+3468.803419 , -1158.3 , 37.124208
+3468.803419 , -965.25 , 40.599108
+3468.803419 , -772.2 , 44.074008
+3468.803419 , -579.15 , 47.548908
+3468.803419 , -386.1 , 51.023808
+3468.803419 , -193.05 , 54.498708
+3468.803419 , 0 , 57.973608
+3468.803419 , 193.05 , 61.448508
+3468.803419 , 386.1 , 64.923408
+3468.803419 , 579.15 , 68.398308
+3468.803419 , 772.2 , 71.873208
+3468.803419 , 965.25 , 75.348108
+3468.803419 , 1158.3 , 78.823008
+3468.803419 , 1351.35 , 82.297908
+3468.803419 , 1544.4 , 85.772808
+3468.803419 , 1737.45 , 89.247708
+3468.803419 , 1930.5 , 92.722608
+3468.803419 , 2123.55 , 96.197508
+3468.803419 , 2316.6 , 99.672408
+3468.803419 , 2509.65 , 103.147308
+3468.803419 , 2702.7 , 106.622208
+3468.803419 , 2895.75 , 110.097108
+3468.803419 , 3088.8 , 113.572008
+3468.803419 , 3281.85 , 117.046908
+3468.803419 , 3474.9 , 120.521808
+3468.803419 , 3667.95 , 123.996708
+3468.803419 , 3861 , 127.471608
+3468.803419 , 4054.05 , 130.946508
+3468.803419 , 4247.1 , 134.421408
+3468.803419 , 4440.15 , 137.896308
+3468.803419 , 4633.2 , 141.371208
+3468.803419 , 4826.25 , 144.846108
+3468.803419 , 5019.3 , 148.321008
+3468.803419 , 5212.35 , 151.795908
+3468.803419 , 5405.4 , 155.270808
+3468.803419 , 5598.45 , 158.745708
+3468.803419 , 5791.5 , 162.220608
+3468.803419 , 5984.55 , 165.695508
+3468.803419 , 6177.6 , 169.170408
+3672.820513 , -6177.6 , 50.5764864
+3672.820513 , -5984.55 , 47.1015864
+3672.820513 , -5791.5 , 43.6266864
+3672.820513 , -5598.45 , 40.1517864
+3672.820513 , -5405.4 , 36.6768864
+3672.820513 , -5212.35 , 33.2019864
+3672.820513 , -5019.3 , 29.7270864
+3672.820513 , -4826.25 , 26.2521864
+3672.820513 , -4633.2 , 22.7772864
+3672.820513 , -4440.15 , 19.3023864
+3672.820513 , -4247.1 , 15.8274864
+3672.820513 , -4054.05 , 12.3525864
+3672.820513 , -3861 , 8.877686398
+3672.820513 , -3667.95 , 5.402786398
+3672.820513 , -3474.9 , 1.927886398
+3672.820513 , -3281.85 , 1.547013602
+3672.820513 , -3088.8 , 5.021913602
+3672.820513 , -2895.75 , 8.496813602
+3672.820513 , -2702.7 , 11.9717136
+3672.820513 , -2509.65 , 15.4466136
+3672.820513 , -2316.6 , 18.9215136
+3672.820513 , -2123.55 , 22.3964136
+3672.820513 , -1930.5 , 25.8713136
+3672.820513 , -1737.45 , 29.3462136
+3672.820513 , -1544.4 , 32.8211136
+3672.820513 , -1351.35 , 36.2960136
+3672.820513 , -1158.3 , 39.7709136
+3672.820513 , -965.25 , 43.2458136
+3672.820513 , -772.2 , 46.7207136
+3672.820513 , -579.15 , 50.1956136
+3672.820513 , -386.1 , 53.6705136
+3672.820513 , -193.05 , 57.1454136
+3672.820513 , 0 , 60.6203136
+3672.820513 , 193.05 , 64.0952136
+3672.820513 , 386.1 , 67.5701136
+3672.820513 , 579.15 , 71.0450136
+3672.820513 , 772.2 , 74.5199136
+3672.820513 , 965.25 , 77.9948136
+3672.820513 , 1158.3 , 81.4697136
+3672.820513 , 1351.35 , 84.9446136
+3672.820513 , 1544.4 , 88.4195136
+3672.820513 , 1737.45 , 91.8944136
+3672.820513 , 1930.5 , 95.3693136
+3672.820513 , 2123.55 , 98.8442136
+3672.820513 , 2316.6 , 102.3191136
+3672.820513 , 2509.65 , 105.7940136
+3672.820513 , 2702.7 , 109.2689136
+3672.820513 , 2895.75 , 112.7438136
+3672.820513 , 3088.8 , 116.2187136
+3672.820513 , 3281.85 , 119.6936136
+3672.820513 , 3474.9 , 123.1685136
+3672.820513 , 3667.95 , 126.6434136
+3672.820513 , 3861 , 130.1183136
+3672.820513 , 4054.05 , 133.5932136
+3672.820513 , 4247.1 , 137.0681136
+3672.820513 , 4440.15 , 140.5430136
+3672.820513 , 4633.2 , 144.0179136
+3672.820513 , 4826.25 , 147.4928136
+3672.820513 , 5019.3 , 150.9677136
+3672.820513 , 5212.35 , 154.4426136
+3672.820513 , 5405.4 , 157.9175136
+3672.820513 , 5598.45 , 161.3924136
+3672.820513 , 5791.5 , 164.8673136
+3672.820513 , 5984.55 , 168.3422136
+3672.820513 , 6177.6 , 171.8171136
+3876.837607 , -6177.6 , 47.9297808
+3876.837607 , -5984.55 , 44.4548808
+3876.837607 , -5791.5 , 40.9799808
+3876.837607 , -5598.45 , 37.5050808
+3876.837607 , -5405.4 , 34.0301808
+3876.837607 , -5212.35 , 30.5552808
+3876.837607 , -5019.3 , 27.0803808
+3876.837607 , -4826.25 , 23.6054808
+3876.837607 , -4633.2 , 20.1305808
+3876.837607 , -4440.15 , 16.6556808
+3876.837607 , -4247.1 , 13.1807808
+3876.837607 , -4054.05 , 9.705880798
+3876.837607 , -3861 , 6.230980798
+3876.837607 , -3667.95 , 2.756080798
+3876.837607 , -3474.9 , 0.718819202
+3876.837607 , -3281.85 , 4.193719202
+3876.837607 , -3088.8 , 7.668619202
+3876.837607 , -2895.75 , 11.1435192
+3876.837607 , -2702.7 , 14.6184192
+3876.837607 , -2509.65 , 18.0933192
+3876.837607 , -2316.6 , 21.5682192
+3876.837607 , -2123.55 , 25.0431192
+3876.837607 , -1930.5 , 28.5180192
+3876.837607 , -1737.45 , 31.9929192
+3876.837607 , -1544.4 , 35.4678192
+3876.837607 , -1351.35 , 38.9427192
+3876.837607 , -1158.3 , 42.4176192
+3876.837607 , -965.25 , 45.8925192
+3876.837607 , -772.2 , 49.3674192
+3876.837607 , -579.15 , 52.8423192
+3876.837607 , -386.1 , 56.3172192
+3876.837607 , -193.05 , 59.7921192
+3876.837607 , 0 , 63.2670192
+3876.837607 , 193.05 , 66.7419192
+3876.837607 , 386.1 , 70.2168192
+3876.837607 , 579.15 , 73.6917192
+3876.837607 , 772.2 , 77.1666192
+3876.837607 , 965.25 , 80.6415192
+3876.837607 , 1158.3 , 84.1164192
+3876.837607 , 1351.35 , 87.5913192
+3876.837607 , 1544.4 , 91.0662192
+3876.837607 , 1737.45 , 94.5411192
+3876.837607 , 1930.5 , 98.0160192
+3876.837607 , 2123.55 , 101.4909192
+3876.837607 , 2316.6 , 104.9658192
+3876.837607 , 2509.65 , 108.4407192
+3876.837607 , 2702.7 , 111.9156192
+3876.837607 , 2895.75 , 115.3905192
+3876.837607 , 3088.8 , 118.8654192
+3876.837607 , 3281.85 , 122.3403192
+3876.837607 , 3474.9 , 125.8152192
+3876.837607 , 3667.95 , 129.2901192
+3876.837607 , 3861 , 132.7650192
+3876.837607 , 4054.05 , 136.2399192
+3876.837607 , 4247.1 , 139.7148192
+3876.837607 , 4440.15 , 143.1897192
+3876.837607 , 4633.2 , 146.6646192
+3876.837607 , 4826.25 , 150.1395192
+3876.837607 , 5019.3 , 153.6144192
+3876.837607 , 5212.35 , 157.0893192
+3876.837607 , 5405.4 , 160.5642192
+3876.837607 , 5598.45 , 164.0391192
+3876.837607 , 5791.5 , 167.5140192
+3876.837607 , 5984.55 , 170.9889192
+3876.837607 , 6177.6 , 174.4638192
+4080.854701 , -6177.6 , 45.2830752
+4080.854701 , -5984.55 , 41.8081752
+4080.854701 , -5791.5 , 38.3332752
+4080.854701 , -5598.45 , 34.8583752
+4080.854701 , -5405.4 , 31.3834752
+4080.854701 , -5212.35 , 27.9085752
+4080.854701 , -5019.3 , 24.4336752
+4080.854701 , -4826.25 , 20.9587752
+4080.854701 , -4633.2 , 17.4838752
+4080.854701 , -4440.15 , 14.0089752
+4080.854701 , -4247.1 , 10.5340752
+4080.854701 , -4054.05 , 7.059175198
+4080.854701 , -3861 , 3.584275198
+4080.854701 , -3667.95 , 0.109375198
+4080.854701 , -3474.9 , 3.365524802
+4080.854701 , -3281.85 , 6.840424802
+4080.854701 , -3088.8 , 10.3153248
+4080.854701 , -2895.75 , 13.7902248
+4080.854701 , -2702.7 , 17.2651248
+4080.854701 , -2509.65 , 20.7400248
+4080.854701 , -2316.6 , 24.2149248
+4080.854701 , -2123.55 , 27.6898248
+4080.854701 , -1930.5 , 31.1647248
+4080.854701 , -1737.45 , 34.6396248
+4080.854701 , -1544.4 , 38.1145248
+4080.854701 , -1351.35 , 41.5894248
+4080.854701 , -1158.3 , 45.0643248
+4080.854701 , -965.25 , 48.5392248
+4080.854701 , -772.2 , 52.0141248
+4080.854701 , -579.15 , 55.4890248
+4080.854701 , -386.1 , 58.9639248
+4080.854701 , -193.05 , 62.4388248
+4080.854701 , 0 , 65.9137248
+4080.854701 , 193.05 , 69.3886248
+4080.854701 , 386.1 , 72.8635248
+4080.854701 , 579.15 , 76.3384248
+4080.854701 , 772.2 , 79.8133248
+4080.854701 , 965.25 , 83.2882248
+4080.854701 , 1158.3 , 86.7631248
+4080.854701 , 1351.35 , 90.2380248
+4080.854701 , 1544.4 , 93.7129248
+4080.854701 , 1737.45 , 97.1878248
+4080.854701 , 1930.5 , 100.6627248
+4080.854701 , 2123.55 , 104.1376248
+4080.854701 , 2316.6 , 107.6125248
+4080.854701 , 2509.65 , 111.0874248
+4080.854701 , 2702.7 , 114.5623248
+4080.854701 , 2895.75 , 118.0372248
+4080.854701 , 3088.8 , 121.5121248
+4080.854701 , 3281.85 , 124.9870248
+4080.854701 , 3474.9 , 128.4619248
+4080.854701 , 3667.95 , 131.9368248
+4080.854701 , 3861 , 135.4117248
+4080.854701 , 4054.05 , 138.8866248
+4080.854701 , 4247.1 , 142.3615248
+4080.854701 , 4440.15 , 145.8364248
+4080.854701 , 4633.2 , 149.3113248
+4080.854701 , 4826.25 , 152.7862248
+4080.854701 , 5019.3 , 156.2611248
+4080.854701 , 5212.35 , 159.7360248
+4080.854701 , 5405.4 , 163.2109248
+4080.854701 , 5598.45 , 166.6858248
+4080.854701 , 5791.5 , 170.1607248
+4080.854701 , 5984.55 , 173.6356248
+4080.854701 , 6177.6 , 177.1105248
+4268.632479 , -6177.6 , 42.8470416
+4268.632479 , -5984.55 , 39.3721416
+4268.632479 , -5791.5 , 35.8972416
+4268.632479 , -5598.45 , 32.4223416
+4268.632479 , -5405.4 , 28.9474416
+4268.632479 , -5212.35 , 25.4725416
+4268.632479 , -5019.3 , 21.9976416
+4268.632479 , -4826.25 , 18.5227416
+4268.632479 , -4633.2 , 15.0478416
+4268.632479 , -4440.15 , 11.5729416
+4268.632479 , -4247.1 , 8.098041595
+4268.632479 , -4054.05 , 4.623141595
+4268.632479 , -3861 , 1.148241595
+4268.632479 , -3667.95 , 2.326658405
+4268.632479 , -3474.9 , 5.801558405
+4268.632479 , -3281.85 , 9.276458405
+4268.632479 , -3088.8 , 12.7513584
+4268.632479 , -2895.75 , 16.2262584
+4268.632479 , -2702.7 , 19.7011584
+4268.632479 , -2509.65 , 23.1760584
+4268.632479 , -2316.6 , 26.6509584
+4268.632479 , -2123.55 , 30.1258584
+4268.632479 , -1930.5 , 33.6007584
+4268.632479 , -1737.45 , 37.0756584
+4268.632479 , -1544.4 , 40.5505584
+4268.632479 , -1351.35 , 44.0254584
+4268.632479 , -1158.3 , 47.5003584
+4268.632479 , -965.25 , 50.9752584
+4268.632479 , -772.2 , 54.4501584
+4268.632479 , -579.15 , 57.9250584
+4268.632479 , -386.1 , 61.3999584
+4268.632479 , -193.05 , 64.8748584
+4268.632479 , 0 , 68.3497584
+4268.632479 , 193.05 , 71.8246584
+4268.632479 , 386.1 , 75.2995584
+4268.632479 , 579.15 , 78.7744584
+4268.632479 , 772.2 , 82.2493584
+4268.632479 , 965.25 , 85.7242584
+4268.632479 , 1158.3 , 89.1991584
+4268.632479 , 1351.35 , 92.6740584
+4268.632479 , 1544.4 , 96.1489584
+4268.632479 , 1737.45 , 99.6238584
+4268.632479 , 1930.5 , 103.0987584
+4268.632479 , 2123.55 , 106.5736584
+4268.632479 , 2316.6 , 110.0485584
+4268.632479 , 2509.65 , 113.5234584
+4268.632479 , 2702.7 , 116.9983584
+4268.632479 , 2895.75 , 120.4732584
+4268.632479 , 3088.8 , 123.9481584
+4268.632479 , 3281.85 , 127.4230584
+4268.632479 , 3474.9 , 130.8979584
+4268.632479 , 3667.95 , 134.3728584
+4268.632479 , 3861 , 137.8477584
+4268.632479 , 4054.05 , 141.3226584
+4268.632479 , 4247.1 , 144.7975584
+4268.632479 , 4440.15 , 148.2724584
+4268.632479 , 4633.2 , 151.7473584
+4268.632479 , 4826.25 , 155.2222584
+4268.632479 , 5019.3 , 158.6971584
+4268.632479 , 5212.35 , 162.1720584
+4268.632479 , 5405.4 , 165.6469584
+4268.632479 , 5598.45 , 169.1218584
+4268.632479 , 5791.5 , 172.5967584
+4268.632479 , 5984.55 , 176.0716584
+4268.632479 , 6177.6 , 179.5465584
+5000 , -6177.6 , 33.35904
+5000 , -5984.55 , 29.88414
+5000 , -5791.5 , 26.40924
+5000 , -5598.45 , 22.93434
+5000 , -5405.4 , 19.45944
+5000 , -5212.35 , 15.98454
+5000 , -5019.3 , 12.50964
+5000 , -4826.25 , 9.03474
+5000 , -4633.2 , 5.55984
+5000 , -4440.15 , 2.08494
+5000 , -4247.1 , 1.38996
+5000 , -4054.05 , 4.86486
+5000 , -3861 , 8.33976
+5000 , -3667.95 , 11.81466
+5000 , -3474.9 , 15.28956
+5000 , -3281.85 , 18.76446
+5000 , -3088.8 , 22.23936
+5000 , -2895.75 , 25.71426
+5000 , -2702.7 , 29.18916
+5000 , -2509.65 , 32.66406
+5000 , -2316.6 , 36.13896
+5000 , -2123.55 , 39.61386
+5000 , -1930.5 , 43.08876
+5000 , -1737.45 , 46.56366
+5000 , -1544.4 , 50.03856
+5000 , -1351.35 , 53.51346
+5000 , -1158.3 , 56.98836
+5000 , -965.25 , 60.46326
+5000 , -772.2 , 63.93816
+5000 , -579.15 , 67.41306
+5000 , -386.1 , 70.88796
+5000 , -193.05 , 74.36286
+5000 , 0 , 77.83776
+5000 , 193.05 , 81.31266
+5000 , 386.1 , 84.78756
+5000 , 579.15 , 88.26246
+5000 , 772.2 , 91.73736
+5000 , 965.25 , 95.21226
+5000 , 1158.3 , 98.68716
+5000 , 1351.35 , 102.16206
+5000 , 1544.4 , 105.63696
+5000 , 1737.45 , 109.11186
+5000 , 1930.5 , 112.58676
+5000 , 2123.55 , 116.06166
+5000 , 2316.6 , 119.53656
+5000 , 2509.65 , 123.01146
+5000 , 2702.7 , 126.48636
+5000 , 2895.75 , 129.96126
+5000 , 3088.8 , 133.43616
+5000 , 3281.85 , 136.91106
+5000 , 3474.9 , 140.38596
+5000 , 3667.95 , 143.86086
+5000 , 3861 , 147.33576
+5000 , 4054.05 , 150.81066
+5000 , 4247.1 , 154.28556
+5000 , 4440.15 , 157.76046
+5000 , 4633.2 , 161.23536
+5000 , 4826.25 , 164.71026
+5000 , 5019.3 , 168.18516
+5000 , 5212.35 , 171.66006
+5000 , 5405.4 , 175.13496
+5000 , 5598.45 , 178.60986
+5000 , 5791.5 , 182.08476
+5000 , 5984.55 , 185.55966
+5000 , 6177.6 , 189.03456
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbat b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbat
new file mode 100644
index 0000000000000000000000000000000000000000..b63cc3aad2ae9a38a3f3d17146b5db01390e99ac
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbat
@@ -0,0 +1,18 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:28:30.2818342Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic Battery",
+ "Capacity": 14.0,
+ "SOC_min": 20.0,
+ "SOC_max": 80.0,
+ "MaxCurrentMap": "MaxCurrent.vimax",
+ "InternalResistanceCurve": "GenericBattery_10kWh_658V.vbatr",
+ "SoCCurve": "GenericBattery_10kWh_658V.vbatv"
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbatr b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbatr
new file mode 100644
index 0000000000000000000000000000000000000000..09c936221ae38d84265ae27ba5542834d407026a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbatr
@@ -0,0 +1,3 @@
+SoC, Ri
+0, 0.12
+100, 0.12
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbatv b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbatv
new file mode 100644
index 0000000000000000000000000000000000000000..8063e04c9379cce6870b2d71c99807f0ee73c3fa
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/GenericBattery_10kWh_658V.vbatv
@@ -0,0 +1,12 @@
+SOC, V
+0, 590
+10, 614
+20, 626
+30, 632
+40, 638
+50, 640
+60, 640
+70, 642
+80, 646
+90, 650
+100, 658
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Group5_HEV.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Group5_HEV.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..913be3ea1bdc50de2dfd2fb5f2468f69b851b2f8
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Group5_HEV.vveh
@@ -0,0 +1,109 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:36:11.4469594Z",
+ "AppVersion": "3",
+ "FileVersion": 10
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "Tractor",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 8229.0,
+ "CurbWeightExtra": 7500.0,
+ "MassMax": 18.0,
+ "Loading": 19300.0,
+ "rdyn": 492.0,
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 33350.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": true,
+ "RRCISO": 0.0065,
+ "FzISO": 33350.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18333,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 41690.0,
+ "Type": "Trailer"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18333,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 41690.0,
+ "Type": "Trailer"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18334,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 41690.0,
+ "Type": "Trailer"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 5.3,
+ "VehicleHeight": 4.0,
+ "IdlingSpeed": 600.0,
+ "Retarder": {
+ "Type": "None",
+ "Ratio": 1.0,
+ "File": ""
+ },
+ "Angledrive": {
+ "Type": "None",
+ "Ratio": 0.0,
+ "LossMap": ""
+ },
+ "PTO": {
+ "Type": "None",
+ "LossMap": "",
+ "Cycle": ""
+ },
+ "TorqueLimits": {},
+ "MaxDrivetrainPower": 1000.0,
+ "InitialSoC": 50.0,
+ "PowertrainConfiguration": "IHPC",
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1.0,
+ "MechanicalEfficiency": 1.0,
+ "Position": "IHPC",
+ "MotorFile": "IHPC-EM_6spd.vem"
+ }
+ ],
+ "Battery": {
+ "NumPacks": 1,
+ "BatteryFile": "GenericBattery_10kWh_658V.vbat"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Hybrid_Parameters.vhctl b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Hybrid_Parameters.vhctl
new file mode 100644
index 0000000000000000000000000000000000000000..a46aef1a05bf9df86bedf57572abe03a6de5fb23
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Hybrid_Parameters.vhctl
@@ -0,0 +1,17 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:28:08.3781385Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "EquivalenceFactor": 2.0,
+ "MinSoC": 20.0,
+ "MaxSoC": 80.0,
+ "TargetSoC": 50.0,
+ "AuxBufferTime": 5.0,
+ "AuxBufferChgTime": 5.0,
+ "MinICEOnTime": 10.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC Group 5.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..252c083c7a8938574fe38a0fbeeec5076a68b979
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC Group 5.vecto
@@ -0,0 +1,64 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-08-24T13:41:04.1591616Z",
+ "AppVersion": "3",
+ "FileVersion": 13
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "Group5_HEV.vveh",
+ "EngineFile": "Engine_325kW_12.7l.veng",
+ "GearboxFile": "IHPC-Gbx_6.vgbx",
+ "TCU": "IHPC-Gbx_6.vgbx",
+ "ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategy",
+ "HybridStrategyParams": "Hybrid_Parameters.vhctl",
+ "AuxiliaryAssembly": "Classic",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
+ "Aux": [],
+ "Padd": 3000.0,
+ "Padd_electric": 0.0,
+ "VACC": "Truck.vacc",
+ "EngineStopStartAtVehicleStopThreshold": 0.0,
+ "EngineStopStartMaxOffTimespan": 1000.0,
+ "EngineStopStartUtilityFactor": 0.0,
+ "EcoRollMinSpeed": 0.0,
+ "EcoRollActivationDelay": 0.0,
+ "EcoRollUnderspeedThreshold": 0.0,
+ "EcoRollMaxAcceleration": 0.0,
+ "PCCEnableSpeed": 0.0,
+ "PCCMinSpeed": 0.0,
+ "PCCUnderspeed": 0.0,
+ "PCCOverSpeed": 5.0,
+ "PCCPreviewDistanceUC1": 0.0,
+ "PCCPreviewDistanceUC2": 0.0,
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": "",
+ "MinSpeed": 50.0
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Overspeed",
+ "MinSpeed": 50.0,
+ "OverSpeed": 2.5
+ },
+ "Cycles": [
+ "LongHaul",
+ "Coach",
+ "Construction",
+ "HeavyUrban",
+ "Interurban",
+ "MunicipalUtility",
+ "RegionalDelivery",
+ "Suburban",
+ "Urban",
+ "UrbanDelivery"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_6spd.vem b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_6spd.vem
new file mode 100644
index 0000000000000000000000000000000000000000..0d1f26fca05c096504d8ba47cbecf7cd8ce12a27
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_6spd.vem
@@ -0,0 +1,51 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-10-09T08:18:42.8238326Z",
+ "AppVersion": "3",
+ "FileVersion": 5
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic IHPC",
+ "DragCurve": "IHPC-EM_Drag.vemd",
+ "Inertia": 0.5,
+ "ThermalOverloadRecoveryFactor": 0.9,
+ "VoltageLevels": [
+ {
+ "Voltage": 500,
+ "ContinuousTorque": 1722.91,
+ "ContinuousTorqueSpeed": 1477,
+ "OverloadTorque": 1956.56,
+ "OverloadTorqueSpeed": 1475,
+ "OverloadTime": 200,
+ "FullLoadCurve": "IHPC-EM_FLD_min.vemp",
+ "EfficiencyMap": {
+ "1": "IHPC-EM_Map_G1.vemo",
+ "2": "IHPC-EM_Map_G2.vemo",
+ "3": "IHPC-EM_Map_G3.vemo",
+ "4": "IHPC-EM_Map_G4.vemo",
+ "5": "IHPC-EM_Map_G5.vemo",
+ "6": "IHPC-EM_Map_G6.vemo"
+ }
+ },
+ {
+ "Voltage": 900,
+ "ContinuousTorque": 1736.79,
+ "ContinuousTorqueSpeed": 1470,
+ "OverloadTorque": 2010.59,
+ "OverloadTorqueSpeed": 1482,
+ "OverloadTime": 230,
+ "FullLoadCurve": "IHPC-EM_FLD_max.vemp",
+ "EfficiencyMap": {
+ "1": "IHPC-EM_Map_G1.vemo",
+ "2": "IHPC-EM_Map_G2.vemo",
+ "3": "IHPC-EM_Map_G3.vemo",
+ "4": "IHPC-EM_Map_G4.vemo",
+ "5": "IHPC-EM_Map_G5.vemo",
+ "6": "IHPC-EM_Map_G6.vemo"
+ }
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Drag.vemd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Drag.vemd
new file mode 100644
index 0000000000000000000000000000000000000000..ea6b5cc3a57308f36d939ccc12b6b122899b3aa9
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Drag.vemd
@@ -0,0 +1,3 @@
+n [rpm] , T_drag [Nm]
+0 , 0.0
+10000 , 0.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_FLD_max.vemp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_FLD_max.vemp
new file mode 100644
index 0000000000000000000000000000000000000000..ddf62440ac37eb95e77db6e8c2280ab25c0ba610
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_FLD_max.vemp
@@ -0,0 +1,70 @@
+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0.00 , 1991.48 , -1996.23
+1485.45 , 2012.58 , -2017.12
+1480.00 , 2012.50 , -2017.06
+1488.89 , 2008.08 , -2012.59
+1497.78 , 1996.49 , -2000.90
+1506.67 , 1985.05 , -1989.36
+1511.11 , 1979.38 , -1983.64
+1555.56 , 1924.45 , -1928.06
+1600.00 , 1872.64 , -1873.95
+1644.44 , 1823.64 , -1822.14
+1688.89 , 1777.31 , -1772.61
+1733.33 , 1733.35 , -1725.55
+1777.78 , 1691.62 , -1680.81
+1822.22 , 1651.92 , -1638.18
+1866.67 , 1614.19 , -1597.61
+1911.11 , 1578.24 , -1558.89
+1955.56 , 1543.93 , -1521.87
+2000.00 , 1511.19 , -1486.49
+2044.44 , 1479.89 , -1452.61
+2088.89 , 1449.97 , -1420.17
+2133.33 , 1421.29 , -1389.02
+2177.78 , 1393.85 , -1359.15
+2222.22 , 1367.49 , -1330.42
+2266.67 , 1342.22 , -1302.82
+2311.11 , 1317.93 , -1276.25
+2355.56 , 1294.59 , -1250.65
+2400.00 , 1272.09 , -1225.93
+2444.44 , 1250.48 , -1202.14
+2488.89 , 1229.65 , -1179.17
+2533.33 , 1209.57 , -1156.97
+2577.78 , 1190.24 , -1135.55
+2622.22 , 1171.54 , -1114.79
+2666.67 , 1153.53 , -1094.75
+2711.11 , 1136.07 , -1075.29
+2755.56 , 1119.26 , -1056.48
+2800.00 , 1102.98 , -1038.25
+2844.44 , 1087.20 , -1020.53
+2888.89 , 1071.97 , -1003.38
+2933.33 , 1057.18 , -986.69
+2977.78 , 1042.88 , -970.51
+3022.22 , 1028.98 , -954.75
+3066.67 , 1015.52 , -939.45
+3111.11 , 1002.51 , -924.61
+3155.56 , 989.84 , -910.13
+3200.00 , 977.52 , -896.02
+3244.44 , 965.60 , -882.31
+3288.89 , 953.97 , -868.92
+3333.33 , 942.69 , -855.88
+3377.78 , 931.75 , -843.21
+3422.22 , 921.07 , -830.79
+3466.67 , 910.72 , -818.73
+3511.11 , 900.63 , -806.93
+3555.56 , 890.78 , -795.39
+3600.00 , 881.23 , -784.15
+3644.44 , 871.92 , -773.17
+3688.89 , 862.82 , -762.40
+3733.33 , 853.96 , -751.89
+3777.78 , 845.35 , -741.63
+3822.22 , 836.93 , -731.58
+3866.67 , 828.76 , -721.79
+3911.11 , 820.75 , -712.15
+3955.56 , 812.92 , -702.72
+4000.00 , 805.30 , -693.49
+4044.44 , 797.87 , -684.47
+4088.89 , 790.65 , -675.66
+4133.33 , 783.52 , -666.94
+4177.78 , 776.59 , -658.44
+4222.22 , 769.85 , -650.14
+4266.67 , 763.22 , -641.94
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_FLD_min.vemp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_FLD_min.vemp
new file mode 100644
index 0000000000000000000000000000000000000000..ddf62440ac37eb95e77db6e8c2280ab25c0ba610
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_FLD_min.vemp
@@ -0,0 +1,70 @@
+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0.00 , 1991.48 , -1996.23
+1485.45 , 2012.58 , -2017.12
+1480.00 , 2012.50 , -2017.06
+1488.89 , 2008.08 , -2012.59
+1497.78 , 1996.49 , -2000.90
+1506.67 , 1985.05 , -1989.36
+1511.11 , 1979.38 , -1983.64
+1555.56 , 1924.45 , -1928.06
+1600.00 , 1872.64 , -1873.95
+1644.44 , 1823.64 , -1822.14
+1688.89 , 1777.31 , -1772.61
+1733.33 , 1733.35 , -1725.55
+1777.78 , 1691.62 , -1680.81
+1822.22 , 1651.92 , -1638.18
+1866.67 , 1614.19 , -1597.61
+1911.11 , 1578.24 , -1558.89
+1955.56 , 1543.93 , -1521.87
+2000.00 , 1511.19 , -1486.49
+2044.44 , 1479.89 , -1452.61
+2088.89 , 1449.97 , -1420.17
+2133.33 , 1421.29 , -1389.02
+2177.78 , 1393.85 , -1359.15
+2222.22 , 1367.49 , -1330.42
+2266.67 , 1342.22 , -1302.82
+2311.11 , 1317.93 , -1276.25
+2355.56 , 1294.59 , -1250.65
+2400.00 , 1272.09 , -1225.93
+2444.44 , 1250.48 , -1202.14
+2488.89 , 1229.65 , -1179.17
+2533.33 , 1209.57 , -1156.97
+2577.78 , 1190.24 , -1135.55
+2622.22 , 1171.54 , -1114.79
+2666.67 , 1153.53 , -1094.75
+2711.11 , 1136.07 , -1075.29
+2755.56 , 1119.26 , -1056.48
+2800.00 , 1102.98 , -1038.25
+2844.44 , 1087.20 , -1020.53
+2888.89 , 1071.97 , -1003.38
+2933.33 , 1057.18 , -986.69
+2977.78 , 1042.88 , -970.51
+3022.22 , 1028.98 , -954.75
+3066.67 , 1015.52 , -939.45
+3111.11 , 1002.51 , -924.61
+3155.56 , 989.84 , -910.13
+3200.00 , 977.52 , -896.02
+3244.44 , 965.60 , -882.31
+3288.89 , 953.97 , -868.92
+3333.33 , 942.69 , -855.88
+3377.78 , 931.75 , -843.21
+3422.22 , 921.07 , -830.79
+3466.67 , 910.72 , -818.73
+3511.11 , 900.63 , -806.93
+3555.56 , 890.78 , -795.39
+3600.00 , 881.23 , -784.15
+3644.44 , 871.92 , -773.17
+3688.89 , 862.82 , -762.40
+3733.33 , 853.96 , -751.89
+3777.78 , 845.35 , -741.63
+3822.22 , 836.93 , -731.58
+3866.67 , 828.76 , -721.79
+3911.11 , 820.75 , -712.15
+3955.56 , 812.92 , -702.72
+4000.00 , 805.30 , -693.49
+4044.44 , 797.87 , -684.47
+4088.89 , 790.65 , -675.66
+4133.33 , 783.52 , -666.94
+4177.78 , 776.59 , -658.44
+4222.22 , 769.85 , -650.14
+4266.67 , 763.22 , -641.94
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G1.vemo b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G1.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..d952daeb523541814e5354e51a5b07cc85cd29b6
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G1.vemo
@@ -0,0 +1,2016 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00 , -2419.07 , 23.82
+0.00 , -2344.05 , 22.44
+0.00 , -2269.03 , 21.09
+0.00 , -2194.02 , 19.79
+0.00 , -2119.00 , 18.53
+0.00 , -2043.98 , 17.31
+0.00 , -1968.97 , 16.13
+0.00 , -1893.95 , 14.99
+0.00 , -1818.93 , 13.89
+0.00 , -1743.92 , 12.84
+0.00 , -1668.90 , 11.83
+0.00 , -1593.88 , 10.85
+0.00 , -1518.87 , 9.92
+0.00 , -1443.85 , 9.04
+0.00 , -1368.83 , 8.19
+0.00 , -1293.82 , 7.38
+0.00 , -1218.80 , 6.62
+0.00 , -1143.78 , 5.90
+0.00 , -1068.77 , 5.21
+0.00 , -993.75 , 4.57
+0.00 , -918.73 , 3.98
+0.00 , -843.72 , 3.42
+0.00 , -768.58 , 2.90
+0.00 , -690.33 , 2.43
+0.00 , -612.09 , 2.00
+0.00 , -533.51 , 1.61
+0.00 , -454.65 , 1.26
+0.00 , -375.79 , 0.95
+0.00 , -296.92 , 0.69
+0.00 , -218.06 , 0.46
+0.00 , -139.19 , 0.28
+0.00 , -60.33 , 0.14
+0.00 , 18.53 , 0.09
+0.00 , 85.28 , 0.21
+0.00 , 152.03 , 0.38
+0.00 , 218.78 , 0.58
+0.00 , 285.53 , 0.83
+0.00 , 352.28 , 1.12
+0.00 , 419.03 , 1.45
+0.00 , 485.78 , 1.82
+0.00 , 552.53 , 2.23
+0.00 , 619.29 , 2.69
+0.00 , 686.04 , 3.19
+0.00 , 752.79 , 3.72
+0.00 , 819.54 , 4.30
+0.00 , 886.29 , 4.93
+0.00 , 953.04 , 5.59
+0.00 , 1019.79 , 6.29
+0.00 , 1086.54 , 7.04
+0.00 , 1153.29 , 7.83
+0.00 , 1220.04 , 8.65
+0.00 , 1286.79 , 9.52
+0.00 , 1353.54 , 10.44
+0.00 , 1420.29 , 11.39
+0.00 , 1487.04 , 12.38
+0.00 , 1553.79 , 13.42
+0.00 , 1620.54 , 14.50
+0.00 , 1687.29 , 15.62
+0.00 , 1754.04 , 16.78
+0.00 , 1820.79 , 17.98
+0.00 , 1887.54 , 19.22
+0.00 , 1954.29 , 20.51
+0.00 , 2021.04 , 21.84
+0.00 , 2087.79 , 23.20
+0.00 , 2154.54 , 24.61
+40.81 , -2419.82 , 13.94
+40.81 , -2344.81 , 12.87
+40.81 , -2269.79 , 11.84
+40.81 , -2194.77 , 10.85
+40.81 , -2119.76 , 9.90
+40.81 , -2044.74 , 9.00
+40.81 , -1969.72 , 8.13
+40.81 , -1894.71 , 7.31
+40.81 , -1819.69 , 6.53
+40.81 , -1744.67 , 5.78
+40.81 , -1669.66 , 5.09
+40.81 , -1594.64 , 4.43
+40.81 , -1519.62 , 3.81
+40.81 , -1444.61 , 3.24
+40.81 , -1369.59 , 2.70
+40.81 , -1294.57 , 2.21
+40.81 , -1219.56 , 1.76
+40.81 , -1144.54 , 1.36
+40.81 , -1069.52 , 0.99
+40.81 , -994.51 , 0.67
+40.81 , -919.49 , 0.39
+40.81 , -844.47 , 0.15
+40.81 , -769.32 , -0.05
+40.81 , -690.47 , -0.22
+40.81 , -611.61 , -0.36
+40.81 , -532.76 , -0.45
+40.81 , -453.89 , -0.50
+40.81 , -375.03 , -0.51
+40.81 , -296.17 , -0.48
+40.81 , -217.30 , -0.41
+40.81 , -138.44 , -0.30
+40.81 , -59.57 , -0.15
+40.81 , 19.29 , 0.09
+40.81 , 86.04 , 0.51
+40.81 , 152.79 , 0.98
+40.81 , 219.54 , 1.48
+40.81 , 286.29 , 2.03
+40.81 , 353.04 , 2.62
+40.81 , 419.79 , 3.25
+40.81 , 486.54 , 3.92
+40.81 , 553.29 , 4.63
+40.81 , 620.04 , 5.39
+40.81 , 686.79 , 6.18
+40.81 , 753.54 , 7.02
+40.81 , 820.29 , 7.90
+40.81 , 887.04 , 8.82
+40.81 , 953.79 , 9.78
+40.81 , 1020.54 , 10.78
+40.81 , 1087.29 , 11.83
+40.81 , 1154.04 , 12.91
+40.81 , 1220.79 , 14.04
+40.81 , 1287.54 , 15.21
+40.81 , 1354.29 , 16.42
+40.81 , 1421.04 , 17.67
+40.81 , 1487.79 , 18.96
+40.81 , 1554.54 , 20.30
+40.81 , 1621.30 , 21.68
+40.81 , 1688.05 , 23.09
+40.81 , 1754.80 , 24.55
+40.81 , 1821.55 , 26.05
+40.81 , 1888.30 , 27.60
+40.81 , 1955.05 , 29.18
+40.81 , 2021.80 , 30.81
+40.81 , 2088.55 , 32.47
+40.81 , 2155.30 , 34.18
+81.62 , -2420.58 , 4.07
+81.62 , -2345.56 , 3.32
+81.62 , -2270.55 , 2.60
+81.62 , -2195.53 , 1.93
+81.62 , -2120.51 , 1.31
+81.62 , -2045.50 , 0.73
+81.62 , -1970.48 , 0.19
+81.62 , -1895.46 , -0.32
+81.62 , -1820.45 , -0.78
+81.62 , -1745.43 , -1.20
+81.62 , -1670.41 , -1.57
+81.62 , -1595.40 , -1.91
+81.62 , -1520.38 , -2.21
+81.62 , -1445.36 , -2.47
+81.62 , -1370.35 , -2.68
+81.62 , -1295.33 , -2.86
+81.62 , -1220.31 , -2.99
+81.62 , -1145.30 , -3.09
+81.62 , -1070.28 , -3.14
+81.62 , -995.26 , -3.15
+81.62 , -919.92 , -3.13
+81.62 , -844.32 , -3.07
+81.62 , -768.59 , -2.96
+81.62 , -689.73 , -2.84
+81.62 , -610.86 , -2.69
+81.62 , -532.00 , -2.49
+81.62 , -453.14 , -2.25
+81.62 , -374.27 , -1.97
+81.62 , -295.41 , -1.65
+81.62 , -216.55 , -1.29
+81.62 , -137.68 , -0.89
+81.62 , -58.82 , -0.44
+81.62 , 20.05 , 0.10
+81.62 , 86.80 , 0.82
+81.62 , 153.55 , 1.58
+81.62 , 220.30 , 2.38
+81.62 , 287.05 , 3.23
+81.62 , 353.80 , 4.12
+81.62 , 420.55 , 5.04
+81.62 , 487.30 , 6.01
+81.62 , 554.05 , 7.03
+81.62 , 620.80 , 8.08
+81.62 , 687.55 , 9.17
+81.62 , 754.30 , 10.31
+81.62 , 821.05 , 11.49
+81.62 , 887.80 , 12.71
+81.62 , 954.55 , 13.97
+81.62 , 1021.30 , 15.27
+81.62 , 1088.05 , 16.61
+81.62 , 1154.80 , 18.00
+81.62 , 1221.55 , 19.42
+81.62 , 1288.30 , 20.89
+81.62 , 1355.05 , 22.40
+81.62 , 1421.80 , 23.95
+81.62 , 1488.55 , 25.54
+81.62 , 1555.30 , 27.18
+81.62 , 1622.05 , 28.85
+81.62 , 1688.80 , 30.57
+81.62 , 1755.55 , 32.33
+81.62 , 1822.30 , 34.13
+81.62 , 1889.05 , 35.97
+81.62 , 1955.80 , 37.85
+81.62 , 2022.55 , 39.78
+81.62 , 2089.30 , 41.74
+81.62 , 2156.05 , 43.75
+122.43 , -2421.34 , -5.62
+122.43 , -2346.32 , -6.06
+122.43 , -2271.30 , -6.46
+122.43 , -2196.29 , -6.81
+122.43 , -2121.27 , -7.13
+122.43 , -2046.25 , -7.40
+122.43 , -1971.24 , -7.63
+122.43 , -1896.22 , -7.83
+122.43 , -1821.20 , -7.98
+122.43 , -1746.19 , -8.09
+122.43 , -1671.17 , -8.16
+122.43 , -1596.15 , -8.19
+122.43 , -1521.14 , -8.18
+122.43 , -1446.12 , -8.13
+122.43 , -1371.10 , -8.04
+122.43 , -1296.09 , -7.91
+122.43 , -1221.07 , -7.73
+122.43 , -1146.05 , -7.52
+122.43 , -1071.04 , -7.26
+122.43 , -996.02 , -6.97
+122.43 , -920.35 , -6.64
+122.43 , -844.14 , -6.28
+122.43 , -767.84 , -5.88
+122.43 , -688.97 , -5.47
+122.43 , -610.11 , -5.02
+122.43 , -531.24 , -4.53
+122.43 , -452.38 , -4.00
+122.43 , -373.52 , -3.43
+122.43 , -294.65 , -2.82
+122.43 , -215.79 , -2.16
+122.43 , -136.93 , -1.47
+122.43 , -58.06 , -0.74
+122.43 , 20.80 , 0.10
+122.43 , 87.55 , 1.12
+122.43 , 154.30 , 2.18
+122.43 , 221.05 , 3.28
+122.43 , 287.80 , 4.43
+122.43 , 354.55 , 5.61
+122.43 , 421.30 , 6.84
+122.43 , 488.05 , 8.11
+122.43 , 554.80 , 9.42
+122.43 , 621.55 , 10.77
+122.43 , 688.30 , 12.16
+122.43 , 755.05 , 13.60
+122.43 , 821.80 , 15.07
+122.43 , 888.56 , 16.59
+122.43 , 955.31 , 18.15
+122.43 , 1022.06 , 19.75
+122.43 , 1088.81 , 21.39
+122.43 , 1155.56 , 23.08
+122.43 , 1222.31 , 24.80
+122.43 , 1289.06 , 26.57
+122.43 , 1355.81 , 28.38
+122.43 , 1422.56 , 30.23
+122.43 , 1489.31 , 32.12
+122.43 , 1556.06 , 34.05
+122.43 , 1622.81 , 36.03
+122.43 , 1689.56 , 38.04
+122.43 , 1756.31 , 40.10
+122.43 , 1823.06 , 42.20
+122.43 , 1889.81 , 44.34
+122.43 , 1956.56 , 46.52
+122.43 , 2023.31 , 48.75
+122.43 , 2090.06 , 51.01
+122.43 , 2156.81 , 53.32
+163.24 , -2422.09 , -15.28
+163.24 , -2347.08 , -15.41
+163.24 , -2272.06 , -15.49
+163.24 , -2197.04 , -15.54
+163.24 , -2122.03 , -15.55
+163.24 , -2047.01 , -15.52
+163.24 , -1971.99 , -15.44
+163.24 , -1896.98 , -15.33
+163.24 , -1821.96 , -15.17
+163.24 , -1746.94 , -14.97
+163.24 , -1671.93 , -14.74
+163.24 , -1596.91 , -14.46
+163.24 , -1521.89 , -14.14
+163.24 , -1446.88 , -13.78
+163.24 , -1371.86 , -13.38
+163.24 , -1296.84 , -12.94
+163.24 , -1221.83 , -12.46
+163.24 , -1146.81 , -11.94
+163.24 , -1071.79 , -11.38
+163.24 , -996.78 , -10.77
+163.24 , -920.78 , -10.15
+163.24 , -843.97 , -9.49
+163.24 , -767.08 , -8.80
+163.24 , -688.22 , -8.10
+163.24 , -609.35 , -7.36
+163.24 , -530.49 , -6.58
+163.24 , -451.62 , -5.75
+163.24 , -372.76 , -4.89
+163.24 , -293.90 , -3.99
+163.24 , -215.03 , -3.04
+163.24 , -136.17 , -2.06
+163.24 , -57.31 , -1.03
+163.24 , 21.56 , 0.10
+163.24 , 88.31 , 1.42
+163.24 , 155.06 , 2.78
+163.24 , 221.81 , 4.18
+163.24 , 288.56 , 5.62
+163.24 , 355.31 , 7.11
+163.24 , 422.06 , 8.63
+163.24 , 488.81 , 10.20
+163.24 , 555.56 , 11.81
+163.24 , 622.31 , 13.46
+163.24 , 689.06 , 15.15
+163.24 , 755.81 , 16.89
+163.24 , 822.56 , 18.66
+163.24 , 889.31 , 20.48
+163.24 , 956.06 , 22.34
+163.24 , 1022.81 , 24.23
+163.24 , 1089.56 , 26.18
+163.24 , 1156.31 , 28.16
+163.24 , 1223.06 , 30.18
+163.24 , 1289.81 , 32.25
+163.24 , 1356.56 , 34.36
+163.24 , 1423.31 , 36.50
+163.24 , 1490.06 , 38.70
+163.24 , 1556.81 , 40.93
+163.24 , 1623.56 , 43.20
+163.24 , 1690.31 , 45.51
+163.24 , 1757.06 , 47.87
+163.24 , 1823.81 , 50.27
+163.24 , 1890.57 , 52.71
+163.24 , 1957.32 , 55.19
+163.24 , 2024.07 , 57.71
+163.24 , 2090.82 , 60.28
+163.24 , 2157.57 , 62.88
+204.04 , -2422.85 , -24.92
+204.04 , -2347.83 , -24.74
+204.04 , -2272.82 , -24.52
+204.04 , -2197.80 , -24.26
+204.04 , -2122.78 , -23.96
+204.04 , -2047.77 , -23.62
+204.04 , -1972.75 , -23.24
+204.04 , -1897.73 , -22.82
+204.04 , -1822.72 , -22.35
+204.04 , -1747.70 , -21.85
+204.04 , -1672.68 , -21.30
+204.04 , -1597.67 , -20.72
+204.04 , -1522.65 , -20.09
+204.04 , -1447.63 , -19.42
+204.04 , -1372.62 , -18.72
+204.04 , -1297.60 , -17.97
+204.04 , -1222.58 , -17.18
+204.04 , -1147.56 , -16.35
+204.04 , -1072.55 , -15.48
+204.04 , -997.53 , -14.57
+204.04 , -921.21 , -13.64
+204.04 , -843.79 , -12.70
+204.04 , -766.32 , -11.72
+204.04 , -687.46 , -10.73
+204.04 , -608.60 , -9.70
+204.04 , -529.73 , -8.62
+204.04 , -450.87 , -7.51
+204.04 , -372.00 , -6.35
+204.04 , -293.14 , -5.16
+204.04 , -214.28 , -3.92
+204.04 , -135.41 , -2.65
+204.04 , -56.55 , -1.33
+204.04 , 22.31 , 0.10
+204.04 , 89.06 , 1.71
+204.04 , 155.81 , 3.37
+204.04 , 222.57 , 5.07
+204.04 , 289.32 , 6.81
+204.04 , 356.07 , 8.60
+204.04 , 422.82 , 10.42
+204.04 , 489.57 , 12.29
+204.04 , 556.32 , 14.20
+204.04 , 623.07 , 16.15
+204.04 , 689.82 , 18.14
+204.04 , 756.57 , 20.17
+204.04 , 823.32 , 22.24
+204.04 , 890.07 , 24.36
+204.04 , 956.82 , 26.52
+204.04 , 1023.57 , 28.72
+204.04 , 1090.32 , 30.96
+204.04 , 1157.07 , 33.24
+204.04 , 1223.82 , 35.56
+204.04 , 1290.57 , 37.93
+204.04 , 1357.32 , 40.33
+204.04 , 1424.07 , 42.78
+204.04 , 1490.82 , 45.27
+204.04 , 1557.57 , 47.80
+204.04 , 1624.32 , 50.37
+204.04 , 1691.07 , 52.98
+204.04 , 1757.82 , 55.64
+204.04 , 1824.57 , 58.34
+204.04 , 1891.32 , 61.07
+204.04 , 1958.07 , 63.85
+204.04 , 2024.82 , 66.68
+204.04 , 2091.57 , 69.54
+204.04 , 2158.32 , 72.44
+244.85 , -2423.61 , -34.56
+244.85 , -2348.59 , -34.07
+244.85 , -2273.57 , -33.54
+244.85 , -2198.56 , -32.97
+244.85 , -2123.54 , -32.37
+244.85 , -2048.52 , -31.72
+244.85 , -1973.51 , -31.03
+244.85 , -1898.49 , -30.29
+244.85 , -1823.47 , -29.52
+244.85 , -1748.46 , -28.71
+244.85 , -1673.44 , -27.86
+244.85 , -1598.42 , -26.96
+244.85 , -1523.40 , -26.03
+244.85 , -1448.39 , -25.05
+244.85 , -1373.37 , -24.04
+244.85 , -1298.35 , -22.98
+244.85 , -1223.34 , -21.88
+244.85 , -1148.32 , -20.75
+244.85 , -1073.30 , -19.57
+244.85 , -998.29 , -18.35
+244.85 , -921.63 , -17.13
+244.85 , -843.62 , -15.91
+244.85 , -765.57 , -14.64
+244.85 , -686.70 , -13.36
+244.85 , -607.84 , -12.04
+244.85 , -528.98 , -10.67
+244.85 , -450.11 , -9.27
+244.85 , -371.25 , -7.82
+244.85 , -292.38 , -6.33
+244.85 , -213.52 , -4.81
+244.85 , -134.66 , -3.24
+244.85 , -55.79 , -1.63
+244.85 , 23.07 , 0.09
+244.85 , 89.82 , 2.01
+244.85 , 156.57 , 3.97
+244.85 , 223.32 , 5.96
+244.85 , 290.07 , 8.01
+244.85 , 356.82 , 10.09
+244.85 , 423.57 , 12.21
+244.85 , 490.32 , 14.38
+244.85 , 557.07 , 16.58
+244.85 , 623.82 , 18.83
+244.85 , 690.57 , 21.12
+244.85 , 757.32 , 23.45
+244.85 , 824.07 , 25.83
+244.85 , 890.82 , 28.24
+244.85 , 957.57 , 30.70
+244.85 , 1024.32 , 33.19
+244.85 , 1091.07 , 35.73
+244.85 , 1157.82 , 38.31
+244.85 , 1224.58 , 40.94
+244.85 , 1291.33 , 43.60
+244.85 , 1358.08 , 46.30
+244.85 , 1424.83 , 49.05
+244.85 , 1491.58 , 51.84
+244.85 , 1558.33 , 54.67
+244.85 , 1625.08 , 57.54
+244.85 , 1691.83 , 60.45
+244.85 , 1758.58 , 63.41
+244.85 , 1825.33 , 66.40
+244.85 , 1892.08 , 69.44
+244.85 , 1958.83 , 72.52
+244.85 , 2025.58 , 75.64
+244.85 , 2092.33 , 78.80
+244.85 , 2159.08 , 82.00
+285.67 , -2424.36 , -44.18
+285.67 , -2349.35 , -43.38
+285.67 , -2274.33 , -42.55
+285.67 , -2199.31 , -41.67
+285.67 , -2124.29 , -40.76
+285.67 , -2049.28 , -39.80
+285.67 , -1974.26 , -38.80
+285.67 , -1899.24 , -37.76
+285.67 , -1824.23 , -36.68
+285.67 , -1749.21 , -35.56
+285.67 , -1674.19 , -34.40
+285.67 , -1599.18 , -33.20
+285.67 , -1524.16 , -31.96
+285.67 , -1449.14 , -30.67
+285.67 , -1374.13 , -29.35
+285.67 , -1299.11 , -27.98
+285.67 , -1224.09 , -26.58
+285.67 , -1149.08 , -25.13
+285.67 , -1074.06 , -23.65
+285.67 , -999.04 , -22.12
+285.67 , -922.06 , -20.61
+285.67 , -843.44 , -19.11
+285.67 , -764.81 , -17.57
+285.67 , -685.95 , -15.99
+285.67 , -607.08 , -14.38
+285.67 , -528.22 , -12.72
+285.67 , -449.36 , -11.02
+285.67 , -370.49 , -9.29
+285.67 , -291.63 , -7.51
+285.67 , -212.76 , -5.69
+285.67 , -133.90 , -3.83
+285.67 , -55.04 , -1.93
+285.67 , 23.83 , 0.08
+285.67 , 90.58 , 2.30
+285.67 , 157.33 , 4.56
+285.67 , 224.08 , 6.85
+285.67 , 290.83 , 9.19
+285.67 , 357.58 , 11.58
+285.67 , 424.33 , 14.00
+285.67 , 491.08 , 16.46
+285.67 , 557.83 , 18.97
+285.67 , 624.58 , 21.52
+285.67 , 691.33 , 24.10
+285.67 , 758.08 , 26.73
+285.67 , 824.83 , 29.41
+285.67 , 891.58 , 32.12
+285.67 , 958.33 , 34.87
+285.67 , 1025.08 , 37.67
+285.67 , 1091.83 , 40.51
+285.67 , 1158.58 , 43.39
+285.67 , 1225.33 , 46.31
+285.67 , 1292.08 , 49.27
+285.67 , 1358.83 , 52.27
+285.67 , 1425.58 , 55.32
+285.67 , 1492.33 , 58.41
+285.67 , 1559.08 , 61.53
+285.67 , 1625.83 , 64.70
+285.67 , 1692.58 , 67.92
+285.67 , 1759.33 , 71.17
+285.67 , 1826.08 , 74.46
+285.67 , 1892.83 , 77.80
+285.67 , 1959.58 , 81.18
+285.67 , 2026.33 , 84.60
+285.67 , 2093.08 , 88.06
+285.67 , 2159.84 , 91.56
+326.47 , -2425.12 , -53.79
+326.47 , -2350.10 , -52.69
+326.47 , -2275.08 , -51.55
+326.47 , -2200.07 , -50.36
+326.47 , -2125.05 , -49.14
+326.47 , -2050.03 , -47.87
+326.47 , -1975.02 , -46.56
+326.47 , -1900.00 , -45.22
+326.47 , -1824.98 , -43.83
+326.47 , -1749.97 , -42.40
+326.47 , -1674.95 , -40.93
+326.47 , -1599.93 , -39.42
+326.47 , -1524.92 , -37.87
+326.47 , -1449.90 , -36.28
+326.47 , -1374.88 , -34.65
+326.47 , -1299.87 , -32.98
+326.47 , -1224.85 , -31.26
+326.47 , -1149.81 , -29.51
+326.47 , -1074.44 , -27.73
+326.47 , -999.06 , -25.90
+326.47 , -921.78 , -24.11
+326.47 , -842.92 , -22.32
+326.47 , -764.05 , -20.50
+326.47 , -685.19 , -18.63
+326.47 , -606.33 , -16.72
+326.47 , -527.46 , -14.77
+326.47 , -448.60 , -12.79
+326.47 , -369.74 , -10.76
+326.47 , -290.87 , -8.69
+326.47 , -212.01 , -6.58
+326.47 , -133.14 , -4.43
+326.47 , -54.28 , -2.23
+326.47 , 24.58 , 0.08
+326.47 , 91.33 , 2.59
+326.47 , 158.08 , 5.15
+326.47 , 224.83 , 7.74
+326.47 , 291.58 , 10.38
+326.47 , 358.33 , 13.06
+326.47 , 425.08 , 15.78
+326.47 , 491.83 , 18.55
+326.47 , 558.59 , 21.35
+326.47 , 625.34 , 24.20
+326.47 , 692.09 , 27.09
+326.47 , 758.84 , 30.01
+326.47 , 825.59 , 32.99
+326.47 , 892.34 , 36.00
+326.47 , 959.09 , 39.05
+326.47 , 1025.84 , 42.15
+326.47 , 1092.59 , 45.28
+326.47 , 1159.34 , 48.46
+326.47 , 1226.09 , 51.68
+326.47 , 1292.84 , 54.94
+326.47 , 1359.59 , 58.24
+326.47 , 1426.34 , 61.59
+326.47 , 1493.09 , 64.97
+326.47 , 1559.84 , 68.40
+326.47 , 1626.59 , 71.87
+326.47 , 1693.34 , 75.38
+326.47 , 1760.09 , 78.93
+326.47 , 1826.84 , 82.53
+326.47 , 1893.59 , 86.16
+326.47 , 1960.34 , 89.84
+326.47 , 2027.09 , 93.55
+326.47 , 2093.84 , 97.31
+326.47 , 2160.59 , 101.11
+367.28 , -2425.87 , -63.39
+367.28 , -2350.86 , -61.98
+367.28 , -2275.84 , -60.53
+367.28 , -2200.82 , -59.04
+367.28 , -2125.81 , -57.51
+367.28 , -2050.79 , -55.93
+367.28 , -1975.77 , -54.32
+367.28 , -1900.76 , -52.66
+367.28 , -1825.74 , -50.97
+367.28 , -1750.72 , -49.23
+367.28 , -1675.71 , -47.45
+367.28 , -1600.69 , -45.64
+367.28 , -1525.67 , -43.78
+367.28 , -1450.66 , -41.88
+367.28 , -1375.64 , -39.94
+367.28 , -1300.62 , -37.96
+367.28 , -1225.61 , -35.94
+367.28 , -1150.54 , -33.88
+367.28 , -1074.56 , -31.81
+367.28 , -998.58 , -29.71
+367.28 , -921.03 , -27.62
+367.28 , -842.16 , -25.54
+367.28 , -763.30 , -23.43
+367.28 , -684.43 , -21.27
+367.28 , -605.57 , -19.07
+367.28 , -526.71 , -16.83
+367.28 , -447.84 , -14.55
+367.28 , -368.98 , -12.23
+367.28 , -290.12 , -9.87
+367.28 , -211.25 , -7.47
+367.28 , -132.39 , -5.02
+367.28 , -53.52 , -2.54
+367.28 , 25.34 , 0.07
+367.28 , 92.09 , 2.88
+367.28 , 158.84 , 5.73
+367.28 , 225.59 , 8.63
+367.28 , 292.34 , 11.57
+367.28 , 359.09 , 14.55
+367.28 , 425.84 , 17.57
+367.28 , 492.59 , 20.63
+367.28 , 559.34 , 23.73
+367.28 , 626.09 , 26.88
+367.28 , 692.84 , 30.06
+367.28 , 759.59 , 33.29
+367.28 , 826.34 , 36.56
+367.28 , 893.09 , 39.87
+367.28 , 959.84 , 43.23
+367.28 , 1026.59 , 46.62
+367.28 , 1093.34 , 50.05
+367.28 , 1160.09 , 53.53
+367.28 , 1226.84 , 57.05
+367.28 , 1293.59 , 60.61
+367.28 , 1360.34 , 64.21
+367.28 , 1427.09 , 67.85
+367.28 , 1493.85 , 71.54
+367.28 , 1560.60 , 75.26
+367.28 , 1627.35 , 79.03
+367.28 , 1694.10 , 82.84
+367.28 , 1760.85 , 86.69
+367.28 , 1827.60 , 90.58
+367.28 , 1894.35 , 94.52
+367.28 , 1961.10 , 98.49
+367.28 , 2027.85 , 102.51
+367.28 , 2094.60 , 106.57
+367.28 , 2161.35 , 110.67
+408.09 , -2426.63 , -72.99
+408.09 , -2351.61 , -71.26
+408.09 , -2276.60 , -69.51
+408.09 , -2201.58 , -67.70
+408.09 , -2126.56 , -65.87
+408.09 , -2051.55 , -63.98
+408.09 , -1976.53 , -62.06
+408.09 , -1901.51 , -60.10
+408.09 , -1826.50 , -58.09
+408.09 , -1751.48 , -56.05
+408.09 , -1676.46 , -53.96
+408.09 , -1601.45 , -51.84
+408.09 , -1526.43 , -49.67
+408.09 , -1451.41 , -47.46
+408.09 , -1376.40 , -45.22
+408.09 , -1301.38 , -42.93
+408.09 , -1226.36 , -40.60
+408.09 , -1151.26 , -38.23
+408.09 , -1074.68 , -35.89
+408.09 , -998.10 , -33.51
+408.09 , -920.27 , -31.13
+408.09 , -841.41 , -28.77
+408.09 , -762.54 , -26.36
+408.09 , -683.68 , -23.91
+408.09 , -604.81 , -21.42
+408.09 , -525.95 , -18.89
+408.09 , -447.09 , -16.31
+408.09 , -368.22 , -13.70
+408.09 , -289.36 , -11.05
+408.09 , -210.50 , -8.36
+408.09 , -131.63 , -5.62
+408.09 , -52.77 , -2.85
+408.09 , 26.10 , 0.05
+408.09 , 92.85 , 3.17
+408.09 , 159.60 , 6.32
+408.09 , 226.35 , 9.51
+408.09 , 293.10 , 12.75
+408.09 , 359.85 , 16.03
+408.09 , 426.60 , 19.35
+408.09 , 493.35 , 22.71
+408.09 , 560.10 , 26.11
+408.09 , 626.85 , 29.55
+408.09 , 693.60 , 33.04
+408.09 , 760.35 , 36.57
+408.09 , 827.10 , 40.14
+408.09 , 893.85 , 43.74
+408.09 , 960.60 , 47.40
+408.09 , 1027.35 , 51.09
+408.09 , 1094.10 , 54.83
+408.09 , 1160.85 , 58.60
+408.09 , 1227.60 , 62.42
+408.09 , 1294.35 , 66.28
+408.09 , 1361.10 , 70.18
+408.09 , 1427.85 , 74.12
+408.09 , 1494.60 , 78.10
+408.09 , 1561.35 , 82.13
+408.09 , 1628.10 , 86.19
+408.09 , 1694.85 , 90.30
+408.09 , 1761.60 , 94.45
+408.09 , 1828.35 , 98.64
+408.09 , 1895.10 , 102.87
+408.09 , 1961.85 , 107.15
+408.09 , 2028.60 , 111.46
+408.09 , 2095.35 , 115.82
+408.09 , 2162.10 , 120.22
+448.90 , -2427.39 , -82.56
+448.90 , -2352.37 , -80.54
+448.90 , -2277.35 , -78.47
+448.90 , -2202.34 , -76.36
+448.90 , -2127.32 , -74.21
+448.90 , -2052.30 , -72.02
+448.90 , -1977.29 , -69.79
+448.90 , -1902.27 , -67.52
+448.90 , -1827.25 , -65.21
+448.90 , -1752.24 , -62.86
+448.90 , -1677.22 , -60.46
+448.90 , -1602.20 , -58.03
+448.90 , -1527.19 , -55.56
+448.90 , -1452.17 , -53.04
+448.90 , -1377.15 , -50.49
+448.90 , -1302.14 , -47.89
+448.90 , -1227.12 , -45.25
+448.90 , -1151.98 , -42.58
+448.90 , -1074.80 , -39.96
+448.90 , -997.61 , -37.31
+448.90 , -919.51 , -34.65
+448.90 , -840.65 , -31.99
+448.90 , -761.79 , -29.29
+448.90 , -682.92 , -26.55
+448.90 , -604.06 , -23.77
+448.90 , -525.19 , -20.95
+448.90 , -446.33 , -18.08
+448.90 , -367.47 , -15.18
+448.90 , -288.60 , -12.23
+448.90 , -209.74 , -9.25
+448.90 , -130.88 , -6.22
+448.90 , -52.01 , -3.16
+448.90 , 26.85 , 0.04
+448.90 , 93.60 , 3.45
+448.90 , 160.35 , 6.90
+448.90 , 227.10 , 10.40
+448.90 , 293.85 , 13.93
+448.90 , 360.60 , 17.51
+448.90 , 427.35 , 21.13
+448.90 , 494.10 , 24.79
+448.90 , 560.85 , 28.49
+448.90 , 627.60 , 32.23
+448.90 , 694.35 , 36.01
+448.90 , 761.10 , 39.84
+448.90 , 827.86 , 43.71
+448.90 , 894.61 , 47.62
+448.90 , 961.36 , 51.57
+448.90 , 1028.11 , 55.56
+448.90 , 1094.86 , 59.59
+448.90 , 1161.61 , 63.67
+448.90 , 1228.36 , 67.78
+448.90 , 1295.11 , 71.94
+448.90 , 1361.86 , 76.14
+448.90 , 1428.61 , 80.38
+448.90 , 1495.36 , 84.66
+448.90 , 1562.11 , 88.99
+448.90 , 1628.86 , 93.35
+448.90 , 1695.61 , 97.76
+448.90 , 1762.36 , 102.21
+448.90 , 1829.11 , 106.70
+448.90 , 1895.86 , 111.23
+448.90 , 1962.61 , 115.80
+448.90 , 2029.36 , 120.42
+448.90 , 2096.11 , 125.07
+448.90 , 2162.86 , 129.77
+489.71 , -2428.14 , -92.13
+489.71 , -2353.13 , -89.80
+489.71 , -2278.11 , -87.42
+489.71 , -2203.09 , -85.01
+489.71 , -2128.08 , -82.55
+489.71 , -2053.06 , -80.05
+489.71 , -1978.04 , -77.51
+489.71 , -1903.03 , -74.94
+489.71 , -1828.01 , -72.31
+489.71 , -1752.99 , -69.65
+489.71 , -1677.98 , -66.95
+489.71 , -1602.96 , -64.21
+489.71 , -1527.94 , -61.43
+489.71 , -1452.93 , -58.61
+489.71 , -1377.91 , -55.74
+489.71 , -1302.89 , -52.84
+489.71 , -1227.88 , -49.89
+489.71 , -1152.71 , -46.92
+489.71 , -1074.92 , -44.03
+489.71 , -997.13 , -41.10
+489.71 , -918.76 , -38.17
+489.71 , -839.89 , -35.22
+489.71 , -761.03 , -32.23
+489.71 , -682.17 , -29.19
+489.71 , -603.30 , -26.12
+489.71 , -524.44 , -23.01
+489.71 , -445.57 , -19.85
+489.71 , -366.71 , -16.66
+489.71 , -287.85 , -13.42
+489.71 , -208.98 , -10.14
+489.71 , -130.12 , -6.83
+489.71 , -51.26 , -3.47
+489.71 , 27.61 , 0.02
+489.71 , 94.36 , 3.73
+489.71 , 161.11 , 7.48
+489.71 , 227.86 , 11.28
+489.71 , 294.61 , 15.11
+489.71 , 361.36 , 18.99
+489.71 , 428.11 , 22.90
+489.71 , 494.86 , 26.86
+489.71 , 561.61 , 30.86
+489.71 , 628.36 , 34.90
+489.71 , 695.11 , 38.99
+489.71 , 761.86 , 43.11
+489.71 , 828.61 , 47.28
+489.71 , 895.36 , 51.49
+489.71 , 962.11 , 55.73
+489.71 , 1028.86 , 60.03
+489.71 , 1095.61 , 64.36
+489.71 , 1162.36 , 68.73
+489.71 , 1229.11 , 73.15
+489.71 , 1295.86 , 77.60
+489.71 , 1362.61 , 82.10
+489.71 , 1429.36 , 86.64
+489.71 , 1496.11 , 91.22
+489.71 , 1562.86 , 95.85
+489.71 , 1629.61 , 100.51
+489.71 , 1696.36 , 105.22
+489.71 , 1763.12 , 109.96
+489.71 , 1829.87 , 114.75
+489.71 , 1896.62 , 119.58
+489.71 , 1963.37 , 124.45
+489.71 , 2030.12 , 129.37
+489.71 , 2096.87 , 134.32
+489.71 , 2163.62 , 139.32
+816.18 , -2434.19 , -168.29
+816.18 , -2359.18 , -163.49
+816.18 , -2284.16 , -158.66
+816.18 , -2209.14 , -153.77
+816.18 , -2134.13 , -148.85
+816.18 , -2059.11 , -143.89
+816.18 , -1984.09 , -138.89
+816.18 , -1909.08 , -133.85
+816.18 , -1834.06 , -128.76
+816.18 , -1759.04 , -123.64
+816.18 , -1684.03 , -118.47
+816.18 , -1609.01 , -113.27
+816.18 , -1533.99 , -108.02
+816.18 , -1458.98 , -102.73
+816.18 , -1383.96 , -97.41
+816.18 , -1306.83 , -92.22
+816.18 , -1228.07 , -87.13
+816.18 , -1149.30 , -82.00
+816.18 , -1070.43 , -76.84
+816.18 , -991.57 , -71.64
+816.18 , -912.71 , -66.39
+816.18 , -833.84 , -61.11
+816.18 , -754.98 , -55.79
+816.18 , -676.11 , -50.42
+816.18 , -597.25 , -45.02
+816.18 , -518.39 , -39.57
+816.18 , -439.52 , -34.08
+816.18 , -360.66 , -28.55
+816.18 , -281.80 , -22.99
+816.18 , -202.93 , -17.38
+816.18 , -124.07 , -11.73
+816.18 , -45.20 , -6.04
+816.18 , 33.66 , -0.18
+816.18 , 100.41 , 5.92
+816.18 , 167.16 , 12.07
+816.18 , 233.91 , 18.25
+816.18 , 300.66 , 24.48
+816.18 , 367.41 , 30.74
+816.18 , 434.16 , 37.05
+816.18 , 500.91 , 43.40
+816.18 , 567.66 , 49.79
+816.18 , 634.41 , 56.22
+816.18 , 701.16 , 62.70
+816.18 , 767.91 , 69.21
+816.18 , 834.66 , 75.77
+816.18 , 901.41 , 82.37
+816.18 , 968.16 , 89.01
+816.18 , 1034.91 , 95.69
+816.18 , 1101.66 , 102.41
+816.18 , 1168.41 , 109.18
+816.18 , 1235.16 , 115.98
+816.18 , 1301.91 , 122.83
+816.18 , 1368.66 , 129.72
+816.18 , 1435.41 , 136.65
+816.18 , 1502.16 , 143.63
+816.18 , 1568.91 , 150.64
+816.18 , 1635.67 , 157.69
+816.18 , 1702.42 , 164.79
+816.18 , 1769.17 , 171.93
+816.18 , 1835.92 , 179.11
+816.18 , 1902.67 , 186.33
+816.18 , 1969.42 , 193.59
+816.18 , 2036.17 , 200.90
+816.18 , 2102.92 , 208.24
+816.18 , 2169.67 , 215.63
+1020.26 , -2437.98 , -215.54
+1020.26 , -2362.96 , -209.20
+1020.26 , -2287.94 , -202.82
+1020.26 , -2212.93 , -196.40
+1020.26 , -2137.91 , -189.94
+1020.26 , -2062.89 , -183.44
+1020.26 , -1987.88 , -176.90
+1020.26 , -1912.86 , -170.31
+1020.26 , -1837.84 , -163.69
+1020.26 , -1762.83 , -157.02
+1020.26 , -1687.81 , -150.32
+1020.26 , -1612.79 , -143.57
+1020.26 , -1537.56 , -136.81
+1020.26 , -1459.63 , -130.30
+1020.26 , -1381.70 , -123.74
+1020.26 , -1303.24 , -117.20
+1020.26 , -1224.38 , -110.66
+1020.26 , -1145.51 , -104.08
+1020.26 , -1066.65 , -97.46
+1020.26 , -987.79 , -90.80
+1020.26 , -908.92 , -84.10
+1020.26 , -830.06 , -77.36
+1020.26 , -751.20 , -70.58
+1020.26 , -672.33 , -63.75
+1020.26 , -593.47 , -56.89
+1020.26 , -514.61 , -49.99
+1020.26 , -435.74 , -43.04
+1020.26 , -356.88 , -36.06
+1020.26 , -278.01 , -29.03
+1020.26 , -199.15 , -21.96
+1020.26 , -120.29 , -14.86
+1020.26 , -41.42 , -7.71
+1020.26 , 37.44 , -0.37
+1020.26 , 104.19 , 7.23
+1020.26 , 170.94 , 14.87
+1020.26 , 237.69 , 22.54
+1020.26 , 304.44 , 30.26
+1020.26 , 371.19 , 38.02
+1020.26 , 437.94 , 45.83
+1020.26 , 504.69 , 53.67
+1020.26 , 571.44 , 61.56
+1020.26 , 638.19 , 69.48
+1020.26 , 704.94 , 77.45
+1020.26 , 771.69 , 85.46
+1020.26 , 838.44 , 93.51
+1020.26 , 905.19 , 101.61
+1020.26 , 971.94 , 109.74
+1020.26 , 1038.69 , 117.92
+1020.26 , 1105.45 , 126.14
+1020.26 , 1172.20 , 134.39
+1020.26 , 1238.95 , 142.69
+1020.26 , 1305.70 , 151.04
+1020.26 , 1372.45 , 159.42
+1020.26 , 1439.20 , 167.85
+1020.26 , 1505.95 , 176.31
+1020.26 , 1572.70 , 184.82
+1020.26 , 1639.45 , 193.37
+1020.26 , 1706.20 , 201.96
+1020.26 , 1772.95 , 210.59
+1020.26 , 1839.70 , 219.27
+1020.26 , 1906.45 , 227.98
+1020.26 , 1973.20 , 236.73
+1020.26 , 2039.95 , 245.53
+1020.26 , 2106.70 , 254.39
+1020.26 , 2173.45 , 263.26
+1224.27 , -2441.76 , -262.51
+1224.27 , -2366.74 , -254.64
+1224.27 , -2291.72 , -246.73
+1224.27 , -2216.71 , -238.76
+1224.27 , -2141.69 , -230.76
+1224.27 , -2066.67 , -222.71
+1224.27 , -1991.66 , -214.63
+1224.27 , -1916.64 , -206.51
+1224.27 , -1841.62 , -198.35
+1224.27 , -1766.61 , -190.14
+1224.27 , -1690.38 , -182.05
+1224.27 , -1613.28 , -174.03
+1224.27 , -1536.05 , -165.99
+1224.27 , -1457.19 , -158.11
+1224.27 , -1378.32 , -150.20
+1224.27 , -1299.46 , -142.25
+1224.27 , -1220.60 , -134.25
+1224.27 , -1141.73 , -126.21
+1224.27 , -1062.87 , -118.14
+1224.27 , -984.01 , -110.02
+1224.27 , -905.14 , -101.86
+1224.27 , -826.28 , -93.66
+1224.27 , -747.42 , -85.42
+1224.27 , -668.55 , -77.14
+1224.27 , -589.69 , -68.82
+1224.27 , -510.82 , -60.46
+1224.27 , -431.96 , -52.06
+1224.27 , -353.10 , -43.61
+1224.27 , -274.23 , -35.13
+1224.27 , -195.37 , -26.60
+1224.27 , -116.51 , -18.04
+1224.27 , -37.64 , -9.43
+1224.27 , 41.22 , -0.60
+1224.27 , 107.97 , 8.49
+1224.27 , 174.72 , 17.62
+1224.27 , 241.47 , 26.79
+1224.27 , 308.22 , 36.00
+1224.27 , 374.97 , 45.26
+1224.27 , 441.72 , 54.56
+1224.27 , 508.47 , 63.89
+1224.27 , 575.22 , 73.27
+1224.27 , 641.97 , 82.69
+1224.27 , 708.72 , 92.16
+1224.27 , 775.47 , 101.66
+1224.27 , 842.23 , 111.21
+1224.27 , 908.98 , 120.79
+1224.27 , 975.73 , 130.43
+1224.27 , 1042.48 , 140.09
+1224.27 , 1109.23 , 149.81
+1224.27 , 1175.98 , 159.56
+1224.27 , 1242.73 , 169.36
+1224.27 , 1309.48 , 179.19
+1224.27 , 1376.23 , 189.07
+1224.27 , 1442.98 , 198.99
+1224.27 , 1509.73 , 208.95
+1224.27 , 1576.48 , 218.95
+1224.27 , 1643.23 , 229.00
+1224.27 , 1709.98 , 239.07
+1224.27 , 1776.73 , 249.20
+1224.27 , 1843.48 , 259.37
+1224.27 , 1910.23 , 269.59
+1224.27 , 1976.98 , 279.84
+1224.27 , 2043.73 , 290.13
+1224.27 , 2110.48 , 300.47
+1224.27 , 2177.23 , 310.84
+1428.29 , -2445.54 , -309.21
+1428.29 , -2370.52 , -299.80
+1428.29 , -2295.50 , -290.34
+1428.29 , -2220.49 , -280.83
+1428.29 , -2145.47 , -271.30
+1428.29 , -2070.45 , -261.72
+1428.29 , -1995.44 , -252.09
+1428.29 , -1920.31 , -242.45
+1428.29 , -1844.04 , -232.93
+1428.29 , -1767.78 , -223.37
+1428.29 , -1690.00 , -214.00
+1428.29 , -1611.14 , -204.75
+1428.29 , -1532.27 , -195.46
+1428.29 , -1453.41 , -186.13
+1428.29 , -1374.54 , -176.76
+1428.29 , -1295.68 , -167.35
+1428.29 , -1216.82 , -157.89
+1428.29 , -1137.95 , -148.40
+1428.29 , -1059.09 , -138.86
+1428.29 , -980.23 , -129.29
+1428.29 , -901.36 , -119.67
+1428.29 , -822.50 , -110.01
+1428.29 , -743.63 , -100.32
+1428.29 , -664.77 , -90.58
+1428.29 , -585.91 , -80.80
+1428.29 , -507.04 , -70.98
+1428.29 , -428.18 , -61.12
+1428.29 , -349.32 , -51.22
+1428.29 , -270.45 , -41.28
+1428.29 , -191.59 , -31.29
+1428.29 , -112.72 , -21.27
+1428.29 , -33.86 , -11.21
+1428.29 , 45.00 , -0.89
+1428.29 , 111.75 , 9.69
+1428.29 , 178.50 , 20.32
+1428.29 , 245.25 , 30.98
+1428.29 , 312.00 , 41.69
+1428.29 , 378.75 , 52.44
+1428.29 , 445.50 , 63.23
+1428.29 , 512.25 , 74.07
+1428.29 , 579.01 , 84.94
+1428.29 , 645.76 , 95.86
+1428.29 , 712.51 , 106.81
+1428.29 , 779.26 , 117.81
+1428.29 , 846.01 , 128.85
+1428.29 , 912.76 , 139.94
+1428.29 , 979.51 , 151.06
+1428.29 , 1046.26 , 162.22
+1428.29 , 1113.01 , 173.43
+1428.29 , 1179.76 , 184.68
+1428.29 , 1246.51 , 195.97
+1428.29 , 1313.26 , 207.30
+1428.29 , 1380.01 , 218.67
+1428.29 , 1446.76 , 230.08
+1428.29 , 1513.51 , 241.53
+1428.29 , 1580.26 , 253.05
+1428.29 , 1647.01 , 264.56
+1428.29 , 1713.76 , 276.15
+1428.29 , 1780.51 , 287.77
+1428.29 , 1847.26 , 299.43
+1428.29 , 1914.01 , 311.14
+1428.29 , 1980.76 , 322.88
+1428.29 , 2047.51 , 334.69
+1428.29 , 2114.26 , 346.49
+1428.29 , 2181.01 , 358.37
+1632.39 , -2449.32 , -355.65
+1632.39 , -2374.30 , -344.69
+1632.39 , -2299.29 , -333.69
+1632.39 , -2224.27 , -322.64
+1632.39 , -2149.25 , -311.57
+1632.39 , -2073.99 , -300.49
+1632.39 , -1998.55 , -289.39
+1632.39 , -1922.81 , -278.32
+1632.39 , -1843.94 , -267.74
+1632.39 , -1765.08 , -257.10
+1632.39 , -1686.22 , -246.45
+1632.39 , -1607.35 , -235.73
+1632.39 , -1528.49 , -224.99
+1632.39 , -1449.63 , -214.20
+1632.39 , -1370.76 , -203.37
+1632.39 , -1291.90 , -192.49
+1632.39 , -1213.03 , -181.59
+1632.39 , -1134.17 , -170.63
+1632.39 , -1055.31 , -159.64
+1632.39 , -976.44 , -148.61
+1632.39 , -897.58 , -137.53
+1632.39 , -818.72 , -126.42
+1632.39 , -739.85 , -115.26
+1632.39 , -660.99 , -104.07
+1632.39 , -582.12 , -92.83
+1632.39 , -503.26 , -81.55
+1632.39 , -424.40 , -70.23
+1632.39 , -345.53 , -58.88
+1632.39 , -266.67 , -47.47
+1632.39 , -187.81 , -36.04
+1632.39 , -108.94 , -24.55
+1632.39 , -30.08 , -13.03
+1632.39 , 48.79 , -1.23
+1632.39 , 115.54 , 10.85
+1632.39 , 182.29 , 22.97
+1632.39 , 249.04 , 35.13
+1632.39 , 315.79 , 47.33
+1632.39 , 382.54 , 59.58
+1632.39 , 449.29 , 71.86
+1632.39 , 516.04 , 84.19
+1632.39 , 582.79 , 96.56
+1632.39 , 649.54 , 108.97
+1632.39 , 716.29 , 121.42
+1632.39 , 783.04 , 133.91
+1632.39 , 849.79 , 146.45
+1632.39 , 916.54 , 159.03
+1632.39 , 983.29 , 171.64
+1632.39 , 1050.04 , 184.30
+1632.39 , 1116.79 , 197.00
+1632.39 , 1183.54 , 209.74
+1632.39 , 1250.29 , 222.53
+1632.39 , 1317.04 , 235.34
+1632.39 , 1383.79 , 248.23
+1632.39 , 1450.54 , 261.14
+1632.39 , 1517.29 , 274.07
+1632.39 , 1584.04 , 287.06
+1632.39 , 1650.79 , 300.09
+1632.39 , 1717.54 , 313.17
+1632.39 , 1784.29 , 326.30
+1632.39 , 1851.04 , 339.45
+1632.39 , 1917.79 , 352.65
+1632.39 , 1984.54 , 365.88
+1632.39 , 2051.29 , 379.17
+1632.39 , 2118.04 , 392.50
+1632.39 , 2184.79 , 405.87
+1836.41 , -2453.10 , -401.80
+1836.41 , -2378.08 , -389.31
+1836.41 , -2303.07 , -376.77
+1836.41 , -2228.05 , -364.20
+1836.41 , -2153.03 , -351.56
+1836.41 , -2075.96 , -339.32
+1836.41 , -1997.51 , -327.26
+1836.41 , -1919.03 , -315.20
+1836.41 , -1840.16 , -303.15
+1836.41 , -1761.30 , -291.06
+1836.41 , -1682.44 , -278.94
+1836.41 , -1603.57 , -266.77
+1836.41 , -1524.71 , -254.56
+1836.41 , -1445.84 , -242.31
+1836.41 , -1366.98 , -230.03
+1836.41 , -1288.12 , -217.70
+1836.41 , -1209.25 , -205.33
+1836.41 , -1130.39 , -192.92
+1836.41 , -1051.53 , -180.47
+1836.41 , -972.66 , -167.98
+1836.41 , -893.80 , -155.45
+1836.41 , -814.93 , -142.87
+1836.41 , -736.07 , -130.26
+1836.41 , -657.21 , -117.61
+1836.41 , -578.34 , -104.91
+1836.41 , -499.48 , -92.18
+1836.41 , -420.62 , -79.40
+1836.41 , -341.75 , -66.58
+1836.41 , -262.89 , -53.73
+1836.41 , -184.02 , -40.83
+1836.41 , -105.16 , -27.89
+1836.41 , -26.30 , -14.91
+1836.41 , 52.57 , -1.61
+1836.41 , 119.32 , 11.96
+1836.41 , 186.07 , 25.57
+1836.41 , 252.82 , 39.23
+1836.41 , 319.57 , 52.93
+1836.41 , 386.32 , 66.66
+1836.41 , 453.07 , 80.44
+1836.41 , 519.82 , 94.27
+1836.41 , 586.57 , 108.13
+1836.41 , 653.32 , 122.03
+1836.41 , 720.07 , 135.98
+1836.41 , 786.82 , 149.97
+1836.41 , 853.57 , 163.99
+1836.41 , 920.32 , 178.07
+1836.41 , 987.07 , 192.18
+1836.41 , 1053.82 , 206.33
+1836.41 , 1120.57 , 220.53
+1836.41 , 1187.32 , 234.77
+1836.41 , 1254.07 , 249.05
+1836.41 , 1320.82 , 263.36
+1836.41 , 1387.57 , 277.73
+1836.41 , 1454.32 , 292.13
+1836.41 , 1521.07 , 306.56
+1836.41 , 1587.82 , 321.05
+1836.41 , 1654.57 , 335.58
+1836.41 , 1721.32 , 350.15
+1836.41 , 1788.07 , 364.76
+1836.41 , 1854.82 , 379.41
+1836.41 , 1921.57 , 394.10
+1836.41 , 1988.32 , 408.84
+1836.41 , 2055.07 , 423.62
+1836.41 , 2121.82 , 438.44
+1836.41 , 2188.57 , 453.30
+2040.43 , -2456.88 , -447.70
+2040.43 , -2381.87 , -433.66
+2040.43 , -2306.57 , -419.64
+2040.43 , -2228.95 , -406.06
+2040.43 , -2151.34 , -392.46
+2040.43 , -2072.97 , -378.97
+2040.43 , -1994.11 , -365.56
+2040.43 , -1915.25 , -352.11
+2040.43 , -1836.38 , -338.60
+2040.43 , -1757.52 , -325.05
+2040.43 , -1678.65 , -311.48
+2040.43 , -1599.79 , -297.85
+2040.43 , -1520.93 , -284.18
+2040.43 , -1442.06 , -270.48
+2040.43 , -1363.20 , -256.73
+2040.43 , -1284.34 , -242.95
+2040.43 , -1205.47 , -229.12
+2040.43 , -1126.61 , -215.26
+2040.43 , -1047.74 , -201.35
+2040.43 , -968.88 , -187.40
+2040.43 , -890.02 , -173.41
+2040.43 , -811.15 , -159.38
+2040.43 , -732.29 , -145.31
+2040.43 , -653.43 , -131.20
+2040.43 , -574.56 , -117.04
+2040.43 , -495.70 , -102.85
+2040.43 , -416.83 , -88.62
+2040.43 , -337.97 , -74.34
+2040.43 , -259.11 , -60.03
+2040.43 , -180.24 , -45.67
+2040.43 , -101.38 , -31.28
+2040.43 , -22.52 , -16.84
+2040.43 , 56.35 , -2.05
+2040.43 , 123.10 , 13.02
+2040.43 , 189.85 , 28.13
+2040.43 , 256.60 , 43.28
+2040.43 , 323.35 , 58.47
+2040.43 , 390.10 , 73.70
+2040.43 , 456.85 , 88.97
+2040.43 , 523.60 , 104.29
+2040.43 , 590.35 , 119.65
+2040.43 , 657.10 , 135.05
+2040.43 , 723.85 , 150.49
+2040.43 , 790.60 , 165.97
+2040.43 , 857.35 , 181.49
+2040.43 , 924.10 , 197.06
+2040.43 , 990.85 , 212.66
+2040.43 , 1057.60 , 228.32
+2040.43 , 1124.35 , 244.00
+2040.43 , 1191.10 , 259.74
+2040.43 , 1257.85 , 275.51
+2040.43 , 1324.60 , 291.33
+2040.43 , 1391.35 , 307.17
+2040.43 , 1458.10 , 323.06
+2040.43 , 1524.85 , 339.00
+2040.43 , 1591.60 , 354.99
+2040.43 , 1658.35 , 371.02
+2040.43 , 1725.10 , 387.08
+2040.43 , 1791.85 , 403.17
+2040.43 , 1858.60 , 419.32
+2040.43 , 1925.35 , 435.50
+2040.43 , 1992.11 , 451.73
+2040.43 , 2058.86 , 468.01
+2040.43 , 2125.61 , 484.31
+2040.43 , 2192.36 , 500.69
+2244.53 , -2459.57 , -493.57
+2244.53 , -2382.79 , -478.41
+2244.53 , -2305.78 , -463.25
+2244.53 , -2226.92 , -448.50
+2244.53 , -2148.05 , -433.71
+2244.53 , -2069.19 , -418.87
+2244.53 , -1990.33 , -403.98
+2244.53 , -1911.46 , -389.06
+2244.53 , -1832.60 , -374.10
+2244.53 , -1753.74 , -359.11
+2244.53 , -1674.87 , -344.08
+2244.53 , -1596.01 , -328.99
+2244.53 , -1517.14 , -313.86
+2244.53 , -1438.28 , -298.70
+2244.53 , -1359.42 , -283.50
+2244.53 , -1280.55 , -268.27
+2244.53 , -1201.69 , -252.97
+2244.53 , -1122.83 , -237.65
+2244.53 , -1043.96 , -222.28
+2244.53 , -965.10 , -206.87
+2244.53 , -886.23 , -191.43
+2244.53 , -807.37 , -175.94
+2244.53 , -728.51 , -160.41
+2244.53 , -649.64 , -144.84
+2244.53 , -570.78 , -129.23
+2244.53 , -491.92 , -113.58
+2244.53 , -413.05 , -97.89
+2244.53 , -334.19 , -82.15
+2244.53 , -255.32 , -66.38
+2244.53 , -176.46 , -50.57
+2244.53 , -97.60 , -34.71
+2244.53 , -18.73 , -18.82
+2244.53 , 60.13 , -2.53
+2244.53 , 126.88 , 14.03
+2244.53 , 193.63 , 30.63
+2244.53 , 260.38 , 47.28
+2244.53 , 327.13 , 63.96
+2244.53 , 393.88 , 80.69
+2244.53 , 460.63 , 97.46
+2244.53 , 527.38 , 114.27
+2244.53 , 594.13 , 131.12
+2244.53 , 660.88 , 148.01
+2244.53 , 727.63 , 164.95
+2244.53 , 794.38 , 181.92
+2244.53 , 861.13 , 198.94
+2244.53 , 927.88 , 216.00
+2244.53 , 994.63 , 233.11
+2244.53 , 1061.38 , 250.25
+2244.53 , 1128.13 , 267.43
+2244.53 , 1194.88 , 284.64
+2244.53 , 1261.63 , 301.93
+2244.53 , 1328.39 , 319.24
+2244.53 , 1395.14 , 336.57
+2244.53 , 1461.89 , 353.97
+2244.53 , 1528.64 , 371.40
+2244.53 , 1595.39 , 388.88
+2244.53 , 1662.14 , 406.40
+2244.53 , 1728.89 , 423.95
+2244.53 , 1795.64 , 441.55
+2244.53 , 1862.39 , 459.20
+2244.53 , 1929.14 , 476.87
+2244.53 , 1995.89 , 494.59
+2244.53 , 2062.64 , 512.35
+2244.53 , 2129.39 , 530.17
+2244.53 , 2196.14 , 548.01
+2448.55 , -2459.73 , -539.88
+2448.55 , -2380.86 , -523.75
+2448.55 , -2302.00 , -507.56
+2448.55 , -2223.14 , -491.36
+2448.55 , -2144.27 , -475.08
+2448.55 , -2065.41 , -458.81
+2448.55 , -1986.55 , -442.46
+2448.55 , -1907.68 , -426.08
+2448.55 , -1828.82 , -409.66
+2448.55 , -1749.95 , -393.21
+2448.55 , -1671.09 , -376.72
+2448.55 , -1592.23 , -360.17
+2448.55 , -1513.36 , -343.61
+2448.55 , -1434.50 , -326.96
+2448.55 , -1355.64 , -310.32
+2448.55 , -1276.77 , -293.61
+2448.55 , -1197.91 , -276.87
+2448.55 , -1119.04 , -260.09
+2448.55 , -1040.18 , -243.26
+2448.55 , -961.32 , -226.40
+2448.55 , -882.45 , -209.49
+2448.55 , -803.59 , -192.55
+2448.55 , -724.73 , -175.56
+2448.55 , -645.86 , -158.53
+2448.55 , -567.00 , -141.46
+2448.55 , -488.13 , -124.36
+2448.55 , -409.27 , -107.21
+2448.55 , -330.41 , -90.02
+2448.55 , -251.54 , -72.79
+2448.55 , -172.68 , -55.52
+2448.55 , -93.82 , -38.20
+2448.55 , -14.95 , -20.85
+2448.55 , 63.91 , -3.07
+2448.55 , 130.66 , 14.99
+2448.55 , 197.41 , 33.09
+2448.55 , 264.16 , 51.23
+2448.55 , 330.91 , 69.41
+2448.55 , 397.66 , 87.63
+2448.55 , 464.41 , 105.89
+2448.55 , 531.16 , 124.19
+2448.55 , 597.91 , 142.54
+2448.55 , 664.66 , 160.93
+2448.55 , 731.41 , 179.36
+2448.55 , 798.16 , 197.83
+2448.55 , 864.91 , 216.34
+2448.55 , 931.66 , 234.90
+2448.55 , 998.41 , 253.48
+2448.55 , 1065.17 , 272.13
+2448.55 , 1131.92 , 290.81
+2448.55 , 1198.67 , 309.53
+2448.55 , 1265.42 , 328.28
+2448.55 , 1332.17 , 347.08
+2448.55 , 1398.92 , 365.92
+2448.55 , 1465.67 , 384.82
+2448.55 , 1532.42 , 403.74
+2448.55 , 1599.17 , 422.70
+2448.55 , 1665.92 , 441.72
+2448.55 , 1732.67 , 460.78
+2448.55 , 1799.42 , 479.87
+2448.55 , 1866.17 , 499.01
+2448.55 , 1932.92 , 518.17
+2448.55 , 1999.67 , 537.40
+2448.55 , 2066.42 , 556.66
+2448.55 , 2133.17 , 575.96
+2448.55 , 2199.92 , 595.29
+2652.56 , -2455.95 , -587.15
+2652.56 , -2377.08 , -569.56
+2652.56 , -2298.22 , -551.92
+2652.56 , -2219.36 , -534.26
+2652.56 , -2140.49 , -516.54
+2652.56 , -2061.63 , -498.78
+2652.56 , -1982.76 , -481.00
+2652.56 , -1903.90 , -463.16
+2652.56 , -1825.04 , -445.28
+2652.56 , -1746.17 , -427.38
+2652.56 , -1667.31 , -409.42
+2652.56 , -1588.45 , -391.42
+2652.56 , -1509.58 , -373.37
+2652.56 , -1430.72 , -355.29
+2652.56 , -1351.85 , -337.17
+2652.56 , -1272.99 , -319.02
+2652.56 , -1194.13 , -300.82
+2652.56 , -1115.26 , -282.58
+2652.56 , -1036.40 , -264.29
+2652.56 , -957.54 , -245.98
+2652.56 , -878.67 , -227.61
+2652.56 , -799.81 , -209.21
+2652.56 , -720.94 , -190.76
+2652.56 , -642.08 , -172.28
+2652.56 , -563.22 , -153.75
+2652.56 , -484.35 , -135.19
+2652.56 , -405.49 , -116.58
+2652.56 , -326.63 , -97.93
+2652.56 , -247.76 , -79.24
+2652.56 , -168.90 , -60.51
+2652.56 , -90.04 , -41.74
+2652.56 , -11.17 , -22.93
+2652.56 , 67.69 , -3.65
+2652.56 , 134.44 , 15.90
+2652.56 , 201.19 , 35.49
+2652.56 , 267.94 , 55.13
+2652.56 , 334.69 , 74.80
+2652.56 , 401.44 , 94.52
+2652.56 , 468.19 , 114.27
+2652.56 , 534.94 , 134.07
+2652.56 , 601.69 , 153.91
+2652.56 , 668.44 , 173.80
+2652.56 , 735.19 , 193.72
+2652.56 , 801.95 , 213.68
+2652.56 , 868.70 , 233.69
+2652.56 , 935.45 , 253.74
+2652.56 , 1002.20 , 273.83
+2652.56 , 1068.95 , 293.95
+2652.56 , 1135.70 , 314.14
+2652.56 , 1202.45 , 334.35
+2652.56 , 1269.20 , 354.59
+2652.56 , 1335.95 , 374.91
+2652.56 , 1402.70 , 395.24
+2652.56 , 1469.45 , 415.62
+2652.56 , 1536.20 , 436.03
+2652.56 , 1602.95 , 456.49
+2652.56 , 1669.70 , 476.99
+2652.56 , 1736.45 , 497.55
+2652.56 , 1803.20 , 518.15
+2652.56 , 1869.95 , 538.78
+2652.56 , 1936.70 , 559.43
+2652.56 , 2003.45 , 580.15
+2652.56 , 2070.20 , 600.90
+2652.56 , 2136.95 , 621.69
+2652.56 , 2203.70 , 642.53
+2856.67 , -2452.16 , -634.47
+2856.67 , -2373.30 , -615.42
+2856.67 , -2294.44 , -596.34
+2856.67 , -2215.57 , -577.19
+2856.67 , -2136.71 , -558.02
+2856.67 , -2057.85 , -538.83
+2856.67 , -1978.98 , -519.58
+2856.67 , -1900.12 , -500.29
+2856.67 , -1821.25 , -480.95
+2856.67 , -1742.39 , -461.58
+2856.67 , -1663.53 , -442.17
+2856.67 , -1584.66 , -422.71
+2856.67 , -1505.80 , -403.22
+2856.67 , -1426.94 , -383.66
+2856.67 , -1348.07 , -364.10
+2856.67 , -1269.21 , -344.47
+2856.67 , -1190.34 , -324.81
+2856.67 , -1111.48 , -305.11
+2856.67 , -1032.62 , -285.38
+2856.67 , -953.75 , -265.61
+2856.67 , -874.89 , -245.78
+2856.67 , -796.03 , -225.92
+2856.67 , -717.16 , -206.02
+2856.67 , -638.30 , -186.07
+2856.67 , -559.43 , -166.09
+2856.67 , -480.57 , -146.07
+2856.67 , -401.71 , -126.00
+2856.67 , -322.84 , -105.90
+2856.67 , -243.98 , -85.75
+2856.67 , -165.12 , -65.57
+2856.67 , -86.25 , -45.34
+2856.67 , -7.39 , -25.07
+2856.67 , 71.47 , -4.28
+2856.67 , 138.23 , 16.76
+2856.67 , 204.98 , 37.85
+2856.67 , 271.73 , 58.98
+2856.67 , 338.48 , 80.14
+2856.67 , 405.23 , 101.36
+2856.67 , 471.98 , 122.61
+2856.67 , 538.73 , 143.90
+2856.67 , 605.48 , 165.24
+2856.67 , 672.23 , 186.61
+2856.67 , 738.98 , 208.03
+2856.67 , 805.73 , 229.49
+2856.67 , 872.48 , 251.00
+2856.67 , 939.23 , 272.54
+2856.67 , 1005.98 , 294.12
+2856.67 , 1072.73 , 315.75
+2856.67 , 1139.48 , 337.41
+2856.67 , 1206.23 , 359.11
+2856.67 , 1272.98 , 380.86
+2856.67 , 1339.73 , 402.67
+2856.67 , 1406.48 , 424.49
+2856.67 , 1473.23 , 446.36
+2856.67 , 1539.98 , 468.29
+2856.67 , 1606.73 , 490.23
+2856.67 , 1673.48 , 512.23
+2856.67 , 1740.23 , 534.27
+2856.67 , 1806.98 , 556.36
+2856.67 , 1873.73 , 578.48
+2856.67 , 1940.48 , 600.64
+2856.67 , 2007.23 , 622.86
+2856.67 , 2073.98 , 645.09
+2856.67 , 2140.73 , 667.40
+2856.67 , 2207.48 , 689.71
+3060.68 , -2448.38 , -681.85
+3060.68 , -2369.52 , -661.34
+3060.68 , -2290.66 , -640.80
+3060.68 , -2211.79 , -620.20
+3060.68 , -2132.93 , -599.59
+3060.68 , -2054.06 , -578.91
+3060.68 , -1975.20 , -558.21
+3060.68 , -1896.34 , -537.45
+3060.68 , -1817.47 , -516.65
+3060.68 , -1738.61 , -495.83
+3060.68 , -1659.75 , -474.96
+3060.68 , -1580.88 , -454.03
+3060.68 , -1502.02 , -433.09
+3060.68 , -1423.15 , -412.09
+3060.68 , -1344.29 , -391.08
+3060.68 , -1265.43 , -369.98
+3060.68 , -1186.56 , -348.87
+3060.68 , -1107.70 , -327.71
+3060.68 , -1028.84 , -306.52
+3060.68 , -949.97 , -285.28
+3060.68 , -871.11 , -264.00
+3060.68 , -792.25 , -242.68
+3060.68 , -713.38 , -221.32
+3060.68 , -634.52 , -199.92
+3060.68 , -555.65 , -178.48
+3060.68 , -476.79 , -157.00
+3060.68 , -397.93 , -135.48
+3060.68 , -319.06 , -113.92
+3060.68 , -240.20 , -92.31
+3060.68 , -161.34 , -70.67
+3060.68 , -82.47 , -48.98
+3060.68 , -3.61 , -27.26
+3060.68 , 75.26 , -4.96
+3060.68 , 142.01 , 17.58
+3060.68 , 208.76 , 40.16
+3060.68 , 275.51 , 62.78
+3060.68 , 342.26 , 85.44
+3060.68 , 409.01 , 108.15
+3060.68 , 475.76 , 130.89
+3060.68 , 542.51 , 153.68
+3060.68 , 609.26 , 176.51
+3060.68 , 676.01 , 199.38
+3060.68 , 742.76 , 222.29
+3060.68 , 809.51 , 245.25
+3060.68 , 876.26 , 268.25
+3060.68 , 943.01 , 291.27
+3060.68 , 1009.76 , 314.37
+3060.68 , 1076.51 , 337.47
+3060.68 , 1143.26 , 360.64
+3060.68 , 1210.01 , 383.83
+3060.68 , 1276.76 , 407.07
+3060.68 , 1343.51 , 430.36
+3060.68 , 1410.26 , 453.70
+3060.68 , 1477.01 , 477.07
+3060.68 , 1543.76 , 500.48
+3060.68 , 1610.51 , 523.94
+3060.68 , 1677.26 , 547.42
+3060.68 , 1744.01 , 570.96
+3060.68 , 1810.76 , 594.54
+3060.68 , 1877.51 , 618.14
+3060.68 , 1944.26 , 641.80
+3060.68 , 2011.01 , 665.50
+3060.68 , 2077.76 , 689.25
+3060.68 , 2144.51 , 713.02
+3060.68 , 2211.26 , 736.85
+3264.70 , -2444.60 , -729.27
+3264.70 , -2365.74 , -707.30
+3264.70 , -2286.87 , -685.30
+3264.70 , -2208.01 , -663.26
+3264.70 , -2129.15 , -641.17
+3264.70 , -2050.28 , -619.06
+3264.70 , -1971.42 , -596.87
+3264.70 , -1892.56 , -574.68
+3264.70 , -1813.69 , -552.42
+3264.70 , -1734.83 , -530.14
+3264.70 , -1655.97 , -507.81
+3264.70 , -1577.10 , -485.45
+3264.70 , -1498.24 , -463.02
+3264.70 , -1419.37 , -440.57
+3264.70 , -1340.51 , -418.09
+3264.70 , -1261.65 , -395.54
+3264.70 , -1182.78 , -372.97
+3264.70 , -1103.92 , -350.37
+3264.70 , -1025.06 , -327.72
+3264.70 , -946.19 , -305.02
+3264.70 , -867.33 , -282.28
+3264.70 , -788.46 , -259.50
+3264.70 , -709.60 , -236.68
+3264.70 , -630.74 , -213.82
+3264.70 , -551.87 , -190.93
+3264.70 , -473.01 , -167.99
+3264.70 , -394.15 , -145.00
+3264.70 , -315.28 , -121.98
+3264.70 , -236.42 , -98.92
+3264.70 , -157.55 , -75.82
+3264.70 , -78.69 , -52.68
+3264.70 , 0.17 , -29.49
+3264.70 , 79.04 , -5.69
+3264.70 , 145.79 , 18.34
+3264.70 , 212.54 , 42.42
+3264.70 , 279.29 , 66.53
+3264.70 , 346.04 , 90.69
+3264.70 , 412.79 , 114.89
+3264.70 , 479.54 , 139.13
+3264.70 , 546.29 , 163.41
+3264.70 , 613.04 , 187.73
+3264.70 , 679.79 , 212.10
+3264.70 , 746.54 , 236.52
+3264.70 , 813.29 , 260.96
+3264.70 , 880.04 , 285.45
+3264.70 , 946.79 , 309.96
+3264.70 , 1013.54 , 334.55
+3264.70 , 1080.29 , 359.16
+3264.70 , 1147.04 , 383.82
+3264.70 , 1213.79 , 408.51
+3264.70 , 1280.54 , 433.26
+3264.70 , 1347.29 , 458.04
+3264.70 , 1414.04 , 482.85
+3264.70 , 1480.79 , 507.73
+3264.70 , 1547.54 , 532.63
+3264.70 , 1614.29 , 557.58
+3264.70 , 1681.04 , 582.55
+3264.70 , 1747.79 , 607.58
+3264.70 , 1814.54 , 632.65
+3264.70 , 1881.29 , 657.77
+3264.70 , 1948.04 , 682.91
+3264.70 , 2014.79 , 708.13
+3264.70 , 2081.54 , 733.34
+3264.70 , 2148.29 , 758.63
+3264.70 , 2215.05 , 783.95
+3468.80 , -2440.82 , -776.75
+3468.80 , -2361.96 , -753.32
+3468.80 , -2283.09 , -729.87
+3468.80 , -2204.23 , -706.37
+3468.80 , -2125.36 , -682.82
+3468.80 , -2046.50 , -659.25
+3468.80 , -1967.64 , -635.62
+3468.80 , -1888.77 , -611.95
+3468.80 , -1809.91 , -588.23
+3468.80 , -1731.05 , -564.49
+3468.80 , -1652.18 , -540.70
+3468.80 , -1573.32 , -516.88
+3468.80 , -1494.46 , -493.02
+3468.80 , -1415.59 , -469.11
+3468.80 , -1336.73 , -445.15
+3468.80 , -1257.86 , -421.16
+3468.80 , -1179.00 , -397.13
+3468.80 , -1100.14 , -373.07
+3468.80 , -1021.27 , -348.94
+3468.80 , -942.41 , -324.78
+3468.80 , -863.55 , -300.60
+3468.80 , -784.68 , -276.38
+3468.80 , -705.82 , -252.09
+3468.80 , -626.95 , -227.78
+3468.80 , -548.09 , -203.42
+3468.80 , -469.23 , -179.02
+3468.80 , -390.36 , -154.58
+3468.80 , -311.50 , -130.10
+3468.80 , -232.64 , -105.58
+3468.80 , -153.77 , -81.02
+3468.80 , -74.91 , -56.42
+3468.80 , 3.96 , -31.78
+3468.80 , 82.82 , -6.47
+3468.80 , 149.57 , 19.06
+3468.80 , 216.32 , 44.62
+3468.80 , 283.07 , 70.24
+3468.80 , 349.82 , 95.89
+3468.80 , 416.57 , 121.58
+3468.80 , 483.32 , 147.32
+3468.80 , 550.07 , 173.09
+3468.80 , 616.82 , 198.91
+3468.80 , 683.57 , 224.77
+3468.80 , 750.32 , 250.67
+3468.80 , 817.07 , 276.61
+3468.80 , 883.82 , 302.59
+3468.80 , 950.57 , 328.62
+3468.80 , 1017.32 , 354.69
+3468.80 , 1084.07 , 380.79
+3468.80 , 1150.82 , 406.94
+3468.80 , 1217.57 , 433.14
+3468.80 , 1284.32 , 459.36
+3468.80 , 1351.07 , 485.63
+3468.80 , 1417.82 , 511.95
+3468.80 , 1484.57 , 538.32
+3468.80 , 1551.33 , 564.71
+3468.80 , 1618.08 , 591.15
+3468.80 , 1684.83 , 617.64
+3468.80 , 1751.58 , 644.15
+3468.80 , 1818.33 , 670.74
+3468.80 , 1885.08 , 697.32
+3468.80 , 1951.83 , 723.98
+3468.80 , 2018.58 , 750.66
+3468.80 , 2085.33 , 777.39
+3468.80 , 2152.08 , 804.17
+3468.80 , 2218.83 , 831.00
+3672.82 , -2437.04 , -824.28
+3672.82 , -2358.17 , -799.41
+3672.82 , -2279.31 , -774.48
+3672.82 , -2200.45 , -749.52
+3672.82 , -2121.58 , -724.53
+3672.82 , -2042.72 , -699.48
+3672.82 , -1963.86 , -674.39
+3672.82 , -1884.99 , -649.29
+3672.82 , -1806.13 , -624.11
+3672.82 , -1727.27 , -598.91
+3672.82 , -1648.40 , -573.66
+3672.82 , -1569.54 , -548.38
+3672.82 , -1490.67 , -523.06
+3672.82 , -1411.81 , -497.69
+3672.82 , -1332.95 , -472.29
+3672.82 , -1254.08 , -446.82
+3672.82 , -1175.22 , -421.35
+3672.82 , -1096.36 , -395.81
+3672.82 , -1017.49 , -370.24
+3672.82 , -938.63 , -344.63
+3672.82 , -859.76 , -318.97
+3672.82 , -780.90 , -293.28
+3672.82 , -702.04 , -267.55
+3672.82 , -623.17 , -241.78
+3672.82 , -544.31 , -215.96
+3672.82 , -465.45 , -190.11
+3672.82 , -386.58 , -164.21
+3672.82 , -307.72 , -138.28
+3672.82 , -228.85 , -112.30
+3672.82 , -149.99 , -86.28
+3672.82 , -71.13 , -60.22
+3672.82 , 7.74 , -34.12
+3672.82 , 86.60 , -7.30
+3672.82 , 153.35 , 19.72
+3672.82 , 220.10 , 46.79
+3672.82 , 286.85 , 73.89
+3672.82 , 353.60 , 101.04
+3672.82 , 420.35 , 128.23
+3672.82 , 487.10 , 155.45
+3672.82 , 553.85 , 182.72
+3672.82 , 620.60 , 210.05
+3672.82 , 687.35 , 237.40
+3672.82 , 754.10 , 264.79
+3672.82 , 820.85 , 292.22
+3672.82 , 887.60 , 319.71
+3672.82 , 954.35 , 347.23
+3672.82 , 1021.10 , 374.77
+3672.82 , 1087.85 , 402.39
+3672.82 , 1154.60 , 430.03
+3672.82 , 1221.35 , 457.71
+3672.82 , 1288.11 , 485.45
+3672.82 , 1354.86 , 513.21
+3672.82 , 1421.61 , 541.02
+3672.82 , 1488.36 , 568.88
+3672.82 , 1555.11 , 596.76
+3672.82 , 1621.86 , 624.71
+3672.82 , 1688.61 , 652.67
+3672.82 , 1755.36 , 680.69
+3672.82 , 1822.11 , 708.74
+3672.82 , 1888.86 , 736.84
+3672.82 , 1955.61 , 764.99
+3672.82 , 2022.36 , 793.19
+3672.82 , 2089.11 , 821.41
+3672.82 , 2155.86 , 849.67
+3672.82 , 2222.61 , 877.99
+3876.84 , -2433.26 , -871.87
+3876.84 , -2354.39 , -845.52
+3876.84 , -2275.53 , -819.15
+3876.84 , -2196.67 , -792.73
+3876.84 , -2117.80 , -766.29
+3876.84 , -2038.94 , -739.77
+3876.84 , -1960.08 , -713.23
+3876.84 , -1881.21 , -686.66
+3876.84 , -1802.35 , -660.03
+3876.84 , -1723.48 , -633.36
+3876.84 , -1644.62 , -606.68
+3876.84 , -1565.76 , -579.92
+3876.84 , -1486.89 , -553.14
+3876.84 , -1408.03 , -526.30
+3876.84 , -1329.17 , -499.45
+3876.84 , -1250.30 , -472.55
+3876.84 , -1171.44 , -445.59
+3876.84 , -1092.57 , -418.62
+3876.84 , -1013.71 , -391.59
+3876.84 , -934.85 , -364.52
+3876.84 , -855.98 , -337.40
+3876.84 , -777.12 , -310.25
+3876.84 , -698.26 , -283.06
+3876.84 , -619.39 , -255.83
+3876.84 , -540.53 , -228.56
+3876.84 , -461.66 , -201.25
+3876.84 , -382.80 , -173.89
+3876.84 , -303.94 , -146.50
+3876.84 , -225.07 , -119.06
+3876.84 , -146.21 , -91.59
+3876.84 , -67.35 , -64.07
+3876.84 , 11.52 , -36.51
+3876.84 , 90.38 , -8.18
+3876.84 , 157.13 , 20.34
+3876.84 , 223.88 , 48.90
+3876.84 , 290.63 , 77.50
+3876.84 , 357.38 , 106.14
+3876.84 , 424.13 , 134.82
+3876.84 , 490.88 , 163.54
+3876.84 , 557.63 , 192.31
+3876.84 , 624.38 , 221.12
+3876.84 , 691.13 , 249.96
+3876.84 , 757.88 , 278.85
+3876.84 , 824.63 , 307.78
+3876.84 , 891.38 , 336.74
+3876.84 , 958.13 , 365.78
+3876.84 , 1024.89 , 394.83
+3876.84 , 1091.64 , 423.91
+3876.84 , 1158.39 , 453.07
+3876.84 , 1225.14 , 482.24
+3876.84 , 1291.89 , 511.47
+3876.84 , 1358.64 , 540.72
+3876.84 , 1425.39 , 570.02
+3876.84 , 1492.14 , 599.37
+3876.84 , 1558.89 , 628.76
+3876.84 , 1625.64 , 658.18
+3876.84 , 1692.39 , 687.67
+3876.84 , 1759.14 , 717.17
+3876.84 , 1825.89 , 746.73
+3876.84 , 1892.64 , 776.32
+3876.84 , 1959.39 , 805.96
+3876.84 , 2026.14 , 835.64
+3876.84 , 2092.89 , 865.35
+3876.84 , 2159.64 , 895.11
+3876.84 , 2226.39 , 924.92
+4080.85 , -2429.48 , -919.50
+4080.85 , -2350.61 , -891.72
+4080.85 , -2271.75 , -863.86
+4080.85 , -2192.89 , -835.98
+4080.85 , -2114.02 , -808.08
+4080.85 , -2035.16 , -780.13
+4080.85 , -1956.29 , -752.13
+4080.85 , -1877.43 , -724.08
+4080.85 , -1798.57 , -696.01
+4080.85 , -1719.70 , -667.89
+4080.85 , -1640.84 , -639.72
+4080.85 , -1561.98 , -611.52
+4080.85 , -1483.11 , -583.28
+4080.85 , -1404.25 , -554.99
+4080.85 , -1325.38 , -526.67
+4080.85 , -1246.52 , -498.31
+4080.85 , -1167.66 , -469.90
+4080.85 , -1088.79 , -441.46
+4080.85 , -1009.93 , -412.98
+4080.85 , -931.07 , -384.45
+4080.85 , -852.20 , -355.89
+4080.85 , -773.34 , -327.28
+4080.85 , -694.47 , -298.63
+4080.85 , -615.61 , -269.94
+4080.85 , -536.75 , -241.21
+4080.85 , -457.88 , -212.44
+4080.85 , -379.02 , -183.62
+4080.85 , -300.16 , -154.77
+4080.85 , -221.29 , -125.88
+4080.85 , -142.43 , -96.95
+4080.85 , -63.56 , -67.97
+4080.85 , 15.30 , -38.95
+4080.85 , 94.16 , -9.10
+4080.85 , 160.91 , 20.91
+4080.85 , 227.66 , 50.96
+4080.85 , 294.41 , 81.05
+4080.85 , 361.16 , 111.19
+4080.85 , 427.91 , 141.36
+4080.85 , 494.66 , 171.58
+4080.85 , 561.41 , 201.85
+4080.85 , 628.16 , 232.13
+4080.85 , 694.91 , 262.48
+4080.85 , 761.67 , 292.86
+4080.85 , 828.42 , 323.29
+4080.85 , 895.17 , 353.76
+4080.85 , 961.92 , 384.26
+4080.85 , 1028.67 , 414.83
+4080.85 , 1095.42 , 445.40
+4080.85 , 1162.17 , 476.04
+4080.85 , 1228.92 , 506.71
+4080.85 , 1295.67 , 537.43
+4080.85 , 1362.42 , 568.19
+4080.85 , 1429.17 , 598.98
+4080.85 , 1495.92 , 629.84
+4080.85 , 1562.67 , 660.70
+4080.85 , 1629.42 , 691.63
+4080.85 , 1696.17 , 722.59
+4080.85 , 1762.92 , 753.60
+4080.85 , 1829.67 , 784.65
+4080.85 , 1896.42 , 815.76
+4080.85 , 1963.17 , 846.88
+4080.85 , 2029.92 , 878.06
+4080.85 , 2096.67 , 909.26
+4080.85 , 2163.42 , 940.51
+4080.85 , 2230.17 , 971.80
+4268.63 , -2426.00 , -963.37
+4268.63 , -2347.13 , -934.25
+4268.63 , -2268.27 , -905.05
+4268.63 , -2189.41 , -875.85
+4268.63 , -2110.54 , -846.58
+4268.63 , -2031.68 , -817.29
+4268.63 , -1952.81 , -787.95
+4268.63 , -1873.95 , -758.56
+4268.63 , -1795.09 , -729.14
+4268.63 , -1716.22 , -699.68
+4268.63 , -1637.36 , -670.19
+4268.63 , -1558.50 , -640.63
+4268.63 , -1479.63 , -611.05
+4268.63 , -1400.77 , -581.44
+4268.63 , -1321.90 , -551.76
+4268.63 , -1243.04 , -522.06
+4268.63 , -1164.18 , -492.33
+4268.63 , -1085.31 , -462.53
+4268.63 , -1006.45 , -432.70
+4268.63 , -927.59 , -402.83
+4268.63 , -848.72 , -372.93
+4268.63 , -769.86 , -342.98
+4268.63 , -690.99 , -312.99
+4268.63 , -612.13 , -282.97
+4268.63 , -533.27 , -252.89
+4268.63 , -454.40 , -222.78
+4268.63 , -375.54 , -192.63
+4268.63 , -296.68 , -162.43
+4268.63 , -217.81 , -132.20
+4268.63 , -138.95 , -101.92
+4268.63 , -60.08 , -71.61
+4268.63 , 18.78 , -41.21
+4268.63 , 97.64 , -10.00
+4268.63 , 164.39 , 21.38
+4268.63 , 231.14 , 52.81
+4268.63 , 297.89 , 84.28
+4268.63 , 364.64 , 115.79
+4268.63 , 431.39 , 147.34
+4268.63 , 498.14 , 178.93
+4268.63 , 564.89 , 210.56
+4268.63 , 631.64 , 242.24
+4268.63 , 698.39 , 273.96
+4268.63 , 765.15 , 305.71
+4268.63 , 831.90 , 337.51
+4268.63 , 898.65 , 369.35
+4268.63 , 965.40 , 401.25
+4268.63 , 1032.15 , 433.17
+4268.63 , 1098.90 , 465.13
+4268.63 , 1165.65 , 497.15
+4268.63 , 1232.40 , 529.19
+4268.63 , 1299.15 , 561.27
+4268.63 , 1365.90 , 593.41
+4268.63 , 1432.65 , 625.59
+4268.63 , 1499.40 , 657.80
+4268.63 , 1566.15 , 690.06
+4268.63 , 1632.90 , 722.36
+4268.63 , 1699.65 , 754.69
+4268.63 , 1766.40 , 787.07
+4268.63 , 1833.15 , 819.50
+4268.63 , 1899.90 , 851.97
+4268.63 , 1966.65 , 884.47
+4268.63 , 2033.40 , 917.02
+4268.63 , 2100.15 , 949.61
+4268.63 , 2166.90 , 982.23
+4268.63 , 2233.65 , 1014.90
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G2.vemo b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G2.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..0683b9b6d09fbab33fbc6ee9e248a5be1c47f01d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G2.vemo
@@ -0,0 +1,2016 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00 , -2373.37 , 23.82
+0.00 , -2299.72 , 22.44
+0.00 , -2226.08 , 21.09
+0.00 , -2152.43 , 19.79
+0.00 , -2078.78 , 18.53
+0.00 , -2005.14 , 17.31
+0.00 , -1931.49 , 16.13
+0.00 , -1857.84 , 14.99
+0.00 , -1784.20 , 13.89
+0.00 , -1710.55 , 12.84
+0.00 , -1636.90 , 11.83
+0.00 , -1563.26 , 10.85
+0.00 , -1489.61 , 9.92
+0.00 , -1415.96 , 9.04
+0.00 , -1342.32 , 8.19
+0.00 , -1268.67 , 7.38
+0.00 , -1195.02 , 6.62
+0.00 , -1121.38 , 5.90
+0.00 , -1047.73 , 5.21
+0.00 , -974.08 , 4.57
+0.00 , -900.44 , 3.98
+0.00 , -826.79 , 3.42
+0.00 , -752.36 , 2.90
+0.00 , -675.64 , 2.43
+0.00 , -598.92 , 2.00
+0.00 , -522.04 , 1.61
+0.00 , -445.08 , 1.26
+0.00 , -368.12 , 0.95
+0.00 , -291.16 , 0.69
+0.00 , -214.20 , 0.46
+0.00 , -137.24 , 0.28
+0.00 , -60.28 , 0.14
+0.00 , 16.68 , 0.09
+0.00 , 84.68 , 0.21
+0.00 , 152.68 , 0.38
+0.00 , 220.68 , 0.58
+0.00 , 288.69 , 0.83
+0.00 , 356.69 , 1.12
+0.00 , 424.69 , 1.45
+0.00 , 492.69 , 1.82
+0.00 , 560.69 , 2.23
+0.00 , 628.70 , 2.69
+0.00 , 696.70 , 3.19
+0.00 , 764.70 , 3.72
+0.00 , 832.70 , 4.30
+0.00 , 900.70 , 4.93
+0.00 , 968.70 , 5.59
+0.00 , 1036.71 , 6.29
+0.00 , 1104.71 , 7.04
+0.00 , 1172.71 , 7.83
+0.00 , 1240.71 , 8.65
+0.00 , 1308.71 , 9.52
+0.00 , 1376.71 , 10.44
+0.00 , 1444.72 , 11.39
+0.00 , 1512.72 , 12.38
+0.00 , 1580.72 , 13.42
+0.00 , 1648.72 , 14.50
+0.00 , 1716.72 , 15.62
+0.00 , 1784.72 , 16.78
+0.00 , 1852.73 , 17.98
+0.00 , 1920.73 , 19.22
+0.00 , 1988.73 , 20.51
+0.00 , 2056.73 , 21.84
+0.00 , 2124.73 , 23.20
+0.00 , 2192.74 , 24.61
+40.81 , -2374.05 , 13.97
+40.81 , -2300.40 , 12.90
+40.81 , -2226.76 , 11.87
+40.81 , -2153.11 , 10.88
+40.81 , -2079.46 , 9.93
+40.81 , -2005.82 , 9.02
+40.81 , -1932.17 , 8.15
+40.81 , -1858.52 , 7.33
+40.81 , -1784.88 , 6.54
+40.81 , -1711.23 , 5.80
+40.81 , -1637.58 , 5.10
+40.81 , -1563.94 , 4.44
+40.81 , -1490.29 , 3.83
+40.81 , -1416.64 , 3.25
+40.81 , -1343.00 , 2.72
+40.81 , -1269.35 , 2.22
+40.81 , -1195.70 , 1.77
+40.81 , -1122.06 , 1.37
+40.81 , -1048.41 , 1.00
+40.81 , -974.76 , 0.68
+40.81 , -900.88 , 0.40
+40.81 , -826.94 , 0.15
+40.81 , -752.24 , -0.05
+40.81 , -675.28 , -0.22
+40.81 , -598.32 , -0.36
+40.81 , -521.36 , -0.45
+40.81 , -444.40 , -0.50
+40.81 , -367.44 , -0.51
+40.81 , -290.48 , -0.48
+40.81 , -213.52 , -0.41
+40.81 , -136.56 , -0.30
+40.81 , -59.60 , -0.15
+40.81 , 17.36 , 0.10
+40.81 , 85.36 , 0.52
+40.81 , 153.36 , 0.99
+40.81 , 221.37 , 1.49
+40.81 , 289.37 , 2.04
+40.81 , 357.37 , 2.63
+40.81 , 425.37 , 3.26
+40.81 , 493.37 , 3.93
+40.81 , 561.37 , 4.64
+40.81 , 629.38 , 5.40
+40.81 , 697.38 , 6.20
+40.81 , 765.38 , 7.03
+40.81 , 833.38 , 7.91
+40.81 , 901.38 , 8.83
+40.81 , 969.38 , 9.80
+40.81 , 1037.39 , 10.80
+40.81 , 1105.39 , 11.84
+40.81 , 1173.39 , 12.93
+40.81 , 1241.39 , 14.06
+40.81 , 1309.39 , 15.23
+40.81 , 1377.39 , 16.44
+40.81 , 1445.40 , 17.69
+40.81 , 1513.40 , 18.99
+40.81 , 1581.40 , 20.32
+40.81 , 1649.40 , 21.70
+40.81 , 1717.40 , 23.12
+40.81 , 1785.41 , 24.58
+40.81 , 1853.41 , 26.08
+40.81 , 1921.41 , 27.63
+40.81 , 1989.41 , 29.21
+40.81 , 2057.41 , 30.84
+40.81 , 2125.41 , 32.50
+40.81 , 2193.42 , 34.21
+81.62 , -2374.73 , 4.13
+81.62 , -2301.08 , 3.37
+81.62 , -2227.44 , 2.65
+81.62 , -2153.79 , 1.98
+81.62 , -2080.14 , 1.36
+81.62 , -2006.50 , 0.77
+81.62 , -1932.85 , 0.23
+81.62 , -1859.20 , -0.28
+81.62 , -1785.56 , -0.74
+81.62 , -1711.91 , -1.16
+81.62 , -1638.26 , -1.54
+81.62 , -1564.62 , -1.88
+81.62 , -1490.97 , -2.18
+81.62 , -1417.32 , -2.44
+81.62 , -1343.68 , -2.66
+81.62 , -1270.03 , -2.84
+81.62 , -1196.39 , -2.97
+81.62 , -1122.74 , -3.07
+81.62 , -1049.09 , -3.13
+81.62 , -975.45 , -3.14
+81.62 , -901.13 , -3.12
+81.62 , -826.66 , -3.06
+81.62 , -751.56 , -2.97
+81.62 , -674.60 , -2.85
+81.62 , -597.64 , -2.69
+81.62 , -520.68 , -2.49
+81.62 , -443.72 , -2.25
+81.62 , -366.76 , -1.96
+81.62 , -289.80 , -1.64
+81.62 , -212.84 , -1.28
+81.62 , -135.88 , -0.87
+81.62 , -58.92 , -0.43
+81.62 , 18.04 , 0.11
+81.62 , 86.04 , 0.84
+81.62 , 154.04 , 1.60
+81.62 , 222.05 , 2.40
+81.62 , 290.05 , 3.25
+81.62 , 358.05 , 4.14
+81.62 , 426.05 , 5.07
+81.62 , 494.05 , 6.04
+81.62 , 562.05 , 7.05
+81.62 , 630.06 , 8.11
+81.62 , 698.06 , 9.20
+81.62 , 766.06 , 10.34
+81.62 , 834.06 , 11.52
+81.62 , 902.06 , 12.74
+81.62 , 970.07 , 14.00
+81.62 , 1038.07 , 15.31
+81.62 , 1106.07 , 16.65
+81.62 , 1174.07 , 18.04
+81.62 , 1242.07 , 19.46
+81.62 , 1310.07 , 20.93
+81.62 , 1378.08 , 22.44
+81.62 , 1446.08 , 24.00
+81.62 , 1514.08 , 25.59
+81.62 , 1582.08 , 27.23
+81.62 , 1650.08 , 28.90
+81.62 , 1718.08 , 30.62
+81.62 , 1786.09 , 32.38
+81.62 , 1854.09 , 34.18
+81.62 , 1922.09 , 36.03
+81.62 , 1990.09 , 37.91
+81.62 , 2058.09 , 39.84
+81.62 , 2126.09 , 41.80
+81.62 , 2194.10 , 43.81
+122.43 , -2375.41 , -5.54
+122.43 , -2301.76 , -5.98
+122.43 , -2228.12 , -6.38
+122.43 , -2154.47 , -6.74
+122.43 , -2080.82 , -7.06
+122.43 , -2007.18 , -7.33
+122.43 , -1933.53 , -7.57
+122.43 , -1859.88 , -7.77
+122.43 , -1786.24 , -7.92
+122.43 , -1712.59 , -8.04
+122.43 , -1638.95 , -8.11
+122.43 , -1565.30 , -8.15
+122.43 , -1491.65 , -8.14
+122.43 , -1418.01 , -8.09
+122.43 , -1344.36 , -8.00
+122.43 , -1270.71 , -7.87
+122.43 , -1197.07 , -7.70
+122.43 , -1123.42 , -7.49
+122.43 , -1049.77 , -7.24
+122.43 , -976.13 , -6.95
+122.43 , -901.37 , -6.63
+122.43 , -826.37 , -6.28
+122.43 , -750.88 , -5.89
+122.43 , -673.92 , -5.47
+122.43 , -596.96 , -5.02
+122.43 , -520.00 , -4.53
+122.43 , -443.04 , -3.99
+122.43 , -366.08 , -3.42
+122.43 , -289.12 , -2.80
+122.43 , -212.16 , -2.15
+122.43 , -135.20 , -1.45
+122.43 , -58.24 , -0.71
+122.43 , 18.72 , 0.12
+122.43 , 86.72 , 1.15
+122.43 , 154.73 , 2.21
+122.43 , 222.73 , 3.31
+122.43 , 290.73 , 4.46
+122.43 , 358.73 , 5.65
+122.43 , 426.73 , 6.88
+122.43 , 494.73 , 8.15
+122.43 , 562.74 , 9.46
+122.43 , 630.74 , 10.82
+122.43 , 698.74 , 12.21
+122.43 , 766.74 , 13.65
+122.43 , 834.74 , 15.13
+122.43 , 902.74 , 16.65
+122.43 , 970.75 , 18.21
+122.43 , 1038.75 , 19.81
+122.43 , 1106.75 , 21.45
+122.43 , 1174.75 , 23.14
+122.43 , 1242.75 , 24.87
+122.43 , 1310.75 , 26.64
+122.43 , 1378.76 , 28.45
+122.43 , 1446.76 , 30.30
+122.43 , 1514.76 , 32.19
+122.43 , 1582.76 , 34.13
+122.43 , 1650.76 , 36.11
+122.43 , 1718.76 , 38.12
+122.43 , 1786.77 , 40.18
+122.43 , 1854.77 , 42.28
+122.43 , 1922.77 , 44.43
+122.43 , 1990.77 , 46.61
+122.43 , 2058.77 , 48.84
+122.43 , 2126.78 , 51.10
+122.43 , 2194.78 , 53.41
+163.24 , -2376.09 , -15.17
+163.24 , -2302.44 , -15.30
+163.24 , -2228.80 , -15.39
+163.24 , -2155.15 , -15.45
+163.24 , -2081.50 , -15.46
+163.24 , -2007.86 , -15.43
+163.24 , -1934.21 , -15.36
+163.24 , -1860.57 , -15.25
+163.24 , -1786.92 , -15.10
+163.24 , -1713.27 , -14.91
+163.24 , -1639.63 , -14.67
+163.24 , -1565.98 , -14.40
+163.24 , -1492.33 , -14.09
+163.24 , -1418.69 , -13.73
+163.24 , -1345.04 , -13.34
+163.24 , -1271.39 , -12.90
+163.24 , -1197.75 , -12.42
+163.24 , -1124.10 , -11.91
+163.24 , -1050.45 , -11.35
+163.24 , -976.81 , -10.75
+163.24 , -901.62 , -10.14
+163.24 , -826.09 , -9.49
+163.24 , -750.20 , -8.81
+163.24 , -673.24 , -8.10
+163.24 , -596.28 , -7.36
+163.24 , -519.32 , -6.57
+163.24 , -442.36 , -5.74
+163.24 , -365.40 , -4.88
+163.24 , -288.44 , -3.97
+163.24 , -211.48 , -3.02
+163.24 , -134.52 , -2.03
+163.24 , -57.56 , -1.00
+163.24 , 19.40 , 0.13
+163.24 , 87.40 , 1.46
+163.24 , 155.41 , 2.82
+163.24 , 223.41 , 4.22
+163.24 , 291.41 , 5.67
+163.24 , 359.41 , 7.16
+163.24 , 427.41 , 8.69
+163.24 , 495.41 , 10.26
+163.24 , 563.42 , 11.87
+163.24 , 631.42 , 13.52
+163.24 , 699.42 , 15.22
+163.24 , 767.42 , 16.95
+163.24 , 835.42 , 18.73
+163.24 , 903.42 , 20.55
+163.24 , 971.43 , 22.41
+163.24 , 1039.43 , 24.31
+163.24 , 1107.43 , 26.26
+163.24 , 1175.43 , 28.24
+163.24 , 1243.43 , 30.27
+163.24 , 1311.44 , 32.34
+163.24 , 1379.44 , 34.45
+163.24 , 1447.44 , 36.60
+163.24 , 1515.44 , 38.79
+163.24 , 1583.44 , 41.03
+163.24 , 1651.44 , 43.30
+163.24 , 1719.45 , 45.62
+163.24 , 1787.45 , 47.98
+163.24 , 1855.45 , 50.38
+163.24 , 1923.45 , 52.82
+163.24 , 1991.45 , 55.31
+163.24 , 2059.45 , 57.83
+163.24 , 2127.46 , 60.40
+163.24 , 2195.46 , 63.01
+204.04 , -2376.77 , -24.79
+204.04 , -2303.13 , -24.61
+204.04 , -2229.48 , -24.40
+204.04 , -2155.83 , -24.15
+204.04 , -2082.19 , -23.85
+204.04 , -2008.54 , -23.51
+204.04 , -1934.89 , -23.14
+204.04 , -1861.25 , -22.72
+204.04 , -1787.60 , -22.26
+204.04 , -1713.95 , -21.76
+204.04 , -1640.31 , -21.22
+204.04 , -1566.66 , -20.64
+204.04 , -1493.01 , -20.02
+204.04 , -1419.37 , -19.36
+204.04 , -1345.72 , -18.66
+204.04 , -1272.07 , -17.92
+204.04 , -1198.43 , -17.13
+204.04 , -1124.78 , -16.31
+204.04 , -1051.13 , -15.45
+204.04 , -977.49 , -14.54
+204.04 , -901.87 , -13.64
+204.04 , -825.81 , -12.70
+204.04 , -749.52 , -11.73
+204.04 , -672.56 , -10.73
+204.04 , -595.60 , -9.69
+204.04 , -518.64 , -8.61
+204.04 , -441.68 , -7.50
+204.04 , -364.72 , -6.34
+204.04 , -287.76 , -5.13
+204.04 , -210.80 , -3.89
+204.04 , -133.84 , -2.61
+204.04 , -56.88 , -1.29
+204.04 , 20.08 , 0.14
+204.04 , 88.08 , 1.76
+204.04 , 156.09 , 3.43
+204.04 , 224.09 , 5.13
+204.04 , 292.09 , 6.88
+204.04 , 360.09 , 8.66
+204.04 , 428.09 , 10.49
+204.04 , 496.09 , 12.36
+204.04 , 564.10 , 14.27
+204.04 , 632.10 , 16.23
+204.04 , 700.10 , 18.22
+204.04 , 768.10 , 20.26
+204.04 , 836.10 , 22.33
+204.04 , 904.11 , 24.45
+204.04 , 972.11 , 26.61
+204.04 , 1040.11 , 28.82
+204.04 , 1108.11 , 31.06
+204.04 , 1176.11 , 33.35
+204.04 , 1244.11 , 35.67
+204.04 , 1312.12 , 38.04
+204.04 , 1380.12 , 40.45
+204.04 , 1448.12 , 42.90
+204.04 , 1516.12 , 45.39
+204.04 , 1584.12 , 47.93
+204.04 , 1652.12 , 50.50
+204.04 , 1720.13 , 53.12
+204.04 , 1788.13 , 55.78
+204.04 , 1856.13 , 58.48
+204.04 , 1924.13 , 61.22
+204.04 , 1992.13 , 64.00
+204.04 , 2060.13 , 66.83
+204.04 , 2128.14 , 69.69
+204.04 , 2196.14 , 72.60
+244.85 , -2377.45 , -34.40
+244.85 , -2303.81 , -33.92
+244.85 , -2230.16 , -33.40
+244.85 , -2156.51 , -32.83
+244.85 , -2082.87 , -32.23
+244.85 , -2009.22 , -31.59
+244.85 , -1935.57 , -30.91
+244.85 , -1861.93 , -30.18
+244.85 , -1788.28 , -29.42
+244.85 , -1714.63 , -28.61
+244.85 , -1640.99 , -27.77
+244.85 , -1567.34 , -26.88
+244.85 , -1493.69 , -25.95
+244.85 , -1420.05 , -24.98
+244.85 , -1346.40 , -23.97
+244.85 , -1272.75 , -22.92
+244.85 , -1199.11 , -21.83
+244.85 , -1125.46 , -20.70
+244.85 , -1051.81 , -19.53
+244.85 , -978.17 , -18.32
+244.85 , -902.11 , -17.13
+244.85 , -825.52 , -15.91
+244.85 , -748.84 , -14.65
+244.85 , -671.88 , -13.36
+244.85 , -594.92 , -12.03
+244.85 , -517.96 , -10.66
+244.85 , -441.00 , -9.25
+244.85 , -364.04 , -7.79
+244.85 , -287.08 , -6.30
+244.85 , -210.12 , -4.77
+244.85 , -133.16 , -3.19
+244.85 , -56.20 , -1.58
+244.85 , 20.76 , 0.15
+244.85 , 88.77 , 2.07
+244.85 , 156.77 , 4.03
+244.85 , 224.77 , 6.04
+244.85 , 292.77 , 8.08
+244.85 , 360.77 , 10.17
+244.85 , 428.77 , 12.30
+244.85 , 496.78 , 14.47
+244.85 , 564.78 , 16.68
+244.85 , 632.78 , 18.93
+244.85 , 700.78 , 21.22
+244.85 , 768.78 , 23.56
+244.85 , 836.78 , 25.94
+244.85 , 904.79 , 28.36
+244.85 , 972.79 , 30.82
+244.85 , 1040.79 , 33.32
+244.85 , 1108.79 , 35.86
+244.85 , 1176.79 , 38.44
+244.85 , 1244.79 , 41.07
+244.85 , 1312.80 , 43.74
+244.85 , 1380.80 , 46.45
+244.85 , 1448.80 , 49.20
+244.85 , 1516.80 , 51.99
+244.85 , 1584.80 , 54.82
+244.85 , 1652.81 , 57.70
+244.85 , 1720.81 , 60.62
+244.85 , 1788.81 , 63.58
+244.85 , 1856.81 , 66.57
+244.85 , 1924.81 , 69.62
+244.85 , 1992.81 , 72.70
+244.85 , 2060.82 , 75.82
+244.85 , 2128.82 , 78.99
+244.85 , 2196.82 , 82.19
+285.67 , -2378.13 , -44.00
+285.67 , -2304.49 , -43.21
+285.67 , -2230.84 , -42.38
+285.67 , -2157.19 , -41.51
+285.67 , -2083.55 , -40.60
+285.67 , -2009.90 , -39.65
+285.67 , -1936.25 , -38.66
+285.67 , -1862.61 , -37.63
+285.67 , -1788.96 , -36.56
+285.67 , -1715.31 , -35.45
+285.67 , -1641.67 , -34.29
+285.67 , -1568.02 , -33.10
+285.67 , -1494.37 , -31.87
+285.67 , -1420.73 , -30.59
+285.67 , -1347.08 , -29.28
+285.67 , -1273.44 , -27.92
+285.67 , -1199.79 , -26.52
+285.67 , -1126.08 , -25.09
+285.67 , -1052.27 , -23.61
+285.67 , -978.46 , -22.10
+285.67 , -902.07 , -20.62
+285.67 , -825.11 , -19.12
+285.67 , -748.15 , -17.58
+285.67 , -671.19 , -15.99
+285.67 , -594.23 , -14.37
+285.67 , -517.27 , -12.71
+285.67 , -440.31 , -11.00
+285.67 , -363.36 , -9.26
+285.67 , -286.40 , -7.47
+285.67 , -209.44 , -5.64
+285.67 , -132.48 , -3.78
+285.67 , -55.52 , -1.87
+285.67 , 21.44 , 0.16
+285.67 , 89.45 , 2.38
+285.67 , 157.45 , 4.64
+285.67 , 225.45 , 6.94
+285.67 , 293.45 , 9.29
+285.67 , 361.45 , 11.67
+285.67 , 429.45 , 14.10
+285.67 , 497.46 , 16.57
+285.67 , 565.46 , 19.08
+285.67 , 633.46 , 21.63
+285.67 , 701.46 , 24.22
+285.67 , 769.46 , 26.86
+285.67 , 837.47 , 29.54
+285.67 , 905.47 , 32.26
+285.67 , 973.47 , 35.01
+285.67 , 1041.47 , 37.82
+285.67 , 1109.47 , 40.66
+285.67 , 1177.47 , 43.54
+285.67 , 1245.48 , 46.47
+285.67 , 1313.48 , 49.44
+285.67 , 1381.48 , 52.44
+285.67 , 1449.48 , 55.50
+285.67 , 1517.48 , 58.59
+285.67 , 1585.48 , 61.72
+285.67 , 1653.49 , 64.89
+285.67 , 1721.49 , 68.11
+285.67 , 1789.49 , 71.37
+285.67 , 1857.49 , 74.67
+285.67 , 1925.49 , 78.01
+285.67 , 1993.49 , 81.39
+285.67 , 2061.50 , 84.82
+285.67 , 2129.50 , 88.28
+285.67 , 2197.50 , 91.79
+326.47 , -2378.81 , -53.58
+326.47 , -2305.17 , -52.49
+326.47 , -2231.52 , -51.36
+326.47 , -2157.87 , -50.18
+326.47 , -2084.23 , -48.97
+326.47 , -2010.58 , -47.71
+326.47 , -1936.93 , -46.41
+326.47 , -1863.29 , -45.07
+326.47 , -1789.64 , -43.70
+326.47 , -1715.99 , -42.28
+326.47 , -1642.35 , -40.82
+326.47 , -1568.70 , -39.32
+326.47 , -1495.06 , -37.78
+326.47 , -1421.41 , -36.19
+326.47 , -1347.76 , -34.57
+326.47 , -1274.12 , -32.91
+326.47 , -1200.47 , -31.20
+326.47 , -1126.56 , -29.47
+326.47 , -1052.22 , -27.70
+326.47 , -977.88 , -25.90
+326.47 , -901.39 , -24.13
+326.47 , -824.43 , -22.34
+326.47 , -747.47 , -20.50
+326.47 , -670.51 , -18.63
+326.47 , -593.55 , -16.71
+326.47 , -516.59 , -14.75
+326.47 , -439.63 , -12.76
+326.47 , -362.67 , -10.72
+326.47 , -285.71 , -8.64
+326.47 , -208.75 , -6.52
+326.47 , -131.79 , -4.36
+326.47 , -54.83 , -2.16
+326.47 , 22.12 , 0.16
+326.47 , 90.13 , 2.68
+326.47 , 158.13 , 5.24
+326.47 , 226.13 , 7.84
+326.47 , 294.13 , 10.49
+326.47 , 362.13 , 13.17
+326.47 , 430.14 , 15.90
+326.47 , 498.14 , 18.67
+326.47 , 566.14 , 21.48
+326.47 , 634.14 , 24.33
+326.47 , 702.14 , 27.23
+326.47 , 770.14 , 30.16
+326.47 , 838.15 , 33.14
+326.47 , 906.15 , 36.15
+326.47 , 974.15 , 39.21
+326.47 , 1042.15 , 42.31
+326.47 , 1110.15 , 45.46
+326.47 , 1178.15 , 48.64
+326.47 , 1246.16 , 51.87
+326.47 , 1314.16 , 55.13
+326.47 , 1382.16 , 58.44
+326.47 , 1450.16 , 61.79
+326.47 , 1518.16 , 65.18
+326.47 , 1586.16 , 68.61
+326.47 , 1654.17 , 72.09
+326.47 , 1722.17 , 75.60
+326.47 , 1790.17 , 79.16
+326.47 , 1858.17 , 82.76
+326.47 , 1926.17 , 86.40
+326.47 , 1994.18 , 90.08
+326.47 , 2062.18 , 93.81
+326.47 , 2130.18 , 97.57
+326.47 , 2198.18 , 101.38
+367.28 , -2379.49 , -63.16
+367.28 , -2305.85 , -61.76
+367.28 , -2232.20 , -60.32
+367.28 , -2158.55 , -58.84
+367.28 , -2084.91 , -57.32
+367.28 , -2011.26 , -55.75
+367.28 , -1937.62 , -54.15
+367.28 , -1863.97 , -52.50
+367.28 , -1790.32 , -50.82
+367.28 , -1716.68 , -49.09
+367.28 , -1643.03 , -47.33
+367.28 , -1569.38 , -45.52
+367.28 , -1495.74 , -43.67
+367.28 , -1422.09 , -41.78
+367.28 , -1348.44 , -39.85
+367.28 , -1274.80 , -37.88
+367.28 , -1201.15 , -35.87
+367.28 , -1127.04 , -33.84
+367.28 , -1052.16 , -31.79
+367.28 , -977.29 , -29.71
+367.28 , -900.71 , -27.64
+367.28 , -823.75 , -25.56
+367.28 , -746.79 , -23.43
+367.28 , -669.83 , -21.26
+367.28 , -592.87 , -19.05
+367.28 , -515.91 , -16.80
+367.28 , -438.95 , -14.51
+367.28 , -361.99 , -12.18
+367.28 , -285.03 , -9.81
+367.28 , -208.07 , -7.40
+367.28 , -131.11 , -4.95
+367.28 , -54.15 , -2.45
+367.28 , 22.81 , 0.16
+367.28 , 90.81 , 2.98
+367.28 , 158.81 , 5.84
+367.28 , 226.81 , 8.75
+367.28 , 294.81 , 11.69
+367.28 , 362.81 , 14.68
+367.28 , 430.82 , 17.70
+367.28 , 498.82 , 20.77
+367.28 , 566.82 , 23.88
+367.28 , 634.82 , 27.03
+367.28 , 702.82 , 30.23
+367.28 , 770.82 , 33.46
+367.28 , 838.83 , 36.73
+367.28 , 906.83 , 40.05
+367.28 , 974.83 , 43.41
+367.28 , 1042.83 , 46.81
+367.28 , 1110.83 , 50.25
+367.28 , 1178.84 , 53.74
+367.28 , 1246.84 , 57.26
+367.28 , 1314.84 , 60.83
+367.28 , 1382.84 , 64.44
+367.28 , 1450.84 , 68.08
+367.28 , 1518.84 , 71.78
+367.28 , 1586.85 , 75.51
+367.28 , 1654.85 , 79.28
+367.28 , 1722.85 , 83.10
+367.28 , 1790.85 , 86.95
+367.28 , 1858.85 , 90.85
+367.28 , 1926.85 , 94.79
+367.28 , 1994.86 , 98.77
+367.28 , 2062.86 , 102.80
+367.28 , 2130.86 , 106.86
+367.28 , 2198.86 , 110.97
+408.09 , -2380.17 , -72.73
+408.09 , -2306.53 , -71.02
+408.09 , -2232.88 , -69.27
+408.09 , -2159.24 , -67.49
+408.09 , -2085.59 , -65.66
+408.09 , -2011.94 , -63.79
+408.09 , -1938.30 , -61.88
+408.09 , -1864.65 , -59.92
+408.09 , -1791.00 , -57.93
+408.09 , -1717.36 , -55.90
+408.09 , -1643.71 , -53.83
+408.09 , -1570.06 , -51.71
+408.09 , -1496.42 , -49.56
+408.09 , -1422.77 , -47.36
+408.09 , -1349.12 , -45.12
+408.09 , -1275.48 , -42.85
+408.09 , -1201.83 , -40.53
+408.09 , -1127.51 , -38.20
+408.09 , -1052.11 , -35.88
+408.09 , -976.71 , -33.51
+408.09 , -900.03 , -31.16
+408.09 , -823.07 , -28.78
+408.09 , -746.11 , -26.36
+408.09 , -669.15 , -23.90
+408.09 , -592.19 , -21.40
+408.09 , -515.23 , -18.85
+408.09 , -438.27 , -16.27
+408.09 , -361.31 , -13.65
+408.09 , -284.35 , -10.98
+408.09 , -207.39 , -8.28
+408.09 , -130.43 , -5.53
+408.09 , -53.47 , -2.75
+408.09 , 23.49 , 0.17
+408.09 , 91.49 , 3.28
+408.09 , 159.49 , 6.44
+408.09 , 227.49 , 9.65
+408.09 , 295.49 , 12.89
+408.09 , 363.49 , 16.18
+408.09 , 431.50 , 19.50
+408.09 , 499.50 , 22.87
+408.09 , 567.50 , 26.28
+408.09 , 635.50 , 29.73
+408.09 , 703.50 , 33.22
+408.09 , 771.51 , 36.76
+408.09 , 839.51 , 40.33
+408.09 , 907.51 , 43.95
+408.09 , 975.51 , 47.61
+408.09 , 1043.51 , 51.31
+408.09 , 1111.51 , 55.05
+408.09 , 1179.52 , 58.83
+408.09 , 1247.52 , 62.66
+408.09 , 1315.52 , 66.52
+408.09 , 1383.52 , 70.43
+408.09 , 1451.52 , 74.38
+408.09 , 1519.52 , 78.37
+408.09 , 1587.53 , 82.40
+408.09 , 1655.53 , 86.47
+408.09 , 1723.53 , 90.59
+408.09 , 1791.53 , 94.75
+408.09 , 1859.53 , 98.94
+408.09 , 1927.53 , 103.18
+408.09 , 1995.54 , 107.46
+408.09 , 2063.54 , 111.79
+408.09 , 2131.54 , 116.15
+408.09 , 2199.54 , 120.55
+448.90 , -2380.86 , -82.29
+448.90 , -2307.21 , -80.27
+448.90 , -2233.56 , -78.22
+448.90 , -2159.92 , -76.12
+448.90 , -2086.27 , -73.99
+448.90 , -2012.62 , -71.81
+448.90 , -1938.98 , -69.59
+448.90 , -1865.33 , -67.33
+448.90 , -1791.68 , -65.03
+448.90 , -1718.04 , -62.69
+448.90 , -1644.39 , -60.31
+448.90 , -1570.74 , -57.89
+448.90 , -1497.10 , -55.43
+448.90 , -1423.45 , -52.93
+448.90 , -1349.80 , -50.39
+448.90 , -1276.16 , -47.80
+448.90 , -1202.51 , -45.18
+448.90 , -1127.99 , -42.55
+448.90 , -1052.06 , -39.96
+448.90 , -976.12 , -37.32
+448.90 , -899.35 , -34.67
+448.90 , -822.39 , -32.00
+448.90 , -745.43 , -29.29
+448.90 , -668.47 , -26.54
+448.90 , -591.51 , -23.74
+448.90 , -514.55 , -20.91
+448.90 , -437.59 , -18.03
+448.90 , -360.63 , -15.12
+448.90 , -283.67 , -12.16
+448.90 , -206.71 , -9.16
+448.90 , -129.75 , -6.12
+448.90 , -52.79 , -3.04
+448.90 , 24.17 , 0.17
+448.90 , 92.17 , 3.58
+448.90 , 160.17 , 7.04
+448.90 , 228.17 , 10.55
+448.90 , 296.17 , 14.09
+448.90 , 364.18 , 17.67
+448.90 , 432.18 , 21.30
+448.90 , 500.18 , 24.97
+448.90 , 568.18 , 28.67
+448.90 , 636.18 , 32.43
+448.90 , 704.18 , 36.22
+448.90 , 772.19 , 40.05
+448.90 , 840.19 , 43.93
+448.90 , 908.19 , 47.84
+448.90 , 976.19 , 51.80
+448.90 , 1044.19 , 55.80
+448.90 , 1112.19 , 59.84
+448.90 , 1180.20 , 63.92
+448.90 , 1248.20 , 68.05
+448.90 , 1316.20 , 72.21
+448.90 , 1384.20 , 76.42
+448.90 , 1452.20 , 80.67
+448.90 , 1520.21 , 84.96
+448.90 , 1588.21 , 89.29
+448.90 , 1656.21 , 93.66
+448.90 , 1724.21 , 98.08
+448.90 , 1792.21 , 102.54
+448.90 , 1860.21 , 107.03
+448.90 , 1928.22 , 111.57
+448.90 , 1996.22 , 116.15
+448.90 , 2064.22 , 120.77
+448.90 , 2132.22 , 125.44
+448.90 , 2200.22 , 130.14
+489.71 , -2381.54 , -91.84
+489.71 , -2307.89 , -89.52
+489.71 , -2234.24 , -87.15
+489.71 , -2160.60 , -84.75
+489.71 , -2086.95 , -82.31
+489.71 , -2013.30 , -79.82
+489.71 , -1939.66 , -77.30
+489.71 , -1866.01 , -74.73
+489.71 , -1792.36 , -72.13
+489.71 , -1718.72 , -69.48
+489.71 , -1645.07 , -66.79
+489.71 , -1571.42 , -64.07
+489.71 , -1497.78 , -61.30
+489.71 , -1424.13 , -58.49
+489.71 , -1350.49 , -55.64
+489.71 , -1276.84 , -52.75
+489.71 , -1203.19 , -49.82
+489.71 , -1128.47 , -46.90
+489.71 , -1052.00 , -44.03
+489.71 , -975.54 , -41.12
+489.71 , -898.67 , -38.19
+489.71 , -821.71 , -35.23
+489.71 , -744.75 , -32.22
+489.71 , -667.79 , -29.17
+489.71 , -590.83 , -26.09
+489.71 , -513.87 , -22.96
+489.71 , -436.91 , -19.79
+489.71 , -359.95 , -16.58
+489.71 , -282.99 , -13.33
+489.71 , -206.03 , -10.04
+489.71 , -129.07 , -6.71
+489.71 , -52.11 , -3.34
+489.71 , 24.85 , 0.17
+489.71 , 92.85 , 3.88
+489.71 , 160.85 , 7.64
+489.71 , 228.85 , 11.44
+489.71 , 296.85 , 15.29
+489.71 , 364.86 , 19.17
+489.71 , 432.86 , 23.09
+489.71 , 500.86 , 27.06
+489.71 , 568.86 , 31.07
+489.71 , 636.86 , 35.12
+489.71 , 704.86 , 39.21
+489.71 , 772.87 , 43.35
+489.71 , 840.87 , 47.52
+489.71 , 908.87 , 51.74
+489.71 , 976.87 , 55.99
+489.71 , 1044.87 , 60.29
+489.71 , 1112.88 , 64.63
+489.71 , 1180.88 , 69.02
+489.71 , 1248.88 , 73.44
+489.71 , 1316.88 , 77.90
+489.71 , 1384.88 , 82.41
+489.71 , 1452.88 , 86.96
+489.71 , 1520.89 , 91.55
+489.71 , 1588.89 , 96.18
+489.71 , 1656.89 , 100.85
+489.71 , 1724.89 , 105.57
+489.71 , 1792.89 , 110.32
+489.71 , 1860.89 , 115.12
+489.71 , 1928.90 , 119.96
+489.71 , 1996.90 , 124.84
+489.71 , 2064.90 , 129.76
+489.71 , 2132.90 , 134.72
+489.71 , 2200.90 , 139.73
+816.18 , -2386.98 , -167.85
+816.18 , -2313.34 , -163.07
+816.18 , -2239.69 , -158.26
+816.18 , -2166.04 , -153.40
+816.18 , -2092.40 , -148.50
+816.18 , -2018.75 , -143.56
+816.18 , -1945.10 , -138.58
+816.18 , -1871.46 , -133.56
+816.18 , -1797.81 , -128.50
+816.18 , -1724.16 , -123.40
+816.18 , -1650.52 , -118.26
+816.18 , -1576.87 , -113.08
+816.18 , -1503.00 , -107.87
+816.18 , -1428.91 , -102.64
+816.18 , -1354.83 , -97.38
+816.18 , -1278.02 , -92.30
+816.18 , -1201.06 , -87.20
+816.18 , -1124.10 , -82.06
+816.18 , -1047.15 , -76.87
+816.18 , -970.19 , -71.65
+816.18 , -893.23 , -66.38
+816.18 , -816.27 , -61.07
+816.18 , -739.31 , -55.73
+816.18 , -662.35 , -50.34
+816.18 , -585.39 , -44.91
+816.18 , -508.43 , -39.44
+816.18 , -431.47 , -33.93
+816.18 , -354.51 , -28.38
+816.18 , -277.55 , -22.79
+816.18 , -200.59 , -17.16
+816.18 , -123.63 , -11.48
+816.18 , -46.67 , -5.77
+816.18 , 30.29 , 0.11
+816.18 , 98.29 , 6.23
+816.18 , 166.30 , 12.38
+816.18 , 234.30 , 18.58
+816.18 , 302.30 , 24.82
+816.18 , 370.30 , 31.10
+816.18 , 438.30 , 37.42
+816.18 , 506.31 , 43.79
+816.18 , 574.31 , 50.19
+816.18 , 642.31 , 56.64
+816.18 , 710.31 , 63.13
+816.18 , 778.31 , 69.66
+816.18 , 846.31 , 76.23
+816.18 , 914.32 , 82.84
+816.18 , 982.32 , 89.49
+816.18 , 1050.32 , 96.19
+816.18 , 1118.32 , 102.93
+816.18 , 1186.32 , 109.70
+816.18 , 1254.32 , 116.52
+816.18 , 1322.33 , 123.39
+816.18 , 1390.33 , 130.29
+816.18 , 1458.33 , 137.23
+816.18 , 1526.33 , 144.22
+816.18 , 1594.33 , 151.25
+816.18 , 1662.33 , 158.32
+816.18 , 1730.34 , 165.43
+816.18 , 1798.34 , 172.58
+816.18 , 1866.34 , 179.78
+816.18 , 1934.34 , 187.01
+816.18 , 2002.34 , 194.29
+816.18 , 2070.35 , 201.61
+816.18 , 2138.35 , 208.97
+816.18 , 2206.35 , 216.37
+1020.26 , -2390.39 , -215.03
+1020.26 , -2316.74 , -208.72
+1020.26 , -2243.09 , -202.37
+1020.26 , -2169.45 , -195.97
+1020.26 , -2095.80 , -189.54
+1020.26 , -2022.15 , -183.07
+1020.26 , -1948.51 , -176.56
+1020.26 , -1874.86 , -170.00
+1020.26 , -1801.21 , -163.40
+1020.26 , -1727.57 , -156.77
+1020.26 , -1653.92 , -150.09
+1020.26 , -1580.27 , -143.38
+1020.26 , -1505.05 , -136.79
+1020.26 , -1428.31 , -130.32
+1020.26 , -1351.57 , -123.81
+1020.26 , -1274.62 , -117.28
+1020.26 , -1197.66 , -110.72
+1020.26 , -1120.70 , -104.11
+1020.26 , -1043.74 , -97.46
+1020.26 , -966.78 , -90.77
+1020.26 , -889.82 , -84.04
+1020.26 , -812.86 , -77.27
+1020.26 , -735.90 , -70.46
+1020.26 , -658.94 , -63.61
+1020.26 , -581.98 , -56.72
+1020.26 , -505.02 , -49.79
+1020.26 , -428.06 , -42.81
+1020.26 , -351.10 , -35.80
+1020.26 , -274.14 , -28.75
+1020.26 , -197.18 , -21.65
+1020.26 , -120.22 , -14.51
+1020.26 , -43.26 , -7.34
+1020.26 , 33.70 , 0.03
+1020.26 , 101.70 , 7.65
+1020.26 , 169.70 , 15.30
+1020.26 , 237.70 , 23.00
+1020.26 , 305.70 , 30.73
+1020.26 , 373.71 , 38.51
+1020.26 , 441.71 , 46.33
+1020.26 , 509.71 , 54.19
+1020.26 , 577.71 , 62.10
+1020.26 , 645.71 , 70.04
+1020.26 , 713.71 , 78.03
+1020.26 , 781.72 , 86.05
+1020.26 , 849.72 , 94.12
+1020.26 , 917.72 , 102.24
+1020.26 , 985.72 , 110.39
+1020.26 , 1053.72 , 118.58
+1020.26 , 1121.72 , 126.82
+1020.26 , 1189.73 , 135.09
+1020.26 , 1257.73 , 143.41
+1020.26 , 1325.73 , 151.77
+1020.26 , 1393.73 , 160.17
+1020.26 , 1461.73 , 168.61
+1020.26 , 1529.74 , 177.10
+1020.26 , 1597.74 , 185.62
+1020.26 , 1665.74 , 194.19
+1020.26 , 1733.74 , 202.80
+1020.26 , 1801.74 , 211.45
+1020.26 , 1869.74 , 220.14
+1020.26 , 1937.75 , 228.87
+1020.26 , 2005.75 , 237.64
+1020.26 , 2073.75 , 246.46
+1020.26 , 2141.75 , 255.33
+1020.26 , 2209.75 , 264.23
+1224.27 , -2393.79 , -261.95
+1224.27 , -2320.14 , -254.11
+1224.27 , -2246.50 , -246.23
+1224.27 , -2172.85 , -238.29
+1224.27 , -2099.20 , -230.33
+1224.27 , -2025.56 , -222.32
+1224.27 , -1951.91 , -214.27
+1224.27 , -1878.26 , -206.18
+1224.27 , -1804.62 , -198.05
+1224.27 , -1730.79 , -189.91
+1224.27 , -1654.71 , -182.01
+1224.27 , -1578.63 , -174.07
+1224.27 , -1502.10 , -166.15
+1224.27 , -1425.14 , -158.24
+1224.27 , -1348.18 , -150.29
+1224.27 , -1271.22 , -142.30
+1224.27 , -1194.26 , -134.27
+1224.27 , -1117.30 , -126.20
+1224.27 , -1040.34 , -118.09
+1224.27 , -963.38 , -109.93
+1224.27 , -886.42 , -101.74
+1224.27 , -809.46 , -93.51
+1224.27 , -732.50 , -85.23
+1224.27 , -655.54 , -76.92
+1224.27 , -578.58 , -68.56
+1224.27 , -501.62 , -60.17
+1224.27 , -424.66 , -51.73
+1224.27 , -347.70 , -43.25
+1224.27 , -270.74 , -34.74
+1224.27 , -193.78 , -26.18
+1224.27 , -116.82 , -17.58
+1224.27 , -39.86 , -8.94
+1224.27 , 37.10 , -0.07
+1224.27 , 105.10 , 9.04
+1224.27 , 173.10 , 18.19
+1224.27 , 241.11 , 27.38
+1224.27 , 309.11 , 36.62
+1224.27 , 377.11 , 45.89
+1224.27 , 445.11 , 55.21
+1224.27 , 513.11 , 64.57
+1224.27 , 581.11 , 73.97
+1224.27 , 649.12 , 83.41
+1224.27 , 717.12 , 92.90
+1224.27 , 785.12 , 102.42
+1224.27 , 853.12 , 111.99
+1224.27 , 921.12 , 121.60
+1224.27 , 989.12 , 131.25
+1224.27 , 1057.13 , 140.94
+1224.27 , 1125.13 , 150.67
+1224.27 , 1193.13 , 160.45
+1224.27 , 1261.13 , 170.26
+1224.27 , 1329.13 , 180.12
+1224.27 , 1397.13 , 190.02
+1224.27 , 1465.14 , 199.96
+1224.27 , 1533.14 , 209.94
+1224.27 , 1601.14 , 219.97
+1224.27 , 1669.14 , 230.03
+1224.27 , 1737.14 , 240.13
+1224.27 , 1805.14 , 250.27
+1224.27 , 1873.15 , 260.47
+1224.27 , 1941.15 , 270.71
+1224.27 , 2009.15 , 280.98
+1224.27 , 2077.15 , 291.29
+1224.27 , 2145.15 , 301.65
+1224.27 , 2213.16 , 312.04
+1428.29 , -2397.19 , -308.61
+1428.29 , -2323.54 , -299.24
+1428.29 , -2249.90 , -289.82
+1428.29 , -2176.25 , -280.35
+1428.29 , -2102.61 , -270.86
+1428.29 , -2028.96 , -261.31
+1428.29 , -1955.31 , -251.73
+1428.29 , -1880.53 , -242.28
+1428.29 , -1805.11 , -232.88
+1428.29 , -1729.57 , -223.46
+1428.29 , -1652.61 , -214.21
+1428.29 , -1575.65 , -204.92
+1428.29 , -1498.69 , -195.59
+1428.29 , -1421.73 , -186.22
+1428.29 , -1344.77 , -176.80
+1428.29 , -1267.81 , -167.35
+1428.29 , -1190.86 , -157.86
+1428.29 , -1113.90 , -148.32
+1428.29 , -1036.94 , -138.75
+1428.29 , -959.98 , -129.13
+1428.29 , -883.02 , -119.48
+1428.29 , -806.06 , -109.78
+1428.29 , -729.10 , -100.04
+1428.29 , -652.14 , -90.26
+1428.29 , -575.18 , -80.44
+1428.29 , -498.22 , -70.59
+1428.29 , -421.26 , -60.68
+1428.29 , -344.30 , -50.74
+1428.29 , -267.34 , -40.76
+1428.29 , -190.38 , -30.74
+1428.29 , -113.42 , -20.68
+1428.29 , -36.46 , -10.57
+1428.29 , 40.50 , -0.22
+1428.29 , 108.50 , 10.39
+1428.29 , 176.51 , 21.04
+1428.29 , 244.51 , 31.73
+1428.29 , 312.51 , 42.47
+1428.29 , 380.51 , 53.24
+1428.29 , 448.51 , 64.05
+1428.29 , 516.51 , 74.91
+1428.29 , 584.52 , 85.81
+1428.29 , 652.52 , 96.75
+1428.29 , 720.52 , 107.73
+1428.29 , 788.52 , 118.76
+1428.29 , 856.52 , 129.82
+1428.29 , 924.53 , 140.93
+1428.29 , 992.53 , 152.08
+1428.29 , 1060.53 , 163.26
+1428.29 , 1128.53 , 174.49
+1428.29 , 1196.53 , 185.77
+1428.29 , 1264.53 , 197.08
+1428.29 , 1332.54 , 208.44
+1428.29 , 1400.54 , 219.83
+1428.29 , 1468.54 , 231.27
+1428.29 , 1536.54 , 242.74
+1428.29 , 1604.54 , 254.28
+1428.29 , 1672.54 , 265.83
+1428.29 , 1740.55 , 277.44
+1428.29 , 1808.55 , 289.08
+1428.29 , 1876.55 , 300.77
+1428.29 , 1944.55 , 312.50
+1428.29 , 2012.55 , 324.26
+1428.29 , 2080.55 , 336.10
+1428.29 , 2148.56 , 347.93
+1428.29 , 2216.56 , 359.83
+1632.39 , -2400.60 , -355.02
+1632.39 , -2326.95 , -344.11
+1632.39 , -2253.30 , -333.16
+1632.39 , -2179.66 , -322.16
+1632.39 , -2105.79 , -311.17
+1632.39 , -2031.02 , -300.28
+1632.39 , -1956.25 , -289.35
+1632.39 , -1880.09 , -278.63
+1632.39 , -1803.13 , -268.00
+1632.39 , -1726.17 , -257.32
+1632.39 , -1649.21 , -246.61
+1632.39 , -1572.25 , -235.86
+1632.39 , -1495.29 , -225.06
+1632.39 , -1418.33 , -214.23
+1632.39 , -1341.37 , -203.35
+1632.39 , -1264.41 , -192.44
+1632.39 , -1187.45 , -181.48
+1632.39 , -1110.49 , -170.48
+1632.39 , -1033.53 , -159.44
+1632.39 , -956.57 , -148.37
+1632.39 , -879.61 , -137.25
+1632.39 , -802.65 , -126.09
+1632.39 , -725.69 , -114.89
+1632.39 , -648.73 , -103.64
+1632.39 , -571.77 , -92.36
+1632.39 , -494.81 , -81.04
+1632.39 , -417.85 , -69.67
+1632.39 , -340.89 , -58.27
+1632.39 , -263.93 , -46.82
+1632.39 , -186.97 , -35.34
+1632.39 , -110.01 , -23.81
+1632.39 , -33.05 , -12.24
+1632.39 , 43.91 , -0.39
+1632.39 , 111.91 , 11.71
+1632.39 , 179.91 , 23.86
+1632.39 , 247.91 , 36.05
+1632.39 , 315.91 , 48.28
+1632.39 , 383.92 , 60.55
+1632.39 , 451.92 , 72.87
+1632.39 , 519.92 , 85.22
+1632.39 , 587.92 , 97.62
+1632.39 , 655.92 , 110.06
+1632.39 , 723.92 , 122.54
+1632.39 , 791.93 , 135.06
+1632.39 , 859.93 , 147.62
+1632.39 , 927.93 , 160.22
+1632.39 , 995.93 , 172.87
+1632.39 , 1063.93 , 185.56
+1632.39 , 1131.93 , 198.29
+1632.39 , 1199.94 , 211.05
+1632.39 , 1267.94 , 223.87
+1632.39 , 1335.94 , 236.71
+1632.39 , 1403.94 , 249.62
+1632.39 , 1471.94 , 262.56
+1632.39 , 1539.95 , 275.53
+1632.39 , 1607.95 , 288.54
+1632.39 , 1675.95 , 301.60
+1632.39 , 1743.95 , 314.71
+1632.39 , 1811.95 , 327.86
+1632.39 , 1879.95 , 341.04
+1632.39 , 1947.96 , 354.27
+1632.39 , 2015.96 , 367.52
+1632.39 , 2083.96 , 380.85
+1632.39 , 2151.96 , 394.20
+1632.39 , 2219.96 , 407.60
+1836.41 , -2404.00 , -401.17
+1836.41 , -2330.35 , -388.73
+1836.41 , -2256.35 , -376.31
+1836.41 , -2182.24 , -363.88
+1836.41 , -2107.57 , -351.49
+1836.41 , -2030.61 , -339.54
+1836.41 , -1953.65 , -327.51
+1836.41 , -1876.69 , -315.47
+1836.41 , -1799.73 , -303.37
+1836.41 , -1722.77 , -291.23
+1836.41 , -1645.81 , -279.06
+1836.41 , -1568.85 , -266.84
+1836.41 , -1491.89 , -254.58
+1836.41 , -1414.93 , -242.28
+1836.41 , -1337.97 , -229.94
+1836.41 , -1261.01 , -217.56
+1836.41 , -1184.05 , -205.14
+1836.41 , -1107.09 , -192.68
+1836.41 , -1030.13 , -180.17
+1836.41 , -953.17 , -167.63
+1836.41 , -876.21 , -155.05
+1836.41 , -799.25 , -142.43
+1836.41 , -722.29 , -129.76
+1836.41 , -645.33 , -117.06
+1836.41 , -568.37 , -104.31
+1836.41 , -491.41 , -91.52
+1836.41 , -414.45 , -78.70
+1836.41 , -337.49 , -65.83
+1836.41 , -260.53 , -52.92
+1836.41 , -183.57 , -39.97
+1836.41 , -106.61 , -26.98
+1836.41 , -29.65 , -13.95
+1836.41 , 47.31 , -0.60
+1836.41 , 115.31 , 13.00
+1836.41 , 183.31 , 26.65
+1836.41 , 251.32 , 40.34
+1836.41 , 319.32 , 54.06
+1836.41 , 387.32 , 67.83
+1836.41 , 455.32 , 81.64
+1836.41 , 523.32 , 95.50
+1836.41 , 591.32 , 109.39
+1836.41 , 659.33 , 123.33
+1836.41 , 727.33 , 137.31
+1836.41 , 795.33 , 151.32
+1836.41 , 863.33 , 165.38
+1836.41 , 931.33 , 179.49
+1836.41 , 999.33 , 193.63
+1836.41 , 1067.34 , 207.82
+1836.41 , 1135.34 , 222.04
+1836.41 , 1203.34 , 236.32
+1836.41 , 1271.34 , 250.63
+1836.41 , 1339.34 , 264.97
+1836.41 , 1407.34 , 279.37
+1836.41 , 1475.35 , 293.81
+1836.41 , 1543.35 , 308.26
+1836.41 , 1611.35 , 322.79
+1836.41 , 1679.35 , 337.34
+1836.41 , 1747.35 , 351.95
+1836.41 , 1815.36 , 366.60
+1836.41 , 1883.36 , 381.27
+1836.41 , 1951.36 , 395.99
+1836.41 , 2019.36 , 410.76
+1836.41 , 2087.36 , 425.58
+1836.41 , 2155.36 , 440.43
+1836.41 , 2223.37 , 455.32
+2040.43 , -2407.40 , -447.08
+2040.43 , -2333.76 , -433.10
+2040.43 , -2257.73 , -419.58
+2040.43 , -2180.97 , -406.17
+2040.43 , -2104.16 , -392.75
+2040.43 , -2027.20 , -379.31
+2040.43 , -1950.24 , -365.84
+2040.43 , -1873.28 , -352.33
+2040.43 , -1796.32 , -338.77
+2040.43 , -1719.36 , -325.16
+2040.43 , -1642.40 , -311.53
+2040.43 , -1565.44 , -297.84
+2040.43 , -1488.48 , -284.11
+2040.43 , -1411.52 , -270.36
+2040.43 , -1334.56 , -256.56
+2040.43 , -1257.60 , -242.72
+2040.43 , -1180.64 , -228.83
+2040.43 , -1103.69 , -214.91
+2040.43 , -1026.73 , -200.94
+2040.43 , -949.77 , -186.94
+2040.43 , -872.81 , -172.89
+2040.43 , -795.85 , -158.80
+2040.43 , -718.89 , -144.67
+2040.43 , -641.93 , -130.51
+2040.43 , -564.97 , -116.30
+2040.43 , -488.01 , -102.05
+2040.43 , -411.05 , -87.75
+2040.43 , -334.09 , -73.42
+2040.43 , -257.13 , -59.05
+2040.43 , -180.17 , -44.64
+2040.43 , -103.21 , -30.19
+2040.43 , -26.25 , -15.69
+2040.43 , 50.71 , -0.84
+2040.43 , 118.71 , 14.26
+2040.43 , 186.72 , 29.40
+2040.43 , 254.72 , 44.59
+2040.43 , 322.72 , 59.81
+2040.43 , 390.72 , 75.08
+2040.43 , 458.72 , 90.39
+2040.43 , 526.73 , 105.74
+2040.43 , 594.73 , 121.13
+2040.43 , 662.73 , 136.57
+2040.43 , 730.73 , 152.04
+2040.43 , 798.73 , 167.56
+2040.43 , 866.73 , 183.12
+2040.43 , 934.74 , 198.72
+2040.43 , 1002.74 , 214.36
+2040.43 , 1070.74 , 230.05
+2040.43 , 1138.74 , 245.76
+2040.43 , 1206.74 , 261.54
+2040.43 , 1274.74 , 277.35
+2040.43 , 1342.75 , 293.20
+2040.43 , 1410.75 , 309.08
+2040.43 , 1478.75 , 325.00
+2040.43 , 1546.75 , 340.98
+2040.43 , 1614.75 , 357.00
+2040.43 , 1682.75 , 373.07
+2040.43 , 1750.76 , 389.16
+2040.43 , 1818.76 , 405.28
+2040.43 , 1886.76 , 421.47
+2040.43 , 1954.76 , 437.69
+2040.43 , 2022.76 , 453.95
+2040.43 , 2090.76 , 470.27
+2040.43 , 2158.77 , 486.60
+2040.43 , 2226.77 , 503.01
+2244.53 , -2407.54 , -493.49
+2244.53 , -2331.44 , -478.55
+2244.53 , -2254.68 , -463.72
+2244.53 , -2177.72 , -448.91
+2244.53 , -2100.76 , -434.05
+2244.53 , -2023.80 , -419.15
+2244.53 , -1946.84 , -404.19
+2244.53 , -1869.88 , -389.22
+2244.53 , -1792.92 , -374.19
+2244.53 , -1715.96 , -359.14
+2244.53 , -1639.00 , -344.04
+2244.53 , -1562.04 , -328.90
+2244.53 , -1485.08 , -313.70
+2244.53 , -1408.12 , -298.48
+2244.53 , -1331.16 , -283.21
+2244.53 , -1254.20 , -267.92
+2244.53 , -1177.24 , -252.56
+2244.53 , -1100.28 , -237.17
+2244.53 , -1023.32 , -221.74
+2244.53 , -946.36 , -206.27
+2244.53 , -869.40 , -190.76
+2244.53 , -792.44 , -175.21
+2244.53 , -715.48 , -159.62
+2244.53 , -638.52 , -143.99
+2244.53 , -561.56 , -128.32
+2244.53 , -484.60 , -112.60
+2244.53 , -407.64 , -96.85
+2244.53 , -330.68 , -81.05
+2244.53 , -253.72 , -65.22
+2244.53 , -176.76 , -49.34
+2244.53 , -99.80 , -33.43
+2244.53 , -22.84 , -17.47
+2244.53 , 54.12 , -1.12
+2244.53 , 122.12 , 15.48
+2244.53 , 190.12 , 32.12
+2244.53 , 258.12 , 48.80
+2244.53 , 326.12 , 65.53
+2244.53 , 394.13 , 82.29
+2244.53 , 462.13 , 99.10
+2244.53 , 530.13 , 115.95
+2244.53 , 598.13 , 132.84
+2244.53 , 666.13 , 149.77
+2244.53 , 734.13 , 166.75
+2244.53 , 802.14 , 183.76
+2244.53 , 870.14 , 200.82
+2244.53 , 938.14 , 217.91
+2244.53 , 1006.14 , 235.06
+2244.53 , 1074.14 , 252.24
+2244.53 , 1142.14 , 269.46
+2244.53 , 1210.15 , 286.71
+2244.53 , 1278.15 , 304.04
+2244.53 , 1346.15 , 321.38
+2244.53 , 1414.15 , 338.75
+2244.53 , 1482.15 , 356.20
+2244.53 , 1550.16 , 373.66
+2244.53 , 1618.16 , 391.18
+2244.53 , 1686.16 , 408.74
+2244.53 , 1754.16 , 426.33
+2244.53 , 1822.16 , 443.97
+2244.53 , 1890.16 , 461.65
+2244.53 , 1958.17 , 479.36
+2244.53 , 2026.17 , 497.12
+2244.53 , 2094.17 , 514.92
+2244.53 , 2162.17 , 532.78
+2244.53 , 2230.17 , 550.66
+2448.55 , -2405.20 , -540.43
+2448.55 , -2328.24 , -524.23
+2448.55 , -2251.28 , -507.98
+2448.55 , -2174.32 , -491.71
+2448.55 , -2097.36 , -475.36
+2448.55 , -2020.40 , -459.01
+2448.55 , -1943.44 , -442.60
+2448.55 , -1866.48 , -426.15
+2448.55 , -1789.52 , -409.66
+2448.55 , -1712.56 , -393.15
+2448.55 , -1635.60 , -376.58
+2448.55 , -1558.64 , -359.97
+2448.55 , -1481.68 , -343.33
+2448.55 , -1404.72 , -326.63
+2448.55 , -1327.76 , -309.92
+2448.55 , -1250.80 , -293.14
+2448.55 , -1173.84 , -276.33
+2448.55 , -1096.88 , -259.48
+2448.55 , -1019.92 , -242.58
+2448.55 , -942.96 , -225.65
+2448.55 , -866.00 , -208.67
+2448.55 , -789.04 , -191.66
+2448.55 , -712.08 , -174.61
+2448.55 , -635.12 , -157.51
+2448.55 , -558.16 , -140.37
+2448.55 , -481.20 , -123.20
+2448.55 , -404.24 , -105.98
+2448.55 , -327.28 , -88.72
+2448.55 , -250.32 , -71.42
+2448.55 , -173.36 , -54.08
+2448.55 , -96.40 , -36.70
+2448.55 , -19.44 , -19.28
+2448.55 , 57.52 , -1.43
+2448.55 , 125.52 , 16.67
+2448.55 , 193.52 , 34.81
+2448.55 , 261.53 , 52.99
+2448.55 , 329.53 , 71.21
+2448.55 , 397.53 , 89.48
+2448.55 , 465.53 , 107.78
+2448.55 , 533.53 , 126.13
+2448.55 , 601.53 , 144.52
+2448.55 , 669.54 , 162.94
+2448.55 , 737.54 , 181.42
+2448.55 , 805.54 , 199.93
+2448.55 , 873.54 , 218.48
+2448.55 , 941.54 , 237.09
+2448.55 , 1009.54 , 255.71
+2448.55 , 1077.55 , 274.40
+2448.55 , 1145.55 , 293.12
+2448.55 , 1213.55 , 311.89
+2448.55 , 1281.55 , 330.68
+2448.55 , 1349.55 , 349.52
+2448.55 , 1417.55 , 368.40
+2448.55 , 1485.56 , 387.34
+2448.55 , 1553.56 , 406.30
+2448.55 , 1621.56 , 425.31
+2448.55 , 1689.56 , 444.37
+2448.55 , 1757.56 , 463.47
+2448.55 , 1825.57 , 482.60
+2448.55 , 1893.57 , 501.78
+2448.55 , 1961.57 , 520.98
+2448.55 , 2029.57 , 540.26
+2448.55 , 2097.57 , 559.56
+2448.55 , 2165.57 , 578.91
+2448.55 , 2233.58 , 598.28
+2652.56 , -2401.79 , -587.64
+2652.56 , -2324.83 , -569.98
+2652.56 , -2247.87 , -552.26
+2652.56 , -2170.91 , -534.53
+2652.56 , -2093.95 , -516.74
+2652.56 , -2016.99 , -498.90
+2652.56 , -1940.03 , -481.04
+2652.56 , -1863.07 , -463.14
+2652.56 , -1786.11 , -445.18
+2652.56 , -1709.15 , -427.20
+2652.56 , -1632.19 , -409.17
+2652.56 , -1555.23 , -391.10
+2652.56 , -1478.27 , -372.97
+2652.56 , -1401.31 , -354.82
+2652.56 , -1324.35 , -336.62
+2652.56 , -1247.39 , -318.40
+2652.56 , -1170.43 , -300.13
+2652.56 , -1093.47 , -281.81
+2652.56 , -1016.52 , -263.44
+2652.56 , -939.56 , -245.06
+2652.56 , -862.60 , -226.62
+2652.56 , -785.64 , -208.14
+2652.56 , -708.68 , -189.62
+2652.56 , -631.72 , -171.07
+2652.56 , -554.76 , -152.47
+2652.56 , -477.80 , -133.83
+2652.56 , -400.84 , -115.14
+2652.56 , -323.88 , -96.42
+2652.56 , -246.92 , -77.66
+2652.56 , -169.96 , -58.86
+2652.56 , -93.00 , -40.01
+2652.56 , -16.04 , -21.13
+2652.56 , 60.92 , -1.77
+2652.56 , 128.92 , 17.83
+2652.56 , 196.93 , 37.46
+2652.56 , 264.93 , 57.14
+2652.56 , 332.93 , 76.86
+2652.56 , 400.93 , 96.63
+2652.56 , 468.93 , 116.43
+2652.56 , 536.94 , 136.27
+2652.56 , 604.94 , 156.16
+2652.56 , 672.94 , 176.09
+2652.56 , 740.94 , 196.06
+2652.56 , 808.94 , 216.07
+2652.56 , 876.94 , 236.12
+2652.56 , 944.95 , 256.21
+2652.56 , 1012.95 , 276.35
+2652.56 , 1080.95 , 296.51
+2652.56 , 1148.95 , 316.75
+2652.56 , 1216.95 , 337.01
+2652.56 , 1284.95 , 357.30
+2652.56 , 1352.96 , 377.65
+2652.56 , 1420.96 , 398.03
+2652.56 , 1488.96 , 418.46
+2652.56 , 1556.96 , 438.92
+2652.56 , 1624.96 , 459.42
+2652.56 , 1692.96 , 479.97
+2652.56 , 1760.97 , 500.57
+2652.56 , 1828.97 , 521.22
+2652.56 , 1896.97 , 541.89
+2652.56 , 1964.97 , 562.58
+2652.56 , 2032.97 , 583.35
+2652.56 , 2100.98 , 604.14
+2652.56 , 2168.98 , 624.99
+2652.56 , 2236.98 , 645.87
+2856.67 , -2398.39 , -634.88
+2856.67 , -2321.43 , -615.75
+2856.67 , -2244.47 , -596.60
+2856.67 , -2167.51 , -577.37
+2856.67 , -2090.55 , -558.12
+2856.67 , -2013.59 , -538.84
+2856.67 , -1936.63 , -519.52
+2856.67 , -1859.67 , -500.15
+2856.67 , -1782.71 , -480.73
+2856.67 , -1705.75 , -461.28
+2856.67 , -1628.79 , -441.79
+2856.67 , -1551.83 , -422.24
+2856.67 , -1474.87 , -402.68
+2856.67 , -1397.91 , -383.04
+2856.67 , -1320.95 , -363.40
+2856.67 , -1243.99 , -343.69
+2856.67 , -1167.03 , -323.95
+2856.67 , -1090.07 , -304.17
+2856.67 , -1013.11 , -284.36
+2856.67 , -936.15 , -264.50
+2856.67 , -859.19 , -244.60
+2856.67 , -782.23 , -224.66
+2856.67 , -705.27 , -204.68
+2856.67 , -628.31 , -184.66
+2856.67 , -551.35 , -164.59
+2856.67 , -474.39 , -144.49
+2856.67 , -397.43 , -124.34
+2856.67 , -320.47 , -104.16
+2856.67 , -243.51 , -83.93
+2856.67 , -166.55 , -63.67
+2856.67 , -89.59 , -43.36
+2856.67 , -12.63 , -23.01
+2856.67 , 64.33 , -2.14
+2856.67 , 132.33 , 18.95
+2856.67 , 200.33 , 40.09
+2856.67 , 268.33 , 61.26
+2856.67 , 336.33 , 82.48
+2856.67 , 404.34 , 103.74
+2856.67 , 472.34 , 125.04
+2856.67 , 540.34 , 146.38
+2856.67 , 608.34 , 167.77
+2856.67 , 676.34 , 189.19
+2856.67 , 744.34 , 210.66
+2856.67 , 812.35 , 232.17
+2856.67 , 880.35 , 253.73
+2856.67 , 948.35 , 275.31
+2856.67 , 1016.35 , 296.95
+2856.67 , 1084.35 , 318.63
+2856.67 , 1152.36 , 340.33
+2856.67 , 1220.36 , 362.09
+2856.67 , 1288.36 , 383.89
+2856.67 , 1356.36 , 405.74
+2856.67 , 1424.36 , 427.61
+2856.67 , 1492.36 , 449.53
+2856.67 , 1560.37 , 471.51
+2856.67 , 1628.37 , 493.50
+2856.67 , 1696.37 , 515.55
+2856.67 , 1764.37 , 537.64
+2856.67 , 1832.37 , 559.78
+2856.67 , 1900.37 , 581.94
+2856.67 , 1968.38 , 604.16
+2856.67 , 2036.38 , 626.42
+2856.67 , 2104.38 , 648.70
+2856.67 , 2172.38 , 671.06
+2856.67 , 2240.38 , 693.42
+3060.68 , -2394.99 , -682.17
+3060.68 , -2318.03 , -661.58
+3060.68 , -2241.07 , -640.96
+3060.68 , -2164.11 , -620.26
+3060.68 , -2087.15 , -599.57
+3060.68 , -2010.19 , -578.81
+3060.68 , -1933.23 , -558.02
+3060.68 , -1856.27 , -537.18
+3060.68 , -1779.31 , -516.29
+3060.68 , -1702.35 , -495.38
+3060.68 , -1625.39 , -474.42
+3060.68 , -1548.43 , -453.42
+3060.68 , -1471.47 , -432.39
+3060.68 , -1394.51 , -411.31
+3060.68 , -1317.55 , -390.20
+3060.68 , -1240.59 , -369.03
+3060.68 , -1163.63 , -347.83
+3060.68 , -1086.67 , -326.58
+3060.68 , -1009.71 , -305.30
+3060.68 , -932.75 , -283.98
+3060.68 , -855.79 , -262.61
+3060.68 , -778.83 , -241.21
+3060.68 , -701.87 , -219.77
+3060.68 , -624.91 , -198.28
+3060.68 , -547.95 , -176.75
+3060.68 , -470.99 , -155.19
+3060.68 , -394.03 , -133.58
+3060.68 , -317.07 , -111.93
+3060.68 , -240.11 , -90.24
+3060.68 , -163.15 , -68.51
+3060.68 , -86.19 , -46.74
+3060.68 , -9.23 , -24.93
+3060.68 , 67.73 , -2.55
+3060.68 , 135.73 , 20.04
+3060.68 , 203.73 , 42.68
+3060.68 , 271.74 , 65.35
+3060.68 , 339.74 , 88.06
+3060.68 , 407.74 , 110.82
+3060.68 , 475.74 , 133.62
+3060.68 , 543.74 , 156.46
+3060.68 , 611.74 , 179.34
+3060.68 , 679.75 , 202.27
+3060.68 , 747.75 , 225.23
+3060.68 , 815.75 , 248.24
+3060.68 , 883.75 , 271.29
+3060.68 , 951.75 , 294.37
+3060.68 , 1019.75 , 317.52
+3060.68 , 1087.76 , 340.67
+3060.68 , 1155.76 , 363.89
+3060.68 , 1223.76 , 387.14
+3060.68 , 1291.76 , 410.43
+3060.68 , 1359.76 , 433.78
+3060.68 , 1427.76 , 457.17
+3060.68 , 1495.77 , 480.58
+3060.68 , 1563.77 , 504.05
+3060.68 , 1631.77 , 527.56
+3060.68 , 1699.77 , 551.10
+3060.68 , 1767.77 , 574.68
+3060.68 , 1835.78 , 598.32
+3060.68 , 1903.78 , 621.98
+3060.68 , 1971.78 , 645.68
+3060.68 , 2039.78 , 669.44
+3060.68 , 2107.78 , 693.24
+3060.68 , 2175.78 , 717.07
+3060.68 , 2243.79 , 740.94
+3264.70 , -2391.58 , -729.48
+3264.70 , -2314.62 , -707.42
+3264.70 , -2237.66 , -685.34
+3264.70 , -2160.70 , -663.21
+3264.70 , -2083.74 , -641.02
+3264.70 , -2006.78 , -618.82
+3264.70 , -1929.82 , -596.54
+3264.70 , -1852.86 , -574.26
+3264.70 , -1775.90 , -551.91
+3264.70 , -1698.94 , -529.54
+3264.70 , -1621.98 , -507.11
+3264.70 , -1545.02 , -484.66
+3264.70 , -1468.06 , -462.14
+3264.70 , -1391.10 , -439.60
+3264.70 , -1314.14 , -417.03
+3264.70 , -1237.18 , -394.39
+3264.70 , -1160.22 , -371.72
+3264.70 , -1083.26 , -349.03
+3264.70 , -1006.30 , -326.29
+3264.70 , -929.35 , -303.51
+3264.70 , -852.39 , -280.67
+3264.70 , -775.43 , -257.80
+3264.70 , -698.47 , -234.89
+3264.70 , -621.51 , -211.94
+3264.70 , -544.55 , -188.95
+3264.70 , -467.59 , -165.92
+3264.70 , -390.63 , -142.85
+3264.70 , -313.67 , -119.74
+3264.70 , -236.71 , -96.58
+3264.70 , -159.75 , -73.39
+3264.70 , -82.79 , -50.16
+3264.70 , -5.83 , -26.88
+3264.70 , 71.13 , -2.99
+3264.70 , 139.13 , 21.10
+3264.70 , 207.14 , 45.23
+3264.70 , 275.14 , 69.40
+3264.70 , 343.14 , 93.62
+3264.70 , 411.14 , 117.87
+3264.70 , 479.14 , 142.17
+3264.70 , 547.15 , 166.51
+3264.70 , 615.15 , 190.89
+3264.70 , 683.15 , 215.31
+3264.70 , 751.15 , 239.78
+3264.70 , 819.15 , 264.28
+3264.70 , 887.15 , 288.83
+3264.70 , 955.16 , 313.40
+3264.70 , 1023.16 , 338.04
+3264.70 , 1091.16 , 362.71
+3264.70 , 1159.16 , 387.42
+3264.70 , 1227.16 , 412.16
+3264.70 , 1295.16 , 436.98
+3264.70 , 1363.17 , 461.81
+3264.70 , 1431.17 , 486.67
+3264.70 , 1499.17 , 511.61
+3264.70 , 1567.17 , 536.57
+3264.70 , 1635.17 , 561.57
+3264.70 , 1703.17 , 586.60
+3264.70 , 1771.18 , 611.68
+3264.70 , 1839.18 , 636.81
+3264.70 , 1907.18 , 661.98
+3264.70 , 1975.18 , 687.18
+3264.70 , 2043.18 , 712.46
+3264.70 , 2111.19 , 737.73
+3264.70 , 2179.19 , 763.07
+3264.70 , 2247.19 , 788.44
+3468.80 , -2388.18 , -776.85
+3468.80 , -2311.22 , -753.32
+3468.80 , -2234.26 , -729.77
+3468.80 , -2157.30 , -706.17
+3468.80 , -2080.34 , -682.53
+3468.80 , -2003.38 , -658.86
+3468.80 , -1926.42 , -635.14
+3468.80 , -1849.46 , -611.37
+3468.80 , -1772.50 , -587.55
+3468.80 , -1695.54 , -563.71
+3468.80 , -1618.58 , -539.82
+3468.80 , -1541.62 , -515.91
+3468.80 , -1464.66 , -491.95
+3468.80 , -1387.70 , -467.94
+3468.80 , -1310.74 , -443.88
+3468.80 , -1233.78 , -419.80
+3468.80 , -1156.82 , -395.67
+3468.80 , -1079.86 , -371.51
+3468.80 , -1002.90 , -347.29
+3468.80 , -925.94 , -323.04
+3468.80 , -848.98 , -298.76
+3468.80 , -772.02 , -274.44
+3468.80 , -695.06 , -250.05
+3468.80 , -618.10 , -225.64
+3468.80 , -541.14 , -201.19
+3468.80 , -464.18 , -176.69
+3468.80 , -387.22 , -152.16
+3468.80 , -310.26 , -127.58
+3468.80 , -233.30 , -102.96
+3468.80 , -156.34 , -78.31
+3468.80 , -79.38 , -53.61
+3468.80 , -2.42 , -28.87
+3468.80 , 74.54 , -3.46
+3468.80 , 142.54 , 22.12
+3468.80 , 210.54 , 47.75
+3468.80 , 278.54 , 73.42
+3468.80 , 346.54 , 99.13
+3468.80 , 414.55 , 124.89
+3468.80 , 482.55 , 150.68
+3468.80 , 550.55 , 176.52
+3468.80 , 618.55 , 202.40
+3468.80 , 686.55 , 228.31
+3468.80 , 754.55 , 254.28
+3468.80 , 822.56 , 280.27
+3468.80 , 890.56 , 306.31
+3468.80 , 958.56 , 332.40
+3468.80 , 1026.56 , 358.54
+3468.80 , 1094.56 , 384.70
+3468.80 , 1162.57 , 410.91
+3468.80 , 1230.57 , 437.16
+3468.80 , 1298.57 , 463.45
+3468.80 , 1366.57 , 489.78
+3468.80 , 1434.57 , 516.15
+3468.80 , 1502.57 , 542.58
+3468.80 , 1570.58 , 569.03
+3468.80 , 1638.58 , 595.53
+3468.80 , 1706.58 , 622.08
+3468.80 , 1774.58 , 648.65
+3468.80 , 1842.58 , 675.30
+3468.80 , 1910.58 , 701.94
+3468.80 , 1978.59 , 728.66
+3468.80 , 2046.59 , 755.40
+3468.80 , 2114.59 , 782.19
+3468.80 , 2182.59 , 809.03
+3468.80 , 2250.59 , 835.92
+3672.82 , -2384.78 , -824.23
+3672.82 , -2307.82 , -799.27
+3672.82 , -2230.86 , -774.23
+3672.82 , -2153.90 , -749.16
+3672.82 , -2076.94 , -724.08
+3672.82 , -1999.98 , -698.92
+3672.82 , -1923.02 , -673.73
+3672.82 , -1846.06 , -648.52
+3672.82 , -1769.10 , -623.24
+3672.82 , -1692.14 , -597.94
+3672.82 , -1615.18 , -572.58
+3672.82 , -1538.22 , -547.21
+3672.82 , -1461.26 , -521.78
+3672.82 , -1384.30 , -496.30
+3672.82 , -1307.34 , -470.81
+3672.82 , -1230.38 , -445.23
+3672.82 , -1153.42 , -419.66
+3672.82 , -1076.46 , -394.02
+3672.82 , -999.50 , -368.35
+3672.82 , -922.54 , -342.63
+3672.82 , -845.58 , -316.87
+3672.82 , -768.62 , -291.08
+3672.82 , -691.66 , -265.25
+3672.82 , -614.70 , -239.37
+3672.82 , -537.74 , -213.45
+3672.82 , -460.78 , -187.49
+3672.82 , -383.82 , -161.50
+3672.82 , -306.86 , -135.46
+3672.82 , -229.90 , -109.38
+3672.82 , -152.94 , -83.26
+3672.82 , -75.98 , -57.10
+3672.82 , 0.98 , -30.89
+3672.82 , 77.94 , -3.97
+3672.82 , 145.94 , 23.12
+3672.82 , 213.94 , 50.24
+3672.82 , 281.95 , 77.41
+3672.82 , 349.95 , 104.62
+3672.82 , 417.95 , 131.87
+3672.82 , 485.95 , 159.16
+3672.82 , 553.95 , 186.50
+3672.82 , 621.95 , 213.88
+3672.82 , 689.96 , 241.30
+3672.82 , 757.96 , 268.76
+3672.82 , 825.96 , 296.24
+3672.82 , 893.96 , 323.80
+3672.82 , 961.96 , 351.38
+3672.82 , 1029.96 , 378.99
+3672.82 , 1097.97 , 406.66
+3672.82 , 1165.97 , 434.37
+3672.82 , 1233.97 , 462.12
+3672.82 , 1301.97 , 489.92
+3672.82 , 1369.97 , 517.74
+3672.82 , 1437.98 , 545.61
+3672.82 , 1505.98 , 573.53
+3672.82 , 1573.98 , 601.48
+3672.82 , 1641.98 , 629.49
+3672.82 , 1709.98 , 657.51
+3672.82 , 1777.98 , 685.60
+3672.82 , 1845.99 , 713.72
+3672.82 , 1913.99 , 741.88
+3672.82 , 1981.99 , 770.09
+3672.82 , 2049.99 , 798.35
+3672.82 , 2117.99 , 826.63
+3672.82 , 2185.99 , 854.96
+3672.82 , 2254.00 , 883.34
+3876.84 , -2381.37 , -871.67
+3876.84 , -2304.41 , -845.21
+3876.84 , -2227.45 , -818.73
+3876.84 , -2150.49 , -792.20
+3876.84 , -2073.53 , -765.65
+3876.84 , -1996.57 , -739.03
+3876.84 , -1919.61 , -712.38
+3876.84 , -1842.65 , -685.70
+3876.84 , -1765.69 , -658.96
+3876.84 , -1688.73 , -632.19
+3876.84 , -1611.77 , -605.39
+3876.84 , -1534.81 , -578.52
+3876.84 , -1457.85 , -551.63
+3876.84 , -1380.89 , -524.69
+3876.84 , -1303.93 , -497.73
+3876.84 , -1226.97 , -470.72
+3876.84 , -1150.01 , -443.66
+3876.84 , -1073.05 , -416.57
+3876.84 , -996.09 , -389.44
+3876.84 , -919.13 , -362.26
+3876.84 , -842.18 , -335.03
+3876.84 , -765.22 , -307.77
+3876.84 , -688.26 , -280.47
+3876.84 , -611.30 , -253.14
+3876.84 , -534.34 , -225.76
+3876.84 , -457.38 , -198.34
+3876.84 , -380.42 , -170.87
+3876.84 , -303.46 , -143.37
+3876.84 , -226.50 , -115.83
+3876.84 , -149.54 , -88.24
+3876.84 , -72.58 , -60.62
+3876.84 , 4.38 , -32.95
+3876.84 , 81.34 , -4.51
+3876.84 , 149.35 , 24.07
+3876.84 , 217.35 , 52.70
+3876.84 , 285.35 , 81.37
+3876.84 , 353.35 , 110.07
+3876.84 , 421.35 , 138.82
+3876.84 , 489.35 , 167.61
+3876.84 , 557.36 , 196.44
+3876.84 , 625.36 , 225.32
+3876.84 , 693.36 , 254.23
+3876.84 , 761.36 , 283.18
+3876.84 , 829.36 , 312.19
+3876.84 , 897.36 , 341.21
+3876.84 , 965.37 , 370.31
+3876.84 , 1033.37 , 399.43
+3876.84 , 1101.37 , 428.58
+3876.84 , 1169.37 , 457.80
+3876.84 , 1237.37 , 487.05
+3876.84 , 1305.37 , 516.34
+3876.84 , 1373.38 , 545.66
+3876.84 , 1441.38 , 575.02
+3876.84 , 1509.38 , 604.44
+3876.84 , 1577.38 , 633.90
+3876.84 , 1645.38 , 663.38
+3876.84 , 1713.38 , 692.94
+3876.84 , 1781.39 , 722.50
+3876.84 , 1849.39 , 752.13
+3876.84 , 1917.39 , 781.79
+3876.84 , 1985.39 , 811.49
+3876.84 , 2053.39 , 841.25
+3876.84 , 2121.40 , 871.02
+3876.84 , 2189.40 , 900.85
+3876.84 , 2257.40 , 930.72
+4080.85 , -2377.97 , -919.12
+4080.85 , -2301.01 , -891.23
+4080.85 , -2224.05 , -863.26
+4080.85 , -2147.09 , -835.27
+4080.85 , -2070.13 , -807.25
+4080.85 , -1993.17 , -779.18
+4080.85 , -1916.21 , -751.07
+4080.85 , -1839.25 , -722.91
+4080.85 , -1762.29 , -694.72
+4080.85 , -1685.33 , -666.48
+4080.85 , -1608.37 , -638.20
+4080.85 , -1531.41 , -609.89
+4080.85 , -1454.45 , -581.54
+4080.85 , -1377.49 , -553.13
+4080.85 , -1300.53 , -524.70
+4080.85 , -1223.57 , -496.23
+4080.85 , -1146.61 , -467.70
+4080.85 , -1069.65 , -439.15
+4080.85 , -992.69 , -410.55
+4080.85 , -915.73 , -381.91
+4080.85 , -838.77 , -353.23
+4080.85 , -761.81 , -324.52
+4080.85 , -684.85 , -295.75
+4080.85 , -607.89 , -266.94
+4080.85 , -530.93 , -238.09
+4080.85 , -453.97 , -209.21
+4080.85 , -377.01 , -180.29
+4080.85 , -300.05 , -151.32
+4080.85 , -223.09 , -122.31
+4080.85 , -146.13 , -93.26
+4080.85 , -69.17 , -64.18
+4080.85 , 7.79 , -35.04
+4080.85 , 84.75 , -5.08
+4080.85 , 152.75 , 25.00
+4080.85 , 220.75 , 55.12
+4080.85 , 288.75 , 85.29
+4080.85 , 356.75 , 115.49
+4080.85 , 424.75 , 145.74
+4080.85 , 492.76 , 176.03
+4080.85 , 560.76 , 206.37
+4080.85 , 628.76 , 236.72
+4080.85 , 696.76 , 267.14
+4080.85 , 764.76 , 297.59
+4080.85 , 832.77 , 328.08
+4080.85 , 900.77 , 358.63
+4080.85 , 968.77 , 389.19
+4080.85 , 1036.77 , 419.84
+4080.85 , 1104.77 , 450.48
+4080.85 , 1172.77 , 481.19
+4080.85 , 1240.78 , 511.93
+4080.85 , 1308.78 , 542.71
+4080.85 , 1376.78 , 573.55
+4080.85 , 1444.78 , 604.41
+4080.85 , 1512.78 , 635.34
+4080.85 , 1580.78 , 666.27
+4080.85 , 1648.79 , 697.27
+4080.85 , 1716.79 , 728.30
+4080.85 , 1784.79 , 759.38
+4080.85 , 1852.79 , 790.50
+4080.85 , 1920.79 , 821.68
+4080.85 , 1988.79 , 852.87
+4080.85 , 2056.80 , 884.12
+4080.85 , 2124.80 , 915.39
+4080.85 , 2192.80 , 946.71
+4080.85 , 2260.80 , 978.07
+4268.63 , -2374.84 , -962.82
+4268.63 , -2297.88 , -933.58
+4268.63 , -2220.92 , -904.26
+4268.63 , -2143.96 , -874.95
+4268.63 , -2067.00 , -845.56
+4268.63 , -1990.04 , -816.15
+4268.63 , -1913.08 , -786.68
+4268.63 , -1836.12 , -757.17
+4268.63 , -1759.16 , -727.64
+4268.63 , -1682.20 , -698.06
+4268.63 , -1605.24 , -668.45
+4268.63 , -1528.28 , -638.77
+4268.63 , -1451.32 , -609.07
+4268.63 , -1374.36 , -579.34
+4268.63 , -1297.40 , -549.54
+4268.63 , -1220.44 , -519.72
+4268.63 , -1143.48 , -489.87
+4268.63 , -1066.52 , -459.95
+4268.63 , -989.56 , -430.01
+4268.63 , -912.60 , -400.01
+4268.63 , -835.64 , -369.99
+4268.63 , -758.68 , -339.93
+4268.63 , -681.72 , -309.81
+4268.63 , -604.76 , -279.68
+4268.63 , -527.80 , -249.48
+4268.63 , -450.84 , -219.25
+4268.63 , -373.88 , -188.98
+4268.63 , -296.92 , -158.66
+4268.63 , -219.96 , -128.31
+4268.63 , -143.00 , -97.92
+4268.63 , -66.04 , -67.48
+4268.63 , 10.92 , -36.97
+4268.63 , 87.88 , -5.64
+4268.63 , 155.88 , 25.82
+4268.63 , 223.88 , 57.32
+4268.63 , 291.88 , 88.86
+4268.63 , 359.89 , 120.45
+4268.63 , 427.89 , 152.07
+4268.63 , 495.89 , 183.74
+4268.63 , 563.89 , 215.44
+4268.63 , 631.89 , 247.19
+4268.63 , 699.89 , 278.99
+4268.63 , 767.90 , 310.81
+4268.63 , 835.90 , 342.68
+4268.63 , 903.90 , 374.60
+4268.63 , 971.90 , 406.57
+4268.63 , 1039.90 , 438.56
+4268.63 , 1107.90 , 470.60
+4268.63 , 1175.91 , 502.69
+4268.63 , 1243.91 , 534.80
+4268.63 , 1311.91 , 566.96
+4268.63 , 1379.91 , 599.17
+4268.63 , 1447.91 , 631.43
+4268.63 , 1515.91 , 663.71
+4268.63 , 1583.92 , 696.04
+4268.63 , 1651.92 , 728.42
+4268.63 , 1719.92 , 760.82
+4268.63 , 1787.92 , 793.27
+4268.63 , 1855.92 , 825.77
+4268.63 , 1923.93 , 858.32
+4268.63 , 1991.93 , 890.89
+4268.63 , 2059.93 , 923.51
+4268.63 , 2127.93 , 956.18
+4268.63 , 2195.93 , 988.87
+4268.63 , 2263.93 , 1021.62
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G3.vemo b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G3.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..a95612fadc82e410c8dc55a4413e37c3d9c0c667
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G3.vemo
@@ -0,0 +1,2016 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00 , -2326.01 , 23.82
+0.00 , -2253.83 , 22.44
+0.00 , -2181.64 , 21.09
+0.00 , -2109.45 , 19.79
+0.00 , -2037.27 , 18.53
+0.00 , -1965.08 , 17.31
+0.00 , -1892.90 , 16.13
+0.00 , -1820.71 , 14.99
+0.00 , -1748.52 , 13.89
+0.00 , -1676.34 , 12.84
+0.00 , -1604.15 , 11.83
+0.00 , -1531.97 , 10.85
+0.00 , -1459.78 , 9.92
+0.00 , -1387.59 , 9.04
+0.00 , -1315.41 , 8.19
+0.00 , -1243.22 , 7.38
+0.00 , -1171.04 , 6.62
+0.00 , -1098.85 , 5.90
+0.00 , -1026.67 , 5.21
+0.00 , -954.48 , 4.57
+0.00 , -882.29 , 3.98
+0.00 , -810.11 , 3.42
+0.00 , -736.51 , 2.90
+0.00 , -661.35 , 2.43
+0.00 , -586.18 , 2.00
+0.00 , -510.92 , 1.61
+0.00 , -435.64 , 1.26
+0.00 , -360.35 , 0.95
+0.00 , -285.07 , 0.69
+0.00 , -209.79 , 0.46
+0.00 , -134.50 , 0.28
+0.00 , -59.22 , 0.14
+0.00 , 16.06 , 0.09
+0.00 , 85.44 , 0.21
+0.00 , 154.82 , 0.38
+0.00 , 224.20 , 0.58
+0.00 , 293.58 , 0.83
+0.00 , 362.96 , 1.12
+0.00 , 432.35 , 1.45
+0.00 , 501.73 , 1.82
+0.00 , 571.11 , 2.23
+0.00 , 640.49 , 2.69
+0.00 , 709.87 , 3.19
+0.00 , 779.25 , 3.72
+0.00 , 848.63 , 4.30
+0.00 , 918.01 , 4.93
+0.00 , 987.39 , 5.59
+0.00 , 1056.77 , 6.29
+0.00 , 1126.15 , 7.04
+0.00 , 1195.53 , 7.83
+0.00 , 1264.91 , 8.65
+0.00 , 1334.29 , 9.52
+0.00 , 1403.67 , 10.44
+0.00 , 1473.05 , 11.39
+0.00 , 1542.44 , 12.38
+0.00 , 1611.82 , 13.42
+0.00 , 1681.20 , 14.50
+0.00 , 1750.58 , 15.62
+0.00 , 1819.96 , 16.78
+0.00 , 1889.34 , 17.98
+0.00 , 1958.72 , 19.22
+0.00 , 2028.10 , 20.51
+0.00 , 2097.48 , 21.84
+0.00 , 2166.86 , 23.20
+0.00 , 2236.24 , 24.61
+40.81 , -2326.67 , 13.98
+40.81 , -2254.48 , 12.91
+40.81 , -2182.30 , 11.88
+40.81 , -2110.11 , 10.89
+40.81 , -2037.92 , 9.94
+40.81 , -1965.74 , 9.03
+40.81 , -1893.55 , 8.16
+40.81 , -1821.37 , 7.34
+40.81 , -1749.18 , 6.55
+40.81 , -1676.99 , 5.81
+40.81 , -1604.81 , 5.11
+40.81 , -1532.62 , 4.45
+40.81 , -1460.44 , 3.83
+40.81 , -1388.25 , 3.26
+40.81 , -1316.06 , 2.72
+40.81 , -1243.88 , 2.23
+40.81 , -1171.69 , 1.78
+40.81 , -1099.51 , 1.37
+40.81 , -1027.32 , 1.00
+40.81 , -955.10 , 0.68
+40.81 , -882.53 , 0.40
+40.81 , -809.96 , 0.16
+40.81 , -736.11 , -0.05
+40.81 , -660.83 , -0.22
+40.81 , -585.55 , -0.36
+40.81 , -510.26 , -0.45
+40.81 , -434.98 , -0.50
+40.81 , -359.70 , -0.51
+40.81 , -284.41 , -0.48
+40.81 , -209.13 , -0.41
+40.81 , -133.85 , -0.30
+40.81 , -58.57 , -0.14
+40.81 , 16.72 , 0.10
+40.81 , 86.10 , 0.53
+40.81 , 155.48 , 0.99
+40.81 , 224.86 , 1.50
+40.81 , 294.24 , 2.04
+40.81 , 363.62 , 2.63
+40.81 , 433.00 , 3.26
+40.81 , 502.38 , 3.94
+40.81 , 571.76 , 4.65
+40.81 , 641.14 , 5.40
+40.81 , 710.52 , 6.20
+40.81 , 779.90 , 7.04
+40.81 , 849.28 , 7.92
+40.81 , 918.67 , 8.84
+40.81 , 988.05 , 9.80
+40.81 , 1057.43 , 10.80
+40.81 , 1126.81 , 11.85
+40.81 , 1196.19 , 12.94
+40.81 , 1265.57 , 14.07
+40.81 , 1334.95 , 15.24
+40.81 , 1404.33 , 16.45
+40.81 , 1473.71 , 17.70
+40.81 , 1543.09 , 18.99
+40.81 , 1612.47 , 20.33
+40.81 , 1681.85 , 21.71
+40.81 , 1751.23 , 23.13
+40.81 , 1820.61 , 24.59
+40.81 , 1889.99 , 26.09
+40.81 , 1959.37 , 27.63
+40.81 , 2028.76 , 29.22
+40.81 , 2098.14 , 30.85
+40.81 , 2167.52 , 32.51
+40.81 , 2236.90 , 34.22
+81.62 , -2327.32 , 4.15
+81.62 , -2255.14 , 3.39
+81.62 , -2182.95 , 2.67
+81.62 , -2110.77 , 2.00
+81.62 , -2038.58 , 1.38
+81.62 , -1966.39 , 0.79
+81.62 , -1894.21 , 0.25
+81.62 , -1822.02 , -0.26
+81.62 , -1749.84 , -0.72
+81.62 , -1677.65 , -1.14
+81.62 , -1605.46 , -1.53
+81.62 , -1533.28 , -1.87
+81.62 , -1461.09 , -2.17
+81.62 , -1388.91 , -2.43
+81.62 , -1316.72 , -2.65
+81.62 , -1244.53 , -2.83
+81.62 , -1172.35 , -2.97
+81.62 , -1100.16 , -3.06
+81.62 , -1027.98 , -3.12
+81.62 , -955.71 , -3.14
+81.62 , -882.64 , -3.12
+81.62 , -809.57 , -3.06
+81.62 , -735.46 , -2.97
+81.62 , -660.17 , -2.85
+81.62 , -584.89 , -2.69
+81.62 , -509.61 , -2.49
+81.62 , -434.32 , -2.25
+81.62 , -359.04 , -1.96
+81.62 , -283.76 , -1.64
+81.62 , -208.48 , -1.27
+81.62 , -133.19 , -0.87
+81.62 , -57.91 , -0.42
+81.62 , 17.37 , 0.12
+81.62 , 86.75 , 0.84
+81.62 , 156.13 , 1.61
+81.62 , 225.51 , 2.41
+81.62 , 294.90 , 3.26
+81.62 , 364.28 , 4.15
+81.62 , 433.66 , 5.08
+81.62 , 503.04 , 6.05
+81.62 , 572.42 , 7.06
+81.62 , 641.80 , 8.12
+81.62 , 711.18 , 9.21
+81.62 , 780.56 , 10.35
+81.62 , 849.94 , 11.53
+81.62 , 919.32 , 12.75
+81.62 , 988.70 , 14.01
+81.62 , 1058.08 , 15.32
+81.62 , 1127.46 , 16.66
+81.62 , 1196.84 , 18.05
+81.62 , 1266.22 , 19.48
+81.62 , 1335.60 , 20.95
+81.62 , 1404.99 , 22.46
+81.62 , 1474.37 , 24.01
+81.62 , 1543.75 , 25.60
+81.62 , 1613.13 , 27.24
+81.62 , 1682.51 , 28.92
+81.62 , 1751.89 , 30.64
+81.62 , 1821.27 , 32.40
+81.62 , 1890.65 , 34.20
+81.62 , 1960.03 , 36.04
+81.62 , 2029.41 , 37.92
+81.62 , 2098.79 , 39.85
+81.62 , 2168.17 , 41.82
+81.62 , 2237.55 , 43.83
+122.43 , -2327.98 , -5.50
+122.43 , -2255.79 , -5.95
+122.43 , -2183.61 , -6.35
+122.43 , -2111.42 , -6.71
+122.43 , -2039.23 , -7.03
+122.43 , -1967.05 , -7.31
+122.43 , -1894.86 , -7.54
+122.43 , -1822.68 , -7.74
+122.43 , -1750.49 , -7.90
+122.43 , -1678.31 , -8.02
+122.43 , -1606.12 , -8.09
+122.43 , -1533.93 , -8.13
+122.43 , -1461.75 , -8.12
+122.43 , -1389.56 , -8.07
+122.43 , -1317.38 , -7.99
+122.43 , -1245.19 , -7.86
+122.43 , -1173.00 , -7.69
+122.43 , -1100.82 , -7.48
+122.43 , -1028.63 , -7.23
+122.43 , -956.32 , -6.94
+122.43 , -882.75 , -6.63
+122.43 , -809.18 , -6.28
+122.43 , -734.80 , -5.89
+122.43 , -659.52 , -5.48
+122.43 , -584.23 , -5.02
+122.43 , -508.95 , -4.53
+122.43 , -433.67 , -3.99
+122.43 , -358.39 , -3.42
+122.43 , -283.10 , -2.80
+122.43 , -207.82 , -2.14
+122.43 , -132.54 , -1.44
+122.43 , -57.25 , -0.71
+122.43 , 18.03 , 0.13
+122.43 , 87.41 , 1.16
+122.43 , 156.79 , 2.22
+122.43 , 226.17 , 3.33
+122.43 , 295.55 , 4.47
+122.43 , 364.93 , 5.66
+122.43 , 434.31 , 6.89
+122.43 , 503.69 , 8.16
+122.43 , 573.07 , 9.47
+122.43 , 642.45 , 10.83
+122.43 , 711.83 , 12.22
+122.43 , 781.22 , 13.66
+122.43 , 850.60 , 15.14
+122.43 , 919.98 , 16.66
+122.43 , 989.36 , 18.22
+122.43 , 1058.74 , 19.83
+122.43 , 1128.12 , 21.47
+122.43 , 1197.50 , 23.16
+122.43 , 1266.88 , 24.89
+122.43 , 1336.26 , 26.66
+122.43 , 1405.64 , 28.47
+122.43 , 1475.02 , 30.32
+122.43 , 1544.40 , 32.21
+122.43 , 1613.78 , 34.15
+122.43 , 1683.16 , 36.13
+122.43 , 1752.54 , 38.14
+122.43 , 1821.92 , 40.20
+122.43 , 1891.31 , 42.30
+122.43 , 1960.69 , 44.45
+122.43 , 2030.07 , 46.63
+122.43 , 2099.45 , 48.86
+122.43 , 2168.83 , 51.13
+122.43 , 2238.21 , 53.43
+163.24 , -2328.63 , -15.12
+163.24 , -2256.45 , -15.26
+163.24 , -2184.26 , -15.35
+163.24 , -2112.08 , -15.41
+163.24 , -2039.89 , -15.42
+163.24 , -1967.70 , -15.39
+163.24 , -1895.52 , -15.32
+163.24 , -1823.33 , -15.22
+163.24 , -1751.15 , -15.07
+163.24 , -1678.96 , -14.88
+163.24 , -1606.77 , -14.65
+163.24 , -1534.59 , -14.37
+163.24 , -1462.40 , -14.06
+163.24 , -1390.22 , -13.71
+163.24 , -1318.03 , -13.32
+163.24 , -1245.84 , -12.88
+163.24 , -1173.66 , -12.41
+163.24 , -1101.47 , -11.89
+163.24 , -1029.29 , -11.34
+163.24 , -956.93 , -10.74
+163.24 , -882.86 , -10.14
+163.24 , -808.79 , -9.49
+163.24 , -734.14 , -8.81
+163.24 , -658.86 , -8.11
+163.24 , -583.58 , -7.36
+163.24 , -508.30 , -6.57
+163.24 , -433.01 , -5.74
+163.24 , -357.73 , -4.87
+163.24 , -282.45 , -3.96
+163.24 , -207.16 , -3.01
+163.24 , -131.88 , -2.02
+163.24 , -56.60 , -0.99
+163.24 , 18.68 , 0.15
+163.24 , 88.06 , 1.47
+163.24 , 157.44 , 2.83
+163.24 , 226.83 , 4.24
+163.24 , 296.21 , 5.68
+163.24 , 365.59 , 7.17
+163.24 , 434.97 , 8.70
+163.24 , 504.35 , 10.27
+163.24 , 573.73 , 11.89
+163.24 , 643.11 , 13.54
+163.24 , 712.49 , 15.24
+163.24 , 781.87 , 16.97
+163.24 , 851.25 , 18.75
+163.24 , 920.63 , 20.57
+163.24 , 990.01 , 22.43
+163.24 , 1059.39 , 24.34
+163.24 , 1128.77 , 26.28
+163.24 , 1198.15 , 28.27
+163.24 , 1267.53 , 30.29
+163.24 , 1336.92 , 32.36
+163.24 , 1406.30 , 34.47
+163.24 , 1475.68 , 36.63
+163.24 , 1545.06 , 38.82
+163.24 , 1614.44 , 41.06
+163.24 , 1683.82 , 43.33
+163.24 , 1753.20 , 45.65
+163.24 , 1822.58 , 48.01
+163.24 , 1891.96 , 50.41
+163.24 , 1961.34 , 52.85
+163.24 , 2030.72 , 55.34
+163.24 , 2100.10 , 57.86
+163.24 , 2169.48 , 60.43
+163.24 , 2238.86 , 63.04
+204.04 , -2329.29 , -24.73
+204.04 , -2257.10 , -24.56
+204.04 , -2184.92 , -24.35
+204.04 , -2112.73 , -24.09
+204.04 , -2040.55 , -23.80
+204.04 , -1968.36 , -23.47
+204.04 , -1896.17 , -23.09
+204.04 , -1823.99 , -22.68
+204.04 , -1751.80 , -22.22
+204.04 , -1679.62 , -21.73
+204.04 , -1607.43 , -21.19
+204.04 , -1535.24 , -20.61
+204.04 , -1463.06 , -19.99
+204.04 , -1390.87 , -19.33
+204.04 , -1318.69 , -18.63
+204.04 , -1246.50 , -17.89
+204.04 , -1174.31 , -17.11
+204.04 , -1102.13 , -16.29
+204.04 , -1029.94 , -15.43
+204.04 , -957.54 , -14.53
+204.04 , -882.97 , -13.64
+204.04 , -808.40 , -12.70
+204.04 , -733.49 , -11.74
+204.04 , -658.21 , -10.74
+204.04 , -582.92 , -9.70
+204.04 , -507.64 , -8.62
+204.04 , -432.36 , -7.49
+204.04 , -357.07 , -6.33
+204.04 , -281.79 , -5.13
+204.04 , -206.51 , -3.88
+204.04 , -131.23 , -2.60
+204.04 , -55.94 , -1.27
+204.04 , 19.34 , 0.16
+204.04 , 88.72 , 1.78
+204.04 , 158.10 , 3.44
+204.04 , 227.48 , 5.15
+204.04 , 296.86 , 6.90
+204.04 , 366.24 , 8.68
+204.04 , 435.62 , 10.51
+204.04 , 505.00 , 12.38
+204.04 , 574.38 , 14.30
+204.04 , 643.76 , 16.25
+204.04 , 713.15 , 18.24
+204.04 , 782.53 , 20.28
+204.04 , 851.91 , 22.36
+204.04 , 921.29 , 24.48
+204.04 , 990.67 , 26.64
+204.04 , 1060.05 , 28.84
+204.04 , 1129.43 , 31.09
+204.04 , 1198.81 , 33.37
+204.04 , 1268.19 , 35.70
+204.04 , 1337.57 , 38.07
+204.04 , 1406.95 , 40.48
+204.04 , 1476.33 , 42.93
+204.04 , 1545.71 , 45.43
+204.04 , 1615.09 , 47.96
+204.04 , 1684.47 , 50.54
+204.04 , 1753.85 , 53.16
+204.04 , 1823.24 , 55.81
+204.04 , 1892.62 , 58.52
+204.04 , 1962.00 , 61.26
+204.04 , 2031.38 , 64.04
+204.04 , 2100.76 , 66.87
+204.04 , 2170.14 , 69.73
+204.04 , 2239.52 , 72.64
+244.85 , -2329.95 , -34.33
+244.85 , -2257.76 , -33.85
+244.85 , -2185.57 , -33.33
+244.85 , -2113.39 , -32.77
+244.85 , -2041.20 , -32.18
+244.85 , -1969.02 , -31.54
+244.85 , -1896.83 , -30.85
+244.85 , -1824.64 , -30.13
+244.85 , -1752.46 , -29.37
+244.85 , -1680.27 , -28.57
+244.85 , -1608.09 , -27.72
+244.85 , -1535.90 , -26.84
+244.85 , -1463.71 , -25.91
+244.85 , -1391.53 , -24.95
+244.85 , -1319.34 , -23.94
+244.85 , -1247.16 , -22.90
+244.85 , -1174.97 , -21.81
+244.85 , -1102.78 , -20.68
+244.85 , -1030.60 , -19.51
+244.85 , -958.15 , -18.31
+244.85 , -883.08 , -17.13
+244.85 , -808.01 , -15.92
+244.85 , -732.83 , -14.66
+244.85 , -657.55 , -13.37
+244.85 , -582.27 , -12.03
+244.85 , -506.99 , -10.66
+244.85 , -431.70 , -9.24
+244.85 , -356.42 , -7.79
+244.85 , -281.14 , -6.29
+244.85 , -205.85 , -4.76
+244.85 , -130.57 , -3.18
+244.85 , -55.29 , -1.56
+244.85 , 19.99 , 0.17
+244.85 , 89.38 , 2.09
+244.85 , 158.76 , 4.05
+244.85 , 228.14 , 6.06
+244.85 , 297.52 , 8.10
+244.85 , 366.90 , 10.19
+244.85 , 436.28 , 12.32
+244.85 , 505.66 , 14.49
+244.85 , 575.04 , 16.70
+244.85 , 644.42 , 18.96
+244.85 , 713.80 , 21.25
+244.85 , 783.18 , 23.59
+244.85 , 852.56 , 25.97
+244.85 , 921.94 , 28.39
+244.85 , 991.32 , 30.85
+244.85 , 1060.70 , 33.35
+244.85 , 1130.08 , 35.89
+244.85 , 1199.47 , 38.48
+244.85 , 1268.85 , 41.11
+244.85 , 1338.23 , 43.78
+244.85 , 1407.61 , 46.49
+244.85 , 1476.99 , 49.24
+244.85 , 1546.37 , 52.03
+244.85 , 1615.75 , 54.86
+244.85 , 1685.13 , 57.74
+244.85 , 1754.51 , 60.66
+244.85 , 1823.89 , 63.62
+244.85 , 1893.27 , 66.62
+244.85 , 1962.65 , 69.66
+244.85 , 2032.03 , 72.74
+244.85 , 2101.41 , 75.87
+244.85 , 2170.79 , 79.04
+244.85 , 2240.17 , 82.24
+285.67 , -2330.60 , -43.92
+285.67 , -2258.41 , -43.13
+285.67 , -2186.23 , -42.31
+285.67 , -2114.04 , -41.44
+285.67 , -2041.86 , -40.54
+285.67 , -1969.67 , -39.59
+285.67 , -1897.48 , -38.60
+285.67 , -1825.30 , -37.58
+285.67 , -1753.11 , -36.51
+285.67 , -1680.93 , -35.40
+285.67 , -1608.74 , -34.25
+285.67 , -1536.56 , -33.06
+285.67 , -1464.37 , -31.83
+285.67 , -1392.18 , -30.55
+285.67 , -1320.00 , -29.24
+285.67 , -1247.81 , -27.89
+285.67 , -1175.63 , -26.49
+285.67 , -1103.23 , -25.07
+285.67 , -1030.76 , -23.60
+285.67 , -958.03 , -22.10
+285.67 , -882.74 , -20.64
+285.67 , -807.46 , -19.13
+285.67 , -732.18 , -17.59
+285.67 , -656.90 , -16.00
+285.67 , -581.61 , -14.37
+285.67 , -506.33 , -12.71
+285.67 , -431.05 , -11.00
+285.67 , -355.76 , -9.25
+285.67 , -280.48 , -7.46
+285.67 , -205.20 , -5.63
+285.67 , -129.92 , -3.76
+285.67 , -54.63 , -1.85
+285.67 , 20.65 , 0.18
+285.67 , 90.03 , 2.40
+285.67 , 159.41 , 4.66
+285.67 , 228.79 , 6.97
+285.67 , 298.17 , 9.31
+285.67 , 367.55 , 11.70
+285.67 , 436.93 , 14.13
+285.67 , 506.31 , 16.60
+285.67 , 575.70 , 19.11
+285.67 , 645.08 , 21.67
+285.67 , 714.46 , 24.26
+285.67 , 783.84 , 26.90
+285.67 , 853.22 , 29.57
+285.67 , 922.60 , 32.29
+285.67 , 991.98 , 35.05
+285.67 , 1061.36 , 37.86
+285.67 , 1130.74 , 40.70
+285.67 , 1200.12 , 43.59
+285.67 , 1269.50 , 46.51
+285.67 , 1338.88 , 49.48
+285.67 , 1408.26 , 52.49
+285.67 , 1477.64 , 55.54
+285.67 , 1547.02 , 58.64
+285.67 , 1616.40 , 61.77
+285.67 , 1685.79 , 64.94
+285.67 , 1755.17 , 68.16
+285.67 , 1824.55 , 71.42
+285.67 , 1893.93 , 74.72
+285.67 , 1963.31 , 78.06
+285.67 , 2032.69 , 81.45
+285.67 , 2102.07 , 84.87
+285.67 , 2171.45 , 88.34
+285.67 , 2240.83 , 91.85
+326.47 , -2331.26 , -53.49
+326.47 , -2259.07 , -52.40
+326.47 , -2186.88 , -51.27
+326.47 , -2114.70 , -50.10
+326.47 , -2042.51 , -48.89
+326.47 , -1970.33 , -47.64
+326.47 , -1898.14 , -46.34
+326.47 , -1825.95 , -45.01
+326.47 , -1753.77 , -43.64
+326.47 , -1681.58 , -42.22
+326.47 , -1609.40 , -40.76
+326.47 , -1537.21 , -39.27
+326.47 , -1465.02 , -37.73
+326.47 , -1392.84 , -36.15
+326.47 , -1320.65 , -34.53
+326.47 , -1248.47 , -32.87
+326.47 , -1176.28 , -31.17
+326.47 , -1103.53 , -29.45
+326.47 , -1030.56 , -27.69
+326.47 , -957.37 , -25.91
+326.47 , -882.09 , -24.15
+326.47 , -806.81 , -22.35
+326.47 , -731.52 , -20.51
+326.47 , -656.24 , -18.63
+326.47 , -580.96 , -16.71
+326.47 , -505.67 , -14.75
+326.47 , -430.39 , -12.75
+326.47 , -355.11 , -10.71
+326.47 , -279.83 , -8.63
+326.47 , -204.54 , -6.50
+326.47 , -129.26 , -4.34
+326.47 , -53.98 , -2.13
+326.47 , 21.31 , 0.19
+326.47 , 90.69 , 2.71
+326.47 , 160.07 , 5.27
+326.47 , 229.45 , 7.88
+326.47 , 298.83 , 10.52
+326.47 , 368.21 , 13.21
+326.47 , 437.59 , 15.94
+326.47 , 506.97 , 18.71
+326.47 , 576.35 , 21.52
+326.47 , 645.73 , 24.37
+326.47 , 715.11 , 27.27
+326.47 , 784.49 , 30.20
+326.47 , 853.87 , 33.18
+326.47 , 923.25 , 36.20
+326.47 , 992.63 , 39.26
+326.47 , 1062.01 , 42.36
+326.47 , 1131.40 , 45.50
+326.47 , 1200.78 , 48.69
+326.47 , 1270.16 , 51.92
+326.47 , 1339.54 , 55.19
+326.47 , 1408.92 , 58.49
+326.47 , 1478.30 , 61.84
+326.47 , 1547.68 , 65.24
+326.47 , 1617.06 , 68.67
+326.47 , 1686.44 , 72.15
+326.47 , 1755.82 , 75.66
+326.47 , 1825.20 , 79.22
+326.47 , 1894.58 , 82.82
+326.47 , 1963.96 , 86.47
+326.47 , 2033.34 , 90.15
+326.47 , 2102.72 , 93.87
+326.47 , 2172.10 , 97.64
+326.47 , 2241.49 , 101.45
+367.28 , -2331.91 , -63.06
+367.28 , -2259.73 , -61.67
+367.28 , -2187.54 , -60.23
+367.28 , -2115.35 , -58.75
+367.28 , -2043.17 , -57.23
+367.28 , -1970.98 , -55.67
+367.28 , -1898.80 , -54.07
+367.28 , -1826.61 , -52.43
+367.28 , -1754.42 , -50.75
+367.28 , -1682.24 , -49.03
+367.28 , -1610.05 , -47.27
+367.28 , -1537.87 , -45.46
+367.28 , -1465.68 , -43.62
+367.28 , -1393.49 , -41.73
+367.28 , -1321.31 , -39.81
+367.28 , -1249.12 , -37.84
+367.28 , -1176.94 , -35.84
+367.28 , -1103.83 , -33.82
+367.28 , -1030.36 , -31.79
+367.28 , -956.72 , -29.71
+367.28 , -881.43 , -27.66
+367.28 , -806.15 , -25.57
+367.28 , -730.87 , -23.44
+367.28 , -655.58 , -21.27
+367.28 , -580.30 , -19.05
+367.28 , -505.02 , -16.80
+367.28 , -429.74 , -14.51
+367.28 , -354.45 , -12.17
+367.28 , -279.17 , -9.80
+367.28 , -203.89 , -7.38
+367.28 , -128.60 , -4.92
+367.28 , -53.32 , -2.42
+367.28 , 21.96 , 0.20
+367.28 , 91.34 , 3.02
+367.28 , 160.72 , 5.88
+367.28 , 230.10 , 8.78
+367.28 , 299.48 , 11.73
+367.28 , 368.86 , 14.71
+367.28 , 438.24 , 17.74
+367.28 , 507.63 , 20.81
+367.28 , 577.01 , 23.92
+367.28 , 646.39 , 27.08
+367.28 , 715.77 , 30.27
+367.28 , 785.15 , 33.51
+367.28 , 854.53 , 36.78
+367.28 , 923.91 , 40.10
+367.28 , 993.29 , 43.46
+367.28 , 1062.67 , 46.87
+367.28 , 1132.05 , 50.31
+367.28 , 1201.43 , 53.79
+367.28 , 1270.81 , 57.32
+367.28 , 1340.19 , 60.89
+367.28 , 1409.57 , 64.50
+367.28 , 1478.95 , 68.15
+367.28 , 1548.33 , 71.84
+367.28 , 1617.72 , 75.57
+367.28 , 1687.10 , 79.35
+367.28 , 1756.48 , 83.17
+367.28 , 1825.86 , 87.02
+367.28 , 1895.24 , 90.92
+367.28 , 1964.62 , 94.87
+367.28 , 2034.00 , 98.85
+367.28 , 2103.38 , 102.87
+367.28 , 2172.76 , 106.94
+367.28 , 2242.14 , 111.04
+408.09 , -2332.57 , -72.62
+408.09 , -2260.38 , -70.92
+408.09 , -2188.19 , -69.17
+408.09 , -2116.01 , -67.39
+408.09 , -2043.82 , -65.57
+408.09 , -1971.64 , -63.70
+408.09 , -1899.45 , -61.79
+408.09 , -1827.27 , -59.84
+408.09 , -1755.08 , -57.86
+408.09 , -1682.89 , -55.83
+408.09 , -1610.71 , -53.76
+408.09 , -1538.52 , -51.65
+408.09 , -1466.34 , -49.50
+408.09 , -1394.15 , -47.31
+408.09 , -1321.96 , -45.08
+408.09 , -1249.78 , -42.81
+408.09 , -1177.59 , -40.49
+408.09 , -1104.13 , -38.19
+408.09 , -1030.16 , -35.88
+408.09 , -956.06 , -33.52
+408.09 , -880.78 , -31.18
+408.09 , -805.49 , -28.79
+408.09 , -730.21 , -26.37
+408.09 , -654.93 , -23.90
+408.09 , -579.65 , -21.40
+408.09 , -504.36 , -18.85
+408.09 , -429.08 , -16.26
+408.09 , -353.80 , -13.63
+408.09 , -278.51 , -10.97
+408.09 , -203.23 , -8.26
+408.09 , -127.95 , -5.51
+408.09 , -52.67 , -2.71
+408.09 , 22.62 , 0.20
+408.09 , 92.00 , 3.32
+408.09 , 161.38 , 6.49
+408.09 , 230.76 , 9.69
+408.09 , 300.14 , 12.93
+408.09 , 369.52 , 16.22
+408.09 , 438.90 , 19.55
+408.09 , 508.28 , 22.92
+408.09 , 577.66 , 26.33
+408.09 , 647.04 , 29.78
+408.09 , 716.42 , 33.27
+408.09 , 785.80 , 36.81
+408.09 , 855.18 , 40.39
+408.09 , 924.56 , 44.01
+408.09 , 993.95 , 47.67
+408.09 , 1063.33 , 51.37
+408.09 , 1132.71 , 55.11
+408.09 , 1202.09 , 58.90
+408.09 , 1271.47 , 62.72
+408.09 , 1340.85 , 66.59
+408.09 , 1410.23 , 70.50
+408.09 , 1479.61 , 74.45
+408.09 , 1548.99 , 78.44
+408.09 , 1618.37 , 82.47
+408.09 , 1687.75 , 86.55
+408.09 , 1757.13 , 90.66
+408.09 , 1826.51 , 94.82
+408.09 , 1895.89 , 99.02
+408.09 , 1965.27 , 103.26
+408.09 , 2034.65 , 107.55
+408.09 , 2104.04 , 111.87
+408.09 , 2173.42 , 116.24
+408.09 , 2242.80 , 120.64
+448.90 , -2333.22 , -82.17
+448.90 , -2261.04 , -80.16
+448.90 , -2188.85 , -78.11
+448.90 , -2116.66 , -76.02
+448.90 , -2044.48 , -73.89
+448.90 , -1972.29 , -71.71
+448.90 , -1900.11 , -69.50
+448.90 , -1827.92 , -67.25
+448.90 , -1755.73 , -64.95
+448.90 , -1683.55 , -62.62
+448.90 , -1611.36 , -60.25
+448.90 , -1539.18 , -57.83
+448.90 , -1466.99 , -55.37
+448.90 , -1394.80 , -52.88
+448.90 , -1322.62 , -50.34
+448.90 , -1250.43 , -47.76
+448.90 , -1178.25 , -45.14
+448.90 , -1104.44 , -42.55
+448.90 , -1029.96 , -39.96
+448.90 , -955.40 , -37.33
+448.90 , -880.12 , -34.69
+448.90 , -804.84 , -32.02
+448.90 , -729.56 , -29.30
+448.90 , -654.27 , -26.54
+448.90 , -578.99 , -23.74
+448.90 , -503.71 , -20.90
+448.90 , -428.42 , -18.02
+448.90 , -353.14 , -15.10
+448.90 , -277.86 , -12.14
+448.90 , -202.58 , -9.13
+448.90 , -127.29 , -6.09
+448.90 , -52.01 , -3.01
+448.90 , 23.27 , 0.21
+448.90 , 92.65 , 3.63
+448.90 , 162.03 , 7.09
+448.90 , 231.41 , 10.59
+448.90 , 300.79 , 14.14
+448.90 , 370.17 , 17.72
+448.90 , 439.56 , 21.35
+448.90 , 508.94 , 25.02
+448.90 , 578.32 , 28.73
+448.90 , 647.70 , 32.48
+448.90 , 717.08 , 36.28
+448.90 , 786.46 , 40.11
+448.90 , 855.84 , 43.99
+448.90 , 925.22 , 47.91
+448.90 , 994.60 , 51.87
+448.90 , 1063.98 , 55.87
+448.90 , 1133.36 , 59.91
+448.90 , 1202.74 , 64.00
+448.90 , 1272.12 , 68.12
+448.90 , 1341.50 , 72.29
+448.90 , 1410.88 , 76.50
+448.90 , 1480.26 , 80.75
+448.90 , 1549.65 , 85.04
+448.90 , 1619.03 , 89.37
+448.90 , 1688.41 , 93.75
+448.90 , 1757.79 , 98.16
+448.90 , 1827.17 , 102.62
+448.90 , 1896.55 , 107.12
+448.90 , 1965.93 , 111.66
+448.90 , 2035.31 , 116.24
+448.90 , 2104.69 , 120.87
+448.90 , 2174.07 , 125.53
+448.90 , 2243.45 , 130.24
+489.71 , -2333.88 , -91.71
+489.71 , -2261.69 , -89.39
+489.71 , -2189.51 , -87.03
+489.71 , -2117.32 , -84.64
+489.71 , -2045.13 , -82.20
+489.71 , -1972.95 , -79.72
+489.71 , -1900.76 , -77.20
+489.71 , -1828.58 , -74.64
+489.71 , -1756.39 , -72.04
+489.71 , -1684.20 , -69.40
+489.71 , -1612.02 , -66.72
+489.71 , -1539.83 , -64.00
+489.71 , -1467.65 , -61.23
+489.71 , -1395.46 , -58.43
+489.71 , -1323.27 , -55.58
+489.71 , -1251.09 , -52.70
+489.71 , -1178.90 , -49.77
+489.71 , -1104.74 , -46.91
+489.71 , -1029.76 , -44.05
+489.71 , -954.75 , -41.14
+489.71 , -879.47 , -38.21
+489.71 , -804.18 , -35.24
+489.71 , -728.90 , -32.23
+489.71 , -653.62 , -29.18
+489.71 , -578.34 , -26.09
+489.71 , -503.05 , -22.95
+489.71 , -427.77 , -19.78
+489.71 , -352.49 , -16.56
+489.71 , -277.20 , -13.31
+489.71 , -201.92 , -10.01
+489.71 , -126.64 , -6.68
+489.71 , -51.36 , -3.30
+489.71 , 23.93 , 0.21
+489.71 , 93.31 , 3.93
+489.71 , 162.69 , 7.69
+489.71 , 232.07 , 11.50
+489.71 , 301.45 , 15.34
+489.71 , 370.83 , 19.23
+489.71 , 440.21 , 23.15
+489.71 , 509.59 , 27.12
+489.71 , 578.97 , 31.13
+489.71 , 648.35 , 35.19
+489.71 , 717.73 , 39.28
+489.71 , 787.11 , 43.41
+489.71 , 856.49 , 47.59
+489.71 , 925.88 , 51.81
+489.71 , 995.26 , 56.07
+489.71 , 1064.64 , 60.37
+489.71 , 1134.02 , 64.71
+489.71 , 1203.40 , 69.10
+489.71 , 1272.78 , 73.52
+489.71 , 1342.16 , 77.99
+489.71 , 1411.54 , 82.50
+489.71 , 1480.92 , 87.05
+489.71 , 1550.30 , 91.64
+489.71 , 1619.68 , 96.27
+489.71 , 1689.06 , 100.95
+489.71 , 1758.44 , 105.66
+489.71 , 1827.82 , 110.42
+489.71 , 1897.20 , 115.22
+489.71 , 1966.58 , 120.06
+489.71 , 2035.97 , 124.94
+489.71 , 2105.35 , 129.86
+489.71 , 2174.73 , 134.83
+489.71 , 2244.11 , 139.84
+816.18 , -2339.12 , -167.65
+816.18 , -2266.94 , -162.88
+816.18 , -2194.75 , -158.08
+816.18 , -2122.56 , -153.23
+816.18 , -2050.38 , -148.34
+816.18 , -1978.19 , -143.41
+816.18 , -1906.01 , -138.44
+816.18 , -1833.82 , -133.43
+816.18 , -1761.63 , -128.38
+816.18 , -1689.45 , -123.29
+816.18 , -1617.26 , -118.15
+816.18 , -1545.08 , -112.98
+816.18 , -1472.32 , -107.81
+816.18 , -1399.53 , -102.61
+816.18 , -1325.92 , -97.44
+816.18 , -1250.64 , -92.36
+816.18 , -1175.35 , -87.25
+816.18 , -1100.07 , -82.10
+816.18 , -1024.79 , -76.90
+816.18 , -949.51 , -71.67
+816.18 , -874.22 , -66.40
+816.18 , -798.94 , -61.08
+816.18 , -723.66 , -55.72
+816.18 , -648.37 , -50.33
+816.18 , -573.09 , -44.89
+816.18 , -497.81 , -39.41
+816.18 , -422.53 , -33.89
+816.18 , -347.24 , -28.33
+816.18 , -271.96 , -22.73
+816.18 , -196.68 , -17.09
+816.18 , -121.39 , -11.41
+816.18 , -46.11 , -5.68
+816.18 , 29.17 , 0.21
+816.18 , 98.55 , 6.33
+816.18 , 167.93 , 12.48
+816.18 , 237.31 , 18.69
+816.18 , 306.69 , 24.93
+816.18 , 376.07 , 31.21
+816.18 , 445.45 , 37.54
+816.18 , 514.84 , 43.90
+816.18 , 584.22 , 50.31
+816.18 , 653.60 , 56.76
+816.18 , 722.98 , 63.25
+816.18 , 792.36 , 69.79
+816.18 , 861.74 , 76.36
+816.18 , 931.12 , 82.98
+816.18 , 1000.50 , 89.63
+816.18 , 1069.88 , 96.33
+816.18 , 1139.26 , 103.07
+816.18 , 1208.64 , 109.85
+816.18 , 1278.02 , 116.68
+816.18 , 1347.40 , 123.54
+816.18 , 1416.78 , 130.45
+816.18 , 1486.16 , 137.40
+816.18 , 1555.54 , 144.39
+816.18 , 1624.93 , 151.42
+816.18 , 1694.31 , 158.49
+816.18 , 1763.69 , 165.60
+816.18 , 1833.07 , 172.76
+816.18 , 1902.45 , 179.96
+816.18 , 1971.83 , 187.19
+816.18 , 2041.21 , 194.47
+816.18 , 2110.59 , 201.80
+816.18 , 2179.97 , 209.16
+816.18 , 2249.35 , 216.56
+1020.26 , -2342.40 , -214.79
+1020.26 , -2270.21 , -208.49
+1020.26 , -2198.03 , -202.15
+1020.26 , -2125.84 , -195.77
+1020.26 , -2053.66 , -189.35
+1020.26 , -1981.47 , -182.89
+1020.26 , -1909.28 , -176.39
+1020.26 , -1837.10 , -169.85
+1020.26 , -1764.91 , -163.26
+1020.26 , -1692.72 , -156.64
+1020.26 , -1620.52 , -149.98
+1020.26 , -1548.32 , -143.27
+1020.26 , -1473.21 , -136.84
+1020.26 , -1397.92 , -130.38
+1020.26 , -1322.64 , -123.88
+1020.26 , -1247.36 , -117.35
+1020.26 , -1172.08 , -110.77
+1020.26 , -1096.79 , -104.15
+1020.26 , -1021.51 , -97.49
+1020.26 , -946.23 , -90.79
+1020.26 , -870.94 , -84.05
+1020.26 , -795.66 , -77.27
+1020.26 , -720.38 , -70.45
+1020.26 , -645.10 , -63.58
+1020.26 , -569.81 , -56.68
+1020.26 , -494.53 , -49.73
+1020.26 , -419.25 , -42.75
+1020.26 , -343.97 , -35.72
+1020.26 , -268.68 , -28.66
+1020.26 , -193.40 , -21.55
+1020.26 , -118.12 , -14.40
+1020.26 , -42.83 , -7.21
+1020.26 , 32.45 , 0.17
+1020.26 , 101.83 , 7.78
+1020.26 , 171.21 , 15.44
+1020.26 , 240.59 , 23.14
+1020.26 , 309.97 , 30.88
+1020.26 , 379.35 , 38.67
+1020.26 , 448.73 , 46.49
+1020.26 , 518.11 , 54.35
+1020.26 , 587.49 , 62.26
+1020.26 , 656.87 , 70.21
+1020.26 , 726.26 , 78.20
+1020.26 , 795.64 , 86.23
+1020.26 , 865.02 , 94.30
+1020.26 , 934.40 , 102.42
+1020.26 , 1003.78 , 110.58
+1020.26 , 1073.16 , 118.77
+1020.26 , 1142.54 , 127.01
+1020.26 , 1211.92 , 135.29
+1020.26 , 1281.30 , 143.61
+1020.26 , 1350.68 , 151.98
+1020.26 , 1420.06 , 160.38
+1020.26 , 1489.44 , 168.83
+1020.26 , 1558.82 , 177.32
+1020.26 , 1628.20 , 185.85
+1020.26 , 1697.58 , 194.42
+1020.26 , 1766.96 , 203.03
+1020.26 , 1836.35 , 211.68
+1020.26 , 1905.73 , 220.38
+1020.26 , 1975.11 , 229.12
+1020.26 , 2044.49 , 237.89
+1020.26 , 2113.87 , 246.71
+1020.26 , 2183.25 , 255.59
+1020.26 , 2252.63 , 264.49
+1224.27 , -2345.68 , -261.68
+1224.27 , -2273.49 , -253.86
+1224.27 , -2201.30 , -245.99
+1224.27 , -2129.12 , -238.07
+1224.27 , -2056.93 , -230.11
+1224.27 , -1984.75 , -222.12
+1224.27 , -1912.56 , -214.09
+1224.27 , -1840.37 , -206.01
+1224.27 , -1768.19 , -197.90
+1224.27 , -1694.58 , -189.92
+1224.27 , -1619.88 , -182.05
+1224.27 , -1545.18 , -174.13
+1224.27 , -1469.93 , -166.25
+1224.27 , -1394.65 , -158.32
+1224.27 , -1319.36 , -150.36
+1224.27 , -1244.08 , -142.36
+1224.27 , -1168.80 , -134.32
+1224.27 , -1093.52 , -126.23
+1224.27 , -1018.23 , -118.11
+1224.27 , -942.95 , -109.94
+1224.27 , -867.67 , -101.73
+1224.27 , -792.39 , -93.49
+1224.27 , -717.10 , -85.20
+1224.27 , -641.82 , -76.87
+1224.27 , -566.54 , -68.50
+1224.27 , -491.25 , -60.09
+1224.27 , -415.97 , -51.64
+1224.27 , -340.69 , -43.15
+1224.27 , -265.41 , -34.61
+1224.27 , -190.12 , -26.04
+1224.27 , -114.84 , -17.43
+1224.27 , -39.56 , -8.77
+1224.27 , 35.73 , 0.10
+1224.27 , 105.11 , 9.22
+1224.27 , 174.49 , 18.37
+1224.27 , 243.87 , 27.57
+1224.27 , 313.25 , 36.81
+1224.27 , 382.63 , 46.09
+1224.27 , 452.01 , 55.41
+1224.27 , 521.39 , 64.78
+1224.27 , 590.77 , 74.18
+1224.27 , 660.15 , 83.63
+1224.27 , 729.53 , 93.12
+1224.27 , 798.91 , 102.65
+1224.27 , 868.29 , 112.22
+1224.27 , 937.67 , 121.83
+1224.27 , 1007.05 , 131.49
+1224.27 , 1076.44 , 141.19
+1224.27 , 1145.82 , 150.92
+1224.27 , 1215.20 , 160.70
+1224.27 , 1284.58 , 170.52
+1224.27 , 1353.96 , 180.38
+1224.27 , 1423.34 , 190.29
+1224.27 , 1492.72 , 200.23
+1224.27 , 1562.10 , 210.22
+1224.27 , 1631.48 , 220.25
+1224.27 , 1700.86 , 230.32
+1224.27 , 1770.24 , 240.42
+1224.27 , 1839.62 , 250.57
+1224.27 , 1909.00 , 260.77
+1224.27 , 1978.38 , 271.02
+1224.27 , 2047.76 , 281.29
+1224.27 , 2117.14 , 291.61
+1224.27 , 2186.53 , 301.98
+1224.27 , 2255.91 , 312.37
+1428.29 , -2348.95 , -308.31
+1428.29 , -2276.77 , -298.96
+1428.29 , -2204.58 , -289.55
+1428.29 , -2132.40 , -280.10
+1428.29 , -2060.21 , -270.63
+1428.29 , -1988.02 , -261.10
+1428.29 , -1915.49 , -251.58
+1428.29 , -1841.38 , -242.27
+1428.29 , -1767.27 , -232.91
+1428.29 , -1692.50 , -223.60
+1428.29 , -1617.22 , -214.34
+1428.29 , -1541.94 , -205.03
+1428.29 , -1466.65 , -195.69
+1428.29 , -1391.37 , -186.30
+1428.29 , -1316.09 , -176.87
+1428.29 , -1240.80 , -167.40
+1428.29 , -1165.52 , -157.89
+1428.29 , -1090.24 , -148.34
+1428.29 , -1014.96 , -138.75
+1428.29 , -939.67 , -129.12
+1428.29 , -864.39 , -119.45
+1428.29 , -789.11 , -109.73
+1428.29 , -713.83 , -99.98
+1428.29 , -638.54 , -90.18
+1428.29 , -563.26 , -80.35
+1428.29 , -487.98 , -70.47
+1428.29 , -412.69 , -60.56
+1428.29 , -337.41 , -50.60
+1428.29 , -262.13 , -40.60
+1428.29 , -186.85 , -30.56
+1428.29 , -111.56 , -20.48
+1428.29 , -36.28 , -10.36
+1428.29 , 39.00 , 0.01
+1428.29 , 108.38 , 10.62
+1428.29 , 177.76 , 21.28
+1428.29 , 247.14 , 31.97
+1428.29 , 316.53 , 42.71
+1428.29 , 385.91 , 53.49
+1428.29 , 455.29 , 64.31
+1428.29 , 524.67 , 75.17
+1428.29 , 594.05 , 86.08
+1428.29 , 663.43 , 97.02
+1428.29 , 732.81 , 108.01
+1428.29 , 802.19 , 119.04
+1428.29 , 871.57 , 130.11
+1428.29 , 940.95 , 141.22
+1428.29 , 1010.33 , 152.38
+1428.29 , 1079.71 , 163.57
+1428.29 , 1149.09 , 174.81
+1428.29 , 1218.47 , 186.09
+1428.29 , 1287.85 , 197.40
+1428.29 , 1357.23 , 208.77
+1428.29 , 1426.62 , 220.17
+1428.29 , 1496.00 , 231.61
+1428.29 , 1565.38 , 243.09
+1428.29 , 1634.76 , 254.63
+1428.29 , 1704.14 , 266.18
+1428.29 , 1773.52 , 277.80
+1428.29 , 1842.90 , 289.45
+1428.29 , 1912.28 , 301.14
+1428.29 , 1981.66 , 312.88
+1428.29 , 2051.04 , 324.65
+1428.29 , 2120.42 , 336.49
+1428.29 , 2189.80 , 348.32
+1428.29 , 2259.18 , 360.23
+1632.39 , -2352.23 , -354.71
+1632.39 , -2280.05 , -343.82
+1632.39 , -2207.86 , -332.88
+1632.39 , -2135.67 , -321.90
+1632.39 , -2062.42 , -311.07
+1632.39 , -1988.91 , -300.24
+1632.39 , -1915.07 , -289.41
+1632.39 , -1839.79 , -278.81
+1632.39 , -1764.51 , -268.16
+1632.39 , -1689.22 , -257.47
+1632.39 , -1613.94 , -246.74
+1632.39 , -1538.66 , -235.97
+1632.39 , -1463.38 , -225.16
+1632.39 , -1388.09 , -214.30
+1632.39 , -1312.81 , -203.41
+1632.39 , -1237.53 , -192.47
+1632.39 , -1162.24 , -181.50
+1632.39 , -1086.96 , -170.48
+1632.39 , -1011.68 , -159.43
+1632.39 , -936.40 , -148.33
+1632.39 , -861.11 , -137.19
+1632.39 , -785.83 , -126.01
+1632.39 , -710.55 , -114.79
+1632.39 , -635.26 , -103.53
+1632.39 , -559.98 , -92.23
+1632.39 , -484.70 , -80.89
+1632.39 , -409.42 , -69.51
+1632.39 , -334.13 , -58.08
+1632.39 , -258.85 , -46.62
+1632.39 , -183.57 , -35.12
+1632.39 , -108.28 , -23.57
+1632.39 , -33.00 , -11.98
+1632.39 , 42.28 , -0.12
+1632.39 , 111.66 , 12.00
+1632.39 , 181.04 , 24.15
+1632.39 , 250.42 , 36.35
+1632.39 , 319.80 , 48.58
+1632.39 , 389.18 , 60.86
+1632.39 , 458.56 , 73.18
+1632.39 , 527.95 , 85.54
+1632.39 , 597.33 , 97.95
+1632.39 , 666.71 , 110.39
+1632.39 , 736.09 , 122.88
+1632.39 , 805.47 , 135.40
+1632.39 , 874.85 , 147.97
+1632.39 , 944.23 , 160.58
+1632.39 , 1013.61 , 173.24
+1632.39 , 1082.99 , 185.93
+1632.39 , 1152.37 , 198.66
+1632.39 , 1221.75 , 211.44
+1632.39 , 1291.13 , 224.26
+1632.39 , 1360.51 , 237.11
+1632.39 , 1429.89 , 250.03
+1632.39 , 1499.27 , 262.97
+1632.39 , 1568.65 , 275.94
+1632.39 , 1638.04 , 288.96
+1632.39 , 1707.42 , 302.03
+1632.39 , 1776.80 , 315.14
+1632.39 , 1846.18 , 328.30
+1632.39 , 1915.56 , 341.49
+1632.39 , 1984.94 , 354.73
+1632.39 , 2054.32 , 367.99
+1632.39 , 2123.70 , 381.32
+1632.39 , 2193.08 , 394.67
+1632.39 , 2262.46 , 408.08
+1836.41 , -2355.51 , -400.84
+1836.41 , -2283.01 , -388.48
+1836.41 , -2210.09 , -376.15
+1836.41 , -2137.17 , -363.80
+1836.41 , -2062.36 , -351.73
+1836.41 , -1987.08 , -339.76
+1836.41 , -1911.79 , -327.72
+1836.41 , -1836.51 , -315.65
+1836.41 , -1761.23 , -303.53
+1836.41 , -1685.95 , -291.37
+1836.41 , -1610.66 , -279.18
+1836.41 , -1535.38 , -266.94
+1836.41 , -1460.10 , -254.66
+1836.41 , -1384.82 , -242.34
+1836.41 , -1309.53 , -229.98
+1836.41 , -1234.25 , -217.58
+1836.41 , -1158.97 , -205.14
+1836.41 , -1083.68 , -192.65
+1836.41 , -1008.40 , -180.13
+1836.41 , -933.12 , -167.57
+1836.41 , -857.84 , -154.96
+1836.41 , -782.55 , -142.32
+1836.41 , -707.27 , -129.63
+1836.41 , -631.99 , -116.91
+1836.41 , -556.70 , -104.14
+1836.41 , -481.42 , -91.33
+1836.41 , -406.14 , -78.49
+1836.41 , -330.86 , -65.60
+1836.41 , -255.57 , -52.67
+1836.41 , -180.29 , -39.70
+1836.41 , -105.01 , -26.69
+1836.41 , -29.73 , -13.63
+1836.41 , 45.56 , -0.27
+1836.41 , 114.94 , 13.35
+1836.41 , 184.32 , 27.00
+1836.41 , 253.70 , 40.69
+1836.41 , 323.08 , 54.43
+1836.41 , 392.46 , 68.20
+1836.41 , 461.84 , 82.02
+1836.41 , 531.22 , 95.88
+1836.41 , 600.60 , 109.78
+1836.41 , 669.98 , 123.73
+1836.41 , 739.36 , 137.71
+1836.41 , 808.74 , 151.74
+1836.41 , 878.13 , 165.81
+1836.41 , 947.51 , 179.92
+1836.41 , 1016.89 , 194.07
+1836.41 , 1086.27 , 208.26
+1836.41 , 1155.65 , 222.49
+1836.41 , 1225.03 , 236.78
+1836.41 , 1294.41 , 251.10
+1836.41 , 1363.79 , 265.44
+1836.41 , 1433.17 , 279.85
+1836.41 , 1502.55 , 294.29
+1836.41 , 1571.93 , 308.76
+1836.41 , 1641.31 , 323.29
+1836.41 , 1710.69 , 337.85
+1836.41 , 1780.07 , 352.46
+1836.41 , 1849.45 , 367.12
+1836.41 , 1918.83 , 381.80
+1836.41 , 1988.22 , 396.53
+1836.41 , 2057.60 , 411.31
+1836.41 , 2126.98 , 426.13
+1836.41 , 2196.36 , 440.98
+1836.41 , 2265.74 , 455.88
+2040.43 , -2358.50 , -446.80
+2040.43 , -2284.93 , -433.14
+2040.43 , -2209.65 , -419.80
+2040.43 , -2134.37 , -406.41
+2040.43 , -2059.08 , -392.99
+2040.43 , -1983.80 , -379.53
+2040.43 , -1908.52 , -366.04
+2040.43 , -1833.24 , -352.51
+2040.43 , -1757.95 , -338.92
+2040.43 , -1682.67 , -325.29
+2040.43 , -1607.39 , -311.63
+2040.43 , -1532.10 , -297.93
+2040.43 , -1456.82 , -284.17
+2040.43 , -1381.54 , -270.40
+2040.43 , -1306.26 , -256.57
+2040.43 , -1230.97 , -242.71
+2040.43 , -1155.69 , -228.80
+2040.43 , -1080.41 , -214.85
+2040.43 , -1005.12 , -200.86
+2040.43 , -929.84 , -186.83
+2040.43 , -854.56 , -172.77
+2040.43 , -779.28 , -158.66
+2040.43 , -703.99 , -144.50
+2040.43 , -628.71 , -130.31
+2040.43 , -553.43 , -116.08
+2040.43 , -478.14 , -101.81
+2040.43 , -402.86 , -87.49
+2040.43 , -327.58 , -73.14
+2040.43 , -252.30 , -58.74
+2040.43 , -177.01 , -44.31
+2040.43 , -101.73 , -29.83
+2040.43 , -26.45 , -15.31
+2040.43 , 48.83 , -0.44
+2040.43 , 118.22 , 14.67
+2040.43 , 187.60 , 29.82
+2040.43 , 256.98 , 45.01
+2040.43 , 326.36 , 60.25
+2040.43 , 395.74 , 75.52
+2040.43 , 465.12 , 90.84
+2040.43 , 534.50 , 106.20
+2040.43 , 603.88 , 121.60
+2040.43 , 673.26 , 137.04
+2040.43 , 742.64 , 152.52
+2040.43 , 812.02 , 168.05
+2040.43 , 881.40 , 183.61
+2040.43 , 950.78 , 199.22
+2040.43 , 1020.16 , 214.87
+2040.43 , 1089.54 , 230.57
+2040.43 , 1158.92 , 246.29
+2040.43 , 1228.31 , 262.08
+2040.43 , 1297.69 , 277.89
+2040.43 , 1367.07 , 293.75
+2040.43 , 1436.45 , 309.63
+2040.43 , 1505.83 , 325.57
+2040.43 , 1575.21 , 341.55
+2040.43 , 1644.59 , 357.58
+2040.43 , 1713.97 , 373.66
+2040.43 , 1783.35 , 389.76
+2040.43 , 1852.73 , 405.89
+2040.43 , 1922.11 , 422.09
+2040.43 , 1991.49 , 438.31
+2040.43 , 2060.87 , 454.58
+2040.43 , 2130.25 , 470.90
+2040.43 , 2199.63 , 487.25
+2040.43 , 2269.01 , 503.67
+2244.53 , -2356.67 , -493.64
+2244.53 , -2281.65 , -478.82
+2244.53 , -2206.37 , -464.01
+2244.53 , -2131.09 , -449.18
+2244.53 , -2055.81 , -434.29
+2244.53 , -1980.52 , -419.36
+2244.53 , -1905.24 , -404.39
+2244.53 , -1829.96 , -389.38
+2244.53 , -1754.67 , -374.33
+2244.53 , -1679.39 , -359.26
+2244.53 , -1604.11 , -344.13
+2244.53 , -1528.83 , -328.96
+2244.53 , -1453.54 , -313.74
+2244.53 , -1378.26 , -298.49
+2244.53 , -1302.98 , -283.20
+2244.53 , -1227.69 , -267.88
+2244.53 , -1152.41 , -252.49
+2244.53 , -1077.13 , -237.08
+2244.53 , -1001.85 , -221.63
+2244.53 , -926.56 , -206.13
+2244.53 , -851.28 , -190.60
+2244.53 , -776.00 , -175.02
+2244.53 , -700.72 , -159.41
+2244.53 , -625.43 , -143.75
+2244.53 , -550.15 , -128.05
+2244.53 , -474.87 , -112.31
+2244.53 , -399.58 , -96.53
+2244.53 , -324.30 , -80.71
+2244.53 , -249.02 , -64.85
+2244.53 , -173.74 , -48.95
+2244.53 , -98.45 , -33.01
+2244.53 , -23.17 , -17.02
+2244.53 , 52.11 , -0.65
+2244.53 , 121.49 , 15.96
+2244.53 , 190.87 , 32.61
+2244.53 , 260.25 , 49.30
+2244.53 , 329.64 , 66.03
+2244.53 , 399.02 , 82.81
+2244.53 , 468.40 , 99.62
+2244.53 , 537.78 , 116.48
+2244.53 , 607.16 , 133.38
+2244.53 , 676.54 , 150.32
+2244.53 , 745.92 , 167.30
+2244.53 , 815.30 , 184.33
+2244.53 , 884.68 , 201.39
+2244.53 , 954.06 , 218.50
+2244.53 , 1023.44 , 235.65
+2244.53 , 1092.82 , 252.84
+2244.53 , 1162.20 , 270.07
+2244.53 , 1231.58 , 287.33
+2244.53 , 1300.96 , 304.66
+2244.53 , 1370.34 , 322.02
+2244.53 , 1439.73 , 339.40
+2244.53 , 1509.11 , 356.85
+2244.53 , 1578.49 , 374.32
+2244.53 , 1647.87 , 391.85
+2244.53 , 1717.25 , 409.42
+2244.53 , 1786.63 , 427.02
+2244.53 , 1856.01 , 444.66
+2244.53 , 1925.39 , 462.36
+2244.53 , 1994.77 , 480.07
+2244.53 , 2064.15 , 497.84
+2244.53 , 2133.53 , 515.65
+2244.53 , 2202.91 , 533.52
+2244.53 , 2272.29 , 551.40
+2448.55 , -2353.66 , -540.77
+2448.55 , -2278.38 , -524.54
+2448.55 , -2203.09 , -508.27
+2448.55 , -2127.81 , -491.96
+2448.55 , -2052.53 , -475.59
+2448.55 , -1977.25 , -459.22
+2448.55 , -1901.96 , -442.77
+2448.55 , -1826.68 , -426.30
+2448.55 , -1751.40 , -409.78
+2448.55 , -1676.11 , -393.24
+2448.55 , -1600.83 , -376.65
+2448.55 , -1525.55 , -360.01
+2448.55 , -1450.27 , -343.34
+2448.55 , -1374.98 , -326.61
+2448.55 , -1299.70 , -309.87
+2448.55 , -1224.42 , -293.06
+2448.55 , -1149.14 , -276.23
+2448.55 , -1073.85 , -259.35
+2448.55 , -998.57 , -242.42
+2448.55 , -923.29 , -225.46
+2448.55 , -848.00 , -208.46
+2448.55 , -772.72 , -191.42
+2448.55 , -697.44 , -174.34
+2448.55 , -622.16 , -157.21
+2448.55 , -546.87 , -140.05
+2448.55 , -471.59 , -122.84
+2448.55 , -396.31 , -105.60
+2448.55 , -321.02 , -88.31
+2448.55 , -245.74 , -70.99
+2448.55 , -170.46 , -53.62
+2448.55 , -95.18 , -36.21
+2448.55 , -19.89 , -18.76
+2448.55 , 55.39 , -0.88
+2448.55 , 124.77 , 17.23
+2448.55 , 194.15 , 35.38
+2448.55 , 263.53 , 53.57
+2448.55 , 332.91 , 71.80
+2448.55 , 402.29 , 90.07
+2448.55 , 471.67 , 108.38
+2448.55 , 541.05 , 126.74
+2448.55 , 610.43 , 145.14
+2448.55 , 679.82 , 163.58
+2448.55 , 749.20 , 182.06
+2448.55 , 818.58 , 200.58
+2448.55 , 887.96 , 219.14
+2448.55 , 957.34 , 237.75
+2448.55 , 1026.72 , 256.39
+2448.55 , 1096.10 , 275.09
+2448.55 , 1165.48 , 293.82
+2448.55 , 1234.86 , 312.59
+2448.55 , 1304.24 , 331.39
+2448.55 , 1373.62 , 350.24
+2448.55 , 1443.00 , 369.14
+2448.55 , 1512.38 , 388.09
+2448.55 , 1581.76 , 407.06
+2448.55 , 1651.14 , 426.07
+2448.55 , 1720.52 , 445.14
+2448.55 , 1789.91 , 464.26
+2448.55 , 1859.29 , 483.39
+2448.55 , 1928.67 , 502.58
+2448.55 , 1998.05 , 521.79
+2448.55 , 2067.43 , 541.08
+2448.55 , 2136.81 , 560.39
+2448.55 , 2206.19 , 579.74
+2448.55 , 2275.57 , 599.13
+2652.56 , -2350.38 , -587.98
+2652.56 , -2275.10 , -570.28
+2652.56 , -2199.82 , -552.54
+2652.56 , -2124.53 , -534.77
+2652.56 , -2049.25 , -516.95
+2652.56 , -1973.97 , -499.09
+2652.56 , -1898.69 , -481.20
+2652.56 , -1823.40 , -463.26
+2652.56 , -1748.12 , -445.28
+2652.56 , -1672.84 , -427.27
+2652.56 , -1597.55 , -409.21
+2652.56 , -1522.27 , -391.10
+2652.56 , -1446.99 , -372.94
+2652.56 , -1371.71 , -354.76
+2652.56 , -1296.42 , -336.54
+2652.56 , -1221.14 , -318.28
+2652.56 , -1145.86 , -299.98
+2652.56 , -1070.58 , -281.63
+2652.56 , -995.29 , -263.24
+2652.56 , -920.01 , -244.82
+2652.56 , -844.73 , -226.36
+2652.56 , -769.44 , -207.85
+2652.56 , -694.16 , -189.30
+2652.56 , -618.88 , -170.71
+2652.56 , -543.60 , -152.08
+2652.56 , -468.31 , -133.41
+2652.56 , -393.03 , -114.70
+2652.56 , -317.75 , -95.95
+2652.56 , -242.46 , -77.15
+2652.56 , -167.18 , -58.32
+2652.56 , -91.90 , -39.45
+2652.56 , -16.62 , -20.53
+2652.56 , 58.67 , -1.14
+2652.56 , 128.05 , 18.47
+2652.56 , 197.43 , 38.11
+2652.56 , 266.81 , 57.80
+2652.56 , 336.19 , 77.53
+2652.56 , 405.57 , 97.30
+2652.56 , 474.95 , 117.12
+2652.56 , 544.33 , 136.97
+2652.56 , 613.71 , 156.87
+2652.56 , 683.09 , 176.80
+2652.56 , 752.47 , 196.78
+2652.56 , 821.85 , 216.81
+2652.56 , 891.23 , 236.87
+2652.56 , 960.61 , 256.97
+2652.56 , 1030.00 , 277.12
+2652.56 , 1099.38 , 297.29
+2652.56 , 1168.76 , 317.54
+2652.56 , 1238.14 , 337.81
+2652.56 , 1307.52 , 358.11
+2652.56 , 1376.90 , 378.47
+2652.56 , 1446.28 , 398.86
+2652.56 , 1515.66 , 419.30
+2652.56 , 1585.04 , 439.77
+2652.56 , 1654.42 , 460.28
+2652.56 , 1723.80 , 480.84
+2652.56 , 1793.18 , 501.45
+2652.56 , 1862.56 , 522.11
+2652.56 , 1931.94 , 542.79
+2652.56 , 2001.32 , 563.50
+2652.56 , 2070.70 , 584.27
+2652.56 , 2140.09 , 605.08
+2652.56 , 2209.47 , 625.93
+2652.56 , 2278.85 , 646.83
+2856.67 , -2347.10 , -635.21
+2856.67 , -2271.82 , -616.04
+2856.67 , -2196.54 , -596.86
+2856.67 , -2121.26 , -577.60
+2856.67 , -2045.97 , -558.31
+2856.67 , -1970.69 , -539.00
+2856.67 , -1895.41 , -519.65
+2856.67 , -1820.13 , -500.24
+2856.67 , -1744.84 , -480.79
+2856.67 , -1669.56 , -461.31
+2856.67 , -1594.28 , -441.79
+2856.67 , -1518.99 , -422.21
+2856.67 , -1443.71 , -402.61
+2856.67 , -1368.43 , -382.94
+2856.67 , -1293.15 , -363.27
+2856.67 , -1217.86 , -343.53
+2856.67 , -1142.58 , -323.76
+2856.67 , -1067.30 , -303.94
+2856.67 , -992.01 , -284.10
+2856.67 , -916.73 , -264.21
+2856.67 , -841.45 , -244.28
+2856.67 , -766.17 , -224.30
+2856.67 , -690.88 , -204.29
+2856.67 , -615.60 , -184.23
+2856.67 , -540.32 , -164.14
+2856.67 , -465.03 , -144.00
+2856.67 , -389.75 , -123.83
+2856.67 , -314.47 , -103.61
+2856.67 , -239.19 , -83.35
+2856.67 , -163.90 , -63.05
+2856.67 , -88.62 , -42.71
+2856.67 , -13.34 , -22.33
+2856.67 , 61.94 , -1.43
+2856.67 , 131.33 , 19.68
+2856.67 , 200.71 , 40.82
+2856.67 , 270.09 , 62.01
+2856.67 , 339.47 , 83.24
+2856.67 , 408.85 , 104.51
+2856.67 , 478.23 , 125.82
+2856.67 , 547.61 , 147.17
+2856.67 , 616.99 , 168.57
+2856.67 , 686.37 , 190.00
+2856.67 , 755.75 , 211.48
+2856.67 , 825.13 , 233.00
+2856.67 , 894.51 , 254.57
+2856.67 , 963.89 , 276.17
+2856.67 , 1033.27 , 297.81
+2856.67 , 1102.65 , 319.50
+2856.67 , 1172.03 , 341.22
+2856.67 , 1241.42 , 362.99
+2856.67 , 1310.80 , 384.80
+2856.67 , 1380.18 , 406.66
+2856.67 , 1449.56 , 428.54
+2856.67 , 1518.94 , 450.48
+2856.67 , 1588.32 , 472.46
+2856.67 , 1657.70 , 494.47
+2856.67 , 1727.08 , 516.52
+2856.67 , 1796.46 , 538.63
+2856.67 , 1865.84 , 560.78
+2856.67 , 1935.22 , 582.95
+2856.67 , 2004.60 , 605.18
+2856.67 , 2073.98 , 627.45
+2856.67 , 2143.36 , 649.75
+2856.67 , 2212.74 , 672.12
+2856.67 , 2282.12 , 694.49
+3060.68 , -2343.83 , -682.48
+3060.68 , -2268.54 , -661.85
+3060.68 , -2193.26 , -641.19
+3060.68 , -2117.98 , -620.47
+3060.68 , -2042.70 , -599.74
+3060.68 , -1967.41 , -578.94
+3060.68 , -1892.13 , -558.12
+3060.68 , -1816.85 , -537.24
+3060.68 , -1741.57 , -516.32
+3060.68 , -1666.28 , -495.38
+3060.68 , -1591.00 , -474.38
+3060.68 , -1515.72 , -453.34
+3060.68 , -1440.43 , -432.28
+3060.68 , -1365.15 , -411.16
+3060.68 , -1289.87 , -390.02
+3060.68 , -1214.59 , -368.81
+3060.68 , -1139.30 , -347.58
+3060.68 , -1064.02 , -326.29
+3060.68 , -988.74 , -304.99
+3060.68 , -913.45 , -283.63
+3060.68 , -838.17 , -262.22
+3060.68 , -762.89 , -240.79
+3060.68 , -687.61 , -219.31
+3060.68 , -612.32 , -197.79
+3060.68 , -537.04 , -176.23
+3060.68 , -461.76 , -154.63
+3060.68 , -386.48 , -132.98
+3060.68 , -311.19 , -111.30
+3060.68 , -235.91 , -89.58
+3060.68 , -160.63 , -67.81
+3060.68 , -85.34 , -46.00
+3060.68 , -10.06 , -24.16
+3060.68 , 65.22 , -1.74
+3060.68 , 134.60 , 20.86
+3060.68 , 203.98 , 43.50
+3060.68 , 273.36 , 66.19
+3060.68 , 342.74 , 88.92
+3060.68 , 412.12 , 111.68
+3060.68 , 481.51 , 134.50
+3060.68 , 550.89 , 157.35
+3060.68 , 620.27 , 180.24
+3060.68 , 689.65 , 203.18
+3060.68 , 759.03 , 226.15
+3060.68 , 828.41 , 249.17
+3060.68 , 897.79 , 272.23
+3060.68 , 967.17 , 295.32
+3060.68 , 1036.55 , 318.49
+3060.68 , 1105.93 , 341.65
+3060.68 , 1175.31 , 364.88
+3060.68 , 1244.69 , 388.14
+3060.68 , 1314.07 , 411.45
+3060.68 , 1383.45 , 434.80
+3060.68 , 1452.83 , 458.21
+3060.68 , 1522.21 , 481.64
+3060.68 , 1591.60 , 505.11
+3060.68 , 1660.98 , 528.64
+3060.68 , 1730.36 , 552.19
+3060.68 , 1799.74 , 575.78
+3060.68 , 1869.12 , 599.43
+3060.68 , 1938.50 , 623.10
+3060.68 , 2007.88 , 646.82
+3060.68 , 2077.26 , 670.58
+3060.68 , 2146.64 , 694.40
+3060.68 , 2216.02 , 718.24
+3060.68 , 2285.40 , 742.13
+3264.70 , -2340.55 , -729.77
+3264.70 , -2265.27 , -707.67
+3264.70 , -2189.99 , -685.55
+3264.70 , -2114.70 , -663.38
+3264.70 , -2039.42 , -641.16
+3264.70 , -1964.14 , -618.92
+3264.70 , -1888.85 , -596.60
+3264.70 , -1813.57 , -574.29
+3264.70 , -1738.29 , -551.90
+3264.70 , -1663.01 , -529.49
+3264.70 , -1587.72 , -507.03
+3264.70 , -1512.44 , -484.54
+3264.70 , -1437.16 , -461.98
+3264.70 , -1361.87 , -439.40
+3264.70 , -1286.59 , -416.80
+3264.70 , -1211.31 , -394.12
+3264.70 , -1136.03 , -371.41
+3264.70 , -1060.74 , -348.69
+3264.70 , -985.46 , -325.91
+3264.70 , -910.18 , -303.09
+3264.70 , -834.89 , -280.22
+3264.70 , -759.61 , -257.31
+3264.70 , -684.33 , -234.36
+3264.70 , -609.05 , -211.38
+3264.70 , -533.76 , -188.35
+3264.70 , -458.48 , -165.28
+3264.70 , -383.20 , -142.17
+3264.70 , -307.92 , -119.02
+3264.70 , -232.63 , -95.83
+3264.70 , -157.35 , -72.60
+3264.70 , -82.07 , -49.33
+3264.70 , -6.78 , -26.02
+3264.70 , 68.50 , -2.09
+3264.70 , 137.88 , 22.01
+3264.70 , 207.26 , 46.16
+3264.70 , 276.64 , 70.34
+3264.70 , 346.02 , 94.57
+3264.70 , 415.40 , 118.83
+3264.70 , 484.78 , 143.14
+3264.70 , 554.16 , 167.50
+3264.70 , 623.54 , 191.89
+3264.70 , 692.92 , 216.32
+3264.70 , 762.30 , 240.81
+3264.70 , 831.69 , 265.32
+3264.70 , 901.07 , 289.88
+3264.70 , 970.45 , 314.46
+3264.70 , 1039.83 , 339.12
+3264.70 , 1109.21 , 363.80
+3264.70 , 1178.59 , 388.52
+3264.70 , 1247.97 , 413.28
+3264.70 , 1317.35 , 438.10
+3264.70 , 1386.73 , 462.95
+3264.70 , 1456.11 , 487.83
+3264.70 , 1525.49 , 512.77
+3264.70 , 1594.87 , 537.74
+3264.70 , 1664.25 , 562.76
+3264.70 , 1733.63 , 587.81
+3264.70 , 1803.01 , 612.90
+3264.70 , 1872.39 , 638.04
+3264.70 , 1941.78 , 663.22
+3264.70 , 2011.16 , 688.44
+3264.70 , 2080.54 , 713.72
+3264.70 , 2149.92 , 739.01
+3264.70 , 2219.30 , 764.37
+3264.70 , 2288.68 , 789.75
+3468.80 , -2337.27 , -777.10
+3468.80 , -2261.99 , -753.54
+3468.80 , -2186.71 , -729.95
+3468.80 , -2111.42 , -706.31
+3468.80 , -2036.14 , -682.62
+3468.80 , -1960.86 , -658.91
+3468.80 , -1885.58 , -635.16
+3468.80 , -1810.29 , -611.35
+3468.80 , -1735.01 , -587.49
+3468.80 , -1659.73 , -563.61
+3468.80 , -1584.44 , -539.69
+3468.80 , -1509.16 , -515.73
+3468.80 , -1433.88 , -491.73
+3468.80 , -1358.60 , -467.68
+3468.80 , -1283.31 , -443.59
+3468.80 , -1208.03 , -419.47
+3468.80 , -1132.75 , -395.30
+3468.80 , -1057.47 , -371.10
+3468.80 , -982.18 , -346.83
+3468.80 , -906.90 , -322.54
+3468.80 , -831.62 , -298.23
+3468.80 , -756.33 , -273.86
+3468.80 , -681.05 , -249.44
+3468.80 , -605.77 , -224.99
+3468.80 , -530.49 , -200.50
+3468.80 , -455.20 , -175.96
+3468.80 , -379.92 , -151.39
+3468.80 , -304.64 , -126.77
+3468.80 , -229.35 , -102.12
+3468.80 , -154.07 , -77.42
+3468.80 , -78.79 , -52.69
+3468.80 , -3.51 , -27.91
+3468.80 , 71.78 , -2.46
+3468.80 , 141.16 , 23.14
+3468.80 , 210.54 , 48.78
+3468.80 , 279.92 , 74.47
+3468.80 , 349.30 , 100.19
+3468.80 , 418.68 , 125.96
+3468.80 , 488.06 , 151.76
+3468.80 , 557.44 , 177.61
+3468.80 , 626.82 , 203.51
+3468.80 , 696.20 , 229.44
+3468.80 , 765.58 , 255.42
+3468.80 , 834.96 , 281.42
+3468.80 , 904.34 , 307.47
+3468.80 , 973.72 , 333.58
+3468.80 , 1043.11 , 359.73
+3468.80 , 1112.49 , 385.90
+3468.80 , 1181.87 , 412.12
+3468.80 , 1251.25 , 438.39
+3468.80 , 1320.63 , 464.69
+3468.80 , 1390.01 , 491.03
+3468.80 , 1459.39 , 517.42
+3468.80 , 1528.77 , 543.87
+3468.80 , 1598.15 , 570.33
+3468.80 , 1667.53 , 596.84
+3468.80 , 1736.91 , 623.40
+3468.80 , 1806.29 , 649.99
+3468.80 , 1875.67 , 676.65
+3468.80 , 1945.05 , 703.31
+3468.80 , 2014.43 , 730.04
+3468.80 , 2083.81 , 756.79
+3468.80 , 2153.20 , 783.60
+3468.80 , 2222.58 , 810.45
+3468.80 , 2291.96 , 837.35
+3672.82 , -2334.00 , -824.45
+3672.82 , -2258.71 , -799.45
+3672.82 , -2183.43 , -774.37
+3672.82 , -2108.15 , -749.26
+3672.82 , -2032.86 , -724.13
+3672.82 , -1957.58 , -698.93
+3672.82 , -1882.30 , -673.70
+3672.82 , -1807.02 , -648.45
+3672.82 , -1731.73 , -623.13
+3672.82 , -1656.45 , -597.78
+3672.82 , -1581.17 , -572.39
+3672.82 , -1505.89 , -546.97
+3672.82 , -1430.60 , -521.50
+3672.82 , -1355.32 , -495.99
+3672.82 , -1280.04 , -470.45
+3672.82 , -1204.75 , -444.83
+3672.82 , -1129.47 , -419.22
+3672.82 , -1054.19 , -393.53
+3672.82 , -978.91 , -367.82
+3672.82 , -903.62 , -342.07
+3672.82 , -828.34 , -316.26
+3672.82 , -753.06 , -290.43
+3672.82 , -677.77 , -264.55
+3672.82 , -602.49 , -238.64
+3672.82 , -527.21 , -212.68
+3672.82 , -451.93 , -186.68
+3672.82 , -376.64 , -160.64
+3672.82 , -301.36 , -134.56
+3672.82 , -226.08 , -108.43
+3672.82 , -150.79 , -82.27
+3672.82 , -75.51 , -56.07
+3672.82 , -0.23 , -29.83
+3672.82 , 75.05 , -2.86
+3672.82 , 144.43 , 24.24
+3672.82 , 213.81 , 51.38
+3672.82 , 283.20 , 78.56
+3672.82 , 352.58 , 105.79
+3672.82 , 421.96 , 133.05
+3672.82 , 491.34 , 160.36
+3672.82 , 560.72 , 187.71
+3672.82 , 630.10 , 215.11
+3672.82 , 699.48 , 242.53
+3672.82 , 768.86 , 270.01
+3672.82 , 838.24 , 297.51
+3672.82 , 907.62 , 325.08
+3672.82 , 977.00 , 352.67
+3672.82 , 1046.38 , 380.29
+3672.82 , 1115.76 , 407.99
+3672.82 , 1185.14 , 435.70
+3672.82 , 1254.52 , 463.47
+3672.82 , 1323.90 , 491.28
+3672.82 , 1393.29 , 519.12
+3672.82 , 1462.67 , 547.01
+3672.82 , 1532.05 , 574.94
+3672.82 , 1601.43 , 602.90
+3672.82 , 1670.81 , 630.93
+3672.82 , 1740.19 , 658.96
+3672.82 , 1809.57 , 687.07
+3672.82 , 1878.95 , 715.19
+3672.82 , 1948.33 , 743.37
+3672.82 , 2017.71 , 771.60
+3672.82 , 2087.09 , 799.87
+3672.82 , 2156.47 , 828.17
+3672.82 , 2225.85 , 856.51
+3672.82 , 2295.23 , 884.91
+3876.84 , -2330.72 , -871.85
+3876.84 , -2255.44 , -845.35
+3876.84 , -2180.15 , -818.83
+3876.84 , -2104.87 , -792.25
+3876.84 , -2029.59 , -765.66
+3876.84 , -1954.30 , -738.99
+3876.84 , -1879.02 , -712.30
+3876.84 , -1803.74 , -685.58
+3876.84 , -1728.46 , -658.79
+3876.84 , -1653.17 , -631.97
+3876.84 , -1577.89 , -605.14
+3876.84 , -1502.61 , -578.22
+3876.84 , -1427.33 , -551.29
+3876.84 , -1352.04 , -524.31
+3876.84 , -1276.76 , -497.30
+3876.84 , -1201.48 , -470.24
+3876.84 , -1126.19 , -443.14
+3876.84 , -1050.91 , -416.01
+3876.84 , -975.63 , -388.83
+3876.84 , -900.35 , -361.61
+3876.84 , -825.06 , -334.33
+3876.84 , -749.78 , -307.03
+3876.84 , -674.50 , -279.69
+3876.84 , -599.21 , -252.31
+3876.84 , -523.93 , -224.89
+3876.84 , -448.65 , -197.42
+3876.84 , -373.37 , -169.91
+3876.84 , -298.08 , -142.37
+3876.84 , -222.80 , -114.78
+3876.84 , -147.52 , -87.15
+3876.84 , -72.23 , -59.48
+3876.84 , 3.05 , -31.77
+3876.84 , 78.33 , -3.28
+3876.84 , 147.71 , 25.31
+3876.84 , 217.09 , 53.95
+3876.84 , 286.47 , 82.63
+3876.84 , 355.85 , 111.36
+3876.84 , 425.23 , 140.12
+3876.84 , 494.61 , 168.93
+3876.84 , 563.99 , 197.77
+3876.84 , 633.38 , 226.67
+3876.84 , 702.76 , 255.59
+3876.84 , 772.14 , 284.56
+3876.84 , 841.52 , 313.57
+3876.84 , 910.90 , 342.61
+3876.84 , 980.28 , 371.73
+3876.84 , 1049.66 , 400.87
+3876.84 , 1119.04 , 430.03
+3876.84 , 1188.42 , 459.26
+3876.84 , 1257.80 , 488.52
+3876.84 , 1327.18 , 517.83
+3876.84 , 1396.56 , 547.16
+3876.84 , 1465.94 , 576.54
+3876.84 , 1535.32 , 605.97
+3876.84 , 1604.70 , 635.45
+3876.84 , 1674.08 , 664.95
+3876.84 , 1743.47 , 694.52
+3876.84 , 1812.85 , 724.10
+3876.84 , 1882.23 , 753.74
+3876.84 , 1951.61 , 783.42
+3876.84 , 2020.99 , 813.13
+3876.84 , 2090.37 , 842.90
+3876.84 , 2159.75 , 872.69
+3876.84 , 2229.13 , 902.53
+3876.84 , 2298.51 , 932.42
+4080.85 , -2327.44 , -919.26
+4080.85 , -2252.16 , -891.32
+4080.85 , -2176.88 , -863.31
+4080.85 , -2101.59 , -835.27
+4080.85 , -2026.31 , -807.20
+4080.85 , -1951.03 , -779.09
+4080.85 , -1875.75 , -750.93
+4080.85 , -1800.46 , -722.72
+4080.85 , -1725.18 , -694.49
+4080.85 , -1649.90 , -666.21
+4080.85 , -1574.61 , -637.88
+4080.85 , -1499.33 , -609.52
+4080.85 , -1424.05 , -581.12
+4080.85 , -1348.77 , -552.67
+4080.85 , -1273.48 , -524.19
+4080.85 , -1198.20 , -495.67
+4080.85 , -1122.92 , -467.10
+4080.85 , -1047.63 , -438.50
+4080.85 , -972.35 , -409.86
+4080.85 , -897.07 , -381.17
+4080.85 , -821.79 , -352.45
+4080.85 , -746.50 , -323.68
+4080.85 , -671.22 , -294.87
+4080.85 , -595.94 , -266.01
+4080.85 , -520.65 , -237.12
+4080.85 , -445.37 , -208.19
+4080.85 , -370.09 , -179.22
+4080.85 , -294.81 , -150.21
+4080.85 , -219.52 , -121.16
+4080.85 , -144.24 , -92.06
+4080.85 , -68.96 , -62.93
+4080.85 , 6.32 , -33.74
+4080.85 , 81.61 , -3.74
+4080.85 , 150.99 , 26.36
+4080.85 , 220.37 , 56.49
+4080.85 , 289.75 , 86.67
+4080.85 , 359.13 , 116.90
+4080.85 , 428.51 , 147.16
+4080.85 , 497.89 , 177.46
+4080.85 , 567.27 , 207.82
+4080.85 , 636.65 , 238.18
+4080.85 , 706.03 , 268.62
+4080.85 , 775.41 , 299.09
+4080.85 , 844.79 , 329.60
+4080.85 , 914.17 , 360.16
+4080.85 , 983.56 , 390.74
+4080.85 , 1052.94 , 421.40
+4080.85 , 1122.32 , 452.05
+4080.85 , 1191.70 , 482.78
+4080.85 , 1261.08 , 513.54
+4080.85 , 1330.46 , 544.34
+4080.85 , 1399.84 , 575.19
+4080.85 , 1469.22 , 606.06
+4080.85 , 1538.60 , 637.01
+4080.85 , 1607.98 , 667.96
+4080.85 , 1677.36 , 698.98
+4080.85 , 1746.74 , 730.02
+4080.85 , 1816.12 , 761.11
+4080.85 , 1885.50 , 792.25
+4080.85 , 1954.88 , 823.44
+4080.85 , 2024.26 , 854.65
+4080.85 , 2093.65 , 885.92
+4080.85 , 2163.03 , 917.20
+4080.85 , 2232.41 , 948.54
+4080.85 , 2301.79 , 979.92
+4268.63 , -2324.43 , -962.91
+4268.63 , -2249.14 , -933.62
+4268.63 , -2173.86 , -904.26
+4268.63 , -2098.58 , -874.89
+4268.63 , -2023.29 , -845.46
+4268.63 , -1948.01 , -816.00
+4268.63 , -1872.73 , -786.49
+4268.63 , -1797.45 , -756.93
+4268.63 , -1722.16 , -727.35
+4268.63 , -1646.88 , -697.72
+4268.63 , -1571.60 , -668.06
+4268.63 , -1496.32 , -638.34
+4268.63 , -1421.03 , -608.58
+4268.63 , -1345.75 , -578.81
+4268.63 , -1270.47 , -548.96
+4268.63 , -1195.18 , -519.09
+4268.63 , -1119.90 , -489.19
+4268.63 , -1044.62 , -459.22
+4268.63 , -969.34 , -429.23
+4268.63 , -894.05 , -399.19
+4268.63 , -818.77 , -369.12
+4268.63 , -743.49 , -339.01
+4268.63 , -668.20 , -308.84
+4268.63 , -592.92 , -278.66
+4268.63 , -517.64 , -248.41
+4268.63 , -442.36 , -218.13
+4268.63 , -367.07 , -187.81
+4268.63 , -291.79 , -157.45
+4268.63 , -216.51 , -127.05
+4268.63 , -141.22 , -96.61
+4268.63 , -65.94 , -66.12
+4268.63 , 9.34 , -35.56
+4268.63 , 84.62 , -4.18
+4268.63 , 154.00 , 27.29
+4268.63 , 223.38 , 58.81
+4268.63 , 292.77 , 90.37
+4268.63 , 362.15 , 121.97
+4268.63 , 431.53 , 153.61
+4268.63 , 500.91 , 185.29
+4268.63 , 570.29 , 217.01
+4268.63 , 639.67 , 248.78
+4268.63 , 709.05 , 280.59
+4268.63 , 778.43 , 312.43
+4268.63 , 847.81 , 344.32
+4268.63 , 917.19 , 376.25
+4268.63 , 986.57 , 408.23
+4268.63 , 1055.95 , 440.24
+4268.63 , 1125.33 , 472.30
+4268.63 , 1194.71 , 504.40
+4268.63 , 1264.09 , 536.53
+4268.63 , 1333.47 , 568.71
+4268.63 , 1402.86 , 600.94
+4268.63 , 1472.24 , 633.21
+4268.63 , 1541.62 , 665.51
+4268.63 , 1611.00 , 697.85
+4268.63 , 1680.38 , 730.25
+4268.63 , 1749.76 , 762.67
+4268.63 , 1819.14 , 795.14
+4268.63 , 1888.52 , 827.65
+4268.63 , 1957.90 , 860.22
+4268.63 , 2027.28 , 892.81
+4268.63 , 2096.66 , 925.44
+4268.63 , 2166.04 , 958.13
+4268.63 , 2235.42 , 990.84
+4268.63 , 2304.80 , 1023.60
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G4.vemo b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G4.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..3fca17419f53cfb5ebc77275808c634b9f977ae0
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G4.vemo
@@ -0,0 +1,2016 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00 , -2303.92 , 23.82
+0.00 , -2232.40 , 22.44
+0.00 , -2160.89 , 21.09
+0.00 , -2089.37 , 19.79
+0.00 , -2017.86 , 18.53
+0.00 , -1946.34 , 17.31
+0.00 , -1874.83 , 16.13
+0.00 , -1803.31 , 14.99
+0.00 , -1731.80 , 13.89
+0.00 , -1660.28 , 12.84
+0.00 , -1588.77 , 11.83
+0.00 , -1517.25 , 10.85
+0.00 , -1445.74 , 9.92
+0.00 , -1374.22 , 9.04
+0.00 , -1302.71 , 8.19
+0.00 , -1231.19 , 7.38
+0.00 , -1159.68 , 6.62
+0.00 , -1088.17 , 5.90
+0.00 , -1016.65 , 5.21
+0.00 , -945.14 , 4.57
+0.00 , -873.62 , 3.98
+0.00 , -802.11 , 3.42
+0.00 , -728.89 , 2.90
+0.00 , -654.46 , 2.43
+0.00 , -580.03 , 2.00
+0.00 , -505.59 , 1.61
+0.00 , -431.16 , 1.26
+0.00 , -356.72 , 0.95
+0.00 , -282.29 , 0.69
+0.00 , -207.86 , 0.46
+0.00 , -133.42 , 0.28
+0.00 , -58.99 , 0.14
+0.00 , 15.44 , 0.09
+0.00 , 85.48 , 0.21
+0.00 , 155.51 , 0.38
+0.00 , 225.55 , 0.58
+0.00 , 295.58 , 0.83
+0.00 , 365.62 , 1.12
+0.00 , 435.65 , 1.45
+0.00 , 505.69 , 1.82
+0.00 , 575.72 , 2.23
+0.00 , 645.76 , 2.69
+0.00 , 715.79 , 3.19
+0.00 , 785.83 , 3.72
+0.00 , 855.86 , 4.30
+0.00 , 925.89 , 4.93
+0.00 , 995.93 , 5.59
+0.00 , 1065.96 , 6.29
+0.00 , 1136.00 , 7.04
+0.00 , 1206.03 , 7.83
+0.00 , 1276.07 , 8.65
+0.00 , 1346.10 , 9.52
+0.00 , 1416.14 , 10.44
+0.00 , 1486.17 , 11.39
+0.00 , 1556.21 , 12.38
+0.00 , 1626.24 , 13.42
+0.00 , 1696.28 , 14.50
+0.00 , 1766.31 , 15.62
+0.00 , 1836.35 , 16.78
+0.00 , 1906.38 , 17.98
+0.00 , 1976.42 , 19.22
+0.00 , 2046.45 , 20.51
+0.00 , 2116.48 , 21.84
+0.00 , 2186.52 , 23.20
+0.00 , 2256.55 , 24.61
+40.81 , -2304.55 , 13.99
+40.81 , -2233.03 , 12.92
+40.81 , -2161.52 , 11.89
+40.81 , -2090.00 , 10.89
+40.81 , -2018.49 , 9.94
+40.81 , -1946.97 , 9.04
+40.81 , -1875.46 , 8.17
+40.81 , -1803.94 , 7.34
+40.81 , -1732.43 , 6.56
+40.81 , -1660.91 , 5.82
+40.81 , -1589.40 , 5.12
+40.81 , -1517.88 , 4.46
+40.81 , -1446.37 , 3.84
+40.81 , -1374.85 , 3.26
+40.81 , -1303.34 , 2.73
+40.81 , -1231.82 , 2.23
+40.81 , -1160.31 , 1.78
+40.81 , -1088.80 , 1.37
+40.81 , -1017.28 , 1.01
+40.81 , -945.66 , 0.68
+40.81 , -873.67 , 0.40
+40.81 , -801.68 , 0.16
+40.81 , -728.26 , -0.05
+40.81 , -653.83 , -0.23
+40.81 , -579.40 , -0.36
+40.81 , -504.96 , -0.45
+40.81 , -430.53 , -0.50
+40.81 , -356.09 , -0.51
+40.81 , -281.66 , -0.48
+40.81 , -207.23 , -0.41
+40.81 , -132.79 , -0.29
+40.81 , -58.36 , -0.14
+40.81 , 16.07 , 0.11
+40.81 , 86.11 , 0.53
+40.81 , 156.14 , 0.99
+40.81 , 226.18 , 1.50
+40.81 , 296.21 , 2.05
+40.81 , 366.25 , 2.64
+40.81 , 436.28 , 3.27
+40.81 , 506.32 , 3.94
+40.81 , 576.35 , 4.65
+40.81 , 646.39 , 5.41
+40.81 , 716.42 , 6.21
+40.81 , 786.46 , 7.04
+40.81 , 856.49 , 7.92
+40.81 , 926.53 , 8.84
+40.81 , 996.56 , 9.81
+40.81 , 1066.59 , 10.81
+40.81 , 1136.63 , 11.86
+40.81 , 1206.66 , 12.94
+40.81 , 1276.70 , 14.07
+40.81 , 1346.73 , 15.24
+40.81 , 1416.77 , 16.45
+40.81 , 1486.80 , 17.71
+40.81 , 1556.84 , 19.00
+40.81 , 1626.87 , 20.34
+40.81 , 1696.91 , 21.72
+40.81 , 1766.94 , 23.14
+40.81 , 1836.98 , 24.60
+40.81 , 1907.01 , 26.10
+40.81 , 1977.05 , 27.64
+40.81 , 2047.08 , 29.23
+40.81 , 2117.11 , 30.85
+40.81 , 2187.15 , 32.52
+40.81 , 2257.18 , 34.23
+81.62 , -2305.18 , 4.17
+81.62 , -2233.66 , 3.41
+81.62 , -2162.15 , 2.69
+81.62 , -2090.63 , 2.02
+81.62 , -2019.12 , 1.39
+81.62 , -1947.60 , 0.81
+81.62 , -1876.09 , 0.26
+81.62 , -1804.57 , -0.25
+81.62 , -1733.06 , -0.71
+81.62 , -1661.54 , -1.13
+81.62 , -1590.03 , -1.52
+81.62 , -1518.51 , -1.86
+81.62 , -1447.00 , -2.16
+81.62 , -1375.48 , -2.42
+81.62 , -1303.97 , -2.64
+81.62 , -1232.46 , -2.82
+81.62 , -1160.94 , -2.96
+81.62 , -1089.43 , -3.06
+81.62 , -1017.91 , -3.11
+81.62 , -946.18 , -3.13
+81.62 , -873.71 , -3.12
+81.62 , -801.24 , -3.06
+81.62 , -727.63 , -2.97
+81.62 , -653.20 , -2.85
+81.62 , -578.77 , -2.69
+81.62 , -504.33 , -2.49
+81.62 , -429.90 , -2.24
+81.62 , -355.46 , -1.96
+81.62 , -281.03 , -1.64
+81.62 , -206.60 , -1.27
+81.62 , -132.16 , -0.87
+81.62 , -57.73 , -0.42
+81.62 , 16.70 , 0.12
+81.62 , 86.74 , 0.85
+81.62 , 156.77 , 1.61
+81.62 , 226.81 , 2.42
+81.62 , 296.84 , 3.27
+81.62 , 366.88 , 4.16
+81.62 , 436.91 , 5.09
+81.62 , 506.95 , 6.06
+81.62 , 576.98 , 7.07
+81.62 , 647.02 , 8.13
+81.62 , 717.05 , 9.22
+81.62 , 787.09 , 10.36
+81.62 , 857.12 , 11.54
+81.62 , 927.16 , 12.76
+81.62 , 997.19 , 14.02
+81.62 , 1067.22 , 15.33
+81.62 , 1137.26 , 16.67
+81.62 , 1207.29 , 18.06
+81.62 , 1277.33 , 19.49
+81.62 , 1347.36 , 20.96
+81.62 , 1417.40 , 22.47
+81.62 , 1487.43 , 24.03
+81.62 , 1557.47 , 25.62
+81.62 , 1627.50 , 27.26
+81.62 , 1697.54 , 28.93
+81.62 , 1767.57 , 30.65
+81.62 , 1837.61 , 32.41
+81.62 , 1907.64 , 34.22
+81.62 , 1977.68 , 36.06
+81.62 , 2047.71 , 37.94
+81.62 , 2117.74 , 39.87
+81.62 , 2187.78 , 41.84
+81.62 , 2257.81 , 43.85
+122.43 , -2305.81 , -5.48
+122.43 , -2234.29 , -5.92
+122.43 , -2162.78 , -6.32
+122.43 , -2091.26 , -6.68
+122.43 , -2019.75 , -7.00
+122.43 , -1948.23 , -7.28
+122.43 , -1876.72 , -7.52
+122.43 , -1805.20 , -7.72
+122.43 , -1733.69 , -7.88
+122.43 , -1662.17 , -8.00
+122.43 , -1590.66 , -8.07
+122.43 , -1519.14 , -8.11
+122.43 , -1447.63 , -8.11
+122.43 , -1376.11 , -8.06
+122.43 , -1304.60 , -7.98
+122.43 , -1233.09 , -7.85
+122.43 , -1161.57 , -7.68
+122.43 , -1090.06 , -7.47
+122.43 , -1018.54 , -7.23
+122.43 , -946.70 , -6.94
+122.43 , -873.76 , -6.63
+122.43 , -800.81 , -6.28
+122.43 , -727.00 , -5.89
+122.43 , -652.57 , -5.48
+122.43 , -578.13 , -5.02
+122.43 , -503.70 , -4.53
+122.43 , -429.27 , -3.99
+122.43 , -354.83 , -3.41
+122.43 , -280.40 , -2.80
+122.43 , -205.97 , -2.14
+122.43 , -131.53 , -1.44
+122.43 , -57.10 , -0.70
+122.43 , 17.33 , 0.14
+122.43 , 87.37 , 1.17
+122.43 , 157.40 , 2.23
+122.43 , 227.44 , 3.34
+122.43 , 297.47 , 4.48
+122.43 , 367.51 , 5.67
+122.43 , 437.54 , 6.90
+122.43 , 507.58 , 8.18
+122.43 , 577.61 , 9.49
+122.43 , 647.65 , 10.84
+122.43 , 717.68 , 12.24
+122.43 , 787.72 , 13.68
+122.43 , 857.75 , 15.16
+122.43 , 927.79 , 16.68
+122.43 , 997.82 , 18.24
+122.43 , 1067.85 , 19.85
+122.43 , 1137.89 , 21.49
+122.43 , 1207.92 , 23.18
+122.43 , 1277.96 , 24.91
+122.43 , 1347.99 , 26.68
+122.43 , 1418.03 , 28.49
+122.43 , 1488.06 , 30.34
+122.43 , 1558.10 , 32.24
+122.43 , 1628.13 , 34.17
+122.43 , 1698.17 , 36.15
+122.43 , 1768.20 , 38.17
+122.43 , 1838.24 , 40.23
+122.43 , 1908.27 , 42.33
+122.43 , 1978.31 , 44.48
+122.43 , 2048.34 , 46.66
+122.43 , 2118.38 , 48.89
+122.43 , 2188.41 , 51.16
+122.43 , 2258.44 , 53.47
+163.24 , -2306.44 , -15.09
+163.24 , -2234.92 , -15.22
+163.24 , -2163.41 , -15.32
+163.24 , -2091.89 , -15.37
+163.24 , -2020.38 , -15.39
+163.24 , -1948.86 , -15.36
+163.24 , -1877.35 , -15.30
+163.24 , -1805.83 , -15.19
+163.24 , -1734.32 , -15.04
+163.24 , -1662.80 , -14.85
+163.24 , -1591.29 , -14.62
+163.24 , -1519.77 , -14.35
+163.24 , -1448.26 , -14.04
+163.24 , -1376.75 , -13.69
+163.24 , -1305.23 , -13.30
+163.24 , -1233.72 , -12.87
+163.24 , -1162.20 , -12.40
+163.24 , -1090.69 , -11.88
+163.24 , -1019.17 , -11.33
+163.24 , -947.22 , -10.74
+163.24 , -873.80 , -10.14
+163.24 , -800.38 , -9.49
+163.24 , -726.37 , -8.82
+163.24 , -651.94 , -8.11
+163.24 , -577.50 , -7.36
+163.24 , -503.07 , -6.57
+163.24 , -428.64 , -5.74
+163.24 , -354.20 , -4.87
+163.24 , -279.77 , -3.96
+163.24 , -205.34 , -3.01
+163.24 , -130.90 , -2.01
+163.24 , -56.47 , -0.98
+163.24 , 17.97 , 0.16
+163.24 , 88.00 , 1.48
+163.24 , 158.03 , 2.85
+163.24 , 228.07 , 4.25
+163.24 , 298.10 , 5.70
+163.24 , 368.14 , 7.19
+163.24 , 438.17 , 8.72
+163.24 , 508.21 , 10.29
+163.24 , 578.24 , 11.90
+163.24 , 648.28 , 13.56
+163.24 , 718.31 , 15.26
+163.24 , 788.35 , 16.99
+163.24 , 858.38 , 18.77
+163.24 , 928.42 , 20.60
+163.24 , 998.45 , 22.46
+163.24 , 1068.49 , 24.36
+163.24 , 1138.52 , 26.31
+163.24 , 1208.55 , 28.30
+163.24 , 1278.59 , 30.32
+163.24 , 1348.62 , 32.39
+163.24 , 1418.66 , 34.50
+163.24 , 1488.69 , 36.66
+163.24 , 1558.73 , 38.85
+163.24 , 1628.76 , 41.09
+163.24 , 1698.80 , 43.36
+163.24 , 1768.83 , 45.68
+163.24 , 1838.87 , 48.05
+163.24 , 1908.90 , 50.45
+163.24 , 1978.94 , 52.89
+163.24 , 2048.97 , 55.38
+163.24 , 2119.01 , 57.90
+163.24 , 2189.04 , 60.47
+163.24 , 2259.07 , 63.08
+204.04 , -2307.07 , -24.68
+204.04 , -2235.55 , -24.52
+204.04 , -2164.04 , -24.31
+204.04 , -2092.52 , -24.06
+204.04 , -2021.01 , -23.76
+204.04 , -1949.49 , -23.43
+204.04 , -1877.98 , -23.06
+204.04 , -1806.46 , -22.65
+204.04 , -1734.95 , -22.19
+204.04 , -1663.43 , -21.70
+204.04 , -1591.92 , -21.16
+204.04 , -1520.40 , -20.59
+204.04 , -1448.89 , -19.97
+204.04 , -1377.38 , -19.31
+204.04 , -1305.86 , -18.62
+204.04 , -1234.35 , -17.88
+204.04 , -1162.83 , -17.10
+204.04 , -1091.32 , -16.28
+204.04 , -1019.80 , -15.42
+204.04 , -947.75 , -14.53
+204.04 , -873.85 , -13.64
+204.04 , -799.95 , -12.71
+204.04 , -725.74 , -11.74
+204.04 , -651.31 , -10.74
+204.04 , -576.87 , -9.70
+204.04 , -502.44 , -8.61
+204.04 , -428.01 , -7.49
+204.04 , -353.57 , -6.32
+204.04 , -279.14 , -5.12
+204.04 , -204.71 , -3.87
+204.04 , -130.27 , -2.59
+204.04 , -55.84 , -1.26
+204.04 , 18.60 , 0.17
+204.04 , 88.63 , 1.80
+204.04 , 158.66 , 3.46
+204.04 , 228.70 , 5.17
+204.04 , 298.73 , 6.92
+204.04 , 368.77 , 8.70
+204.04 , 438.80 , 10.53
+204.04 , 508.84 , 12.41
+204.04 , 578.87 , 14.32
+204.04 , 648.91 , 16.28
+204.04 , 718.94 , 18.27
+204.04 , 788.98 , 20.31
+204.04 , 859.01 , 22.39
+204.04 , 929.05 , 24.51
+204.04 , 999.08 , 26.67
+204.04 , 1069.12 , 28.88
+204.04 , 1139.15 , 31.12
+204.04 , 1209.18 , 33.41
+204.04 , 1279.22 , 35.74
+204.04 , 1349.25 , 38.11
+204.04 , 1419.29 , 40.52
+204.04 , 1489.32 , 42.97
+204.04 , 1559.36 , 45.47
+204.04 , 1629.39 , 48.00
+204.04 , 1699.43 , 50.58
+204.04 , 1769.46 , 53.20
+204.04 , 1839.50 , 55.86
+204.04 , 1909.53 , 58.56
+204.04 , 1979.57 , 61.31
+204.04 , 2049.60 , 64.09
+204.04 , 2119.64 , 66.92
+204.04 , 2189.67 , 69.79
+204.04 , 2259.70 , 72.70
+244.85 , -2307.70 , -34.27
+244.85 , -2236.18 , -33.80
+244.85 , -2164.67 , -33.28
+244.85 , -2093.15 , -32.73
+244.85 , -2021.64 , -32.13
+244.85 , -1950.12 , -31.49
+244.85 , -1878.61 , -30.81
+244.85 , -1807.09 , -30.09
+244.85 , -1735.58 , -29.34
+244.85 , -1664.06 , -28.53
+244.85 , -1592.55 , -27.69
+244.85 , -1521.04 , -26.81
+244.85 , -1449.52 , -25.89
+244.85 , -1378.01 , -24.93
+244.85 , -1306.49 , -23.92
+244.85 , -1234.98 , -22.88
+244.85 , -1163.46 , -21.79
+244.85 , -1091.95 , -20.67
+244.85 , -1020.43 , -19.50
+244.85 , -948.27 , -18.31
+244.85 , -873.89 , -17.13
+244.85 , -799.52 , -15.92
+244.85 , -725.11 , -14.66
+244.85 , -650.68 , -13.37
+244.85 , -576.24 , -12.03
+244.85 , -501.81 , -10.66
+244.85 , -427.38 , -9.24
+244.85 , -352.94 , -7.78
+244.85 , -278.51 , -6.28
+244.85 , -204.08 , -4.74
+244.85 , -129.64 , -3.16
+244.85 , -55.21 , -1.54
+244.85 , 19.23 , 0.19
+244.85 , 89.26 , 2.11
+244.85 , 159.29 , 4.08
+244.85 , 229.33 , 6.08
+244.85 , 299.36 , 8.13
+244.85 , 369.40 , 10.22
+244.85 , 439.43 , 12.35
+244.85 , 509.47 , 14.52
+244.85 , 579.50 , 16.74
+244.85 , 649.54 , 18.99
+244.85 , 719.57 , 21.29
+244.85 , 789.61 , 23.62
+244.85 , 859.64 , 26.00
+244.85 , 929.68 , 28.43
+244.85 , 999.71 , 30.89
+244.85 , 1069.75 , 33.39
+244.85 , 1139.78 , 35.94
+244.85 , 1209.82 , 38.52
+244.85 , 1279.85 , 41.15
+244.85 , 1349.88 , 43.82
+244.85 , 1419.92 , 46.53
+244.85 , 1489.95 , 49.29
+244.85 , 1559.99 , 52.08
+244.85 , 1630.02 , 54.92
+244.85 , 1700.06 , 57.79
+244.85 , 1770.09 , 60.71
+244.85 , 1840.13 , 63.68
+244.85 , 1910.16 , 66.68
+244.85 , 1980.20 , 69.72
+244.85 , 2050.23 , 72.80
+244.85 , 2120.27 , 75.93
+244.85 , 2190.30 , 79.10
+244.85 , 2260.34 , 82.31
+285.67 , -2308.33 , -43.85
+285.67 , -2236.81 , -43.07
+285.67 , -2165.30 , -42.25
+285.67 , -2093.78 , -41.39
+285.67 , -2022.27 , -40.49
+285.67 , -1950.75 , -39.54
+285.67 , -1879.24 , -38.56
+285.67 , -1807.72 , -37.53
+285.67 , -1736.21 , -36.47
+285.67 , -1664.69 , -35.36
+285.67 , -1593.18 , -34.21
+285.67 , -1521.67 , -33.02
+285.67 , -1450.15 , -31.80
+285.67 , -1378.64 , -30.53
+285.67 , -1307.12 , -29.22
+285.67 , -1235.61 , -27.87
+285.67 , -1164.09 , -26.48
+285.67 , -1092.21 , -25.06
+285.67 , -1020.28 , -23.59
+285.67 , -947.78 , -22.11
+285.67 , -873.35 , -20.64
+285.67 , -798.91 , -19.14
+285.67 , -724.48 , -17.59
+285.67 , -650.05 , -16.00
+285.67 , -575.61 , -14.37
+285.67 , -501.18 , -12.70
+285.67 , -426.75 , -10.99
+285.67 , -352.31 , -9.24
+285.67 , -277.88 , -7.45
+285.67 , -203.45 , -5.61
+285.67 , -129.01 , -3.74
+285.67 , -54.58 , -1.83
+285.67 , 19.86 , 0.20
+285.67 , 89.89 , 2.43
+285.67 , 159.93 , 4.69
+285.67 , 229.96 , 7.00
+285.67 , 299.99 , 9.34
+285.67 , 370.03 , 11.73
+285.67 , 440.06 , 14.16
+285.67 , 510.10 , 16.64
+285.67 , 580.13 , 19.15
+285.67 , 650.17 , 21.70
+285.67 , 720.20 , 24.30
+285.67 , 790.24 , 26.94
+285.67 , 860.27 , 29.62
+285.67 , 930.31 , 32.34
+285.67 , 1000.34 , 35.10
+285.67 , 1070.38 , 37.90
+285.67 , 1140.41 , 40.75
+285.67 , 1210.45 , 43.64
+285.67 , 1280.48 , 46.57
+285.67 , 1350.51 , 49.54
+285.67 , 1420.55 , 52.55
+285.67 , 1490.58 , 55.60
+285.67 , 1560.62 , 58.69
+285.67 , 1630.65 , 61.83
+285.67 , 1700.69 , 65.01
+285.67 , 1770.72 , 68.23
+285.67 , 1840.76 , 71.49
+285.67 , 1910.79 , 74.79
+285.67 , 1980.83 , 78.13
+285.67 , 2050.86 , 81.52
+285.67 , 2120.90 , 84.95
+285.67 , 2190.93 , 88.41
+285.67 , 2260.97 , 91.92
+326.47 , -2308.96 , -53.42
+326.47 , -2237.44 , -52.34
+326.47 , -2165.93 , -51.21
+326.47 , -2094.41 , -50.04
+326.47 , -2022.90 , -48.83
+326.47 , -1951.38 , -47.58
+326.47 , -1879.87 , -46.29
+326.47 , -1808.35 , -44.96
+326.47 , -1736.84 , -43.59
+326.47 , -1665.33 , -42.18
+326.47 , -1593.81 , -40.72
+326.47 , -1522.30 , -39.23
+326.47 , -1450.78 , -37.70
+326.47 , -1379.27 , -36.12
+326.47 , -1307.75 , -34.50
+326.47 , -1236.24 , -32.85
+326.47 , -1164.72 , -31.15
+326.47 , -1092.43 , -29.44
+326.47 , -1020.02 , -27.69
+326.47 , -947.15 , -25.92
+326.47 , -872.72 , -24.16
+326.47 , -798.28 , -22.36
+326.47 , -723.85 , -20.51
+326.47 , -649.42 , -18.63
+326.47 , -574.98 , -16.71
+326.47 , -500.55 , -14.75
+326.47 , -426.12 , -12.74
+326.47 , -351.68 , -10.70
+326.47 , -277.25 , -8.61
+326.47 , -202.82 , -6.48
+326.47 , -128.38 , -4.32
+326.47 , -53.95 , -2.11
+326.47 , 20.49 , 0.22
+326.47 , 90.52 , 2.74
+326.47 , 160.56 , 5.30
+326.47 , 230.59 , 7.91
+326.47 , 300.62 , 10.56
+326.47 , 370.66 , 13.25
+326.47 , 440.69 , 15.98
+326.47 , 510.73 , 18.75
+326.47 , 580.76 , 21.56
+326.47 , 650.80 , 24.42
+326.47 , 720.83 , 27.31
+326.47 , 790.87 , 30.25
+326.47 , 860.90 , 33.23
+326.47 , 930.94 , 36.25
+326.47 , 1000.97 , 39.31
+326.47 , 1071.01 , 42.42
+326.47 , 1141.04 , 45.56
+326.47 , 1211.08 , 48.75
+326.47 , 1281.11 , 51.98
+326.47 , 1351.14 , 55.25
+326.47 , 1421.18 , 58.56
+326.47 , 1491.21 , 61.91
+326.47 , 1561.25 , 65.31
+326.47 , 1631.28 , 68.74
+326.47 , 1701.32 , 72.22
+326.47 , 1771.35 , 75.74
+326.47 , 1841.39 , 79.30
+326.47 , 1911.42 , 82.90
+326.47 , 1981.46 , 86.54
+326.47 , 2051.49 , 90.23
+326.47 , 2121.53 , 93.96
+326.47 , 2191.56 , 97.72
+326.47 , 2261.60 , 101.53
+367.28 , -2309.59 , -62.98
+367.28 , -2238.07 , -61.59
+367.28 , -2166.56 , -60.16
+367.28 , -2095.04 , -58.68
+367.28 , -2023.53 , -57.17
+367.28 , -1952.01 , -55.61
+367.28 , -1880.50 , -54.02
+367.28 , -1808.98 , -52.38
+367.28 , -1737.47 , -50.70
+367.28 , -1665.96 , -48.98
+367.28 , -1594.44 , -47.22
+367.28 , -1522.93 , -45.42
+367.28 , -1451.41 , -43.58
+367.28 , -1379.90 , -41.70
+367.28 , -1308.38 , -39.78
+367.28 , -1236.87 , -37.82
+367.28 , -1165.35 , -35.81
+367.28 , -1092.64 , -33.82
+367.28 , -1019.76 , -31.78
+367.28 , -946.52 , -29.73
+367.28 , -872.09 , -27.67
+367.28 , -797.65 , -25.58
+367.28 , -723.22 , -23.44
+367.28 , -648.79 , -21.27
+367.28 , -574.35 , -19.05
+367.28 , -499.92 , -16.79
+367.28 , -425.49 , -14.49
+367.28 , -351.05 , -12.16
+367.28 , -276.62 , -9.78
+367.28 , -202.18 , -7.36
+367.28 , -127.75 , -4.90
+367.28 , -53.32 , -2.39
+367.28 , 21.12 , 0.23
+367.28 , 91.15 , 3.05
+367.28 , 161.19 , 5.92
+367.28 , 231.22 , 8.82
+367.28 , 301.26 , 11.77
+367.28 , 371.29 , 14.76
+367.28 , 441.32 , 17.79
+367.28 , 511.36 , 20.86
+367.28 , 581.39 , 23.97
+367.28 , 651.43 , 27.13
+367.28 , 721.46 , 30.33
+367.28 , 791.50 , 33.56
+367.28 , 861.53 , 36.84
+367.28 , 931.57 , 40.16
+367.28 , 1001.60 , 43.53
+367.28 , 1071.64 , 46.93
+367.28 , 1141.67 , 50.37
+367.28 , 1211.71 , 53.86
+367.28 , 1281.74 , 57.39
+367.28 , 1351.78 , 60.96
+367.28 , 1421.81 , 64.57
+367.28 , 1491.84 , 68.22
+367.28 , 1561.88 , 71.92
+367.28 , 1631.91 , 75.65
+367.28 , 1701.95 , 79.43
+367.28 , 1771.98 , 83.25
+367.28 , 1842.02 , 87.11
+367.28 , 1912.05 , 91.01
+367.28 , 1982.09 , 94.96
+367.28 , 2052.12 , 98.94
+367.28 , 2122.16 , 102.97
+367.28 , 2192.19 , 107.03
+367.28 , 2262.23 , 111.14
+408.09 , -2310.22 , -72.54
+408.09 , -2238.70 , -70.84
+408.09 , -2167.19 , -69.10
+408.09 , -2095.67 , -67.32
+408.09 , -2024.16 , -65.50
+408.09 , -1952.64 , -63.63
+408.09 , -1881.13 , -61.73
+408.09 , -1809.62 , -59.79
+408.09 , -1738.10 , -57.80
+408.09 , -1666.59 , -55.78
+408.09 , -1595.07 , -53.71
+408.09 , -1523.56 , -51.61
+408.09 , -1452.04 , -49.46
+408.09 , -1380.53 , -47.27
+408.09 , -1309.01 , -45.05
+408.09 , -1237.50 , -42.78
+408.09 , -1165.98 , -40.47
+408.09 , -1092.86 , -38.19
+408.09 , -1019.50 , -35.88
+408.09 , -945.89 , -33.53
+408.09 , -871.46 , -31.19
+408.09 , -797.02 , -28.80
+408.09 , -722.59 , -26.37
+408.09 , -648.16 , -23.90
+408.09 , -573.72 , -21.39
+408.09 , -499.29 , -18.84
+408.09 , -424.86 , -16.25
+408.09 , -350.42 , -13.62
+408.09 , -275.99 , -10.94
+408.09 , -201.55 , -8.23
+408.09 , -127.12 , -5.48
+408.09 , -52.69 , -2.68
+408.09 , 21.75 , 0.24
+408.09 , 91.78 , 3.36
+408.09 , 161.82 , 6.53
+408.09 , 231.85 , 9.73
+408.09 , 301.89 , 12.98
+408.09 , 371.92 , 16.27
+408.09 , 441.95 , 19.60
+408.09 , 511.99 , 22.97
+408.09 , 582.02 , 26.39
+408.09 , 652.06 , 29.84
+408.09 , 722.09 , 33.33
+408.09 , 792.13 , 36.87
+408.09 , 862.16 , 40.45
+408.09 , 932.20 , 44.07
+408.09 , 1002.23 , 47.74
+408.09 , 1072.27 , 51.44
+408.09 , 1142.30 , 55.19
+408.09 , 1212.34 , 58.97
+408.09 , 1282.37 , 62.80
+408.09 , 1352.41 , 66.67
+408.09 , 1422.44 , 70.58
+408.09 , 1492.47 , 74.53
+408.09 , 1562.51 , 78.53
+408.09 , 1632.54 , 82.56
+408.09 , 1702.58 , 86.64
+408.09 , 1772.61 , 90.76
+408.09 , 1842.65 , 94.92
+408.09 , 1912.68 , 99.12
+408.09 , 1982.72 , 103.37
+408.09 , 2052.75 , 107.65
+408.09 , 2122.79 , 111.98
+408.09 , 2192.82 , 116.34
+408.09 , 2262.86 , 120.75
+448.90 , -2310.85 , -82.08
+448.90 , -2239.33 , -80.07
+448.90 , -2167.82 , -78.03
+448.90 , -2096.30 , -75.94
+448.90 , -2024.79 , -73.81
+448.90 , -1953.27 , -71.64
+448.90 , -1881.76 , -69.44
+448.90 , -1810.25 , -67.19
+448.90 , -1738.73 , -64.90
+448.90 , -1667.22 , -62.57
+448.90 , -1595.70 , -60.20
+448.90 , -1524.19 , -57.78
+448.90 , -1452.67 , -55.33
+448.90 , -1381.16 , -52.84
+448.90 , -1309.64 , -50.30
+448.90 , -1238.13 , -47.73
+448.90 , -1166.61 , -45.11
+448.90 , -1093.07 , -42.55
+448.90 , -1019.23 , -39.97
+448.90 , -945.26 , -37.34
+448.90 , -870.83 , -34.70
+448.90 , -796.39 , -32.02
+448.90 , -721.96 , -29.30
+448.90 , -647.53 , -26.54
+448.90 , -573.09 , -23.73
+448.90 , -498.66 , -20.89
+448.90 , -424.23 , -18.00
+448.90 , -349.79 , -15.08
+448.90 , -275.36 , -12.11
+448.90 , -200.92 , -9.10
+448.90 , -126.49 , -6.06
+448.90 , -52.06 , -2.97
+448.90 , 22.38 , 0.25
+448.90 , 92.41 , 3.67
+448.90 , 162.45 , 7.14
+448.90 , 232.48 , 10.64
+448.90 , 302.52 , 14.19
+448.90 , 372.55 , 17.78
+448.90 , 442.58 , 21.41
+448.90 , 512.62 , 25.08
+448.90 , 582.65 , 28.79
+448.90 , 652.69 , 32.55
+448.90 , 722.72 , 36.34
+448.90 , 792.76 , 40.18
+448.90 , 862.79 , 44.06
+448.90 , 932.83 , 47.98
+448.90 , 1002.86 , 51.95
+448.90 , 1072.90 , 55.95
+448.90 , 1142.93 , 59.99
+448.90 , 1212.97 , 64.08
+448.90 , 1283.00 , 68.21
+448.90 , 1353.04 , 72.38
+448.90 , 1423.07 , 76.59
+448.90 , 1493.11 , 80.84
+448.90 , 1563.14 , 85.14
+448.90 , 1633.17 , 89.47
+448.90 , 1703.21 , 93.85
+448.90 , 1773.24 , 98.27
+448.90 , 1843.28 , 102.73
+448.90 , 1913.31 , 107.23
+448.90 , 1983.35 , 111.78
+448.90 , 2053.38 , 116.36
+448.90 , 2123.42 , 120.99
+448.90 , 2193.45 , 125.65
+448.90 , 2263.49 , 130.36
+489.71 , -2311.48 , -91.61
+489.71 , -2239.96 , -89.30
+489.71 , -2168.45 , -86.94
+489.71 , -2096.93 , -84.55
+489.71 , -2025.42 , -82.12
+489.71 , -1953.91 , -79.65
+489.71 , -1882.39 , -77.13
+489.71 , -1810.88 , -74.58
+489.71 , -1739.36 , -71.98
+489.71 , -1667.85 , -69.34
+489.71 , -1596.33 , -66.67
+489.71 , -1524.82 , -63.95
+489.71 , -1453.30 , -61.19
+489.71 , -1381.79 , -58.39
+489.71 , -1310.27 , -55.55
+489.71 , -1238.76 , -52.67
+489.71 , -1167.24 , -49.75
+489.71 , -1093.29 , -46.91
+489.71 , -1018.97 , -44.05
+489.71 , -944.63 , -41.15
+489.71 , -870.20 , -38.22
+489.71 , -795.76 , -35.24
+489.71 , -721.33 , -32.23
+489.71 , -646.90 , -29.17
+489.71 , -572.46 , -26.08
+489.71 , -498.03 , -22.94
+489.71 , -423.60 , -19.76
+489.71 , -349.16 , -16.54
+489.71 , -274.73 , -13.28
+489.71 , -200.29 , -9.98
+489.71 , -125.86 , -6.64
+489.71 , -51.43 , -3.26
+489.71 , 23.01 , 0.26
+489.71 , 93.04 , 3.98
+489.71 , 163.08 , 7.75
+489.71 , 233.11 , 11.55
+489.71 , 303.15 , 15.40
+489.71 , 373.18 , 19.29
+489.71 , 443.22 , 23.22
+489.71 , 513.25 , 27.19
+489.71 , 583.28 , 31.20
+489.71 , 653.32 , 35.26
+489.71 , 723.35 , 39.36
+489.71 , 793.39 , 43.49
+489.71 , 863.42 , 47.67
+489.71 , 933.46 , 51.89
+489.71 , 1003.49 , 56.15
+489.71 , 1073.53 , 60.46
+489.71 , 1143.56 , 64.80
+489.71 , 1213.60 , 69.19
+489.71 , 1283.63 , 73.62
+489.71 , 1353.67 , 78.09
+489.71 , 1423.70 , 82.60
+489.71 , 1493.74 , 87.15
+489.71 , 1563.77 , 91.75
+489.71 , 1633.80 , 96.38
+489.71 , 1703.84 , 101.06
+489.71 , 1773.87 , 105.78
+489.71 , 1843.91 , 110.54
+489.71 , 1913.94 , 115.34
+489.71 , 1983.98 , 120.18
+489.71 , 2054.01 , 125.07
+489.71 , 2124.05 , 129.99
+489.71 , 2194.08 , 134.96
+489.71 , 2264.12 , 139.97
+816.18 , -2316.52 , -167.50
+816.18 , -2245.01 , -162.74
+816.18 , -2173.49 , -157.95
+816.18 , -2101.98 , -153.10
+816.18 , -2030.46 , -148.22
+816.18 , -1958.95 , -143.30
+816.18 , -1887.43 , -138.34
+816.18 , -1815.92 , -133.33
+816.18 , -1744.40 , -128.29
+816.18 , -1672.89 , -123.21
+816.18 , -1601.37 , -118.08
+816.18 , -1529.73 , -112.93
+816.18 , -1457.44 , -107.78
+816.18 , -1385.16 , -102.60
+816.18 , -1311.76 , -97.48
+816.18 , -1237.32 , -92.40
+816.18 , -1162.89 , -87.28
+816.18 , -1088.46 , -82.12
+816.18 , -1014.02 , -76.91
+816.18 , -939.59 , -71.67
+816.18 , -865.16 , -66.39
+816.18 , -790.72 , -61.07
+816.18 , -716.29 , -55.70
+816.18 , -641.85 , -50.30
+816.18 , -567.42 , -44.85
+816.18 , -492.99 , -39.37
+816.18 , -418.55 , -33.84
+816.18 , -344.12 , -28.27
+816.18 , -269.69 , -22.66
+816.18 , -195.25 , -17.02
+816.18 , -120.82 , -11.33
+816.18 , -46.38 , -5.60
+816.18 , 28.05 , 0.30
+816.18 , 98.08 , 6.43
+816.18 , 168.12 , 12.59
+816.18 , 238.15 , 18.80
+816.18 , 308.19 , 25.04
+816.18 , 378.22 , 31.33
+816.18 , 448.26 , 37.66
+816.18 , 518.29 , 44.03
+816.18 , 588.33 , 50.44
+816.18 , 658.36 , 56.90
+816.18 , 728.40 , 63.40
+816.18 , 798.43 , 69.93
+816.18 , 868.47 , 76.51
+816.18 , 938.50 , 83.13
+816.18 , 1008.53 , 89.79
+816.18 , 1078.57 , 96.50
+816.18 , 1148.60 , 103.24
+816.18 , 1218.64 , 110.03
+816.18 , 1288.67 , 116.86
+816.18 , 1358.71 , 123.72
+816.18 , 1428.74 , 130.64
+816.18 , 1498.78 , 137.59
+816.18 , 1568.81 , 144.58
+816.18 , 1638.85 , 151.62
+816.18 , 1708.88 , 158.69
+816.18 , 1778.92 , 165.81
+816.18 , 1848.95 , 172.97
+816.18 , 1918.99 , 180.18
+816.18 , 1989.02 , 187.42
+816.18 , 2059.05 , 194.70
+816.18 , 2129.09 , 202.03
+816.18 , 2199.12 , 209.40
+816.18 , 2269.16 , 216.81
+1020.26 , -2319.67 , -214.62
+1020.26 , -2248.16 , -208.33
+1020.26 , -2176.64 , -202.00
+1020.26 , -2105.13 , -195.63
+1020.26 , -2033.61 , -189.22
+1020.26 , -1962.10 , -182.77
+1020.26 , -1890.58 , -176.27
+1020.26 , -1819.07 , -169.74
+1020.26 , -1747.55 , -163.17
+1020.26 , -1675.85 , -156.57
+1020.26 , -1604.10 , -149.94
+1020.26 , -1531.91 , -143.32
+1020.26 , -1457.47 , -136.89
+1020.26 , -1383.04 , -130.43
+1020.26 , -1308.61 , -123.92
+1020.26 , -1234.17 , -117.38
+1020.26 , -1159.74 , -110.79
+1020.26 , -1085.30 , -104.16
+1020.26 , -1010.87 , -97.49
+1020.26 , -936.44 , -90.78
+1020.26 , -862.00 , -84.03
+1020.26 , -787.57 , -77.24
+1020.26 , -713.14 , -70.41
+1020.26 , -638.70 , -63.53
+1020.26 , -564.27 , -56.62
+1020.26 , -489.84 , -49.67
+1020.26 , -415.40 , -42.67
+1020.26 , -340.97 , -35.64
+1020.26 , -266.53 , -28.56
+1020.26 , -192.10 , -21.45
+1020.26 , -117.67 , -14.29
+1020.26 , -43.23 , -7.09
+1020.26 , 31.20 , 0.30
+1020.26 , 101.24 , 7.92
+1020.26 , 171.27 , 15.59
+1020.26 , 241.30 , 23.29
+1020.26 , 311.34 , 31.04
+1020.26 , 381.37 , 38.83
+1020.26 , 451.41 , 46.66
+1020.26 , 521.44 , 54.53
+1020.26 , 591.48 , 62.44
+1020.26 , 661.51 , 70.40
+1020.26 , 731.55 , 78.39
+1020.26 , 801.58 , 86.43
+1020.26 , 871.62 , 94.51
+1020.26 , 941.65 , 102.63
+1020.26 , 1011.69 , 110.79
+1020.26 , 1081.72 , 118.99
+1020.26 , 1151.76 , 127.24
+1020.26 , 1221.79 , 135.52
+1020.26 , 1291.83 , 143.85
+1020.26 , 1361.86 , 152.22
+1020.26 , 1431.89 , 160.63
+1020.26 , 1501.93 , 169.08
+1020.26 , 1571.96 , 177.58
+1020.26 , 1642.00 , 186.11
+1020.26 , 1712.03 , 194.69
+1020.26 , 1782.07 , 203.31
+1020.26 , 1852.10 , 211.97
+1020.26 , 1922.14 , 220.67
+1020.26 , 1992.17 , 229.41
+1020.26 , 2062.21 , 238.19
+1020.26 , 2132.24 , 247.02
+1020.26 , 2202.28 , 255.90
+1020.26 , 2272.31 , 264.80
+1224.27 , -2322.82 , -261.49
+1224.27 , -2251.31 , -253.68
+1224.27 , -2179.79 , -245.82
+1224.27 , -2108.28 , -237.91
+1224.27 , -2036.76 , -229.97
+1224.27 , -1965.25 , -221.99
+1224.27 , -1893.73 , -213.97
+1224.27 , -1822.22 , -205.90
+1224.27 , -1750.71 , -197.80
+1224.27 , -1677.07 , -189.93
+1224.27 , -1602.94 , -182.08
+1224.27 , -1528.76 , -174.19
+1224.27 , -1454.32 , -166.30
+1224.27 , -1379.89 , -158.36
+1224.27 , -1305.46 , -150.39
+1224.27 , -1231.02 , -142.38
+1224.27 , -1156.59 , -134.32
+1224.27 , -1082.15 , -126.22
+1224.27 , -1007.72 , -118.09
+1224.27 , -933.29 , -109.91
+1224.27 , -858.85 , -101.69
+1224.27 , -784.42 , -93.43
+1224.27 , -709.99 , -85.13
+1224.27 , -635.55 , -76.80
+1224.27 , -561.12 , -68.41
+1224.27 , -486.68 , -59.99
+1224.27 , -412.25 , -51.53
+1224.27 , -337.82 , -43.03
+1224.27 , -263.38 , -34.48
+1224.27 , -188.95 , -25.90
+1224.27 , -114.52 , -17.28
+1224.27 , -40.08 , -8.61
+1224.27 , 34.35 , 0.28
+1224.27 , 104.39 , 9.40
+1224.27 , 174.42 , 18.56
+1224.27 , 244.46 , 27.77
+1224.27 , 314.49 , 37.01
+1224.27 , 384.53 , 46.30
+1224.27 , 454.56 , 55.63
+1224.27 , 524.59 , 65.00
+1224.27 , 594.63 , 74.42
+1224.27 , 664.66 , 83.87
+1224.27 , 734.70 , 93.37
+1224.27 , 804.73 , 102.90
+1224.27 , 874.77 , 112.48
+1224.27 , 944.80 , 122.10
+1224.27 , 1014.84 , 131.76
+1224.27 , 1084.87 , 141.47
+1224.27 , 1154.91 , 151.21
+1224.27 , 1224.94 , 161.00
+1224.27 , 1294.98 , 170.82
+1224.27 , 1365.01 , 180.69
+1224.27 , 1435.05 , 190.60
+1224.27 , 1505.08 , 200.56
+1224.27 , 1575.11 , 210.55
+1224.27 , 1645.15 , 220.59
+1224.27 , 1715.18 , 230.66
+1224.27 , 1785.22 , 240.77
+1224.27 , 1855.25 , 250.93
+1224.27 , 1925.29 , 261.13
+1224.27 , 1995.32 , 271.39
+1224.27 , 2065.36 , 281.66
+1224.27 , 2135.39 , 291.99
+1224.27 , 2205.43 , 302.37
+1224.27 , 2275.46 , 312.77
+1428.29 , -2325.97 , -308.11
+1428.29 , -2254.46 , -298.77
+1428.29 , -2182.94 , -289.38
+1428.29 , -2111.43 , -279.94
+1428.29 , -2039.92 , -270.48
+1428.29 , -1968.40 , -260.97
+1428.29 , -1895.94 , -251.55
+1428.29 , -1822.34 , -242.27
+1428.29 , -1748.75 , -232.95
+1428.29 , -1674.47 , -223.69
+1428.29 , -1600.04 , -214.41
+1428.29 , -1525.61 , -205.09
+1428.29 , -1451.17 , -195.73
+1428.29 , -1376.74 , -186.33
+1428.29 , -1302.30 , -176.89
+1428.29 , -1227.87 , -167.40
+1428.29 , -1153.44 , -157.88
+1428.29 , -1079.00 , -148.32
+1428.29 , -1004.57 , -138.71
+1428.29 , -930.14 , -129.07
+1428.29 , -855.70 , -119.38
+1428.29 , -781.27 , -109.65
+1428.29 , -706.83 , -99.89
+1428.29 , -632.40 , -90.08
+1428.29 , -557.97 , -80.23
+1428.29 , -483.53 , -70.34
+1428.29 , -409.10 , -60.41
+1428.29 , -334.67 , -50.44
+1428.29 , -260.23 , -40.43
+1428.29 , -185.80 , -30.38
+1428.29 , -111.36 , -20.29
+1428.29 , -36.93 , -10.15
+1428.29 , 37.50 , 0.23
+1428.29 , 107.54 , 10.85
+1428.29 , 177.57 , 21.52
+1428.29 , 247.61 , 32.22
+1428.29 , 317.64 , 42.97
+1428.29 , 387.68 , 53.75
+1428.29 , 457.71 , 64.58
+1428.29 , 527.75 , 75.46
+1428.29 , 597.78 , 86.37
+1428.29 , 667.81 , 97.32
+1428.29 , 737.85 , 108.32
+1428.29 , 807.88 , 119.35
+1428.29 , 877.92 , 130.43
+1428.29 , 947.95 , 141.55
+1428.29 , 1017.99 , 152.71
+1428.29 , 1088.02 , 163.92
+1428.29 , 1158.06 , 175.16
+1428.29 , 1228.09 , 186.45
+1428.29 , 1298.13 , 197.77
+1428.29 , 1368.16 , 209.14
+1428.29 , 1438.20 , 220.55
+1428.29 , 1508.23 , 232.00
+1428.29 , 1578.27 , 243.49
+1428.29 , 1648.30 , 255.04
+1428.29 , 1718.33 , 266.60
+1428.29 , 1788.37 , 278.23
+1428.29 , 1858.40 , 289.88
+1428.29 , 1928.44 , 301.58
+1428.29 , 1998.47 , 313.33
+1428.29 , 2068.51 , 325.10
+1428.29 , 2138.54 , 336.95
+1428.29 , 2208.58 , 348.80
+1428.29 , 2278.61 , 360.72
+1632.39 , -2329.13 , -354.50
+1632.39 , -2257.61 , -343.63
+1632.39 , -2186.10 , -332.70
+1632.39 , -2114.43 , -321.76
+1632.39 , -2041.37 , -311.03
+1632.39 , -1968.31 , -300.25
+1632.39 , -1894.62 , -289.53
+1632.39 , -1820.19 , -278.92
+1632.39 , -1745.75 , -268.25
+1632.39 , -1671.32 , -257.54
+1632.39 , -1596.89 , -246.80
+1632.39 , -1522.45 , -236.01
+1632.39 , -1448.02 , -225.18
+1632.39 , -1373.59 , -214.31
+1632.39 , -1299.15 , -203.40
+1632.39 , -1224.72 , -192.45
+1632.39 , -1150.28 , -181.46
+1632.39 , -1075.85 , -170.43
+1632.39 , -1001.42 , -159.36
+1632.39 , -926.98 , -148.25
+1632.39 , -852.55 , -137.09
+1632.39 , -778.12 , -125.90
+1632.39 , -703.68 , -114.67
+1632.39 , -629.25 , -103.39
+1632.39 , -554.82 , -92.07
+1632.39 , -480.38 , -80.72
+1632.39 , -405.95 , -69.32
+1632.39 , -331.51 , -57.88
+1632.39 , -257.08 , -46.40
+1632.39 , -182.65 , -34.88
+1632.39 , -108.21 , -23.32
+1632.39 , -33.78 , -11.72
+1632.39 , 40.65 , 0.16
+1632.39 , 110.69 , 12.28
+1632.39 , 180.72 , 24.45
+1632.39 , 250.76 , 36.65
+1632.39 , 320.79 , 48.90
+1632.39 , 390.83 , 61.19
+1632.39 , 460.86 , 73.52
+1632.39 , 530.90 , 85.89
+1632.39 , 600.93 , 98.30
+1632.39 , 670.97 , 110.75
+1632.39 , 741.00 , 123.25
+1632.39 , 811.04 , 135.78
+1632.39 , 881.07 , 148.36
+1632.39 , 951.11 , 160.98
+1632.39 , 1021.14 , 173.64
+1632.39 , 1091.17 , 186.35
+1632.39 , 1161.21 , 199.09
+1632.39 , 1231.24 , 211.87
+1632.39 , 1301.28 , 224.70
+1632.39 , 1371.31 , 237.56
+1632.39 , 1441.35 , 250.49
+1632.39 , 1511.38 , 263.44
+1632.39 , 1581.42 , 276.42
+1632.39 , 1651.45 , 289.45
+1632.39 , 1721.49 , 302.52
+1632.39 , 1791.52 , 315.65
+1632.39 , 1861.56 , 328.82
+1632.39 , 1931.59 , 342.02
+1632.39 , 2001.63 , 355.26
+1632.39 , 2071.66 , 368.53
+1632.39 , 2141.70 , 381.87
+1632.39 , 2211.73 , 395.24
+1632.39 , 2281.76 , 408.65
+1836.41 , -2332.28 , -400.63
+1836.41 , -2260.01 , -388.37
+1836.41 , -2187.49 , -376.11
+1836.41 , -2114.77 , -363.87
+1836.41 , -2040.34 , -351.88
+1836.41 , -1965.90 , -339.89
+1836.41 , -1891.47 , -327.83
+1836.41 , -1817.04 , -315.74
+1836.41 , -1742.60 , -303.61
+1836.41 , -1668.17 , -291.42
+1836.41 , -1593.74 , -279.22
+1836.41 , -1519.30 , -266.96
+1836.41 , -1444.87 , -254.66
+1836.41 , -1370.43 , -242.33
+1836.41 , -1296.00 , -229.95
+1836.41 , -1221.57 , -217.53
+1836.41 , -1147.13 , -205.07
+1836.41 , -1072.70 , -192.57
+1836.41 , -998.27 , -180.03
+1836.41 , -923.83 , -167.45
+1836.41 , -849.40 , -154.83
+1836.41 , -774.97 , -142.17
+1836.41 , -700.53 , -129.47
+1836.41 , -626.10 , -116.72
+1836.41 , -551.66 , -103.94
+1836.41 , -477.23 , -91.12
+1836.41 , -402.80 , -78.25
+1836.41 , -328.36 , -65.35
+1836.41 , -253.93 , -52.40
+1836.41 , -179.50 , -39.41
+1836.41 , -105.06 , -26.38
+1836.41 , -30.63 , -13.31
+1836.41 , 43.81 , 0.07
+1836.41 , 113.84 , 13.69
+1836.41 , 183.87 , 27.36
+1836.41 , 253.91 , 41.06
+1836.41 , 323.94 , 54.81
+1836.41 , 393.98 , 68.59
+1836.41 , 464.01 , 82.42
+1836.41 , 534.05 , 96.29
+1836.41 , 604.08 , 110.20
+1836.41 , 674.12 , 124.16
+1836.41 , 744.15 , 138.15
+1836.41 , 814.19 , 152.19
+1836.41 , 884.22 , 166.27
+1836.41 , 954.26 , 180.39
+1836.41 , 1024.29 , 194.55
+1836.41 , 1094.33 , 208.75
+1836.41 , 1164.36 , 223.00
+1836.41 , 1234.40 , 237.29
+1836.41 , 1304.43 , 251.62
+1836.41 , 1374.46 , 265.97
+1836.41 , 1444.50 , 280.40
+1836.41 , 1514.53 , 294.85
+1836.41 , 1584.57 , 309.32
+1836.41 , 1654.60 , 323.87
+1836.41 , 1724.64 , 338.44
+1836.41 , 1794.67 , 353.06
+1836.41 , 1864.71 , 367.72
+1836.41 , 1934.74 , 382.41
+1836.41 , 2004.78 , 397.15
+1836.41 , 2074.81 , 411.94
+1836.41 , 2144.85 , 426.78
+1836.41 , 2214.88 , 441.64
+1836.41 , 2284.92 , 456.55
+2040.43 , -2334.30 , -446.77
+2040.43 , -2260.49 , -433.33
+2040.43 , -2186.05 , -419.97
+2040.43 , -2111.62 , -406.56
+2040.43 , -2037.19 , -393.12
+2040.43 , -1962.75 , -379.64
+2040.43 , -1888.32 , -366.14
+2040.43 , -1813.89 , -352.58
+2040.43 , -1739.45 , -338.98
+2040.43 , -1665.02 , -325.33
+2040.43 , -1590.59 , -311.65
+2040.43 , -1516.15 , -297.93
+2040.43 , -1441.72 , -284.15
+2040.43 , -1367.28 , -270.36
+2040.43 , -1292.85 , -256.51
+2040.43 , -1218.42 , -242.63
+2040.43 , -1143.98 , -228.70
+2040.43 , -1069.55 , -214.74
+2040.43 , -995.12 , -200.73
+2040.43 , -920.68 , -186.68
+2040.43 , -846.25 , -172.59
+2040.43 , -771.81 , -158.46
+2040.43 , -697.38 , -144.29
+2040.43 , -622.95 , -130.08
+2040.43 , -548.51 , -115.83
+2040.43 , -474.08 , -101.54
+2040.43 , -399.65 , -87.20
+2040.43 , -325.21 , -72.83
+2040.43 , -250.78 , -58.42
+2040.43 , -176.34 , -43.96
+2040.43 , -101.91 , -29.47
+2040.43 , -27.48 , -14.93
+2040.43 , 46.96 , -0.04
+2040.43 , 116.99 , 15.08
+2040.43 , 187.03 , 30.24
+2040.43 , 257.06 , 45.45
+2040.43 , 327.10 , 60.69
+2040.43 , 397.13 , 75.98
+2040.43 , 467.16 , 91.31
+2040.43 , 537.20 , 106.68
+2040.43 , 607.23 , 122.09
+2040.43 , 677.27 , 137.54
+2040.43 , 747.30 , 153.04
+2040.43 , 817.34 , 168.58
+2040.43 , 887.37 , 184.15
+2040.43 , 957.41 , 199.77
+2040.43 , 1027.44 , 215.43
+2040.43 , 1097.48 , 231.15
+2040.43 , 1167.51 , 246.87
+2040.43 , 1237.55 , 262.67
+2040.43 , 1307.58 , 278.50
+2040.43 , 1377.62 , 294.37
+2040.43 , 1447.65 , 310.27
+2040.43 , 1517.68 , 326.21
+2040.43 , 1587.72 , 342.20
+2040.43 , 1657.75 , 358.25
+2040.43 , 1727.79 , 374.34
+2040.43 , 1797.82 , 390.45
+2040.43 , 1867.86 , 406.59
+2040.43 , 1937.89 , 422.80
+2040.43 , 2007.93 , 439.03
+2040.43 , 2077.96 , 455.32
+2040.43 , 2148.00 , 471.65
+2040.43 , 2218.03 , 488.01
+2040.43 , 2288.07 , 504.43
+2244.53 , -2331.75 , -493.78
+2244.53 , -2257.34 , -479.00
+2244.53 , -2182.90 , -464.17
+2244.53 , -2108.47 , -449.31
+2244.53 , -2034.04 , -434.41
+2244.53 , -1959.60 , -419.46
+2244.53 , -1885.17 , -404.46
+2244.53 , -1810.73 , -389.43
+2244.53 , -1736.30 , -374.36
+2244.53 , -1661.87 , -359.26
+2244.53 , -1587.43 , -344.12
+2244.53 , -1513.00 , -328.93
+2244.53 , -1438.57 , -313.68
+2244.53 , -1364.13 , -298.42
+2244.53 , -1289.70 , -283.10
+2244.53 , -1215.26 , -267.77
+2244.53 , -1140.83 , -252.35
+2244.53 , -1066.40 , -236.93
+2244.53 , -991.96 , -221.45
+2244.53 , -917.53 , -205.93
+2244.53 , -843.10 , -190.38
+2244.53 , -768.66 , -174.78
+2244.53 , -694.23 , -159.14
+2244.53 , -619.79 , -143.47
+2244.53 , -545.36 , -127.75
+2244.53 , -470.93 , -111.99
+2244.53 , -396.49 , -96.19
+2244.53 , -322.06 , -80.34
+2244.53 , -247.63 , -64.46
+2244.53 , -173.19 , -48.54
+2244.53 , -98.76 , -32.58
+2244.53 , -24.33 , -16.57
+2244.53 , 50.11 , -0.18
+2244.53 , 120.14 , 16.44
+2244.53 , 190.18 , 33.11
+2244.53 , 260.21 , 49.81
+2244.53 , 330.25 , 66.56
+2244.53 , 400.28 , 83.34
+2244.53 , 470.32 , 100.17
+2244.53 , 540.35 , 117.04
+2244.53 , 610.39 , 133.95
+2244.53 , 680.42 , 150.91
+2244.53 , 750.46 , 167.90
+2244.53 , 820.49 , 184.94
+2244.53 , 890.52 , 202.02
+2244.53 , 960.56 , 219.13
+2244.53 , 1030.59 , 236.30
+2244.53 , 1100.63 , 253.50
+2244.53 , 1170.66 , 270.75
+2244.53 , 1240.70 , 288.02
+2244.53 , 1310.73 , 305.36
+2244.53 , 1380.77 , 322.73
+2244.53 , 1450.80 , 340.12
+2244.53 , 1520.84 , 357.58
+2244.53 , 1590.87 , 375.07
+2244.53 , 1660.91 , 392.61
+2244.53 , 1730.94 , 410.20
+2244.53 , 1800.98 , 427.80
+2244.53 , 1871.01 , 445.46
+2244.53 , 1941.04 , 463.17
+2244.53 , 2011.08 , 480.90
+2244.53 , 2081.11 , 498.68
+2244.53 , 2151.15 , 516.50
+2244.53 , 2221.18 , 534.38
+2244.53 , 2291.22 , 552.28
+2448.55 , -2328.62 , -540.95
+2448.55 , -2254.19 , -524.70
+2448.55 , -2179.75 , -508.40
+2448.55 , -2105.32 , -492.08
+2448.55 , -2030.88 , -475.68
+2448.55 , -1956.45 , -459.29
+2448.55 , -1882.02 , -442.82
+2448.55 , -1807.58 , -426.32
+2448.55 , -1733.15 , -409.78
+2448.55 , -1658.72 , -393.22
+2448.55 , -1584.28 , -376.60
+2448.55 , -1509.85 , -359.94
+2448.55 , -1435.41 , -343.25
+2448.55 , -1360.98 , -326.49
+2448.55 , -1286.55 , -309.73
+2448.55 , -1212.11 , -292.90
+2448.55 , -1137.68 , -276.05
+2448.55 , -1063.25 , -259.14
+2448.55 , -988.81 , -242.20
+2448.55 , -914.38 , -225.21
+2448.55 , -839.95 , -208.19
+2448.55 , -765.51 , -191.12
+2448.55 , -691.08 , -174.02
+2448.55 , -616.64 , -156.87
+2448.55 , -542.21 , -139.68
+2448.55 , -467.78 , -122.46
+2448.55 , -393.34 , -105.19
+2448.55 , -318.91 , -87.88
+2448.55 , -244.48 , -70.53
+2448.55 , -170.04 , -53.14
+2448.55 , -95.61 , -35.71
+2448.55 , -21.17 , -18.24
+2448.55 , 53.26 , -0.33
+2448.55 , 123.29 , 17.79
+2448.55 , 193.33 , 35.95
+2448.55 , 263.36 , 54.15
+2448.55 , 333.40 , 72.40
+2448.55 , 403.43 , 90.69
+2448.55 , 473.47 , 109.01
+2448.55 , 543.50 , 127.38
+2448.55 , 613.54 , 145.80
+2448.55 , 683.57 , 164.25
+2448.55 , 753.61 , 182.74
+2448.55 , 823.64 , 201.28
+2448.55 , 893.68 , 219.85
+2448.55 , 963.71 , 238.48
+2448.55 , 1033.74 , 257.12
+2448.55 , 1103.78 , 275.84
+2448.55 , 1173.81 , 294.58
+2448.55 , 1243.85 , 313.37
+2448.55 , 1313.88 , 332.19
+2448.55 , 1383.92 , 351.05
+2448.55 , 1453.95 , 369.96
+2448.55 , 1523.99 , 388.92
+2448.55 , 1594.02 , 407.91
+2448.55 , 1664.06 , 426.94
+2448.55 , 1734.09 , 446.02
+2448.55 , 1804.13 , 465.15
+2448.55 , 1874.16 , 484.30
+2448.55 , 1944.20 , 503.50
+2448.55 , 2014.23 , 522.73
+2448.55 , 2084.27 , 542.03
+2448.55 , 2154.30 , 561.35
+2448.55 , 2224.33 , 580.72
+2448.55 , 2294.37 , 600.11
+2652.56 , -2325.47 , -588.14
+2652.56 , -2251.03 , -570.42
+2652.56 , -2176.60 , -552.65
+2652.56 , -2102.17 , -534.86
+2652.56 , -2027.73 , -517.02
+2652.56 , -1953.30 , -499.13
+2652.56 , -1878.87 , -481.22
+2652.56 , -1804.43 , -463.25
+2652.56 , -1730.00 , -445.24
+2652.56 , -1655.57 , -427.21
+2652.56 , -1581.13 , -409.12
+2652.56 , -1506.70 , -390.99
+2652.56 , -1432.26 , -372.81
+2652.56 , -1357.83 , -354.61
+2652.56 , -1283.40 , -336.35
+2652.56 , -1208.96 , -318.08
+2652.56 , -1134.53 , -299.75
+2652.56 , -1060.10 , -281.38
+2652.56 , -985.66 , -262.96
+2652.56 , -911.23 , -244.52
+2652.56 , -836.79 , -226.02
+2652.56 , -762.36 , -207.49
+2652.56 , -687.93 , -188.92
+2652.56 , -613.49 , -170.31
+2652.56 , -539.06 , -151.65
+2652.56 , -464.63 , -132.96
+2652.56 , -390.19 , -114.22
+2652.56 , -315.76 , -95.44
+2652.56 , -241.32 , -76.62
+2652.56 , -166.89 , -57.77
+2652.56 , -92.46 , -38.87
+2652.56 , -18.02 , -19.93
+2652.56 , 56.41 , -0.51
+2652.56 , 126.44 , 19.11
+2652.56 , 196.48 , 38.77
+2652.56 , 266.51 , 58.47
+2652.56 , 336.55 , 78.22
+2652.56 , 406.58 , 98.00
+2652.56 , 476.62 , 117.83
+2652.56 , 546.65 , 137.70
+2652.56 , 616.69 , 157.61
+2652.56 , 686.72 , 177.57
+2652.56 , 756.76 , 197.56
+2652.56 , 826.79 , 217.60
+2652.56 , 896.83 , 237.68
+2652.56 , 966.86 , 257.79
+2652.56 , 1036.90 , 277.96
+2652.56 , 1106.93 , 298.15
+2652.56 , 1176.97 , 318.41
+2652.56 , 1247.00 , 338.69
+2652.56 , 1317.03 , 359.00
+2652.56 , 1387.07 , 379.38
+2652.56 , 1457.10 , 399.79
+2652.56 , 1527.14 , 420.24
+2652.56 , 1597.17 , 440.72
+2652.56 , 1667.21 , 461.25
+2652.56 , 1737.24 , 481.83
+2652.56 , 1807.28 , 502.45
+2652.56 , 1877.31 , 523.12
+2652.56 , 1947.35 , 543.82
+2652.56 , 2017.38 , 564.54
+2652.56 , 2087.42 , 585.33
+2652.56 , 2157.45 , 606.15
+2652.56 , 2227.49 , 627.02
+2652.56 , 2297.52 , 647.93
+2856.67 , -2322.32 , -635.35
+2856.67 , -2247.88 , -616.16
+2856.67 , -2173.45 , -596.94
+2856.67 , -2099.02 , -577.66
+2856.67 , -2024.58 , -558.35
+2856.67 , -1950.15 , -539.01
+2856.67 , -1875.71 , -519.63
+2856.67 , -1801.28 , -500.20
+2856.67 , -1726.85 , -480.72
+2856.67 , -1652.41 , -461.21
+2856.67 , -1577.98 , -441.66
+2856.67 , -1503.55 , -422.06
+2856.67 , -1429.11 , -402.43
+2856.67 , -1354.68 , -382.73
+2856.67 , -1280.24 , -363.04
+2856.67 , -1205.81 , -343.27
+2856.67 , -1131.38 , -323.47
+2856.67 , -1056.94 , -303.63
+2856.67 , -982.51 , -283.76
+2856.67 , -908.08 , -263.85
+2856.67 , -833.64 , -243.88
+2856.67 , -759.21 , -223.88
+2856.67 , -684.77 , -203.84
+2856.67 , -610.34 , -183.76
+2856.67 , -535.91 , -163.64
+2856.67 , -461.47 , -143.48
+2856.67 , -387.04 , -123.27
+2856.67 , -312.61 , -103.03
+2856.67 , -238.17 , -82.74
+2856.67 , -163.74 , -62.42
+2856.67 , -89.31 , -42.05
+2856.67 , -14.87 , -21.64
+2856.67 , 59.56 , -0.72
+2856.67 , 129.60 , 20.40
+2856.67 , 199.63 , 41.57
+2856.67 , 269.67 , 62.77
+2856.67 , 339.70 , 84.01
+2856.67 , 409.74 , 105.30
+2856.67 , 479.77 , 126.63
+2856.67 , 549.81 , 148.00
+2856.67 , 619.84 , 169.41
+2856.67 , 689.87 , 190.86
+2856.67 , 759.91 , 212.36
+2856.67 , 829.94 , 233.89
+2856.67 , 899.98 , 255.48
+2856.67 , 970.01 , 277.09
+2856.67 , 1040.05 , 298.75
+2856.67 , 1110.08 , 320.46
+2856.67 , 1180.12 , 342.19
+2856.67 , 1250.15 , 363.97
+2856.67 , 1320.19 , 385.80
+2856.67 , 1390.22 , 407.68
+2856.67 , 1460.26 , 429.58
+2856.67 , 1530.29 , 451.53
+2856.67 , 1600.33 , 473.53
+2856.67 , 1670.36 , 495.55
+2856.67 , 1740.39 , 517.62
+2856.67 , 1810.43 , 539.74
+2856.67 , 1880.46 , 561.91
+2856.67 , 1950.50 , 584.10
+2856.67 , 2020.53 , 606.34
+2856.67 , 2090.57 , 628.63
+2856.67 , 2160.60 , 650.94
+2856.67 , 2230.64 , 673.33
+2856.67 , 2300.67 , 695.71
+3060.68 , -2319.17 , -682.59
+3060.68 , -2244.73 , -661.93
+3060.68 , -2170.30 , -641.24
+3060.68 , -2095.86 , -620.49
+3060.68 , -2021.43 , -599.73
+3060.68 , -1947.00 , -578.90
+3060.68 , -1872.56 , -558.05
+3060.68 , -1798.13 , -537.15
+3060.68 , -1723.70 , -516.20
+3060.68 , -1649.26 , -495.23
+3060.68 , -1574.83 , -474.21
+3060.68 , -1500.39 , -453.14
+3060.68 , -1425.96 , -432.04
+3060.68 , -1351.53 , -410.90
+3060.68 , -1277.09 , -389.73
+3060.68 , -1202.66 , -368.49
+3060.68 , -1128.23 , -347.23
+3060.68 , -1053.79 , -325.92
+3060.68 , -979.36 , -304.58
+3060.68 , -904.93 , -283.20
+3060.68 , -830.49 , -261.76
+3060.68 , -756.06 , -240.30
+3060.68 , -681.62 , -218.79
+3060.68 , -607.19 , -197.24
+3060.68 , -532.76 , -175.65
+3060.68 , -458.32 , -154.02
+3060.68 , -383.89 , -132.35
+3060.68 , -309.46 , -110.64
+3060.68 , -235.02 , -88.89
+3060.68 , -160.59 , -67.09
+3060.68 , -86.15 , -45.26
+3060.68 , -11.72 , -23.38
+3060.68 , 62.71 , -0.94
+3060.68 , 132.75 , 21.68
+3060.68 , 202.78 , 44.34
+3060.68 , 272.82 , 67.04
+3060.68 , 342.85 , 89.79
+3060.68 , 412.89 , 112.58
+3060.68 , 482.92 , 135.40
+3060.68 , 552.96 , 158.27
+3060.68 , 622.99 , 181.18
+3060.68 , 693.03 , 204.13
+3060.68 , 763.06 , 227.13
+3060.68 , 833.09 , 250.16
+3060.68 , 903.13 , 273.25
+3060.68 , 973.16 , 296.35
+3060.68 , 1043.20 , 319.53
+3060.68 , 1113.23 , 342.71
+3060.68 , 1183.27 , 365.96
+3060.68 , 1253.30 , 389.24
+3060.68 , 1323.34 , 412.56
+3060.68 , 1393.37 , 435.93
+3060.68 , 1463.41 , 459.36
+3060.68 , 1533.44 , 482.80
+3060.68 , 1603.48 , 506.29
+3060.68 , 1673.51 , 529.84
+3060.68 , 1743.55 , 553.40
+3060.68 , 1813.58 , 577.02
+3060.68 , 1883.61 , 600.68
+3060.68 , 1953.65 , 624.37
+3060.68 , 2023.68 , 648.10
+3060.68 , 2093.72 , 671.89
+3060.68 , 2163.75 , 695.72
+3060.68 , 2233.79 , 719.58
+3060.68 , 2303.82 , 743.48
+3264.70 , -2316.01 , -729.84
+3264.70 , -2241.58 , -707.71
+3264.70 , -2167.15 , -685.56
+3264.70 , -2092.71 , -663.36
+3264.70 , -2018.28 , -641.11
+3264.70 , -1943.85 , -618.84
+3264.70 , -1869.41 , -596.49
+3264.70 , -1794.98 , -574.15
+3264.70 , -1720.55 , -551.73
+3264.70 , -1646.11 , -529.28
+3264.70 , -1571.68 , -506.79
+3264.70 , -1497.24 , -484.28
+3264.70 , -1422.81 , -461.69
+3264.70 , -1348.38 , -439.08
+3264.70 , -1273.94 , -416.44
+3264.70 , -1199.51 , -393.73
+3264.70 , -1125.08 , -371.00
+3264.70 , -1050.64 , -348.24
+3264.70 , -976.21 , -325.44
+3264.70 , -901.77 , -302.58
+3264.70 , -827.34 , -279.68
+3264.70 , -752.91 , -256.74
+3264.70 , -678.47 , -233.76
+3264.70 , -604.04 , -210.75
+3264.70 , -529.61 , -187.69
+3264.70 , -455.17 , -164.59
+3264.70 , -380.74 , -141.45
+3264.70 , -306.30 , -118.27
+3264.70 , -231.87 , -95.05
+3264.70 , -157.44 , -71.79
+3264.70 , -83.00 , -48.49
+3264.70 , -8.57 , -25.15
+3264.70 , 65.86 , -1.19
+3264.70 , 135.90 , 22.93
+3264.70 , 205.93 , 47.09
+3264.70 , 275.97 , 71.30
+3264.70 , 346.00 , 95.54
+3264.70 , 416.04 , 119.83
+3264.70 , 486.07 , 144.16
+3264.70 , 556.11 , 168.52
+3264.70 , 626.14 , 192.94
+3264.70 , 696.18 , 217.39
+3264.70 , 766.21 , 241.89
+3264.70 , 836.25 , 266.42
+3264.70 , 906.28 , 291.00
+3264.70 , 976.31 , 315.60
+3264.70 , 1046.35 , 340.27
+3264.70 , 1116.38 , 364.97
+3264.70 , 1186.42 , 389.72
+3264.70 , 1256.45 , 414.49
+3264.70 , 1326.49 , 439.33
+3264.70 , 1396.52 , 464.20
+3264.70 , 1466.56 , 489.09
+3264.70 , 1536.59 , 514.06
+3264.70 , 1606.63 , 539.05
+3264.70 , 1676.66 , 564.09
+3264.70 , 1746.70 , 589.15
+3264.70 , 1816.73 , 614.26
+3264.70 , 1886.77 , 639.42
+3264.70 , 1956.80 , 664.62
+3264.70 , 2026.84 , 689.85
+3264.70 , 2096.87 , 715.16
+3264.70 , 2166.90 , 740.46
+3264.70 , 2236.94 , 765.84
+3264.70 , 2306.97 , 791.24
+3468.80 , -2312.86 , -777.13
+3468.80 , -2238.43 , -753.54
+3468.80 , -2164.00 , -729.91
+3468.80 , -2089.56 , -706.24
+3468.80 , -2015.13 , -682.53
+3468.80 , -1940.69 , -658.78
+3468.80 , -1866.26 , -634.99
+3468.80 , -1791.83 , -611.15
+3468.80 , -1717.39 , -587.27
+3468.80 , -1642.96 , -563.35
+3468.80 , -1568.53 , -539.39
+3468.80 , -1494.09 , -515.41
+3468.80 , -1419.66 , -491.38
+3468.80 , -1345.22 , -467.30
+3468.80 , -1270.79 , -443.17
+3468.80 , -1196.36 , -419.01
+3468.80 , -1121.92 , -394.81
+3468.80 , -1047.49 , -370.58
+3468.80 , -973.06 , -346.28
+3468.80 , -898.62 , -321.96
+3468.80 , -824.19 , -297.61
+3468.80 , -749.75 , -273.22
+3468.80 , -675.32 , -248.76
+3468.80 , -600.89 , -224.28
+3468.80 , -526.45 , -199.75
+3468.80 , -452.02 , -175.19
+3468.80 , -377.59 , -150.58
+3468.80 , -303.15 , -125.93
+3468.80 , -228.72 , -101.24
+3468.80 , -154.28 , -76.52
+3468.80 , -79.85 , -51.75
+3468.80 , -5.42 , -26.94
+3468.80 , 69.02 , -1.46
+3468.80 , 139.05 , 24.16
+3468.80 , 209.09 , 49.82
+3468.80 , 279.12 , 75.53
+3468.80 , 349.15 , 101.27
+3468.80 , 419.19 , 127.06
+3468.80 , 489.22 , 152.88
+3468.80 , 559.26 , 178.75
+3468.80 , 629.29 , 204.67
+3468.80 , 699.33 , 230.61
+3468.80 , 769.36 , 256.61
+3468.80 , 839.40 , 282.64
+3468.80 , 909.43 , 308.71
+3468.80 , 979.47 , 334.83
+3468.80 , 1049.50 , 361.00
+3468.80 , 1119.54 , 387.20
+3468.80 , 1189.57 , 413.44
+3468.80 , 1259.61 , 439.73
+3468.80 , 1329.64 , 466.04
+3468.80 , 1399.68 , 492.41
+3468.80 , 1469.71 , 518.82
+3468.80 , 1539.74 , 545.28
+3468.80 , 1609.78 , 571.76
+3468.80 , 1679.81 , 598.30
+3468.80 , 1749.85 , 624.88
+3468.80 , 1819.88 , 651.48
+3468.80 , 1889.92 , 678.16
+3468.80 , 1959.95 , 704.84
+3468.80 , 2029.99 , 731.59
+3468.80 , 2100.02 , 758.36
+3468.80 , 2170.06 , 785.18
+3468.80 , 2240.09 , 812.06
+3468.80 , 2310.13 , 838.98
+3672.82 , -2309.71 , -824.44
+3672.82 , -2235.28 , -799.40
+3672.82 , -2160.84 , -774.28
+3672.82 , -2086.41 , -749.14
+3672.82 , -2011.98 , -723.98
+3672.82 , -1937.54 , -698.74
+3672.82 , -1863.11 , -673.48
+3672.82 , -1788.68 , -648.20
+3672.82 , -1714.24 , -622.84
+3672.82 , -1639.81 , -597.46
+3672.82 , -1565.37 , -572.03
+3672.82 , -1490.94 , -546.58
+3672.82 , -1416.51 , -521.08
+3672.82 , -1342.07 , -495.53
+3672.82 , -1267.64 , -469.95
+3672.82 , -1193.21 , -444.30
+3672.82 , -1118.77 , -418.66
+3672.82 , -1044.34 , -392.94
+3672.82 , -969.90 , -367.19
+3672.82 , -895.47 , -341.40
+3672.82 , -821.04 , -315.56
+3672.82 , -746.60 , -289.69
+3672.82 , -672.17 , -263.79
+3672.82 , -597.74 , -237.83
+3672.82 , -523.30 , -211.84
+3672.82 , -448.87 , -185.81
+3672.82 , -374.44 , -159.73
+3672.82 , -300.00 , -133.62
+3672.82 , -225.57 , -107.46
+3672.82 , -151.13 , -81.26
+3672.82 , -76.70 , -55.03
+3672.82 , -2.27 , -28.75
+3672.82 , 72.17 , -1.75
+3672.82 , 142.20 , 25.37
+3672.82 , 212.24 , 52.53
+3672.82 , 282.27 , 79.74
+3672.82 , 352.31 , 106.98
+3672.82 , 422.34 , 134.27
+3672.82 , 492.38 , 161.59
+3672.82 , 562.41 , 188.96
+3672.82 , 632.44 , 216.38
+3672.82 , 702.48 , 243.83
+3672.82 , 772.51 , 271.33
+3672.82 , 842.55 , 298.84
+3672.82 , 912.58 , 326.44
+3672.82 , 982.62 , 354.05
+3672.82 , 1052.65 , 381.69
+3672.82 , 1122.69 , 409.41
+3672.82 , 1192.72 , 437.14
+3672.82 , 1262.76 , 464.93
+3672.82 , 1332.79 , 492.76
+3672.82 , 1402.83 , 520.62
+3672.82 , 1472.86 , 548.53
+3672.82 , 1542.90 , 576.49
+3672.82 , 1612.93 , 604.46
+3672.82 , 1682.96 , 632.52
+3672.82 , 1753.00 , 660.57
+3672.82 , 1823.03 , 688.69
+3672.82 , 1893.07 , 716.84
+3672.82 , 1963.10 , 745.04
+3672.82 , 2033.14 , 773.29
+3672.82 , 2103.17 , 801.58
+3672.82 , 2173.21 , 829.90
+3672.82 , 2243.24 , 858.26
+3672.82 , 2313.28 , 886.68
+3876.84 , -2306.56 , -871.78
+3876.84 , -2232.13 , -845.25
+3876.84 , -2157.69 , -818.69
+3876.84 , -2083.26 , -792.08
+3876.84 , -2008.83 , -765.45
+3876.84 , -1934.39 , -738.74
+3876.84 , -1859.96 , -712.01
+3876.84 , -1785.52 , -685.26
+3876.84 , -1711.09 , -658.43
+3876.84 , -1636.66 , -631.58
+3876.84 , -1562.22 , -604.71
+3876.84 , -1487.79 , -577.76
+3876.84 , -1413.36 , -550.79
+3876.84 , -1338.92 , -523.77
+3876.84 , -1264.49 , -496.72
+3876.84 , -1190.06 , -469.63
+3876.84 , -1115.62 , -442.49
+3876.84 , -1041.19 , -415.33
+3876.84 , -966.75 , -388.11
+3876.84 , -892.32 , -360.85
+3876.84 , -817.89 , -333.54
+3876.84 , -743.45 , -306.21
+3876.84 , -669.02 , -278.83
+3876.84 , -594.59 , -251.41
+3876.84 , -520.15 , -223.95
+3876.84 , -445.72 , -196.45
+3876.84 , -371.28 , -168.91
+3876.84 , -296.85 , -141.32
+3876.84 , -222.42 , -113.70
+3876.84 , -147.98 , -86.04
+3876.84 , -73.55 , -58.33
+3876.84 , 0.88 , -30.59
+3876.84 , 75.32 , -2.06
+3876.84 , 145.35 , 26.56
+3876.84 , 215.39 , 55.22
+3876.84 , 285.42 , 83.92
+3876.84 , 355.46 , 112.67
+3876.84 , 425.49 , 141.45
+3876.84 , 495.53 , 170.28
+3876.84 , 565.56 , 199.15
+3876.84 , 635.60 , 228.06
+3876.84 , 705.63 , 257.01
+3876.84 , 775.66 , 286.00
+3876.84 , 845.70 , 315.04
+3876.84 , 915.73 , 344.10
+3876.84 , 985.77 , 373.24
+3876.84 , 1055.80 , 402.40
+3876.84 , 1125.84 , 431.58
+3876.84 , 1195.87 , 460.84
+3876.84 , 1265.91 , 490.12
+3876.84 , 1335.94 , 519.45
+3876.84 , 1405.98 , 548.80
+3876.84 , 1476.01 , 578.20
+3876.84 , 1546.05 , 607.65
+3876.84 , 1616.08 , 637.15
+3876.84 , 1686.12 , 666.68
+3876.84 , 1756.15 , 696.27
+3876.84 , 1826.18 , 725.87
+3876.84 , 1896.22 , 755.54
+3876.84 , 1966.25 , 785.23
+3876.84 , 2036.29 , 814.97
+3876.84 , 2106.32 , 844.76
+3876.84 , 2176.36 , 874.57
+3876.84 , 2246.39 , 904.43
+3876.84 , 2316.43 , 934.34
+4080.85 , -2303.41 , -919.14
+4080.85 , -2228.98 , -891.16
+4080.85 , -2154.54 , -863.10
+4080.85 , -2080.11 , -835.03
+4080.85 , -2005.68 , -806.93
+4080.85 , -1931.24 , -778.78
+4080.85 , -1856.81 , -750.58
+4080.85 , -1782.37 , -722.33
+4080.85 , -1707.94 , -694.06
+4080.85 , -1633.51 , -665.74
+4080.85 , -1559.07 , -637.37
+4080.85 , -1484.64 , -608.98
+4080.85 , -1410.21 , -580.54
+4080.85 , -1335.77 , -552.05
+4080.85 , -1261.34 , -523.54
+4080.85 , -1186.90 , -494.98
+4080.85 , -1112.47 , -466.37
+4080.85 , -1038.04 , -437.73
+4080.85 , -963.60 , -409.05
+4080.85 , -889.17 , -380.32
+4080.85 , -814.74 , -351.56
+4080.85 , -740.30 , -322.76
+4080.85 , -665.87 , -293.91
+4080.85 , -591.43 , -265.01
+4080.85 , -517.00 , -236.09
+4080.85 , -442.57 , -207.12
+4080.85 , -368.13 , -178.11
+4080.85 , -293.70 , -149.06
+4080.85 , -219.27 , -119.97
+4080.85 , -144.83 , -90.83
+4080.85 , -70.40 , -61.66
+4080.85 , 4.04 , -32.44
+4080.85 , 78.47 , -2.40
+4080.85 , 148.50 , 27.72
+4080.85 , 218.54 , 57.88
+4080.85 , 288.57 , 88.09
+4080.85 , 358.61 , 118.33
+4080.85 , 428.64 , 148.61
+4080.85 , 498.68 , 178.94
+4080.85 , 568.71 , 209.32
+4080.85 , 638.75 , 239.71
+4080.85 , 708.78 , 270.17
+4080.85 , 778.82 , 300.66
+4080.85 , 848.85 , 331.19
+4080.85 , 918.88 , 361.77
+4080.85 , 988.92 , 392.38
+4080.85 , 1058.95 , 423.06
+4080.85 , 1128.99 , 453.74
+4080.85 , 1199.02 , 484.49
+4080.85 , 1269.06 , 515.27
+4080.85 , 1339.09 , 546.09
+4080.85 , 1409.13 , 576.97
+4080.85 , 1479.16 , 607.86
+4080.85 , 1549.20 , 638.83
+4080.85 , 1619.23 , 669.80
+4080.85 , 1689.27 , 700.85
+4080.85 , 1759.30 , 731.91
+4080.85 , 1829.34 , 763.03
+4080.85 , 1899.37 , 794.19
+4080.85 , 1969.41 , 825.40
+4080.85 , 2039.44 , 856.64
+4080.85 , 2109.47 , 887.92
+4080.85 , 2179.51 , 919.23
+4080.85 , 2249.54 , 950.59
+4080.85 , 2319.58 , 982.00
+4268.63 , -2300.51 , -962.73
+4268.63 , -2226.08 , -933.40
+4268.63 , -2151.64 , -904.00
+4268.63 , -2077.21 , -874.59
+4268.63 , -2002.78 , -845.12
+4268.63 , -1928.34 , -815.62
+4268.63 , -1853.91 , -786.07
+4268.63 , -1779.47 , -756.47
+4268.63 , -1705.04 , -726.85
+4268.63 , -1630.61 , -697.18
+4268.63 , -1556.17 , -667.48
+4268.63 , -1481.74 , -637.72
+4268.63 , -1407.31 , -607.92
+4268.63 , -1332.87 , -578.11
+4268.63 , -1258.44 , -548.22
+4268.63 , -1184.00 , -518.31
+4268.63 , -1109.57 , -488.37
+4268.63 , -1035.14 , -458.36
+4268.63 , -960.70 , -428.33
+4268.63 , -886.27 , -398.25
+4268.63 , -811.84 , -368.14
+4268.63 , -737.40 , -337.99
+4268.63 , -662.97 , -307.79
+4268.63 , -588.53 , -277.56
+4268.63 , -514.10 , -247.27
+4268.63 , -439.67 , -216.96
+4268.63 , -365.23 , -186.60
+4268.63 , -290.80 , -156.19
+4268.63 , -216.37 , -125.75
+4268.63 , -141.93 , -95.27
+4268.63 , -67.50 , -64.75
+4268.63 , 6.94 , -34.15
+4268.63 , 81.37 , -2.73
+4268.63 , 151.40 , 28.77
+4268.63 , 221.44 , 60.31
+4268.63 , 291.47 , 91.89
+4268.63 , 361.51 , 123.52
+4268.63 , 431.54 , 155.18
+4268.63 , 501.58 , 186.89
+4268.63 , 571.61 , 218.63
+4268.63 , 641.65 , 250.42
+4268.63 , 711.68 , 282.26
+4268.63 , 781.72 , 314.12
+4268.63 , 851.75 , 346.04
+4268.63 , 921.78 , 377.99
+4268.63 , 991.82 , 410.00
+4268.63 , 1061.85 , 442.03
+4268.63 , 1131.89 , 474.11
+4268.63 , 1201.92 , 506.24
+4268.63 , 1271.96 , 538.40
+4268.63 , 1341.99 , 570.60
+4268.63 , 1412.03 , 602.85
+4268.63 , 1482.06 , 635.15
+4268.63 , 1552.10 , 667.47
+4268.63 , 1622.13 , 699.84
+4268.63 , 1692.17 , 732.26
+4268.63 , 1762.20 , 764.70
+4268.63 , 1832.24 , 797.19
+4268.63 , 1902.27 , 829.73
+4268.63 , 1972.31 , 862.32
+4268.63 , 2042.34 , 894.93
+4268.63 , 2112.37 , 927.60
+4268.63 , 2182.41 , 960.31
+4268.63 , 2252.44 , 993.04
+4268.63 , 2322.48 , 1025.82
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G5.vemo b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G5.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..d20d4a5bd74aae53a41fa7b6127b1449b2082507
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G5.vemo
@@ -0,0 +1,2016 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00 , -2281.64 , 23.82
+0.00 , -2210.78 , 22.44
+0.00 , -2139.93 , 21.09
+0.00 , -2069.07 , 19.79
+0.00 , -1998.21 , 18.53
+0.00 , -1927.35 , 17.31
+0.00 , -1856.50 , 16.13
+0.00 , -1785.64 , 14.99
+0.00 , -1714.78 , 13.89
+0.00 , -1643.92 , 12.84
+0.00 , -1573.07 , 11.83
+0.00 , -1502.21 , 10.85
+0.00 , -1431.35 , 9.92
+0.00 , -1360.50 , 9.04
+0.00 , -1289.64 , 8.19
+0.00 , -1218.78 , 7.38
+0.00 , -1147.92 , 6.62
+0.00 , -1077.07 , 5.90
+0.00 , -1006.21 , 5.21
+0.00 , -935.35 , 4.57
+0.00 , -864.50 , 3.98
+0.00 , -793.64 , 3.42
+0.00 , -721.12 , 2.90
+0.00 , -647.87 , 2.43
+0.00 , -574.61 , 2.00
+0.00 , -501.01 , 1.61
+0.00 , -427.40 , 1.26
+0.00 , -353.80 , 0.95
+0.00 , -280.20 , 0.69
+0.00 , -206.60 , 0.46
+0.00 , -133.00 , 0.28
+0.00 , -59.39 , 0.14
+0.00 , 14.21 , 0.09
+0.00 , 84.90 , 0.21
+0.00 , 155.58 , 0.38
+0.00 , 226.27 , 0.58
+0.00 , 296.96 , 0.83
+0.00 , 367.65 , 1.12
+0.00 , 438.33 , 1.45
+0.00 , 509.02 , 1.82
+0.00 , 579.71 , 2.23
+0.00 , 650.39 , 2.69
+0.00 , 721.08 , 3.19
+0.00 , 791.77 , 3.72
+0.00 , 862.46 , 4.30
+0.00 , 933.14 , 4.93
+0.00 , 1003.83 , 5.59
+0.00 , 1074.52 , 6.29
+0.00 , 1145.21 , 7.04
+0.00 , 1215.89 , 7.83
+0.00 , 1286.58 , 8.65
+0.00 , 1357.27 , 9.52
+0.00 , 1427.95 , 10.44
+0.00 , 1498.64 , 11.39
+0.00 , 1569.33 , 12.38
+0.00 , 1640.02 , 13.42
+0.00 , 1710.70 , 14.50
+0.00 , 1781.39 , 15.62
+0.00 , 1852.08 , 16.78
+0.00 , 1922.77 , 17.98
+0.00 , 1993.45 , 19.22
+0.00 , 2064.14 , 20.51
+0.00 , 2134.83 , 21.84
+0.00 , 2205.52 , 23.20
+0.00 , 2276.20 , 24.61
+40.81 , -2282.22 , 14.00
+40.81 , -2211.36 , 12.93
+40.81 , -2140.51 , 11.89
+40.81 , -2069.65 , 10.90
+40.81 , -1998.79 , 9.95
+40.81 , -1927.93 , 9.04
+40.81 , -1857.08 , 8.17
+40.81 , -1786.22 , 7.35
+40.81 , -1715.36 , 6.56
+40.81 , -1644.50 , 5.82
+40.81 , -1573.65 , 5.12
+40.81 , -1502.79 , 4.46
+40.81 , -1431.93 , 3.84
+40.81 , -1361.08 , 3.26
+40.81 , -1290.22 , 2.73
+40.81 , -1219.36 , 2.23
+40.81 , -1148.50 , 1.78
+40.81 , -1077.65 , 1.37
+40.81 , -1006.79 , 1.01
+40.81 , -935.90 , 0.68
+40.81 , -864.96 , 0.40
+40.81 , -794.01 , 0.16
+40.81 , -721.23 , -0.05
+40.81 , -647.63 , -0.22
+40.81 , -574.03 , -0.35
+40.81 , -500.43 , -0.45
+40.81 , -426.82 , -0.50
+40.81 , -353.22 , -0.50
+40.81 , -279.62 , -0.47
+40.81 , -206.02 , -0.40
+40.81 , -132.42 , -0.29
+40.81 , -58.81 , -0.14
+40.81 , 14.79 , 0.11
+40.81 , 85.48 , 0.54
+40.81 , 156.16 , 1.00
+40.81 , 226.85 , 1.51
+40.81 , 297.54 , 2.05
+40.81 , 368.22 , 2.64
+40.81 , 438.91 , 3.27
+40.81 , 509.60 , 3.95
+40.81 , 580.29 , 4.66
+40.81 , 650.97 , 5.42
+40.81 , 721.66 , 6.21
+40.81 , 792.35 , 7.05
+40.81 , 863.04 , 7.93
+40.81 , 933.72 , 8.85
+40.81 , 1004.41 , 9.82
+40.81 , 1075.10 , 10.82
+40.81 , 1145.79 , 11.87
+40.81 , 1216.47 , 12.95
+40.81 , 1287.16 , 14.08
+40.81 , 1357.85 , 15.25
+40.81 , 1428.53 , 16.46
+40.81 , 1499.22 , 17.72
+40.81 , 1569.91 , 19.01
+40.81 , 1640.60 , 20.35
+40.81 , 1711.28 , 21.73
+40.81 , 1781.97 , 23.15
+40.81 , 1852.66 , 24.61
+40.81 , 1923.35 , 26.11
+40.81 , 1994.03 , 27.66
+40.81 , 2064.72 , 29.24
+40.81 , 2135.41 , 30.87
+40.81 , 2206.10 , 32.53
+40.81 , 2276.78 , 34.24
+81.62 , -2282.80 , 4.19
+81.62 , -2211.94 , 3.42
+81.62 , -2141.09 , 2.70
+81.62 , -2070.23 , 2.03
+81.62 , -1999.37 , 1.40
+81.62 , -1928.51 , 0.81
+81.62 , -1857.66 , 0.27
+81.62 , -1786.80 , -0.24
+81.62 , -1715.94 , -0.70
+81.62 , -1645.08 , -1.13
+81.62 , -1574.23 , -1.51
+81.62 , -1503.37 , -1.85
+81.62 , -1432.51 , -2.16
+81.62 , -1361.66 , -2.42
+81.62 , -1290.80 , -2.64
+81.62 , -1219.94 , -2.82
+81.62 , -1149.08 , -2.96
+81.62 , -1078.23 , -3.06
+81.62 , -1007.37 , -3.12
+81.62 , -936.32 , -3.13
+81.62 , -864.94 , -3.12
+81.62 , -793.57 , -3.06
+81.62 , -720.65 , -2.97
+81.62 , -647.05 , -2.85
+81.62 , -573.45 , -2.68
+81.62 , -499.85 , -2.48
+81.62 , -426.24 , -2.24
+81.62 , -352.64 , -1.95
+81.62 , -279.04 , -1.63
+81.62 , -205.44 , -1.26
+81.62 , -131.84 , -0.86
+81.62 , -58.23 , -0.41
+81.62 , 15.37 , 0.14
+81.62 , 86.06 , 0.86
+81.62 , 156.74 , 1.62
+81.62 , 227.43 , 2.43
+81.62 , 298.12 , 3.28
+81.62 , 368.80 , 4.17
+81.62 , 439.49 , 5.10
+81.62 , 510.18 , 6.07
+81.62 , 580.87 , 7.09
+81.62 , 651.55 , 8.14
+81.62 , 722.24 , 9.24
+81.62 , 792.93 , 10.38
+81.62 , 863.62 , 11.56
+81.62 , 934.30 , 12.78
+81.62 , 1004.99 , 14.04
+81.62 , 1075.68 , 15.35
+81.62 , 1146.37 , 16.69
+81.62 , 1217.05 , 18.08
+81.62 , 1287.74 , 19.51
+81.62 , 1358.43 , 20.98
+81.62 , 1429.11 , 22.49
+81.62 , 1499.80 , 24.05
+81.62 , 1570.49 , 25.64
+81.62 , 1641.18 , 27.28
+81.62 , 1711.86 , 28.96
+81.62 , 1782.55 , 30.68
+81.62 , 1853.24 , 32.44
+81.62 , 1923.93 , 34.24
+81.62 , 1994.61 , 36.08
+81.62 , 2065.30 , 37.97
+81.62 , 2135.99 , 39.90
+81.62 , 2206.67 , 41.86
+81.62 , 2277.36 , 43.88
+122.43 , -2283.38 , -5.46
+122.43 , -2212.52 , -5.90
+122.43 , -2141.66 , -6.31
+122.43 , -2070.81 , -6.67
+122.43 , -1999.95 , -6.99
+122.43 , -1929.09 , -7.27
+122.43 , -1858.24 , -7.51
+122.43 , -1787.38 , -7.71
+122.43 , -1716.52 , -7.87
+122.43 , -1645.66 , -7.99
+122.43 , -1574.81 , -8.07
+122.43 , -1503.95 , -8.11
+122.43 , -1433.09 , -8.10
+122.43 , -1362.24 , -8.06
+122.43 , -1291.38 , -7.97
+122.43 , -1220.52 , -7.85
+122.43 , -1149.66 , -7.68
+122.43 , -1078.81 , -7.47
+122.43 , -1007.95 , -7.23
+122.43 , -936.74 , -6.94
+122.43 , -864.93 , -6.63
+122.43 , -793.12 , -6.27
+122.43 , -720.07 , -5.89
+122.43 , -646.47 , -5.47
+122.43 , -572.87 , -5.02
+122.43 , -499.27 , -4.52
+122.43 , -425.66 , -3.98
+122.43 , -352.06 , -3.40
+122.43 , -278.46 , -2.78
+122.43 , -204.86 , -2.12
+122.43 , -131.26 , -1.42
+122.43 , -57.65 , -0.68
+122.43 , 15.95 , 0.16
+122.43 , 86.64 , 1.18
+122.43 , 157.32 , 2.25
+122.43 , 228.01 , 3.36
+122.43 , 298.70 , 4.50
+122.43 , 369.38 , 5.69
+122.43 , 440.07 , 6.93
+122.43 , 510.76 , 8.20
+122.43 , 581.45 , 9.51
+122.43 , 652.13 , 10.87
+122.43 , 722.82 , 12.27
+122.43 , 793.51 , 13.70
+122.43 , 864.20 , 15.18
+122.43 , 934.88 , 16.71
+122.43 , 1005.57 , 18.27
+122.43 , 1076.26 , 19.87
+122.43 , 1146.95 , 21.52
+122.43 , 1217.63 , 23.21
+122.43 , 1288.32 , 24.94
+122.43 , 1359.01 , 26.71
+122.43 , 1429.69 , 28.52
+122.43 , 1500.38 , 30.38
+122.43 , 1571.07 , 32.27
+122.43 , 1641.76 , 34.21
+122.43 , 1712.44 , 36.19
+122.43 , 1783.13 , 38.20
+122.43 , 1853.82 , 40.27
+122.43 , 1924.51 , 42.37
+122.43 , 1995.19 , 44.51
+122.43 , 2065.88 , 46.70
+122.43 , 2136.57 , 48.93
+122.43 , 2207.25 , 51.20
+122.43 , 2277.94 , 53.51
+163.24 , -2283.96 , -15.06
+163.24 , -2213.10 , -15.20
+163.24 , -2142.24 , -15.30
+163.24 , -2071.39 , -15.36
+163.24 , -2000.53 , -15.37
+163.24 , -1929.67 , -15.35
+163.24 , -1858.82 , -15.28
+163.24 , -1787.96 , -15.18
+163.24 , -1717.10 , -15.03
+163.24 , -1646.24 , -14.84
+163.24 , -1575.39 , -14.62
+163.24 , -1504.53 , -14.35
+163.24 , -1433.67 , -14.04
+163.24 , -1362.82 , -13.69
+163.24 , -1291.96 , -13.30
+163.24 , -1221.10 , -12.87
+163.24 , -1150.24 , -12.40
+163.24 , -1079.39 , -11.88
+163.24 , -1008.53 , -11.33
+163.24 , -937.17 , -10.74
+163.24 , -864.92 , -10.13
+163.24 , -792.67 , -9.48
+163.24 , -719.49 , -8.81
+163.24 , -645.89 , -8.10
+163.24 , -572.29 , -7.35
+163.24 , -498.69 , -6.56
+163.24 , -425.08 , -5.72
+163.24 , -351.48 , -4.85
+163.24 , -277.88 , -3.94
+163.24 , -204.28 , -2.98
+163.24 , -130.68 , -1.99
+163.24 , -57.07 , -0.96
+163.24 , 16.53 , 0.18
+163.24 , 87.22 , 1.51
+163.24 , 157.90 , 2.87
+163.24 , 228.59 , 4.28
+163.24 , 299.28 , 5.73
+163.24 , 369.96 , 7.22
+163.24 , 440.65 , 8.75
+163.24 , 511.34 , 10.32
+163.24 , 582.03 , 11.94
+163.24 , 652.71 , 13.59
+163.24 , 723.40 , 15.29
+163.24 , 794.09 , 17.03
+163.24 , 864.78 , 18.81
+163.24 , 935.46 , 20.63
+163.24 , 1006.15 , 22.50
+163.24 , 1076.84 , 24.40
+163.24 , 1147.52 , 26.35
+163.24 , 1218.21 , 28.34
+163.24 , 1288.90 , 30.37
+163.24 , 1359.59 , 32.44
+163.24 , 1430.27 , 34.55
+163.24 , 1500.96 , 36.70
+163.24 , 1571.65 , 38.90
+163.24 , 1642.34 , 41.14
+163.24 , 1713.02 , 43.41
+163.24 , 1783.71 , 45.73
+163.24 , 1854.40 , 48.10
+163.24 , 1925.09 , 50.50
+163.24 , 1995.77 , 52.94
+163.24 , 2066.46 , 55.43
+163.24 , 2137.15 , 57.96
+163.24 , 2207.83 , 60.53
+163.24 , 2278.52 , 63.14
+204.04 , -2284.54 , -24.66
+204.04 , -2213.68 , -24.49
+204.04 , -2142.82 , -24.28
+204.04 , -2071.97 , -24.03
+204.04 , -2001.11 , -23.74
+204.04 , -1930.25 , -23.41
+204.04 , -1859.40 , -23.04
+204.04 , -1788.54 , -22.63
+204.04 , -1717.68 , -22.18
+204.04 , -1646.82 , -21.69
+204.04 , -1575.97 , -21.15
+204.04 , -1505.11 , -20.58
+204.04 , -1434.25 , -19.97
+204.04 , -1363.39 , -19.31
+204.04 , -1292.54 , -18.61
+204.04 , -1221.68 , -17.88
+204.04 , -1150.82 , -17.10
+204.04 , -1079.97 , -16.28
+204.04 , -1009.11 , -15.42
+204.04 , -937.59 , -14.54
+204.04 , -864.91 , -13.64
+204.04 , -792.23 , -12.70
+204.04 , -718.91 , -11.73
+204.04 , -645.31 , -10.72
+204.04 , -571.71 , -9.68
+204.04 , -498.11 , -8.59
+204.04 , -424.50 , -7.47
+204.04 , -350.90 , -6.30
+204.04 , -277.30 , -5.09
+204.04 , -203.70 , -3.85
+204.04 , -130.10 , -2.56
+204.04 , -56.49 , -1.23
+204.04 , 17.11 , 0.21
+204.04 , 87.79 , 1.83
+204.04 , 158.48 , 3.50
+204.04 , 229.17 , 5.20
+204.04 , 299.86 , 6.95
+204.04 , 370.54 , 8.74
+204.04 , 441.23 , 10.57
+204.04 , 511.92 , 12.45
+204.04 , 582.61 , 14.36
+204.04 , 653.29 , 16.32
+204.04 , 723.98 , 18.32
+204.04 , 794.67 , 20.35
+204.04 , 865.36 , 22.44
+204.04 , 936.04 , 24.56
+204.04 , 1006.73 , 26.72
+204.04 , 1077.42 , 28.93
+204.04 , 1148.10 , 31.17
+204.04 , 1218.79 , 33.46
+204.04 , 1289.48 , 35.79
+204.04 , 1360.17 , 38.16
+204.04 , 1430.85 , 40.57
+204.04 , 1501.54 , 43.03
+204.04 , 1572.23 , 45.52
+204.04 , 1642.92 , 48.06
+204.04 , 1713.60 , 50.64
+204.04 , 1784.29 , 53.26
+204.04 , 1854.98 , 55.92
+204.04 , 1925.67 , 58.63
+204.04 , 1996.35 , 61.37
+204.04 , 2067.04 , 64.16
+204.04 , 2137.73 , 66.99
+204.04 , 2208.41 , 69.85
+204.04 , 2279.10 , 72.77
+244.85 , -2285.12 , -34.24
+244.85 , -2214.26 , -33.77
+244.85 , -2143.40 , -33.26
+244.85 , -2072.55 , -32.70
+244.85 , -2001.69 , -32.11
+244.85 , -1930.83 , -31.47
+244.85 , -1859.98 , -30.80
+244.85 , -1789.12 , -30.08
+244.85 , -1718.26 , -29.32
+244.85 , -1647.40 , -28.52
+244.85 , -1576.55 , -27.68
+244.85 , -1505.69 , -26.80
+244.85 , -1434.83 , -25.88
+244.85 , -1363.97 , -24.92
+244.85 , -1293.12 , -23.92
+244.85 , -1222.26 , -22.88
+244.85 , -1151.40 , -21.80
+244.85 , -1080.55 , -20.67
+244.85 , -1009.69 , -19.51
+244.85 , -938.01 , -18.32
+244.85 , -864.90 , -17.14
+244.85 , -791.78 , -15.91
+244.85 , -718.33 , -14.65
+244.85 , -644.73 , -13.35
+244.85 , -571.13 , -12.01
+244.85 , -497.53 , -10.63
+244.85 , -423.92 , -9.21
+244.85 , -350.32 , -7.75
+244.85 , -276.72 , -6.25
+244.85 , -203.12 , -4.71
+244.85 , -129.52 , -3.13
+244.85 , -55.91 , -1.50
+244.85 , 17.69 , 0.23
+244.85 , 88.37 , 2.15
+244.85 , 159.06 , 4.12
+244.85 , 229.75 , 6.13
+244.85 , 300.44 , 8.18
+244.85 , 371.12 , 10.27
+244.85 , 441.81 , 12.40
+244.85 , 512.50 , 14.57
+244.85 , 583.19 , 16.79
+244.85 , 653.87 , 19.04
+244.85 , 724.56 , 21.34
+244.85 , 795.25 , 23.68
+244.85 , 865.94 , 26.06
+244.85 , 936.62 , 28.48
+244.85 , 1007.31 , 30.95
+244.85 , 1078.00 , 33.45
+244.85 , 1148.68 , 36.00
+244.85 , 1219.37 , 38.59
+244.85 , 1290.06 , 41.22
+244.85 , 1360.75 , 43.89
+244.85 , 1431.43 , 46.60
+244.85 , 1502.12 , 49.36
+244.85 , 1572.81 , 52.15
+244.85 , 1643.50 , 54.99
+244.85 , 1714.18 , 57.87
+244.85 , 1784.87 , 60.79
+244.85 , 1855.56 , 63.75
+244.85 , 1926.25 , 66.75
+244.85 , 1996.93 , 69.80
+244.85 , 2067.62 , 72.88
+244.85 , 2138.31 , 76.01
+244.85 , 2208.99 , 79.18
+244.85 , 2279.68 , 82.39
+285.67 , -2285.70 , -43.82
+285.67 , -2214.84 , -43.04
+285.67 , -2143.98 , -42.22
+285.67 , -2073.13 , -41.36
+285.67 , -2002.27 , -40.46
+285.67 , -1931.41 , -39.52
+285.67 , -1860.56 , -38.54
+285.67 , -1789.70 , -37.52
+285.67 , -1718.84 , -36.45
+285.67 , -1647.98 , -35.35
+285.67 , -1577.13 , -34.20
+285.67 , -1506.27 , -33.02
+285.67 , -1435.41 , -31.79
+285.67 , -1364.55 , -30.52
+285.67 , -1293.70 , -29.22
+285.67 , -1222.84 , -27.87
+285.67 , -1151.98 , -26.48
+285.67 , -1081.13 , -25.05
+285.67 , -1010.27 , -23.58
+285.67 , -938.43 , -22.10
+285.67 , -864.89 , -20.63
+285.67 , -791.34 , -19.12
+285.67 , -717.75 , -17.57
+285.67 , -644.15 , -15.98
+285.67 , -570.55 , -14.34
+285.67 , -496.95 , -12.67
+285.67 , -423.34 , -10.96
+285.67 , -349.74 , -9.20
+285.67 , -276.14 , -7.41
+285.67 , -202.54 , -5.57
+285.67 , -128.94 , -3.70
+285.67 , -55.33 , -1.78
+285.67 , 18.27 , 0.25
+285.67 , 88.95 , 2.48
+285.67 , 159.64 , 4.74
+285.67 , 230.33 , 7.05
+285.67 , 301.02 , 9.40
+285.67 , 371.70 , 11.79
+285.67 , 442.39 , 14.22
+285.67 , 513.08 , 16.69
+285.67 , 583.77 , 19.21
+285.67 , 654.45 , 21.77
+285.67 , 725.14 , 24.36
+285.67 , 795.83 , 27.00
+285.67 , 866.52 , 29.69
+285.67 , 937.20 , 32.41
+285.67 , 1007.89 , 35.17
+285.67 , 1078.58 , 37.98
+285.67 , 1149.26 , 40.82
+285.67 , 1219.95 , 43.71
+285.67 , 1290.64 , 46.64
+285.67 , 1361.33 , 49.61
+285.67 , 1432.01 , 52.63
+285.67 , 1502.70 , 55.68
+285.67 , 1573.39 , 58.78
+285.67 , 1644.08 , 61.91
+285.67 , 1714.76 , 65.09
+285.67 , 1785.45 , 68.32
+285.67 , 1856.14 , 71.58
+285.67 , 1926.82 , 74.88
+285.67 , 1997.51 , 78.23
+285.67 , 2068.20 , 81.61
+285.67 , 2138.89 , 85.04
+285.67 , 2209.57 , 88.51
+285.67 , 2280.26 , 92.02
+326.47 , -2286.28 , -53.39
+326.47 , -2215.42 , -52.30
+326.47 , -2144.56 , -51.18
+326.47 , -2073.71 , -50.01
+326.47 , -2002.85 , -48.81
+326.47 , -1931.99 , -47.56
+326.47 , -1861.14 , -46.27
+326.47 , -1790.28 , -44.94
+326.47 , -1719.42 , -43.57
+326.47 , -1648.56 , -42.17
+326.47 , -1577.71 , -40.71
+326.47 , -1506.85 , -39.22
+326.47 , -1435.99 , -37.69
+326.47 , -1365.13 , -36.12
+326.47 , -1294.28 , -34.51
+326.47 , -1223.42 , -32.85
+326.47 , -1152.55 , -31.16
+326.47 , -1081.31 , -29.44
+326.47 , -1010.08 , -27.67
+326.47 , -937.98 , -25.90
+326.47 , -864.38 , -24.14
+326.47 , -790.77 , -22.33
+326.47 , -717.17 , -20.49
+326.47 , -643.57 , -18.60
+326.47 , -569.97 , -16.68
+326.47 , -496.37 , -14.71
+326.47 , -422.76 , -12.70
+326.47 , -349.16 , -10.66
+326.47 , -275.56 , -8.57
+326.47 , -201.96 , -6.44
+326.47 , -128.36 , -4.27
+326.47 , -54.75 , -2.06
+326.47 , 18.85 , 0.27
+326.47 , 89.53 , 2.80
+326.47 , 160.22 , 5.36
+326.47 , 230.91 , 7.97
+326.47 , 301.60 , 10.62
+326.47 , 372.28 , 13.31
+326.47 , 442.97 , 16.04
+326.47 , 513.66 , 18.82
+326.47 , 584.35 , 21.63
+326.47 , 655.03 , 24.49
+326.47 , 725.72 , 27.39
+326.47 , 796.41 , 30.33
+326.47 , 867.09 , 33.31
+326.47 , 937.78 , 36.33
+326.47 , 1008.47 , 39.40
+326.47 , 1079.16 , 42.50
+326.47 , 1149.84 , 45.65
+326.47 , 1220.53 , 48.84
+326.47 , 1291.22 , 52.07
+326.47 , 1361.91 , 55.34
+326.47 , 1432.59 , 58.65
+326.47 , 1503.28 , 62.01
+326.47 , 1573.97 , 65.40
+326.47 , 1644.66 , 68.84
+326.47 , 1715.34 , 72.32
+326.47 , 1786.03 , 75.84
+326.47 , 1856.72 , 79.40
+326.47 , 1927.40 , 83.01
+326.47 , 1998.09 , 86.65
+326.47 , 2068.78 , 90.34
+326.47 , 2139.47 , 94.07
+326.47 , 2210.15 , 97.84
+326.47 , 2280.84 , 101.65
+367.28 , -2286.86 , -62.94
+367.28 , -2216.00 , -61.55
+367.28 , -2145.14 , -60.12
+367.28 , -2074.29 , -58.65
+367.28 , -2003.43 , -57.14
+367.28 , -1932.57 , -55.59
+367.28 , -1861.71 , -53.99
+367.28 , -1790.86 , -52.36
+367.28 , -1720.00 , -50.69
+367.28 , -1649.14 , -48.97
+367.28 , -1578.29 , -47.21
+367.28 , -1507.43 , -45.42
+367.28 , -1436.57 , -43.58
+367.28 , -1365.71 , -41.70
+367.28 , -1294.86 , -39.78
+367.28 , -1224.00 , -37.82
+367.28 , -1153.11 , -35.83
+367.28 , -1081.44 , -33.82
+367.28 , -1009.77 , -31.77
+367.28 , -937.40 , -29.70
+367.28 , -863.80 , -27.65
+367.28 , -790.19 , -25.55
+367.28 , -716.59 , -23.41
+367.28 , -642.99 , -21.23
+367.28 , -569.39 , -19.01
+367.28 , -495.79 , -16.75
+367.28 , -422.18 , -14.45
+367.28 , -348.58 , -12.11
+367.28 , -274.98 , -9.72
+367.28 , -201.38 , -7.30
+367.28 , -127.78 , -4.84
+367.28 , -54.17 , -2.33
+367.28 , 19.43 , 0.29
+367.28 , 90.11 , 3.12
+367.28 , 160.80 , 5.99
+367.28 , 231.49 , 8.89
+367.28 , 302.18 , 11.84
+367.28 , 372.86 , 14.83
+367.28 , 443.55 , 17.87
+367.28 , 514.24 , 20.94
+367.28 , 584.93 , 24.05
+367.28 , 655.61 , 27.21
+367.28 , 726.30 , 30.41
+367.28 , 796.99 , 33.65
+367.28 , 867.67 , 36.93
+367.28 , 938.36 , 40.25
+367.28 , 1009.05 , 43.62
+367.28 , 1079.74 , 47.03
+367.28 , 1150.42 , 50.47
+367.28 , 1221.11 , 53.96
+367.28 , 1291.80 , 57.49
+367.28 , 1362.49 , 61.06
+367.28 , 1433.17 , 64.68
+367.28 , 1503.86 , 68.33
+367.28 , 1574.55 , 72.03
+367.28 , 1645.24 , 75.77
+367.28 , 1715.92 , 79.55
+367.28 , 1786.61 , 83.37
+367.28 , 1857.30 , 87.23
+367.28 , 1927.98 , 91.13
+367.28 , 1998.67 , 95.08
+367.28 , 2069.36 , 99.07
+367.28 , 2140.05 , 103.10
+367.28 , 2210.73 , 107.16
+367.28 , 2281.42 , 111.28
+408.09 , -2287.44 , -72.49
+408.09 , -2216.58 , -70.79
+408.09 , -2145.72 , -69.06
+408.09 , -2074.87 , -67.28
+408.09 , -2004.01 , -65.47
+408.09 , -1933.15 , -63.61
+408.09 , -1862.29 , -61.71
+408.09 , -1791.44 , -59.77
+408.09 , -1720.58 , -57.79
+408.09 , -1649.72 , -55.77
+408.09 , -1578.87 , -53.71
+408.09 , -1508.01 , -51.61
+408.09 , -1437.15 , -49.46
+408.09 , -1366.29 , -47.28
+408.09 , -1295.44 , -45.05
+408.09 , -1224.58 , -42.79
+408.09 , -1153.68 , -40.48
+408.09 , -1081.57 , -38.19
+408.09 , -1009.47 , -35.86
+408.09 , -936.82 , -33.51
+408.09 , -863.22 , -31.16
+408.09 , -789.61 , -28.77
+408.09 , -716.01 , -26.33
+408.09 , -642.41 , -23.86
+408.09 , -568.81 , -21.35
+408.09 , -495.21 , -18.79
+408.09 , -421.60 , -16.20
+408.09 , -348.00 , -13.56
+408.09 , -274.40 , -10.88
+408.09 , -200.80 , -8.17
+408.09 , -127.20 , -5.41
+408.09 , -53.60 , -2.61
+408.09 , 20.01 , 0.31
+408.09 , 90.69 , 3.44
+408.09 , 161.38 , 6.61
+408.09 , 232.07 , 9.81
+408.09 , 302.76 , 13.06
+408.09 , 373.44 , 16.35
+408.09 , 444.13 , 19.69
+408.09 , 514.82 , 23.06
+408.09 , 585.51 , 26.48
+408.09 , 656.19 , 29.93
+408.09 , 726.88 , 33.43
+408.09 , 797.57 , 36.97
+408.09 , 868.25 , 40.56
+408.09 , 938.94 , 44.18
+408.09 , 1009.63 , 47.84
+408.09 , 1080.32 , 51.55
+408.09 , 1151.00 , 55.30
+408.09 , 1221.69 , 59.09
+408.09 , 1292.38 , 62.92
+408.09 , 1363.07 , 66.79
+408.09 , 1433.75 , 70.70
+408.09 , 1504.44 , 74.66
+408.09 , 1575.13 , 78.65
+408.09 , 1645.82 , 82.69
+408.09 , 1716.50 , 86.77
+408.09 , 1787.19 , 90.89
+408.09 , 1857.88 , 95.06
+408.09 , 1928.56 , 99.26
+408.09 , 1999.25 , 103.51
+408.09 , 2069.94 , 107.79
+408.09 , 2140.63 , 112.12
+408.09 , 2211.31 , 116.49
+408.09 , 2282.00 , 120.90
+448.90 , -2288.02 , -82.03
+448.90 , -2217.16 , -80.03
+448.90 , -2146.30 , -77.99
+448.90 , -2075.45 , -75.90
+448.90 , -2004.59 , -73.78
+448.90 , -1933.73 , -71.62
+448.90 , -1862.87 , -69.41
+448.90 , -1792.02 , -67.17
+448.90 , -1721.16 , -64.88
+448.90 , -1650.30 , -62.56
+448.90 , -1579.45 , -60.19
+448.90 , -1508.59 , -57.78
+448.90 , -1437.73 , -55.33
+448.90 , -1366.87 , -52.84
+448.90 , -1296.02 , -50.31
+448.90 , -1225.16 , -47.74
+448.90 , -1154.24 , -45.13
+448.90 , -1081.70 , -42.56
+448.90 , -1009.16 , -39.95
+448.90 , -936.24 , -37.31
+448.90 , -862.64 , -34.67
+448.90 , -789.03 , -31.98
+448.90 , -715.43 , -29.26
+448.90 , -641.83 , -26.49
+448.90 , -568.23 , -23.68
+448.90 , -494.63 , -20.83
+448.90 , -421.03 , -17.94
+448.90 , -347.42 , -15.01
+448.90 , -273.82 , -12.04
+448.90 , -200.22 , -9.03
+448.90 , -126.62 , -5.98
+448.90 , -53.02 , -2.89
+448.90 , 20.59 , 0.33
+448.90 , 91.27 , 3.76
+448.90 , 161.96 , 7.23
+448.90 , 232.65 , 10.73
+448.90 , 303.34 , 14.28
+448.90 , 374.02 , 17.88
+448.90 , 444.71 , 21.51
+448.90 , 515.40 , 25.18
+448.90 , 586.09 , 28.90
+448.90 , 656.77 , 32.66
+448.90 , 727.46 , 36.46
+448.90 , 798.15 , 40.30
+448.90 , 868.83 , 44.18
+448.90 , 939.52 , 48.10
+448.90 , 1010.21 , 52.07
+448.90 , 1080.90 , 56.07
+448.90 , 1151.58 , 60.12
+448.90 , 1222.27 , 64.21
+448.90 , 1292.96 , 68.34
+448.90 , 1363.65 , 72.51
+448.90 , 1434.33 , 76.73
+448.90 , 1505.02 , 80.98
+448.90 , 1575.71 , 85.28
+448.90 , 1646.39 , 89.62
+448.90 , 1717.08 , 94.00
+448.90 , 1787.77 , 98.42
+448.90 , 1858.46 , 102.88
+448.90 , 1929.14 , 107.38
+448.90 , 1999.83 , 111.93
+448.90 , 2070.52 , 116.52
+448.90 , 2141.21 , 121.15
+448.90 , 2211.89 , 125.82
+448.90 , 2282.58 , 130.53
+489.71 , -2288.60 , -91.56
+489.71 , -2217.74 , -89.25
+489.71 , -2146.88 , -86.90
+489.71 , -2076.03 , -84.52
+489.71 , -2005.17 , -82.09
+489.71 , -1934.31 , -79.62
+489.71 , -1863.45 , -77.11
+489.71 , -1792.60 , -74.56
+489.71 , -1721.74 , -71.97
+489.71 , -1650.88 , -69.33
+489.71 , -1580.03 , -66.66
+489.71 , -1509.17 , -63.95
+489.71 , -1438.31 , -61.19
+489.71 , -1367.45 , -58.40
+489.71 , -1296.60 , -55.56
+489.71 , -1225.74 , -52.69
+489.71 , -1154.81 , -49.78
+489.71 , -1081.83 , -46.93
+489.71 , -1008.86 , -44.04
+489.71 , -935.66 , -41.12
+489.71 , -862.06 , -38.18
+489.71 , -788.45 , -35.20
+489.71 , -714.85 , -32.18
+489.71 , -641.25 , -29.12
+489.71 , -567.65 , -26.02
+489.71 , -494.05 , -22.87
+489.71 , -420.45 , -19.69
+489.71 , -346.84 , -16.47
+489.71 , -273.24 , -13.20
+489.71 , -199.64 , -9.90
+489.71 , -126.04 , -6.55
+489.71 , -52.44 , -3.17
+489.71 , 21.17 , 0.35
+489.71 , 91.85 , 4.08
+489.71 , 162.54 , 7.85
+489.71 , 233.23 , 11.66
+489.71 , 303.92 , 15.51
+489.71 , 374.60 , 19.40
+489.71 , 445.29 , 23.33
+489.71 , 515.98 , 27.30
+489.71 , 586.67 , 31.32
+489.71 , 657.35 , 35.38
+489.71 , 728.04 , 39.48
+489.71 , 798.73 , 43.62
+489.71 , 869.41 , 47.80
+489.71 , 940.10 , 52.02
+489.71 , 1010.79 , 56.29
+489.71 , 1081.48 , 60.60
+489.71 , 1152.16 , 64.94
+489.71 , 1222.85 , 69.33
+489.71 , 1293.54 , 73.76
+489.71 , 1364.23 , 78.24
+489.71 , 1434.91 , 82.75
+489.71 , 1505.60 , 87.31
+489.71 , 1576.29 , 91.90
+489.71 , 1646.97 , 96.54
+489.71 , 1717.66 , 101.22
+489.71 , 1788.35 , 105.94
+489.71 , 1859.04 , 110.71
+489.71 , 1929.72 , 115.51
+489.71 , 2000.41 , 120.36
+489.71 , 2071.10 , 125.24
+489.71 , 2141.79 , 130.17
+489.71 , 2212.47 , 135.14
+489.71 , 2283.16 , 140.16
+816.18 , -2293.24 , -167.46
+816.18 , -2222.38 , -162.70
+816.18 , -2151.52 , -157.91
+816.18 , -2080.66 , -153.08
+816.18 , -2009.81 , -148.21
+816.18 , -1938.95 , -143.29
+816.18 , -1868.09 , -138.34
+816.18 , -1797.24 , -133.34
+816.18 , -1726.38 , -128.30
+816.18 , -1655.52 , -123.23
+816.18 , -1584.66 , -118.11
+816.18 , -1513.77 , -112.95
+816.18 , -1442.82 , -107.76
+816.18 , -1371.86 , -102.53
+816.18 , -1299.03 , -97.42
+816.18 , -1225.43 , -92.33
+816.18 , -1151.83 , -87.20
+816.18 , -1078.22 , -82.04
+816.18 , -1004.62 , -76.83
+816.18 , -931.02 , -71.58
+816.18 , -857.42 , -66.29
+816.18 , -783.82 , -60.96
+816.18 , -710.21 , -55.59
+816.18 , -636.61 , -50.17
+816.18 , -563.01 , -44.72
+816.18 , -489.41 , -39.23
+816.18 , -415.81 , -33.69
+816.18 , -342.20 , -28.12
+816.18 , -268.60 , -22.50
+816.18 , -195.00 , -16.85
+816.18 , -121.40 , -11.15
+816.18 , -47.80 , -5.41
+816.18 , 25.81 , 0.50
+816.18 , 96.49 , 6.62
+816.18 , 167.18 , 12.79
+816.18 , 237.87 , 19.00
+816.18 , 308.55 , 25.25
+816.18 , 379.24 , 31.55
+816.18 , 449.93 , 37.88
+816.18 , 520.62 , 44.26
+816.18 , 591.30 , 50.67
+816.18 , 661.99 , 57.13
+816.18 , 732.68 , 63.63
+816.18 , 803.37 , 70.18
+816.18 , 874.05 , 76.76
+816.18 , 944.74 , 83.38
+816.18 , 1015.43 , 90.05
+816.18 , 1086.11 , 96.76
+816.18 , 1156.80 , 103.51
+816.18 , 1227.49 , 110.30
+816.18 , 1298.18 , 117.13
+816.18 , 1368.86 , 124.01
+816.18 , 1439.55 , 130.92
+816.18 , 1510.24 , 137.88
+816.18 , 1580.93 , 144.88
+816.18 , 1651.61 , 151.92
+816.18 , 1722.30 , 159.00
+816.18 , 1792.99 , 166.12
+816.18 , 1863.68 , 173.29
+816.18 , 1934.36 , 180.50
+816.18 , 2005.05 , 187.74
+816.18 , 2075.74 , 195.03
+816.18 , 2146.42 , 202.36
+816.18 , 2217.11 , 209.74
+816.18 , 2287.80 , 217.15
+1020.26 , -2296.14 , -214.59
+1020.26 , -2225.28 , -208.31
+1020.26 , -2154.42 , -201.99
+1020.26 , -2083.56 , -195.63
+1020.26 , -2012.71 , -189.23
+1020.26 , -1941.85 , -182.78
+1020.26 , -1870.99 , -176.30
+1020.26 , -1800.14 , -169.78
+1020.26 , -1729.28 , -163.21
+1020.26 , -1658.42 , -156.60
+1020.26 , -1587.56 , -149.96
+1020.26 , -1515.84 , -143.36
+1020.26 , -1442.72 , -136.88
+1020.26 , -1369.59 , -130.35
+1020.26 , -1296.13 , -123.82
+1020.26 , -1222.53 , -117.27
+1020.26 , -1148.93 , -110.67
+1020.26 , -1075.32 , -104.03
+1020.26 , -1001.72 , -97.35
+1020.26 , -928.12 , -90.64
+1020.26 , -854.52 , -83.88
+1020.26 , -780.92 , -77.07
+1020.26 , -707.31 , -70.23
+1020.26 , -633.71 , -63.35
+1020.26 , -560.11 , -56.43
+1020.26 , -486.51 , -49.47
+1020.26 , -412.91 , -42.46
+1020.26 , -339.30 , -35.42
+1020.26 , -265.70 , -28.33
+1020.26 , -192.10 , -21.21
+1020.26 , -118.50 , -14.04
+1020.26 , -44.90 , -6.83
+1020.26 , 28.70 , 0.57
+1020.26 , 99.39 , 8.20
+1020.26 , 170.08 , 15.87
+1020.26 , 240.77 , 23.58
+1020.26 , 311.45 , 31.33
+1020.26 , 382.14 , 39.12
+1020.26 , 452.83 , 46.96
+1020.26 , 523.52 , 54.84
+1020.26 , 594.20 , 62.76
+1020.26 , 664.89 , 70.71
+1020.26 , 735.58 , 78.72
+1020.26 , 806.27 , 86.76
+1020.26 , 876.95 , 94.84
+1020.26 , 947.64 , 102.97
+1020.26 , 1018.33 , 111.14
+1020.26 , 1089.01 , 119.35
+1020.26 , 1159.70 , 127.60
+1020.26 , 1230.39 , 135.89
+1020.26 , 1301.08 , 144.22
+1020.26 , 1371.76 , 152.60
+1020.26 , 1442.45 , 161.01
+1020.26 , 1513.14 , 169.47
+1020.26 , 1583.83 , 177.97
+1020.26 , 1654.51 , 186.52
+1020.26 , 1725.20 , 195.10
+1020.26 , 1795.89 , 203.72
+1020.26 , 1866.58 , 212.39
+1020.26 , 1937.26 , 221.10
+1020.26 , 2007.95 , 229.84
+1020.26 , 2078.64 , 238.62
+1020.26 , 2149.32 , 247.46
+1020.26 , 2220.01 , 256.35
+1020.26 , 2290.70 , 265.26
+1224.27 , -2299.03 , -261.49
+1224.27 , -2228.18 , -253.69
+1224.27 , -2157.32 , -245.84
+1224.27 , -2086.46 , -237.94
+1224.27 , -2015.61 , -230.01
+1224.27 , -1944.75 , -222.04
+1224.27 , -1873.89 , -214.03
+1224.27 , -1803.03 , -205.97
+1224.27 , -1732.08 , -197.89
+1224.27 , -1659.54 , -189.98
+1224.27 , -1586.99 , -182.02
+1224.27 , -1514.04 , -174.07
+1224.27 , -1440.44 , -166.17
+1224.27 , -1366.83 , -158.22
+1224.27 , -1293.23 , -150.24
+1224.27 , -1219.63 , -142.21
+1224.27 , -1146.03 , -134.15
+1224.27 , -1072.43 , -126.04
+1224.27 , -998.82 , -117.89
+1224.27 , -925.22 , -109.70
+1224.27 , -851.62 , -101.48
+1224.27 , -778.02 , -93.21
+1224.27 , -704.42 , -84.89
+1224.27 , -630.81 , -76.54
+1224.27 , -557.21 , -68.15
+1224.27 , -483.61 , -59.72
+1224.27 , -410.01 , -51.25
+1224.27 , -336.41 , -42.73
+1224.27 , -262.80 , -34.18
+1224.27 , -189.20 , -25.58
+1224.27 , -115.60 , -16.95
+1224.27 , -42.00 , -8.27
+1224.27 , 31.60 , 0.63
+1224.27 , 102.29 , 9.76
+1224.27 , 172.98 , 18.93
+1224.27 , 243.67 , 28.14
+1224.27 , 314.35 , 37.39
+1224.27 , 385.04 , 46.69
+1224.27 , 455.73 , 56.03
+1224.27 , 526.41 , 65.41
+1224.27 , 597.10 , 74.82
+1224.27 , 667.79 , 84.28
+1224.27 , 738.48 , 93.79
+1224.27 , 809.16 , 103.33
+1224.27 , 879.85 , 112.92
+1224.27 , 950.54 , 122.54
+1224.27 , 1021.23 , 132.21
+1224.27 , 1091.91 , 141.92
+1224.27 , 1162.60 , 151.67
+1224.27 , 1233.29 , 161.47
+1224.27 , 1303.98 , 171.30
+1224.27 , 1374.66 , 181.18
+1224.27 , 1445.35 , 191.10
+1224.27 , 1516.04 , 201.06
+1224.27 , 1586.72 , 211.06
+1224.27 , 1657.41 , 221.10
+1224.27 , 1728.10 , 231.18
+1224.27 , 1798.79 , 241.30
+1224.27 , 1869.47 , 251.46
+1224.27 , 1940.16 , 261.68
+1224.27 , 2010.85 , 271.94
+1224.27 , 2081.54 , 282.22
+1224.27 , 2152.22 , 292.56
+1224.27 , 2222.91 , 302.94
+1224.27 , 2293.60 , 313.34
+1428.29 , -2301.93 , -308.14
+1428.29 , -2231.08 , -298.81
+1428.29 , -2160.22 , -289.44
+1428.29 , -2089.36 , -280.01
+1428.29 , -2018.50 , -270.56
+1428.29 , -1947.65 , -261.06
+1428.29 , -1875.98 , -251.64
+1428.29 , -1804.01 , -242.23
+1428.29 , -1731.94 , -232.79
+1428.29 , -1658.34 , -223.54
+1428.29 , -1584.74 , -214.25
+1428.29 , -1511.14 , -204.91
+1428.29 , -1437.54 , -195.54
+1428.29 , -1363.93 , -186.13
+1428.29 , -1290.33 , -176.67
+1428.29 , -1216.73 , -167.18
+1428.29 , -1143.13 , -157.64
+1428.29 , -1069.53 , -148.06
+1428.29 , -995.93 , -138.45
+1428.29 , -922.32 , -128.79
+1428.29 , -848.72 , -119.09
+1428.29 , -775.12 , -109.35
+1428.29 , -701.52 , -99.57
+1428.29 , -627.92 , -89.75
+1428.29 , -554.31 , -79.89
+1428.29 , -480.71 , -69.99
+1428.29 , -407.11 , -60.04
+1428.29 , -333.51 , -50.06
+1428.29 , -259.91 , -40.03
+1428.29 , -186.30 , -29.97
+1428.29 , -112.70 , -19.86
+1428.29 , -39.10 , -9.72
+1428.29 , 34.50 , 0.68
+1428.29 , 105.19 , 11.31
+1428.29 , 175.88 , 21.98
+1428.29 , 246.56 , 32.69
+1428.29 , 317.25 , 43.45
+1428.29 , 387.94 , 54.24
+1428.29 , 458.63 , 65.08
+1428.29 , 529.31 , 75.96
+1428.29 , 600.00 , 86.88
+1428.29 , 670.69 , 97.84
+1428.29 , 741.38 , 108.85
+1428.29 , 812.06 , 119.89
+1428.29 , 882.75 , 130.98
+1428.29 , 953.44 , 142.11
+1428.29 , 1024.12 , 153.28
+1428.29 , 1094.81 , 164.49
+1428.29 , 1165.50 , 175.74
+1428.29 , 1236.19 , 187.04
+1428.29 , 1306.87 , 198.37
+1428.29 , 1377.56 , 209.75
+1428.29 , 1448.25 , 221.17
+1428.29 , 1518.94 , 232.63
+1428.29 , 1589.62 , 244.12
+1428.29 , 1660.31 , 255.68
+1428.29 , 1731.00 , 267.25
+1428.29 , 1801.69 , 278.88
+1428.29 , 1872.37 , 290.54
+1428.29 , 1943.06 , 302.25
+1428.29 , 2013.75 , 314.01
+1428.29 , 2084.43 , 325.79
+1428.29 , 2155.12 , 337.65
+1428.29 , 2225.81 , 349.50
+1428.29 , 2296.50 , 361.43
+1632.39 , -2304.83 , -354.58
+1632.39 , -2233.98 , -343.72
+1632.39 , -2163.12 , -332.81
+1632.39 , -2092.05 , -321.90
+1632.39 , -2020.65 , -311.01
+1632.39 , -1949.25 , -300.07
+1632.39 , -1876.25 , -289.36
+1632.39 , -1802.65 , -278.73
+1632.39 , -1729.04 , -268.05
+1632.39 , -1655.44 , -257.32
+1632.39 , -1581.84 , -246.57
+1632.39 , -1508.24 , -235.77
+1632.39 , -1434.64 , -224.92
+1632.39 , -1361.03 , -214.04
+1632.39 , -1287.43 , -203.12
+1632.39 , -1213.83 , -192.15
+1632.39 , -1140.23 , -181.15
+1632.39 , -1066.63 , -170.10
+1632.39 , -993.03 , -159.01
+1632.39 , -919.42 , -147.89
+1632.39 , -845.82 , -136.72
+1632.39 , -772.22 , -125.51
+1632.39 , -698.62 , -114.26
+1632.39 , -625.02 , -102.97
+1632.39 , -551.41 , -91.64
+1632.39 , -477.81 , -80.27
+1632.39 , -404.21 , -68.85
+1632.39 , -330.61 , -57.40
+1632.39 , -257.01 , -45.91
+1632.39 , -183.40 , -34.37
+1632.39 , -109.80 , -22.80
+1632.39 , -36.20 , -11.18
+1632.39 , 37.40 , 0.72
+1632.39 , 108.09 , 12.85
+1632.39 , 178.78 , 25.02
+1632.39 , 249.46 , 37.24
+1632.39 , 320.15 , 49.49
+1632.39 , 390.84 , 61.79
+1632.39 , 461.53 , 74.13
+1632.39 , 532.21 , 86.51
+1632.39 , 602.90 , 98.93
+1632.39 , 673.59 , 111.39
+1632.39 , 744.28 , 123.90
+1632.39 , 814.96 , 136.44
+1632.39 , 885.65 , 149.03
+1632.39 , 956.34 , 161.66
+1632.39 , 1027.02 , 174.33
+1632.39 , 1097.71 , 187.04
+1632.39 , 1168.40 , 199.80
+1632.39 , 1239.09 , 212.59
+1632.39 , 1309.77 , 225.43
+1632.39 , 1380.46 , 238.30
+1632.39 , 1451.15 , 251.23
+1632.39 , 1521.84 , 264.20
+1632.39 , 1592.52 , 277.19
+1632.39 , 1663.21 , 290.22
+1632.39 , 1733.90 , 303.31
+1632.39 , 1804.59 , 316.44
+1632.39 , 1875.27 , 329.62
+1632.39 , 1945.96 , 342.83
+1632.39 , 2016.65 , 356.08
+1632.39 , 2087.33 , 369.36
+1632.39 , 2158.02 , 382.71
+1632.39 , 2228.71 , 396.09
+1632.39 , 2299.40 , 409.51
+1836.41 , -2307.73 , -400.77
+1836.41 , -2236.88 , -388.38
+1836.41 , -2166.02 , -375.94
+1836.41 , -2094.08 , -363.69
+1836.41 , -2020.51 , -351.68
+1836.41 , -1946.94 , -339.67
+1836.41 , -1873.35 , -327.59
+1836.41 , -1799.75 , -315.49
+1836.41 , -1726.15 , -303.34
+1836.41 , -1652.54 , -291.14
+1836.41 , -1578.94 , -278.91
+1836.41 , -1505.34 , -266.64
+1836.41 , -1431.74 , -254.32
+1836.41 , -1358.14 , -241.97
+1836.41 , -1284.53 , -229.57
+1836.41 , -1210.93 , -217.14
+1836.41 , -1137.33 , -204.67
+1836.41 , -1063.73 , -192.15
+1836.41 , -990.13 , -179.59
+1836.41 , -916.52 , -167.00
+1836.41 , -842.92 , -154.36
+1836.41 , -769.32 , -141.68
+1836.41 , -695.72 , -128.96
+1836.41 , -622.12 , -116.20
+1836.41 , -548.51 , -103.40
+1836.41 , -474.91 , -90.56
+1836.41 , -401.31 , -77.68
+1836.41 , -327.71 , -64.76
+1836.41 , -254.11 , -51.79
+1836.41 , -180.50 , -38.79
+1836.41 , -106.90 , -25.74
+1836.41 , -33.30 , -12.66
+1836.41 , 40.30 , 0.75
+1836.41 , 110.99 , 14.38
+1836.41 , 181.68 , 28.05
+1836.41 , 252.36 , 41.77
+1836.41 , 323.05 , 55.52
+1836.41 , 393.74 , 69.32
+1836.41 , 464.42 , 83.16
+1836.41 , 535.11 , 97.04
+1836.41 , 605.80 , 110.96
+1836.41 , 676.49 , 124.93
+1836.41 , 747.17 , 138.93
+1836.41 , 817.86 , 152.98
+1836.41 , 888.55 , 167.07
+1836.41 , 959.24 , 181.20
+1836.41 , 1029.92 , 195.37
+1836.41 , 1100.61 , 209.58
+1836.41 , 1171.30 , 223.84
+1836.41 , 1241.99 , 238.14
+1836.41 , 1312.67 , 252.48
+1836.41 , 1383.36 , 266.85
+1836.41 , 1454.05 , 281.28
+1836.41 , 1524.73 , 295.74
+1836.41 , 1595.42 , 310.23
+1836.41 , 1666.11 , 324.78
+1836.41 , 1736.80 , 339.37
+1836.41 , 1807.48 , 354.00
+1836.41 , 1878.17 , 368.67
+1836.41 , 1948.86 , 383.38
+1836.41 , 2019.55 , 398.13
+1836.41 , 2090.23 , 412.92
+1836.41 , 2160.92 , 427.77
+1836.41 , 2231.61 , 442.64
+1836.41 , 2302.30 , 457.56
+2040.43 , -2310.48 , -446.77
+2040.43 , -2237.48 , -433.31
+2040.43 , -2164.49 , -419.80
+2040.43 , -2091.26 , -406.29
+2040.43 , -2017.65 , -392.84
+2040.43 , -1944.05 , -379.34
+2040.43 , -1870.45 , -365.82
+2040.43 , -1796.85 , -352.24
+2040.43 , -1723.25 , -338.62
+2040.43 , -1649.65 , -324.95
+2040.43 , -1576.04 , -311.26
+2040.43 , -1502.44 , -297.51
+2040.43 , -1428.84 , -283.72
+2040.43 , -1355.24 , -269.91
+2040.43 , -1281.64 , -256.04
+2040.43 , -1208.03 , -242.14
+2040.43 , -1134.43 , -228.20
+2040.43 , -1060.83 , -214.21
+2040.43 , -987.23 , -200.19
+2040.43 , -913.63 , -186.12
+2040.43 , -840.02 , -172.01
+2040.43 , -766.42 , -157.86
+2040.43 , -692.82 , -143.68
+2040.43 , -619.22 , -129.45
+2040.43 , -545.62 , -115.18
+2040.43 , -472.01 , -100.87
+2040.43 , -398.41 , -86.51
+2040.43 , -324.81 , -72.12
+2040.43 , -251.21 , -57.69
+2040.43 , -177.61 , -43.22
+2040.43 , -104.00 , -28.70
+2040.43 , -30.40 , -14.15
+2040.43 , 43.20 , 0.76
+2040.43 , 113.89 , 15.90
+2040.43 , 184.57 , 31.07
+2040.43 , 255.26 , 46.29
+2040.43 , 325.95 , 61.54
+2040.43 , 396.64 , 76.84
+2040.43 , 467.32 , 92.18
+2040.43 , 538.01 , 107.56
+2040.43 , 608.70 , 122.99
+2040.43 , 679.39 , 138.45
+2040.43 , 750.07 , 153.96
+2040.43 , 820.76 , 169.51
+2040.43 , 891.45 , 185.10
+2040.43 , 962.13 , 200.73
+2040.43 , 1032.82 , 216.40
+2040.43 , 1103.51 , 232.13
+2040.43 , 1174.20 , 247.87
+2040.43 , 1244.88 , 263.68
+2040.43 , 1315.57 , 279.51
+2040.43 , 1386.26 , 295.40
+2040.43 , 1456.95 , 311.30
+2040.43 , 1527.63 , 327.26
+2040.43 , 1598.32 , 343.27
+2040.43 , 1669.01 , 359.32
+2040.43 , 1739.70 , 375.42
+2040.43 , 1810.38 , 391.55
+2040.43 , 1881.07 , 407.70
+2040.43 , 1951.76 , 423.92
+2040.43 , 2022.44 , 440.17
+2040.43 , 2093.13 , 456.46
+2040.43 , 2163.82 , 472.81
+2040.43 , 2234.51 , 489.17
+2040.43 , 2305.19 , 505.61
+2244.53 , -2309.16 , -493.49
+2244.53 , -2235.56 , -478.69
+2244.53 , -2161.96 , -463.84
+2244.53 , -2088.36 , -448.96
+2244.53 , -2014.75 , -434.04
+2244.53 , -1941.15 , -419.07
+2244.53 , -1867.55 , -404.05
+2244.53 , -1793.95 , -389.00
+2244.53 , -1720.35 , -373.91
+2244.53 , -1646.75 , -358.79
+2244.53 , -1573.14 , -343.63
+2244.53 , -1499.54 , -328.41
+2244.53 , -1425.94 , -313.15
+2244.53 , -1352.34 , -297.87
+2244.53 , -1278.74 , -282.53
+2244.53 , -1205.13 , -267.17
+2244.53 , -1131.53 , -251.74
+2244.53 , -1057.93 , -236.29
+2244.53 , -984.33 , -220.79
+2244.53 , -910.73 , -205.26
+2244.53 , -837.12 , -189.68
+2244.53 , -763.52 , -174.06
+2244.53 , -689.92 , -158.41
+2244.53 , -616.32 , -142.71
+2244.53 , -542.72 , -126.97
+2244.53 , -469.11 , -111.19
+2244.53 , -395.51 , -95.37
+2244.53 , -321.91 , -79.50
+2244.53 , -248.31 , -63.60
+2244.53 , -174.71 , -47.66
+2244.53 , -101.10 , -31.68
+2244.53 , -27.50 , -15.65
+2244.53 , 46.10 , 0.77
+2244.53 , 116.79 , 17.40
+2244.53 , 187.47 , 34.07
+2244.53 , 258.16 , 50.79
+2244.53 , 328.85 , 67.55
+2244.53 , 399.54 , 84.35
+2244.53 , 470.22 , 101.19
+2244.53 , 540.91 , 118.08
+2244.53 , 611.60 , 135.00
+2244.53 , 682.29 , 151.96
+2244.53 , 752.97 , 168.97
+2244.53 , 823.66 , 186.02
+2244.53 , 894.35 , 203.11
+2244.53 , 965.03 , 220.24
+2244.53 , 1035.72 , 237.43
+2244.53 , 1106.41 , 254.64
+2244.53 , 1177.10 , 271.90
+2244.53 , 1247.78 , 289.18
+2244.53 , 1318.47 , 306.54
+2244.53 , 1389.16 , 323.92
+2244.53 , 1459.85 , 341.32
+2244.53 , 1530.53 , 358.80
+2244.53 , 1601.22 , 376.30
+2244.53 , 1671.91 , 393.85
+2244.53 , 1742.60 , 411.45
+2244.53 , 1813.28 , 429.07
+2244.53 , 1883.97 , 446.74
+2244.53 , 1954.66 , 464.46
+2244.53 , 2025.34 , 482.20
+2244.53 , 2096.03 , 500.00
+2244.53 , 2166.72 , 517.84
+2244.53 , 2237.41 , 535.73
+2244.53 , 2308.09 , 553.64
+2448.55 , -2306.26 , -540.58
+2448.55 , -2232.66 , -524.30
+2448.55 , -2159.06 , -507.98
+2448.55 , -2085.46 , -491.63
+2448.55 , -2011.86 , -475.22
+2448.55 , -1938.25 , -458.80
+2448.55 , -1864.65 , -442.31
+2448.55 , -1791.05 , -425.79
+2448.55 , -1717.45 , -409.23
+2448.55 , -1643.85 , -392.64
+2448.55 , -1570.24 , -376.00
+2448.55 , -1496.64 , -359.32
+2448.55 , -1423.04 , -342.61
+2448.55 , -1349.44 , -325.83
+2448.55 , -1275.84 , -309.04
+2448.55 , -1202.23 , -292.19
+2448.55 , -1128.63 , -275.31
+2448.55 , -1055.03 , -258.38
+2448.55 , -981.43 , -241.42
+2448.55 , -907.83 , -224.41
+2448.55 , -834.22 , -207.36
+2448.55 , -760.62 , -190.28
+2448.55 , -687.02 , -173.15
+2448.55 , -613.42 , -155.98
+2448.55 , -539.82 , -138.77
+2448.55 , -466.22 , -121.52
+2448.55 , -392.61 , -104.23
+2448.55 , -319.01 , -86.90
+2448.55 , -245.41 , -69.53
+2448.55 , -171.81 , -52.12
+2448.55 , -98.21 , -34.66
+2448.55 , -24.60 , -17.17
+2448.55 , 49.00 , 0.76
+2448.55 , 119.69 , 18.89
+2448.55 , 190.37 , 37.07
+2448.55 , 261.06 , 55.29
+2448.55 , 331.75 , 73.55
+2448.55 , 402.44 , 91.85
+2448.55 , 473.12 , 110.19
+2448.55 , 543.81 , 128.57
+2448.55 , 614.50 , 147.00
+2448.55 , 685.18 , 165.47
+2448.55 , 755.87 , 183.98
+2448.55 , 826.56 , 202.53
+2448.55 , 897.25 , 221.12
+2448.55 , 967.93 , 239.76
+2448.55 , 1038.62 , 258.42
+2448.55 , 1109.31 , 277.15
+2448.55 , 1180.00 , 295.90
+2448.55 , 1250.68 , 314.71
+2448.55 , 1321.37 , 333.54
+2448.55 , 1392.06 , 352.41
+2448.55 , 1462.74 , 371.34
+2448.55 , 1533.43 , 390.31
+2448.55 , 1604.12 , 409.31
+2448.55 , 1674.81 , 428.36
+2448.55 , 1745.49 , 447.45
+2448.55 , 1816.18 , 466.59
+2448.55 , 1886.87 , 485.76
+2448.55 , 1957.56 , 504.98
+2448.55 , 2028.24 , 524.22
+2448.55 , 2098.93 , 543.53
+2448.55 , 2169.62 , 562.86
+2448.55 , 2240.31 , 582.25
+2448.55 , 2310.99 , 601.66
+2652.56 , -2303.37 , -587.66
+2652.56 , -2229.76 , -569.92
+2652.56 , -2156.16 , -552.13
+2652.56 , -2082.56 , -534.31
+2652.56 , -2008.96 , -516.44
+2652.56 , -1935.36 , -498.53
+2652.56 , -1861.75 , -480.59
+2652.56 , -1788.15 , -462.60
+2652.56 , -1714.55 , -444.57
+2652.56 , -1640.95 , -426.51
+2652.56 , -1567.35 , -408.40
+2652.56 , -1493.74 , -390.25
+2652.56 , -1420.14 , -372.04
+2652.56 , -1346.54 , -353.81
+2652.56 , -1272.94 , -335.54
+2652.56 , -1199.34 , -317.24
+2652.56 , -1125.73 , -298.89
+2652.56 , -1052.13 , -280.49
+2652.56 , -978.53 , -262.04
+2652.56 , -904.93 , -243.58
+2652.56 , -831.33 , -225.06
+2652.56 , -757.72 , -206.50
+2652.56 , -684.12 , -187.91
+2652.56 , -610.52 , -169.27
+2652.56 , -536.92 , -150.59
+2652.56 , -463.32 , -131.87
+2652.56 , -389.71 , -113.11
+2652.56 , -316.11 , -94.31
+2652.56 , -242.51 , -75.47
+2652.56 , -168.91 , -56.59
+2652.56 , -95.31 , -37.66
+2652.56 , -21.70 , -18.70
+2652.56 , 51.90 , 0.74
+2652.56 , 122.58 , 20.38
+2652.56 , 193.27 , 40.05
+2652.56 , 263.96 , 59.77
+2652.56 , 334.65 , 79.53
+2652.56 , 405.33 , 99.34
+2652.56 , 476.02 , 119.18
+2652.56 , 546.71 , 139.06
+2652.56 , 617.40 , 158.99
+2652.56 , 688.08 , 178.96
+2652.56 , 758.77 , 198.97
+2652.56 , 829.46 , 219.02
+2652.56 , 900.15 , 239.11
+2652.56 , 970.83 , 259.25
+2652.56 , 1041.52 , 279.43
+2652.56 , 1112.21 , 299.63
+2652.56 , 1182.89 , 319.91
+2652.56 , 1253.58 , 340.21
+2652.56 , 1324.27 , 360.53
+2652.56 , 1394.96 , 380.93
+2652.56 , 1465.64 , 401.35
+2652.56 , 1536.33 , 421.82
+2652.56 , 1607.02 , 442.31
+2652.56 , 1677.71 , 462.86
+2652.56 , 1748.39 , 483.45
+2652.56 , 1819.08 , 504.09
+2652.56 , 1889.77 , 524.78
+2652.56 , 1960.45 , 545.49
+2652.56 , 2031.14 , 566.22
+2652.56 , 2101.83 , 587.03
+2652.56 , 2172.52 , 607.87
+2652.56 , 2243.20 , 628.75
+2652.56 , 2313.89 , 649.68
+2856.67 , -2300.47 , -634.75
+2856.67 , -2226.86 , -615.54
+2856.67 , -2153.26 , -596.30
+2856.67 , -2079.66 , -576.99
+2856.67 , -2006.06 , -557.65
+2856.67 , -1932.46 , -538.29
+2856.67 , -1858.85 , -518.88
+2856.67 , -1785.25 , -499.42
+2856.67 , -1711.65 , -479.92
+2856.67 , -1638.05 , -460.39
+2856.67 , -1564.45 , -440.81
+2856.67 , -1490.84 , -421.18
+2856.67 , -1417.24 , -401.53
+2856.67 , -1343.64 , -381.80
+2856.67 , -1270.04 , -362.08
+2856.67 , -1196.44 , -342.28
+2856.67 , -1122.83 , -322.46
+2856.67 , -1049.23 , -302.59
+2856.67 , -975.63 , -282.70
+2856.67 , -902.03 , -262.76
+2856.67 , -828.43 , -242.77
+2856.67 , -754.82 , -222.75
+2856.67 , -681.22 , -202.68
+2856.67 , -607.62 , -182.57
+2856.67 , -534.02 , -162.42
+2856.67 , -460.42 , -142.23
+2856.67 , -386.81 , -122.00
+2856.67 , -313.21 , -101.73
+2856.67 , -239.61 , -81.42
+2856.67 , -166.01 , -61.07
+2856.67 , -92.41 , -40.68
+2856.67 , -18.80 , -20.25
+2856.67 , 54.80 , 0.71
+2856.67 , 125.48 , 21.85
+2856.67 , 196.17 , 43.02
+2856.67 , 266.86 , 64.24
+2856.67 , 337.55 , 85.50
+2856.67 , 408.23 , 106.81
+2856.67 , 478.92 , 128.15
+2856.67 , 549.61 , 149.54
+2856.67 , 620.30 , 170.97
+2856.67 , 690.98 , 192.44
+2856.67 , 761.67 , 213.95
+2856.67 , 832.36 , 235.50
+2856.67 , 903.05 , 257.10
+2856.67 , 973.73 , 278.73
+2856.67 , 1044.42 , 300.41
+2856.67 , 1115.11 , 322.13
+2856.67 , 1185.79 , 343.88
+2856.67 , 1256.48 , 365.68
+2856.67 , 1327.17 , 387.52
+2856.67 , 1397.86 , 409.42
+2856.67 , 1468.54 , 431.34
+2856.67 , 1539.23 , 453.30
+2856.67 , 1609.92 , 475.32
+2856.67 , 1680.61 , 497.36
+2856.67 , 1751.29 , 519.44
+2856.67 , 1821.98 , 541.58
+2856.67 , 1892.67 , 563.76
+2856.67 , 1963.35 , 585.97
+2856.67 , 2034.04 , 608.23
+2856.67 , 2104.73 , 630.53
+2856.67 , 2175.42 , 652.86
+2856.67 , 2246.10 , 675.27
+2856.67 , 2316.79 , 697.67
+3060.68 , -2297.57 , -681.87
+3060.68 , -2223.96 , -661.18
+3060.68 , -2150.36 , -640.47
+3060.68 , -2076.76 , -619.69
+3060.68 , -2003.16 , -598.91
+3060.68 , -1929.56 , -578.05
+3060.68 , -1855.95 , -557.17
+3060.68 , -1782.35 , -536.24
+3060.68 , -1708.75 , -515.26
+3060.68 , -1635.15 , -494.26
+3060.68 , -1561.55 , -473.21
+3060.68 , -1487.94 , -452.12
+3060.68 , -1414.34 , -430.99
+3060.68 , -1340.74 , -409.82
+3060.68 , -1267.14 , -388.63
+3060.68 , -1193.54 , -367.36
+3060.68 , -1119.94 , -346.07
+3060.68 , -1046.33 , -324.73
+3060.68 , -972.73 , -303.36
+3060.68 , -899.13 , -281.95
+3060.68 , -825.53 , -260.49
+3060.68 , -751.93 , -239.00
+3060.68 , -678.32 , -217.46
+3060.68 , -604.72 , -195.89
+3060.68 , -531.12 , -174.27
+3060.68 , -457.52 , -152.61
+3060.68 , -383.92 , -130.91
+3060.68 , -310.31 , -109.17
+3060.68 , -236.71 , -87.39
+3060.68 , -163.11 , -65.57
+3060.68 , -89.51 , -43.71
+3060.68 , -15.91 , -21.80
+3060.68 , 57.70 , 0.67
+3060.68 , 128.38 , 23.30
+3060.68 , 199.07 , 45.99
+3060.68 , 269.76 , 68.71
+3060.68 , 340.45 , 91.47
+3060.68 , 411.13 , 114.27
+3060.68 , 481.82 , 137.12
+3060.68 , 552.51 , 160.00
+3060.68 , 623.19 , 182.93
+3060.68 , 693.88 , 205.90
+3060.68 , 764.57 , 228.91
+3060.68 , 835.26 , 251.97
+3060.68 , 905.94 , 275.07
+3060.68 , 976.63 , 298.19
+3060.68 , 1047.32 , 321.39
+3060.68 , 1118.01 , 344.58
+3060.68 , 1188.69 , 367.85
+3060.68 , 1259.38 , 391.15
+3060.68 , 1330.07 , 414.49
+3060.68 , 1400.76 , 437.88
+3060.68 , 1471.44 , 461.32
+3060.68 , 1542.13 , 484.78
+3060.68 , 1612.82 , 508.29
+3060.68 , 1683.50 , 531.85
+3060.68 , 1754.19 , 555.44
+3060.68 , 1824.88 , 579.07
+3060.68 , 1895.57 , 602.75
+3060.68 , 1966.25 , 626.45
+3060.68 , 2036.94 , 650.21
+3060.68 , 2107.63 , 674.01
+3060.68 , 2178.32 , 697.86
+3060.68 , 2249.00 , 721.73
+3060.68 , 2319.69 , 745.66
+3264.70 , -2294.67 , -728.99
+3264.70 , -2221.07 , -706.83
+3264.70 , -2147.46 , -684.65
+3264.70 , -2073.86 , -662.42
+3264.70 , -2000.26 , -640.14
+3264.70 , -1926.66 , -617.84
+3264.70 , -1853.06 , -595.46
+3264.70 , -1779.45 , -573.09
+3264.70 , -1705.85 , -550.64
+3264.70 , -1632.25 , -528.17
+3264.70 , -1558.65 , -505.65
+3264.70 , -1485.05 , -483.10
+3264.70 , -1411.44 , -460.48
+3264.70 , -1337.84 , -437.84
+3264.70 , -1264.24 , -415.18
+3264.70 , -1190.64 , -392.44
+3264.70 , -1117.04 , -369.68
+3264.70 , -1043.43 , -346.89
+3264.70 , -969.83 , -324.05
+3264.70 , -896.23 , -301.17
+3264.70 , -822.63 , -278.24
+3264.70 , -749.03 , -255.27
+3264.70 , -675.42 , -232.26
+3264.70 , -601.82 , -209.22
+3264.70 , -528.22 , -186.13
+3264.70 , -454.62 , -163.00
+3264.70 , -381.02 , -139.83
+3264.70 , -307.41 , -116.62
+3264.70 , -233.81 , -93.37
+3264.70 , -160.21 , -70.08
+3264.70 , -86.61 , -46.75
+3264.70 , -13.01 , -23.38
+3264.70 , 60.59 , 0.61
+3264.70 , 131.28 , 24.75
+3264.70 , 201.97 , 48.93
+3264.70 , 272.66 , 73.15
+3264.70 , 343.34 , 97.42
+3264.70 , 414.03 , 121.72
+3264.70 , 484.72 , 146.07
+3264.70 , 555.41 , 170.46
+3264.70 , 626.09 , 194.89
+3264.70 , 696.78 , 219.36
+3264.70 , 767.47 , 243.88
+3264.70 , 838.16 , 268.43
+3264.70 , 908.84 , 293.03
+3264.70 , 979.53 , 317.65
+3264.70 , 1050.22 , 342.34
+3264.70 , 1120.90 , 367.06
+3264.70 , 1191.59 , 391.82
+3264.70 , 1262.28 , 416.61
+3264.70 , 1332.97 , 441.48
+3264.70 , 1403.65 , 466.36
+3264.70 , 1474.34 , 491.27
+3264.70 , 1545.03 , 516.26
+3264.70 , 1615.72 , 541.27
+3264.70 , 1686.40 , 566.32
+3264.70 , 1757.09 , 591.40
+3264.70 , 1827.78 , 616.53
+3264.70 , 1898.47 , 641.71
+3264.70 , 1969.15 , 666.93
+3264.70 , 2039.84 , 692.18
+3264.70 , 2110.53 , 717.51
+3264.70 , 2181.21 , 742.83
+3264.70 , 2251.90 , 768.22
+3264.70 , 2322.59 , 793.64
+3468.80 , -2291.77 , -776.14
+3468.80 , -2218.17 , -752.51
+3468.80 , -2144.56 , -728.86
+3468.80 , -2070.96 , -705.16
+3468.80 , -1997.36 , -681.41
+3468.80 , -1923.76 , -657.63
+3468.80 , -1850.16 , -633.81
+3468.80 , -1776.55 , -609.94
+3468.80 , -1702.95 , -586.02
+3468.80 , -1629.35 , -562.08
+3468.80 , -1555.75 , -538.08
+3468.80 , -1482.15 , -514.07
+3468.80 , -1408.54 , -490.00
+3468.80 , -1334.94 , -465.89
+3468.80 , -1261.34 , -441.73
+3468.80 , -1187.74 , -417.54
+3468.80 , -1114.14 , -393.31
+3468.80 , -1040.53 , -369.05
+3468.80 , -966.93 , -344.72
+3468.80 , -893.33 , -320.37
+3468.80 , -819.73 , -295.99
+3468.80 , -746.13 , -271.56
+3468.80 , -672.52 , -247.07
+3468.80 , -598.92 , -222.56
+3468.80 , -525.32 , -198.00
+3468.80 , -451.72 , -173.40
+3468.80 , -378.12 , -148.76
+3468.80 , -304.51 , -124.09
+3468.80 , -230.91 , -99.36
+3468.80 , -157.31 , -74.61
+3468.80 , -83.71 , -49.81
+3468.80 , -10.11 , -24.96
+3468.80 , 63.49 , 0.55
+3468.80 , 134.18 , 26.19
+3468.80 , 204.87 , 51.87
+3468.80 , 275.56 , 77.59
+3468.80 , 346.24 , 103.36
+3468.80 , 416.93 , 129.16
+3468.80 , 487.62 , 155.01
+3468.80 , 558.31 , 180.90
+3468.80 , 628.99 , 206.83
+3468.80 , 699.68 , 232.80
+3468.80 , 770.37 , 258.82
+3468.80 , 841.06 , 284.87
+3468.80 , 911.74 , 310.96
+3468.80 , 982.43 , 337.10
+3468.80 , 1053.12 , 363.29
+3468.80 , 1123.80 , 389.50
+3468.80 , 1194.49 , 415.76
+3468.80 , 1265.18 , 442.08
+3468.80 , 1335.87 , 468.41
+3468.80 , 1406.55 , 494.79
+3468.80 , 1477.24 , 521.23
+3468.80 , 1547.93 , 547.71
+3468.80 , 1618.62 , 574.21
+3468.80 , 1689.30 , 600.76
+3468.80 , 1759.99 , 627.36
+3468.80 , 1830.68 , 653.99
+3468.80 , 1901.37 , 680.69
+3468.80 , 1972.05 , 707.38
+3468.80 , 2042.74 , 734.15
+3468.80 , 2113.43 , 760.95
+3468.80 , 2184.11 , 787.79
+3468.80 , 2254.80 , 814.68
+3468.80 , 2325.49 , 841.62
+3672.82 , -2288.87 , -823.29
+3672.82 , -2215.27 , -798.21
+3672.82 , -2141.66 , -773.07
+3672.82 , -2068.06 , -747.89
+3672.82 , -1994.46 , -722.70
+3672.82 , -1920.86 , -697.43
+3672.82 , -1847.26 , -672.13
+3672.82 , -1773.66 , -646.82
+3672.82 , -1700.05 , -621.43
+3672.82 , -1626.45 , -596.01
+3672.82 , -1552.85 , -570.55
+3672.82 , -1479.25 , -545.06
+3672.82 , -1405.65 , -519.53
+3672.82 , -1332.04 , -493.94
+3672.82 , -1258.44 , -468.33
+3672.82 , -1184.84 , -442.65
+3672.82 , -1111.24 , -416.97
+3672.82 , -1037.64 , -391.22
+3672.82 , -964.03 , -365.44
+3672.82 , -890.43 , -339.61
+3672.82 , -816.83 , -313.74
+3672.82 , -743.23 , -287.84
+3672.82 , -669.63 , -261.90
+3672.82 , -596.02 , -235.91
+3672.82 , -522.42 , -209.89
+3672.82 , -448.82 , -183.82
+3672.82 , -375.22 , -157.71
+3672.82 , -301.62 , -131.56
+3672.82 , -228.01 , -105.37
+3672.82 , -154.41 , -79.14
+3672.82 , -80.81 , -52.87
+3672.82 , -7.21 , -26.56
+3672.82 , 66.39 , 0.47
+3672.82 , 137.08 , 27.61
+3672.82 , 207.77 , 54.80
+3672.82 , 278.46 , 82.02
+3672.82 , 349.14 , 109.28
+3672.82 , 419.83 , 136.59
+3672.82 , 490.52 , 163.94
+3672.82 , 561.20 , 191.33
+3672.82 , 631.89 , 218.77
+3672.82 , 702.58 , 246.24
+3672.82 , 773.27 , 273.76
+3672.82 , 843.95 , 301.30
+3672.82 , 914.64 , 328.91
+3672.82 , 985.33 , 356.55
+3672.82 , 1056.02 , 384.21
+3672.82 , 1126.70 , 411.95
+3672.82 , 1197.39 , 439.70
+3672.82 , 1268.08 , 467.51
+3672.82 , 1338.77 , 495.37
+3672.82 , 1409.45 , 523.25
+3672.82 , 1480.14 , 551.18
+3672.82 , 1550.83 , 579.15
+3672.82 , 1621.51 , 607.15
+3672.82 , 1692.20 , 635.23
+3672.82 , 1762.89 , 663.30
+3672.82 , 1833.58 , 691.44
+3672.82 , 1904.26 , 719.61
+3672.82 , 1974.95 , 747.83
+3672.82 , 2045.64 , 776.10
+3672.82 , 2116.33 , 804.42
+3672.82 , 2187.01 , 832.75
+3672.82 , 2257.70 , 861.14
+3672.82 , 2328.39 , 889.58
+3876.84 , -2285.97 , -870.47
+3876.84 , -2212.37 , -843.90
+3876.84 , -2138.77 , -817.30
+3876.84 , -2065.16 , -790.66
+3876.84 , -1991.56 , -763.99
+3876.84 , -1917.96 , -737.25
+3876.84 , -1844.36 , -710.48
+3876.84 , -1770.76 , -683.70
+3876.84 , -1697.15 , -656.83
+3876.84 , -1623.55 , -629.95
+3876.84 , -1549.95 , -603.04
+3876.84 , -1476.35 , -576.06
+3876.84 , -1402.75 , -549.05
+3876.84 , -1329.14 , -521.99
+3876.84 , -1255.54 , -494.92
+3876.84 , -1181.94 , -467.79
+3876.84 , -1108.34 , -440.61
+3876.84 , -1034.74 , -413.41
+3876.84 , -961.13 , -386.16
+3876.84 , -887.53 , -358.87
+3876.84 , -813.93 , -331.52
+3876.84 , -740.33 , -304.15
+3876.84 , -666.73 , -276.73
+3876.84 , -593.13 , -249.28
+3876.84 , -519.52 , -221.79
+3876.84 , -445.92 , -194.25
+3876.84 , -372.32 , -166.67
+3876.84 , -298.72 , -139.05
+3876.84 , -225.12 , -111.40
+3876.84 , -151.51 , -83.70
+3876.84 , -77.91 , -55.96
+3876.84 , -4.31 , -28.18
+3876.84 , 69.29 , 0.39
+3876.84 , 139.98 , 29.03
+3876.84 , 210.67 , 57.71
+3876.84 , 281.35 , 86.44
+3876.84 , 352.04 , 115.20
+3876.84 , 422.73 , 144.01
+3876.84 , 493.42 , 172.86
+3876.84 , 564.10 , 201.75
+3876.84 , 634.79 , 230.69
+3876.84 , 705.48 , 259.65
+3876.84 , 776.17 , 288.67
+3876.84 , 846.85 , 317.73
+3876.84 , 917.54 , 346.82
+3876.84 , 988.23 , 375.97
+3876.84 , 1058.91 , 405.16
+3876.84 , 1129.60 , 434.36
+3876.84 , 1200.29 , 463.64
+3876.84 , 1270.98 , 492.95
+3876.84 , 1341.66 , 522.30
+3876.84 , 1412.35 , 551.67
+3876.84 , 1483.04 , 581.10
+3876.84 , 1553.73 , 610.57
+3876.84 , 1624.41 , 640.09
+3876.84 , 1695.10 , 669.64
+3876.84 , 1765.79 , 699.26
+3876.84 , 1836.48 , 728.87
+3876.84 , 1907.16 , 758.56
+3876.84 , 1977.85 , 788.28
+3876.84 , 2048.54 , 818.04
+3876.84 , 2119.22 , 847.85
+3876.84 , 2189.91 , 877.69
+3876.84 , 2260.60 , 907.57
+3876.84 , 2331.29 , 937.51
+4080.85 , -2283.07 , -917.65
+4080.85 , -2209.47 , -889.63
+4080.85 , -2135.87 , -861.54
+4080.85 , -2062.27 , -833.42
+4080.85 , -1988.66 , -805.29
+4080.85 , -1915.06 , -777.10
+4080.85 , -1841.46 , -748.86
+4080.85 , -1767.86 , -720.58
+4080.85 , -1694.26 , -692.27
+4080.85 , -1620.65 , -663.91
+4080.85 , -1547.05 , -635.51
+4080.85 , -1473.45 , -607.08
+4080.85 , -1399.85 , -578.60
+4080.85 , -1326.25 , -550.07
+4080.85 , -1252.64 , -521.52
+4080.85 , -1179.04 , -492.93
+4080.85 , -1105.44 , -464.28
+4080.85 , -1031.84 , -435.61
+4080.85 , -958.24 , -406.89
+4080.85 , -884.63 , -378.12
+4080.85 , -811.03 , -349.33
+4080.85 , -737.43 , -320.49
+4080.85 , -663.83 , -291.60
+4080.85 , -590.23 , -262.67
+4080.85 , -516.62 , -233.70
+4080.85 , -443.02 , -204.70
+4080.85 , -369.42 , -175.65
+4080.85 , -295.82 , -146.56
+4080.85 , -222.22 , -117.43
+4080.85 , -148.61 , -88.26
+4080.85 , -75.01 , -59.05
+4080.85 , -1.41 , -29.79
+4080.85 , 72.19 , 0.29
+4080.85 , 142.88 , 30.43
+4080.85 , 213.57 , 60.61
+4080.85 , 284.25 , 90.84
+4080.85 , 354.94 , 121.11
+4080.85 , 425.63 , 151.41
+4080.85 , 496.32 , 181.77
+4080.85 , 567.00 , 212.17
+4080.85 , 637.69 , 242.58
+4080.85 , 708.38 , 273.07
+4080.85 , 779.06 , 303.58
+4080.85 , 849.75 , 334.13
+4080.85 , 920.44 , 364.74
+4080.85 , 991.13 , 395.37
+4080.85 , 1061.81 , 426.07
+4080.85 , 1132.50 , 456.78
+4080.85 , 1203.19 , 487.55
+4080.85 , 1273.88 , 518.35
+4080.85 , 1344.56 , 549.20
+4080.85 , 1415.25 , 580.10
+4080.85 , 1485.94 , 611.02
+4080.85 , 1556.62 , 642.01
+4080.85 , 1627.31 , 673.01
+4080.85 , 1698.00 , 704.07
+4080.85 , 1768.69 , 735.16
+4080.85 , 1839.37 , 766.30
+4080.85 , 1910.06 , 797.49
+4080.85 , 1980.75 , 828.72
+4080.85 , 2051.44 , 859.98
+4080.85 , 2122.12 , 891.29
+4080.85 , 2192.81 , 922.62
+4080.85 , 2263.50 , 954.00
+4080.85 , 2334.19 , 985.43
+4268.63 , -2280.40 , -961.07
+4268.63 , -2206.80 , -931.70
+4268.63 , -2133.20 , -902.26
+4268.63 , -2059.60 , -872.81
+4268.63 , -1986.00 , -843.30
+4268.63 , -1912.39 , -813.76
+4268.63 , -1838.79 , -784.17
+4268.63 , -1765.19 , -754.53
+4268.63 , -1691.59 , -724.87
+4268.63 , -1617.99 , -695.16
+4268.63 , -1544.38 , -665.43
+4268.63 , -1470.78 , -635.62
+4268.63 , -1397.18 , -605.79
+4268.63 , -1323.58 , -575.94
+4268.63 , -1249.98 , -546.01
+4268.63 , -1176.37 , -516.06
+4268.63 , -1102.77 , -486.09
+4268.63 , -1029.17 , -456.04
+4268.63 , -955.57 , -425.97
+4268.63 , -881.97 , -395.84
+4268.63 , -808.36 , -365.70
+4268.63 , -734.76 , -335.51
+4268.63 , -661.16 , -305.27
+4268.63 , -587.56 , -275.00
+4268.63 , -513.96 , -244.68
+4268.63 , -440.35 , -214.32
+4268.63 , -366.75 , -183.92
+4268.63 , -293.15 , -153.48
+4268.63 , -219.55 , -123.00
+4268.63 , -145.95 , -92.48
+4268.63 , -72.34 , -61.91
+4268.63 , 1.26 , -31.27
+4268.63 , 74.86 , 0.18
+4268.63 , 145.55 , 31.71
+4268.63 , 216.23 , 63.27
+4268.63 , 286.92 , 94.88
+4268.63 , 357.61 , 126.53
+4268.63 , 428.30 , 158.22
+4268.63 , 498.98 , 189.95
+4268.63 , 569.67 , 221.72
+4268.63 , 640.36 , 253.53
+4268.63 , 711.05 , 285.39
+4268.63 , 781.73 , 317.28
+4268.63 , 852.42 , 349.22
+4268.63 , 923.11 , 381.20
+4268.63 , 993.79 , 413.23
+4268.63 , 1064.48 , 445.29
+4268.63 , 1135.17 , 477.39
+4268.63 , 1205.86 , 509.55
+4268.63 , 1276.54 , 541.73
+4268.63 , 1347.23 , 573.95
+4268.63 , 1417.92 , 606.23
+4268.63 , 1488.61 , 638.55
+4268.63 , 1559.29 , 670.90
+4268.63 , 1629.98 , 703.29
+4268.63 , 1700.67 , 735.74
+4268.63 , 1771.35 , 768.20
+4268.63 , 1842.04 , 800.72
+4268.63 , 1912.73 , 833.28
+4268.63 , 1983.42 , 865.90
+4268.63 , 2054.10 , 898.54
+4268.63 , 2124.79 , 931.22
+4268.63 , 2195.48 , 963.96
+4268.63 , 2266.17 , 996.71
+4268.63 , 2336.85 , 1029.52
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G6.vemo b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G6.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..499d82e7251224248137dcca47f789e943303338
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-EM_Map_G6.vemo
@@ -0,0 +1,2016 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00 , -2271.19 , 23.82
+0.00 , -2200.62 , 22.44
+0.00 , -2130.06 , 21.09
+0.00 , -2059.49 , 19.79
+0.00 , -1988.92 , 18.53
+0.00 , -1918.35 , 17.31
+0.00 , -1847.78 , 16.13
+0.00 , -1777.21 , 14.99
+0.00 , -1706.64 , 13.89
+0.00 , -1636.07 , 12.84
+0.00 , -1565.50 , 11.83
+0.00 , -1494.93 , 10.85
+0.00 , -1424.36 , 9.92
+0.00 , -1353.79 , 9.04
+0.00 , -1283.22 , 8.19
+0.00 , -1212.65 , 7.38
+0.00 , -1142.08 , 6.62
+0.00 , -1071.51 , 5.90
+0.00 , -1000.94 , 5.21
+0.00 , -930.38 , 4.57
+0.00 , -859.81 , 3.98
+0.00 , -789.24 , 3.42
+0.00 , -717.25 , 2.90
+0.00 , -644.79 , 2.43
+0.00 , -572.28 , 2.00
+0.00 , -499.12 , 1.61
+0.00 , -425.97 , 1.26
+0.00 , -352.81 , 0.95
+0.00 , -279.65 , 0.69
+0.00 , -206.50 , 0.46
+0.00 , -133.34 , 0.28
+0.00 , -60.18 , 0.14
+0.00 , 12.97 , 0.09
+0.00 , 83.95 , 0.21
+0.00 , 154.93 , 0.38
+0.00 , 225.91 , 0.58
+0.00 , 296.89 , 0.83
+0.00 , 367.86 , 1.12
+0.00 , 438.84 , 1.45
+0.00 , 509.82 , 1.82
+0.00 , 580.80 , 2.23
+0.00 , 651.78 , 2.69
+0.00 , 722.76 , 3.19
+0.00 , 793.73 , 3.72
+0.00 , 864.71 , 4.30
+0.00 , 935.69 , 4.93
+0.00 , 1006.67 , 5.59
+0.00 , 1077.65 , 6.29
+0.00 , 1148.62 , 7.04
+0.00 , 1219.60 , 7.83
+0.00 , 1290.58 , 8.65
+0.00 , 1361.56 , 9.52
+0.00 , 1432.54 , 10.44
+0.00 , 1503.52 , 11.39
+0.00 , 1574.49 , 12.38
+0.00 , 1645.47 , 13.42
+0.00 , 1716.45 , 14.50
+0.00 , 1787.43 , 15.62
+0.00 , 1858.41 , 16.78
+0.00 , 1929.39 , 17.98
+0.00 , 2000.36 , 19.22
+0.00 , 2071.34 , 20.51
+0.00 , 2142.32 , 21.84
+0.00 , 2213.30 , 23.20
+0.00 , 2284.28 , 24.61
+40.81 , -2271.72 , 14.01
+40.81 , -2201.15 , 12.93
+40.81 , -2130.58 , 11.90
+40.81 , -2060.02 , 10.90
+40.81 , -1989.45 , 9.95
+40.81 , -1918.88 , 9.04
+40.81 , -1848.31 , 8.18
+40.81 , -1777.74 , 7.35
+40.81 , -1707.17 , 6.57
+40.81 , -1636.60 , 5.82
+40.81 , -1566.03 , 5.12
+40.81 , -1495.46 , 4.46
+40.81 , -1424.89 , 3.84
+40.81 , -1354.32 , 3.26
+40.81 , -1283.75 , 2.73
+40.81 , -1213.18 , 2.23
+40.81 , -1142.61 , 1.78
+40.81 , -1072.04 , 1.37
+40.81 , -1001.47 , 1.01
+40.81 , -930.90 , 0.68
+40.81 , -860.34 , 0.40
+40.81 , -789.77 , 0.16
+40.81 , -717.49 , -0.05
+40.81 , -644.63 , -0.22
+40.81 , -571.75 , -0.35
+40.81 , -498.59 , -0.44
+40.81 , -425.44 , -0.49
+40.81 , -352.28 , -0.50
+40.81 , -279.12 , -0.47
+40.81 , -205.97 , -0.40
+40.81 , -132.81 , -0.28
+40.81 , -59.65 , -0.13
+40.81 , 13.50 , 0.12
+40.81 , 84.48 , 0.54
+40.81 , 155.46 , 1.01
+40.81 , 226.44 , 1.51
+40.81 , 297.42 , 2.06
+40.81 , 368.39 , 2.65
+40.81 , 439.37 , 3.28
+40.81 , 510.35 , 3.95
+40.81 , 581.33 , 4.67
+40.81 , 652.31 , 5.42
+40.81 , 723.28 , 6.22
+40.81 , 794.26 , 7.06
+40.81 , 865.24 , 7.94
+40.81 , 936.22 , 8.86
+40.81 , 1007.20 , 9.82
+40.81 , 1078.18 , 10.83
+40.81 , 1149.15 , 11.88
+40.81 , 1220.13 , 12.96
+40.81 , 1291.11 , 14.09
+40.81 , 1362.09 , 15.26
+40.81 , 1433.07 , 16.48
+40.81 , 1504.05 , 17.73
+40.81 , 1575.02 , 19.02
+40.81 , 1646.00 , 20.36
+40.81 , 1716.98 , 21.74
+40.81 , 1787.96 , 23.16
+40.81 , 1858.94 , 24.62
+40.81 , 1929.91 , 26.12
+40.81 , 2000.89 , 27.67
+40.81 , 2071.87 , 29.25
+40.81 , 2142.85 , 30.88
+40.81 , 2213.83 , 32.55
+40.81 , 2284.81 , 34.26
+81.62 , -2272.25 , 4.20
+81.62 , -2201.68 , 3.43
+81.62 , -2131.11 , 2.71
+81.62 , -2060.54 , 2.04
+81.62 , -1989.98 , 1.41
+81.62 , -1919.41 , 0.82
+81.62 , -1848.84 , 0.27
+81.62 , -1778.27 , -0.23
+81.62 , -1707.70 , -0.70
+81.62 , -1637.13 , -1.12
+81.62 , -1566.56 , -1.51
+81.62 , -1495.99 , -1.85
+81.62 , -1425.42 , -2.15
+81.62 , -1354.85 , -2.42
+81.62 , -1284.28 , -2.64
+81.62 , -1213.71 , -2.82
+81.62 , -1143.14 , -2.96
+81.62 , -1072.57 , -3.06
+81.62 , -1002.00 , -3.12
+81.62 , -931.39 , -3.14
+81.62 , -860.72 , -3.11
+81.62 , -790.06 , -3.05
+81.62 , -717.53 , -2.96
+81.62 , -644.38 , -2.84
+81.62 , -571.22 , -2.68
+81.62 , -498.06 , -2.47
+81.62 , -424.91 , -2.23
+81.62 , -351.75 , -1.95
+81.62 , -278.59 , -1.62
+81.62 , -205.44 , -1.25
+81.62 , -132.28 , -0.85
+81.62 , -59.12 , -0.40
+81.62 , 14.03 , 0.15
+81.62 , 85.01 , 0.87
+81.62 , 155.99 , 1.64
+81.62 , 226.97 , 2.44
+81.62 , 297.94 , 3.29
+81.62 , 368.92 , 4.18
+81.62 , 439.90 , 5.11
+81.62 , 510.88 , 6.09
+81.62 , 581.86 , 7.10
+81.62 , 652.84 , 8.16
+81.62 , 723.81 , 9.26
+81.62 , 794.79 , 10.40
+81.62 , 865.77 , 11.58
+81.62 , 936.75 , 12.80
+81.62 , 1007.73 , 14.06
+81.62 , 1078.71 , 15.37
+81.62 , 1149.68 , 16.71
+81.62 , 1220.66 , 18.10
+81.62 , 1291.64 , 19.53
+81.62 , 1362.62 , 21.00
+81.62 , 1433.60 , 22.51
+81.62 , 1504.57 , 24.07
+81.62 , 1575.55 , 25.66
+81.62 , 1646.53 , 27.30
+81.62 , 1717.51 , 28.98
+81.62 , 1788.49 , 30.70
+81.62 , 1859.47 , 32.46
+81.62 , 1930.44 , 34.27
+81.62 , 2001.42 , 36.11
+81.62 , 2072.40 , 38.00
+81.62 , 2143.38 , 39.92
+81.62 , 2214.36 , 41.89
+81.62 , 2285.34 , 43.91
+122.43 , -2272.78 , -5.44
+122.43 , -2202.21 , -5.89
+122.43 , -2131.64 , -6.29
+122.43 , -2061.07 , -6.66
+122.43 , -1990.50 , -6.98
+122.43 , -1919.94 , -7.26
+122.43 , -1849.37 , -7.50
+122.43 , -1778.80 , -7.70
+122.43 , -1708.23 , -7.87
+122.43 , -1637.66 , -7.98
+122.43 , -1567.09 , -8.06
+122.43 , -1496.52 , -8.10
+122.43 , -1425.95 , -8.10
+122.43 , -1355.38 , -8.06
+122.43 , -1284.81 , -7.97
+122.43 , -1214.24 , -7.85
+122.43 , -1143.67 , -7.68
+122.43 , -1073.10 , -7.48
+122.43 , -1002.53 , -7.23
+122.43 , -931.75 , -6.95
+122.43 , -860.69 , -6.63
+122.43 , -789.63 , -6.26
+122.43 , -717.00 , -5.88
+122.43 , -643.85 , -5.46
+122.43 , -570.69 , -5.01
+122.43 , -497.53 , -4.51
+122.43 , -424.38 , -3.97
+122.43 , -351.22 , -3.39
+122.43 , -278.06 , -2.77
+122.43 , -204.91 , -2.11
+122.43 , -131.75 , -1.41
+122.43 , -58.60 , -0.66
+122.43 , 14.56 , 0.18
+122.43 , 85.54 , 1.20
+122.43 , 156.52 , 2.27
+122.43 , 227.50 , 3.38
+122.43 , 298.47 , 4.53
+122.43 , 369.45 , 5.72
+122.43 , 440.43 , 6.95
+122.43 , 511.41 , 8.22
+122.43 , 582.39 , 9.54
+122.43 , 653.37 , 10.89
+122.43 , 724.34 , 12.29
+122.43 , 795.32 , 13.73
+122.43 , 866.30 , 15.21
+122.43 , 937.28 , 16.73
+122.43 , 1008.26 , 18.30
+122.43 , 1079.23 , 19.90
+122.43 , 1150.21 , 21.55
+122.43 , 1221.19 , 23.24
+122.43 , 1292.17 , 24.97
+122.43 , 1363.15 , 26.74
+122.43 , 1434.13 , 28.56
+122.43 , 1505.10 , 30.41
+122.43 , 1576.08 , 32.31
+122.43 , 1647.06 , 34.24
+122.43 , 1718.04 , 36.22
+122.43 , 1789.02 , 38.24
+122.43 , 1860.00 , 40.31
+122.43 , 1930.97 , 42.41
+122.43 , 2001.95 , 44.55
+122.43 , 2072.93 , 46.74
+122.43 , 2143.91 , 48.97
+122.43 , 2214.89 , 51.24
+122.43 , 2285.86 , 53.55
+163.24 , -2273.31 , -15.04
+163.24 , -2202.74 , -15.18
+163.24 , -2132.17 , -15.28
+163.24 , -2061.60 , -15.34
+163.24 , -1991.03 , -15.36
+163.24 , -1920.46 , -15.34
+163.24 , -1849.90 , -15.27
+163.24 , -1779.33 , -15.17
+163.24 , -1708.76 , -15.02
+163.24 , -1638.19 , -14.84
+163.24 , -1567.62 , -14.61
+163.24 , -1497.05 , -14.34
+163.24 , -1426.48 , -14.04
+163.24 , -1355.91 , -13.69
+163.24 , -1285.34 , -13.30
+163.24 , -1214.77 , -12.87
+163.24 , -1144.20 , -12.40
+163.24 , -1073.63 , -11.89
+163.24 , -1003.06 , -11.34
+163.24 , -932.11 , -10.75
+163.24 , -860.65 , -10.13
+163.24 , -789.20 , -9.47
+163.24 , -716.47 , -8.80
+163.24 , -643.32 , -8.08
+163.24 , -570.16 , -7.33
+163.24 , -497.00 , -6.54
+163.24 , -423.85 , -5.71
+163.24 , -350.69 , -4.83
+163.24 , -277.54 , -3.92
+163.24 , -204.38 , -2.96
+163.24 , -131.22 , -1.97
+163.24 , -58.07 , -0.93
+163.24 , 15.09 , 0.21
+163.24 , 86.07 , 1.53
+163.24 , 157.05 , 2.90
+163.24 , 228.03 , 4.31
+163.24 , 299.00 , 5.76
+163.24 , 369.98 , 7.25
+163.24 , 440.96 , 8.78
+163.24 , 511.94 , 10.35
+163.24 , 582.92 , 11.97
+163.24 , 653.89 , 13.63
+163.24 , 724.87 , 15.33
+163.24 , 795.85 , 17.07
+163.24 , 866.83 , 18.85
+163.24 , 937.81 , 20.67
+163.24 , 1008.79 , 22.54
+163.24 , 1079.76 , 24.44
+163.24 , 1150.74 , 26.39
+163.24 , 1221.72 , 28.38
+163.24 , 1292.70 , 30.41
+163.24 , 1363.68 , 32.48
+163.24 , 1434.66 , 34.59
+163.24 , 1505.63 , 36.75
+163.24 , 1576.61 , 38.95
+163.24 , 1647.59 , 41.18
+163.24 , 1718.57 , 43.46
+163.24 , 1789.55 , 45.78
+163.24 , 1860.52 , 48.15
+163.24 , 1931.50 , 50.55
+163.24 , 2002.48 , 53.00
+163.24 , 2073.46 , 55.48
+163.24 , 2144.44 , 58.01
+163.24 , 2215.42 , 60.58
+163.24 , 2286.39 , 63.20
+204.04 , -2273.84 , -24.63
+204.04 , -2203.27 , -24.47
+204.04 , -2132.70 , -24.26
+204.04 , -2062.13 , -24.02
+204.04 , -1991.56 , -23.73
+204.04 , -1920.99 , -23.40
+204.04 , -1850.42 , -23.03
+204.04 , -1779.86 , -22.62
+204.04 , -1709.29 , -22.17
+204.04 , -1638.72 , -21.68
+204.04 , -1568.15 , -21.15
+204.04 , -1497.58 , -20.58
+204.04 , -1427.01 , -19.96
+204.04 , -1356.44 , -19.31
+204.04 , -1285.87 , -18.62
+204.04 , -1215.30 , -17.88
+204.04 , -1144.73 , -17.11
+204.04 , -1074.16 , -16.29
+204.04 , -1003.59 , -15.43
+204.04 , -932.47 , -14.55
+204.04 , -860.62 , -13.63
+204.04 , -788.77 , -12.68
+204.04 , -715.94 , -11.71
+204.04 , -642.79 , -10.71
+204.04 , -569.63 , -9.66
+204.04 , -496.48 , -8.57
+204.04 , -423.32 , -7.45
+204.04 , -350.16 , -6.28
+204.04 , -277.01 , -5.07
+204.04 , -203.85 , -3.82
+204.04 , -130.69 , -2.53
+204.04 , -57.54 , -1.20
+204.04 , 15.62 , 0.24
+204.04 , 86.60 , 1.86
+204.04 , 157.58 , 3.53
+204.04 , 228.55 , 5.24
+204.04 , 299.53 , 6.99
+204.04 , 370.51 , 8.78
+204.04 , 441.49 , 10.61
+204.04 , 512.47 , 12.49
+204.04 , 583.45 , 14.40
+204.04 , 654.42 , 16.36
+204.04 , 725.40 , 18.36
+204.04 , 796.38 , 20.40
+204.04 , 867.36 , 22.48
+204.04 , 938.34 , 24.61
+204.04 , 1009.32 , 26.77
+204.04 , 1080.29 , 28.98
+204.04 , 1151.27 , 31.23
+204.04 , 1222.25 , 33.52
+204.04 , 1293.23 , 35.85
+204.04 , 1364.21 , 38.22
+204.04 , 1435.18 , 40.63
+204.04 , 1506.16 , 43.09
+204.04 , 1577.14 , 45.59
+204.04 , 1648.12 , 48.12
+204.04 , 1719.10 , 50.70
+204.04 , 1790.08 , 53.33
+204.04 , 1861.05 , 55.99
+204.04 , 1932.03 , 58.69
+204.04 , 2003.01 , 61.44
+204.04 , 2073.99 , 64.23
+204.04 , 2144.97 , 67.06
+204.04 , 2215.95 , 69.93
+204.04 , 2286.92 , 72.84
+244.85 , -2274.37 , -34.22
+244.85 , -2203.80 , -33.75
+244.85 , -2133.23 , -33.23
+244.85 , -2062.66 , -32.68
+244.85 , -1992.09 , -32.09
+244.85 , -1921.52 , -31.46
+244.85 , -1850.95 , -30.78
+244.85 , -1780.38 , -30.07
+244.85 , -1709.82 , -29.31
+244.85 , -1639.25 , -28.52
+244.85 , -1568.68 , -27.68
+244.85 , -1498.11 , -26.80
+244.85 , -1427.54 , -25.88
+244.85 , -1356.97 , -24.92
+244.85 , -1286.40 , -23.92
+244.85 , -1215.83 , -22.88
+244.85 , -1145.26 , -21.80
+244.85 , -1074.69 , -20.68
+244.85 , -1004.12 , -19.52
+244.85 , -932.83 , -18.33
+244.85 , -860.58 , -17.13
+244.85 , -788.34 , -15.89
+244.85 , -715.42 , -14.63
+244.85 , -642.26 , -13.33
+244.85 , -569.10 , -11.99
+244.85 , -495.95 , -10.61
+244.85 , -422.79 , -9.19
+244.85 , -349.63 , -7.72
+244.85 , -276.48 , -6.22
+244.85 , -203.32 , -4.68
+244.85 , -130.16 , -3.09
+244.85 , -57.01 , -1.47
+244.85 , 16.15 , 0.27
+244.85 , 87.13 , 2.19
+244.85 , 158.11 , 4.16
+244.85 , 229.08 , 6.17
+244.85 , 300.06 , 8.22
+244.85 , 371.04 , 10.31
+244.85 , 442.02 , 12.45
+244.85 , 513.00 , 14.62
+244.85 , 583.98 , 16.84
+244.85 , 654.95 , 19.10
+244.85 , 725.93 , 21.40
+244.85 , 796.91 , 23.74
+244.85 , 867.89 , 26.12
+244.85 , 938.87 , 28.54
+244.85 , 1009.84 , 31.01
+244.85 , 1080.82 , 33.52
+244.85 , 1151.80 , 36.06
+244.85 , 1222.78 , 38.65
+244.85 , 1293.76 , 41.29
+244.85 , 1364.74 , 43.96
+244.85 , 1435.71 , 46.67
+244.85 , 1506.69 , 49.43
+244.85 , 1577.67 , 52.23
+244.85 , 1648.65 , 55.06
+244.85 , 1719.63 , 57.95
+244.85 , 1790.61 , 60.87
+244.85 , 1861.58 , 63.83
+244.85 , 1932.56 , 66.84
+244.85 , 2003.54 , 69.88
+244.85 , 2074.52 , 72.97
+244.85 , 2145.50 , 76.10
+244.85 , 2216.47 , 79.27
+244.85 , 2287.45 , 82.48
+285.67 , -2274.90 , -43.79
+285.67 , -2204.33 , -43.01
+285.67 , -2133.76 , -42.20
+285.67 , -2063.19 , -41.34
+285.67 , -1992.62 , -40.44
+285.67 , -1922.05 , -39.50
+285.67 , -1851.48 , -38.52
+285.67 , -1780.91 , -37.50
+285.67 , -1710.34 , -36.44
+285.67 , -1639.78 , -35.34
+285.67 , -1569.21 , -34.20
+285.67 , -1498.64 , -33.02
+285.67 , -1428.07 , -31.79
+285.67 , -1357.50 , -30.53
+285.67 , -1286.93 , -29.22
+285.67 , -1216.36 , -27.88
+285.67 , -1145.79 , -26.49
+285.67 , -1075.22 , -25.07
+285.67 , -1004.65 , -23.60
+285.67 , -933.19 , -22.12
+285.67 , -860.55 , -20.63
+285.67 , -787.91 , -19.10
+285.67 , -714.89 , -17.54
+285.67 , -641.73 , -15.95
+285.67 , -568.57 , -14.32
+285.67 , -495.42 , -12.64
+285.67 , -422.26 , -10.92
+285.67 , -349.10 , -9.17
+285.67 , -275.95 , -7.37
+285.67 , -202.79 , -5.53
+285.67 , -129.63 , -3.65
+285.67 , -56.48 , -1.74
+285.67 , 16.68 , 0.30
+285.67 , 87.66 , 2.53
+285.67 , 158.64 , 4.79
+285.67 , 229.61 , 7.10
+285.67 , 300.59 , 9.45
+285.67 , 371.57 , 11.85
+285.67 , 442.55 , 14.28
+285.67 , 513.53 , 16.75
+285.67 , 584.50 , 19.27
+285.67 , 655.48 , 21.83
+285.67 , 726.46 , 24.43
+285.67 , 797.44 , 27.07
+285.67 , 868.42 , 29.76
+285.67 , 939.40 , 32.48
+285.67 , 1010.37 , 35.24
+285.67 , 1081.35 , 38.05
+285.67 , 1152.33 , 40.90
+285.67 , 1223.31 , 43.79
+285.67 , 1294.29 , 46.72
+285.67 , 1365.27 , 49.70
+285.67 , 1436.24 , 52.71
+285.67 , 1507.22 , 55.77
+285.67 , 1578.20 , 58.87
+285.67 , 1649.18 , 62.01
+285.67 , 1720.16 , 65.19
+285.67 , 1791.13 , 68.41
+285.67 , 1862.11 , 71.67
+285.67 , 1933.09 , 74.98
+285.67 , 2004.07 , 78.33
+285.67 , 2075.05 , 81.72
+285.67 , 2146.03 , 85.15
+285.67 , 2217.00 , 88.62
+285.67 , 2287.98 , 92.13
+326.47 , -2275.43 , -53.36
+326.47 , -2204.86 , -52.27
+326.47 , -2134.29 , -51.15
+326.47 , -2063.72 , -49.99
+326.47 , -1993.15 , -48.79
+326.47 , -1922.58 , -47.54
+326.47 , -1852.01 , -46.26
+326.47 , -1781.44 , -44.93
+326.47 , -1710.87 , -43.57
+326.47 , -1640.30 , -42.16
+326.47 , -1569.74 , -40.71
+326.47 , -1499.17 , -39.22
+326.47 , -1428.60 , -37.69
+326.47 , -1358.03 , -36.12
+326.47 , -1287.46 , -34.51
+326.47 , -1216.89 , -32.86
+326.47 , -1146.32 , -31.17
+326.47 , -1075.75 , -29.44
+326.47 , -1005.18 , -27.66
+326.47 , -933.55 , -25.89
+326.47 , -860.51 , -24.12
+326.47 , -787.48 , -22.31
+326.47 , -714.36 , -20.46
+326.47 , -641.20 , -18.57
+326.47 , -568.04 , -16.64
+326.47 , -494.89 , -14.67
+326.47 , -421.73 , -12.66
+326.47 , -348.57 , -10.61
+326.47 , -275.42 , -8.52
+326.47 , -202.26 , -6.39
+326.47 , -129.10 , -4.22
+326.47 , -55.95 , -2.00
+326.47 , 17.21 , 0.33
+326.47 , 88.19 , 2.86
+326.47 , 159.16 , 5.42
+326.47 , 230.14 , 8.03
+326.47 , 301.12 , 10.68
+326.47 , 372.10 , 13.38
+326.47 , 443.08 , 16.11
+326.47 , 514.06 , 18.89
+326.47 , 585.03 , 21.71
+326.47 , 656.01 , 24.56
+326.47 , 726.99 , 27.47
+326.47 , 797.97 , 30.41
+326.47 , 868.95 , 33.39
+326.47 , 939.93 , 36.41
+326.47 , 1010.90 , 39.48
+326.47 , 1081.88 , 42.59
+326.47 , 1152.86 , 45.74
+326.47 , 1223.84 , 48.93
+326.47 , 1294.82 , 52.16
+326.47 , 1365.79 , 55.44
+326.47 , 1436.77 , 58.75
+326.47 , 1507.75 , 62.11
+326.47 , 1578.73 , 65.51
+326.47 , 1649.71 , 68.95
+326.47 , 1720.69 , 72.43
+326.47 , 1791.66 , 75.95
+326.47 , 1862.64 , 79.52
+326.47 , 1933.62 , 83.12
+326.47 , 2004.60 , 86.77
+326.47 , 2075.58 , 90.46
+326.47 , 2146.56 , 94.19
+326.47 , 2217.53 , 97.96
+326.47 , 2288.51 , 101.77
+367.28 , -2275.96 , -62.91
+367.28 , -2205.39 , -61.52
+367.28 , -2134.82 , -60.10
+367.28 , -2064.25 , -58.63
+367.28 , -1993.68 , -57.12
+367.28 , -1923.11 , -55.57
+367.28 , -1852.54 , -53.98
+367.28 , -1781.97 , -52.35
+367.28 , -1711.40 , -50.68
+367.28 , -1640.83 , -48.97
+367.28 , -1570.26 , -47.21
+367.28 , -1499.70 , -45.42
+367.28 , -1429.13 , -43.58
+367.28 , -1358.56 , -41.71
+367.28 , -1287.99 , -39.79
+367.28 , -1217.42 , -37.84
+367.28 , -1146.82 , -35.84
+367.28 , -1075.98 , -33.82
+367.28 , -1005.14 , -31.75
+367.28 , -933.30 , -29.68
+367.28 , -860.14 , -27.62
+367.28 , -786.98 , -25.52
+367.28 , -713.83 , -23.38
+367.28 , -640.67 , -21.19
+367.28 , -567.51 , -18.97
+367.28 , -494.36 , -16.71
+367.28 , -421.20 , -14.40
+367.28 , -348.04 , -12.06
+367.28 , -274.89 , -9.67
+367.28 , -201.73 , -7.25
+367.28 , -128.58 , -4.78
+367.28 , -55.42 , -2.27
+367.28 , 17.74 , 0.36
+367.28 , 88.72 , 3.19
+367.28 , 159.69 , 6.05
+367.28 , 230.67 , 8.97
+367.28 , 301.65 , 11.92
+367.28 , 372.63 , 14.91
+367.28 , 443.61 , 17.95
+367.28 , 514.59 , 21.02
+367.28 , 585.56 , 24.14
+367.28 , 656.54 , 27.30
+367.28 , 727.52 , 30.50
+367.28 , 798.50 , 33.74
+367.28 , 869.48 , 37.03
+367.28 , 940.45 , 40.35
+367.28 , 1011.43 , 43.72
+367.28 , 1082.41 , 47.13
+367.28 , 1153.39 , 50.58
+367.28 , 1224.37 , 54.07
+367.28 , 1295.35 , 57.60
+367.28 , 1366.32 , 61.18
+367.28 , 1437.30 , 64.79
+367.28 , 1508.28 , 68.45
+367.28 , 1579.26 , 72.15
+367.28 , 1650.24 , 75.89
+367.28 , 1721.22 , 79.67
+367.28 , 1792.19 , 83.49
+367.28 , 1863.17 , 87.36
+367.28 , 1934.15 , 91.26
+367.28 , 2005.13 , 95.21
+367.28 , 2076.11 , 99.20
+367.28 , 2147.08 , 103.23
+367.28 , 2218.06 , 107.30
+367.28 , 2289.04 , 111.42
+408.09 , -2276.49 , -72.46
+408.09 , -2205.92 , -70.76
+408.09 , -2135.35 , -69.03
+408.09 , -2064.78 , -67.26
+408.09 , -1994.21 , -65.45
+408.09 , -1923.64 , -63.59
+408.09 , -1853.07 , -61.70
+408.09 , -1782.50 , -59.76
+408.09 , -1711.93 , -57.78
+408.09 , -1641.36 , -55.77
+408.09 , -1570.79 , -53.71
+408.09 , -1500.22 , -51.61
+408.09 , -1429.66 , -49.47
+408.09 , -1359.09 , -47.29
+408.09 , -1288.52 , -45.07
+408.09 , -1217.95 , -42.81
+408.09 , -1147.30 , -40.51
+408.09 , -1076.07 , -38.19
+408.09 , -1004.83 , -35.84
+408.09 , -932.77 , -33.48
+408.09 , -859.61 , -31.12
+408.09 , -786.45 , -28.73
+408.09 , -713.30 , -26.29
+408.09 , -640.14 , -23.82
+408.09 , -566.98 , -21.30
+408.09 , -493.83 , -18.74
+408.09 , -420.67 , -16.14
+408.09 , -347.52 , -13.50
+408.09 , -274.36 , -10.82
+408.09 , -201.20 , -8.10
+408.09 , -128.05 , -5.34
+408.09 , -54.89 , -2.54
+408.09 , 18.27 , 0.39
+408.09 , 89.25 , 3.52
+408.09 , 160.22 , 6.69
+408.09 , 231.20 , 9.90
+408.09 , 302.18 , 13.15
+408.09 , 373.16 , 16.44
+408.09 , 444.14 , 19.78
+408.09 , 515.11 , 23.16
+408.09 , 586.09 , 26.57
+408.09 , 657.07 , 30.03
+408.09 , 728.05 , 33.53
+408.09 , 799.03 , 37.08
+408.09 , 870.01 , 40.66
+408.09 , 940.98 , 44.29
+408.09 , 1011.96 , 47.96
+408.09 , 1082.94 , 51.66
+408.09 , 1153.92 , 55.42
+408.09 , 1224.90 , 59.21
+408.09 , 1295.88 , 63.04
+408.09 , 1366.85 , 66.91
+408.09 , 1437.83 , 70.83
+408.09 , 1508.81 , 74.79
+408.09 , 1579.79 , 78.79
+408.09 , 1650.77 , 82.83
+408.09 , 1721.74 , 86.91
+408.09 , 1792.72 , 91.03
+408.09 , 1863.70 , 95.20
+408.09 , 1934.68 , 99.41
+408.09 , 2005.66 , 103.66
+408.09 , 2076.64 , 107.95
+408.09 , 2147.61 , 112.28
+408.09 , 2218.59 , 116.65
+408.09 , 2289.57 , 121.06
+448.90 , -2277.02 , -81.99
+448.90 , -2206.45 , -80.00
+448.90 , -2135.88 , -77.96
+448.90 , -2065.31 , -75.88
+448.90 , -1994.74 , -73.76
+448.90 , -1924.17 , -71.60
+448.90 , -1853.60 , -69.40
+448.90 , -1783.03 , -67.16
+448.90 , -1712.46 , -64.88
+448.90 , -1641.89 , -62.55
+448.90 , -1571.32 , -60.19
+448.90 , -1500.75 , -57.79
+448.90 , -1430.18 , -55.34
+448.90 , -1359.62 , -52.86
+448.90 , -1289.05 , -50.33
+448.90 , -1218.48 , -47.76
+448.90 , -1147.78 , -45.16
+448.90 , -1076.15 , -42.56
+448.90 , -1004.53 , -39.93
+448.90 , -932.24 , -37.28
+448.90 , -859.08 , -34.63
+448.90 , -785.92 , -31.94
+448.90 , -712.77 , -29.21
+448.90 , -639.61 , -26.44
+448.90 , -566.46 , -23.63
+448.90 , -493.30 , -20.77
+448.90 , -420.14 , -17.88
+448.90 , -346.99 , -14.95
+448.90 , -273.83 , -11.97
+448.90 , -200.67 , -8.96
+448.90 , -127.52 , -5.90
+448.90 , -54.36 , -2.81
+448.90 , 18.80 , 0.42
+448.90 , 89.77 , 3.85
+448.90 , 160.75 , 7.32
+448.90 , 231.73 , 10.83
+448.90 , 302.71 , 14.38
+448.90 , 373.69 , 17.97
+448.90 , 444.67 , 21.61
+448.90 , 515.64 , 25.29
+448.90 , 586.62 , 29.01
+448.90 , 657.60 , 32.77
+448.90 , 728.58 , 36.57
+448.90 , 799.56 , 40.41
+448.90 , 870.54 , 44.30
+448.90 , 941.51 , 48.22
+448.90 , 1012.49 , 52.19
+448.90 , 1083.47 , 56.20
+448.90 , 1154.45 , 60.25
+448.90 , 1225.43 , 64.34
+448.90 , 1296.40 , 68.48
+448.90 , 1367.38 , 72.65
+448.90 , 1438.36 , 76.87
+448.90 , 1509.34 , 81.13
+448.90 , 1580.32 , 85.43
+448.90 , 1651.30 , 89.77
+448.90 , 1722.27 , 94.15
+448.90 , 1793.25 , 98.58
+448.90 , 1864.23 , 103.04
+448.90 , 1935.21 , 107.55
+448.90 , 2006.19 , 112.10
+448.90 , 2077.17 , 116.69
+448.90 , 2148.14 , 121.32
+448.90 , 2219.12 , 126.00
+448.90 , 2290.10 , 130.71
+489.71 , -2277.55 , -91.52
+489.71 , -2206.98 , -89.22
+489.71 , -2136.41 , -86.88
+489.71 , -2065.84 , -84.50
+489.71 , -1995.27 , -82.07
+489.71 , -1924.70 , -79.60
+489.71 , -1854.13 , -77.10
+489.71 , -1783.56 , -74.55
+489.71 , -1712.99 , -71.96
+489.71 , -1642.42 , -69.34
+489.71 , -1571.85 , -66.67
+489.71 , -1501.28 , -63.96
+489.71 , -1430.71 , -61.21
+489.71 , -1360.14 , -58.42
+489.71 , -1289.58 , -55.58
+489.71 , -1219.01 , -52.71
+489.71 , -1148.26 , -49.81
+489.71 , -1076.24 , -46.93
+489.71 , -1004.22 , -44.01
+489.71 , -931.71 , -41.08
+489.71 , -858.55 , -38.13
+489.71 , -785.40 , -35.15
+489.71 , -712.24 , -32.12
+489.71 , -639.08 , -29.06
+489.71 , -565.93 , -25.96
+489.71 , -492.77 , -22.81
+489.71 , -419.61 , -19.62
+489.71 , -346.46 , -16.39
+489.71 , -273.30 , -13.12
+489.71 , -200.14 , -9.82
+489.71 , -126.99 , -6.47
+489.71 , -53.83 , -3.08
+489.71 , 19.33 , 0.45
+489.71 , 90.30 , 4.18
+489.71 , 161.28 , 7.95
+489.71 , 232.26 , 11.76
+489.71 , 303.24 , 15.61
+489.71 , 374.22 , 19.51
+489.71 , 445.20 , 23.44
+489.71 , 516.17 , 27.42
+489.71 , 587.15 , 31.44
+489.71 , 658.13 , 35.50
+489.71 , 729.11 , 39.60
+489.71 , 800.09 , 43.75
+489.71 , 871.06 , 47.93
+489.71 , 942.04 , 52.16
+489.71 , 1013.02 , 56.43
+489.71 , 1084.00 , 60.74
+489.71 , 1154.98 , 65.09
+489.71 , 1225.96 , 69.48
+489.71 , 1296.93 , 73.92
+489.71 , 1367.91 , 78.39
+489.71 , 1438.89 , 82.91
+489.71 , 1509.87 , 87.47
+489.71 , 1580.85 , 92.07
+489.71 , 1651.83 , 96.71
+489.71 , 1722.80 , 101.39
+489.71 , 1793.78 , 106.12
+489.71 , 1864.76 , 110.88
+489.71 , 1935.74 , 115.69
+489.71 , 2006.72 , 120.54
+489.71 , 2077.69 , 125.43
+489.71 , 2148.67 , 130.36
+489.71 , 2219.65 , 135.34
+489.71 , 2290.63 , 140.35
+816.18 , -2281.78 , -167.43
+816.18 , -2211.21 , -162.69
+816.18 , -2140.64 , -157.90
+816.18 , -2070.07 , -153.08
+816.18 , -1999.50 , -148.21
+816.18 , -1928.94 , -143.30
+816.18 , -1858.37 , -138.35
+816.18 , -1787.80 , -133.36
+816.18 , -1717.23 , -128.33
+816.18 , -1646.66 , -123.26
+816.18 , -1576.09 , -118.15
+816.18 , -1505.52 , -113.00
+816.18 , -1434.95 , -107.81
+816.18 , -1364.38 , -102.57
+816.18 , -1292.19 , -97.44
+816.18 , -1219.60 , -92.30
+816.18 , -1146.94 , -87.12
+816.18 , -1073.79 , -81.95
+816.18 , -1000.63 , -76.73
+816.18 , -927.47 , -71.48
+816.18 , -854.32 , -66.18
+816.18 , -781.16 , -60.84
+816.18 , -708.00 , -55.46
+816.18 , -634.85 , -50.04
+816.18 , -561.69 , -44.58
+816.18 , -488.53 , -39.08
+816.18 , -415.38 , -33.54
+816.18 , -342.22 , -27.96
+816.18 , -269.06 , -22.34
+816.18 , -195.91 , -16.67
+816.18 , -122.75 , -10.97
+816.18 , -49.60 , -5.23
+816.18 , 23.56 , 0.69
+816.18 , 94.54 , 6.82
+816.18 , 165.52 , 12.99
+816.18 , 236.50 , 19.21
+816.18 , 307.47 , 25.47
+816.18 , 378.45 , 31.77
+816.18 , 449.43 , 38.11
+816.18 , 520.41 , 44.49
+816.18 , 591.39 , 50.91
+816.18 , 662.37 , 57.37
+816.18 , 733.34 , 63.88
+816.18 , 804.32 , 70.43
+816.18 , 875.30 , 77.02
+816.18 , 946.28 , 83.65
+816.18 , 1017.26 , 90.32
+816.18 , 1088.23 , 97.03
+816.18 , 1159.21 , 103.79
+816.18 , 1230.19 , 110.58
+816.18 , 1301.17 , 117.42
+816.18 , 1372.15 , 124.30
+816.18 , 1443.13 , 131.22
+816.18 , 1514.10 , 138.18
+816.18 , 1585.08 , 145.19
+816.18 , 1656.06 , 152.23
+816.18 , 1727.04 , 159.32
+816.18 , 1798.02 , 166.45
+816.18 , 1869.00 , 173.62
+816.18 , 1939.97 , 180.83
+816.18 , 2010.95 , 188.08
+816.18 , 2081.93 , 195.38
+816.18 , 2152.91 , 202.72
+816.18 , 2223.89 , 210.09
+816.18 , 2294.87 , 217.51
+1020.26 , -2284.43 , -214.59
+1020.26 , -2213.86 , -208.31
+1020.26 , -2143.29 , -202.00
+1020.26 , -2072.72 , -195.65
+1020.26 , -2002.15 , -189.26
+1020.26 , -1931.58 , -182.82
+1020.26 , -1861.01 , -176.35
+1020.26 , -1790.44 , -169.83
+1020.26 , -1719.87 , -163.27
+1020.26 , -1649.31 , -156.68
+1020.26 , -1578.74 , -150.04
+1020.26 , -1507.48 , -143.43
+1020.26 , -1435.51 , -136.87
+1020.26 , -1363.53 , -130.26
+1020.26 , -1290.61 , -123.71
+1020.26 , -1217.45 , -117.14
+1020.26 , -1144.29 , -110.54
+1020.26 , -1071.14 , -103.89
+1020.26 , -997.98 , -97.21
+1020.26 , -924.83 , -90.48
+1020.26 , -851.67 , -83.71
+1020.26 , -778.51 , -76.90
+1020.26 , -705.36 , -70.05
+1020.26 , -632.20 , -63.16
+1020.26 , -559.04 , -56.23
+1020.26 , -485.89 , -49.26
+1020.26 , -412.73 , -42.25
+1020.26 , -339.57 , -35.19
+1020.26 , -266.42 , -28.10
+1020.26 , -193.26 , -20.97
+1020.26 , -120.10 , -13.79
+1020.26 , -46.95 , -6.58
+1020.26 , 26.21 , 0.83
+1020.26 , 97.19 , 8.47
+1020.26 , 168.17 , 16.15
+1020.26 , 239.14 , 23.86
+1020.26 , 310.12 , 31.62
+1020.26 , 381.10 , 39.42
+1020.26 , 452.08 , 47.27
+1020.26 , 523.06 , 55.15
+1020.26 , 594.03 , 63.08
+1020.26 , 665.01 , 71.04
+1020.26 , 735.99 , 79.05
+1020.26 , 806.97 , 87.10
+1020.26 , 877.95 , 95.19
+1020.26 , 948.93 , 103.33
+1020.26 , 1019.90 , 111.50
+1020.26 , 1090.88 , 119.71
+1020.26 , 1161.86 , 127.97
+1020.26 , 1232.84 , 136.27
+1020.26 , 1303.82 , 144.61
+1020.26 , 1374.80 , 152.99
+1020.26 , 1445.77 , 161.42
+1020.26 , 1516.75 , 169.88
+1020.26 , 1587.73 , 178.39
+1020.26 , 1658.71 , 186.94
+1020.26 , 1729.69 , 195.52
+1020.26 , 1800.66 , 204.16
+1020.26 , 1871.64 , 212.83
+1020.26 , 1942.62 , 221.54
+1020.26 , 2013.60 , 230.30
+1020.26 , 2084.58 , 239.09
+1020.26 , 2155.56 , 247.93
+1020.26 , 2226.53 , 256.82
+1020.26 , 2297.51 , 265.74
+1224.27 , -2287.08 , -261.52
+1224.27 , -2216.51 , -253.73
+1224.27 , -2145.94 , -245.89
+1224.27 , -2075.37 , -238.00
+1224.27 , -2004.80 , -230.08
+1224.27 , -1934.23 , -222.12
+1224.27 , -1863.66 , -214.12
+1224.27 , -1793.09 , -206.07
+1224.27 , -1722.38 , -198.01
+1224.27 , -1651.03 , -189.99
+1224.27 , -1579.67 , -181.93
+1224.27 , -1507.43 , -173.93
+1224.27 , -1434.27 , -166.02
+1224.27 , -1361.12 , -158.06
+1224.27 , -1287.96 , -150.07
+1224.27 , -1214.80 , -142.03
+1224.27 , -1141.65 , -133.96
+1224.27 , -1068.49 , -125.84
+1224.27 , -995.34 , -117.68
+1224.27 , -922.18 , -109.48
+1224.27 , -849.02 , -101.24
+1224.27 , -775.87 , -92.96
+1224.27 , -702.71 , -84.64
+1224.27 , -629.55 , -76.28
+1224.27 , -556.40 , -67.88
+1224.27 , -483.24 , -59.44
+1224.27 , -410.08 , -50.95
+1224.27 , -336.93 , -42.43
+1224.27 , -263.77 , -33.86
+1224.27 , -190.61 , -25.26
+1224.27 , -117.46 , -16.61
+1224.27 , -44.30 , -7.93
+1224.27 , 28.86 , 0.98
+1224.27 , 99.83 , 10.12
+1224.27 , 170.81 , 19.30
+1224.27 , 241.79 , 28.52
+1224.27 , 312.77 , 37.78
+1224.27 , 383.75 , 47.08
+1224.27 , 454.72 , 56.43
+1224.27 , 525.70 , 65.81
+1224.27 , 596.68 , 75.24
+1224.27 , 667.66 , 84.71
+1224.27 , 738.64 , 94.22
+1224.27 , 809.62 , 103.77
+1224.27 , 880.59 , 113.37
+1224.27 , 951.57 , 123.00
+1224.27 , 1022.55 , 132.68
+1224.27 , 1093.53 , 142.40
+1224.27 , 1164.51 , 152.16
+1224.27 , 1235.49 , 161.96
+1224.27 , 1306.46 , 171.80
+1224.27 , 1377.44 , 181.68
+1224.27 , 1448.42 , 191.61
+1224.27 , 1519.40 , 201.58
+1224.27 , 1590.38 , 211.59
+1224.27 , 1661.36 , 221.64
+1224.27 , 1732.33 , 231.73
+1224.27 , 1803.31 , 241.85
+1224.27 , 1874.29 , 252.03
+1224.27 , 1945.27 , 262.25
+1224.27 , 2016.25 , 272.52
+1224.27 , 2087.22 , 282.81
+1224.27 , 2158.20 , 293.15
+1224.27 , 2229.18 , 303.54
+1224.27 , 2300.16 , 313.96
+1428.29 , -2289.72 , -308.21
+1428.29 , -2219.15 , -298.90
+1428.29 , -2148.58 , -289.53
+1428.29 , -2078.02 , -280.12
+1428.29 , -2007.45 , -270.68
+1428.29 , -1936.88 , -261.19
+1428.29 , -1866.16 , -251.68
+1428.29 , -1795.42 , -242.14
+1428.29 , -1724.25 , -232.62
+1428.29 , -1651.10 , -223.36
+1428.29 , -1577.94 , -214.06
+1428.29 , -1504.78 , -204.71
+1428.29 , -1431.63 , -195.33
+1428.29 , -1358.47 , -185.90
+1428.29 , -1285.31 , -176.43
+1428.29 , -1212.16 , -166.93
+1428.29 , -1139.00 , -157.38
+1428.29 , -1065.85 , -147.79
+1428.29 , -992.69 , -138.16
+1428.29 , -919.53 , -128.49
+1428.29 , -846.38 , -118.78
+1428.29 , -773.22 , -109.03
+1428.29 , -700.06 , -99.24
+1428.29 , -626.91 , -89.41
+1428.29 , -553.75 , -79.53
+1428.29 , -480.59 , -69.62
+1428.29 , -407.44 , -59.66
+1428.29 , -334.28 , -49.67
+1428.29 , -261.12 , -39.63
+1428.29 , -187.97 , -29.56
+1428.29 , -114.81 , -19.44
+1428.29 , -41.65 , -9.28
+1428.29 , 31.50 , 1.13
+1428.29 , 102.48 , 11.77
+1428.29 , 173.46 , 22.45
+1428.29 , 244.44 , 33.17
+1428.29 , 315.42 , 43.94
+1428.29 , 386.39 , 54.74
+1428.29 , 457.37 , 65.59
+1428.29 , 528.35 , 76.48
+1428.29 , 599.33 , 87.41
+1428.29 , 670.31 , 98.38
+1428.29 , 741.28 , 109.39
+1428.29 , 812.26 , 120.45
+1428.29 , 883.24 , 131.54
+1428.29 , 954.22 , 142.68
+1428.29 , 1025.20 , 153.86
+1428.29 , 1096.18 , 165.08
+1428.29 , 1167.15 , 176.34
+1428.29 , 1238.13 , 187.65
+1428.29 , 1309.11 , 198.99
+1428.29 , 1380.09 , 210.38
+1428.29 , 1451.07 , 221.80
+1428.29 , 1522.05 , 233.27
+1428.29 , 1593.02 , 244.77
+1428.29 , 1664.00 , 256.35
+1428.29 , 1734.98 , 267.92
+1428.29 , 1805.96 , 279.57
+1428.29 , 1876.94 , 291.24
+1428.29 , 1947.91 , 302.96
+1428.29 , 2018.89 , 314.72
+1428.29 , 2089.87 , 326.51
+1428.29 , 2160.85 , 338.38
+1428.29 , 2231.83 , 350.24
+1428.29 , 2302.81 , 362.18
+1632.39 , -2292.37 , -354.70
+1632.39 , -2221.80 , -343.86
+1632.39 , -2151.23 , -332.97
+1632.39 , -2080.66 , -322.02
+1632.39 , -2010.09 , -311.06
+1632.39 , -1939.52 , -300.04
+1632.39 , -1867.11 , -289.30
+1632.39 , -1794.40 , -278.58
+1632.39 , -1721.61 , -267.82
+1632.39 , -1648.45 , -257.08
+1632.39 , -1575.29 , -246.31
+1632.39 , -1502.14 , -235.49
+1632.39 , -1428.98 , -224.64
+1632.39 , -1355.82 , -213.74
+1632.39 , -1282.67 , -202.80
+1632.39 , -1209.51 , -191.82
+1632.39 , -1136.35 , -180.81
+1632.39 , -1063.20 , -169.75
+1632.39 , -990.04 , -158.65
+1632.39 , -916.88 , -147.50
+1632.39 , -843.73 , -136.32
+1632.39 , -770.57 , -125.10
+1632.39 , -697.41 , -113.84
+1632.39 , -624.26 , -102.53
+1632.39 , -551.10 , -91.19
+1632.39 , -477.95 , -79.80
+1632.39 , -404.79 , -68.38
+1632.39 , -331.63 , -56.91
+1632.39 , -258.48 , -45.40
+1632.39 , -185.32 , -33.86
+1632.39 , -112.16 , -22.27
+1632.39 , -39.01 , -10.64
+1632.39 , 34.15 , 1.27
+1632.39 , 105.13 , 13.42
+1632.39 , 176.11 , 25.60
+1632.39 , 247.08 , 37.82
+1632.39 , 318.06 , 50.09
+1632.39 , 389.04 , 62.40
+1632.39 , 460.02 , 74.75
+1632.39 , 531.00 , 87.14
+1632.39 , 601.98 , 99.57
+1632.39 , 672.95 , 112.05
+1632.39 , 743.93 , 124.56
+1632.39 , 814.91 , 137.12
+1632.39 , 885.89 , 149.72
+1632.39 , 956.87 , 162.36
+1632.39 , 1027.85 , 175.04
+1632.39 , 1098.82 , 187.76
+1632.39 , 1169.80 , 200.52
+1632.39 , 1240.78 , 213.33
+1632.39 , 1311.76 , 226.18
+1632.39 , 1382.74 , 239.06
+1632.39 , 1453.71 , 252.01
+1632.39 , 1524.69 , 264.98
+1632.39 , 1595.67 , 277.98
+1632.39 , 1666.65 , 291.03
+1632.39 , 1737.63 , 304.12
+1632.39 , 1808.61 , 317.27
+1632.39 , 1879.58 , 330.46
+1632.39 , 1950.56 , 343.67
+1632.39 , 2021.54 , 356.94
+1632.39 , 2092.52 , 370.23
+1632.39 , 2163.50 , 383.59
+1632.39 , 2234.48 , 396.98
+1632.39 , 2305.45 , 410.41
+1836.41 , -2295.02 , -400.96
+1836.41 , -2224.45 , -388.59
+1836.41 , -2153.88 , -376.16
+1836.41 , -2082.47 , -363.88
+1836.41 , -2010.38 , -351.65
+1836.41 , -1938.28 , -339.43
+1836.41 , -1865.27 , -327.31
+1836.41 , -1792.12 , -315.19
+1836.41 , -1718.96 , -303.03
+1836.41 , -1645.80 , -290.81
+1836.41 , -1572.65 , -278.57
+1836.41 , -1499.49 , -266.29
+1836.41 , -1426.33 , -253.95
+1836.41 , -1353.18 , -241.58
+1836.41 , -1280.02 , -229.17
+1836.41 , -1206.86 , -216.72
+1836.41 , -1133.71 , -204.23
+1836.41 , -1060.55 , -191.70
+1836.41 , -987.39 , -179.13
+1836.41 , -914.24 , -166.52
+1836.41 , -841.08 , -153.87
+1836.41 , -767.92 , -141.17
+1836.41 , -694.77 , -128.44
+1836.41 , -621.61 , -115.66
+1836.41 , -548.46 , -102.85
+1836.41 , -475.30 , -89.99
+1836.41 , -402.14 , -77.09
+1836.41 , -328.99 , -64.16
+1836.41 , -255.83 , -51.18
+1836.41 , -182.67 , -38.16
+1836.41 , -109.52 , -25.10
+1836.41 , -36.36 , -12.00
+1836.41 , 36.80 , 1.42
+1836.41 , 107.77 , 15.06
+1836.41 , 178.75 , 28.75
+1836.41 , 249.73 , 42.48
+1836.41 , 320.71 , 56.25
+1836.41 , 391.69 , 70.05
+1836.41 , 462.67 , 83.91
+1836.41 , 533.64 , 97.80
+1836.41 , 604.62 , 111.73
+1836.41 , 675.60 , 125.71
+1836.41 , 746.58 , 139.73
+1836.41 , 817.56 , 153.79
+1836.41 , 888.54 , 167.89
+1836.41 , 959.51 , 182.03
+1836.41 , 1030.49 , 196.22
+1836.41 , 1101.47 , 210.44
+1836.41 , 1172.45 , 224.71
+1836.41 , 1243.43 , 239.02
+1836.41 , 1314.41 , 253.38
+1836.41 , 1385.38 , 267.75
+1836.41 , 1456.36 , 282.20
+1836.41 , 1527.34 , 296.67
+1836.41 , 1598.32 , 311.17
+1836.41 , 1669.30 , 325.74
+1836.41 , 1740.27 , 340.33
+1836.41 , 1811.25 , 354.97
+1836.41 , 1882.23 , 369.66
+1836.41 , 1953.21 , 384.38
+1836.41 , 2024.19 , 399.14
+1836.41 , 2095.17 , 413.95
+1836.41 , 2166.14 , 428.81
+1836.41 , 2237.12 , 443.69
+1836.41 , 2308.10 , 458.63
+2040.43 , -2297.45 , -447.05
+2040.43 , -2225.97 , -433.34
+2040.43 , -2154.50 , -419.59
+2040.43 , -2082.09 , -405.98
+2040.43 , -2008.94 , -392.51
+2040.43 , -1935.78 , -378.99
+2040.43 , -1862.63 , -365.45
+2040.43 , -1789.47 , -351.86
+2040.43 , -1716.31 , -338.22
+2040.43 , -1643.16 , -324.54
+2040.43 , -1570.00 , -310.82
+2040.43 , -1496.84 , -297.07
+2040.43 , -1423.69 , -283.26
+2040.43 , -1350.53 , -269.42
+2040.43 , -1277.37 , -255.54
+2040.43 , -1204.22 , -241.63
+2040.43 , -1131.06 , -227.66
+2040.43 , -1057.90 , -213.66
+2040.43 , -984.75 , -199.62
+2040.43 , -911.59 , -185.54
+2040.43 , -838.43 , -171.41
+2040.43 , -765.28 , -157.25
+2040.43 , -692.12 , -143.04
+2040.43 , -618.96 , -128.80
+2040.43 , -545.81 , -114.51
+2040.43 , -472.65 , -100.18
+2040.43 , -399.50 , -85.81
+2040.43 , -326.34 , -71.40
+2040.43 , -253.18 , -56.95
+2040.43 , -180.03 , -42.46
+2040.43 , -106.87 , -27.93
+2040.43 , -33.71 , -13.36
+2040.43 , 39.44 , 1.56
+2040.43 , 110.42 , 16.71
+2040.43 , 181.40 , 31.90
+2040.43 , 252.38 , 47.13
+2040.43 , 323.36 , 62.40
+2040.43 , 394.33 , 77.71
+2040.43 , 465.31 , 93.06
+2040.43 , 536.29 , 108.46
+2040.43 , 607.27 , 123.90
+2040.43 , 678.25 , 139.38
+2040.43 , 749.23 , 154.90
+2040.43 , 820.20 , 170.46
+2040.43 , 891.18 , 186.06
+2040.43 , 962.16 , 201.71
+2040.43 , 1033.14 , 217.39
+2040.43 , 1104.12 , 233.13
+2040.43 , 1175.10 , 248.88
+2040.43 , 1246.07 , 264.71
+2040.43 , 1317.05 , 280.56
+2040.43 , 1388.03 , 296.45
+2040.43 , 1459.01 , 312.38
+2040.43 , 1529.99 , 328.35
+2040.43 , 1600.96 , 344.36
+2040.43 , 1671.94 , 360.43
+2040.43 , 1742.92 , 376.55
+2040.43 , 1813.90 , 392.69
+2040.43 , 1884.88 , 408.85
+2040.43 , 1955.86 , 425.09
+2040.43 , 2026.83 , 441.35
+2040.43 , 2097.81 , 457.66
+2040.43 , 2168.79 , 474.01
+2040.43 , 2239.77 , 490.39
+2040.43 , 2310.75 , 506.85
+2244.53 , -2298.92 , -493.14
+2244.53 , -2225.76 , -478.32
+2244.53 , -2152.60 , -463.45
+2244.53 , -2079.45 , -448.56
+2244.53 , -2006.29 , -433.62
+2244.53 , -1933.13 , -418.63
+2244.53 , -1859.98 , -403.59
+2244.53 , -1786.82 , -388.52
+2244.53 , -1713.66 , -373.41
+2244.53 , -1640.51 , -358.28
+2244.53 , -1567.35 , -343.09
+2244.53 , -1494.19 , -327.86
+2244.53 , -1421.04 , -312.58
+2244.53 , -1347.88 , -297.28
+2244.53 , -1274.73 , -281.92
+2244.53 , -1201.57 , -266.54
+2244.53 , -1128.41 , -251.09
+2244.53 , -1055.26 , -235.63
+2244.53 , -982.10 , -220.11
+2244.53 , -908.94 , -204.56
+2244.53 , -835.79 , -188.96
+2244.53 , -762.63 , -173.33
+2244.53 , -689.47 , -157.65
+2244.53 , -616.32 , -141.93
+2244.53 , -543.16 , -126.17
+2244.53 , -470.00 , -110.38
+2244.53 , -396.85 , -94.54
+2244.53 , -323.69 , -78.65
+2244.53 , -250.53 , -62.74
+2244.53 , -177.38 , -46.77
+2244.53 , -104.22 , -30.77
+2244.53 , -31.07 , -14.73
+2244.53 , 42.09 , 1.71
+2244.53 , 113.07 , 18.36
+2244.53 , 184.05 , 35.05
+2244.53 , 255.03 , 51.78
+2244.53 , 326.00 , 68.55
+2244.53 , 396.98 , 85.37
+2244.53 , 467.96 , 102.22
+2244.53 , 538.94 , 119.12
+2244.53 , 609.92 , 136.06
+2244.53 , 680.90 , 153.04
+2244.53 , 751.87 , 170.06
+2244.53 , 822.85 , 187.13
+2244.53 , 893.83 , 204.23
+2244.53 , 964.81 , 221.38
+2244.53 , 1035.79 , 238.58
+2244.53 , 1106.76 , 255.80
+2244.53 , 1177.74 , 273.08
+2244.53 , 1248.72 , 290.37
+2244.53 , 1319.70 , 307.75
+2244.53 , 1390.68 , 325.14
+2244.53 , 1461.66 , 342.56
+2244.53 , 1532.63 , 360.05
+2244.53 , 1603.61 , 377.57
+2244.53 , 1674.59 , 395.13
+2244.53 , 1745.57 , 412.75
+2244.53 , 1816.55 , 430.38
+2244.53 , 1887.53 , 448.07
+2244.53 , 1958.50 , 465.80
+2244.53 , 2029.48 , 483.56
+2244.53 , 2100.46 , 501.37
+2244.53 , 2171.44 , 519.22
+2244.53 , 2242.42 , 537.13
+2244.53 , 2313.39 , 555.05
+2448.55 , -2296.27 , -540.13
+2448.55 , -2223.11 , -523.84
+2448.55 , -2149.96 , -507.49
+2448.55 , -2076.80 , -491.13
+2448.55 , -2003.64 , -474.69
+2448.55 , -1930.49 , -458.25
+2448.55 , -1857.33 , -441.74
+2448.55 , -1784.17 , -425.20
+2448.55 , -1711.02 , -408.62
+2448.55 , -1637.86 , -392.01
+2448.55 , -1564.70 , -375.35
+2448.55 , -1491.55 , -358.65
+2448.55 , -1418.39 , -341.92
+2448.55 , -1345.24 , -325.12
+2448.55 , -1272.08 , -308.32
+2448.55 , -1198.92 , -291.44
+2448.55 , -1125.77 , -274.54
+2448.55 , -1052.61 , -257.60
+2448.55 , -979.45 , -240.61
+2448.55 , -906.30 , -223.58
+2448.55 , -833.14 , -206.51
+2448.55 , -759.98 , -189.41
+2448.55 , -686.83 , -172.26
+2448.55 , -613.67 , -155.07
+2448.55 , -540.51 , -137.84
+2448.55 , -467.36 , -120.57
+2448.55 , -394.20 , -103.26
+2448.55 , -321.04 , -85.91
+2448.55 , -247.89 , -68.52
+2448.55 , -174.73 , -51.08
+2448.55 , -101.58 , -33.61
+2448.55 , -28.42 , -16.10
+2448.55 , 44.74 , 1.85
+2448.55 , 115.72 , 20.00
+2448.55 , 186.69 , 38.19
+2448.55 , 257.67 , 56.43
+2448.55 , 328.65 , 74.71
+2448.55 , 399.63 , 93.02
+2448.55 , 470.61 , 111.38
+2448.55 , 541.59 , 129.78
+2448.55 , 612.56 , 148.22
+2448.55 , 683.54 , 166.70
+2448.55 , 754.52 , 185.23
+2448.55 , 825.50 , 203.80
+2448.55 , 896.48 , 222.40
+2448.55 , 967.46 , 241.06
+2448.55 , 1038.43 , 259.73
+2448.55 , 1109.41 , 278.48
+2448.55 , 1180.39 , 297.25
+2448.55 , 1251.37 , 316.07
+2448.55 , 1322.35 , 334.92
+2448.55 , 1393.32 , 353.81
+2448.55 , 1464.30 , 372.75
+2448.55 , 1535.28 , 391.74
+2448.55 , 1606.26 , 410.76
+2448.55 , 1677.24 , 429.82
+2448.55 , 1748.22 , 448.93
+2448.55 , 1819.19 , 468.09
+2448.55 , 1890.17 , 487.27
+2448.55 , 1961.15 , 506.50
+2448.55 , 2032.13 , 525.76
+2448.55 , 2103.11 , 545.09
+2448.55 , 2174.09 , 564.44
+2448.55 , 2245.06 , 583.84
+2448.55 , 2316.04 , 603.27
+2652.56 , -2293.62 , -587.11
+2652.56 , -2220.47 , -569.34
+2652.56 , -2147.31 , -551.53
+2652.56 , -2074.15 , -533.69
+2652.56 , -2001.00 , -515.80
+2652.56 , -1927.84 , -497.87
+2652.56 , -1854.68 , -479.91
+2652.56 , -1781.53 , -461.90
+2652.56 , -1708.37 , -443.84
+2652.56 , -1635.21 , -425.76
+2652.56 , -1562.06 , -407.63
+2652.56 , -1488.90 , -389.45
+2652.56 , -1415.74 , -371.23
+2652.56 , -1342.59 , -352.98
+2652.56 , -1269.43 , -334.68
+2652.56 , -1196.28 , -316.35
+2652.56 , -1123.12 , -297.98
+2652.56 , -1049.96 , -279.56
+2652.56 , -976.81 , -261.09
+2652.56 , -903.65 , -242.61
+2652.56 , -830.49 , -224.07
+2652.56 , -757.34 , -205.49
+2652.56 , -684.18 , -186.87
+2652.56 , -611.02 , -168.21
+2652.56 , -537.87 , -149.51
+2652.56 , -464.71 , -130.77
+2652.56 , -391.55 , -111.99
+2652.56 , -318.40 , -93.17
+2652.56 , -245.24 , -74.30
+2652.56 , -172.08 , -55.40
+2652.56 , -98.93 , -36.45
+2652.56 , -25.77 , -17.47
+2652.56 , 47.38 , 1.99
+2652.56 , 118.36 , 21.65
+2652.56 , 189.34 , 41.34
+2652.56 , 260.32 , 61.08
+2652.56 , 331.30 , 80.86
+2652.56 , 402.28 , 100.68
+2652.56 , 473.25 , 120.54
+2652.56 , 544.23 , 140.44
+2652.56 , 615.21 , 160.38
+2652.56 , 686.19 , 180.37
+2652.56 , 757.17 , 200.40
+2652.56 , 828.15 , 220.47
+2652.56 , 899.12 , 240.58
+2652.56 , 970.10 , 260.73
+2652.56 , 1041.08 , 280.92
+2652.56 , 1112.06 , 301.15
+2652.56 , 1183.04 , 321.44
+2652.56 , 1254.01 , 341.76
+2652.56 , 1324.99 , 362.10
+2652.56 , 1395.97 , 382.51
+2652.56 , 1466.95 , 402.95
+2652.56 , 1537.93 , 423.44
+2652.56 , 1608.91 , 443.95
+2652.56 , 1679.88 , 464.51
+2652.56 , 1750.86 , 485.12
+2652.56 , 1821.84 , 505.78
+2652.56 , 1892.82 , 526.48
+2652.56 , 1963.80 , 547.21
+2652.56 , 2034.78 , 567.97
+2652.56 , 2105.75 , 588.79
+2652.56 , 2176.73 , 609.64
+2652.56 , 2247.71 , 630.54
+2652.56 , 2318.69 , 651.49
+2856.67 , -2290.97 , -634.08
+2856.67 , -2217.82 , -614.84
+2856.67 , -2144.66 , -595.58
+2856.67 , -2071.51 , -576.24
+2856.67 , -1998.35 , -556.88
+2856.67 , -1925.19 , -537.50
+2856.67 , -1852.04 , -518.07
+2856.67 , -1778.88 , -498.59
+2856.67 , -1705.72 , -479.06
+2856.67 , -1632.57 , -459.50
+2856.67 , -1559.41 , -439.90
+2856.67 , -1486.25 , -420.25
+2856.67 , -1413.10 , -400.57
+2856.67 , -1339.94 , -380.83
+2856.67 , -1266.78 , -361.08
+2856.67 , -1193.63 , -341.26
+2856.67 , -1120.47 , -321.42
+2856.67 , -1047.31 , -301.52
+2856.67 , -974.16 , -281.61
+2856.67 , -901.00 , -261.64
+2856.67 , -827.85 , -241.63
+2856.67 , -754.69 , -221.58
+2856.67 , -681.53 , -201.49
+2856.67 , -608.38 , -181.36
+2856.67 , -535.22 , -161.19
+2856.67 , -462.06 , -140.97
+2856.67 , -388.91 , -120.72
+2856.67 , -315.75 , -100.43
+2856.67 , -242.59 , -80.09
+2856.67 , -169.44 , -59.72
+2856.67 , -96.28 , -39.30
+2856.67 , -23.12 , -18.84
+2856.67 , 50.03 , 2.13
+2856.67 , 121.01 , 23.29
+2856.67 , 191.99 , 44.49
+2856.67 , 262.97 , 65.73
+2856.67 , 333.95 , 87.01
+2856.67 , 404.92 , 108.33
+2856.67 , 475.90 , 129.69
+2856.67 , 546.88 , 151.10
+2856.67 , 617.86 , 172.54
+2856.67 , 688.84 , 194.03
+2856.67 , 759.81 , 215.56
+2856.67 , 830.79 , 237.13
+2856.67 , 901.77 , 258.75
+2856.67 , 972.75 , 280.40
+2856.67 , 1043.73 , 302.10
+2856.67 , 1114.71 , 323.84
+2856.67 , 1185.68 , 345.61
+2856.67 , 1256.66 , 367.42
+2856.67 , 1327.64 , 389.29
+2856.67 , 1398.62 , 411.20
+2856.67 , 1469.60 , 433.14
+2856.67 , 1540.58 , 455.12
+2856.67 , 1611.55 , 477.16
+2856.67 , 1682.53 , 499.21
+2856.67 , 1753.51 , 521.32
+2856.67 , 1824.49 , 543.48
+2856.67 , 1895.47 , 565.68
+2856.67 , 1966.44 , 587.91
+2856.67 , 2037.42 , 610.18
+2856.67 , 2108.40 , 632.51
+2856.67 , 2179.38 , 654.85
+2856.67 , 2250.36 , 677.28
+2856.67 , 2321.34 , 699.70
+3060.68 , -2288.33 , -681.07
+3060.68 , -2215.17 , -660.36
+3060.68 , -2142.02 , -639.62
+3060.68 , -2068.86 , -618.82
+3060.68 , -1995.70 , -598.01
+3060.68 , -1922.55 , -577.12
+3060.68 , -1849.39 , -556.22
+3060.68 , -1776.23 , -535.27
+3060.68 , -1703.08 , -514.26
+3060.68 , -1629.92 , -493.24
+3060.68 , -1556.76 , -472.16
+3060.68 , -1483.61 , -451.04
+3060.68 , -1410.45 , -429.89
+3060.68 , -1337.29 , -408.69
+3060.68 , -1264.14 , -387.47
+3060.68 , -1190.98 , -366.18
+3060.68 , -1117.82 , -344.86
+3060.68 , -1044.67 , -323.50
+3060.68 , -971.51 , -302.11
+3060.68 , -898.36 , -280.67
+3060.68 , -825.20 , -259.18
+3060.68 , -752.04 , -237.67
+3060.68 , -678.89 , -216.11
+3060.68 , -605.73 , -194.51
+3060.68 , -532.57 , -172.86
+3060.68 , -459.42 , -151.18
+3060.68 , -386.26 , -129.45
+3060.68 , -313.10 , -107.69
+3060.68 , -239.95 , -85.88
+3060.68 , -166.79 , -64.04
+3060.68 , -93.63 , -42.15
+3060.68 , -20.48 , -20.22
+3060.68 , 52.68 , 2.28
+3060.68 , 123.66 , 24.93
+3060.68 , 194.64 , 47.63
+3060.68 , 265.61 , 70.37
+3060.68 , 336.59 , 93.16
+3060.68 , 407.57 , 115.98
+3060.68 , 478.55 , 138.85
+3060.68 , 549.53 , 161.75
+3060.68 , 620.51 , 184.70
+3060.68 , 691.48 , 207.69
+3060.68 , 762.46 , 230.72
+3060.68 , 833.44 , 253.80
+3060.68 , 904.42 , 276.92
+3060.68 , 975.40 , 300.06
+3060.68 , 1046.37 , 323.28
+3060.68 , 1117.35 , 346.49
+3060.68 , 1188.33 , 369.78
+3060.68 , 1259.31 , 393.10
+3060.68 , 1330.29 , 416.46
+3060.68 , 1401.27 , 439.87
+3060.68 , 1472.24 , 463.33
+3060.68 , 1543.22 , 486.81
+3060.68 , 1614.20 , 510.34
+3060.68 , 1685.18 , 533.92
+3060.68 , 1756.16 , 557.53
+3060.68 , 1827.14 , 581.18
+3060.68 , 1898.11 , 604.88
+3060.68 , 1969.09 , 628.61
+3060.68 , 2040.07 , 652.38
+3060.68 , 2111.05 , 676.20
+3060.68 , 2182.03 , 700.07
+3060.68 , 2253.00 , 723.97
+3060.68 , 2323.98 , 747.91
+3264.70 , -2285.68 , -728.05
+3264.70 , -2212.52 , -705.87
+3264.70 , -2139.37 , -683.66
+3264.70 , -2066.21 , -661.40
+3264.70 , -1993.06 , -639.10
+3264.70 , -1919.90 , -616.77
+3264.70 , -1846.74 , -594.36
+3264.70 , -1773.59 , -571.96
+3264.70 , -1700.43 , -549.49
+3264.70 , -1627.27 , -526.99
+3264.70 , -1554.12 , -504.44
+3264.70 , -1480.96 , -481.87
+3264.70 , -1407.80 , -459.22
+3264.70 , -1334.65 , -436.55
+3264.70 , -1261.49 , -413.86
+3264.70 , -1188.33 , -391.09
+3264.70 , -1115.18 , -368.31
+3264.70 , -1042.02 , -345.49
+3264.70 , -968.86 , -322.63
+3264.70 , -895.71 , -299.72
+3264.70 , -822.55 , -276.76
+3264.70 , -749.40 , -253.76
+3264.70 , -676.24 , -230.73
+3264.70 , -603.08 , -207.66
+3264.70 , -529.93 , -184.54
+3264.70 , -456.77 , -161.39
+3264.70 , -383.61 , -138.19
+3264.70 , -310.46 , -114.95
+3264.70 , -237.30 , -91.68
+3264.70 , -164.14 , -68.36
+3264.70 , -90.99 , -45.00
+3264.70 , -17.83 , -21.60
+3264.70 , 55.33 , 2.42
+3264.70 , 126.30 , 26.58
+3264.70 , 197.28 , 50.78
+3264.70 , 268.26 , 75.02
+3264.70 , 339.24 , 99.31
+3264.70 , 410.22 , 123.63
+3264.70 , 481.20 , 148.00
+3264.70 , 552.17 , 172.41
+3264.70 , 623.15 , 196.86
+3264.70 , 694.13 , 221.35
+3264.70 , 765.11 , 245.90
+3264.70 , 836.09 , 270.47
+3264.70 , 907.06 , 295.09
+3264.70 , 978.04 , 319.73
+3264.70 , 1049.02 , 344.44
+3264.70 , 1120.00 , 369.18
+3264.70 , 1190.98 , 393.97
+3264.70 , 1261.96 , 418.78
+3264.70 , 1332.93 , 443.66
+3264.70 , 1403.91 , 468.57
+3264.70 , 1474.89 , 493.51
+3264.70 , 1545.87 , 518.51
+3264.70 , 1616.85 , 543.54
+3264.70 , 1687.83 , 568.62
+3264.70 , 1758.80 , 593.72
+3264.70 , 1829.78 , 618.87
+3264.70 , 1900.76 , 644.07
+3264.70 , 1971.74 , 669.32
+3264.70 , 2042.72 , 694.59
+3264.70 , 2113.69 , 719.93
+3264.70 , 2184.67 , 745.28
+3264.70 , 2255.65 , 770.69
+3264.70 , 2326.63 , 796.13
+3468.80 , -2283.03 , -775.05
+3468.80 , -2209.88 , -751.39
+3468.80 , -2136.72 , -727.71
+3468.80 , -2063.56 , -703.98
+3468.80 , -1990.41 , -680.20
+3468.80 , -1917.25 , -656.40
+3468.80 , -1844.09 , -632.55
+3468.80 , -1770.94 , -608.65
+3468.80 , -1697.78 , -584.70
+3468.80 , -1624.63 , -560.73
+3468.80 , -1551.47 , -536.71
+3468.80 , -1478.31 , -512.66
+3468.80 , -1405.16 , -488.57
+3468.80 , -1332.00 , -464.43
+3468.80 , -1258.84 , -440.24
+3468.80 , -1185.69 , -416.03
+3468.80 , -1112.53 , -391.76
+3468.80 , -1039.37 , -367.48
+3468.80 , -966.22 , -343.12
+3468.80 , -893.06 , -318.73
+3468.80 , -819.90 , -294.33
+3468.80 , -746.75 , -269.87
+3468.80 , -673.59 , -245.36
+3468.80 , -600.43 , -220.81
+3468.80 , -527.28 , -196.23
+3468.80 , -454.12 , -171.60
+3468.80 , -380.97 , -146.93
+3468.80 , -307.81 , -122.22
+3468.80 , -234.65 , -97.47
+3468.80 , -161.50 , -72.69
+3468.80 , -88.34 , -47.86
+3468.80 , -15.18 , -22.99
+3468.80 , 57.97 , 2.55
+3468.80 , 128.95 , 28.22
+3468.80 , 199.93 , 53.92
+3468.80 , 270.91 , 79.67
+3468.80 , 341.89 , 105.45
+3468.80 , 412.86 , 131.28
+3468.80 , 483.84 , 157.15
+3468.80 , 554.82 , 183.07
+3468.80 , 625.80 , 209.02
+3468.80 , 696.78 , 235.01
+3468.80 , 767.76 , 261.06
+3468.80 , 838.73 , 287.12
+3468.80 , 909.71 , 313.24
+3468.80 , 980.69 , 339.40
+3468.80 , 1051.67 , 365.61
+3468.80 , 1122.65 , 391.85
+3468.80 , 1193.63 , 418.14
+3468.80 , 1264.60 , 444.47
+3468.80 , 1335.58 , 470.83
+3468.80 , 1406.56 , 497.23
+3468.80 , 1477.54 , 523.69
+3468.80 , 1548.52 , 550.19
+3468.80 , 1619.49 , 576.72
+3468.80 , 1690.47 , 603.29
+3468.80 , 1761.45 , 629.92
+3468.80 , 1832.43 , 656.57
+3468.80 , 1903.41 , 683.29
+3468.80 , 1974.39 , 710.01
+3468.80 , 2045.36 , 736.80
+3468.80 , 2116.34 , 763.62
+3468.80 , 2187.32 , 790.48
+3468.80 , 2258.30 , 817.40
+3468.80 , 2329.28 , 844.36
+3672.82 , -2280.39 , -822.04
+3672.82 , -2207.23 , -796.93
+3672.82 , -2134.07 , -771.75
+3672.82 , -2060.92 , -746.55
+3672.82 , -1987.76 , -721.32
+3672.82 , -1914.60 , -696.03
+3672.82 , -1841.45 , -670.70
+3672.82 , -1768.29 , -645.35
+3672.82 , -1695.14 , -619.93
+3672.82 , -1621.98 , -594.49
+3672.82 , -1548.82 , -568.99
+3672.82 , -1475.67 , -543.48
+3672.82 , -1402.51 , -517.91
+3672.82 , -1329.35 , -492.30
+3672.82 , -1256.20 , -466.66
+3672.82 , -1183.04 , -440.95
+3672.82 , -1109.88 , -415.24
+3672.82 , -1036.73 , -389.45
+3672.82 , -963.57 , -363.64
+3672.82 , -890.41 , -337.79
+3672.82 , -817.26 , -311.88
+3672.82 , -744.10 , -285.95
+3672.82 , -670.94 , -259.98
+3672.82 , -597.79 , -233.97
+3672.82 , -524.63 , -207.91
+3672.82 , -451.48 , -181.81
+3672.82 , -378.32 , -155.67
+3672.82 , -305.16 , -129.50
+3672.82 , -232.01 , -103.27
+3672.82 , -158.85 , -77.01
+3672.82 , -85.69 , -50.71
+3672.82 , -12.54 , -24.37
+3672.82 , 60.62 , 2.69
+3672.82 , 131.60 , 29.86
+3672.82 , 202.58 , 57.06
+3672.82 , 273.56 , 84.31
+3672.82 , 344.53 , 111.60
+3672.82 , 415.51 , 138.93
+3672.82 , 486.49 , 166.31
+3672.82 , 557.47 , 193.72
+3672.82 , 628.45 , 221.19
+3672.82 , 699.42 , 248.68
+3672.82 , 770.40 , 276.22
+3672.82 , 841.38 , 303.79
+3672.82 , 912.36 , 331.42
+3672.82 , 983.34 , 359.09
+3672.82 , 1054.32 , 386.77
+3672.82 , 1125.29 , 414.53
+3672.82 , 1196.27 , 442.31
+3672.82 , 1267.25 , 470.14
+3672.82 , 1338.23 , 498.02
+3672.82 , 1409.21 , 525.93
+3672.82 , 1480.19 , 553.88
+3672.82 , 1551.16 , 581.88
+3672.82 , 1622.14 , 609.91
+3672.82 , 1693.12 , 638.00
+3672.82 , 1764.10 , 666.10
+3672.82 , 1835.08 , 694.27
+3672.82 , 1906.05 , 722.47
+3672.82 , 1977.03 , 750.71
+3672.82 , 2048.01 , 779.00
+3672.82 , 2118.99 , 807.34
+3672.82 , 2189.97 , 835.70
+3672.82 , 2260.95 , 864.11
+3672.82 , 2331.92 , 892.57
+3876.84 , -2277.74 , -869.05
+3876.84 , -2204.58 , -842.44
+3876.84 , -2131.43 , -815.81
+3876.84 , -2058.27 , -789.14
+3876.84 , -1985.11 , -762.44
+3876.84 , -1911.96 , -735.67
+3876.84 , -1838.80 , -708.87
+3876.84 , -1765.64 , -682.05
+3876.84 , -1692.49 , -655.16
+3876.84 , -1619.33 , -628.24
+3876.84 , -1546.18 , -601.30
+3876.84 , -1473.02 , -574.28
+3876.84 , -1399.86 , -547.24
+3876.84 , -1326.71 , -520.16
+3876.84 , -1253.55 , -493.05
+3876.84 , -1180.39 , -465.89
+3876.84 , -1107.24 , -438.68
+3876.84 , -1034.08 , -411.45
+3876.84 , -960.92 , -384.16
+3876.84 , -887.77 , -356.84
+3876.84 , -814.61 , -329.46
+3876.84 , -741.45 , -302.06
+3876.84 , -668.30 , -274.61
+3876.84 , -595.14 , -247.12
+3876.84 , -521.98 , -219.60
+3876.84 , -448.83 , -192.03
+3876.84 , -375.67 , -164.42
+3876.84 , -302.52 , -136.77
+3876.84 , -229.36 , -109.08
+3876.84 , -156.20 , -81.35
+3876.84 , -83.05 , -53.57
+3876.84 , -9.89 , -25.76
+3876.84 , 63.27 , 2.83
+3876.84 , 134.25 , 31.50
+3876.84 , 205.22 , 60.21
+3876.84 , 276.20 , 88.96
+3876.84 , 347.18 , 117.75
+3876.84 , 418.16 , 146.58
+3876.84 , 489.14 , 175.46
+3876.84 , 560.11 , 204.37
+3876.84 , 631.09 , 233.34
+3876.84 , 702.07 , 262.33
+3876.84 , 773.05 , 291.37
+3876.84 , 844.03 , 320.46
+3876.84 , 915.01 , 349.57
+3876.84 , 985.98 , 378.75
+3876.84 , 1056.96 , 407.96
+3876.84 , 1127.94 , 437.19
+3876.84 , 1198.92 , 466.50
+3876.84 , 1269.90 , 495.83
+3876.84 , 1340.88 , 525.20
+3876.84 , 1411.85 , 554.61
+3876.84 , 1482.83 , 584.06
+3876.84 , 1553.81 , 613.55
+3876.84 , 1624.79 , 643.10
+3876.84 , 1695.77 , 672.67
+3876.84 , 1766.74 , 702.32
+3876.84 , 1837.72 , 731.96
+3876.84 , 1908.70 , 761.68
+3876.84 , 1979.68 , 791.42
+3876.84 , 2050.66 , 821.21
+3876.84 , 2121.64 , 851.04
+3876.84 , 2192.61 , 880.90
+3876.84 , 2263.59 , 910.81
+3876.84 , 2334.57 , 940.77
+4080.85 , -2275.09 , -916.04
+4080.85 , -2201.94 , -887.99
+4080.85 , -2128.78 , -859.87
+4080.85 , -2055.62 , -831.72
+4080.85 , -1982.47 , -803.55
+4080.85 , -1909.31 , -775.32
+4080.85 , -1836.15 , -747.06
+4080.85 , -1763.00 , -718.74
+4080.85 , -1689.84 , -690.40
+4080.85 , -1616.69 , -662.01
+4080.85 , -1543.53 , -633.57
+4080.85 , -1470.37 , -605.10
+4080.85 , -1397.22 , -576.59
+4080.85 , -1324.06 , -548.03
+4080.85 , -1250.90 , -519.45
+4080.85 , -1177.75 , -490.82
+4080.85 , -1104.59 , -462.13
+4080.85 , -1031.43 , -433.43
+4080.85 , -958.28 , -404.68
+4080.85 , -885.12 , -375.87
+4080.85 , -811.96 , -347.05
+4080.85 , -738.81 , -318.17
+4080.85 , -665.65 , -289.25
+4080.85 , -592.49 , -260.29
+4080.85 , -519.34 , -231.29
+4080.85 , -446.18 , -202.25
+4080.85 , -373.03 , -173.17
+4080.85 , -299.87 , -144.05
+4080.85 , -226.71 , -114.88
+4080.85 , -153.56 , -85.68
+4080.85 , -80.40 , -56.44
+4080.85 , -7.24 , -27.14
+4080.85 , 65.91 , 2.97
+4080.85 , 136.89 , 33.14
+4080.85 , 207.87 , 63.35
+4080.85 , 278.85 , 93.60
+4080.85 , 349.83 , 123.90
+4080.85 , 420.80 , 154.23
+4080.85 , 491.78 , 184.61
+4080.85 , 562.76 , 215.04
+4080.85 , 633.74 , 245.48
+4080.85 , 704.72 , 275.99
+4080.85 , 775.70 , 306.53
+4080.85 , 846.67 , 337.11
+4080.85 , 917.65 , 367.75
+4080.85 , 988.63 , 398.40
+4080.85 , 1059.61 , 429.13
+4080.85 , 1130.59 , 459.86
+4080.85 , 1201.57 , 490.67
+4080.85 , 1272.54 , 521.49
+4080.85 , 1343.52 , 552.37
+4080.85 , 1414.50 , 583.29
+4080.85 , 1485.48 , 614.24
+4080.85 , 1556.46 , 645.26
+4080.85 , 1627.44 , 676.28
+4080.85 , 1698.41 , 707.37
+4080.85 , 1769.39 , 738.49
+4080.85 , 1840.37 , 769.66
+4080.85 , 1911.35 , 800.87
+4080.85 , 1982.33 , 832.13
+4080.85 , 2053.30 , 863.42
+4080.85 , 2124.28 , 894.75
+4080.85 , 2195.26 , 926.11
+4080.85 , 2266.24 , 957.52
+4080.85 , 2337.22 , 988.98
+4268.63 , -2272.66 , -959.29
+4268.63 , -2199.50 , -929.88
+4268.63 , -2126.34 , -900.40
+4268.63 , -2053.19 , -870.92
+4268.63 , -1980.03 , -841.37
+4268.63 , -1906.88 , -811.80
+4268.63 , -1833.72 , -782.18
+4268.63 , -1760.56 , -752.50
+4268.63 , -1687.41 , -722.81
+4268.63 , -1614.25 , -693.06
+4268.63 , -1541.09 , -663.29
+4268.63 , -1467.94 , -633.45
+4268.63 , -1394.78 , -603.59
+4268.63 , -1321.62 , -573.70
+4268.63 , -1248.47 , -543.74
+4268.63 , -1175.31 , -513.75
+4268.63 , -1102.15 , -483.74
+4268.63 , -1029.00 , -453.66
+4268.63 , -955.84 , -423.55
+4268.63 , -882.68 , -393.39
+4268.63 , -809.53 , -363.21
+4268.63 , -736.37 , -332.98
+4268.63 , -663.22 , -302.71
+4268.63 , -590.06 , -272.41
+4268.63 , -516.90 , -242.05
+4268.63 , -443.75 , -211.65
+4268.63 , -370.59 , -181.22
+4268.63 , -297.43 , -150.75
+4268.63 , -224.28 , -120.23
+4268.63 , -151.12 , -89.67
+4268.63 , -77.96 , -59.08
+4268.63 , -4.81 , -28.40
+4268.63 , 68.35 , 3.09
+4268.63 , 139.33 , 34.64
+4268.63 , 210.31 , 66.24
+4268.63 , 281.28 , 97.87
+4268.63 , 352.26 , 129.55
+4268.63 , 423.24 , 161.27
+4268.63 , 494.22 , 193.03
+4268.63 , 565.20 , 224.82
+4268.63 , 636.18 , 256.67
+4268.63 , 707.15 , 288.56
+4268.63 , 778.13 , 320.47
+4268.63 , 849.11 , 352.44
+4268.63 , 920.09 , 384.45
+4268.63 , 991.07 , 416.51
+4268.63 , 1062.05 , 448.59
+4268.63 , 1133.02 , 480.73
+4268.63 , 1204.00 , 512.91
+4268.63 , 1274.98 , 545.11
+4268.63 , 1345.96 , 577.37
+4268.63 , 1416.94 , 609.67
+4268.63 , 1487.91 , 642.02
+4268.63 , 1558.89 , 674.40
+4268.63 , 1629.87 , 706.82
+4268.63 , 1700.85 , 739.29
+4268.63 , 1771.83 , 771.79
+4268.63 , 1842.81 , 804.33
+4268.63 , 1913.78 , 836.93
+4268.63 , 1984.76 , 869.57
+4268.63 , 2055.74 , 902.23
+4268.63 , 2126.72 , 934.95
+4268.63 , 2197.70 , 967.71
+4268.63 , 2268.68 , 1000.50
+4268.63 , 2339.65 , 1033.33
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-GBX_6.vgbx b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-GBX_6.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..5865a3e480a3c6fe3797b0d10eb7256b77a493c9
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/IHPC-GBX_6.vgbx
@@ -0,0 +1,75 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2020-09-07T15:26:44.5653903Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "tractor_12gear_example",
+ "Inertia": 0.0,
+ "TracInt": 1.0,
+ "Gears": [
+ {
+ "Ratio": 2.64,
+ "LossMap": "Axle_4x2_Tractor.vtlm"
+ },
+ {
+ "Ratio": 9.15,
+ "LossMap": "Gear_1.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 5.46,
+ "LossMap": "Gear_2.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 3.69,
+ "LossMap": "Gear_3.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 2.15,
+ "LossMap": "Gear_4.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.05,
+ "LossMap": "Gear_5.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 0.95,
+ "LossMap": "Gear_6.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ }
+ ],
+ "TqReserve": 20.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.0,
+ "StartAcc": 0.6,
+ "GearboxType": "IHPC",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAfterUpshiftDelay": 6.0,
+ "UpshiftAfterDownshiftDelay": 6.0,
+ "UpshiftMinAcceleration": 0.1,
+ "PowershiftShiftTime": 0.8
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/MaxCurrent.vimax
new file mode 100644
index 0000000000000000000000000000000000000000..5552bda2b03a9e6d5f0b2de49ea79b598013047f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/MaxCurrent.vimax
@@ -0,0 +1,3 @@
+SOC, I_charge, I_discharge
+0, 280, 280
+100, 280, 280
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Truck.vacc
new file mode 100644
index 0000000000000000000000000000000000000000..54e77864874d21d67e8f8d69a97b35c5c6031749
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIHPC/6SpeedGbx/Truck.vacc
@@ -0,0 +1,6 @@
+v [km/h],acc [m/s²],dec [m/s²]
+0,1,-1
+25,1,-1
+50,0.642857143,-1
+60,0.5,-0.5
+120,0.5,-0.5
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Bus_S3/AxleOnly.vgbx b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Bus_S3/AxleOnly.vgbx
index 8a89626077c2747207415d584a0083b75b901a54..912f2678cf95042c6820876eaf9ba6ae5e596aca 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Bus_S3/AxleOnly.vgbx
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Bus_S3/AxleOnly.vgbx
@@ -14,7 +14,7 @@
{
"Ratio": 3.73,
"LossMap": "Axle.vtlm"
- },
+ }
],
"TqReserve": 20.0,
"ShiftTime": 2.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Bus_S3/S3 Bus.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Bus_S3/S3 Bus.vveh
index a8ce54accfca6c820daae93490a371670edd30db..5d53dcbfdc4923855c4e8715bd423e294ee03edf 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Bus_S3/S3 Bus.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Bus_S3/S3 Bus.vveh
@@ -36,7 +36,7 @@
"RRCISO": 0.0065,
"FzISO": 33350.0,
"Type": "VehicleDriven"
- },
+ }
]
},
"EngineStopStart": true,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/Hybrid_Parameters.vhctl b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/Hybrid_Parameters.vhctl
index 2f2ed814fcff9e24e146e56f0d0ff41378f5a386..b6efcd7e8fcab1a880915e2d55ee4352d8f5d7c4 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/Hybrid_Parameters.vhctl
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/Hybrid_Parameters.vhctl
@@ -7,7 +7,7 @@
},
"Body": {
"----EquivalenceFactor": 2.0,
- "MinSoC": 24.0,
+ "MinSoC": 30.0,
"----MaxSoC": 80.0,
"TargetSoC": 70.0,
"----AuxBufferTime": 5.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/PTO-idle.vptol b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/PTO-idle.vptol
new file mode 100644
index 0000000000000000000000000000000000000000..7d1bdd293625e7cbbfc19603ecffe142ebbf60fe
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/PTO-idle.vptol
@@ -0,0 +1,15 @@
+Engine speed,PTO Torque
+# [rpm],[Nm]
+600,8.04746666666667
+800,11.4109530864198
+1000,15.4686419753086
+1200,20.2205333333333
+1400,25.6666271604938
+1600,31.8069234567901
+1800,38.6414222222222
+2000,46.1701234567901
+2200,54.3930271604938
+2400,63.3101333333333
+2600,72.9214419753087
+2800,83.2269530864197
+3000,94.2266666666667
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vveh
index 4e6c2723b5301a73a6893d559a951305e0ab0466..2798829bcdf02e9d5bf4f652d46cea17c277031a 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vveh
@@ -93,7 +93,7 @@
"EcoRoll": "None",
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
- "CdxA": 4.83,
+ "CdA": 4.83,
"VehicleHeight": 3.0
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_3Speed_PTO.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_3Speed_PTO.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..591660c2aae7f73499f37ec9a2a2a0eb685b50d4
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_3Speed_PTO.vecto
@@ -0,0 +1,57 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2022-02-08T08:23:21.5081224Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "SerialHybrid_S2_PTO.vveh",
+ "GearboxFile": "3speedEV.vgbx",
+ "TCU": "3speedEV.vgbx",
+ "EngineFile": "209kW_7c7l.veng",
+ "HybridStrategyParams": "Hybrid_Parameters.vhctl",
+ "Padd_electric": 0.0,
+ "VACC": "Truck.vacc",
+ "EngineStopStartAtVehicleStopThreshold": 2.0,
+ "EngineStopStartMaxOffTimespan": 120.0,
+ "EngineStopStartUtilityFactor": 0.8,
+ "EngineStopStartUtilityFactorDriving": 0.8,
+ "EcoRollMinSpeed": 60.000000000000007,
+ "EcoRollActivationDelay": 2.0,
+ "EcoRollUnderspeedThreshold": 0.0,
+ "EcoRollMaxAcceleration": 0.1,
+ "PCCEnableSpeed": 80.0,
+ "PCCMinSpeed": 50.0,
+ "PCCUnderspeed": 8.0,
+ "PCCOverSpeed": 5.0,
+ "PCCPreviewDistanceUC1": 1500.0,
+ "PCCPreviewDistanceUC2": 1000.0,
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": "",
+ "MinSpeed": 50.0
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Overspeed",
+ "MinSpeed": 50.0,
+ "OverSpeed": 2.5
+ },
+ "Cycles": [
+ "LongHaul",
+ "RegionalDelivery",
+ "UrbanDelivery",
+ "Construction",
+ "Urban",
+ "Suburban",
+ "Interurban",
+ "Coach"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_PTO.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_PTO.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..ea9889c7a7800677b19f42ee6c2e893a2b23597d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2_PTO.vveh
@@ -0,0 +1,105 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2017-07-13T14:14:29.3226830Z",
+ "AppVersion": "3",
+ "FileVersion": 10
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 1900.0,
+ "Loading": 3020.0,
+ "MassMax": 11.99,
+ "rdyn": 421.0,
+ "PowertrainConfiguration": "SerialHybrid",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "Retarder": {
+ "Type": "None",
+ "Ratio": 1.0,
+ "File": ""
+ },
+ "ElectricMotors": [
+ {
+ "Count": 2,
+ "Ratio": 2,
+ "MechanicalEfficiency": 0.97,
+ "Position": "E2",
+ "MotorFile": "GenericEMotor_125kW_485Nm.vem"
+ },
+ {
+ "Count": 1,
+ "Ratio": 1,
+ "Position": "GEN",
+ "MotorFile": "GenericGen.vem",
+ "MechanicalEfficiency": 1
+ }
+ ],
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "StreamId": 0,
+ "BatteryFile": "GenericBattery.vreess"
+ }
+ ],
+ "InitialSoC": 80,
+ "TorqueLimits": {},
+ "IdlingSpeed": 0.0,
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.3,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 4.5,
+ "Wheels": "235/75 R17.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 16680.0,
+ "Type": "VehicleNonDriven"
+ }
+ ]
+ },
+ "PTO": {
+ "Type": "drive shaft and/or up to 2 gear wheels - multi-disc clutch, oil pump",
+ "LossMap": "PTO-idle.vptol",
+ "Cycle": "",
+ "CycleDriving": ""
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/Conventional_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/Conventional_completedBus_1.xml
index 469016a09d20af3962140f4534995c68d6920011..750c6d33d684d7a9460f342950eb5f4f4832ef9f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/Conventional_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/Conventional_completedBus_1.xml
@@ -75,7 +75,7 @@
<Cooling>non R-744 3-stage</Cooling>
<Heating>none</Heating>
</HeatPumpTypePassengerCompartment>
- <AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+ <AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
<DoubleGlazing>false</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/Conventional_completedBus_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/Conventional_completedBus_2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e6bc8ea28a50a808d19b7d1fe78edc8ab93a7a6c
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/Conventional_completedBus_2.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-06-30T22:00:00Z</Date>
+ <Model>Sample Bus Model</Model>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>500</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+ <AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+ <ClassBus>II+III</ClassBus>
+ <NgTankSystem>Compressed</NgTankSystem><!-- optional -->
+ <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+ <BodyworkCode>CB</BodyworkCode>
+ <LowEntry>false</LowEntry>
+ <HeightIntegratedBody>2500</HeightIntegratedBody>
+ <VehicleLength>9500</VehicleLength>
+ <VehicleWidth>2500</VehicleWidth>
+ <EntranceHeight>2000</EntranceHeight>
+ <DoorDriveTechnology>electric</DoorDriveTechnology>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
+ <ADAS xsi:type="ADAS_Conventional_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ <APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
+ </ADAS>
+ <Components xsi:type="Components_Conventional_CompletedBusType">
+ <AirDrag>
+ <v2.0:Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+ <v2.0:Model>Generic Model</v2.0:Model>
+ <v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+ <v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+ <v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+ <v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+ <v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+ <v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_CompletedBusType">
+ <ElectricSystem>
+ <LEDLights>
+ <Interiorlights>false</Interiorlights>
+ <Dayrunninglights>true</Dayrunninglights>
+ <Positionlights>true</Positionlights>
+ <Brakelights>true</Brakelights>
+ <Headlights>false</Headlights>
+ </LEDLights>
+ </ElectricSystem>
+ <HVAC>
+ <SystemConfiguration>1</SystemConfiguration>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 3-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
+ <AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+ <DoubleGlazing>false</DoubleGlazing>
+ <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+ <SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/HEV_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/HEV_completedBus_1.xml
index 0a35e5eda63337ee20bfeb38454f6571a6addb3e..0a7032c6a0fbf31e5f1a4f09f17b433dd5841b8b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/HEV_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/HEV_completedBus_1.xml
@@ -72,7 +72,7 @@
<Cooling>non R-744 3-stage</Cooling>
<Heating>none</Heating>
</HeatPumpTypePassengerCompartment>
- <AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+ <AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
<DoubleGlazing>false</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/HEV_completedBus_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/HEV_completedBus_2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4e96006be71a54da8cc43006063ebe779b265d46
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/HEV_completedBus_2.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_HEV_CompletedBusDeclarationType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-06-30T22:00:00Z</Date>
+ <Model>Sample Bus Model</Model>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>500</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+ <AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+ <ClassBus>II+III</ClassBus>
+ <NgTankSystem>Compressed</NgTankSystem><!-- optional -->
+ <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+ <BodyworkCode>CB</BodyworkCode>
+ <LowEntry>false</LowEntry>
+ <HeightIntegratedBody>2500</HeightIntegratedBody>
+ <VehicleLength>9500</VehicleLength>
+ <VehicleWidth>2500</VehicleWidth>
+ <EntranceHeight>2000</EntranceHeight>
+ <DoorDriveTechnology>electric</DoorDriveTechnology>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
+ <ADAS xsi:type="ADAS_HEV_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_xEV_CompletedBusType">
+ <AirDrag>
+ <v2.0:Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType">
+ <v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+ <v2.0:Model>Generic Model</v2.0:Model>
+ <v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+ <v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+ <v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+ <v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+ <v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+ <v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ <Auxiliaries>
+ <Data xsi:type="AUX_xEV_CompletedBusType">
+ <ElectricSystem>
+ <LEDLights>
+ <Interiorlights>false</Interiorlights>
+ <Dayrunninglights>true</Dayrunninglights>
+ <Positionlights>true</Positionlights>
+ <Brakelights>true</Brakelights>
+ <Headlights>false</Headlights>
+ </LEDLights>
+ </ElectricSystem>
+ <HVAC>
+ <SystemConfiguration>1</SystemConfiguration>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 3-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
+ <AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+ <DoubleGlazing>false</DoubleGlazing>
+ <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+ <SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+ <WaterElectricHeater>false</WaterElectricHeater>
+ <AirElectricHeater>false</AirElectricHeater>
+ <OtherHeatingTechnology>false</OtherHeatingTechnology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/IEPC_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/IEPC_completedBus_1.xml
index 656f9a00486293d4c31ed3b81afccb29791cd277..d5fa73aefb12ca2a06a194376549fea7908db846 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/IEPC_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/IEPC_completedBus_1.xml
@@ -70,7 +70,7 @@
<Cooling>non R-744 3-stage</Cooling>
<Heating>none</Heating>
</HeatPumpTypePassengerCompartment>
- <AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+ <AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
<DoubleGlazing>false</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/IEPC_completedBus_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/IEPC_completedBus_2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..650c0839f149650a9fd8c88e6b88dcaa969eb865
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/IEPC_completedBus_2.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_IEPC_CompletedBusDeclarationType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-06-30T22:00:00Z</Date>
+ <Model>Sample Bus Model</Model>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>500</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+ <AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+ <ClassBus>II+III</ClassBus>
+ <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+ <BodyworkCode>CB</BodyworkCode>
+ <LowEntry>false</LowEntry>
+ <HeightIntegratedBody>2500</HeightIntegratedBody>
+ <VehicleLength>9500</VehicleLength>
+ <VehicleWidth>2500</VehicleWidth>
+ <EntranceHeight>2000</EntranceHeight>
+ <DoorDriveTechnology>electric</DoorDriveTechnology>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
+ <ADAS xsi:type="ADAS_IEPC_Type">
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_xEV_CompletedBusType">
+ <AirDrag>
+ <v2.0:Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType">
+ <v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+ <v2.0:Model>Generic Model</v2.0:Model>
+ <v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+ <v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+ <v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+ <v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+ <v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+ <v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ <Auxiliaries>
+ <Data xsi:type="AUX_xEV_CompletedBusType">
+ <ElectricSystem>
+ <LEDLights>
+ <Interiorlights>false</Interiorlights>
+ <Dayrunninglights>true</Dayrunninglights>
+ <Positionlights>true</Positionlights>
+ <Brakelights>true</Brakelights>
+ <Headlights>false</Headlights>
+ </LEDLights>
+ </ElectricSystem>
+ <HVAC>
+ <SystemConfiguration>1</SystemConfiguration>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 3-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
+ <AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+ <DoubleGlazing>false</DoubleGlazing>
+ <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+ <SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+ <WaterElectricHeater>false</WaterElectricHeater>
+ <AirElectricHeater>false</AirElectricHeater>
+ <OtherHeatingTechnology>false</OtherHeatingTechnology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/PEV_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/PEV_completedBus_1.xml
index b6a025e1925bcf5cf7aa8e3e7c504837e0d9866e..f1246dde0c61a32286a6ab79651b517f8fd53ca0 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/PEV_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/PEV_completedBus_1.xml
@@ -70,7 +70,7 @@
<Cooling>non R-744 3-stage</Cooling>
<Heating>none</Heating>
</HeatPumpTypePassengerCompartment>
- <AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+ <AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
<DoubleGlazing>false</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/PEV_completedBus_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/PEV_completedBus_2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..454b7206b1200116eb3f32b167e0da96ee4bcefd
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/PEV_completedBus_2.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_PEV_CompletedBusDeclarationType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-06-30T22:00:00Z</Date>
+ <Model>Sample Bus Model</Model>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>500</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+ <AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+ <ClassBus>II+III</ClassBus>
+ <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+ <BodyworkCode>CB</BodyworkCode>
+ <LowEntry>false</LowEntry>
+ <HeightIntegratedBody>2500</HeightIntegratedBody>
+ <VehicleLength>9500</VehicleLength>
+ <VehicleWidth>2500</VehicleWidth>
+ <EntranceHeight>2000</EntranceHeight>
+ <DoorDriveTechnology>electric</DoorDriveTechnology>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
+ <ADAS xsi:type="ADAS_PEV_Type">
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_xEV_CompletedBusType">
+ <AirDrag>
+ <v2.0:Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType">
+ <v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+ <v2.0:Model>Generic Model</v2.0:Model>
+ <v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+ <v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+ <v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+ <v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+ <v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+ <v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ <Auxiliaries>
+ <Data xsi:type="AUX_xEV_CompletedBusType">
+ <ElectricSystem>
+ <LEDLights>
+ <Interiorlights>false</Interiorlights>
+ <Dayrunninglights>true</Dayrunninglights>
+ <Positionlights>true</Positionlights>
+ <Brakelights>true</Brakelights>
+ <Headlights>false</Headlights>
+ </LEDLights>
+ </ElectricSystem>
+ <HVAC>
+ <SystemConfiguration>1</SystemConfiguration>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 3-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
+ <AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+ <DoubleGlazing>false</DoubleGlazing>
+ <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+ <SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+ <WaterElectricHeater>false</WaterElectricHeater>
+ <AirElectricHeater>false</AirElectricHeater>
+ <OtherHeatingTechnology>false</OtherHeatingTechnology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
index 3bda4f34ec817645c286343a2026d70e2a930c6e..224e6a5072033c605bc2604112b7ba6edb825c29 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
@@ -9,7 +9,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>IHPC Type 1</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_1.xml
index e58954177634d38bd199cb204be5bf8a5f07d415..e2af8105f97f3a7358ebdfa0ae662c337ea7ced2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_1.xml
@@ -9,7 +9,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml
index bdce5bf6b70e349efa0d849543033eac3149ce77..3fb5bc97f1248c1d9d0d002dd3ba3534369093d9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml
@@ -9,7 +9,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Standard values</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_1.xml
index c2fb24c4787d8fb6e55d84a518c5685c0fd8361a..9ae8cbb21dd592df8749e3365fddf1cdde133f8f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_1.xml
@@ -9,7 +9,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured for complete component</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_StdValues.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_StdValues.xml
index 82e2b4c3f3a1500c06f73d719ffb0ba61591bb7b..5e0e17ae2e629f96281e09d094eb37171cee7db8 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_StdValues.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_StdValues.xml
@@ -9,7 +9,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Standard values for all components</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Tyre.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Tyre.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0cc588f3e7c9d08f1aa4dd5ede6e32e46584773c
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/Tyre.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+ <tns:Tyre xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <v2.0:Data xsi:type="TyreDataDeclarationType" id="TYR-123" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>Generic Vendor</Manufacturer>
+ <Model>ADC 20</Model>
+ <CertificationNumber>xyz-abc-def</CertificationNumber>
+ <Date>2021-11-18T14:09:17.2810263Z</Date>
+ <AppVersion>Some Application v1.0</AppVersion>
+ <Dimension>295/75 R22.5</Dimension>
+ <TyreClass>C1</TyreClass>
+ <FuelEfficiencyClass>A</FuelEfficiencyClass>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>33500</FzISO>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#TYR-123">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>vBmgFUk+38yQ+p+SKpbE7VVP2Fvzzp37b9pb0PXpKhE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </tns:Tyre>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml
index 33edc8ed8a3b4ac332a6363a4bb9a88cc29b4f01..65234aac7ceab95a82555d1b93d20dd9fb385e7e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml
@@ -123,7 +123,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -279,7 +279,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml
index ef79b03d4a22337d4ab1ac36731ba1e5d80c58b2..ffef3405dafddd34b30b26ba6794648bc24668cf 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml
@@ -105,7 +105,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -258,7 +258,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured for complete component</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>false</DesignTypeWheelMotor>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml
index f0a5c5083ef91ea4ae1078f37464eec9df95853b..1e4945e5e2f99aed8d340fe0d93a055da824f79c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml
@@ -123,7 +123,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -279,7 +279,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3_ovc.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3_ovc.xml
index baf1d1010ddff62a37011fc4d201e3dff3ef870b..1b7aab3bd6f5fe0f6f966af28e92877c8c712233 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3_ovc.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3_ovc.xml
@@ -124,7 +124,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -280,12 +280,12 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
- <Voltage>400</Voltage>
+ <Voltage>450</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
@@ -303,7 +303,7 @@
</PowerMap>
</VoltageLevel>
<VoltageLevel>
- <Voltage>600</Voltage>
+ <Voltage>650</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml
index 515e3df774d8d908ed1473578e69a0d554219aad..0855371ad80a2dbf83d8552fbd9015f0c4571583 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml
@@ -123,7 +123,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -279,7 +279,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml
index af0f9cdf8127e38bc84862452f10e3f2ca6473dd..df81c3470f74900153d1f3f7b4dff4ac098a03ae 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<Model>HEV Heavy Lorry Px</Model>
<VIN>1234</VIN>
<Date>2017-01-01T00:00:00Z</Date>
<LegislativeCategory>N3</LegislativeCategory>
<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>650</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
<PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<NgTankSystem>Liquefied</NgTankSystem>
<!-- optional -->
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
<!-- optional -->
<ElectricMachine>
<Position>2</Position>
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
<VoltageLevel>
<Voltage>500</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<BoostingLimitations xsi:type="BoostingLimitationsType">
<!-- optional -->
<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
</BoostingLimitations>
<Components xsi:type="Components_HEV-Px_LorryType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference URI="#EM-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>tokena</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>zX/IDR+bCvdMheYa6auUOE/hx8ZAqeJz1u3+Pd/NIss=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>b</Manufacturer>
<Model>b</Model>
<CertificationNumber>tokenb</CertificationNumber>
<Date>2017-02-02T00:00:00Z</Date>
<AppVersion>bbbbb</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>73.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="621.00"/>
<Entry SoC="100" OCV="641.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>bJfbc0NkhpTZWhZ/03YZ4S3iFwGtzhE2kbIiAuKNia8=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#TQ-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Angledrive>
<!-- optional -->
<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<Ratio>2.345</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Angledrive>
<Retarder>
<!-- optional -->
<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
<Model>Generic Retarder</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<RetarderLossMap>
<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
</ElectricSystem>
<PneumaticSystem>
<Technology>Medium Supply 2-stage</Technology>
</PneumaticSystem>
<HVAC>
<Technology>Default</Technology>
</HVAC>
</Data>
</Auxiliaries>
<AirDrag>
<!-- optional -->
<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-03-24T15:00:00Z</Date>
<AppVersion>Vecto AirDrag x.y</AppVersion>
<CdxA_0>6.31</CdxA_0>
<TransferredCdxA>6.32</TransferredCdxA>
<DeclaredCdxA>6.34</DeclaredCdxA>
</Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<Model>HEV Heavy Lorry Px</Model>
<VIN>1234</VIN>
<Date>2017-01-01T00:00:00Z</Date>
<LegislativeCategory>N3</LegislativeCategory>
<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>650</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
<PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<NgTankSystem>Liquefied</NgTankSystem>
<!-- optional -->
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
<!-- optional -->
<ElectricMachine>
<Position>2</Position>
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
<VoltageLevel>
<Voltage>500</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<BoostingLimitations xsi:type="BoostingLimitationsType">
<!-- optional -->
<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
</BoostingLimitations>
<Components xsi:type="Components_HEV-Px_LorryType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference URI="#EM-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>tokena</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>zX/IDR+bCvdMheYa6auUOE/hx8ZAqeJz1u3+Pd/NIss=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>b</Manufacturer>
<Model>b</Model>
<CertificationNumber>tokenb</CertificationNumber>
<Date>2017-02-02T00:00:00Z</Date>
<AppVersion>bbbbb</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>73.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="621.00"/>
<Entry SoC="100" OCV="641.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>bJfbc0NkhpTZWhZ/03YZ4S3iFwGtzhE2kbIiAuKNia8=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#TQ-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Angledrive>
<!-- optional -->
<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<Ratio>2.345</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Angledrive>
<Retarder>
<!-- optional -->
<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
<Model>Generic Retarder</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<RetarderLossMap>
<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
</ElectricSystem>
<PneumaticSystem>
<Technology>Medium Supply 2-stage</Technology>
</PneumaticSystem>
<HVAC>
<Technology>Default</Technology>
</HVAC>
</Data>
</Auxiliaries>
<AirDrag>
<!-- optional -->
<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-03-24T15:00:00Z</Date>
<AppVersion>Vecto AirDrag x.y</AppVersion>
<CdxA_0>6.31</CdxA_0>
<TransferredCdxA>6.32</TransferredCdxA>
<DeclaredCdxA>6.34</DeclaredCdxA>
</Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml
index 77032b8f223533fd4e4ad8d4078d6f10819afbbe..404c4af706a1e93895d0079ce150892d4ca8d731 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<Model>HEV Heavy Lorry Px</Model>
<VIN>1234</VIN>
<Date>2017-01-01T00:00:00Z</Date>
<LegislativeCategory>N3</LegislativeCategory>
<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>650</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
<PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<NgTankSystem>Liquefied</NgTankSystem>
<!-- optional -->
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
<!-- optional -->
<ElectricMachine>
<Position>2</Position>
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
<VoltageLevel>
<Voltage>500</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<BoostingLimitations xsi:type="BoostingLimitationsType">
<!-- optional -->
<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
</BoostingLimitations>
<Components xsi:type="Components_HEV-Px_LorryType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>IHPC Type 1</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap gear="1">
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
<PowerMap gear="2">
<Entry outShaftSpeed="0.00" torque="500.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="26000.00"/>
<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-26000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap gear="1">
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
<PowerMap gear="2">
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="26000.00"/>
<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-26000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<!-- optional -->
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference URI="#EM-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>SRYiAOd48DGe63vPJXjcBoFN3q2fkWjPKvxIKhQaKac=</di:DigestValue>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>tokena</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>zX/IDR+bCvdMheYa6auUOE/hx8ZAqeJz1u3+Pd/NIss=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>b</Manufacturer>
<Model>b</Model>
<CertificationNumber>tokenb</CertificationNumber>
<Date>2017-02-02T00:00:00Z</Date>
<AppVersion>bbbbb</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>73.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="621.00"/>
<Entry SoC="100" OCV="641.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>bJfbc0NkhpTZWhZ/03YZ4S3iFwGtzhE2kbIiAuKNia8=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#TQ-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Angledrive>
<!-- optional -->
<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<Ratio>2.345</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Angledrive>
<Retarder>
<!-- optional -->
<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
<Model>Generic Retarder</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<RetarderLossMap>
<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
</ElectricSystem>
<PneumaticSystem>
<Technology>Medium Supply 2-stage</Technology>
</PneumaticSystem>
<HVAC>
<Technology>Default</Technology>
</HVAC>
</Data>
</Auxiliaries>
<AirDrag>
<!-- optional -->
<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-03-24T15:00:00Z</Date>
<AppVersion>Vecto AirDrag x.y</AppVersion>
<CdxA_0>6.31</CdxA_0>
<TransferredCdxA>6.32</TransferredCdxA>
<DeclaredCdxA>6.34</DeclaredCdxA>
</Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<Model>HEV Heavy Lorry Px</Model>
<VIN>1234</VIN>
<Date>2017-01-01T00:00:00Z</Date>
<LegislativeCategory>N3</LegislativeCategory>
<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>650</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
<PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<NgTankSystem>Liquefied</NgTankSystem>
<!-- optional -->
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
<!-- optional -->
<ElectricMachine>
<Position>2</Position>
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
<VoltageLevel>
<Voltage>500</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<BoostingLimitations xsi:type="BoostingLimitationsType">
<!-- optional -->
<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
</BoostingLimitations>
<Components xsi:type="Components_HEV-Px_LorryType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>IHPC Type 1</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap gear="1">
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
<PowerMap gear="2">
<Entry outShaftSpeed="0.00" torque="500.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="26000.00"/>
<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-26000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap gear="1">
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
<PowerMap gear="2">
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="26000.00"/>
<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-26000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<!-- optional -->
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference URI="#EM-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>SRYiAOd48DGe63vPJXjcBoFN3q2fkWjPKvxIKhQaKac=</di:DigestValue>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>tokena</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>zX/IDR+bCvdMheYa6auUOE/hx8ZAqeJz1u3+Pd/NIss=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>b</Manufacturer>
<Model>b</Model>
<CertificationNumber>tokenb</CertificationNumber>
<Date>2017-02-02T00:00:00Z</Date>
<AppVersion>bbbbb</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>73.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="621.00"/>
<Entry SoC="100" OCV="641.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>bJfbc0NkhpTZWhZ/03YZ4S3iFwGtzhE2kbIiAuKNia8=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#TQ-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Angledrive>
<!-- optional -->
<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<Ratio>2.345</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Angledrive>
<Retarder>
<!-- optional -->
<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
<Model>Generic Retarder</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<RetarderLossMap>
<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
</ElectricSystem>
<PneumaticSystem>
<Technology>Medium Supply 2-stage</Technology>
</PneumaticSystem>
<HVAC>
<Technology>Default</Technology>
</HVAC>
</Data>
</Auxiliaries>
<AirDrag>
<!-- optional -->
<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-03-24T15:00:00Z</Date>
<AppVersion>Vecto AirDrag x.y</AppVersion>
<CdxA_0>6.31</CdxA_0>
<TransferredCdxA>6.32</TransferredCdxA>
<DeclaredCdxA>6.34</DeclaredCdxA>
</Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml
index 01aaa46d07682d30680f8355b16b68ccb983eb8d..c488cdbd6c6b1f7629eaea7589e2ebd6325f3b7a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml
@@ -22,7 +22,8 @@
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>E-IEPC</ArchitectureID>
- <OvcHev>false</OvcHev>
+ <OvcHev>true</OvcHev>
+ <MaxChargingPower>30000</MaxChargingPower>
<ADAS xsi:type="ADAS_IEPC_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
@@ -36,11 +37,11 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured for complete component</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
- <DesignTypeWheelMotor>true</DesignTypeWheelMotor>
- <Gears xsi:type="v2.3:IEPCGearsDeclarationType">
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+ <Gears xsi:type="IEPCGearsDeclarationType">
<Gear number="1">
<Ratio>3.000</Ratio>
</Gear>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml
index 93bb15cdca5894fba624da2b62b095c63c66be8d..f0c39eb8910edb7559a5acf14471f00274bbdd31 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml
@@ -23,7 +23,8 @@
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>E2</ArchitectureID>
- <OvcHev>false</OvcHev>
+ <OvcHev>true</OvcHev>
+ <MaxChargingPower>30000</MaxChargingPower>
<ADAS xsi:type="ADAS_PEV_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
@@ -60,7 +61,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml
index cff68f15e5a3ab495be11f006a7ab4b10a210dec..0646086cb4fb980e07e204b47a64ee31c2a92df7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml
@@ -22,7 +22,8 @@
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>E2</ArchitectureID>
- <OvcHev>false</OvcHev>
+ <OvcHev>true</OvcHev>
+ <MaxChargingPower>30000</MaxChargingPower>
<ADAS xsi:type="v2.4:ADAS_PEV_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
@@ -59,7 +60,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml
index b3566c5c59e551720df5bde51b5b0afa1917a3a7..9929f9a229bdb9ae050e96f558d1367e04a9cbe2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml
@@ -22,7 +22,8 @@
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>E3</ArchitectureID>
- <OvcHev>false</OvcHev>
+ <OvcHev>true</OvcHev>
+ <MaxChargingPower>30000</MaxChargingPower>
<ADAS xsi:type="ADAS_PEV_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
@@ -59,7 +60,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml
index eb9a1d82ef34c1eb661da00d4186aabaeac98bbe..7900c34fa0476e6a032d3577ceb0cdc2c2587d10 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml
@@ -22,7 +22,8 @@
<SleeperCab>false</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>E4</ArchitectureID>
- <OvcHev>false</OvcHev>
+ <OvcHev>true</OvcHev>
+ <MaxChargingPower>30000</MaxChargingPower>
<ADAS xsi:type="ADAS_PEV_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
@@ -59,7 +60,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml
index f4058fbb03111959f14b3cae9794c77ed5efe268..8b866a8f4a7d33ba8d6cc335029bb56060e9af54 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml
@@ -119,7 +119,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -275,7 +275,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml
index 4504a67075fda6615cc32dcf615848e4d8dd9192..9eb1873602c4021f4c50a2b4ee9abb36abd10735 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml
@@ -101,7 +101,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -254,7 +254,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured for complete component</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>false</DesignTypeWheelMotor>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml
index 12ee94be010eddce289e9ed04e3fc24af6a76534..ed56ab0604d88ce2cb0b7bb4fa1b1549ce8e028c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml
@@ -119,7 +119,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -275,7 +275,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml
index ae591fb32125332566374638ee9e4d797ad3e3cd..8b3ad53a3b5426809dcdc15292cace161b87cb4a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml
@@ -119,7 +119,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -275,7 +275,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml
index db595628401d4799835188071cf075d3d6290f53..498cf7f2f8d041165faa8da5844e444e60f41be6 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml
@@ -110,7 +110,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml
index 4c8843fb8f930a88dd85064cf8054e0a1e45b661..317379a196e960b7eda1da9931d0eb3c20b22ec4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml
@@ -18,7 +18,8 @@
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>E-IEPC</ArchitectureID>
- <OvcHev>false</OvcHev>
+ <OvcHev>true</OvcHev>
+ <MaxChargingPower>30000</MaxChargingPower>
<ADAS xsi:type="ADAS_IEPC_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
@@ -32,10 +33,10 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured for complete component</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
- <DesignTypeWheelMotor>true</DesignTypeWheelMotor>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
<Gear number="1">
<Ratio>3.000</Ratio>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml
index e27ad1fbdd5d8dcdeb7dd80dc9b2f6f8fd8a82df..9c95661516be49f85e860b2b0e763b4262cf58fa 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml
@@ -17,7 +17,8 @@
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>E2</ArchitectureID>
- <OvcHev>false</OvcHev>
+ <OvcHev>true</OvcHev>
+ <MaxChargingPower>30000</MaxChargingPower>
<ADAS xsi:type="ADAS_PEV_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
@@ -53,7 +54,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml
index 9b045f03fed05f29c0a9415a4ebb282378e992da..cf76eaa54852cd39dbeb2da4777c8b419bd8cabd 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml
@@ -10,7 +10,7 @@
<ChassisConfiguration>Van</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
- <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <TechnicalPermissibleMaximumLadenMass>7000</TechnicalPermissibleMaximumLadenMass>
<CargoVolume>20.300</CargoVolume>
<!-- optional -->
<RetarderType>None</RetarderType>
@@ -18,7 +18,8 @@
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>E2</ArchitectureID>
- <OvcHev>false</OvcHev>
+ <OvcHev>true</OvcHev>
+ <MaxChargingPower>30000</MaxChargingPower>
<ADAS xsi:type="ADAS_PEV_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
@@ -55,7 +56,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Standard values</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml
index 20881f25f147cf915e48bb211e4981d64f9a94ea..fcbf86abff6ce1ff83bc81046215d4714dd37c01 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml
@@ -18,7 +18,8 @@
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>E2</ArchitectureID>
- <OvcHev>false</OvcHev>
+ <OvcHev>true</OvcHev>
+ <MaxChargingPower>30000</MaxChargingPower>
<ADAS xsi:type="ADAS_PEV_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
@@ -55,7 +56,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E3.xml
index 40e01c6255f0dbafaf9dc14510ee2d6568e3495d..5408e58f0785f02646ca19ef56bdb46e166199f4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E3.xml
@@ -18,7 +18,8 @@
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>E3</ArchitectureID>
- <OvcHev>false</OvcHev>
+ <OvcHev>true</OvcHev>
+ <MaxChargingPower>30000</MaxChargingPower>
<ADAS xsi:type="ADAS_PEV_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
@@ -55,7 +56,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E4.xml
index 8ab9994cb1ee0e82bf4fb1bf10110994f8290a36..285c2cde75f4a99308f4e7543fe4b653b716476b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E4.xml
@@ -18,7 +18,8 @@
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>E4</ArchitectureID>
- <OvcHev>false</OvcHev>
+ <OvcHev>true</OvcHev>
+ <MaxChargingPower>30000</MaxChargingPower>
<ADAS xsi:type="v2.4:ADAS_PEV_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
@@ -55,7 +56,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/Conventional_primaryBus_AMT_DifferentTyres.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/Conventional_primaryBus_AMT_DifferentTyres.xml
new file mode 100644
index 0000000000000000000000000000000000000000..78174a72be0122ee504233f3ebb3f4d341fa709a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/Conventional_primaryBus_AMT_DifferentTyres.xml
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+ <Model>Generic Model</Model>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
+ <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>600</IdlingSpeed>
+ <RetarderType>Transmission Output Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ADAS xsi:type="ADAS_Conventional_Type">
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
+ <v2.0:Entry gear="6" maxTorque="1800"/>
+ <v2.0:Entry gear="1" maxTorque="2500"/>
+ <v2.0:Entry gear="12" maxTorque="1900"/>
+ </TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine xsi:type="v2.0:EngineComponentDeclarationType">
+ <v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <IdlingSpeed>560</IdlingSpeed>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelType>NG</FuelType>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter><!-- optional -->
+ <v2.0:Data id="tc-123xyz" xsi:type="v2.0:TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#tc-123xyz">
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>BpqbVEM5dAFXyIeZfvKBUhv+Oj4OU5R85aK9M4ylV+4=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive><!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder><!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </v2.0:Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <TyreClass>C1</TyreClass>
+ <FuelEfficiencyClass>A</FuelEfficiencyClass>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </v2.0:Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <AlternatorTechnology>conventional</AlternatorTechnology>
+ <SmartAlternator><!-- optional -->
+ <RatedCurrent>100</RatedCurrent>
+ <RatedVoltage>48</RatedVoltage>
+ </SmartAlternator>
+ <SmartAlternator><!-- optional -->
+ <RatedCurrent>50</RatedCurrent>
+ <RatedVoltage>48</RatedVoltage>
+ </SmartAlternator>
+ <Battery><!-- optional -->
+ <BatteryTechnology>li-ion battery - high power</BatteryTechnology>
+ <RatedCapacity>50</RatedCapacity>
+ <NominalVoltage>48</NominalVoltage>
+ </Battery>
+ <Capacitor><!-- optional -->
+ <CapacitorTechnology>with DCDC converter</CapacitorTechnology>
+ <RatedCapacitance>120</RatedCapacitance>
+ <RatedVoltage>30</RatedVoltage>
+ </Capacitor>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+ <CompressorDrive>mechanically</CompressorDrive>
+ <Clutch>none</Clutch>
+ <CompressorRatio>1.000</CompressorRatio>
+ <SmartCompressionSystem>false</SmartCompressionSystem>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml
index 996d8d106993107cc5681e210ed6af802248279b..7d8004b765614468448b68e965c0bf0d3f9aa676 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml
@@ -117,7 +117,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -273,7 +273,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S.xml
index 7133b50d2b3c2f4345acabe1dc8d3e57460275d8..f61c42c82fb9317fc12a134e509ccf55eaca991b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S.xml
@@ -97,7 +97,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -250,7 +250,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured for complete component</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>false</DesignTypeWheelMotor>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml
index bc8398274bd22621c71c30d2b792a4cb1b116855..0724153c376c66b113f50a72db3537c7e95b3d5c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml
@@ -115,7 +115,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -271,7 +271,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml
index 738bb5514fb7bbd1c445bb526e34c1428aa69813..ee377c8fe518a0df5d06c6e7942c360981ef7a7f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml
@@ -115,7 +115,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -271,7 +271,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV_primaryBus_AMT_Px.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV_primaryBus_AMT_Px.xml
index 04e901f18537ec805fb493a17fd0012b038b1f7f..0e853efeeea18d619c02b22ce87a31894c825439 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV_primaryBus_AMT_Px.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV_primaryBus_AMT_Px.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890</VIN>
<Date>2017-02-15T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
<!-- optional -->
<ElectricMachine>
<Position>2</Position>
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
<VoltageLevel>
<Voltage>500</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<BoostingLimitations xsi:type="BoostingLimitationsType">
<!-- optional -->
<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
</BoostingLimitations>
<Components xsi:type="Components_HEV-Px_PrimaryBusType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="v2.3:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference URI="#EM-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#TQ-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Angledrive>
<!-- optional -->
<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<Ratio>2.345</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Angledrive>
<Retarder>
<!-- optional -->
<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
<Model>Generic Retarder</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<RetarderLossMap>
<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>100</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>50</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<Battery>
<!-- optional -->
<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
<RatedCapacity>50</RatedCapacity>
<NominalVoltage>48</NominalVoltage>
</Battery>
<Capacitor>
<!-- optional -->
<CapacitorTechnology>with DCDC converter</CapacitorTechnology>
<RatedCapacitance>120</RatedCapacitance>
<RatedVoltage>30</RatedVoltage>
</Capacitor>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
<CompressorDrive>mechanically</CompressorDrive>
<Clutch>none</Clutch>
<CompressorRatio>1.000</CompressorRatio>
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890</VIN>
<Date>2017-02-15T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
<!-- optional -->
<ElectricMachine>
<Position>2</Position>
<VoltageLevel>
<Voltage>100</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
<VoltageLevel>
<Voltage>500</Voltage>
<MaxTorqueCurve>
<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
</MaxTorqueCurve>
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<BoostingLimitations xsi:type="BoostingLimitationsType">
<!-- optional -->
<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
</BoostingLimitations>
<Components xsi:type="Components_HEV-Px_PrimaryBusType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="v2.3:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference URI="#EM-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference URI="#BAT-asdf">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#TQ-1234">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Angledrive>
<!-- optional -->
<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<Ratio>2.345</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Angledrive>
<Retarder>
<!-- optional -->
<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
<Model>Generic Retarder</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<RetarderLossMap>
<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
</RetarderLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>100</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>50</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<Battery>
<!-- optional -->
<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
<RatedCapacity>50</RatedCapacity>
<NominalVoltage>48</NominalVoltage>
</Battery>
<Capacitor>
<!-- optional -->
<CapacitorTechnology>with DCDC converter</CapacitorTechnology>
<RatedCapacitance>120</RatedCapacitance>
<RatedVoltage>30</RatedVoltage>
</Capacitor>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
<CompressorDrive>mechanically</CompressorDrive>
<Clutch>none</Clutch>
<CompressorRatio>1.000</CompressorRatio>
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/IEPC_primaryBus.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/IEPC_primaryBus.xml
index 505f21f52e0e7ee126503dc69d4a486c0025b729..d123e7c8471f6aee0e98e531b87d99d798ea5f7e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/IEPC_primaryBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/IEPC_primaryBus.xml
@@ -11,12 +11,13 @@
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
- <RetarderType>Transmission Output Retarder</RetarderType>
+ <RetarderType>Axlegear Input Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
- <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<ArchitectureID>E-IEPC</ArchitectureID>
- <OvcHev>false</OvcHev>
+ <OvcHev>true</OvcHev>
+ <MaxChargingPower>30000</MaxChargingPower>
<ADAS xsi:type="ADAS_IEPC_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
@@ -30,10 +31,10 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured for complete component</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
- <DesignTypeWheelMotor>true</DesignTypeWheelMotor>
+ <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
<Gear number="1">
<Ratio>3.000</Ratio>
@@ -323,7 +324,6 @@
<CompressorDrive>electrically</CompressorDrive>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_AMT_E2.xml
index c98f9a0346a0deab31cf4dc0a490cd24b7777959..2121cc7b33b8857f7a0a46679a9bc51d0b78e201 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_AMT_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_AMT_E2.xml
@@ -14,9 +14,10 @@
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
- <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<ArchitectureID>E2</ArchitectureID>
- <OvcHev>false</OvcHev>
+ <OvcHev>true</OvcHev>
+ <MaxChargingPower>30000</MaxChargingPower>
<ADAS xsi:type="ADAS_PEV_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
@@ -53,7 +54,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -431,7 +432,6 @@
<CompressorDrive>electrically</CompressorDrive>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E3.xml
index 5080b4738feac15547954578d2aabdc6908a75c2..1ebd52aee4944e6b3469bbfc85d678babf85ced3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E3.xml
@@ -14,9 +14,10 @@
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
- <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<ArchitectureID>E3</ArchitectureID>
- <OvcHev>false</OvcHev>
+ <OvcHev>true</OvcHev>
+ <MaxChargingPower>30000</MaxChargingPower>
<ADAS xsi:type="ADAS_PEV_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
@@ -52,7 +53,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -323,7 +324,6 @@
<CompressorDrive>electrically</CompressorDrive>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E4.xml
index 732be3806ec94193d41516f2213cf7bda6b8f350..8721a9991918623df14b4f31057d4825f3eabb6a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/PEV_primaryBus_E4.xml
@@ -14,9 +14,10 @@
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
- <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<ArchitectureID>E4</ArchitectureID>
- <OvcHev>false</OvcHev>
+ <OvcHev>true</OvcHev>
+ <MaxChargingPower>30000</MaxChargingPower>
<ADAS xsi:type="ADAS_PEV_Type">
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
@@ -53,7 +54,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -296,7 +297,6 @@
<CompressorDrive>electrically</CompressorDrive>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV-S_heavyLorry_AMT_S2_ADC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV-S_heavyLorry_AMT_S2_ADC.xml
index 3c74a0f74e59e34a68aba279f2b5532cad63ccb4..7fcde6ad7ebc8130612ac3da9c98a55fb9794529 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV-S_heavyLorry_AMT_S2_ADC.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV-S_heavyLorry_AMT_S2_ADC.xml
@@ -118,7 +118,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -286,7 +286,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV_heavyLorry_AMT_Px_Capacitor.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV_heavyLorry_AMT_Px_Capacitor.xml
index 317875ab41ae9f1a05faedad8892f2edfa35513a..1793b234182fc6e3e6b04599581ff93b853e112e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV_heavyLorry_AMT_Px_Capacitor.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/HEV_heavyLorry_AMT_Px_Capacitor.xml
@@ -110,7 +110,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/Conventional_InterimBus_Min.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/Conventional_InterimBus_Min.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1b7adcd58d4603dd76791fd551f50b4cfd133b49
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/Conventional_InterimBus_Min.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-06-30T22:00:00Z</Date>
+ <Model>Sample Bus Model</Model>
+ <VehicleDeclarationType>interim</VehicleDeclarationType>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/Conventional_completedBus_AirdragV10.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/Conventional_completedBus_AirdragV10.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3995f1c65774f214fd9f3c16f8b9819842adb594
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/Conventional_completedBus_AirdragV10.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-06-30T22:00:00Z</Date>
+ <Model>Sample Bus Model</Model>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>500</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+ <AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+ <ClassBus>II+III</ClassBus>
+ <NgTankSystem>Compressed</NgTankSystem><!-- optional -->
+ <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+ <BodyworkCode>CB</BodyworkCode>
+ <LowEntry>false</LowEntry>
+ <HeightIntegratedBody>2500</HeightIntegratedBody>
+ <VehicleLength>9500</VehicleLength>
+ <VehicleWidth>2500</VehicleWidth>
+ <EntranceHeight>2000</EntranceHeight>
+ <DoorDriveTechnology>electric</DoorDriveTechnology>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
+ <ADAS xsi:type="ADAS_Conventional_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ <APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
+ </ADAS>
+ <Components xsi:type="Components_Conventional_CompletedBusType">
+ <AirDrag>
+ <v2.0:Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Manufacturer</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-03-24T15:00:00Z</Date>
+ <AppVersion>Vecto AirDrag x.y</AppVersion>
+ <CdxA_0>6.31</CdxA_0>
+ <TransferredCdxA>6.32</TransferredCdxA>
+ <DeclaredCdxA>6.34</DeclaredCdxA>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_CompletedBusType">
+ <ElectricSystem>
+ <LEDLights>
+ <Interiorlights>false</Interiorlights>
+ <Dayrunninglights>true</Dayrunninglights>
+ <Positionlights>true</Positionlights>
+ <Brakelights>true</Brakelights>
+ <Headlights>false</Headlights>
+ </LEDLights>
+ </ElectricSystem>
+ <HVAC>
+ <SystemConfiguration>1</SystemConfiguration>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 3-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
+ <AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+ <DoubleGlazing>false</DoubleGlazing>
+ <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+ <SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/Conventional_completedBus_AirdragV20.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/Conventional_completedBus_AirdragV20.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3f9e7ef9f25d1ac2b95e86523da493b5a117ba03
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/Conventional_completedBus_AirdragV20.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-06-30T22:00:00Z</Date>
+ <Model>Sample Bus Model</Model>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>500</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+ <AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+ <ClassBus>II+III</ClassBus>
+ <NgTankSystem>Compressed</NgTankSystem><!-- optional -->
+ <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+ <BodyworkCode>CB</BodyworkCode>
+ <LowEntry>false</LowEntry>
+ <HeightIntegratedBody>2500</HeightIntegratedBody>
+ <VehicleLength>9500</VehicleLength>
+ <VehicleWidth>2500</VehicleWidth>
+ <EntranceHeight>2000</EntranceHeight>
+ <DoorDriveTechnology>electric</DoorDriveTechnology>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
+ <ADAS xsi:type="ADAS_Conventional_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ <APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
+ </ADAS>
+ <Components xsi:type="Components_Conventional_CompletedBusType">
+ <AirDrag>
+ <v2.0:Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Manufacturer</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-03-24T15:00:00Z</Date>
+ <AppVersion>Vecto AirDrag x.y</AppVersion>
+ <CdxA_0>6.31</CdxA_0>
+ <TransferredCdxA>6.32</TransferredCdxA>
+ <DeclaredCdxA>6.34</DeclaredCdxA>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_CompletedBusType">
+ <ElectricSystem>
+ <LEDLights>
+ <Interiorlights>false</Interiorlights>
+ <Dayrunninglights>true</Dayrunninglights>
+ <Positionlights>true</Positionlights>
+ <Brakelights>true</Brakelights>
+ <Headlights>false</Headlights>
+ </LEDLights>
+ </ElectricSystem>
+ <HVAC>
+ <SystemConfiguration>1</SystemConfiguration>
+ <HeatPumpTypeDriverCompartment>
+ <Cooling>non R-744 2-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>
+ <Cooling>non R-744 3-stage</Cooling>
+ <Heating>none</Heating>
+ </HeatPumpTypePassengerCompartment>
+ <AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+ <DoubleGlazing>false</DoubleGlazing>
+ <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+ <SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/HEV_InterimBus_Min.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/HEV_InterimBus_Min.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6ace6090f35fe2ec4eba4cf1c047a15de1b2f69b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/HEV_InterimBus_Min.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_HEV_CompletedBusDeclarationType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-06-30T22:00:00Z</Date>
+ <Model>Sample Bus Model</Model>
+ <VehicleDeclarationType>interim</VehicleDeclarationType>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/IEPC_InterimBus_Min.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/IEPC_InterimBus_Min.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2038c283cbc78558b52a3df8a25051dc860f4c21
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/IEPC_InterimBus_Min.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_IEPC_CompletedBusDeclarationType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-06-30T22:00:00Z</Date>
+ <Model>Sample Bus Model</Model>
+ <VehicleDeclarationType>interim</VehicleDeclarationType>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/PEV_InterimBus_Min.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/PEV_InterimBus_Min.xml
new file mode 100644
index 0000000000000000000000000000000000000000..827e44ea1e3765c9847404d4008ce5707aea4226
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/CompletedBus/PEV_InterimBus_Min.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_PEV_CompletedBusDeclarationType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-06-30T22:00:00Z</Date>
+ <Model>Sample Bus Model</Model>
+ <VehicleDeclarationType>interim</VehicleDeclarationType>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/Conventional_heavyLorry_AMT_DF.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/Conventional_heavyLorry_AMT_DF.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a18531f009caabeaf196eba6df9619d9f49e562f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/Conventional_heavyLorry_AMT_DF.xml
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
+ <v2.0:Vehicle xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType" id="a">
+ <Manufacturer>TU Graz</Manufacturer>
+ <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
+ <Model>HEV Heavy Lorry Px</Model>
+ <VIN>1234</VIN>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <NgTankSystem>Liquefied</NgTankSystem>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ADAS xsi:type="ADAS_Conventional_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xsi:type="v2.0:TorqueLimitsType">
+ <!-- optional -->
+ <v2.0:Entry gear="9" maxTorque="2000"/>
+ </TorqueLimits>
+ <Components xsi:type="Components_Conventional_LorryType">
+ <Engine>
+ <v2.0:Data xsi:type="EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <!---->
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHRType>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>false</ElectricalOutput>
+ </WHRType>
+ <Mode>
+ <IdlingSpeed>560</IdlingSpeed>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ <Fuel type="NG PI">
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ </Fuel>
+ <Fuel type="Diesel CI">
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="1286.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="5063.00"/>
+ </FuelConsumptionMap>
+ </Fuel>
+ </Mode>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#TQ-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage</Technology>
+ </PneumaticSystem>
+ <HVAC>
+ <Technology>Default</Technology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ <AirDrag>
+ <!-- optional -->
+ <Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Manufacturer</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-03-24T15:00:00Z</Date>
+ <AppVersion>Vecto AirDrag x.y</AppVersion>
+ <CdxA_0>6.31</CdxA_0>
+ <TransferredCdxA>6.32</TransferredCdxA>
+ <DeclaredCdxA>6.34</DeclaredCdxA>
+ </Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/Conventional_heavyLorry_AMT_DifferentTyres.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/Conventional_heavyLorry_AMT_DifferentTyres.xml
new file mode 100644
index 0000000000000000000000000000000000000000..84dda376d9d166c46ffedccf4c9cef20f202a134
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/Conventional_heavyLorry_AMT_DifferentTyres.xml
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
+ <v2.0:Vehicle xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType" id="a">
+ <Manufacturer>TU Graz</Manufacturer>
+ <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
+ <Model>HEV Heavy Lorry Px</Model>
+ <VIN>1234</VIN>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
+ <AxleConfiguration>6x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>30000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <NgTankSystem>Liquefied</NgTankSystem><!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ADAS xsi:type="ADAS_Conventional_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
+ <v2.0:Entry gear="9" maxTorque="2000"/>
+ </TorqueLimits>
+ <Components xsi:type="Components_Conventional_LorryType">
+ <Engine>
+ <v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <IdlingSpeed>560</IdlingSpeed>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelType>NG</FuelType>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter><!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#TQ-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive><!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder><!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </v2.0:Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <TyreClass>C1</TyreClass>
+ <FuelEfficiencyClass>C</FuelEfficiencyClass>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </v2.0:Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage</Technology>
+ </PneumaticSystem>
+ <HVAC>
+ <Technology>Default</Technology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ <AirDrag><!-- optional -->
+ <Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Manufacturer</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-03-24T15:00:00Z</Date>
+ <AppVersion>Vecto AirDrag x.y</AppVersion>
+ <CdxA_0>6.31</CdxA_0>
+ <TransferredCdxA>6.32</TransferredCdxA>
+ <DeclaredCdxA>6.34</DeclaredCdxA>
+ </Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/Conventional_heavyLorry_AT_Angledrive.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/Conventional_heavyLorry_AT_Angledrive.xml
new file mode 100644
index 0000000000000000000000000000000000000000..38d064a48b2fcd6386b52ee9f70ae9860a9b9ad0
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/Conventional_heavyLorry_AT_Angledrive.xml
@@ -0,0 +1,351 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
+ <v2.0:Vehicle xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType" id="a">
+ <Manufacturer>TU Graz</Manufacturer>
+ <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
+ <Model>HEV Heavy Lorry Px</Model>
+ <VIN>1234</VIN>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>Separate Angledrive</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <NgTankSystem>Liquefied</NgTankSystem><!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ADAS xsi:type="ADAS_Conventional_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
+ <v2.0:Entry gear="9" maxTorque="2000"/>
+ </TorqueLimits>
+ <Components xsi:type="Components_Conventional_LorryType">
+ <Engine>
+ <v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <IdlingSpeed>560</IdlingSpeed>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelType>NG</FuelType>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>APT-S</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="3">
+ <Ratio>9.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#TQ-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder><!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage</Technology>
+ </PneumaticSystem>
+ <HVAC>
+ <Technology>Default</Technology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ <AirDrag><!-- optional -->
+ <Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Manufacturer</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-03-24T15:00:00Z</Date>
+ <AppVersion>Vecto AirDrag x.y</AppVersion>
+ <CdxA_0>6.31</CdxA_0>
+ <TransferredCdxA>6.32</TransferredCdxA>
+ <DeclaredCdxA>6.34</DeclaredCdxA>
+ </Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV-S_heavyLorry_S3_ADC_GenSetADC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV-S_heavyLorry_S3_ADC_GenSetADC.xml
new file mode 100644
index 0000000000000000000000000000000000000000..38b6e9be9feaf3f38ae8a4b844c1ccbc1c4f0eaf
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV-S_heavyLorry_S3_ADC_GenSetADC.xml
@@ -0,0 +1,552 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
+ <v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
+ <Manufacturer>TU Graz</Manufacturer>
+ <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
+ <Model>HEV Heavy Lorry Px</Model>
+ <VIN>1234</VIN>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <NgTankSystem>Liquefied</NgTankSystem>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>S3</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="ADAS_HEV_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsSerialHybridType">
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>3</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>GEN</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <Components xsi:type="Components_HEV-S3_LorryType">
+ <Engine>
+ <v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <IdlingSpeed>560</IdlingSpeed>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelType>NG</FuelType>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <ElectricMachineGEN>
+ <PowertrainPosition>GEN</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+ <ADC>
+ <v2.3:Data xsi:type="v2.3:ADCDataDeclarationType" id="ADC34533">
+ <v2.3:Manufacturer>ADC Manufacturer</v2.3:Manufacturer>
+ <v2.3:Model>Some ADC Model</v2.3:Model>
+ <v2.3:CertificationNumber>CertNmbr23451</v2.3:CertificationNumber>
+ <v2.3:Date>2022-01-01T00:00:00Z</v2.3:Date>
+ <v2.3:AppVersion>ADC Declaration App</v2.3:AppVersion>
+ <v2.3:Ratio>1.234</v2.3:Ratio>
+ <v2.3:CertificationMethod>Option 2</v2.3:CertificationMethod>
+ <v2.3:TorqueLossMap>
+ <v2.3:Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="0.00"/>
+ <v2.3:Entry inputSpeed="0.00" inputTorque="500.00" torqueLoss="5.00"/>
+ <v2.3:Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="0.00"/>
+ <v2.3:Entry inputSpeed="2000.00" inputTorque="500.00" torqueLoss="5.00"/>
+ </v2.3:TorqueLossMap>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue>DummyDigestValue</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ADC>
+ </ElectricMachineGEN>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <ElectricMachine>
+ <PowertrainPosition>3</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+ <ADC>
+ <v2.3:Data xsi:type="v2.3:ADCDataDeclarationType" id="ADC34533">
+ <v2.3:Manufacturer>ADC Manufacturer</v2.3:Manufacturer>
+ <v2.3:Model>Some ADC Model</v2.3:Model>
+ <v2.3:CertificationNumber>CertNmbr23451</v2.3:CertificationNumber>
+ <v2.3:Date>2022-01-01T00:00:00Z</v2.3:Date>
+ <v2.3:AppVersion>ADC Declaration App</v2.3:AppVersion>
+ <v2.3:Ratio>1.234</v2.3:Ratio>
+ <v2.3:CertificationMethod>Option 2</v2.3:CertificationMethod>
+ <v2.3:TorqueLossMap>
+ <v2.3:Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="0.00"/>
+ <v2.3:Entry inputSpeed="0.00" inputTorque="500.00" torqueLoss="5.00"/>
+ <v2.3:Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="0.00"/>
+ <v2.3:Entry inputSpeed="2000.00" inputTorque="500.00" torqueLoss="5.00"/>
+ </v2.3:TorqueLossMap>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue>DummyDigestValue</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ADC>
+ <P2.5GearRatios>
+ <!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <Retarder>
+ <!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_HEV-S_LorryDataType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Full electric steering gear</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage</Technology>
+ </PneumaticSystem>
+ <HVAC>
+ <Technology>Default</Technology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ <AirDrag>
+ <!-- optional -->
+ <Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Manufacturer</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-03-24T15:00:00Z</Date>
+ <AppVersion>Vecto AirDrag x.y</AppVersion>
+ <CdxA_0>6.31</CdxA_0>
+ <TransferredCdxA>6.32</TransferredCdxA>
+ <DeclaredCdxA>6.34</DeclaredCdxA>
+ </Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV_heavyLorry_IHPC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV_heavyLorry_IHPC.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0aa90d087ee1e0c4fe60a452c1861c4d1c298964
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV_heavyLorry_IHPC.xml
@@ -0,0 +1,543 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
+ <v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
+ <Manufacturer>TU Graz</Manufacturer>
+ <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
+ <Model>HEV Heavy Lorry Px</Model>
+ <VIN>1234</VIN>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <NgTankSystem>Liquefied</NgTankSystem>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>P2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="ADAS_HEV_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xsi:type="v2.0:TorqueLimitsType">
+ <!-- optional -->
+ <v2.0:Entry gear="9" maxTorque="2000"/>
+ </TorqueLimits>
+ <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <BoostingLimitations xsi:type="BoostingLimitationsType">
+ <!-- optional -->
+ <Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
+ <Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
+ </BoostingLimitations>
+ <Components xsi:type="Components_HEV-Px_LorryType">
+ <Engine>
+ <v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <IdlingSpeed>560</IdlingSpeed>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelType>NG</FuelType>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>IHPC Type 1</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap gear="1">
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ <PowerMap gear="2">
+ <Entry outShaftSpeed="0.00" torque="500.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="26000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-26000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap gear="1">
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ <PowerMap gear="2">
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="26000.00"/>
+ <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-26000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning>
+ <!-- optional -->
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>SRYiAOd48DGe63vPJXjcBoFN3q2fkWjPKvxIKhQaKac=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+ <P2.5GearRatios>
+ <!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>tokena</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>zX/IDR+bCvdMheYa6auUOE/hx8ZAqeJz1u3+Pd/NIss=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>b</Manufacturer>
+ <Model>b</Model>
+ <CertificationNumber>tokenb</CertificationNumber>
+ <Date>2017-02-02T00:00:00Z</Date>
+ <AppVersion>bbbbb</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>73.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="621.00"/>
+ <Entry SoC="100" OCV="641.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>bJfbc0NkhpTZWhZ/03YZ4S3iFwGtzhE2kbIiAuKNia8=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>IHPC Type 1</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </v2.3:Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#TQ-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_HEV-P_LorryDataType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage</Technology>
+ </PneumaticSystem>
+ <HVAC>
+ <Technology>Default</Technology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ <AirDrag>
+ <!-- optional -->
+ <Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Manufacturer</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-03-24T15:00:00Z</Date>
+ <AppVersion>Vecto AirDrag x.y</AppVersion>
+ <CdxA_0>6.31</CdxA_0>
+ <TransferredCdxA>6.32</TransferredCdxA>
+ <DeclaredCdxA>6.34</DeclaredCdxA>
+ </Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV_heavyLorry_Px_ADC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV_heavyLorry_Px_ADC.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6a3348f7bbdf9e016a6aaf3cbb5b7b87ef53f300
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV_heavyLorry_Px_ADC.xml
@@ -0,0 +1,556 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
+ <v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
+ <Manufacturer>TU Graz</Manufacturer>
+ <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
+ <Model>HEV Heavy Lorry Px</Model>
+ <VIN>1234</VIN>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <NgTankSystem>Liquefied</NgTankSystem>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>P2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="ADAS_HEV_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xsi:type="v2.0:TorqueLimitsType">
+ <!-- optional -->
+ <v2.0:Entry gear="9" maxTorque="2000"/>
+ </TorqueLimits>
+ <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <BoostingLimitations xsi:type="BoostingLimitationsType">
+ <!-- optional -->
+ <Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
+ <Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
+ </BoostingLimitations>
+ <Components xsi:type="Components_HEV-Px_LorryType">
+ <Engine>
+ <v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <IdlingSpeed>560</IdlingSpeed>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelType>NG</FuelType>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning>
+ <!-- optional -->
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>SRYiAOd48DGe63vPJXjcBoFN3q2fkWjPKvxIKhQaKac=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+ <ADC>
+ <v2.3:Data xsi:type="v2.3:ADCDataDeclarationType" id="ADC34533">
+ <v2.3:Manufacturer>ADC Manufacturer</v2.3:Manufacturer>
+ <v2.3:Model>Some ADC Model</v2.3:Model>
+ <v2.3:CertificationNumber>CertNmbr23451</v2.3:CertificationNumber>
+ <v2.3:Date>2022-01-01T00:00:00Z</v2.3:Date>
+ <v2.3:AppVersion>ADC Declaration App</v2.3:AppVersion>
+ <v2.3:Ratio>1.234</v2.3:Ratio>
+ <v2.3:CertificationMethod>Option 2</v2.3:CertificationMethod>
+ <v2.3:TorqueLossMap>
+ <v2.3:Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="0.00"/>
+ <v2.3:Entry inputSpeed="0.00" inputTorque="500.00" torqueLoss="5.00"/>
+ <v2.3:Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="0.00"/>
+ <v2.3:Entry inputSpeed="2000.00" inputTorque="500.00" torqueLoss="5.00"/>
+ </v2.3:TorqueLossMap>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""></di:DigestMethod>
+ <di:DigestValue>DummyDigestValue</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ADC>
+ <P2.5GearRatios>
+ <!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>tokena</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>zX/IDR+bCvdMheYa6auUOE/hx8ZAqeJz1u3+Pd/NIss=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>b</Manufacturer>
+ <Model>b</Model>
+ <CertificationNumber>tokenb</CertificationNumber>
+ <Date>2017-02-02T00:00:00Z</Date>
+ <AppVersion>bbbbb</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>73.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="621.00"/>
+ <Entry SoC="100" OCV="641.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>bJfbc0NkhpTZWhZ/03YZ4S3iFwGtzhE2kbIiAuKNia8=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#TQ-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_HEV-P_LorryDataType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage</Technology>
+ </PneumaticSystem>
+ <HVAC>
+ <Technology>Default</Technology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ <AirDrag>
+ <!-- optional -->
+ <Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Manufacturer</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-03-24T15:00:00Z</Date>
+ <AppVersion>Vecto AirDrag x.y</AppVersion>
+ <CdxA_0>6.31</CdxA_0>
+ <TransferredCdxA>6.32</TransferredCdxA>
+ <DeclaredCdxA>6.34</DeclaredCdxA>
+ </Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV_heavyLorry_Px_SuperCap.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV_heavyLorry_Px_SuperCap.xml
new file mode 100644
index 0000000000000000000000000000000000000000..46d6d7a40da5d96e10880555170f11c01aa19d16
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/HeavyLorry/HEV_heavyLorry_Px_SuperCap.xml
@@ -0,0 +1,496 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
+ <v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
+ <Manufacturer>TU Graz</Manufacturer>
+ <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
+ <Model>HEV Heavy Lorry Px</Model>
+ <VIN>1234</VIN>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xsi:type="PTOType">
+ <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+ <PTOOtherElements>none</PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <NgTankSystem>Liquefied</NgTankSystem>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>P2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="ADAS_HEV_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xsi:type="v2.0:TorqueLimitsType">
+ <!-- optional -->
+ <v2.0:Entry gear="9" maxTorque="2000"/>
+ </TorqueLimits>
+ <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <BoostingLimitations xsi:type="BoostingLimitationsType">
+ <!-- optional -->
+ <Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
+ <Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
+ </BoostingLimitations>
+ <Components xsi:type="Components_HEV-Px_LorryType">
+ <Engine>
+ <v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <IdlingSpeed>560</IdlingSpeed>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelType>NG</FuelType>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning>
+ <!-- optional -->
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>SRYiAOd48DGe63vPJXjcBoFN3q2fkWjPKvxIKhQaKac=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+ <ADC>
+ <v2.3:Data xsi:type="v2.3:ADCDataDeclarationType" id="ADC34533">
+ <v2.3:Manufacturer>ADC Manufacturer</v2.3:Manufacturer>
+ <v2.3:Model>Some ADC Model</v2.3:Model>
+ <v2.3:CertificationNumber>CertNmbr23451</v2.3:CertificationNumber>
+ <v2.3:Date>2022-01-01T00:00:00Z</v2.3:Date>
+ <v2.3:AppVersion>ADC Declaration App</v2.3:AppVersion>
+ <v2.3:Ratio>1.234</v2.3:Ratio>
+ <v2.3:CertificationMethod>Option 2</v2.3:CertificationMethod>
+ <v2.3:TorqueLossMap>
+ <v2.3:Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="0.00"/>
+ <v2.3:Entry inputSpeed="0.00" inputTorque="500.00" torqueLoss="5.00"/>
+ <v2.3:Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="0.00"/>
+ <v2.3:Entry inputSpeed="2000.00" inputTorque="500.00" torqueLoss="5.00"/>
+ </v2.3:TorqueLossMap>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""></di:DigestMethod>
+ <di:DigestValue>DummyDigestValue</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ADC>
+ <P2.5GearRatios>
+ <!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <ElectricEnergyStorage>
+ <Capacitor>
+ <Data xsi:type="v2.3:CapacitorSystemDataType" id="SuperCap-1234">
+ <v2.3:Manufacturer>SuperCapManufacturer</v2.3:Manufacturer>
+ <v2.3:Model>MySuperSupercap</v2.3:Model>
+ <v2.3:CertificationNumber>C123987765</v2.3:CertificationNumber>
+ <v2.3:Date>2022-01-01T00:00:00Z</v2.3:Date>
+ <v2.3:AppVersion>SuperCapMeasurementApp</v2.3:AppVersion>
+ <v2.3:CertificationMethod>Measured</v2.3:CertificationMethod>
+ <v2.3:Capacitance>53.00</v2.3:Capacitance>
+ <v2.3:InternalResistance>300.00</v2.3:InternalResistance>
+ <v2.3:MinVoltage>30.00</v2.3:MinVoltage>
+ <v2.3:MaxVoltage>180.00</v2.3:MaxVoltage>
+ <v2.3:MaxChargingCurrent>210.00</v2.3:MaxChargingCurrent>
+ <v2.3:MaxDischargingCurrent>220.00</v2.3:MaxDischargingCurrent>
+ </Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""></di:DigestMethod>
+ <di:DigestValue>DummyDigestValue</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Capacitor>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#TQ-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_HEV-P_LorryDataType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage</Technology>
+ </PneumaticSystem>
+ <HVAC>
+ <Technology>Default</Technology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ <AirDrag>
+ <!-- optional -->
+ <Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Manufacturer</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-03-24T15:00:00Z</Date>
+ <AppVersion>Vecto AirDrag x.y</AppVersion>
+ <CdxA_0>6.31</CdxA_0>
+ <TransferredCdxA>6.32</TransferredCdxA>
+ <DeclaredCdxA>6.34</DeclaredCdxA>
+ </Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/MediumLorry/HEV_mediumLorry_IHPC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/MediumLorry/HEV_mediumLorry_IHPC.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e09a8667c587edcdf64fc3d8b8c0f7064dfc3d17
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/MediumLorry/HEV_mediumLorry_IHPC.xml
@@ -0,0 +1,540 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
+ <v2.0:Vehicle xsi:type="Vehicle_HEV-Px_MediumLorryDeclarationType" id="a">
+ <Manufacturer>TU Graz</Manufacturer>
+ <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
+ <Model>HEV Heavy Lorry Px</Model>
+ <VIN>1234</VIN>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <LegislativeCategory>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>3500</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>7100</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <CargoVolume>20.300</CargoVolume>
+ <!-- optional -->
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <NgTankSystem>Liquefied</NgTankSystem>
+ <!-- optional -->
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>P2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="ADAS_HEV_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xsi:type="v2.0:TorqueLimitsType">
+ <!-- optional -->
+ <v2.0:Entry gear="9" maxTorque="2000"/>
+ </TorqueLimits>
+ <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <BoostingLimitations xsi:type="BoostingLimitationsType">
+ <!-- optional -->
+ <Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
+ <Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
+ </BoostingLimitations>
+ <Components xsi:type="Components_HEV-Px_LorryType">
+ <Engine>
+ <v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <IdlingSpeed>560</IdlingSpeed>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelType>NG</FuelType>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>IHPC Type 1</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap gear="1">
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ <PowerMap gear="2">
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap gear="1">
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ <PowerMap gear="2">
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+ <P2.5GearRatios>
+ <!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <!-- optional -->
+ <SOCmax>80</SOCmax>
+ <!-- optional -->
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>IHPC Type 1</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </v2.3:Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#TQ-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_HEV-P_LorryDataType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage</Technology>
+ </PneumaticSystem>
+ <HVAC>
+ <Technology>Default</Technology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ <AirDrag>
+ <!-- optional -->
+ <Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Manufacturer</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-03-24T15:00:00Z</Date>
+ <AppVersion>Vecto AirDrag x.y</AppVersion>
+ <CdxA_0>6.31</CdxA_0>
+ <TransferredCdxA>6.32</TransferredCdxA>
+ <DeclaredCdxA>6.34</DeclaredCdxA>
+ </Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/MediumLorry/HEV_mediumLorry_Px_SuperCap.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/MediumLorry/HEV_mediumLorry_Px_SuperCap.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8bd33f3cc5bbb77133293c231e5c67fc85bb794f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/MediumLorry/HEV_mediumLorry_Px_SuperCap.xml
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
+ <v2.0:Vehicle xsi:type="Vehicle_HEV-Px_MediumLorryDeclarationType" id="a">
+ <Manufacturer>TU Graz</Manufacturer>
+ <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
+ <Model>HEV Heavy Lorry Px</Model>
+ <VIN>1234</VIN>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <LegislativeCategory>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>3500</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>7100</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>650</IdlingSpeed>
+ <CargoVolume>20.300</CargoVolume>
+ <!-- optional -->
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <NgTankSystem>Liquefied</NgTankSystem>
+ <!-- optional -->
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>P2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="ADAS_HEV_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xsi:type="v2.0:TorqueLimitsType">
+ <!-- optional -->
+ <v2.0:Entry gear="9" maxTorque="2000"/>
+ </TorqueLimits>
+ <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <BoostingLimitations xsi:type="BoostingLimitationsType">
+ <!-- optional -->
+ <Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
+ <Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
+ </BoostingLimitations>
+ <Components xsi:type="Components_HEV-Px_LorryType">
+ <Engine>
+ <v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <IdlingSpeed>560</IdlingSpeed>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelType>NG</FuelType>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+ <P2.5GearRatios>
+ <!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <ElectricEnergyStorage>
+ <Capacitor>
+ <v2.4:Data xsi:type="CapacitorSystemDataType" id="SuperCap-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>SuperCap Manufacturer</Manufacturer>
+ <Model>TheBestSuperCap</Model>
+ <CertificationNumber>CertNbr1234</CertificationNumber>
+ <Date>2022-01-01T00:00:00Z</Date>
+ <AppVersion>SuperCap Preprocessing App 1.0</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <Capacitance>25.00</Capacitance>
+ <InternalResistance>400.00</InternalResistance>
+ <MinVoltage>60.00</MinVoltage>
+ <MaxVoltage>180.00</MaxVoltage>
+ <MaxChargingCurrent>200.00</MaxChargingCurrent>
+ <MaxDischargingCurrent>200.00</MaxDischargingCurrent>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue>DummyDigestValue</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Capacitor>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#TQ-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_HEV-P_LorryDataType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage</Technology>
+ </PneumaticSystem>
+ <HVAC>
+ <Technology>Default</Technology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ <AirDrag>
+ <!-- optional -->
+ <Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Manufacturer</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-03-24T15:00:00Z</Date>
+ <AppVersion>Vecto AirDrag x.y</AppVersion>
+ <CdxA_0>6.31</CdxA_0>
+ <TransferredCdxA>6.32</TransferredCdxA>
+ <DeclaredCdxA>6.34</DeclaredCdxA>
+ </Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/MediumLorry/PEV_mediumLorry_AMT_E2_BatteryStd.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/MediumLorry/PEV_mediumLorry_AMT_E2_BatteryStd.xml
new file mode 100644
index 0000000000000000000000000000000000000000..15167fb7ac66761263e796b6e2cd9e4d4248cab2
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/MediumLorry/PEV_mediumLorry_AMT_E2_BatteryStd.xml
@@ -0,0 +1,460 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
+ <v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
+ <Manufacturer>TU Graz</Manufacturer>
+ <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
+ <Model>HEV Heavy Lorry Px</Model>
+ <VIN>1234</VIN>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <LegislativeCategory>N2</LegislativeCategory>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>3500</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>7100</TechnicalPermissibleMaximumLadenMass>
+ <CargoVolume>20.300</CargoVolume><!-- optional -->
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="ADAS_PEV_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"><!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <Components xsi:type="Components_PEV-E2_LorryType">
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+ <P2.5GearRatios><!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter><!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#TQ-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive><!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder><!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_PEV_LorryDataType">
+ <SteeringPump>
+ <Technology axleNumber="1">Full electric steering gear</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage + elec. driven</Technology>
+ </PneumaticSystem>
+ <HVAC>
+ <Technology>Default</Technology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ <AirDrag><!-- optional -->
+ <Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Manufacturer</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-03-24T15:00:00Z</Date>
+ <AppVersion>Vecto AirDrag x.y</AppVersion>
+ <CdxA_0>6.31</CdxA_0>
+ <TransferredCdxA>6.32</TransferredCdxA>
+ <DeclaredCdxA>6.34</DeclaredCdxA>
+ </Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/Conventional_primaryBus_AMT_DF.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/Conventional_primaryBus_AMT_DF.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a9a5d66aff37a2acccc87b0e3ae52b8e2cc8bd5a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/Conventional_primaryBus_AMT_DF.xml
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+ <Model>Generic Model</Model>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
+ <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>600</IdlingSpeed>
+ <RetarderType>Transmission Output Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ADAS xsi:type="ADAS_Conventional_Type">
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xsi:type="v2.0:TorqueLimitsType">
+ <!-- optional -->
+ <v2.0:Entry gear="6" maxTorque="1800"/>
+ <v2.0:Entry gear="1" maxTorque="2500"/>
+ <v2.0:Entry gear="12" maxTorque="1900"/>
+ </TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine xsi:type="v2.0:EngineComponentDeclarationType">
+ <v2.0:Data xsi:type="EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHRType>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>false</ElectricalOutput>
+ </WHRType>
+ <Mode>
+ <IdlingSpeed>560</IdlingSpeed>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ <Fuel type="NG CI">
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ </Fuel>
+ <Fuel type="Diesel CI">
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="1286.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="5063.00"/>
+ </FuelConsumptionMap>
+ </Fuel>
+ </Mode>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <!-- optional -->
+ <v2.0:Data id="tc-123xyz" xsi:type="v2.0:TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#tc-123xyz">
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>BpqbVEM5dAFXyIeZfvKBUhv+Oj4OU5R85aK9M4ylV+4=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <AlternatorTechnology>conventional</AlternatorTechnology>
+ <SmartAlternator>
+ <!-- optional -->
+ <RatedCurrent>100</RatedCurrent>
+ <RatedVoltage>48</RatedVoltage>
+ </SmartAlternator>
+ <SmartAlternator>
+ <!-- optional -->
+ <RatedCurrent>50</RatedCurrent>
+ <RatedVoltage>48</RatedVoltage>
+ </SmartAlternator>
+ <Battery>
+ <!-- optional -->
+ <BatteryTechnology>li-ion battery - high power</BatteryTechnology>
+ <RatedCapacity>50</RatedCapacity>
+ <NominalVoltage>48</NominalVoltage>
+ </Battery>
+ <Capacitor>
+ <!-- optional -->
+ <CapacitorTechnology>with DCDC converter</CapacitorTechnology>
+ <RatedCapacitance>120</RatedCapacitance>
+ <RatedVoltage>30</RatedVoltage>
+ </Capacitor>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+ <CompressorDrive>mechanically</CompressorDrive>
+ <Clutch>none</Clutch>
+ <CompressorRatio>1.000</CompressorRatio>
+ <SmartCompressionSystem>false</SmartCompressionSystem>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/Conventional_primaryBus_AT_Angledrive.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/Conventional_primaryBus_AT_Angledrive.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2dca27c32d715acaf6da7e8373e0ad487b5dbe14
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/Conventional_primaryBus_AT_Angledrive.xml
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+ <Model>Generic Model</Model>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
+ <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>600</IdlingSpeed>
+ <RetarderType>Transmission Output Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>Separate Angledrive</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ADAS xsi:type="ADAS_Conventional_Type">
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ <APTEcoRollReleaseLockupClutch>false</APTEcoRollReleaseLockupClutch>
+ </ADAS>
+ <TorqueLimits xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
+ <v2.0:Entry gear="6" maxTorque="1800"/>
+ <v2.0:Entry gear="1" maxTorque="2500"/>
+ <v2.0:Entry gear="12" maxTorque="1900"/>
+ </TorqueLimits>
+ <Components xsi:type="Components_Conventional_PrimaryBusType">
+ <Engine xsi:type="v2.0:EngineComponentDeclarationType">
+ <v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <IdlingSpeed>560</IdlingSpeed>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelType>NG</FuelType>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>APT-S</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="3">
+ <Ratio>9.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <v2.0:Data id="tc-123xyz" xsi:type="v2.0:TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#tc-123xyz">
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>BpqbVEM5dAFXyIeZfvKBUhv+Oj4OU5R85aK9M4ylV+4=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder><!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <AlternatorTechnology>conventional</AlternatorTechnology>
+ <SmartAlternator><!-- optional -->
+ <RatedCurrent>100</RatedCurrent>
+ <RatedVoltage>48</RatedVoltage>
+ </SmartAlternator>
+ <SmartAlternator><!-- optional -->
+ <RatedCurrent>50</RatedCurrent>
+ <RatedVoltage>48</RatedVoltage>
+ </SmartAlternator>
+ <Battery><!-- optional -->
+ <BatteryTechnology>li-ion battery - high power</BatteryTechnology>
+ <RatedCapacity>50</RatedCapacity>
+ <NominalVoltage>48</NominalVoltage>
+ </Battery>
+ <Capacitor><!-- optional -->
+ <CapacitorTechnology>with DCDC converter</CapacitorTechnology>
+ <RatedCapacitance>120</RatedCapacitance>
+ <RatedVoltage>30</RatedVoltage>
+ </Capacitor>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+ <CompressorDrive>mechanically</CompressorDrive>
+ <Clutch>none</Clutch>
+ <CompressorRatio>1.000</CompressorRatio>
+ <SmartCompressionSystem>false</SmartCompressionSystem>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/HEV-S_primaryBus_AMT_S2_ADC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/HEV-S_primaryBus_AMT_S2_ADC.xml
new file mode 100644
index 0000000000000000000000000000000000000000..04e7ae54f47425350d220559feef73958aad1ca3
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/HEV-S_primaryBus_AMT_S2_ADC.xml
@@ -0,0 +1,609 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_HEV-Sx_PrimaryBusDeclarationType">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+ <Model>Generic Model</Model>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
+ <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>600</IdlingSpeed>
+ <RetarderType>Transmission Output Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ArchitectureID>S2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <MaxChargingPower>1</MaxChargingPower>
+ <!-- optional -->
+ <ADAS xsi:type="ADAS_HEV_Type">
+ <EngineStopStart>false</EngineStopStart>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
+ <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsSerialHybridType">
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>GEN</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <Components xsi:type="Components_HEV-S2_PrimaryBusType">
+ <Engine xsi:type="v2.0:EngineComponentDeclarationType">
+ <v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <IdlingSpeed>560</IdlingSpeed>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelType>NG</FuelType>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <ElectricMachineGEN>
+ <PowertrainPosition>GEN</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+ </ElectricMachineGEN>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+<ADC>
+ <Data xsi:type="ADCDataDeclarationType" id="ADC-123498" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>ADC MAnufacturer</Manufacturer>
+ <Model>Some ADC Model</Model>
+ <CertificationNumber>CertNbr 1234987</CertificationNumber>
+ <Date>2022-01-01T00:00:00Z</Date>
+ <AppVersion>ADC PreProcessing 1.0</AppVersion>
+ <Ratio>1.000</Ratio>
+ <CertificationMethod>Option 2</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="0.00"/>
+ <Entry inputSpeed="0.00" inputTorque="500.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="0.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="500.00" torqueLoss="5.00"/>
+ </TorqueLossMap>
+ </Data>
+ <v2.3:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""></di:DigestMethod>
+ <di:DigestValue></di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+</ADC>
+ <P2.5GearRatios>
+ <!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <!-- optional -->
+ <v2.0:Data id="tc-123xyz" xsi:type="v2.0:TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#tc-123xyz">
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>BpqbVEM5dAFXyIeZfvKBUhv+Oj4OU5R85aK9M4ylV+4=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_HEV-S_PrimaryBusType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Full electric steering gear</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <AlternatorTechnology>conventional</AlternatorTechnology>
+ <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+ <CompressorDrive>mechanically</CompressorDrive>
+ <Clutch>none</Clutch>
+ <CompressorRatio>1.000</CompressorRatio>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/HEV-S_primaryBus_AMT_S2_GenSetADC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/HEV-S_primaryBus_AMT_S2_GenSetADC.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c1a62d5661a12b22c488371826ca103faf1c8dc4
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/HEV-S_primaryBus_AMT_S2_GenSetADC.xml
@@ -0,0 +1,609 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_HEV-Sx_PrimaryBusDeclarationType">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+ <Model>Generic Model</Model>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
+ <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>600</IdlingSpeed>
+ <RetarderType>Transmission Output Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ArchitectureID>S2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <MaxChargingPower>1</MaxChargingPower>
+ <!-- optional -->
+ <ADAS xsi:type="ADAS_HEV_Type">
+ <EngineStopStart>false</EngineStopStart>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
+ <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsSerialHybridType">
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>GEN</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <Components xsi:type="Components_HEV-S2_PrimaryBusType">
+ <Engine xsi:type="v2.0:EngineComponentDeclarationType">
+ <v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <IdlingSpeed>560</IdlingSpeed>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelType>NG</FuelType>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <ElectricMachineGEN>
+ <PowertrainPosition>GEN</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+ <ADC>
+ <Data xsi:type="ADCDataDeclarationType" id="ADCGen-123" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>ADC Manufaturer</Manufacturer>
+ <Model>GenSetADC</Model>
+ <CertificationNumber>CertNbr345</CertificationNumber>
+ <Date>2022-01-01T00:00:00Z</Date>
+ <AppVersion>ADC Evaluation App</AppVersion>
+ <Ratio>1.000</Ratio>
+ <CertificationMethod>Option 2</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="0.00"/>
+ <Entry inputSpeed="0.00" inputTorque="500.00" torqueLoss="5.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="0.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="500.00" torqueLoss="5.00"/>
+ </TorqueLossMap>
+ </Data>
+ <v2.3:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""></di:DigestMethod>
+ <di:DigestValue></di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ADC>
+ </ElectricMachineGEN>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+ <P2.5GearRatios>
+ <!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <!-- optional -->
+ <v2.0:Data id="tc-123xyz" xsi:type="v2.0:TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#tc-123xyz">
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>BpqbVEM5dAFXyIeZfvKBUhv+Oj4OU5R85aK9M4ylV+4=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_HEV-S_PrimaryBusType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Full electric steering gear</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <AlternatorTechnology>conventional</AlternatorTechnology>
+ <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+ <CompressorDrive>mechanically</CompressorDrive>
+ <Clutch>none</Clutch>
+ <CompressorRatio>1.000</CompressorRatio>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/HEV_primaryBus_AMT_IHPC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/HEV_primaryBus_AMT_IHPC.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b6f0d78f58a3c4cd3bb907f8fb545588b1e29862
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/HEV_primaryBus_AMT_IHPC.xml
@@ -0,0 +1,542 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
+ <v2.0:Vehicle xsi:type="Vehicle_HEV-Px_PrimaryBusDeclarationType" id="a">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+ <Model>Generic Model</Model>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
+ <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>600</IdlingSpeed>
+ <RetarderType>Transmission Output Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ArchitectureID>P2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="ADAS_HEV_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:TorqueLimitsType">
+ <!-- optional -->
+ <v2.0:Entry gear="9" maxTorque="2000"/>
+ </TorqueLimits>
+ <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <BoostingLimitations xsi:type="BoostingLimitationsType">
+ <!-- optional -->
+ <Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
+ <Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
+ </BoostingLimitations>
+ <Components xsi:type="Components_HEV-Px_PrimaryBusType">
+ <Engine>
+ <v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <IdlingSpeed>560</IdlingSpeed>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelType>NG</FuelType>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>IHPC Type 1</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap gear="1">
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ <PowerMap gear="2">
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap gear="1">
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ <PowerMap gear="2">
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+ <P2.5GearRatios>
+ <!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>IHPC Type 1</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </v2.3:Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#TQ-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_HEV-P_PrimaryBusType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <AlternatorTechnology>conventional</AlternatorTechnology>
+ <SmartAlternator>
+ <!-- optional -->
+ <RatedCurrent>100</RatedCurrent>
+ <RatedVoltage>48</RatedVoltage>
+ </SmartAlternator>
+ <SmartAlternator>
+ <!-- optional -->
+ <RatedCurrent>50</RatedCurrent>
+ <RatedVoltage>48</RatedVoltage>
+ </SmartAlternator>
+ <Battery>
+ <!-- optional -->
+ <BatteryTechnology>li-ion battery - high power</BatteryTechnology>
+ <RatedCapacity>50</RatedCapacity>
+ <NominalVoltage>48</NominalVoltage>
+ </Battery>
+ <Capacitor>
+ <!-- optional -->
+ <CapacitorTechnology>with DCDC converter</CapacitorTechnology>
+ <RatedCapacitance>120</RatedCapacitance>
+ <RatedVoltage>30</RatedVoltage>
+ </Capacitor>
+ <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+ <CompressorDrive>mechanically</CompressorDrive>
+ <Clutch>none</Clutch>
+ <CompressorRatio>1.000</CompressorRatio>
+ <SmartCompressionSystem>true</SmartCompressionSystem>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/HEV_primaryBus_AMT_Px_SuperCap.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/HEV_primaryBus_AMT_Px_SuperCap.xml
new file mode 100644
index 0000000000000000000000000000000000000000..42cbc5389c405c106848c1de7d440206868e02b4
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/HEV_primaryBus_AMT_Px_SuperCap.xml
@@ -0,0 +1,470 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
+ <v2.0:Vehicle xsi:type="Vehicle_HEV-Px_PrimaryBusDeclarationType" id="a">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+ <Model>Generic Model</Model>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
+ <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>600</IdlingSpeed>
+ <RetarderType>Transmission Output Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ArchitectureID>P2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="ADAS_HEV_Type">
+ <EngineStopStart>true</EngineStopStart>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:TorqueLimitsType">
+ <!-- optional -->
+ <v2.0:Entry gear="9" maxTorque="2000"/>
+ </TorqueLimits>
+ <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <BoostingLimitations xsi:type="BoostingLimitationsType">
+ <!-- optional -->
+ <Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
+ <Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
+ </BoostingLimitations>
+ <Components xsi:type="Components_HEV-Px_PrimaryBusType">
+ <Engine>
+ <v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <IdlingSpeed>560</IdlingSpeed>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>380000</RatedPower>
+ <MaxEngineTorque>2300</MaxEngineTorque>
+ <WHTCUrban>1.0097</WHTCUrban>
+ <WHTCRural>1.0035</WHTCRural>
+ <WHTCMotorway>1.0200</WHTCMotorway>
+ <BFColdHot>1.0000</BFColdHot>
+ <CFRegPer>1.0000</CFRegPer>
+ <CFNCV>1.0000</CFNCV>
+ <FuelType>NG</FuelType>
+ <FuelConsumptionMap>
+ <Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
+ <Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
+ <Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
+ </FuelConsumptionMap>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+ <Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
+ <Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+ </FullLoadAndDragCurve>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#ENG-gooZah3D">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>/qqS7iMvDm0MYurhsIRZTF5FeS+MNA2HnoS1P8SrSdA=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Engine>
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="v2.3:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+ <P2.5GearRatios>
+ <!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <ElectricEnergyStorage>
+<Capacitor>
+ <v2.4:Data xsi:type="CapacitorSystemDataType" id="SuperCap-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>SuperCap Manufacturer</Manufacturer>
+ <Model>TheBestSuperCap</Model>
+ <CertificationNumber>CertNbr1234</CertificationNumber>
+ <Date>2022-01-01T00:00:00Z</Date>
+ <AppVersion>SuperCap Preprocessing App 1.0</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <Capacitance>25.00</Capacitance>
+ <InternalResistance>400.00</InternalResistance>
+ <MinVoltage>60.00</MinVoltage>
+ <MaxVoltage>180.00</MaxVoltage>
+ <MaxChargingCurrent>200.00</MaxChargingCurrent>
+ <MaxDischargingCurrent>200.00</MaxDischargingCurrent>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""></di:DigestMethod>
+ <di:DigestValue></di:DigestValue>
+ </di:Reference>
+ </Signature>
+</Capacitor>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#TQ-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_HEV-P_PrimaryBusType">
+ <Fan>
+ <Technology>Hydraulic driven - Constant displacement pump</Technology>
+ </Fan>
+ <SteeringPump>
+ <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <AlternatorTechnology>conventional</AlternatorTechnology>
+ <SmartAlternator>
+ <!-- optional -->
+ <RatedCurrent>100</RatedCurrent>
+ <RatedVoltage>48</RatedVoltage>
+ </SmartAlternator>
+ <SmartAlternator>
+ <!-- optional -->
+ <RatedCurrent>50</RatedCurrent>
+ <RatedVoltage>48</RatedVoltage>
+ </SmartAlternator>
+ <Battery>
+ <!-- optional -->
+ <BatteryTechnology>li-ion battery - high power</BatteryTechnology>
+ <RatedCapacity>50</RatedCapacity>
+ <NominalVoltage>48</NominalVoltage>
+ </Battery>
+ <Capacitor>
+ <!-- optional -->
+ <CapacitorTechnology>with DCDC converter</CapacitorTechnology>
+ <RatedCapacitance>120</RatedCapacitance>
+ <RatedVoltage>30</RatedVoltage>
+ </Capacitor>
+ <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+ <CompressorDrive>mechanically</CompressorDrive>
+ <Clutch>none</Clutch>
+ <CompressorRatio>1.000</CompressorRatio>
+ <SmartCompressionSystem>true</SmartCompressionSystem>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/PEV_primaryBus_AMT_E2_BatteryStd.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/PEV_primaryBus_AMT_E2_BatteryStd.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0fc9d67a836caa12beeeacccaf5b9da1e842826b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/PEV_primaryBus_AMT_E2_BatteryStd.xml
@@ -0,0 +1,441 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
+ <v2.0:Vehicle xsi:type="Vehicle_PEV_PrimaryBusDeclarationType" id="a">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+ <Model>Generic Model</Model>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
+ <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+ <RetarderType>Transmission Output Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ArchitectureID>E2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="ADAS_PEV_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <Components xsi:type="Components_PEV-E2_PrimaryBusType">
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning>
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+ <P2.5GearRatios>
+ <!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#TQ-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_PEV_PrimaryBusType">
+ <SteeringPump>
+ <Technology axleNumber="1">Full electric steering gear</Technology>
+ </SteeringPump>
+ <PneumaticSystem>
+ <CompressorDrive>electrically</CompressorDrive>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/PEV_primaryBus_AMT_E2_EMStd.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/PEV_primaryBus_AMT_E2_EMStd.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b16ce74000effcedc9677d52665e287104ec1c19
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/PrimaryBus/PEV_primaryBus_AMT_E2_EMStd.xml
@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
+ <v2.0:Vehicle xsi:type="Vehicle_PEV_PrimaryBusDeclarationType" id="a">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+ <Model>Generic Model</Model>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
+ <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+ <RetarderType>Transmission Output Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ArchitectureID>E2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="ADAS_PEV_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
+ <!-- optional -->
+ <ElectricMachine>
+ <Position>2</Position>
+ <VoltageLevel>
+ <Voltage>100</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>500</Voltage>
+ <MaxTorqueCurve>
+ <v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+ <v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+ </MaxTorqueCurve>
+ </VoltageLevel>
+ </ElectricMachine>
+ </ElectricMotorTorqueLimits>
+ <Components xsi:type="Components_PEV-E2_PrimaryBusType">
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.3:Data xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <R85RatedPower>50000</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ </v2.3:Data>
+ <v2.3:Signature>
+ <di:Reference URI="#EM-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>siONkqzC3QW+4si2eVwLNTwtAxUM0dxMFdAYXjVNl+0=</di:DigestValue>
+ </di:Reference>
+ </v2.3:Signature>
+ </ElectricMachineSystem>
+ <P2.5GearRatios>
+ <!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.4:Data>
+ <Signature>
+ <di:Reference URI="#BAT-asdf">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>8fsWE1AvinkI5UcWuU/vyx3X2kKjarP/qPC+Uon+aBE=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter>
+ <!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#TQ-1234">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>P8mKieew0dWJFSIPapRXdUf2FsYG4ONvolD5kjkYEkw=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Angledrive>
+ <!-- optional -->
+ <v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <Ratio>2.345</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+ <Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+ <Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#agl-vi2Oak2N">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>iVRxT+wETVrlCQhZMsiqRC1mKcw3a3KSeb1y5uhINQk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Angledrive>
+ <Retarder>
+ <!-- optional -->
+ <v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+ <Model>Generic Retarder</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <RetarderLossMap>
+ <Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+ <Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
+ </RetarderLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#RET-Shai9imi">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>xcfok6Uo1kvFefSRo+W/oMfEfS5BdTklBugAjby2DUQ=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Retarder>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>Ux2vo+s07pGr9XCbvNs/YbJcFaZClORRGXpP6Eyeze8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_PEV_PrimaryBusType">
+ <SteeringPump>
+ <Technology axleNumber="1">Full electric steering gear</Technology>
+ </SteeringPump>
+ <PneumaticSystem>
+ <CompressorDrive>electrically</CompressorDrive>
+ <SmartRegenerationSystem>false</SmartRegenerationSystem>
+ <AirsuspensionControl>electronically</AirsuspensionControl>
+ </PneumaticSystem>
+ <HVAC>
+ <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_AMT_S2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_AMT_S2_n_opt.xml
index 615c385e6ca20dd62eb39d25cedf1ab7d66930ef..0a41c27700f4ea079b18ecdc314d513f0de64c99 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_AMT_S2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_AMT_S2_n_opt.xml
@@ -81,7 +81,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -225,7 +225,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_IEPC-S_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_IEPC-S_n_opt.xml
index 984c847dfb4b2904808b7ac3bea5839c301b570f..9a7551d2fac0e1cb40136a750586b641b8fd3dc9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_IEPC-S_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_IEPC-S_n_opt.xml
@@ -101,7 +101,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -242,7 +242,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured for complete component</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>false</DesignTypeWheelMotor>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S3_n_opt.xml
index 404d1791f790583353225415b95bf6d5a9834eb8..28caaf1d3216655a2a55b7ba37984391a85821a7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S3_n_opt.xml
@@ -81,7 +81,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -225,7 +225,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S4_n_opt.xml
index 2172cd84cc98f4140f33467b9175c4e297ace98a..574f1573096ca5136cc5902aa1cd2031d48d22c7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_heavyLorry_S4_n_opt.xml
@@ -81,7 +81,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -225,7 +225,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_AMT_S2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_AMT_S2_n_opt.xml
index 84849e92792e8e8c014754d6d1d0745df9b3ff66..1a7b7f6f640a0c4ce4c46772a3d053582b741af2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_AMT_S2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_AMT_S2_n_opt.xml
@@ -75,7 +75,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -219,7 +219,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_IEPC-S_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_IEPC-S_n_opt.xml
index 3655abed882ed2d5fb654b8fdaed29e822a04232..81efe8a405148ab409f15590493201513cda93ee 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_IEPC-S_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_IEPC-S_n_opt.xml
@@ -95,7 +95,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -236,7 +236,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured for complete component</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>false</DesignTypeWheelMotor>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S3_n_opt.xml
index 01bdc223301d9b76f4648a4266793f5131ce4a8f..10618e5fbe380fb142d6acee5e39ee0b49984c3f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S3_n_opt.xml
@@ -75,7 +75,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -219,7 +219,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S4_n_opt.xml
index 166a929a4e7dbb624bfb320b605f87190411a360..667fe3bd11f80260c62fe3abf88e297b140c2115 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_mediumLorry_S4_n_opt.xml
@@ -75,7 +75,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -219,7 +219,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_AMT_S2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_AMT_S2_n_opt.xml
index 97b4f3895bb56b4dd86cfb2eaf23784c7fa8e38b..66e6678fc43732c14c28e46370d0112aaf748328 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_AMT_S2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_AMT_S2_n_opt.xml
@@ -78,7 +78,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -222,7 +222,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_IEPC-S_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_IEPC-S_n_opt.xml
index 8e2a63396255527bfe1902416f0e17e8a0608721..a6e3e8e82a59a8ac35a06b8c20b61816017d569f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_IEPC-S_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_IEPC-S_n_opt.xml
@@ -94,7 +94,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -235,7 +235,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured for complete component</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>false</DesignTypeWheelMotor>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S3_n_opt.xml
index 5e6fd226e7a8f427307cb49d4d20683203521775..34d18d16240c6c48755592edb1c64f02701087ce 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S3_n_opt.xml
@@ -74,7 +74,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -218,7 +218,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S4_n_opt.xml
index 38d89ce490086bfd5b2ba0e38072dd986d1c687f..9cb1c0ddc13b58f954ef41dd27597124dff1dff0 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV-S_primaryBus_S4_n_opt.xml
@@ -74,7 +74,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
@@ -218,7 +218,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_heavyLorry_AMT_Px_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_heavyLorry_AMT_Px_n_opt.xml
index 733c8d8ca876a7e7d0106de5155f9522f7a7b57a..329423213ab9af172658325ec391ad01906a5453 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_heavyLorry_AMT_Px_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_heavyLorry_AMT_Px_n_opt.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<Model>HEV Heavy Lorry Px</Model>
<VIN>1234</VIN>
<Date>2017-01-01T00:00:00Z</Date>
<LegislativeCategory>N3</LegislativeCategory>
<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>650</IdlingSpeed>
<RetarderType>Losses included in Gearbox</RetarderType>
<RetarderRatio>2.000</RetarderRatio>
<AngledriveType>Separate Angledrive</AngledriveType>
<PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<VocationalVehicle>true</VocationalVehicle>
<SleeperCab>true</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>P2.5</ArchitectureID>
<OvcHev>true</OvcHev>
<MaxChargingPower>11</MaxChargingPower>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<Components xsi:type="Components_HEV-Px_LorryType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
</v2.3:Data>
<v2.3:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>tokena</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm="asf"/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>b</Manufacturer>
<Model>b</Model>
<CertificationNumber>tokenb</CertificationNumber>
<Date>2017-02-02T00:00:00Z</Date>
<AppVersion>bbbbb</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>73.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="621.00"/>
<Entry SoC="100" OCV="641.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm="bsf"/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
</ElectricSystem>
<PneumaticSystem>
<Technology>Medium Supply 2-stage</Technology>
</PneumaticSystem>
<HVAC>
<Technology>Default</Technology>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
<Manufacturer>TU Graz</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<Model>HEV Heavy Lorry Px</Model>
<VIN>1234</VIN>
<Date>2017-01-01T00:00:00Z</Date>
<LegislativeCategory>N3</LegislativeCategory>
<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>650</IdlingSpeed>
<RetarderType>Losses included in Gearbox</RetarderType>
<RetarderRatio>2.000</RetarderRatio>
<AngledriveType>Separate Angledrive</AngledriveType>
<PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<VocationalVehicle>true</VocationalVehicle>
<SleeperCab>true</SleeperCab>
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>P2.5</ArchitectureID>
<OvcHev>true</OvcHev>
<MaxChargingPower>11</MaxChargingPower>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<Components xsi:type="Components_HEV-Px_LorryType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
</v2.3:Data>
<v2.3:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>tokena</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm="asf"/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>b</Manufacturer>
<Model>b</Model>
<CertificationNumber>tokenb</CertificationNumber>
<Date>2017-02-02T00:00:00Z</Date>
<AppVersion>bbbbb</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>73.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="621.00"/>
<Entry SoC="100" OCV="641.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm="bsf"/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
</ElectricSystem>
<PneumaticSystem>
<Technology>Medium Supply 2-stage</Technology>
</PneumaticSystem>
<HVAC>
<Technology>Default</Technology>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml
index 68ba28d5ebcec8b75db415dcfcd749d509a4a176..0cfd8f16e69ed26e7bc1e0536340ef8faa87cea2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml
@@ -75,7 +75,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_primaryBus_AMT_Px_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_primaryBus_AMT_Px_n_opt.xml
index ced7dfb8fbfba31f46148dcf8f966f6158104f24..5324763cc63744d092a0d965ffc2f67eafc0a84a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_primaryBus_AMT_Px_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/HEV_primaryBus_AMT_Px_n_opt.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890</VIN>
<Date>2017-02-15T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>true</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Losses included in Gearbox</RetarderType>
<RetarderRatio>2.000</RetarderRatio>
<AngledriveType>Separate Angledrive</AngledriveType>
<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>true</OvcHev>
<MaxChargingPower>11</MaxChargingPower>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<Components xsi:type="Components_HEV-Px_PrimaryBusType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>1</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>100</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>50</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<Battery>
<!-- optional -->
<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
<RatedCapacity>50</RatedCapacity>
<NominalVoltage>48</NominalVoltage>
</Battery>
<Capacitor>
<!-- optional -->
<CapacitorTechnology>with DCDC converter</CapacitorTechnology>
<RatedCapacitance>120</RatedCapacitance>
<RatedVoltage>30</RatedVoltage>
</Capacitor>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
<CompressorDrive>mechanically</CompressorDrive>
<Clutch>none</Clutch>
<CompressorRatio>1.000</CompressorRatio>
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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">
<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_PrimaryBusDeclarationType" id="a">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890</VIN>
<Date>2017-02-15T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>true</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Losses included in Gearbox</RetarderType>
<RetarderRatio>2.000</RetarderRatio>
<AngledriveType>Separate Angledrive</AngledriveType>
<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<ArchitectureID>P2</ArchitectureID>
<OvcHev>true</OvcHev>
<MaxChargingPower>11</MaxChargingPower>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<Components xsi:type="Components_HEV-Px_PrimaryBusType">
<Engine>
<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<IdlingSpeed>560</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2300</MaxEngineTorque>
<WHTCUrban>1.0097</WHTCUrban>
<WHTCRural>1.0035</WHTCRural>
<WHTCMotorway>1.0200</WHTCMotorway>
<BFColdHot>1.0000</BFColdHot>
<CFRegPer>1.0000</CFRegPer>
<CFNCV>1.0000</CFNCV>
<FuelType>NG</FuelType>
<FuelConsumptionMap>
<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
</FuelConsumptionMap>
<FullLoadAndDragCurve>
<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
</FullLoadAndDragCurve>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</Engine>
<ElectricMachine>
<PowertrainPosition>2</PowertrainPosition>
<Count>1</Count>
<ElectricMachineSystem>
<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
<R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
<VoltageLevel>
<Voltage>400</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<VoltageLevel>
<Voltage>600</Voltage>
<ContinuousTorque>200.00</ContinuousTorque>
<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
<OverloadTorque>400.00</OverloadTorque>
<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
<OverloadDuration>30.00</OverloadDuration>
<MaxTorqueCurve>
<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
</MaxTorqueCurve>
<PowerMap>
<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
</PowerMap>
</VoltageLevel>
<DragCurve>
<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
</DragCurve>
<Conditioning>
<Entry coolantTempInlet="30" coolingPower="5000"/>
</Conditioning>
</v2.3:Data>
<v2.3:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.3:Signature>
</ElectricMachineSystem>
<P2.5GearRatios>
<!-- only for P2.5 HEV -->
<Ratio gear="1">1.000</Ratio>
<Ratio gear="2">2.000</Ratio>
</P2.5GearRatios>
</ElectricMachine>
<ElectricEnergyStorage>
<Battery>
<StringID>0</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
<SOCmin>20</SOCmin>
<SOCmax>80</SOCmax>
</Battery>
<Battery>
<StringID>1</StringID>
<REESS>
<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
<Manufacturer>a</Manufacturer>
<Model>a</Model>
<CertificationNumber>token</CertificationNumber>
<Date>2017-01-01T00:00:00Z</Date>
<AppVersion>aaaaa</AppVersion>
<CertificationMethod>Measured</CertificationMethod>
<BatteryType>HPBS</BatteryType>
<RatedCapacity>72.00</RatedCapacity>
<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
<JunctionboxIncluded>true</JunctionboxIncluded>
<TestingTemperature>20</TestingTemperature>
<OCV>
<Entry SoC="0" OCV="620.00"/>
<Entry SoC="100" OCV="640.00"/>
</OCV>
<InternalResistance>
<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
</InternalResistance>
<CurrentLimits>
<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
</CurrentLimits>
</v2.4:Data>
<Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</Signature>
</REESS>
</Battery>
</ElectricEnergyStorage>
<Gearbox>
<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
</TorqueLossMap>
</Gear>
</Gears>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Gearbox>
<TorqueConverter>
<!-- optional -->
<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>TC CalcApp 123</AppVersion>
<CertificationMethod>Standard values</CertificationMethod>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</v2.0:Data>
<v2.0:Signature>
<di:Reference>
<di:DigestMethod Algorithm=""/>
<di:DigestValue/>
</di:Reference>
</v2.0:Signature>
</TorqueConverter>
<Axlegear>
<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
<CertificationMethod>Standard values</CertificationMethod>
<TorqueLossMap>
<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
</TorqueLossMap>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</Axlegear>
<AxleWheels>
<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
<Model>Generic Wheel</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-01-11T14:00:00Z</Date>
<AppVersion>Tyre Generation App 1.0</AppVersion>
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0063</RRCDeclared>
<FzISO>31300</FzISO>
</Data>
<Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
</di:Reference>
</Signature>
</Tyre>
</Axle>
</Axles>
</v2.0:Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AUX_HEV-P_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>100</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<SmartAlternator>
<!-- optional -->
<RatedCurrent>50</RatedCurrent>
<RatedVoltage>48</RatedVoltage>
</SmartAlternator>
<Battery>
<!-- optional -->
<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
<RatedCapacity>50</RatedCapacity>
<NominalVoltage>48</NominalVoltage>
</Battery>
<Capacitor>
<!-- optional -->
<CapacitorTechnology>with DCDC converter</CapacitorTechnology>
<RatedCapacitance>120</RatedCapacitance>
<RatedVoltage>30</RatedVoltage>
</Capacitor>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
<CompressorDrive>mechanically</CompressorDrive>
<Clutch>none</Clutch>
<CompressorRatio>1.000</CompressorRatio>
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml
index bd8d18634fd9b7ca451fbfac33843b56f4f77641..7fb9913eb374f51b02bae564ea5b7cf0b0980ce2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml
@@ -38,7 +38,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured for complete component</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml
index 8e668fe88df09311314a0cd3542d12e3945c7351..dc6b87c914223eb5bcc6d416fee9842c7bba4a41 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml
@@ -33,7 +33,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured for complete component</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml
index d74b5bbcd386cfbdb1dba5f6bd35bd03427c3239..0dc738a50460311a37f0941f44331088bde4f0c1 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml
@@ -31,7 +31,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured for complete component</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DifferentialIncluded>false</DifferentialIncluded>
<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml
index 9faf3142103ec3a886468987f295643c9e57864a..ea8b506b84009fb595df21acc9334ed4a71c1391 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml
@@ -42,7 +42,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml
index e55067566a7eb5923821fcdae20df3edd822e484..bf5800e4f1c754250010bc8d7d408f6bfd06b58b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml
@@ -39,7 +39,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml
index 5c9988dfddfb27cb9631dfaee5eee3f708b9771d..689e039b6a1374b7ccba2bd9aea5015246bab642 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml
@@ -41,7 +41,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml
index 5a5b30ef66a385aae1f80580e481ca6f8cb677bf..cbe4407e5a0c8dae794a5daef909a488a7112748 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml
@@ -41,7 +41,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml
index 79173c8f65be96d7962850377b5d02d18d580f1a..1620c38899dfbd6a314776031d527f255326e590 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml
@@ -35,7 +35,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml
index 9bd1d71faa2817a7fe65617ab64701965d8915d2..04a036641988a30ef8fc6366d3dcc8cf854e9fff 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml
@@ -34,7 +34,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml
index e9fa92d0e202c2561f84dd1cc25ae08a35a9601f..89d1c3e1c54a5f5d4035b827b80e39902fa90d36 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml
@@ -35,7 +35,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml
index 3b1ce96b31290cecbda13d26fa32e38bd64a291b..2eb5d109114e17a27a10b8403bfa4186142114eb 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml
@@ -35,7 +35,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml
index c30eba3db3eb2a79bcfa98098cc51025079e1d9f..23a49544403cc5ed78f2320d4911567002a9ea5d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml
@@ -34,7 +34,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml
index 13dab62ca8a07af7e6e930c9f16cecb9fdf6d3a6..9cdeb35c70106764e7a1d1d240bde0bf33218a89 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml
@@ -34,7 +34,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml
index bd887885c2f607420a45e82e4996f674703fe3eb..a16a250fef7b7394bd50d986555947caccc97dd8 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml
@@ -34,7 +34,7 @@
<AppVersion>aaaaa</AppVersion>
<ElectricMachineType>ASM</ElectricMachineType>
<CertificationMethod>Measured</CertificationMethod>
- <R85RatedPower>1</R85RatedPower>
+ <R85RatedPower>50000</R85RatedPower>
<RotationalInertia>0.10</RotationalInertia>
<DcDcConverterIncluded>true</DcDcConverterIncluded>
<IHPCType>None</IHPCType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml
index ac99245ae39617d7a7b4a484fb46ca6005a85cdd..92d4f08f771fa79867d549118cdadb4e9c5563e0 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml
@@ -2,17 +2,17 @@
<vif0.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: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:DEV:v2.3" xmlns:v2.4="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">
<PrimaryVehicle xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<Data id="VEH-4cb168560c0d4b3d886d" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehicleExemptedPrimaryBusType">
- <ManufacturerPrimaryVehicle>Some Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Infinite Loop 1</ManufacturerAddressPrimaryVehicle>
+ <Vehicle xsi:type="Exempted_VehicleVIFType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<Model>Sample Bus Model</Model>
<VIN>VEH-1234567890</VIN>
<Date>2017-02-15T11:00:00Z</Date>
- <LegislativeCategory>N2</LegislativeCategory>
+ <LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>6x2</AxleConfiguration>
<Articulated>false</Articulated>
- <TechnicalPermissibleMaximumLadenMass unit="kg">15400.0</TechnicalPermissibleMaximumLadenMass>
+ <TechnicalPermissibleMaximumLadenMass>15400</TechnicalPermissibleMaximumLadenMass>
<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<SumNetPower unit="W">350000</SumNetPower>
<Technology>Fuel cell vehicle</Technology>
@@ -86,7 +86,7 @@
<BodyworkCode>CE</BodyworkCode>
<LowEntry>true</LowEntry>
<HeightIntegratedBody>2000</HeightIntegratedBody>
- </vif0.1:Vehicle>
+ </vif0.1:Vehicle>
<ApplicationInformation>
<SimulationToolVersion>0.7.5.2380-DEV</SimulationToolVersion>
<Date>2021-08-24T09:29:02.5917498Z</Date>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml
index a1dfe0305c17985906b8e3e908c524cd595ac0ce..3be573c3c80288278704c87d796c1db14fb65e85 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml
@@ -9,17 +9,17 @@ xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:v2.4="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">
<PrimaryVehicle xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<Data id="VEH-4cb168560c0d4b3d886d" xsi:type="PrimaryVehicleDataType">
- <Vehicle xsi:type="VehicleExemptedPrimaryBusType">
- <ManufacturerPrimaryVehicle>Some Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Infinite Loop 1</ManufacturerAddressPrimaryVehicle>
+ <Vehicle xsi:type="Exempted_VehicleVIFType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<Model>Sample Bus Model</Model>
<VIN>VEH-1234567890</VIN>
<Date>2017-02-15T11:00:00Z</Date>
- <LegislativeCategory>N2</LegislativeCategory>
+ <LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>6x2</AxleConfiguration>
<Articulated>false</Articulated>
- <TechnicalPermissibleMaximumLadenMass unit="kg">15400.0</TechnicalPermissibleMaximumLadenMass>
+ <TechnicalPermissibleMaximumLadenMass>15400</TechnicalPermissibleMaximumLadenMass>
<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<SumNetPower unit="W">350000</SumNetPower>
<Technology>Fuel cell vehicle</Technology>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
index 738ac530eec0810a1e66e935ba3f4194d7bc43b5..03a7ba470d4845c7a936b8606794c981b02e3cc6 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
@@ -12,8 +12,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="ConventionalVehicleVIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -52,9 +52,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>true</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -316,7 +316,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>
@@ -327,10 +327,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>
@@ -341,10 +340,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>
@@ -355,10 +353,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>
@@ -369,10 +366,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>
@@ -383,10 +379,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>
@@ -397,10 +392,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>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
@@ -411,10 +405,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">866.66</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
@@ -425,10 +418,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">970.73</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -439,10 +431,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>
@@ -453,10 +444,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>
@@ -467,10 +457,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>
@@ -481,10 +470,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>
@@ -495,10 +483,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>
@@ -509,10 +496,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">16467.68</TotalVehicleMass>
@@ -523,10 +509,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">875.01</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -537,10 +522,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>
@@ -551,10 +535,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>
@@ -565,10 +548,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">19588.08</TotalVehicleMass>
@@ -579,10 +561,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">995.69</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -593,10 +574,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>
@@ -607,10 +587,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>
@@ -621,7 +600,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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
index 2b6805c520ac9ad7997b94052c101ee1966123a8..da9f3c666adc260d549935a7f87d7f40095e310b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
@@ -12,8 +12,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="ConventionalVehicleVIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -52,9 +52,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>true</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -265,7 +265,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -317,7 +317,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>
@@ -328,10 +328,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>
@@ -342,10 +341,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>
@@ -356,10 +354,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>
@@ -370,10 +367,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>
@@ -384,10 +380,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>
@@ -398,10 +393,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>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
@@ -412,10 +406,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">866.66</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
@@ -426,10 +419,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">970.73</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -440,10 +432,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>
@@ -454,10 +445,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>
@@ -468,10 +458,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>
@@ -482,10 +471,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>
@@ -496,10 +484,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>
@@ -510,10 +497,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">16467.68</TotalVehicleMass>
@@ -524,10 +510,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">875.01</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -538,10 +523,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>
@@ -552,10 +536,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>
@@ -566,10 +549,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">19588.08</TotalVehicleMass>
@@ -580,10 +562,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">995.69</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -594,10 +575,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>
@@ -608,10 +588,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>
@@ -622,7 +601,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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
index cc342b4b8c5787830a63be9f1bf00220ac75fd21..7a5e4c74001178c92f737ae70cb27ece6947e123 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
@@ -12,8 +12,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="ConventionalVehicleVIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -52,9 +52,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>true</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -316,7 +316,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>
@@ -327,10 +327,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>
@@ -341,10 +340,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>
@@ -355,10 +353,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>
@@ -369,10 +366,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>
@@ -383,10 +379,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>
@@ -397,10 +392,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>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
@@ -411,10 +405,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">866.66</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
@@ -425,10 +418,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">970.73</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -439,10 +431,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>
@@ -453,10 +444,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>
@@ -467,10 +457,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>
@@ -481,10 +470,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>
@@ -495,10 +483,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>
@@ -509,10 +496,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">16467.68</TotalVehicleMass>
@@ -523,10 +509,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">875.01</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -537,10 +522,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>
@@ -551,10 +535,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>
@@ -565,10 +548,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">19588.08</TotalVehicleMass>
@@ -579,10 +561,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">995.69</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -593,10 +574,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>
@@ -607,10 +587,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>
@@ -621,7 +600,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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
index 8ab37cc3ce0a7d990e26e6df27f7fe08dfdb60b1..bf29b3f750dd84fade436eae75488f8d47777942 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
@@ -12,8 +12,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="ConventionalVehicleVIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -52,9 +52,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>true</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -316,7 +316,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>
@@ -327,10 +327,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>
@@ -341,10 +340,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>
@@ -355,10 +353,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>
@@ -369,10 +366,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>
@@ -383,10 +379,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>
@@ -397,10 +392,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>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
@@ -411,10 +405,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">866.66</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
@@ -425,10 +418,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">970.73</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -439,10 +431,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>
@@ -453,10 +444,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>
@@ -467,10 +457,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>
@@ -481,10 +470,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>
@@ -495,10 +483,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>
@@ -509,10 +496,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">16467.68</TotalVehicleMass>
@@ -523,10 +509,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">875.01</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -537,10 +522,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>
@@ -551,10 +535,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>
@@ -565,10 +548,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">19588.08</TotalVehicleMass>
@@ -579,10 +561,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">995.69</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -593,10 +574,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>
@@ -607,10 +587,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>
@@ -621,7 +600,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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
index 38628a09bad3a350cfc50931ba19b719643e9bf3..e25c4ac5ecfa29afe750a0c3dd4a85dd6bd51514 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
@@ -12,8 +12,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="ConventionalVehicleVIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -52,9 +52,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>true</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -316,7 +316,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>
@@ -327,10 +327,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>
@@ -341,10 +340,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>
@@ -355,10 +353,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>
@@ -369,10 +366,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>
@@ -383,10 +379,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>
@@ -397,10 +392,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>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
@@ -411,10 +405,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">866.66</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
@@ -425,10 +418,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">970.73</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -439,10 +431,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>
@@ -453,10 +444,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>
@@ -467,10 +457,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>
@@ -481,10 +470,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>
@@ -495,10 +483,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>
@@ -509,10 +496,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">16467.68</TotalVehicleMass>
@@ -523,10 +509,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">875.01</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -537,10 +522,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>
@@ -551,10 +535,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>
@@ -565,10 +548,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">19588.08</TotalVehicleMass>
@@ -579,10 +561,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">995.69</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -593,10 +574,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>
@@ -607,10 +587,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>
@@ -621,7 +600,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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
index 3ebda336e48fe9904386339787b4f21f504fa1a6..01aece6ca7db482c73c394147c344a1bcd95c9d9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
@@ -12,8 +12,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="ConventionalVehicleVIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -52,9 +52,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>true</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -316,7 +316,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>
@@ -327,10 +327,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>
@@ -341,10 +340,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>
@@ -355,10 +353,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>
@@ -369,10 +366,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>
@@ -383,10 +379,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>
@@ -397,10 +392,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>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
@@ -411,10 +405,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">866.66</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
@@ -425,10 +418,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">970.73</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -439,10 +431,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>
@@ -453,10 +444,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>
@@ -467,10 +457,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>
@@ -481,10 +470,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>
@@ -495,10 +483,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>
@@ -509,10 +496,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">16467.68</TotalVehicleMass>
@@ -523,10 +509,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">875.01</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -537,10 +522,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>
@@ -551,10 +535,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>
@@ -565,10 +548,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">19588.08</TotalVehicleMass>
@@ -579,10 +561,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">995.69</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -593,10 +574,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>
@@ -607,10 +587,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>
@@ -621,7 +600,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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
index c13114a284e01e3a2ee4f80f6cf5c2898a1149c3..ee349909db66391ee95f497152561b5a666fc59a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
@@ -12,8 +12,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="ConventionalVehicleVIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -52,9 +52,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>true</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -316,7 +316,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>
@@ -327,10 +327,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>
@@ -341,10 +340,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>
@@ -355,10 +353,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>
@@ -369,10 +366,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>
@@ -383,10 +379,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>
@@ -397,10 +392,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>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
@@ -411,10 +405,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">866.66</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
@@ -425,10 +418,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">970.73</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -439,10 +431,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>
@@ -453,10 +444,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>
@@ -467,10 +457,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>
@@ -481,10 +470,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>
@@ -495,10 +483,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>
@@ -509,10 +496,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">16467.68</TotalVehicleMass>
@@ -523,10 +509,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">875.01</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -537,10 +522,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>
@@ -551,10 +535,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>
@@ -565,10 +548,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">19588.08</TotalVehicleMass>
@@ -579,10 +561,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">995.69</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -593,10 +574,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>
@@ -607,10 +587,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>
@@ -621,7 +600,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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
index 4ab9b87ac9b4686569f0d18315450be0d9363048..c45a370997de9a7bacbf8dca78ea15c3acab4ca5 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
@@ -12,8 +12,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="ConventionalVehicleVIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -52,9 +52,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>true</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -316,7 +316,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>
@@ -327,10 +327,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>
@@ -341,10 +340,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>
@@ -355,10 +353,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>
@@ -369,10 +366,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>
@@ -383,10 +379,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>
@@ -397,10 +392,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>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
@@ -411,10 +405,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">866.66</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
@@ -425,10 +418,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">970.73</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -439,10 +431,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>
@@ -453,10 +444,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>
@@ -467,10 +457,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>
@@ -481,10 +470,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>
@@ -495,10 +483,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>
@@ -509,10 +496,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">16467.68</TotalVehicleMass>
@@ -523,10 +509,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">875.01</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -537,10 +522,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>
@@ -551,10 +535,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>
@@ -565,10 +548,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">19588.08</TotalVehicleMass>
@@ -579,10 +561,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">995.69</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -593,10 +574,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>
@@ -607,10 +587,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>
@@ -621,7 +600,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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
index beeefd4c23e43b3c3a1ff84dea927a62b9222eda..2776075bc28f99828e8f0450da7a4e7c95f15d13 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
@@ -9,8 +9,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<PrimaryVehicle>
<Data id="VEH-622a60d3b3cf4340a362" xsi:type="PrimaryVehicleDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<Vehicle xsi:type="ConventionalVehicleVIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -48,9 +48,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RatedPower>380000</RatedPower>
<MaxEngineTorque>2400</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>560</IdlingSpeed>
@@ -205,7 +205,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -256,7 +256,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Results>
<Status>success</Status>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -267,10 +267,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">19.71467</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1104.84</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
@@ -281,10 +280,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">23.22512</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1301.57</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -295,10 +293,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">15.45965</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">866.38</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
@@ -309,10 +306,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">18.39275</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1030.76</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -323,10 +319,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">13.17582</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">738.40</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
@@ -337,10 +332,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">16.00192</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">896.77</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13050.44</TotalVehicleMass>
@@ -351,10 +345,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">11.11672</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">623.00</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15494.61</TotalVehicleMass>
@@ -365,10 +358,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">12.34809</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">692.01</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
@@ -379,10 +371,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1160.65</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
@@ -393,10 +384,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">24.68655</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1383.48</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
@@ -407,10 +397,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">16.25928</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">911.20</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
@@ -421,10 +410,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">19.58479</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1097.56</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
@@ -435,10 +423,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">13.83088</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">775.11</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
@@ -449,10 +436,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">17.02489</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">954.10</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
@@ -463,10 +449,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">11.30640</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">633.63</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
@@ -477,10 +462,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">12.56427</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">704.12</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
@@ -491,10 +475,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">8.73159</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">489.33</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
@@ -505,10 +488,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">9.18847</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">514.94</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
@@ -519,10 +501,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">11.67569</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">654.33</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
@@ -533,10 +514,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">13.23582</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">741.76</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
@@ -547,10 +527,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">9.18672</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">514.84</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
@@ -561,7 +540,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">9.74629</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">546.20</CO2>
</Result>
</Results>
<ApplicationInformation>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
index 7b30f3e6d5b3a9cceee45b2df3ec581a242c6f00..1f414754425db20bbb8efe1ba985a16cd986e8e2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
@@ -12,8 +12,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="ConventionalVehicleVIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -52,9 +52,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>true</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -330,7 +330,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>
@@ -341,10 +341,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>
@@ -355,10 +354,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>
@@ -369,10 +367,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>
@@ -383,10 +380,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>
@@ -397,10 +393,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>
@@ -411,10 +406,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>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
@@ -425,10 +419,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">866.66</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
@@ -439,10 +432,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">970.73</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -453,10 +445,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>
@@ -467,10 +458,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>
@@ -481,10 +471,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>
@@ -495,10 +484,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>
@@ -509,10 +497,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>
@@ -523,10 +510,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">16467.68</TotalVehicleMass>
@@ -537,10 +523,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">875.01</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -551,10 +536,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>
@@ -565,10 +549,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>
@@ -579,10 +562,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">19588.08</TotalVehicleMass>
@@ -593,10 +575,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">995.69</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -607,10 +588,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>
@@ -621,10 +601,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>
@@ -635,7 +614,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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
index ec705312d43ca181a823e15228a03245c68fb2d8..d34bfcf00384e5d81586bc65709d98361b4b099e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
@@ -11,8 +11,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="ConventionalVehicleVIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -51,9 +51,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>true</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -263,7 +263,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -315,7 +315,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>
@@ -326,10 +326,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>
@@ -340,10 +339,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>
@@ -354,10 +352,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>
@@ -368,10 +365,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>
@@ -382,10 +378,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>
@@ -396,10 +391,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>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
@@ -410,10 +404,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">866.66</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
@@ -424,10 +417,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">970.73</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -438,10 +430,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>
@@ -452,10 +443,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>
@@ -466,10 +456,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>
@@ -480,10 +469,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>
@@ -494,10 +482,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>
@@ -508,10 +495,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">16467.68</TotalVehicleMass>
@@ -522,10 +508,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">875.01</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -536,10 +521,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>
@@ -550,10 +534,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>
@@ -564,10 +547,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">19588.08</TotalVehicleMass>
@@ -578,10 +560,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">995.69</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -592,10 +573,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>
@@ -606,10 +586,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>
@@ -620,7 +599,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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
index cea4aaff46cca79892c80c5ebc25822867693fb7..6f9fd5e8818736df9c407402c4bc1ca44a7ad4ec 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
@@ -12,8 +12,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="ConventionalVehicleVIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <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>
@@ -51,9 +51,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -187,7 +187,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -250,7 +250,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Results>
<Status>success</Status>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -261,10 +261,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -275,10 +274,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -289,10 +287,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -303,10 +300,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -317,10 +313,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -331,10 +326,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -345,10 +339,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -359,10 +352,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -373,10 +365,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -387,10 +378,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -401,10 +391,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -415,10 +404,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -429,10 +417,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -443,10 +430,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -457,10 +443,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -471,10 +456,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -485,10 +469,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -499,10 +482,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -513,10 +495,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -527,10 +508,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -541,10 +521,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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>
@@ -555,7 +534,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
index 923b07c1e393f28822d6a87084deaa430be5000e..f6f605cabb6941f10b77e5f3e55d13fbd209db68 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
@@ -12,8 +12,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="ConventionalVehicleVIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -52,9 +52,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>true</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -316,7 +316,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>
@@ -327,10 +327,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>
@@ -341,10 +340,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>
@@ -355,10 +353,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>
@@ -369,10 +366,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>
@@ -383,10 +379,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>
@@ -397,10 +392,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>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
@@ -411,10 +405,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">866.66</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
@@ -425,10 +418,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">970.73</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -439,10 +431,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>
@@ -453,10 +444,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>
@@ -467,10 +457,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>
@@ -481,10 +470,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>
@@ -495,10 +483,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>
@@ -509,10 +496,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">16467.68</TotalVehicleMass>
@@ -523,10 +509,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">875.01</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -537,10 +522,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>
@@ -551,10 +535,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>
@@ -565,10 +548,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">19588.08</TotalVehicleMass>
@@ -579,10 +561,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">995.69</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -593,10 +574,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>
@@ -607,10 +587,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>
@@ -621,7 +600,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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
index f81b15c5c14772d96643143e3d36efc9907ba754..bdfe494846eeac09700d147f84b6757967d23586 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
@@ -12,8 +12,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="ConventionalVehicleVIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -52,9 +52,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
+ <MechanicalOutputICE>false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+ <ElectricalOutput>true</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -316,7 +316,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>
@@ -327,10 +327,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>
@@ -341,10 +340,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>
@@ -355,10 +353,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>
@@ -369,10 +366,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>
@@ -383,10 +379,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>
@@ -397,10 +392,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>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
@@ -411,10 +405,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">866.66</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
@@ -425,10 +418,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">970.73</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
@@ -439,10 +431,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>
@@ -453,10 +444,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>
@@ -467,10 +457,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>
@@ -481,10 +470,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>
@@ -495,10 +483,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>
@@ -509,10 +496,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">16467.68</TotalVehicleMass>
@@ -523,10 +509,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">875.01</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
@@ -537,10 +522,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>
@@ -551,10 +535,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>
@@ -565,10 +548,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">19588.08</TotalVehicleMass>
@@ -579,10 +561,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">995.69</CO2>
</Result>
<Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
@@ -593,10 +574,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>
@@ -607,10 +587,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>
@@ -621,7 +600,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>
diff --git a/VectoCore/VectoCoreTest/Utils/CompletedVIF.cs b/VectoCore/VectoCoreTest/Utils/CompletedVIF.cs
index cad4740bce7fa4013c6d113f12092b17a5cd1271..091e324a1e09109e93265558ebe4281de85a5613 100644
--- a/VectoCore/VectoCoreTest/Utils/CompletedVIF.cs
+++ b/VectoCore/VectoCoreTest/Utils/CompletedVIF.cs
@@ -22,7 +22,7 @@ namespace TUGraz.VectoCore.Tests.Utils
var vifDataProvider = xmlInputReader.Create(completedJson.PrimaryInputDataFile);
var completeDataProvider = xmlInputReader.CreateDeclaration(completedJson.CompletedInputDataFile);
var inputDataAsm = new XMLDeclarationVIFInputData(
- vifDataProvider as IMultistageBusInputDataProvider, completeDataProvider.JobInputData.Vehicle);
+ vifDataProvider as IMultistepBusInputDataProvider, completeDataProvider.JobInputData.Vehicle);
var filename = Guid.NewGuid().ToString().Substring(0, 20);
var writerAsm = new FileOutputVIFWriter(filename, 0);
@@ -46,7 +46,7 @@ namespace TUGraz.VectoCore.Tests.Utils
var completedVif =
xmlInputReader.CreateDeclaration(XmlReader.Create(new StringReader(CreateCompletedVifXML(completedJson, xmlInputReader))));
- return new XMLDeclarationVIFInputData(completedVif as IMultistageBusInputDataProvider, null);
+ return new XMLDeclarationVIFInputData(completedVif as IMultistepBusInputDataProvider, null);
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Utils/GraphWriter.cs b/VectoCore/VectoCoreTest/Utils/GraphWriter.cs
index 138d96bcf74b4d9713ce31198f6b4bded6e8d473..401406af8536025b319b374e57d8a4a98e414357 100644
--- a/VectoCore/VectoCoreTest/Utils/GraphWriter.cs
+++ b/VectoCore/VectoCoreTest/Utils/GraphWriter.cs
@@ -387,8 +387,14 @@ namespace TUGraz.VectoCore.Tests.Utils
.ToArray();
}
- private static double[] LoadDataMapped(DataTable modDataV3, string field, Dictionary<string, double> mapping) =>
- modDataV3.Rows.Cast<DataRow>().Select(x => mapping.GetValueOrDefault(((string)x[field]), double.NaN)).ToArray();
+ //private static double[] LoadDataMapped(DataTable modDataV3, string field, Dictionary<string, double> mapping) =>
+ // modDataV3.Rows.Cast<DataRow>().Select(x => mapping.GetValueOrDefault(((string)x[field]), double.NaN)).ToArray();
+ private static double[] LoadDataMapped(DataTable modDataV3, string field, Dictionary<string, double> mapping)
+ {
+ return (from x in modDataV3.Rows.Cast<DataRow>()
+ let val = x.Field<string>(field)
+ select mapping.ContainsKey(val) ? mapping[val] : double.NaN).ToArray();
+ }
private static void AlignChart(Chart chart, string chartToAlign, string chartToAlignWith)
{
diff --git a/VectoCore/VectoCoreTest/Utils/MockBrakes.cs b/VectoCore/VectoCoreTest/Utils/MockBrakes.cs
index 755580cfdaac54c5bb8776c400073a7a9cba8365..eba2ca40b3d624acc1d5e0c3fc28dde1ae9fcdde 100644
--- a/VectoCore/VectoCoreTest/Utils/MockBrakes.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockBrakes.cs
@@ -36,7 +36,7 @@ using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoCore.Tests.Utils
{
- public class MockBrakes : VectoSimulationComponent, IBrakes
+ public class MockBrakes : VectoSimulationComponent, IBrakes, IUpdateable
{
public MockBrakes(IVehicleContainer vehicle) : base(vehicle)
{
@@ -48,5 +48,18 @@ namespace TUGraz.VectoCore.Tests.Utils
protected override void DoWriteModalResults(Second time, Second simulationInterval, IModalDataContainer container) {}
protected override void DoCommitSimulationStep(Second time, Second simulationInterval) {}
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ if (other is IBrakes b) {
+ BrakePower = b.BrakePower;
+ return true;
+ }
+
+ return false;
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
index 98078dc03115d1294d4bea71ac0b8b3c649e83cf..6c78f97dc72c0cacf8cce1d10b1d18945c09dfdc 100644
--- a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
@@ -192,6 +192,7 @@ namespace TUGraz.VectoCore.Tests.Utils
public IAxlesEngineeringInputData AxleWheels { get; set; }
public IElectricStorageSystemEngineeringInputData ElectricStorage { get; set; }
public IElectricMachinesEngineeringInputData ElectricMachines { get; set; }
+ public IIEPCEngineeringInputData IEPCEngineeringInputData { get; }
Dictionary<PowertrainPosition, List<Tuple<Volt, TableData>>> IVehicleDeclarationInputData.ElectricMotorTorqueLimits => throw new NotImplementedException();
diff --git a/VectoCore/VectoCoreTest/Utils/MockGearbox.cs b/VectoCore/VectoCoreTest/Utils/MockGearbox.cs
index 8f656aa0f2f11b41ab940f0c0c43e3ea5b921a6d..1e83d9820061133dbf102f5aa7fb910f448d731b 100644
--- a/VectoCore/VectoCoreTest/Utils/MockGearbox.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockGearbox.cs
@@ -131,6 +131,8 @@ namespace TUGraz.VectoCore.Tests.Utils
return _clutchClosed;
}
+ public bool RequestAfterGearshift { get; set; }
+
public bool ClutchClosed(Second absTime)
{
return _clutchClosed;
diff --git a/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs b/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
index 54b0580661a7a5ebf6b8e35c8b34976eebc24649..911ee8289e38a8bb17690705a5994278382a8449 100644
--- a/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
@@ -48,7 +48,7 @@ using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoCore.Tests.Utils
{
- public class MockVehicleContainer : IVehicleContainer, IEngineInfo, IEngineControl, IVehicleInfo, IClutchInfo, IBrakes, IAxlegearInfo, IWheelsInfo, IDriverInfo, IDrivingCycleInfo, IMileageCounter, IGearboxInfo, IGearboxControl, IPowertainInfo
+ public class MockVehicleContainer : IVehicleContainer, IEngineInfo, IEngineControl, IVehicleInfo, IClutchInfo, IBrakes, IAxlegearInfo, IWheelsInfo, IDriverInfo, IDrivingCycleInfo, IMileageCounter, IGearboxInfo, IGearboxControl, IPowertainInfo, IUpdateable
{
// only CycleData Lookup is set / accessed...
@@ -315,6 +315,8 @@ namespace TUGraz.VectoCore.Tests.Utils
return ClutchClosed(absTime);
}
+ public bool RequestAfterGearshift { get; set; }
+
#endregion
public IEnumerable<ISimulationPreprocessor> GetPreprocessingRuns { get { return new ISimulationPreprocessor[] { }; } }
@@ -337,5 +339,13 @@ namespace TUGraz.VectoCore.Tests.Utils
public VectoSimulationJobType VehicleArchitecutre { get; }
#endregion
+
+ #region Implementation of IUpdateable
+
+ public bool UpdateFrom(object other) {
+ return false;
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 12a914221dadf80e88fda3851a786fd6dde38598..46de90a322530f97057969368805da66f716eed6 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -36,8 +36,7 @@
</None>
</ItemGroup>
<Choose>
- <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
- $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
+ <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
 $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup>
<ProjectReference Include="$(SolutionDir)\VectoMockup\VectoMockup\VectoMockup.csproj" />
diff --git a/VectoCore/VectoCoreTest/XML/Reports/CustomerInformationFileWriterTest.cs b/VectoCore/VectoCoreTest/XML/Reports/CustomerInformationFileWriterTest.cs
index 3336dd40e4b08db048392c5262d8cbfab4d250ee..b0f4fb20ad0b2c6b832339cb4ee7d739b8eb719e 100644
--- a/VectoCore/VectoCoreTest/XML/Reports/CustomerInformationFileWriterTest.cs
+++ b/VectoCore/VectoCoreTest/XML/Reports/CustomerInformationFileWriterTest.cs
@@ -4,14 +4,15 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
-using System.Xml.XPath;
using NUnit.Framework;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
-using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.OutputData.XML;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9.CustomerInformationFile;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport;
+using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.XML.Reports
{
@@ -41,17 +42,18 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
}
private IXMLCustomerReport GetCompletedBusCustomerReport(string fileName,
- out IMultistageBusInputDataProvider dataProvider)
+ out IMultistepBusInputDataProvider dataProvider)
{
Assert.IsFalse(string.IsNullOrEmpty(fileName));
- dataProvider = _xmlReader.CreateDeclaration(fileName) as IMultistageBusInputDataProvider;
+ var tmp = _xmlReader.CreateDeclaration(fileName);
+ dataProvider = tmp as IMultistepBusInputDataProvider;
var arch = dataProvider.JobInputData.PrimaryVehicle.Vehicle.ArchitectureID;
dataProvider.JobInputData.PrimaryVehicle.Vehicle.VehicleCategory.GetVehicleType(); // HEV/PEV - Sx/Px
- var ihpc = (dataProvider.JobInputData.PrimaryVehicle.Vehicle.Components.ElectricMachines?.Entries)?.Count(electric =>
+ var ihpc = (dataProvider.JobInputData.PrimaryVehicle.Vehicle.Components?.ElectricMachines?.Entries)?.Count(electric =>
electric.ElectricMachine.IHPCType != "None") > 0;
- var iepc = (dataProvider.JobInputData.PrimaryVehicle.Vehicle.Components.IEPC != null);
+ var iepc = (dataProvider.JobInputData.PrimaryVehicle.Vehicle.Components?.IEPC != null);
var report = _cifFactory.GetCustomerReport(
dataProvider.JobInputData.ConsolidateManufacturingStage.Vehicle.VehicleCategory,
dataProvider.JobInputData.JobType,
@@ -69,23 +71,21 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
var report = GetCustomerReport(fileName, out var dataProvider) as ConventionalLorry_CIF;
Assert.NotNull(report);
report.InitializeVehicleData(dataProvider);
+ report.GenerateReport(XMLHelper.CreateDummySig(XNamespace.Get("http://www.w3.org/2000/09/xmldsig#")));
- report.GenerateReport(new XElement("Signature", "Dummy"));
-
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.CustomerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
-
[TestCase(HEV_Px_HeavyLorry)]
public void HEV_Px_IHPC_LorryCIFTest(string fileName)
{
var report = GetCustomerReport(fileName, out var dataProvider) as HEV_PxLorry_CIF;
Assert.NotNull(report);
report.InitializeVehicleData(dataProvider);
- report.GenerateReport(new XElement("Signature", "Dummy"));
+ report.GenerateReport(XMLHelper.CreateDummySig(XNamespace.Get("http://www.w3.org/2000/09/xmldsig#")));
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.CustomerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -96,9 +96,9 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
Assert.NotNull(report);
report.InitializeVehicleData(dataProvider);
- report.GenerateReport(new XElement("Signature", "Dummy"));
+ report.GenerateReport(XMLHelper.CreateDummySig(XNamespace.Get("http://www.w3.org/2000/09/xmldsig#")));
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']")))); Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.CustomerReport)); Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -109,9 +109,9 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
Assert.NotNull(report);
report.InitializeVehicleData(dataProvider);
- report.GenerateReport(new XElement("Signature", "Dummy"));
+ report.GenerateReport(XMLHelper.CreateDummySig(XNamespace.Get("http://www.w3.org/2000/09/xmldsig#")));
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.CustomerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -124,9 +124,9 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
Assert.NotNull(report);
report.InitializeVehicleData(dataProvider);
- report.GenerateReport(new XElement("Signature", "Dummy"));
+ report.GenerateReport(XMLHelper.CreateDummySig(XNamespace.Get("http://www.w3.org/2000/09/xmldsig#")));
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.CustomerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -137,9 +137,9 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
Assert.NotNull(report);
report.InitializeVehicleData(dataProvider);
- report.GenerateReport(new XElement("Signature", "Dummy"));
+ report.GenerateReport(XMLHelper.CreateDummySig(XNamespace.Get("http://www.w3.org/2000/09/xmldsig#")));
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.CustomerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -150,9 +150,9 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
Assert.NotNull(report);
report.InitializeVehicleData(dataProvider);
- report.GenerateReport(new XElement("Signature", "Dummy"));
+ report.GenerateReport(XMLHelper.CreateDummySig(XNamespace.Get("http://www.w3.org/2000/09/xmldsig#")));
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.CustomerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -162,9 +162,9 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
var report = GetCustomerReport(fileName, out var dataProvider) as PEV_E3_Lorry_CIF;
Assert.NotNull(report);
report.InitializeVehicleData(dataProvider);
- report.GenerateReport(new XElement("Signature", "Dummy"));
+ report.GenerateReport(XMLHelper.CreateDummySig(XNamespace.Get("http://www.w3.org/2000/09/xmldsig#")));
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.CustomerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
[TestCase(PEV_E4_HeavyLorry)]
@@ -174,9 +174,9 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
Assert.NotNull(report);
report.InitializeVehicleData(dataProvider);
- report.GenerateReport(new XElement("Signature", "Dummy"));
+ report.GenerateReport(XMLHelper.CreateDummySig(XNamespace.Get("http://www.w3.org/2000/09/xmldsig#")));
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.CustomerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
[TestCase(PEV_IEPC_HeavyLorry)]
@@ -186,9 +186,9 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
Assert.NotNull(report);
report.InitializeVehicleData(dataProvider);
- report.GenerateReport(new XElement("Signature", "Dummy"));
+ report.GenerateReport(XMLHelper.CreateDummySig(XNamespace.Get("http://www.w3.org/2000/09/xmldsig#")));
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.CustomerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -198,9 +198,9 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
var report = GetCustomerReport(fileName, out var dataProvider) as Exempted_Lorry_CIF;
Assert.NotNull(report);
report.InitializeVehicleData(dataProvider);
- report.GenerateReport(new XElement("Signature", "Dummy"));
+ report.GenerateReport(XMLHelper.CreateDummySig(XNamespace.Get("http://www.w3.org/2000/09/xmldsig#")));
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.CustomerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -212,9 +212,9 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
var report = GetCompletedBusCustomerReport(fileName, out var dataProvider) as Conventional_CompletedBusCIF;
Assert.NotNull(report);
report.InitializeVehicleData(dataProvider);
- report.GenerateReport(new XElement("Signature", "Dummy"));
+ report.GenerateReport(XMLHelper.CreateDummySig(XNamespace.Get("http://www.w3.org/2000/09/xmldsig#")));
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.CustomerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -226,9 +226,9 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
var report = GetCompletedBusCustomerReport(fileName, out var dataProvider) as Exempted_CompletedBusCIF;
Assert.NotNull(report);
report.InitializeVehicleData(dataProvider);
- report.GenerateReport(new XElement("Signature", "Dummy"));
+ report.GenerateReport(XMLHelper.CreateDummySig(XNamespace.Get("http://www.w3.org/2000/09/xmldsig#")));
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.CustomerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
diff --git a/VectoCore/VectoCoreTest/XML/Reports/ManufacturerReportWriterTest.cs b/VectoCore/VectoCoreTest/XML/Reports/ManufacturerReportWriterTest.cs
index 3164932ab3368282736d1380c0efce79f44ad523..ffa9c7cd011b51c1342a6854f21d8d224f829061 100644
--- a/VectoCore/VectoCoreTest/XML/Reports/ManufacturerReportWriterTest.cs
+++ b/VectoCore/VectoCoreTest/XML/Reports/ManufacturerReportWriterTest.cs
@@ -7,13 +7,11 @@ using System.Threading.Tasks;
using System.Xml;
using System.Xml.Linq;
using System.Xml.Schema;
-using System.Xml.XPath;
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection;
using Ninject;
using NUnit.Framework;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
-using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.FileIO.XML;
using TUGraz.VectoCore.Models.Simulation;
@@ -28,6 +26,7 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.Manu
using TUGraz.VectoCore.Tests.Integration.CompletedBus;
using TUGraz.VectoCore.Tests.Models.Simulation;
using TUGraz.VectoCore.Utils;
+using XmlDocumentType = TUGraz.VectoCore.Utils.XmlDocumentType;
namespace TUGraz.VectoCore.Tests.XML.Reports
{
@@ -35,7 +34,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
public class MRF_CIF_WriterTestBase
{
- protected string outputBasePath = @"C:\Users\Harry\source\vecto\mrf_report_0_9";
+ protected string outputBasePath; //@"C:\Users\Harry\source\vecto\mrf_report_0_9";
protected ISimulatorFactory _simulatorFactory;
protected IOutputDataWriter _outputWriter;
protected StandardKernel _kernel;
@@ -93,88 +92,51 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
protected const string Conventional_CompletedBus = @"TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_conventional_final_vif.VIF_Report_1.xml";
- protected const string Exempted_CompletedBus = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\ExemptedVehicles\exempted_completedBus_input_full.xml";
- public static bool ValidateAndPrint(XDocument document, string xsdPath = "../../../../VectoCore/Resources/XSD", Func<XDocument, XElement> elementSelector = null)
+ protected const string Exempted_CompletedBus = @"TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\exempted_completed.VIF_Report_2.xml";
+ //@"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\ExemptedVehicles\exempted_completedBus_input_full.xml";
+
+ public static bool ValidateAndPrint(XDocument document, XmlDocumentType documentType)
{
var error = false;
try {
-
- var schemaSet = new XmlSchemaSet() {
- XmlResolver = new XmlUrlResolver()
- };
-
- XmlSchema schema;
- using (var reader = XmlReader.Create(
- Path.GetFullPath(Path.Combine(xsdPath, "VectoOutputManufacturer.0.9.xsd"))))
- {
- schema = XmlSchema.Read(reader, null);
- }
-
- schemaSet.Add(schema);
-
- using (var reader = XmlReader.Create(
- Path.GetFullPath(Path.Combine(xsdPath, "VectoOutputCustomer.0.9.xsd"))))
- {
- schema = XmlSchema.Read(reader, null);
- }
-
- schemaSet.Add(schema);
-
- using (var reader = XmlReader.Create(
- Path.GetFullPath(Path.Combine(xsdPath, "VectoOutputMultistep.0.1.xsd"))))
- {
- schema = XmlSchema.Read(reader, null);
- }
-
- schemaSet.Add(schema);
-
-
- if (elementSelector != null) {
- document.Validate(schemaSet, ((sender, args) => {
- //do nothing just add schema info
- }), true);
- var element = elementSelector(document);
- element.Validate(element.GetSchemaInfo().SchemaType, schemaSet, (sender, args) => {
- error = true;
- TestContext.WriteLine(sender?.ToString());
- TestContext.WriteLine(args.Message);
- });
- } else {
- document.Validate(schemaSet, (sender, args) => {
- error = true;
-
- TestContext.WriteLine(sender?.ToString());
- TestContext.WriteLine(args.Message);
- });
+ var stream = new MemoryStream();
+ var writer = new XmlTextWriter(stream, Encoding.UTF8);
+ document.WriteTo(writer);
+ writer.Flush();
+ stream.Flush();
+ stream.Seek(0, SeekOrigin.Begin);
+ var validator = new XMLValidator(new XmlTextReader(stream));
+ error = !validator.ValidateXML(documentType);
+ if (error) {
+ TestContext.WriteLine(validator.ValidationError);
}
-
-
} finally {
TestContext.WriteLine(document);
}
return !error;
}
-
- private static XmlSchemaSet XmlSchemaSet(params (string path, string targetNamespace)[] paths)
+ public static void Validate(XDocument document, XmlDocumentType documentType)
{
- XmlSchemaSet schemas = new XmlSchemaSet();
- foreach (var path in paths) {
- using (XmlReader reader = new XmlTextReader(path.path)
- {
- XmlResolver = new XmlUrlResolver()
+ var error = false;
- })
- {
- schemas.Add(path.targetNamespace, reader);
- };
-
+ var stream = new MemoryStream();
+ var writer = new XmlTextWriter(stream, Encoding.UTF8);
+ document.WriteTo(writer);
+ writer.Flush();
+ stream.Flush();
+ stream.Seek(0, SeekOrigin.Begin);
+ var validator = new XMLValidator(new XmlTextReader(stream));
+ error = !validator.ValidateXML(documentType);
+ if (error) {
+ TestContext.WriteLine(validator.ValidationError);
+ Assert.Fail($"XML Validation failed {documentType}");
}
- return schemas;
}
+
protected bool WriteToDisk(string basePath, string fileName, XDocument xDocument)
{
TestContext.WriteLine($"{basePath},{fileName}");
@@ -182,6 +144,10 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
{
fileName = fileName + ".xml";
}
+
+ if (!Directory.Exists(basePath)) {
+ Directory.CreateDirectory(basePath);
+ }
var destPath = Path.Combine(basePath, fileName);
using (var writer = new XmlTextWriter(destPath, Encoding.UTF8) { Formatting = Formatting.Indented })
{
@@ -205,7 +171,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
_kernel = new StandardKernel(
new VectoNinjectModule()
);
-
+ outputBasePath = Path.Combine(TestContext.CurrentContext.TestDirectory, "XMLReports_0.9");
}
[SetUp]
@@ -246,10 +212,10 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
}
private IXMLManufacturerReport GetCompletedBusReport(string fileName,
- out IMultistageBusInputDataProvider dataProvider)
+ out IMultistepBusInputDataProvider dataProvider)
{
Assert.IsFalse(string.IsNullOrEmpty(fileName));
- dataProvider = _xmlReader.CreateDeclaration(fileName) as IMultistageBusInputDataProvider;
+ dataProvider = _xmlReader.CreateDeclaration(fileName) as IMultistepBusInputDataProvider;
Assert.NotNull(dataProvider);
var arch = dataProvider.JobInputData.PrimaryVehicle.Vehicle.ArchitectureID;
@@ -278,7 +244,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector:(document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -290,7 +256,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -302,7 +268,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -314,7 +280,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -326,7 +292,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -338,7 +304,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -350,7 +316,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -363,7 +329,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -375,7 +341,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -387,7 +353,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -399,7 +365,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -412,7 +378,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -424,7 +390,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -439,7 +405,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -452,7 +418,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -464,7 +430,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -476,7 +442,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -490,7 +456,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -503,7 +469,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -515,7 +481,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -530,7 +496,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -543,7 +509,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
@@ -555,7 +521,7 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
report.InitializeVehicleData(dataProvider);
report.GenerateReport();
- Assert.IsTrue(ValidateAndPrint(report.Report, elementSelector: (document => document.XPathSelectElement($"//*[local-name()='{XMLNames.Component_Vehicle}']"))));
+ Assert.IsTrue(ValidateAndPrint(report.Report, XmlDocumentType.ManufacturerReport));
Assert.IsTrue(WriteToDisk(outputBasePath, TestContext.CurrentContext.Test.MethodName, report.Report));
}
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
index 3b8acaf915aac426e8528049a394595062d20d59..2bbb611ebd9468ba3e53bcb90db23813c14a014e 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
@@ -859,7 +859,7 @@ namespace TUGraz.VectoCore.Tests.XML
var lookup = DeclarationData.PTOTransmission.Lookup(ptoDataProvider.PTOTransmissionType);
Assert.AreEqual("only the drive shaft of the PTO - multi-disc clutch", ptoDataProvider.PTOTransmissionType);
- Assert.AreEqual(1000, lookup.PowerDemand.Value());
+ Assert.AreEqual(350, lookup.PowerDemand.Value());
}
[TestCase]
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
index 64ecf91f45da8df09019ae117714957b8225533a..c209074e66391df9f42de882021fbba7410dc076 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
@@ -802,7 +802,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.Components.AngledriveInputData);
Assert.IsNull(vehicle.Components.RetarderInputData);
Assert.IsNull(vehicle.Components.AirdragInputData);
- Assert.AreEqual(0, vehicle.TorqueLimits.Count);
+ Assert.IsNull(vehicle.TorqueLimits);
Assert.IsNull(vehicle.ElectricMotorTorqueLimits);//Vehicle EM Drive Limits
}
else
@@ -1007,7 +1007,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.Components.RetarderInputData);
Assert.IsNull(vehicle.Components.AirdragInputData);
Assert.IsNull(vehicle.CargoVolume);
- Assert.IsEmpty(vehicle.TorqueLimits);
+ Assert.IsNull(vehicle.TorqueLimits);
Assert.IsNull(vehicle.ElectricMotorTorqueLimits);
}
else
@@ -1155,7 +1155,7 @@ namespace TUGraz.VectoCore.Tests.XML
{
Assert.IsNull(vehicle.Components.AngledriveInputData);
Assert.IsNull(vehicle.Components.RetarderInputData);
- Assert.IsEmpty(vehicle.TorqueLimits);
+ Assert.IsNull(vehicle.TorqueLimits);
Assert.IsNull(vehicle.ElectricMotorTorqueLimits);
}
else
@@ -1414,7 +1414,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNotNull(vehicle.Components.ElectricStorage);
Assert.IsNull(vehicle.Components.PTOTransmissionInputData);
Assert.IsNull(vehicle.TorqueLimits);
- Assert.IsNull(vehicle.ElectricMotorTorqueLimits);
+ Assert.IsNotNull(vehicle.ElectricMotorTorqueLimits);
Assert.IsNull(vehicle.BoostingLimitations);
}
@@ -1457,7 +1457,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.Components.PTOTransmissionInputData);
Assert.IsNull(vehicle.CargoVolume);
Assert.IsNull(vehicle.TorqueLimits);
- Assert.IsNull(vehicle.ElectricMotorTorqueLimits);
+ Assert.IsNotNull(vehicle.ElectricMotorTorqueLimits);
Assert.IsNull(vehicle.BoostingLimitations);
}
diff --git a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs
index cdc154af1079b570121439b6310a50f9c5ed26d6..5943588c1f1922db0a42874bdf3e052f8ed02c04 100644
--- a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs
@@ -692,7 +692,7 @@ namespace TUGraz.VectoCore.Tests.XML
//angledrivelosses.ReplaceSelf(new XElement(XMLNames.AngleDrive_Efficiency, "0.9124").ToString());
aux.InnerXml =
new XElement(XMLNames.Auxiliaries_Auxiliary, new XAttribute(XMLNames.Auxiliaries_Auxiliary_ID_Attr, "const"),
- new XAttribute(XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance") + "type", "AuxiliaryEntryEngineeringType"),
+ new XAttribute(XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance") + XMLNames.XSIType, "AuxiliaryEntryEngineeringType"),
new XElement(XMLNames.Auxiliaries_Auxiliary_ConstantAuxLoad, "5000")).ToString();
//var modified = XmlReader.Create(new StringReader(nav.OuterXml));
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
index e0c0068ab735dfe618f1eb956f8fb43a9f20696d..65d45abfca0c2c90dfdd174cdf5aa0dc8e15cba9 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
@@ -43,7 +43,7 @@ namespace TUGraz.VectoCore.Tests.XML
public void TestConsolidateMultistageVehicle()
{
var reader = XmlReader.Create(_consolidatedInputData);
- var inputDataProvider = _xmlInputReader.Create(reader) as IMultistageBusInputDataProvider;
+ var inputDataProvider = _xmlInputReader.Create(reader) as IMultistepBusInputDataProvider;
Assert.AreEqual(true, inputDataProvider.JobInputData.InputComplete);
TestConsolidateManufacturingStage(inputDataProvider.JobInputData.ConsolidateManufacturingStage);
}
@@ -110,7 +110,7 @@ namespace TUGraz.VectoCore.Tests.XML
public void TestPrimaryOnlyConsolidateMultistageVehicle()
{
var reader = XmlReader.Create(_primaryOnlyInputData);
- var inputDataProvider = _xmlInputReader.Create(reader) as IMultistageBusInputDataProvider;
+ var inputDataProvider = _xmlInputReader.Create(reader) as IMultistepBusInputDataProvider;
Assert.AreEqual(null, inputDataProvider.JobInputData.ManufacturingStages);
//The consolidated ManufacturingStage is now always created, and can hold some values from the primary vehicle (i.e. TPMLM)
@@ -122,7 +122,7 @@ namespace TUGraz.VectoCore.Tests.XML
public void TestOneStageConsolidateMultistageVehicle()
{
var reader = XmlReader.Create(_oneStageInputData);
- var inputDataProvider = _xmlInputReader.Create(reader) as IMultistageBusInputDataProvider;
+ var inputDataProvider = _xmlInputReader.Create(reader) as IMultistepBusInputDataProvider;
Assert.AreEqual(false, inputDataProvider.JobInputData.InputComplete);
@@ -161,7 +161,7 @@ namespace TUGraz.VectoCore.Tests.XML
public void TestTwoStagesConsolidateMultistageVehicle()
{
var reader = XmlReader.Create(_twoStagesInputData);
- var inputDataProvider = _xmlInputReader.Create(reader) as IMultistageBusInputDataProvider;
+ var inputDataProvider = _xmlInputReader.Create(reader) as IMultistepBusInputDataProvider;
Assert.AreEqual(false, inputDataProvider.JobInputData.InputComplete);
var vehicle = inputDataProvider.JobInputData.ConsolidateManufacturingStage.Vehicle;
@@ -202,7 +202,7 @@ namespace TUGraz.VectoCore.Tests.XML
public void TestConsolidateMultistageAirdrag()
{
var reader = XmlReader.Create(_consolidatedInputDataAirdrag);
- var inputDataProvider = _xmlInputReader.Create(reader) as IMultistageBusInputDataProvider;
+ var inputDataProvider = _xmlInputReader.Create(reader) as IMultistepBusInputDataProvider;
var hvaux = inputDataProvider.JobInputData.ConsolidateManufacturingStage.Vehicle.Components.BusAuxiliaries.HVACAux;
Assert.NotNull(hvaux);
@@ -221,7 +221,7 @@ namespace TUGraz.VectoCore.Tests.XML
public void TestConsolidateMultistageHeatPump()
{
var reader = XmlReader.Create(_consolidatedInputDataHeatPump);
- var inputDataProvider = _xmlInputReader.Create(reader) as IMultistageBusInputDataProvider;
+ var inputDataProvider = _xmlInputReader.Create(reader) as IMultistepBusInputDataProvider;
var hvaux = inputDataProvider.JobInputData.ConsolidateManufacturingStage.Vehicle.Components.BusAuxiliaries.HVACAux;
Assert.NotNull(hvaux);
@@ -238,7 +238,7 @@ namespace TUGraz.VectoCore.Tests.XML
public void TestConsolidateMultistageHeatHev()
{
var reader = XmlReader.Create(_consolidatedInputDataHeatHev);
- var inputDataProvider = _xmlInputReader.Create(reader) as IMultistageBusInputDataProvider;
+ var inputDataProvider = _xmlInputReader.Create(reader) as IMultistepBusInputDataProvider;
var hvaux = inputDataProvider.JobInputData.ConsolidateManufacturingStage.Vehicle.Components.BusAuxiliaries.HVACAux;
Assert.NotNull(hvaux);
@@ -255,7 +255,7 @@ namespace TUGraz.VectoCore.Tests.XML
public void TestConsolidateMultistageHeatNgTankSystem()
{
var reader = XmlReader.Create(_consolidatedInputDataHeatNgTank);
- var inputDataProvider = _xmlInputReader.Create(reader) as IMultistageBusInputDataProvider;
+ var inputDataProvider = _xmlInputReader.Create(reader) as IMultistepBusInputDataProvider;
var hvaux = inputDataProvider.JobInputData.ConsolidateManufacturingStage.Vehicle.Components.BusAuxiliaries.HVACAux;
Assert.NotNull(hvaux);
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
index e6f64bb85b0d4ca7add6630ec87f1193ace9140e..1207efe1f950bf47a86536db865420232bdd454d 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
@@ -42,7 +42,7 @@ namespace TUGraz.VectoCore.Tests.XML
public void TestVehicleMultistageBusInput01()
{
var reader = XmlReader.Create(VIF01);
- var inputDataProvider = _xmlInputReader.Create(reader) as IMultistageBusInputDataProvider;
+ var inputDataProvider = _xmlInputReader.Create(reader) as IMultistepBusInputDataProvider;
TestPrimaryVehicleDataType(inputDataProvider.JobInputData.PrimaryVehicle);
TestManufacturingStages(inputDataProvider.JobInputData.ManufacturingStages);
}
@@ -508,7 +508,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(totalMass.SI<Kilogram>(), result.SimulationParameter.TotalVehicleMass);
Assert.AreEqual(payload.SI<Kilogram>(), result.SimulationParameter.Payload);
Assert.AreEqual(passenger, result.SimulationParameter.PassengerCount);
- Assert.AreEqual(fuelMode, result.SimulationParameter.FuelMode);
+ //Assert.AreEqual(fuelMode, result.SimulationParameter.FuelMode);
index++;
}
@@ -670,7 +670,7 @@ namespace TUGraz.VectoCore.Tests.XML
public void TestVehicleMultistageBusInput02()
{
var reader = XmlReader.Create(VIF02);
- var inputDataProvider = _xmlInputReader.Create(reader) as IMultistageBusInputDataProvider;
+ var inputDataProvider = _xmlInputReader.Create(reader) as IMultistepBusInputDataProvider;
TestPrimaryVehicleDataType(inputDataProvider.JobInputData.PrimaryVehicle);
TestManufacturingStageVIF02(inputDataProvider.JobInputData.ManufacturingStages);
}
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index 21e33376d1a6005239f08d9e973345c178673b5f..a58a883006e9defa8c30efc46df520bbb5d0768d 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -82,6 +82,7 @@
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\ComponentData\Gearbox_IHPC.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\ComponentData\IEPC_1.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\ComponentData\IEPC_StdValues.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\ComponentData\Tyre.xml" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="Schema 2.4_Jobs">
<Folder FolderName="HeavyLorry">
@@ -153,6 +154,29 @@
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_stage_2_full.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_stage_2_mandatory.xml" HomeFolder="Yes"/>
</Folder>
+ <Folder FolderName="MockupResults">
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_Conv_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_Conv_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_non-OVC-HEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_non-OVC-HEV_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_OVC-HEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_OVC-HEV_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_PEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_PEV_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_Conv_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_Conv_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_Error.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_non-OVC-HEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_non-OVC-HEV_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_OVC-HEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_OVC-HEV_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_PEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_PEV_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\VIF_MockupResults_Conv_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\VIF_MockupResults_non-OVC-HEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\VIF_MockupResults_OVC-HEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\VIF_MockupResults_PEV_Bus.xml" HomeFolder="Yes"/>
+ </Folder>
</Folder>
<Folder FolderName="XML Files Vecto Testcases">
<Folder FolderName="SchemaVersion2.4" ExtStr=".xml">
diff --git a/VectoMockup/VectoMockup/MockupResultReader.cs b/VectoMockup/VectoMockup/MockupResultReader.cs
index 37406fde8862f7d8319b04ac885eee671243e201..4d235350a16ece3472c173742ea53a6fb6ecbd78 100644
--- a/VectoMockup/VectoMockup/MockupResultReader.cs
+++ b/VectoMockup/VectoMockup/MockupResultReader.cs
@@ -107,11 +107,11 @@ namespace TUGraz.VectoMockup
private static string GetArch(string xmlName, VectoRunData runData)
{
-
bool ovc = false;
var jobType = VectoSimulationJobType.ConventionalVehicle;
- if (runData.InputData is IXMLMultistageInputDataProvider) {
+ if (runData.InputData is IXMLMultistageInputDataProvider mst) {
ovc = false; //TODO implement
+ jobType = mst.JobInputData.JobType; //runData.InputData.JobInputData.JobType;
} else {
ovc = runData.InputData.JobInputData.Vehicle.OvcHev;
jobType = runData.InputData.JobInputData.JobType;
@@ -140,6 +140,9 @@ namespace TUGraz.VectoMockup
{
var resultElement = GetResultElement(resultElementName, MockupResultHelper.GetResourceName(xmlName, result, ResultType.MRF, runData));
ReplaceMission(result, resultElement);
+ ReplaceGroup(result, resultElement);
+ ReplacePayload(result, resultElement);
+ ReplaceFuelMode(result, resultElement);
SetFuels(result, resultElement);
ClearGearboxAndAxleGearEntries(result, resultElement, runData);
@@ -166,49 +169,32 @@ namespace TUGraz.VectoMockup
ReplaceGroup(result, resultElement);
ReplacePayload(result, resultElement);
ReplaceFuelMode(result,resultElement);
- //SetFuels(result, resultElement);
-
- //Results.Add(
- // new XElement(
- // tns + XMLNames.Report_Result_Result,
- // new XAttribute(
- // XMLNames.Report_Result_Status_Attr,
- // resultEntry.Status == VectoRun.Status.Success ? "success" : "error"),
- // new XElement(tns + XMLNames.Report_Vehicle_VehicleGroup, resultEntry.VehicleClass.GetClassNumber()),
- // new XElement(tns + XMLNames.Report_Result_Mission, resultEntry.Mission.ToXMLFormat()),
- // new XElement(
- // tns + XMLNames.Report_ResultEntry_SimulationParameters,
- // new XElement(
- // tns + XMLNames.Report_ResultEntry_TotalVehicleMass,
- // XMLHelper.ValueAsUnit(resultEntry.TotalVehicleMass, XMLNames.Unit_kg, 2)),
- // new XElement(
- // tns + XMLNames.Report_Result_Payload, XMLHelper.ValueAsUnit(resultEntry.Payload, XMLNames.Unit_kg, 2)),
- // new XElement(
- // tns + XMLNames.Report_ResultEntry_PassengerCount,
- // resultEntry.PassengerCount?.ToXMLFormat(2) ?? "NaN"),
- // new XElement(
- // tns + XMLNames.Report_Result_FuelMode,
- // resultEntry.FuelData.Count > 1
- // ? XMLNames.Report_Result_FuelMode_Val_Dual
- // : XMLNames.Report_Result_FuelMode_Val_Single)
- // ),
- // GetResults(resultEntry)));
+ SetFuels(result, resultElement);
- return resultElement;
+ return resultElement;
}
private static void ReplacePayload(XMLDeclarationReport.ResultEntry result, XElement resultElement)
{
- var payload = resultElement.XPathSelectElements($"//*[local-name()='{XMLNames.Report_ResultEntry_Payload}']");
- payload.Single().Value = result.Payload.ToXMLFormat();
+ if (result.Payload == null) {
+ return;
+ }
+ var payload = resultElement.XPathSelectElements($"//*[local-name()='{XMLNames.Report_ResultEntry_Payload}']").ToList();
+ if (!payload.Any()) {
+ return;
+ }
+ payload.ForEach(x => x.Value = result.Payload.ToXMLFormat());
}
private static void ReplaceGroup(XMLDeclarationReport.ResultEntry result, XElement resultElement)
{
- var groupElement = resultElement.XPathSelectElements($"//*[local-name()='{XMLNames.Report_Vehicle_VehicleGroup}']");
- groupElement.Single().Value = result.VehicleClass.GetClassNumber();
+ var groupElement = resultElement.XPathSelectElements($"//*[local-name()='{XMLNames.Report_Results_PrimaryVehicleSubgroup}']").ToList();
+ if (!groupElement.Any()) {
+ return;
+ }
+ groupElement.ForEach(x => x.Value = result.VehicleClass.GetClassNumber());
}
private static void ReplaceFuelMode(XMLDeclarationReport.ResultEntry result, XElement resultElement)
@@ -257,36 +243,22 @@ namespace TUGraz.VectoMockup
private static void SetFuels(XMLDeclarationReport.ResultEntry result, XElement resultElement)
{
//var tmpResultElement = new XElement(resultElement);
- var fuelElements = resultElement.XPathSelectElements("//*[name()='Fuel']").ToList();
+ var fuelElements = resultElement.XPathSelectElements("//*[local-name()='Fuel']").ToList();
foreach (var fuelElement in fuelElements) {
- XElement lastAdded = null;
+ var insertPos = fuelElement.NextNode as XElement;
+ ;
foreach (var fuelProperties in result.FuelData)
{
- Action<XElement> insertAction = (element) => {
- //FuelElements added after this element
- if (lastAdded != null) {
- fuelElement.AddAfterSelf(element);
-
- } else if (fuelElement.PreviousNode != null) {
- fuelElement.AddAfterSelf(element);
-
- } else {
- fuelElement.Parent.AddFirst(element);
- }
- lastAdded = element;
- fuelElement.Remove();
- };
-
var fuelElementToAdd = new XElement(fuelElement); //deep copy of fuel element;
fuelElementToAdd.SetAttributeValue(XMLNames.Report_Results_Fuel_Type_Attr, fuelProperties.FuelType.ToXMLFormat());
ClearFuelConsumptionEntries(fuelProperties, fuelElementToAdd, result.VehicleClass);
-
-
-
- insertAction(fuelElementToAdd);
-
-
+ if (insertPos == null) {
+ resultElement.Add(fuelElementToAdd);
+ } else {
+ insertPos.AddBeforeSelf(fuelElementToAdd);
+ }
}
+ fuelElement.Remove();
}
}
@@ -295,7 +267,9 @@ namespace TUGraz.VectoMockup
{
var elementsToRemove = new List<XElement>();
if (runData.GearboxData == null) {
- elementsToRemove.AddRange(resultElement.XPathSelectElements("//*[name()='GearshiftCount']"));
+ //elementsToRemove.AddRange(resultElement.XPathSelectElements("//*[name()='GearshiftCount']"));
+ var gearshiftCount = resultElement.XPathSelectElement("//*[name()='GearshiftCount']");
+ gearshiftCount.Value = "1";
elementsToRemove.AddRange(resultElement.XPathSelectElements("//*[name()='AverageGearboxEfficiency']"));
}
@@ -323,7 +297,10 @@ namespace TUGraz.VectoMockup
fuelElement.XPathSelectElements("//*[@unit='l/m³-km']").FirstOrDefault()?.Remove();
fuelElement.XPathSelectElements("//*[@unit='l/t-km']").FirstOrDefault()?.Remove();
fuelElement.XPathSelectElements("//*[@unit='l/100km']").FirstOrDefault()?.Remove();
+ fuelElement.XPathSelectElements("//*[@unit='l/p-km']").FirstOrDefault()?.Remove();
}
}
+
+
}
}
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Bus.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Bus.xml
index b4e9fb845158270c9807430f11c3c1c0bb212bb1..7d57378d89b10ea655c328c080fd9458989ab2d4 100644
--- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Bus.xml
@@ -28,6 +28,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
</Result>
<!-- Conventional Bus -->
<Summary xsi:type="ResultSummaryConventionalType">
+ <AveragePassengerCount>3.141</AveragePassengerCount>
<Fuel type="Diesel CI"><!-- repeat for every fuel used -->
<FuelConsumption unit="g/km">6.1</FuelConsumption>
<FuelConsumption unit="g/p-km">6.21</FuelConsumption>
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Lorry.xml
index 5d9eb9985386f783fa056bb1de1bfa7ae06a92b6..f4a4d304c91d16afde3f5d261e69d240a615b05b 100644
--- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Lorry.xml
+++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_Conv_Lorry.xml
@@ -31,6 +31,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
</Result>
<!-- END Conventional Lorry -->
<Summary xsi:type="ResultSummaryConventionalType">
+ <AveragePayload unit="t">3.141</AveragePayload>
<Fuel type="Diesel CI"><!-- repeat for every fuel used -->
<FuelConsumption unit="g/km">6.1</FuelConsumption>
<FuelConsumption unit="g/t-km">6.20</FuelConsumption>
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml
index cb0510f83271d054b37d1380e675113f86bdcd3c..6b91ea62812809430c94fc095215ced25373a2fa 100644
--- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml
@@ -70,6 +70,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
</Result>
<!-- END OCV HEV (and OCV FCV in future) Bus -->
<Summary xsi:type="ResultSummaryOCVHEVType">
+ <AveragePassengerCount>3.141</AveragePassengerCount>
<Fuel type="Diesel CI"><!-- repeat for every fuel used -->
<FuelConsumption unit="g/km">6.1</FuelConsumption>
<FuelConsumption unit="g/p-km">6.21</FuelConsumption>
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml
index e2d877de790b7516b19c70ec1236680b16605a58..db265ed79273d2cee5d05e5105c94799edce0264 100644
--- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml
+++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml
@@ -85,6 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
</Result>
<!-- END OCV HEV (and OCV FCV in future) Lorry -->
<Summary xsi:type="ResultSummaryOCVHEVType">
+ <AveragePayload unit="t">3.141</AveragePayload>
<!-- repeat for every fuel used -->
<Fuel type="Diesel CI">
<FuelConsumption unit="g/km">6.1</FuelConsumption>
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Bus.xml
index 9d7c3b7b923c6f462540839a302fb7a7e4af3456..17f4916e6fbf6972c4dd4db4a08ff2525f314c89 100644
--- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Bus.xml
@@ -38,6 +38,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
</Result>
<!-- END PEV Bus -->
<Summary xsi:type="ResultSummaryPEVType">
+ <AveragePayload unit="t">3.141</AveragePayload>
<ElectricEnergy>
<EnergyConsumption unit="kWh/km">7.101</EnergyConsumption>
<EnergyConsumption unit="kWh/p-km">7.111</EnergyConsumption>
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Lorry.xml
index 077090df91a5a69702d9a7f80769523d69ee168b..f4a92ac09c793592149ab66be057dccacf50507a 100644
--- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Lorry.xml
+++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_PEV_Lorry.xml
@@ -28,6 +28,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
</Result>
<!-- END PEV Lorry -->
<Summary xsi:type="ResultSummaryPEVType">
+ <AveragePayload unit="t">3.141</AveragePayload>
<ElectricEnergy>
<EnergyConsumption unit="kWh/km">7.101</EnergyConsumption>
<EnergyConsumption unit="kWh/t-km">7.121</EnergyConsumption>
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml
index 839993909a29bb232eb676a251f4066379d5deec..337f5ef774c228c0217b3821988fb325e11c14cd 100644
--- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml
@@ -28,6 +28,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
</Result>
<!-- END non-OCV HEV Bus -->
<Summary xsi:type="ResultSummaryNonOCVHEVType">
+ <AveragePassengerCount>3.141</AveragePassengerCount>
<Fuel type="Diesel CI"><!-- repeat for every fuel used -->
<FuelConsumption unit="g/km">6.1</FuelConsumption>
<FuelConsumption unit="g/p-km">6.21</FuelConsumption>
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml
index efe9fd4230c8259d39a9fb466c6fbafceb4c9e8d..6b6c0a8ffbb92c40a9ef28fc3db700f07c587123 100644
--- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml
+++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml
@@ -31,6 +31,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
</Result>
<!-- END non-OCV HEV Lorry -->
<Summary xsi:type="ResultSummaryNonOCVHEVType">
+ <AveragePayload unit="t">3.141</AveragePayload>
<Fuel type="Diesel CI"><!-- repeat for every fuel used -->
<FuelConsumption unit="g/km">6.1</FuelConsumption>
<FuelConsumption unit="g/t-km">6.20</FuelConsumption>
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
index d3e3c42ff70b13eccb00b5ab02df820ac50bc18a..89a9d9c2b623e46eef334767474337013e9a7095 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
@@ -13,6 +13,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<Payload unit="kg">2600</Payload>
<PassengerCount>13.75</PassengerCount>
</SimulationParameters>
+ <PrimaryVehicleSubgroup>Pxx</PrimaryVehicleSubgroup>
<Total>
<VehiclePerformance>
<AverageSpeed unit="km/h">1.2</AverageSpeed>
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Error.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Error.xml
index f99c99dda31ee179b2540e98c3fa0080a2c103ba..8674b89b0326c30cd27b0ac8ffc019546ff0d955 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Error.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Error.xml
@@ -12,6 +12,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<Payload unit="kg">2600</Payload>
<PassengerCount>13.75</PassengerCount>
</SimulationParameters>
+ <VehicleGroup>Pxx</VehicleGroup>
<Error>7 (LongHaul LowLoading) - absTime: 45.8061 [s], distance: 575.8976 [m], dt: 0.4990 [s], v: 23.6111 [m/s], Gear: 8 | AxleGear LossMap data was extrapolated in Declaration Mode: range for loss map is not sufficient: n:568.520042003599, torque:983.0149 [Nm]</Error>
<ErrorDetails> at TUGraz.VectoCore.Models.SimulationComponent.Impl.TransmissionComponent.DoCommitSimulationStep() in E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Models\SimulationComponent\Impl\TransmissionComponent.cs:line 118
at TUGraz.VectoCore.Models.SimulationComponent.VectoSimulationComponent.CommitSimulationStep(IModalDataContainer container) in E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Models\SimulationComponent\VectoSimulationComponent.cs:line 67
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
index a757be0225a3aac1aca98465f7f8ae19050b136b..0b8151ad2b9eaf1341b8dd3db5d14a4130d7ef40 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
@@ -5,7 +5,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<Results>
<Status>success</Status>
<!-- OCV HEV (and OCV FCV in future) Bus -->
- <Result status="success" xsi:type="ResultSuccessOCVHEVType">
+ <Result status="success" xsi:type="ResultSuccessOVCHEVType">
<Mission>Long Haul</Mission>
<Distance unit="km">100.185</Distance>
<SimulationParameters>
@@ -13,7 +13,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<Payload unit="kg">2600</Payload>
<PassengerCount>13.75</PassengerCount>
</SimulationParameters>
- <OCVMode type="charge depleting">
+ <PrimaryVehicleSubgroup>Pxx</PrimaryVehicleSubgroup>
+ <OVCMode type="charge depleting">
<VehiclePerformance>
<AverageSpeed unit="km/h">1.0</AverageSpeed>
<AverageDrivingSpeed unit="km/h">1.1</AverageDrivingSpeed>
@@ -47,8 +48,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
</ElectricEnergy>
<CO2 unit="g/km">5.1</CO2>
<CO2 unit="g/p-km">5.2</CO2>
- </OCVMode>
- <OCVMode type="charge sustaining">
+ </OVCMode>
+ <OVCMode type="charge sustaining">
<VehiclePerformance>
<AverageSpeed unit="km/h">1.2</AverageSpeed>
<AverageDrivingSpeed unit="km/h">1.3</AverageDrivingSpeed>
@@ -76,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
</Fuel>
<CO2 unit="g/km">8.1</CO2>
<CO2 unit="g/p-km">8.2</CO2>
- </OCVMode>
+ </OVCMode>
<Total>
<VehiclePerformance>
<AverageSpeed unit="km/h">1.2</AverageSpeed>
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml
index 4148ecd5701737e86ba1a2c01c9173587c3286ab..e3f1c79e9d37a53ab0faebdf701badf5f6a5ef9a 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml
@@ -5,14 +5,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<Results>
<Status>success</Status>
<!-- OCV HEV (and OCV FCV in future) Lorry -->
- <Result status="success" xsi:type="ResultSuccessOCVHEVType">
+ <Result status="success" xsi:type="ResultSuccessOVCHEVType">
<Mission>Long Haul</Mission>
<Distance unit="km">100.185</Distance>
<SimulationParameters>
<TotalVehicleMass unit="kg">17200</TotalVehicleMass>
<Payload unit="kg">2600</Payload>
</SimulationParameters>
- <OCVMode type="charge depleting">
+ <OVCMode type="charge depleting">
<VehiclePerformance>
<AverageSpeed unit="km/h">1.0</AverageSpeed>
<AverageDrivingSpeed unit="km/h">1.1</AverageDrivingSpeed>
@@ -52,8 +52,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<CO2 unit="g/km">5.1</CO2>
<CO2 unit="g/t-km">5.3</CO2>
<CO2 unit="g/m³-km">5.4</CO2>
- </OCVMode>
- <OCVMode type="charge sustaining">
+ </OVCMode>
+ <OVCMode type="charge sustaining">
<VehiclePerformance>
<AverageSpeed unit="km/h">1.2</AverageSpeed>
<AverageDrivingSpeed unit="km/h">1.3</AverageDrivingSpeed>
@@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<CO2 unit="g/km">8.1</CO2>
<CO2 unit="g/t-km">8.3</CO2>
<CO2 unit="g/m³-km">8.4</CO2>
- </OCVMode>
+ </OVCMode>
<Total>
<VehiclePerformance>
<AverageSpeed unit="km/h">1.2</AverageSpeed>
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Bus.xml
index 7f932fe29212c25f6ce70a9b210e87b3e310c391..fc1db115aed7bde74c3c0627a5f174aa8ac68721 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Bus.xml
@@ -13,6 +13,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<Payload unit="kg">2600</Payload>
<PassengerCount>13.75</PassengerCount>
</SimulationParameters>
+ <PrimaryVehicleSubgroup></PrimaryVehicleSubgroup>
<Total>
<VehiclePerformance>
<AverageSpeed unit="km/h">1.2</AverageSpeed>
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Lorry.xml
index b0bf83f452c6555e02433faec201e6784e7ab229..7468105446333de20000758b526bf19df72b978c 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Lorry.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Lorry.xml
@@ -11,7 +11,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<SimulationParameters>
<TotalVehicleMass unit="kg">17200</TotalVehicleMass>
<Payload unit="kg">2600</Payload>
- <!--<PassengerCount>13.75</PassengerCount>--><!-- only for buses -->
</SimulationParameters>
<Total>
<VehiclePerformance>
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml
index 5d50add3f2e915e737e20ffad5107a167525906a..44dba2fad0d19dc8ee45e70b1fe4a80fce89c58c 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml
@@ -13,6 +13,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<Payload unit="kg">2600</Payload>
<PassengerCount>13.75</PassengerCount>
</SimulationParameters>
+ <PrimaryVehicleSubgroup>Pxxx</PrimaryVehicleSubgroup>
<Total>
<VehiclePerformance>
<AverageSpeed unit="km/h">1.2</AverageSpeed>
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_Conv_Bus.xml b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_Conv_Bus.xml
index 23dfe4b699a570fb08926f002b2dcd28b67fcd3c..afd621f890f029d84a17fab9d304234e7faa6d88 100644
--- a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_Conv_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_Conv_Bus.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPIDeclarationOutput:VehicleInterimFile:v0.1">
+<?xml version="1.0" encoding="utf-8" ?>
+<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+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">
<Results>
<Status>success</Status>
<Result status="success">
- <VehicleGroup>GRP</VehicleGroup>
- <Mission>MISSION</Mission>
+ <PrimaryVehicleSubgroup>GRP</PrimaryVehicleSubgroup>
+ <Mission>Long Haul</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15000</TotalVehicleMass>
<Payload unit="kg">15000</Payload>
<PassengerCount>2</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1160.65</CO2>
</Result>
</Results>
</vif:VectoMockResults>
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_OVC_HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_OVC-HEV_Bus.xml
similarity index 66%
rename from VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_OVC_HEV_Bus.xml
rename to VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_OVC-HEV_Bus.xml
index de105b0e08244c3b98267d3b47c813cb417131f5..6a33e6ef4186b047b65e48713a927e9cc9af3a81 100644
--- a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_OVC_HEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_OVC-HEV_Bus.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationPutput:VehicleInterimFile:v0.1" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationPutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPIDeclarationOutput:VehicleInterimFile:v0.1">
+<?xml version="1.0" encoding="utf-8" ?>
+<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+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">
<Results>
<Status>success</Status>
<Result status="success">
- <VehicleGroup>GRP</VehicleGroup>
- <Mission>MISSION</Mission>
+ <PrimaryVehicleSubgroup>GRP</PrimaryVehicleSubgroup>
+ <Mission>Long Haul</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15000</TotalVehicleMass>
<Payload unit="kg">15000</Payload>
<PassengerCount>2</PassengerCount>
- <Fuelmode>single fuel mode</Fuelmode>
</SimulationParameters>
<OVCMode type="charge depleting">
<Fuel type="NG CI">
@@ -18,7 +18,6 @@
<ElectricEnergyConsumption>
<EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
</ElectricEnergyConsumption>
- <CO2 unit="g/km">1160.65</CO2>
</OVCMode>
<OVCMode type="charge sustaining">
<Fuel type="NG CI">
@@ -27,7 +26,6 @@
<ElectricEnergyConsumption>
<EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
</ElectricEnergyConsumption>
- <CO2 unit="g/km">1160.65</CO2>
</OVCMode>
</Result>
</Results>
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_PEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_PEV_Bus.xml
index 0cfc83ffd3d654b4a0eb6f43943541db5b8d4fdb..c9ef9ec854f41ac123dafb336a18d33702157539 100644
--- a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_PEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_PEV_Bus.xml
@@ -1,20 +1,19 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationPutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPIDeclarationOutput:VehicleInterimFile:v0.1">
+<?xml version="1.0" encoding="utf-8" ?>
+<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+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">
<Results>
<Status>success</Status>
<Result status="success">
- <VehicleGroup>GRP</VehicleGroup>
- <Mission>MISSION</Mission>
+ <PrimaryVehicleSubgroup>GRP</PrimaryVehicleSubgroup>
+ <Mission>Long Haul</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15000</TotalVehicleMass>
<Payload unit="kg">15000</Payload>
<PassengerCount>2</PassengerCount>
- <Fuelmode>single fuel mode</Fuelmode>
</SimulationParameters>
<ElectricEnergyConsumption>
<EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
</ElectricEnergyConsumption>
- <CO2 unit="g/km">1160.65</CO2>
</Result>
</Results>
</vif:VectoMockResults>
\ No newline at end of file
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_non_OVC_HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_non-OVC-HEV_Bus.xml
similarity index 56%
rename from VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_non_OVC_HEV_Bus.xml
rename to VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_non-OVC-HEV_Bus.xml
index dccac82239fe700352ebf82e153acbc34ad03637..998432fee874796d221fe50f8f0fcffb9f241ea5 100644
--- a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_non_OVC_HEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_non-OVC-HEV_Bus.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationPutput:VehicleInterimFile:v0.1" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationPutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPIDeclarationOutput:VehicleInterimFile:v0.1">
+<?xml version="1.0" encoding="utf-8" ?>
+<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+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">
<Results>
<Status>success</Status>
<Result status="success">
- <VehicleGroup>GRP</VehicleGroup>
- <Mission>MISSION</Mission>
+ <PrimaryVehicleSubgroup>GRP</PrimaryVehicleSubgroup>
+ <Mission>Long Haul</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15000</TotalVehicleMass>
<Payload unit="kg">15000</Payload>
<PassengerCount>2</PassengerCount>
- <Fuelmode>single fuel mode</Fuelmode>
</SimulationParameters>
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
@@ -17,7 +17,6 @@
<ElectricEnergyConsumption>
<EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
</ElectricEnergyConsumption>
- <CO2 unit="g/km">1160.65</CO2>
</Result>
</Results>
</vif:VectoMockResults>
diff --git a/VectoMockup/VectoMockup/MockupXMLInputDataFactory.cs b/VectoMockup/VectoMockup/MockupXMLInputDataFactory.cs
index 4bdf5e347b7d4173574d17e4df07d54a74275460..4313770419fe3e795f334b74d8a3fc2a2181d004 100644
--- a/VectoMockup/VectoMockup/MockupXMLInputDataFactory.cs
+++ b/VectoMockup/VectoMockup/MockupXMLInputDataFactory.cs
@@ -23,7 +23,7 @@ namespace TUGraz.VectoMockup
#region Overrides of XMLInputDataFactory
- protected override IMultistageBusInputDataProvider ReadMultistageDeclarationJob(XmlDocument xmlDoc, string source)
+ protected override IMultistepBusInputDataProvider ReadMultistageDeclarationJob(XmlDocument xmlDoc, string source)
{
var ret = base.ReadMultistageDeclarationJob(xmlDoc, source);
diff --git a/VectoMockup/VectoMockup/Ninject/CIFMockupModule.cs b/VectoMockup/VectoMockup/Ninject/CIFMockupModule.cs
index fb512e085e493b9929fa30403db3173158f2ed17..80dc0573315abdb38d7c46e0f7c9b8963e40b676 100644
--- a/VectoMockup/VectoMockup/Ninject/CIFMockupModule.cs
+++ b/VectoMockup/VectoMockup/Ninject/CIFMockupModule.cs
@@ -103,15 +103,56 @@ namespace TUGraz.VectoMockup.Ninject
return _cifFactory.GetConventional_CompletedBusVehicleType();
}
- public IXmlTypeWriter GetHEV_CompletedBusVehicleType()
- {
- return _cifFactory.GetHEV_CompletedBusVehicleType();
- }
+ public IXmlTypeWriter GetHEV_Px_CompletedBusVehicleType()
+ {
+ return _cifFactory.GetHEV_Px_CompletedBusVehicleType();
+ }
+
+ public IXmlTypeWriter GetHEV_IHPC_CompletedBusVehicleType()
+ {
+ return _cifFactory.GetHEV_IHPC_CompletedBusVehicleType();
+ }
+
+ public IXmlTypeWriter GetHEV_S2_CompletedBusVehicleType()
+ {
+ return _cifFactory.GetHEV_S2_CompletedBusVehicleType();
+ }
+
+ public IXmlTypeWriter GetHEV_S3_CompletedBusVehicleType()
+ {
+ return _cifFactory.GetHEV_S3_CompletedBusVehicleType();
+ }
+
+ public IXmlTypeWriter GetHEV_S4_CompletedBusVehicleType()
+ {
+ return _cifFactory.GetHEV_S4_CompletedBusVehicleType();
+ }
+
+ public IXmlTypeWriter GetHEV_IEPC_S_CompletedBusVehicleType()
+ {
+ return _cifFactory.GetHEV_IEPC_S_CompletedBusVehicleType();
+ }
+
+ public IXmlTypeWriter GetPEV_E2_CompletedBusVehicleType()
+ {
+ return _cifFactory.GetPEV_E2_CompletedBusVehicleType();
+ }
+
+ public IXmlTypeWriter GetPEV_E3_CompletedBusVehicleType()
+ {
+ return _cifFactory.GetPEV_E3_CompletedBusVehicleType();
+ }
+
+ public IXmlTypeWriter GetPEV_E4_CompletedBusVehicleType()
+ {
+ return _cifFactory.GetPEV_E4_CompletedBusVehicleType();
+ }
+
+ public IXmlTypeWriter GetPEV_IEPC_CompletedBusVehicleType()
+ {
+ return _cifFactory.GetPEV_IEPC_CompletedBusVehicleType();
+ }
- public IXmlTypeWriter GetPEV_CompletedBusVehicleType()
- {
- return _cifFactory.GetPEV_CompletedBusVehicleType();
- }
public IXmlTypeWriter GetExemptedCompletedBusVehicleType()
{
@@ -133,7 +174,12 @@ namespace TUGraz.VectoMockup.Ninject
return _cifFactory.GetConventionalLorryVehicleSequenceGroupWriter();
}
- public IReportOutputGroup GetEngineGroup()
+ public IReportOutputGroup GetConventionalCompletedBusVehicleSequenceGroupWriter()
+ {
+ return _cifFactory.GetConventionalCompletedBusVehicleSequenceGroupWriter();
+ }
+
+ public IReportOutputGroup GetEngineGroup()
{
return _cifFactory.GetEngineGroup();
}
@@ -143,7 +189,12 @@ namespace TUGraz.VectoMockup.Ninject
return _cifFactory.GetTransmissionGroup();
}
- public IReportOutputGroup GetAxleWheelsGroup()
+ public IReportOutputGroup GetTransmissionGroupNoGearbox()
+ {
+ return _cifFactory.GetTransmissionGroupNoGearbox();
+ }
+
+ public IReportOutputGroup GetAxleWheelsGroup()
{
return _cifFactory.GetAxleWheelsGroup();
}
@@ -153,17 +204,37 @@ namespace TUGraz.VectoMockup.Ninject
return _cifFactory.GetLorryAuxGroup();
}
- public IReportOutputGroup GetCompletedBusAuxGroup()
+ public IReportOutputGroup GetConventionalCompletedBusAuxGroup()
{
- return _cifFactory.GetCompletedBusAuxGroup();
+ return _cifFactory.GetConventionalCompletedBusAuxGroup();
}
- public IReportOutputGroup GetHEV_VehicleSequenceGroupWriter()
+ public IReportOutputGroup GetHEV_Px_IHPC_CompletedBusAuxGroup()
+ {
+ return _cifFactory.GetHEV_Px_IHPC_CompletedBusAuxGroup();
+ }
+
+ public IReportOutputGroup GetHEV_Sx_CompletedBusAuxGroup()
+ {
+ return _cifFactory.GetHEV_Sx_CompletedBusAuxGroup();
+ }
+
+ public IReportOutputGroup GetPEV_CompletedBusAuxGroup()
+ {
+ return _cifFactory.GetPEV_CompletedBusAuxGroup();
+ }
+
+ public IReportOutputGroup GetHEV_LorryVehicleSequenceGroupWriter()
{
- return _cifFactory.GetHEV_VehicleSequenceGroupWriter();
+ return _cifFactory.GetHEV_LorryVehicleSequenceGroupWriter();
}
- public IReportOutputGroup GetHEV_LorryVehicleTypeGroup()
+ public IReportOutputGroup GetHEV_CompletedBusVehicleSequenceGroupWriter()
+ {
+ return _cifFactory.GetHEV_CompletedBusVehicleSequenceGroupWriter();
+ }
+
+ public IReportOutputGroup GetHEV_LorryVehicleTypeGroup()
{
return _cifFactory.GetHEV_LorryVehicleTypeGroup();
}
@@ -183,21 +254,56 @@ namespace TUGraz.VectoMockup.Ninject
return _cifFactory.GetPEV_LorryVehicleTypeGroup();
}
- public IReportOutputGroup GetPEV_VehicleSequenceGroupWriter()
+ public IReportOutputGroup GetPEV_LorryVehicleSequenceGroupWriter()
{
- return _cifFactory.GetPEV_VehicleSequenceGroupWriter();
+ return _cifFactory.GetPEV_LorryVehicleSequenceGroupWriter();
}
- public IReportOutputGroup GetCompletedBusVehicleTypeGroup()
+ public IReportOutputGroup GetPEV_CompletedBusVehicleSequenceGroupWriter()
+ {
+ return _cifFactory.GetPEV_CompletedBusVehicleSequenceGroupWriter();
+ }
+
+ public IReportOutputGroup GetCompletedBusVehicleTypeGroup()
{
return _cifFactory.GetCompletedBusVehicleTypeGroup();
}
- public IReportCompletedBusOutputGroup GetGeneralVehicleSequenceGroupWriterCompletedBus()
+ public IReportOutputGroup GetExemptedCompletedBusVehicleTypeGroup()
+ {
+ return _cifFactory.GetExemptedCompletedBusVehicleTypeGroup();
+ }
+
+ public IReportCompletedBusOutputGroup GetGeneralVehicleSequenceGroupWriterCompletedBus()
{
return _cifFactory.GetGeneralVehicleSequenceGroupWriterCompletedBus();
}
- #endregion
+ public ICIFAdasType GetConventionalADASType()
+ {
+ return _cifFactory.GetConventionalADASType();
+ }
+
+ public ICIFAdasType GetHEVADASType()
+ {
+ return _cifFactory.GetHEVADASType();
+ }
+
+ public ICIFAdasType GetPEVADASType()
+ {
+ return _cifFactory.GetPEVADASType();
+ }
+
+ public IReportOutputGroup GetPEVCompletedBusVehicleTypeGroup()
+ {
+ return _cifFactory.GetPEVCompletedBusVehicleTypeGroup();
+ }
+
+ public IReportOutputGroup GetIEPCTransmissionGroup()
+ {
+ return _cifFactory.GetIEPCTransmissionGroup();
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/VectoMockup/VectoMockup/Ninject/MRFMockupModule.cs b/VectoMockup/VectoMockup/Ninject/MRFMockupModule.cs
index 747f08b7d38f7d18fdc82afb8e89a11255cad827..a3162f9c637c5be5a34a3236a61b7ef3f2e4911d 100644
--- a/VectoMockup/VectoMockup/Ninject/MRFMockupModule.cs
+++ b/VectoMockup/VectoMockup/Ninject/MRFMockupModule.cs
@@ -497,22 +497,62 @@ namespace TUGraz.VectoMockup.Ninject
return _manufacturerReportFactoryImplementation.GetConventionalCompletedBus_HVACSystemType();
}
- public IMRFBusAuxiliariesType GetCompletedBusElectricSystemType()
+ public IMRFBusAuxiliariesType GetConventionalCompletedBusElectricSystemType()
{
- return _manufacturerReportFactoryImplementation.GetCompletedBusElectricSystemType();
+ return _manufacturerReportFactoryImplementation.GetConventionalCompletedBusElectricSystemType();
}
- public IReportOutputGroup GetPEV_PrimaryBusVehicleOutputGroup()
+ public IMRFBusAuxiliariesType GetHEVCompletedBusAuxType()
+ {
+ return _manufacturerReportFactoryImplementation.GetHEVCompletedBusAuxType();
+ }
+
+ public IMRFBusAuxiliariesType GetHEVCompletedBus_HVACSystemType()
+ {
+ return _manufacturerReportFactoryImplementation.GetHEVCompletedBus_HVACSystemType();
+ }
+
+ public IMRFBusAuxiliariesType GetHEVCompletedBusElectricSystemType()
+ {
+ return _manufacturerReportFactoryImplementation.GetHEVCompletedBusElectricSystemType();
+ }
+
+ public IMRFBusAuxiliariesType GetPEVCompletedBusAuxType()
+ {
+ return _manufacturerReportFactoryImplementation.GetPEVCompletedBusAuxType();
+ }
+
+ public IMRFBusAuxiliariesType GetPEVCompletedBus_HVACSystemType()
+ {
+ return _manufacturerReportFactoryImplementation.GetPEVCompletedBus_HVACSystemType();
+ }
+
+ public IMRFBusAuxiliariesType GetPEVCompletedBusElectricSystemType()
+ {
+ return _manufacturerReportFactoryImplementation.GetPEVCompletedBusElectricSystemType();
+ }
+
+ public IReportOutputGroup GetPEV_PrimaryBusVehicleOutputGroup()
{
return _manufacturerReportFactoryImplementation.GetPEV_PrimaryBusVehicleOutputGroup();
}
- public IReportOutputGroup GetCompletedBusGeneralVehicleOutputGroup()
+ public IReportOutputGroup GetConventionalCompletedBusGeneralVehicleOutputGroup()
{
- return _manufacturerReportFactoryImplementation.GetCompletedBusGeneralVehicleOutputGroup();
+ return _manufacturerReportFactoryImplementation.GetConventionalCompletedBusGeneralVehicleOutputGroup();
}
- public IReportVehicleOutputGroup GetCompletedBusSequenceGroup()
+ public IReportOutputGroup GetHEVCompletedBusGeneralVehicleOutputGroup()
+ {
+ return _manufacturerReportFactoryImplementation.GetHEVCompletedBusGeneralVehicleOutputGroup();
+ }
+
+ public IReportOutputGroup GetPEVCompletedBusGeneralVehicleOutputGroup()
+ {
+ return _manufacturerReportFactoryImplementation.GetPEVCompletedBusGeneralVehicleOutputGroup();
+ }
+
+ public IReportVehicleOutputGroup GetCompletedBusSequenceGroup()
{
return _manufacturerReportFactoryImplementation.GetCompletedBusSequenceGroup();
}
@@ -527,7 +567,12 @@ namespace TUGraz.VectoMockup.Ninject
return _manufacturerReportFactoryImplementation.GetCompletedBus_HVACSystemGroup();
}
- public IMrfVehicleType GetBoostingLimitationsType()
+ public IMrfBusAuxGroup GetCompletedBus_xEVHVACSystemGroup()
+ {
+ return _manufacturerReportFactoryImplementation.GetCompletedBus_xEVHVACSystemGroup();
+ }
+
+ public IMrfVehicleType GetBoostingLimitationsType()
{
return _manufacturerReportFactoryImplementation.GetBoostingLimitationsType();
}
diff --git a/VectoMockup/VectoMockup/Ninject/VIFMockupModule.cs b/VectoMockup/VectoMockup/Ninject/VIFMockupModule.cs
index e448064bed6a3759c353fb06d772f49b8409380c..0eb7a2f9ad9d42de4353a530b2a41d8b82a1952e 100644
--- a/VectoMockup/VectoMockup/Ninject/VIFMockupModule.cs
+++ b/VectoMockup/VectoMockup/Ninject/VIFMockupModule.cs
@@ -3,19 +3,451 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components;
+using TUGraz.VectoMockup.Reports;
namespace TUGraz.VectoMockup.Ninject
{
- internal class VIFMockupModulen : AbstractNinjectModule
+ public class VIFMockupModule : AbstractNinjectModule
{
#region Overrides of NinjectModule
public override void Load()
{
-
+ Kernel.Bind<IVIFReportFactory>().To<MockupVIFReportFactory>()
+ .WhenInjectedExactlyInto<MockupReportFactory>().InSingletonScope();
+
+ Kernel.Bind<IVIFReportInterimFactory>().To<MockupVIFReportFactory>()
+ .WhenInjectedExactlyInto<MockupReportFactory>().InSingletonScope();
}
#endregion
+
+ public class MockupVIFReportFactory : IVIFReportFactory, IVIFReportInterimFactory
+ {
+ private IVIFReportFactory _vifReportFactoryImplementation;
+ private readonly IVIFReportInterimFactory _interimFactory;
+
+
+ public MockupVIFReportFactory(IVIFReportFactory vifReportFactoryImplementation, IVIFReportInterimFactory interimFactory)
+ {
+ _vifReportFactoryImplementation = vifReportFactoryImplementation;
+ _interimFactory = interimFactory;
+ }
+
+
+ #region Implementation of IVIFReportFactory
+
+ public IXMLVehicleInformationFile GetVIFReport(VehicleCategory vehicleType, VectoSimulationJobType jobType, ArchitectureID archId,
+ bool exempted, bool iepc, bool ihpc)
+ {
+ return new MockupPrimaryVehicleInformationFile(
+ _vifReportFactoryImplementation.GetVIFReport(vehicleType, jobType, archId, exempted, iepc,
+ ihpc));
+ }
+
+ public IXMLMultistepIntermediateReport GetInterimVIFReport(VehicleCategory vehicleType, VectoSimulationJobType jobType,
+ ArchitectureID archId, bool exempted, bool iepc, bool ihpc)
+ {
+ return new MockupInterimVehicleInformationFile(
+ _interimFactory.GetInterimVIFReport(vehicleType, jobType, archId, exempted,
+ iepc, ihpc));
+ }
+
+ IXmlMultistepTypeWriter IVIFReportInterimFactory.GetConventionalVehicleType()
+ {
+ return _interimFactory.GetConventionalVehicleType();
+ }
+
+ public IXmlMultistepTypeWriter GetHEVVehicleType()
+ {
+ return _interimFactory.GetHEVVehicleType();
+ }
+
+ public IXmlMultistepTypeWriter GetPEVVehicleType()
+ {
+ return _interimFactory.GetPEVVehicleType();
+ }
+
+ public IXmlMultistepTypeWriter GetIEPCVehicleType()
+ {
+ return _interimFactory.GetIEPCVehicleType();
+ }
+
+ IXmlMultistepTypeWriter IVIFReportInterimFactory.GetExemptedVehicleType()
+ {
+ return _interimFactory.GetExemptedVehicleType();
+ }
+
+ public IReportMultistepCompletedBusOutputGroup GetCompletedBusGeneralParametersGroup()
+ {
+ return _interimFactory.GetCompletedBusGeneralParametersGroup();
+ }
+
+ public IReportMultistepCompletedBusOutputGroup GetCompletedBusParametersGroup()
+ {
+ return _interimFactory.GetCompletedBusParametersGroup();
+ }
+
+ public IReportMultistepCompletedBusOutputGroup GetCompletedBusPassengerCountGroup()
+ {
+ return _interimFactory.GetCompletedBusPassengerCountGroup();
+ }
+
+ public IReportMultistepCompletedBusOutputGroup GetCompletedBusDimensionsGroup()
+ {
+ return _interimFactory.GetCompletedBusDimensionsGroup();
+ }
+
+ public IReportMultistepCompletedBusTypeWriter GetInterimConventionalAuxiliariesType()
+ {
+ return _interimFactory.GetInterimConventionalAuxiliariesType();
+ }
+
+ public IReportMultistepCompletedBusTypeWriter GetInterimxEVAuxiliariesType()
+ {
+ return _interimFactory.GetInterimxEVAuxiliariesType();
+ }
+
+ public IVIFFAdasType GetConventionalInterimADASType()
+ {
+ return _interimFactory.GetConventionalInterimADASType();
+ }
+
+ public IVIFFAdasType GetHEVInterimADASType()
+ {
+ return _interimFactory.GetHEVInterimADASType();
+ }
+
+ public IVIFFAdasType GetPEVInterimADASType()
+ {
+ return _interimFactory.GetPEVInterimADASType();
+ }
+
+ public IVIFFAdasType GetIEPCInterimADASType()
+ {
+ return _interimFactory.GetIEPCInterimADASType();
+ }
+
+ public IReportMultistepCompletedBusTypeWriter GetConventionalInterimComponentsType()
+ {
+ return _interimFactory.GetConventionalInterimComponentsType();
+ }
+
+ public IReportMultistepCompletedBusTypeWriter GetxEVInterimComponentsType()
+ {
+ return _interimFactory.GetxEVInterimComponentsType();
+ }
+
+ public IReportMultistepCompletedBusTypeWriter GetInterimAirdragType()
+ {
+ return _interimFactory.GetInterimAirdragType();
+ }
+
+ public IXmlTypeWriter GetConventionalVehicleType()
+ {
+ return _vifReportFactoryImplementation.GetConventionalVehicleType();
+ }
+
+ public IXmlTypeWriter GetHevIepcSVehicleType()
+ {
+ return _vifReportFactoryImplementation.GetHevIepcSVehicleType();
+ }
+
+ public IXmlTypeWriter GetHevPxVehicleType()
+ {
+ return _vifReportFactoryImplementation.GetHevPxVehicleType();
+ }
+
+ public IXmlTypeWriter GetHevS2VehicleType()
+ {
+ return _vifReportFactoryImplementation.GetHevS2VehicleType();
+ }
+
+ public IXmlTypeWriter GetHevS3VehicleType()
+ {
+ return _vifReportFactoryImplementation.GetHevS3VehicleType();
+ }
+
+ public IXmlTypeWriter GetHevS4VehicleType()
+ {
+ return _vifReportFactoryImplementation.GetHevS4VehicleType();
+ }
+
+ public IXmlTypeWriter GetIepcVehicleType()
+ {
+ return _vifReportFactoryImplementation.GetIepcVehicleType();
+ }
+
+ public IXmlTypeWriter GetPevE2VehicleType()
+ {
+ return _vifReportFactoryImplementation.GetPevE2VehicleType();
+ }
+
+ public IXmlTypeWriter GetPevE3VehicleType()
+ {
+ return _vifReportFactoryImplementation.GetPevE3VehicleType();
+ }
+
+ public IXmlTypeWriter GetPevE4VehicleType()
+ {
+ return _vifReportFactoryImplementation.GetPevE4VehicleType();
+ }
+
+ public IXmlTypeWriter GetPevIEPCVehicleType()
+ {
+ return _vifReportFactoryImplementation.GetPevIEPCVehicleType();
+ }
+
+ public IXmlTypeWriter GetExemptedVehicleType()
+ {
+ return _vifReportFactoryImplementation.GetExemptedVehicleType();
+ }
+
+ public IXmlTypeWriter GetConventionalComponentType()
+ {
+ return _vifReportFactoryImplementation.GetConventionalComponentType();
+ }
+
+ public IXmlTypeWriter GetHevIepcSComponentVIFType()
+ {
+ return _vifReportFactoryImplementation.GetHevIepcSComponentVIFType();
+ }
+
+ public IXmlTypeWriter GetHevPxComponentVIFType()
+ {
+ return _vifReportFactoryImplementation.GetHevPxComponentVIFType();
+ }
+
+ public IXmlTypeWriter GetHevS2ComponentVIFType()
+ {
+ return _vifReportFactoryImplementation.GetHevS2ComponentVIFType();
+ }
+
+ public IXmlTypeWriter GetHevS3ComponentVIFType()
+ {
+ return _vifReportFactoryImplementation.GetHevS3ComponentVIFType();
+ }
+
+ public IXmlTypeWriter GetHevS4ComponentVIFType()
+ {
+ return _vifReportFactoryImplementation.GetHevS4ComponentVIFType();
+ }
+
+ public IXmlTypeWriter GetPevE2ComponentVIFType()
+ {
+ return _vifReportFactoryImplementation.GetPevE2ComponentVIFType();
+ }
+
+ public IXmlTypeWriter GetPevE3ComponentVIFType()
+ {
+ return _vifReportFactoryImplementation.GetPevE3ComponentVIFType();
+ }
+
+ public IXmlTypeWriter GetPevE4ComponentVIFType()
+ {
+ return _vifReportFactoryImplementation.GetPevE4ComponentVIFType();
+ }
+
+ public IXmlTypeWriter GetPevIEPCComponentVIFType()
+ {
+ return _vifReportFactoryImplementation.GetPevIEPCComponentVIFType();
+ }
+
+ public IVIFFAdasType GetConventionalADASType()
+ {
+ return _vifReportFactoryImplementation.GetConventionalADASType();
+ }
+
+ public IVIFFAdasType GetHEVADASType()
+ {
+ return _vifReportFactoryImplementation.GetHEVADASType();
+ }
+
+ public IVIFFAdasType GetPEVADASType()
+ {
+ return _vifReportFactoryImplementation.GetPEVADASType();
+ }
+
+ public IVIFFAdasType GetIEPCADASType()
+ {
+ return _vifReportFactoryImplementation.GetIEPCADASType();
+ }
+
+ public IXmlTypeWriter GetTorqueConvertType()
+ {
+ return _vifReportFactoryImplementation.GetTorqueConvertType();
+ }
+
+ public IXmlTypeWriter GetIepcType()
+ {
+ return _vifReportFactoryImplementation.GetIepcType();
+ }
+
+ public IXmlTypeWriter GetTorqueLimitsType()
+ {
+ return _vifReportFactoryImplementation.GetTorqueLimitsType();
+ }
+
+ public IXmlTypeWriter GetTransmissionType()
+ {
+ return _vifReportFactoryImplementation.GetTransmissionType();
+ }
+
+ public IReportOutputGroup GetConventionalVehicleGroup()
+ {
+ return _vifReportFactoryImplementation.GetConventionalVehicleGroup();
+ }
+
+ public IReportOutputGroup GetPrimaryBusGeneralParameterGroup()
+ {
+ return _vifReportFactoryImplementation.GetPrimaryBusGeneralParameterGroup();
+ }
+
+ public IReportOutputGroup GetPrimaryBusChassisParameterGroup()
+ {
+ throw new NotImplementedException();
+ }
+
+ public IReportOutputGroup GetPrimaryBusRetarderParameterGroup()
+ {
+ return _vifReportFactoryImplementation.GetPrimaryBusRetarderParameterGroup();
+ }
+
+ public IReportOutputGroup GetPrimaryBusXevParameterGroup()
+ {
+ return _vifReportFactoryImplementation.GetPrimaryBusXevParameterGroup();
+ }
+
+ public IReportOutputGroup GetHevIepcSVehicleParameterGroup()
+ {
+ return _vifReportFactoryImplementation.GetHevIepcSVehicleParameterGroup();
+ }
+
+ public IReportOutputGroup GetHevSxVehicleParameterGroup()
+ {
+ return _vifReportFactoryImplementation.GetHevSxVehicleParameterGroup();
+ }
+
+ public IReportOutputGroup GetIepcVehicleParameterGroup()
+ {
+ return _vifReportFactoryImplementation.GetIepcVehicleParameterGroup();
+ }
+
+ public IReportOutputGroup GetPevExVehicleParmeterGroup()
+ {
+ return _vifReportFactoryImplementation.GetPevExVehicleParmeterGroup();
+ }
+
+ public IReportOutputGroup GetPevIEPCVehicleParmeterGroup()
+ {
+ return _vifReportFactoryImplementation.GetPevIEPCVehicleParmeterGroup();
+ }
+
+ public IReportOutputGroup GetHevPxVehicleParameterGroup()
+ {
+ return _vifReportFactoryImplementation.GetHevPxVehicleParameterGroup();
+ }
+
+ public IReportOutputGroup GetExemptedVehicleParameterGroup()
+ {
+ return _vifReportFactoryImplementation.GetExemptedVehicleParameterGroup();
+ }
+
+ public IXmlTypeWriter GetAngelDriveType()
+ {
+ return _vifReportFactoryImplementation.GetAngelDriveType();
+ }
+
+ public IXmlTypeWriter GetRetarderType()
+ {
+ return _vifReportFactoryImplementation.GetRetarderType();
+ }
+
+ public IXmlTypeWriter GetAuxiliaryType()
+ {
+ return _vifReportFactoryImplementation.GetAuxiliaryType();
+ }
+
+ public IXmlTypeWriter GetAuxiliaryHevSType()
+ {
+ return _vifReportFactoryImplementation.GetAuxiliaryHevSType();
+ }
+
+ public IXmlTypeWriter GetAuxiliaryIEPC_SType()
+ {
+ return _vifReportFactoryImplementation.GetAuxiliaryIEPC_SType();
+ }
+
+ public IXmlTypeWriter GetAuxiliaryHevPType()
+ {
+ return _vifReportFactoryImplementation.GetAuxiliaryHevPType();
+ }
+
+ public IXmlTypeWriter GetAuxiliaryIEPCType()
+ {
+ return _vifReportFactoryImplementation.GetAuxiliaryIEPCType();
+ }
+
+ public IXmlTypeWriter GetAuxiliaryPEVType()
+ {
+ return _vifReportFactoryImplementation.GetAuxiliaryPEVType();
+ }
+
+ public IXmlTypeWriter GetAxlegearType()
+ {
+ return _vifReportFactoryImplementation.GetAxlegearType();
+ }
+
+ public IXmlTypeWriter GetAxleWheelsType()
+ {
+ return _vifReportFactoryImplementation.GetAxleWheelsType();
+ }
+
+ public IXmlTypeWriter GetBoostingLimitationsType()
+ {
+ return _vifReportFactoryImplementation.GetBoostingLimitationsType();
+ }
+
+ public IXmlTypeWriter GetElectricEnergyStorageType()
+ {
+ return _vifReportFactoryImplementation.GetElectricEnergyStorageType();
+ }
+
+ public IXmlTypeWriter GetElectricMachineGENType()
+ {
+ return _vifReportFactoryImplementation.GetElectricMachineGENType();
+ }
+
+ public IXmlElectricMachineSystemType GetElectricMachineSystemType()
+ {
+ return _vifReportFactoryImplementation.GetElectricMachineSystemType();
+ }
+
+ public IXmlTypeWriter GetElectricMachineType()
+ {
+ return _vifReportFactoryImplementation.GetElectricMachineType();
+ }
+
+ public IXmlTypeWriter GetElectricMotorTorqueLimitsType()
+ {
+ return _vifReportFactoryImplementation.GetElectricMotorTorqueLimitsType();
+ }
+
+ public IXmlTypeWriter GetEngineType()
+ {
+ return _vifReportFactoryImplementation.GetEngineType();
+ }
+
+ #endregion
+ }
+
}
}
diff --git a/VectoMockup/VectoMockup/Reports/MockupCustomerReport.cs b/VectoMockup/VectoMockup/Reports/MockupCustomerReport.cs
index fab9897b4d67bbd131eedb6275bf05d6ef90045d..01e0401739d9829d804fec28e58c2377a2fcfdf0 100644
--- a/VectoMockup/VectoMockup/Reports/MockupCustomerReport.cs
+++ b/VectoMockup/VectoMockup/Reports/MockupCustomerReport.cs
@@ -16,7 +16,7 @@ namespace TUGraz.VectoMockup.Reports
{
private readonly bool _exempted;
private readonly AbstractCustomerReport _originalCustomerReport;
- private XNamespace Cif = AbstractCustomerReport.Cif;
+ private XNamespace Cif = AbstractCustomerReport.Cif_0_9;
public MockupCustomerReport(IXMLCustomerReport originalReport, bool exempted)
{
_exempted = exempted;
diff --git a/VectoMockup/VectoMockup/Reports/MockupManufacturerReport.cs b/VectoMockup/VectoMockup/Reports/MockupManufacturerReport.cs
index 46309a05351f0b7452576c19659e4a1721127034..59a519252b73dc6dc0c79611ef018c4dad6c51d2 100644
--- a/VectoMockup/VectoMockup/Reports/MockupManufacturerReport.cs
+++ b/VectoMockup/VectoMockup/Reports/MockupManufacturerReport.cs
@@ -2,6 +2,7 @@
using System.Linq;
using System.Xml.Linq;
using System.Xml.XPath;
+using TUGraz.VectoCommon.BusAuxiliaries;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCore.Models.Declaration;
@@ -18,7 +19,7 @@ namespace TUGraz.VectoMockup.Reports
private AbstractManufacturerReport _ixmlManufacturerReportImplementation;
private VectoRunData _modelData;
- private XNamespace Mrf = AbstractManufacturerReport.Mrf;
+ private XNamespace Mrf = AbstractManufacturerReport.Mrf_0_9;
private readonly string _outputData;
private XElement Results { get; set; }
public MockupManufacturerReport(IXMLManufacturerReport originalManufacturerReport, bool exempted)
@@ -35,8 +36,6 @@ namespace TUGraz.VectoMockup.Reports
Results.Add(MockupResultReader.GetMRFMockupResult(_outputData, resultValue, Mrf + "Result", _modelData));
-
-
}
public void WriteMockupSummary(XMLDeclarationReport.ResultEntry resultValue)
diff --git a/VectoMockup/VectoMockup/Reports/MockupReportFactory.cs b/VectoMockup/VectoMockup/Reports/MockupReportFactory.cs
index 28e605c86756ae6f5f644ea9da4a6f41e82f1435..7d35d9451f2a52e0e790076380920d5526e2f7fd 100644
--- a/VectoMockup/VectoMockup/Reports/MockupReportFactory.cs
+++ b/VectoMockup/VectoMockup/Reports/MockupReportFactory.cs
@@ -1,8 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
@@ -10,28 +6,39 @@ using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.OutputData.XML;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1;
+
namespace TUGraz.VectoMockup.Reports
{
class MockupReportFactory : IXMLDeclarationReportFactory, IMockupDeclarationReportFactory
{
+
private readonly IManufacturerReportFactory _mrfFactory;
private readonly ICustomerInformationFileFactory _cifFactory;
+ private readonly IVIFReportFactory _vifFactory;
+ private readonly IVIFReportInterimFactory _interimFactory;
- #region Implementation of IXMLDeclarationReportFactory
+ #region Implementation of IXMLDeclarationReportFactory
- public MockupReportFactory(IManufacturerReportFactory mrfFactory, ICustomerInformationFileFactory cifFactory)
+ public MockupReportFactory(IManufacturerReportFactory mrfFactory, ICustomerInformationFileFactory cifFactory,
+ IVIFReportFactory vifFactory, IVIFReportInterimFactory interimFactory)
{
_mrfFactory = mrfFactory;
_cifFactory = cifFactory;
- }
+ _vifFactory = vifFactory;
+ _interimFactory = interimFactory;
+ }
+
+
+
public IDeclarationReport CreateReport(IInputDataProvider input, IOutputDataWriter outputWriter)
- {
+ {
switch (input)
{
- case IMultistageBusInputDataProvider multistageBusInputDataProvider:
+ case IMultistepBusInputDataProvider multistageBusInputDataProvider:
break;
case ISingleBusInputDataProvider singleBusInputDataProvider:
return new XMLDeclarationReport(outputWriter);
@@ -69,15 +76,17 @@ namespace TUGraz.VectoMockup.Reports
{
if (multistageVifInputData.VehicleInputData == null)
{
- var reportCompleted = new XMLDeclarationMockupReportCompletedVehicle(outputDataWriter, _mrfFactory, _cifFactory, true)
+ var reportCompleted = new XMLDeclarationMockupReportCompletedVehicle(outputDataWriter, _mrfFactory, _cifFactory, _vifFactory,
+ multistageVifInputData.MultistageJobInputData.JobInputData.PrimaryVehicle.Vehicle.ExemptedVehicle)
{
PrimaryVehicleReportInputData = multistageVifInputData.MultistageJobInputData.JobInputData.PrimaryVehicle,
};
return reportCompleted;
}
else {
- //throw new NotImplementedException();
- var report = new XMLDeclarationReportMultistageBusVehicle(outputDataWriter);
+
+ var report = new XMLDeclarationMockupReportInterimVehicle(outputDataWriter, _mrfFactory, _cifFactory, _vifFactory, _interimFactory,
+ multistageVifInputData.MultistageJobInputData.JobInputData.PrimaryVehicle.Vehicle.ExemptedVehicle);
return report;
}
}
@@ -97,17 +106,13 @@ namespace TUGraz.VectoMockup.Reports
{
case VehicleCategory.HeavyBusCompletedVehicle:
throw new NotImplementedException();
- return new XMLDeclarationReportCompletedVehicle(outputDataWriter,
- declarationInputDataProvider.JobInputData.Vehicle.VehicleCategory ==
- VehicleCategory.HeavyBusPrimaryVehicle)
+ return new XMLDeclarationReportCompletedVehicle(outputDataWriter)
{
PrimaryVehicleReportInputData = declarationInputDataProvider.PrimaryVehicleData,
};
case VehicleCategory.HeavyBusPrimaryVehicle:
- return new XMLDeclarationMockupPrimaryReport(outputDataWriter, _mrfFactory, _cifFactory,
- declarationInputDataProvider.JobInputData.Vehicle.ExemptedVehicle,
- declarationInputDataProvider.JobInputData.Vehicle.VehicleCategory ==
- VehicleCategory.HeavyBusPrimaryVehicle);
+ return new XMLDeclarationMockupPrimaryReport(outputDataWriter, _mrfFactory, _cifFactory, _vifFactory,
+ declarationInputDataProvider.JobInputData.Vehicle.ExemptedVehicle);
default:
break;
@@ -130,12 +135,17 @@ namespace TUGraz.VectoMockup.Reports
public IManufacturerReportFactory MrfFactory => _mrfFactory;
public ICustomerInformationFileFactory CifFactory => _cifFactory;
+ public IVIFReportFactory VifFactory => _vifFactory;
+
#endregion
}
internal interface IMockupDeclarationReportFactory
{
IManufacturerReportFactory MrfFactory { get; }
+
ICustomerInformationFileFactory CifFactory { get; }
+
+ IVIFReportFactory VifFactory { get; }
}
}
diff --git a/VectoMockup/VectoMockup/Reports/MockupVIFReport.cs b/VectoMockup/VectoMockup/Reports/MockupVIFReport.cs
new file mode 100644
index 0000000000000000000000000000000000000000..2c244ecb98da19152005ec297a597928e5cac9d6
--- /dev/null
+++ b/VectoMockup/VectoMockup/Reports/MockupVIFReport.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.OutputData.XML;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile;
+
+namespace TUGraz.VectoMockup.Reports
+{
+ public class MockupVehicleInformationFile : IXMLVehicleInformationFile, IXMLMockupReport
+ {
+ private XDocument _report;
+ private XNamespace _tns;
+
+
+ public MockupVehicleInformationFile(IXMLVehicleInformationFile vehicleInformationFile)
+ {
+
+ }
+
+
+
+ //private XDocument _report;
+ //private VectoRunData _modelData;
+
+
+ //#region Implementation of IXMLMockupReport
+
+ //public void WriteMockupResult(XMLDeclarationReport.ResultEntry resultValue)
+ //{
+ // throw new NotImplementedException();
+ //}
+
+ //public void WriteMockupSummary(XMLDeclarationReport.ResultEntry resultValue)
+ //{
+ // throw new NotImplementedException();
+ //}
+
+ //#endregion
+
+ //#region Implementation of IXMLMultistageReport
+
+ //public void Initialize(VectoRunData modelData)
+ //{
+ // _modelData = modelData;
+ //}
+
+ //public XDocument Report => _report;
+
+ //public void GenerateReport()
+ //{
+ // throw new NotImplementedException();
+ //}
+
+ //#endregion
+
+ #region Implementation of IXMLPrimaryVehicleReport
+
+ public void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void WriteResult(XMLDeclarationReport.ResultEntry result)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void GenerateReport(XElement fullReportHash)
+ {
+ throw new NotImplementedException();
+ }
+
+ public XDocument Report => _report;
+
+ public XNamespace Tns => _tns;
+
+ #endregion
+
+ #region Implementation of IXMLMockupReport
+
+ public void WriteMockupResult(XMLDeclarationReport.ResultEntry resultValue)
+ {
+
+ }
+
+ public void WriteMockupSummary(XMLDeclarationReport.ResultEntry resultValue)
+ {
+ }
+
+ public void WriteExemptedResults()
+ {
+ throw new NotImplementedException();
+ }
+
+ #endregion
+ }
+}
diff --git a/VectoMockup/VectoMockup/Reports/MockupPrimaryReport.cs b/VectoMockup/VectoMockup/Reports/MockupVehicleInformationFile.cs
similarity index 51%
rename from VectoMockup/VectoMockup/Reports/MockupPrimaryReport.cs
rename to VectoMockup/VectoMockup/Reports/MockupVehicleInformationFile.cs
index 508f3a13e3cbcbf42ffd6307c1c94d09560a0565..a56c59829de05227ce8012621a1a42a221f1e85a 100644
--- a/VectoMockup/VectoMockup/Reports/MockupPrimaryReport.cs
+++ b/VectoMockup/VectoMockup/Reports/MockupVehicleInformationFile.cs
@@ -15,17 +15,63 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile;
namespace TUGraz.VectoMockup.Reports
{
- internal class MockupPrimaryReport : IXMLPrimaryVehicleReport, IXMLMockupReport
+ internal class MockupInterimVehicleInformationFile : IXMLMultistepIntermediateReport, IXMLMockupReport
+ {
+ private readonly IXMLMultistepIntermediateReport _intermediateVifImplementation;
+
+ public MockupInterimVehicleInformationFile(IXMLMultistepIntermediateReport vifImplementation)
+ {
+ _intermediateVifImplementation = vifImplementation;
+ }
+
+ #region Implementation of IXMLMultistepIntermediateReport
+
+ public void Initialize(VectoRunData modelData)
+ {
+ _intermediateVifImplementation.Initialize(modelData);
+ }
+
+ public XDocument Report => _intermediateVifImplementation.Report;
+
+ public void GenerateReport()
+ {
+ _intermediateVifImplementation.GenerateReport();
+ }
+
+ #endregion
+
+ #region Implementation of IXMLMockupReport
+
+ public void WriteMockupResult(XMLDeclarationReport.ResultEntry resultValue)
+ {
+
+ }
+
+ public void WriteMockupSummary(XMLDeclarationReport.ResultEntry resultValue)
+ {
+
+ }
+
+ public void WriteExemptedResults()
+ {
+
+ }
+
+ #endregion
+ }
+
+
+ internal class MockupPrimaryVehicleInformationFile : IXMLVehicleInformationFile, IXMLMockupReport
{
- private readonly IXMLPrimaryVehicleReport _primaryVehicleReportImplementation;
+ private readonly IXMLVehicleInformationFile _vehicleInformationFileImplementation;
private VectoRunData _modelData;
private XElement Results;
- public MockupPrimaryReport(IXMLPrimaryVehicleReport primaryVehicleReportImplementation)
+ public MockupPrimaryVehicleInformationFile(IXMLVehicleInformationFile vehicleInformationFileImplementation)
{
- _primaryVehicleReportImplementation = primaryVehicleReportImplementation;
- Results = new XElement(_primaryVehicleReportImplementation.Tns + XMLNames.Report_Results);
+ _vehicleInformationFileImplementation = vehicleInformationFileImplementation;
+ Results = new XElement(_vehicleInformationFileImplementation.Tns + XMLNames.Report_Results);
}
@@ -33,16 +79,16 @@ namespace TUGraz.VectoMockup.Reports
public void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
- _primaryVehicleReportImplementation.Initialize(modelData, fuelModes);
+ _vehicleInformationFileImplementation.Initialize(modelData, fuelModes);
_modelData = modelData;
}
public void WriteResult(XMLDeclarationReport.ResultEntry result)
{
- _primaryVehicleReportImplementation.WriteResult(result);
+ _vehicleInformationFileImplementation.WriteResult(result);
}
- public XNamespace Tns => _primaryVehicleReportImplementation.Tns;
+ public XNamespace Tns => _vehicleInformationFileImplementation.Tns;
#endregion
@@ -65,18 +111,18 @@ namespace TUGraz.VectoMockup.Reports
Results.Add(new XElement(Tns + "Status", "success"));
Results.Add(new XElement(Tns + "ExemptedVehicle"));
}
-
+
public void GenerateReport(XElement fullReportHash)
{
- _primaryVehicleReportImplementation.GenerateReport(fullReportHash);
+ _vehicleInformationFileImplementation.GenerateReport(fullReportHash);
}
public XDocument Report
{
get
{
- var report = _primaryVehicleReportImplementation.Report;
+ var report = _vehicleInformationFileImplementation.Report;
var resultsElement = report.XPathSelectElements($"//*[local-name()='{XMLNames.Report_Results}']");
resultsElement.First().ReplaceWith(Results);
return report;
diff --git a/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupPrimaryReport.cs b/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupPrimaryReport.cs
index 6f070edf36b06a0e460b849d6460e280da50950d..be9a19230fac2c216501ae1ee1f2f120676780e5 100644
--- a/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupPrimaryReport.cs
+++ b/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupPrimaryReport.cs
@@ -7,30 +7,30 @@ using TUGraz.VectoCore.OutputData.XML;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1;
namespace TUGraz.VectoMockup.Reports
{
+
+ /// <summary>
+ /// Create MRF and VIF for primary bus
+ /// </summary>
public class XMLDeclarationMockupPrimaryReport : XMLDeclarationReportPrimaryVehicle_09
{
private readonly bool _exempted;
public XMLDeclarationMockupPrimaryReport(IReportWriter writer,
IManufacturerReportFactory mrfFactory,
- ICustomerInformationFileFactory cifFactory, bool exempted,
- bool writePIF = false) : base(writer,
+ ICustomerInformationFileFactory cifFactory,
+ IVIFReportFactory vifFactory,
+ bool exempted) : base(writer,
mrfFactory,
cifFactory,
- writePIF)
+ vifFactory)
{
_exempted = exempted;
}
- protected override void InstantiateReports(VectoRunData modelData)
- {
- base.InstantiateReports(modelData);
- PrimaryReport = new MockupPrimaryReport(PrimaryReport);
- }
-
#region Overrides of XMLDeclarationReportPrimaryVehicle_09
protected override void DoStoreResult(ResultEntry entry, VectoRunData runData, IModalDataContainer modData)
@@ -40,46 +40,28 @@ namespace TUGraz.VectoMockup.Reports
protected override void WriteResult(ResultEntry result)
{
- (ManufacturerRpt as IXMLMockupReport)?.WriteMockupResult(result);
- (PrimaryReport as IXMLMockupReport)?.WriteMockupResult(result);
+ (ManufacturerRpt as IXMLMockupReport).WriteMockupResult(result);
+ (VehicleInformationFile as IXMLMockupReport).WriteMockupResult(result);
}
#endregion
- #region Overrides of XMLDeclarationReportPrimaryVehicle
-
+
protected override void GenerateReports()
{
if (!_exempted) {
- (ManufacturerRpt as IXMLMockupReport)?.WriteMockupSummary(Results.First());
- (PrimaryReport as IXMLMockupReport)?.WriteMockupSummary(Results.First());
+ (ManufacturerRpt as IXMLMockupReport).WriteMockupSummary(Results.First());
+ (VehicleInformationFile as IXMLMockupReport).WriteMockupSummary(Results.First());
} else {
- (ManufacturerRpt as IXMLMockupReport)?.WriteExemptedResults();
- (PrimaryReport as IXMLMockupReport)?.WriteExemptedResults();
+ (ManufacturerRpt as IXMLMockupReport).WriteExemptedResults();
+ (VehicleInformationFile as IXMLMockupReport).WriteExemptedResults();
}
ManufacturerRpt.GenerateReport();
- var fullReportHash = CreateDummySig();
- //CustomerRpt.GenerateReport(fullReportHash);
- PrimaryReport.GenerateReport(fullReportHash);
+ var fullReportHash = GetSignature(ManufacturerRpt.Report);
+ VehicleInformationFile.GenerateReport(fullReportHash);
}
- protected virtual XElement CreateDummySig()
- {
- XNamespace di = "http://www.w3.org/2000/09/xmldsig#";
- return new XElement(
- di + XMLNames.DI_Signature_Reference,
- new XElement(
- di + XMLNames.DI_Signature_Reference_DigestMethod,
- new XAttribute(XMLNames.DI_Signature_Algorithm_Attr, "null")),
- new XElement(di + XMLNames.DI_Signature_Reference_DigestValue, "NOT AVAILABLE")
- );
- }
}
-
-
-
-
- #endregion
}
\ No newline at end of file
diff --git a/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReport.cs b/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReport.cs
index c8bc7ce6c92c7671d740f4ad869cda79063b221c..8625f3474be64a73d13de775ecfbf07e5022e97b 100644
--- a/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReport.cs
+++ b/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReport.cs
@@ -12,7 +12,10 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.Manu
namespace TUGraz.VectoMockup.Reports
{
- internal class XMLDeclarationMockupReport : XMLDeclarationReport09
+ /// <summary>
+ /// Create MRF and CIF for lorries
+ /// </summary>
+ internal class XMLDeclarationMockupReport : XMLDeclarationReport09
{
private readonly bool _exempted;
diff --git a/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReportCompletedVehicle.cs b/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReportCompletedVehicle.cs
index c04214e04370ea4594e4557bded0472bd1fc748a..1e7169b8ad82b4cc41fa7dee3ea1431088c1a1f0 100644
--- a/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReportCompletedVehicle.cs
+++ b/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupReportCompletedVehicle.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using TUGraz.VectoCommon.BusAuxiliaries;
+using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Interfaces;
using TUGraz.VectoCore.Models.Declaration;
@@ -11,94 +13,130 @@ using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.OutputData.XML;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1;
namespace TUGraz.VectoMockup.Reports
{
- public class XMLDeclarationMockupReportCompletedVehicle : XMLDeclarationReportCompletedVehicle
+
+ /// <summary>
+ /// Create VIF of an interim (or the complete(d) step
+ /// </summary>
+ public class XMLDeclarationMockupReportInterimVehicle : XMLDeclarationReportInterimVehicle_09
{
- private readonly IManufacturerReportFactory _mrfFactory;
- private readonly ICustomerInformationFileFactory _cifFactory;
+ private readonly bool _exempted;
- public XMLDeclarationMockupReportCompletedVehicle(IReportWriter writer, IManufacturerReportFactory mrfFactory, ICustomerInformationFileFactory cifFactory, bool writePIF = false) : base(writer,
- writePIF)
+ public XMLDeclarationMockupReportInterimVehicle(IReportWriter writer, IManufacturerReportFactory mrfFactory,
+ ICustomerInformationFileFactory cifFactory, IVIFReportFactory vifFactory, IVIFReportInterimFactory interimFactory, bool exempted) : base(writer,
+ mrfFactory,
+ cifFactory, vifFactory, interimFactory)
{
- _mrfFactory = mrfFactory;
- _cifFactory = cifFactory;
+ _exempted = exempted;
}
+ }
- #region Overrides of XMLDeclarationReportCompletedVehicle
- protected override void InstantiateReports(VectoRunData modelData)
+ /// <summary>
+ /// Create MRF and CIF of the complete(d) step
+ /// </summary>
+ public class XMLDeclarationMockupReportCompletedVehicle : XMLDeclarationReportCompletedVehicle_09
+ {
+ //private readonly IManufacturerReportFactory _mrfFactory;
+ //private readonly ICustomerInformationFileFactory _cifFactory;
+ private readonly bool _exempted;
+ private VectoRunData _modelData;
+
+ public XMLDeclarationMockupReportCompletedVehicle(IReportWriter writer, IManufacturerReportFactory mrfFactory,
+ ICustomerInformationFileFactory cifFactory, IVIFReportFactory vifFactory, bool exempted) : base(writer, mrfFactory, cifFactory, vifFactory)
{
- var inputData = modelData.InputData as IXMLMultistageInputDataProvider;
-
-
- var ihpc = (inputData.JobInputData.PrimaryVehicle.Vehicle.Components.ElectricMachines?.Entries)?.Count(electric => electric.ElectricMachine.IHPCType != "None") > 0;
- var iepc = (inputData.JobInputData.PrimaryVehicle.Vehicle.Components.IEPC != null);
- ManufacturerRpt = _mrfFactory.GetManufacturerReport(
- inputData.JobInputData.ConsolidateManufacturingStage.Vehicle.VehicleCategory,
- inputData.JobInputData.JobType,
- inputData.JobInputData.PrimaryVehicle.Vehicle.ArchitectureID,
- inputData.JobInputData.PrimaryVehicle.Vehicle.ExemptedVehicle,
- iepc,
- ihpc);
- CustomerRpt = _cifFactory.GetCustomerReport(
- inputData.JobInputData.ConsolidateManufacturingStage.Vehicle.VehicleCategory,
- inputData.JobInputData.JobType,
- inputData.JobInputData.PrimaryVehicle.Vehicle.ArchitectureID,
- inputData.JobInputData.PrimaryVehicle.Vehicle.ExemptedVehicle,
- iepc,
- ihpc);
- //base.InstantiateReports(modelData);
+ //_mrfFactory = mrfFactory;
+ //_cifFactory = cifFactory;
+
+ _exempted = exempted;
}
+ #region Overrides of XMLDeclarationReportCompletedVehicle
+
+ //protected override void InstantiateReports(VectoRunData modelData)
+ //{
+ // var inputData = modelData.InputData as IXMLMultistageInputDataProvider;
+ // var primaryVehicle = inputData.JobInputData.PrimaryVehicle.Vehicle;
+
+ // var ihpc = (primaryVehicle.Components?.ElectricMachines?.Entries)?.Count(electric => electric.ElectricMachine.IHPCType != "None") > 0;
+ // var iepc = (primaryVehicle.Components?.IEPC != null);
+ // ManufacturerRpt = _mrfFactory.GetManufacturerReport(
+ // inputData.JobInputData.ConsolidateManufacturingStage.Vehicle.VehicleCategory,
+ // inputData.JobInputData.JobType,
+ // primaryVehicle.ArchitectureID,
+ // primaryVehicle.ExemptedVehicle,
+ // iepc,
+ // ihpc);
+
+ // CustomerRpt = _cifFactory.GetCustomerReport(
+ // inputData.JobInputData.ConsolidateManufacturingStage.Vehicle.VehicleCategory,
+ // inputData.JobInputData.JobType,
+ // primaryVehicle.ArchitectureID,
+ // primaryVehicle.ExemptedVehicle,
+ // iepc,
+ // ihpc);
+
+ //}
+
+ #endregion
+
+ #region Overrides of XMLDeclarationReportCompletedVehicle
+
public override void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
base.InitializeReport(modelData, fuelModes);
+ _modelData = modelData;
}
#endregion
- #region Overrides of XMLDeclarationReport
-
- #region Overrides of XMLDeclarationReportCompletedVehicle
-
protected internal override void DoWriteReport()
- {
- (ManufacturerRpt as IXMLMockupReport).WriteMockupSummary(Results.First());
- (CustomerRpt as IXMLMockupReport).WriteMockupSummary(Results.First());
+ {
+ foreach (var result in OrderedResults) {
+ WriteResult(result);
+ }
+
GenerateReports();
- if (Writer != null)
- {
+
+ if (Writer != null) {
OutputReports();
}
}
- #endregion
-
- protected override void DoStoreResult(ResultEntry entry, VectoRunData runData, IModalDataContainer modData)
+ protected override void DoStoreResult(ResultEntry entry, VectoRunData runData, IModalDataContainer modData)
{
- base.DoStoreResult(entry, runData, modData);
+
}
protected override void WriteResult(ResultEntry result)
{
+ if (_modelData.InputData is IMultistepBusInputDataProvider multistageInput) {
+ var primaryResult = multistageInput.JobInputData.PrimaryVehicle.ResultsInputData.Results.FirstOrDefault();
+ var tankSystem = multistageInput.JobInputData.ConsolidateManufacturingStage.Vehicle.TankSystem;
+ result.FuelData = primaryResult.EnergyConsumption.Keys
+ .Select(x => DeclarationData.FuelData.Lookup(x, tankSystem)).Cast<IFuelProperties>().ToList();
+ }
(ManufacturerRpt as IXMLMockupReport).WriteMockupResult(result);
(CustomerRpt as IXMLMockupReport).WriteMockupResult(result);
}
protected override void GenerateReports()
{
- base.GenerateReports();
- }
+ if (!_exempted) {
+ (ManufacturerRpt as IXMLMockupReport).WriteMockupSummary(Results.First());
+ (CustomerRpt as IXMLMockupReport).WriteMockupSummary(Results.First());
+ } else {
+ (ManufacturerRpt as IXMLMockupReport).WriteExemptedResults();
+ (CustomerRpt as IXMLMockupReport).WriteExemptedResults();
+ }
- protected override void OutputReports()
- {
- base.OutputReports();
- }
+ base.GenerateReports();
+ }
- #endregion
}
}
diff --git a/VectoMockup/VectoMockup/Simulation/RundataFactories/CompletedBusRunDataFactory.cs b/VectoMockup/VectoMockup/Simulation/RundataFactories/CompletedBusRunDataFactory.cs
index d09f52d067e5ef4b94668cf6cc1ddd4691553b22..7161fc9579b3d10c2cb120312dec81554615c79d 100644
--- a/VectoMockup/VectoMockup/Simulation/RundataFactories/CompletedBusRunDataFactory.cs
+++ b/VectoMockup/VectoMockup/Simulation/RundataFactories/CompletedBusRunDataFactory.cs
@@ -17,7 +17,7 @@ namespace TUGraz.VectoMockup.Simulation.RundataFactories
{
internal class MockupMultistageCompletedBusRunDataFactory : DeclarationModeCompletedMultistageBusVectoRunDataFactory
{
- public MockupMultistageCompletedBusRunDataFactory(IMultistageBusInputDataProvider dataProvider,
+ public MockupMultistageCompletedBusRunDataFactory(IMultistepBusInputDataProvider dataProvider,
IDeclarationReport report) : base(dataProvider, report)
{
@@ -63,31 +63,33 @@ namespace TUGraz.VectoMockup.Simulation.RundataFactories
ExecutionMode = ExecutionMode.Declaration,
JobName = InputDataProvider.JobInputData.ManufacturingStages.Last().Vehicle.Identifier,
Report = Report,
- //Aux = PrimaryBusMockupRunDataFactory.CreateMockupBusAux(CompletedVehicle),
+ //Aux = PrimaryBusMockupRunDataFactory.CreateMockupBusAux(CompletedVehicle),
- // //AirdragData = DataAdapterSpecific.CreateAirdragData(CompletedVehicle, mission),
- // //EngineData = DataAdapterSpecific.CreateEngineData(PrimaryVehicle, modeIdx, mission),
- // //ElectricMachinesData = new List<Tuple<PowertrainPosition, ElectricMotorData>>(),
- // //GearboxData = _gearboxData,
- // //AxleGearData = _axlegearData,
- // //AngledriveData = _angledriveData,
- // Aux = DataAdapterSpecific.CreateAuxiliaryData(PrimaryVehicle.Components.AuxiliaryInputData,
- // PrimaryVehicle.Components.BusAuxiliaries, mission.MissionType, _segmentCompletedBus.VehicleClass, CompletedVehicle.Length,
- // PrimaryVehicle.Components.AxleWheels.NumSteeredAxles),
- //Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()),
- //Retarder = _retarderData,
- ////DriverData = _driverData,
- //ExecutionMode = ExecutionMode.Declaration,
- //JobName = InputDataProvider.JobInputData.ManufacturingStages.Last().Vehicle.Identifier,//?!? Jobname
- //ModFileSuffix = $"_{_segmentCompletedBus.VehicleClass.GetClassNumber()}-Specific_{loading.Key}",
- //Report = Report,
- //Mission = mission,
- //InputDataHash = InputDataProvider.XMLHash,// right hash?!?
- //SimulationType = SimulationType.DistanceCycle,
- //VehicleDesignSpeed = _segmentCompletedBus.DesignSpeed,
- //GearshiftParameters = _gearshiftData,
- };
- simulationRunData.EngineData.FuelMode = 0;
+ // //AirdragData = DataAdapterSpecific.CreateAirdragData(CompletedVehicle, mission),
+ // //EngineData = DataAdapterSpecific.CreateEngineData(PrimaryVehicle, modeIdx, mission),
+ // //ElectricMachinesData = new List<Tuple<PowertrainPosition, ElectricMotorData>>(),
+ // //GearboxData = _gearboxData,
+ // //AxleGearData = _axlegearData,
+ // //AngledriveData = _angledriveData,
+ // Aux = DataAdapterSpecific.CreateAuxiliaryData(PrimaryVehicle.Components.AuxiliaryInputData,
+ // PrimaryVehicle.Components.BusAuxiliaries, mission.MissionType, _segmentCompletedBus.VehicleClass, CompletedVehicle.Length,
+ // PrimaryVehicle.Components.AxleWheels.NumSteeredAxles),
+ //Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()),
+ //Retarder = _retarderData,
+ ////DriverData = _driverData,
+ //ExecutionMode = ExecutionMode.Declaration,
+ //JobName = InputDataProvider.JobInputData.ManufacturingStages.Last().Vehicle.Identifier,//?!? Jobname
+ ModFileSuffix = $"_{_segmentCompletedBus.VehicleClass.GetClassNumber()}-Specific_{loading.Key}",
+ //Report = Report,
+ //Mission = mission,
+ //InputDataHash = InputDataProvider.XMLHash,// right hash?!?
+ //SimulationType = SimulationType.DistanceCycle,
+ //VehicleDesignSpeed = _segmentCompletedBus.DesignSpeed,
+ //GearshiftParameters = _gearshiftData,
+ };
+ if (simulationRunData.EngineData != null) {
+ simulationRunData.EngineData.FuelMode = 0;
+ }
simulationRunData.VehicleData.VehicleClass = _segmentCompletedBus.VehicleClass;
simulationRunData.BusAuxiliaries = DataAdapterSpecific.CreateBusAuxiliariesData(mission, PrimaryVehicle, CompletedVehicle, simulationRunData);
@@ -101,15 +103,18 @@ namespace TUGraz.VectoMockup.Simulation.RundataFactories
var cycle = DeclarationData.CyclesCache.GetOrAdd(mission.MissionType, _ => DrivingCycleDataReader.ReadFromStream(mission.CycleFile, CycleType.DistanceBased, "", false));
return new VectoRunData() {
Mission = mission,
+ Loading = loading.Key,
VehicleData = new VehicleData() {
Loading = loading.Value.Item1,
},
+ EngineData = PrimaryBusMockupRunDataFactory.CreateMockupEngineData(PrimaryVehicle, modeIdx, CompletedVehicle.TankSystem),
JobName = InputDataProvider.JobInputData.ManufacturingStages.Last().Vehicle.Identifier,
ExecutionMode = ExecutionMode.Declaration,
SimulationType = SimulationType.DistanceCycle,
Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()),
Report = Report,
+ ModFileSuffix = $"_{_segmentCompletedBus.VehicleClass.GetClassNumber()}-Generic_{loading.Key}",
};
return base.CreateVectoRunDataGeneric(mission, loading, primarySegment, modeIdx);
}
diff --git a/VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs b/VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs
index 09f063d502869f0e63a73630b0c4cae66b9a99d4..d95245224de65e40ab8950e7d09052fcd64f1970 100644
--- a/VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs
+++ b/VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs
@@ -107,7 +107,7 @@ namespace TUGraz.VectoMockup.Simulation.RundataFactories
AngledriveData = CreateMockupAngleDriveData(vehicle),
EngineData = CreateMockupEngineData(vehicle, modeIdx),
BusAuxiliaries = CreateMockupBusAux(vehicle),
-
+ InputDataHash = InputDataProvider.XMLHash,
};
}
diff --git a/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupFollowUpSimulatorFactoryCreator.cs b/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupFollowUpSimulatorFactoryCreator.cs
index 40f5aeccd5cef068a8c0de6bd47553c5bc818672..e391adfd712cf147a8bc4496d6f8e08eb9842637 100644
--- a/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupFollowUpSimulatorFactoryCreator.cs
+++ b/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupFollowUpSimulatorFactoryCreator.cs
@@ -6,6 +6,7 @@ using TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1;
using TUGraz.VectoMockup.Reports;
namespace TUGraz.VectoMockup.Simulation.SimulatorFactory
@@ -18,12 +19,13 @@ namespace TUGraz.VectoMockup.Simulation.SimulatorFactory
ISimulatorFactoryFactory simFactoryFactory,
IManufacturerReportFactory mrfFactory,
ICustomerInformationFileFactory cifFactory,
+ IVIFReportFactory vifFactory,
IXMLInputDataReader inputDataReader, bool validate) :
base(originalStageInputData, originalReportWriter, originalDeclarationReport, simFactoryFactory,
inputDataReader, validate)
{
_currentStageDeclarationReport =
- new XMLDeclarationMockupPrimaryReport(_currentStageOutputDataWriter, mrfFactory, cifFactory, originalStageInputData.StageInputData.ExemptedVehicle,true);
+ new XMLDeclarationMockupPrimaryReport(_currentStageOutputDataWriter, mrfFactory, cifFactory, vifFactory, originalStageInputData.StageInputData.ExemptedVehicle);
}
#region Overrides of InterimAfterPrimaryFactoryCreator
diff --git a/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs b/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
index 0ef5b2f1825bd323755c9c47d71b05ee7c5ad77b..90fb473ab9f05bfa336bcb2670d8c783fd8ec312 100644
--- a/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
+++ b/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
@@ -33,7 +33,7 @@ namespace TUGraz.VectoMockup.Simulation.SimulatorFactory
{
private void CheckInputData(IInputDataProvider dataProvider)
{
- if (dataProvider is JSONFile json && !(dataProvider is JSONInputDataV10_PrimaryAndStageInputBus)) {
+ if (dataProvider is JSONFile json && !(dataProvider is JSONInputDataV10_PrimaryAndStageInputBus || dataProvider is JSONInputDataCompletedBusFactorMethodV7)) {
throw new VectoException($"JSON input data is not supported in Mockup Vecto");
}
}
@@ -121,6 +121,7 @@ namespace TUGraz.VectoMockup.Simulation.SimulatorFactory
_simFactoryFactory,
((IMockupDeclarationReportFactory)_xmlDeclarationReportFactory).MrfFactory,
((IMockupDeclarationReportFactory)_xmlDeclarationReportFactory).CifFactory,
+ ((IMockupDeclarationReportFactory)_xmlDeclarationReportFactory).VifFactory,
_xmlInputDataReader,
Validate);
case IMultistageVIFInputData multistageVifInputData:
diff --git a/VectoMockup/VectoMockup/VectoMockup.csproj b/VectoMockup/VectoMockup/VectoMockup.csproj
index a9ac9de719c3892d1b3fc6fa7df62b60ff8b79cd..088fd9e2a4f2b63425b431511507730c12214250 100644
--- a/VectoMockup/VectoMockup/VectoMockup.csproj
+++ b/VectoMockup/VectoMockup/VectoMockup.csproj
@@ -34,6 +34,9 @@
<None Remove="MockupResults\MRF_MockupResults_PEV_Bus.xml" />
<None Remove="MockupResults\MRF_MockupResults_PEV_Lorry.xml" />
<None Remove="MockupResults\VIF_MockupResults_Conv_Bus.xml" />
+ <None Remove="MockupResults\VIF_MockupResults_non-OVC-HEV_Bus.xml" />
+ <None Remove="MockupResults\VIF_MockupResults_OVC-HEV_Bus.xml" />
+ <None Remove="MockupResults\VIF_MockupResults_PEV_Bus.xml" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="MockupResults\CIF_MockupResults_Conv_Bus.xml" />
@@ -54,6 +57,9 @@
<EmbeddedResource Include="MockupResults\MRF_MockupResults_PEV_Bus.xml" />
<EmbeddedResource Include="MockupResults\MRF_MockupResults_PEV_Lorry.xml" />
<EmbeddedResource Include="MockupResults\VIF_MockupResults_Conv_Bus.xml" />
+ <EmbeddedResource Include="MockupResults\VIF_MockupResults_non-OVC-HEV_Bus.xml" />
+ <EmbeddedResource Include="MockupResults\VIF_MockupResults_OVC-HEV_Bus.xml" />
+ <EmbeddedResource Include="MockupResults\VIF_MockupResults_PEV_Bus.xml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\VectoCore\VectoCore\VectoCore.csproj" />
diff --git a/VectoMockup/VectoMockupTest/MockUpVectoTest.cs b/VectoMockup/VectoMockupTest/MockUpVectoTest.cs
index 70ee3f8c60b88ad9cd5dc52149d7f94793c23589..cd417f67f78f1c95728e1cfe8b4dba978c25bd04 100644
--- a/VectoMockup/VectoMockupTest/MockUpVectoTest.cs
+++ b/VectoMockup/VectoMockupTest/MockUpVectoTest.cs
@@ -1,15 +1,20 @@
-using System.Collections;
+using System;
+using System.Collections;
using System.Collections.Generic;
using System.ComponentModel.Design;
using System.IO;
using System.IO.Compression;
+using System.Linq;
using System.Xml;
using System.Xml.Linq;
+using System.Xml.XPath;
+using Newtonsoft.Json;
using Ninject;
using NUnit.Framework;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.FileIO.XML;
@@ -19,7 +24,11 @@ using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.OutputData.FileIO;
+using TUGraz.VectoCore.Tests.Utils;
using TUGraz.VectoCore.Tests.XML.Reports;
+using TUGraz.VectoCore.Utils;
+using Formatting = System.Xml.Formatting;
+using XmlDocumentType = TUGraz.VectoCore.Utils.XmlDocumentType;
namespace VectoMockupTest
{
@@ -30,63 +39,105 @@ namespace VectoMockupTest
public class MockUpVectoTest
{
+ private const string BasePath = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\";
+ private const string BasePathMockup = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\MockupBusTest\";
- private const string XsdPath = @"../../../../../VectoCore/VectoCore/Resources/XSD";
+ private const string XsdPath = @".. /../../../../VectoCore/VectoCore/Resources/XSD";
private IKernel _vectoKernel;
private ISimulatorFactoryFactory _simFactoryFactory;
- private ISimulatorFactory _simulatorFactory;
+ //private ISimulatorFactory _simulatorFactory;
private IXMLInputDataReader _inputDataReader;
- #region Lorry Testfiles
- protected const string ConventionalHeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\Conventional_heavyLorry_AMT.xml";
- protected const string HEV_Px_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV_heavyLorry_AMT_Px_IHPC.xml";
- protected const string HEV_S2_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_AMT_S2.xml";
- protected const string HEV_S3_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_S3.xml";
- protected const string HEV_S3_HeavyLorry_ovc =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_S3_ovc.xml";
- protected const string HEV_S4_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_S4.xml";
- protected const string HEV_IEPC_S_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_IEPC-S.xml";
- protected const string PEV_E2_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\PEV_heavyLorry_AMT_E2.xml";
- protected const string PEV_E3_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\PEV_heavyLorry_E3.xml";
- protected const string PEV_E4_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\PEV_heavyLorry_E4.xml";
- protected const string PEV_IEPC_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\IEPC_heavyLorry.xml";
+ #region Heavy Lorry Testfiles
+ protected const string ConventionalHeavyLorry = BasePath + @"HeavyLorry\Conventional_heavyLorry_AMT.xml";
+ protected const string ConventionalHeavyLorry_DifferentTyres = BasePathMockup + @"HeavyLorry\Conventional_heavyLorry_AMT_DifferentTyres.xml";
+ protected const string ConventionalHeavyLorry_AT_Angledrive = BasePathMockup + @"HeavyLorry\Conventional_heavyLorry_AT_Angledrive.xml";
+ protected const string HEV_Px_HeavyLorry = BasePath + @"HeavyLorry\HEV_heavyLorry_AMT_Px_IHPC.xml";
+ protected const string HEV_S2_HeavyLorry = BasePath + @"HeavyLorry\HEV-S_heavyLorry_AMT_S2.xml";
+ protected const string HEV_S3_HeavyLorry = BasePath + @"HeavyLorry\HEV-S_heavyLorry_S3.xml";
+ protected const string HEV_S3_HeavyLorry_ovc = BasePath + @"HeavyLorry\HEV-S_heavyLorry_S3_ovc.xml";
+ protected const string HEV_S4_HeavyLorry = BasePath + @"HeavyLorry\HEV-S_heavyLorry_S4.xml";
+ protected const string HEV_IEPC_S_HeavyLorry = BasePath + @"HeavyLorry\HEV-S_heavyLorry_IEPC-S.xml";
+ protected const string PEV_E2_HeavyLorry = BasePath + @"HeavyLorry\PEV_heavyLorry_AMT_E2.xml";
+ protected const string PEV_E3_HeavyLorry = BasePath + @"HeavyLorry\PEV_heavyLorry_E3.xml";
+ protected const string PEV_E4_HeavyLorry = BasePath + @"HeavyLorry\PEV_heavyLorry_E4.xml";
+ protected const string PEV_IEPC_HeavyLorry = BasePath + @"HeavyLorry\IEPC_heavyLorry.xml";
+
+ protected const string HEV_IHPC_HeavyLorry = BasePathMockup + @"HeavyLorry\HEV_heavyLorry_IHPC.xml";
+ protected const string HEV_Px_HeavyLorry_ADC = BasePathMockup + @"HeavyLorry\HEV_heavyLorry_Px_ADC.xml";
+ protected const string HEV_S3_HeavyLorry_ADC = BasePathMockup + @"HeavyLorry\HEV-S_heavyLorry_S3_ADC_GenSetADC.xml";
+ protected const string HEV_Px_HeavyLorry_SuperCap = BasePathMockup + @"HeavyLorry\HEV_heavyLorry_Px_SuperCap.xml";
#endregion
+ #region Medium Lorry Testfiles
+
+ protected const string Conventional_mediumLorry_AMT = BasePath + @"MediumLorry/Conventional_mediumLorry_AMT.xml";
+ protected const string HEV_S_mediumLorry_AMT_S2 = BasePath + @"MediumLorry/HEV-S_mediumLorry_AMT_S2.xml";
+ protected const string HEV_S_mediumLorry_IEPC_S = BasePath + @"MediumLorry/HEV-S_mediumLorry_IEPC-S.xml";
+ protected const string HEV_S_mediumLorry_S3 = BasePath + @"MediumLorry/HEV-S_mediumLorry_S3.xml";
+ protected const string HEV_S_mediumLorry_S4 = BasePath + @"MediumLorry/HEV-S_mediumLorry_S4.xml";
+ protected const string HEV_mediumLorry_AMT_Px = BasePath + @"MediumLorry/HEV_mediumLorry_AMT_Px.xml";
+ protected const string IEPC_mediumLorry = BasePath + @"MediumLorry/IEPC_mediumLorry.xml";
+ protected const string PEV_mediumLorry_AMT_E2 = BasePath + @"MediumLorry/PEV_mediumLorry_AMT_E2.xml";
+ protected const string PEV_mediumLorry_AMT_E2_EM_Std = BasePath + @"MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml";
+ protected const string PEV_mediumLorry_APT_N_E2 = BasePath + @"MediumLorry/PEV_mediumLorry_APT-N_E2.xml";
+ protected const string PEV_mediumLorry_E3 = BasePath + @"MediumLorry/PEV_mediumLorry_E3.xml";
+ protected const string PEV_mediumLorry_E4 = BasePath + @"MediumLorry/PEV_mediumLorry_E4.xml";
+
+ protected const string HEV_mediumLorry_IHPC = BasePathMockup + @"MediumLorry/HEV_mediumLorry_IHPC.xml";
+ protected const string HEV_mediumLorry_Px_SuperCap = BasePathMockup + @"MediumLorry/HEV_mediumLorry_Px_SuperCap.xml";
+ protected const string PEV_mediumLorry_AMT_E2_BatStd = BasePathMockup + @"MediumLorry/PEV_mediumLorry_AMT_E2_BatteryStd.xml";
+ //protected const string HEV_mediumLorry_Px_ADC = BasePathMockup + @"MediumLorry/HEV_heavyLorry_IHPC.xml";
+ //protected const string HEV_mediumLorry_S3_ADC_GenSetADC = BasePathMockup + @"MediumLorry/HEV_heavyLorry_IHPC.xml";
+ #endregion
+
#region PrimaryBus
- protected const string Conventional_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\Conventional_primaryBus_AMT.xml";
- protected const string HEV_Px_IHPC_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV_primaryBus_AMT_Px.xml";
- protected const string HEV_S2_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV-S_primaryBus_AMT_S2.xml";
- protected const string HEV_S3_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV-S_primaryBus_S3.xml";
- protected const string HEV_S4_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV-S_primaryBus_S4.xml";
- protected const string HEV_IEPC_S_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV-S_primaryBus_IEPC-S.xml";
- protected const string PEV_E2_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\PEV_primaryBus_AMT_E2.xml";
- protected const string PEV_E3_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\PEV_primaryBus_E3.xml";
- protected const string PEV_E4_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\PEV_primaryBus_E4.xml";
- protected const string PEV_IEPC_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\IEPC_primaryBus.xml";
+ protected const string Conventional_PrimaryBus = BasePath + @"PrimaryBus\Conventional_primaryBus_AMT.xml";
+ protected const string Conventional_PrimaryBus_AT_Angledrive = BasePathMockup + @"PrimaryBus\Conventional_primaryBus_AT_Angledrive.xml";
+ protected const string Conventional_PrimaryBus_Tyres = BasePath + @"PrimaryBus\Conventional_primaryBus_AMT_DifferentTyres.xml";
+ protected const string HEV_Px_PrimaryBus = BasePath + @"PrimaryBus\HEV_primaryBus_AMT_Px.xml";
+ protected const string HEV_IHPC_PrimaryBus = BasePathMockup + @"PrimaryBus\HEV_primaryBus_AMT_IHPC.xml";
+ protected const string HEV_Px_PrimaryBus_SuperCap = BasePathMockup + @"PrimaryBus\HEV_primaryBus_AMT_Px_SuperCap.xml";
+ protected const string HEV_S2_PrimaryBus = BasePath + @"PrimaryBus\HEV-S_primaryBus_AMT_S2.xml";
+ protected const string HEV_S2_PrimaryBus_GenSetADC = BasePathMockup + @"PrimaryBus\HEV-S_primaryBus_AMT_S2_GenSetADC.xml";
+ protected const string HEV_S2_PrimaryBus_ADC = BasePathMockup + @"PrimaryBus\HEV-S_primaryBus_AMT_S2_ADC.xml";
+ protected const string HEV_S3_PrimaryBus = BasePath + @"PrimaryBus\HEV-S_primaryBus_S3.xml";
+ protected const string HEV_S4_PrimaryBus = BasePath + @"PrimaryBus\HEV-S_primaryBus_S4.xml";
+ protected const string HEV_IEPC_S_PrimaryBus = BasePath + @"PrimaryBus\HEV-S_primaryBus_IEPC-S.xml";
+ protected const string PEV_E2_PrimaryBus = BasePath + @"PrimaryBus\PEV_primaryBus_AMT_E2.xml";
+ protected const string PEV_E3_PrimaryBus = BasePath + @"PrimaryBus\PEV_primaryBus_E3.xml";
+ protected const string PEV_E4_PrimaryBus = BasePath + @"PrimaryBus\PEV_primaryBus_E4.xml";
+ protected const string PEV_IEPC_PrimaryBus = BasePath + @"PrimaryBus\IEPC_primaryBus.xml";
+
+ protected const string PEV_E2_PrimaryBus_StdEM = BasePathMockup + @"PrimaryBus\PEV_primaryBus_AMT_E2_EMStd.xml";
+ protected const string PEV_E2_PrimaryBus_StdBat = BasePathMockup + @"PrimaryBus\PEV_primaryBus_AMT_E2_BatteryStd.xml";
+ protected const string Conventional_PrimaryBus_DF = BasePathMockup + @"PrimaryBus\Conventional_primaryBus_AMT_DF.xml";
+
+ #endregion
+
+ #region Complete(d) Bus Input
+
+ protected const string Conventional_CompletedBusInput = BasePath + @"CompletedBus\Conventional_completedBus_2.xml";
+ protected const string HEV_CompletedBusInput = BasePath + @"CompletedBus\HEV_completedBus_2.xml";
+ protected const string PEV_CompletedBusInput = BasePath + @"CompletedBus\PEV_completedBus_2.xml";
+ protected const string PEV_IEPC_CompletedBusInput = BasePath + @"CompletedBus\IEPC_completedBus_2.xml";
+
+
+ #endregion
+
+ #region Interim Bus Input
+
+ protected const string Conventional_InterimBusInput = BasePathMockup + @"CompletedBus\Conventional_InterimBus_Min.xml";
+ protected const string Conventional_InterimBusInput_AirdragV10 = BasePathMockup + @"CompletedBus\Conventional_completedBus_AirdragV10.xml";
+ protected const string Conventional_InterimBusInput_AirdragV20 = BasePathMockup + @"CompletedBus\Conventional_completedBus_AirdragV20.xml";
+ protected const string HEV_InterimBusInput = BasePathMockup + @"CompletedBus\HEV_InterimBus_Min.xml";
+ protected const string PEV_InterimBusInput = BasePathMockup + @"CompletedBus\PEV_InterimBus_Min.xml";
+ protected const string PEV_IEPC_InterimBusInput = BasePathMockup + @"CompletedBus\IEPC_InterimBus_Min.xml";
+
#endregion
@@ -97,20 +148,20 @@ namespace VectoMockupTest
protected const string Conventional_StageInput =
@"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\vecto_vehicle-stage_input_full-sample.xml";
- #endregion
+#endregion
- #region completed bus
+#region completed bus
protected const string Conventional_CompletedBus = @"TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_conventional_final_vif.VIF_Report_1.xml";
- #endregion
+#endregion
- #region special cases multistage
+#region special cases multistage
private const string TestDataDir = "TestData\\";
- private const string CompletedDiesel = TestDataDir + "Integration\\Multistage\\newVifCompletedConventional.vecto";
- private const string CompletedExempted = TestDataDir + "Integration\\Multistage\\newVifExempted.vecto";
- private const string CompletedExemptedWithoutTPMLM = TestDataDir + "Integration\\Multistage\\newVifExempted-noTPMLM.vecto";
+ private const string CompleteDiesel = TestDataDir + "Integration\\Multistage\\newVifCompletedConventional.vecto";
+ private const string CompleteExempted = TestDataDir + "Integration\\Multistage\\newVifExempted.vecto";
+ private const string CompleteExemptedWithoutTPMLM = TestDataDir + "Integration\\Multistage\\newVifExempted-noTPMLM.vecto";
private string CompletedWithoutADAS = TestDataDir + "Integration\\Multistage\\newVifCompletedConventional-noADAS.vecto";
@@ -120,15 +171,15 @@ namespace VectoMockupTest
private const string InterimDiesel = TestDataDir + "Integration\\Multistage\\newVifInterimDiesel.vecto";
- #endregion
+#endregion
- #region GroupTest
+#region GroupTest
private const string GroupTestDir = @"TestData\XML\XMLReaderDeclaration\GroupTest\";
- #endregion
+#endregion
@@ -165,6 +216,22 @@ namespace VectoMockupTest
}
}
}
+
+ private string[] CopyInputFile(params string[] fileNames)
+ {
+ var subDirectory = Path.Combine( "MockupReports", TestContext.CurrentContext.Test.Name, "Input");
+ Directory.CreateDirectory(Path.GetFullPath(subDirectory));
+ var retVal = new List<string>();
+ foreach (var file in fileNames) {
+ var output = Path.Combine(subDirectory, Path.GetFileName(file));
+ File.Copy(file, output, true);
+ retVal.Add(output);
+ }
+
+ return retVal.ToArray();
+ }
+
+
public FileOutputWriter GetOutputFileWriter(string subDirectory, string originalFilePath)
{
subDirectory = Path.Combine("MockupReports",subDirectory);
@@ -174,14 +241,16 @@ namespace VectoMockupTest
}
-
-
- [TestCase(ConventionalHeavyLorry, TestName="ConventionalHeavyLorry")]
+
+
+ [TestCase(ConventionalHeavyLorry, TestName = "ConventionalHeavyLorry")]
+ [TestCase(ConventionalHeavyLorry_DifferentTyres, TestName = "ConventionalHeavyLorry_DifferentTyres")]
+ [TestCase(ConventionalHeavyLorry_AT_Angledrive, TestName = "ConventionalHeavyLorry_AT_Angledrive")]
//[TestCase(ConventionalHeavyLorry, false, TestName = "ConventionalHeavyLorryNoMockup")]
[TestCase(HEV_S2_HeavyLorry, TestName = "HEV_S2_HeavyLorry")]
[TestCase(HEV_S3_HeavyLorry, TestName = "HEV_S3_HeavyLorry")]
- [TestCase(HEV_S3_HeavyLorry_ovc, TestName="HEV_S3_HeavyLorry_ovc")]
+ [TestCase(HEV_S3_HeavyLorry_ovc, TestName = "HEV_S3_HeavyLorry_ovc")]
[TestCase(HEV_S4_HeavyLorry, TestName = "HEV_S4_HeavyLorry")]
[TestCase(HEV_Px_HeavyLorry, TestName = "HEV_Px_HeavyLorry")]
[TestCase(PEV_E2_HeavyLorry, TestName = "PEV_E2_HeavyLorry")]
@@ -190,29 +259,36 @@ namespace VectoMockupTest
[TestCase(PEV_E4_HeavyLorry, TestName = "PEV_E4_HeavyLorry")]
[TestCase(PEV_IEPC_HeavyLorry, TestName = "PEV_IEPC_HeavyLorry")]
[TestCase(HEV_IEPC_S_HeavyLorry, TestName = "HEV_IEPC_S_HeavyLorry")]
- //[NonParallelizable]
-
- [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/Conventional_mediumLorry_AMT.xml", TestName="Conventional_Medium_Lorry")]
- [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml", TestName="HEV_S2_Medium_Lorry")]
- [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml", TestName="HEV_IEPC_Medium_Lorry")]
- [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml", TestName="HEV_S3_Medium_Lorry")]
- [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml", TestName="HEV_S4_Medium_Lorry")]
- [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml", TestName="HEV_Px_Medium_Lorry")]
- [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml", TestName="PEV_IEPC_Medium_Lorry")]
- [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml", TestName="PEV_E2_Medium_Lorry")]
- [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml", TestName="PEV_E2_std_Medium_Lorry", Ignore="Segment not found")]
- [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml", TestName="PEV_E2_Medium_Lorry_2")]
- [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E3.xml", TestName="PEV_E3_Medium_Lorry")]
- [TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E4.xml", TestName="PEV_E4_Medium_Lorry")]
+ [TestCase(HEV_IHPC_HeavyLorry, TestName = "HEV_IHPC_HeavyLorry")]
+ [TestCase(HEV_Px_HeavyLorry_ADC, TestName = "HEV_Px_HeavyLorry_ADC")]
+ [TestCase(HEV_S3_HeavyLorry_ADC, TestName = "HEV_S3_HeavyLorry_ADC")]
+ [TestCase(HEV_Px_HeavyLorry_SuperCap, TestName = "HEV_Px_HeavyLorry_SuperCap")]
+
+ //[NonParallelizable]
+ [TestCase(Conventional_mediumLorry_AMT, TestName = "Conventional_Medium_Lorry")]
+ [TestCase(HEV_S_mediumLorry_AMT_S2, TestName = "HEV_S2_Medium_Lorry")]
+ [TestCase(HEV_S_mediumLorry_IEPC_S, TestName = "HEV_IEPC_Medium_Lorry")]
+ [TestCase(HEV_S_mediumLorry_S3, TestName = "HEV_S3_Medium_Lorry")]
+ [TestCase(HEV_S_mediumLorry_S4, TestName = "HEV_S4_Medium_Lorry")]
+ [TestCase(HEV_mediumLorry_AMT_Px, TestName = "HEV_Px_Medium_Lorry")]
+ [TestCase(IEPC_mediumLorry, TestName = "PEV_IEPC_Medium_Lorry")]
+ [TestCase(PEV_mediumLorry_AMT_E2, TestName = "PEV_E2_Medium_Lorry")]
+ [TestCase(PEV_mediumLorry_AMT_E2_EM_Std, TestName = "PEV_E2_std_Medium_Lorry")]
+ [TestCase(PEV_mediumLorry_APT_N_E2, TestName = "PEV_E2_Medium_Lorry_2")]
+ [TestCase(PEV_mediumLorry_E3, TestName = "PEV_E3_Medium_Lorry")]
+ [TestCase(PEV_mediumLorry_E4, TestName = "PEV_E4_Medium_Lorry")]
+ [TestCase(HEV_mediumLorry_IHPC, TestName = "HEV_IHPC_MediumLorry")]
+ [TestCase(HEV_mediumLorry_Px_SuperCap, TestName = "HEV_Px_Medium_Lorry_SuperCap")]
+ [TestCase(PEV_mediumLorry_AMT_E2_BatStd, TestName = "PEV_E2_Medium_Lorry_BatteryStd")]
public void LorryMockupTest(string fileName, bool mockup = true)
{
-
+ CopyInputFile(fileName);
var inputProvider = _inputDataReader.Create(fileName);
var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName);
- var sumWriter = new SummaryDataContainer(fileWriter);
+ var sumWriter = new SummaryDataContainer(null);
var jobContainer = new JobContainer(sumWriter);
- _simulatorFactory =
+ var _simulatorFactory =
_simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true);
Clearfiles(fileWriter);
jobContainer.AddRuns(_simulatorFactory);
@@ -220,28 +296,40 @@ namespace VectoMockupTest
jobContainer.WaitFinished();
CheckFileExists(fileWriter);
- Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName),XsdPath), "MRF invalid");
- Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLCustomerReportName),XsdPath), "CIF invalid");
+ Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName), XmlDocumentType.ManufacturerReport), "MRF invalid");
+ Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLCustomerReportName), XmlDocumentType.CustomerReport), "CIF invalid");
}
+
+
[TestCase(Conventional_PrimaryBus, TestName = "ConventionalPrimaryBus")]
+ [TestCase(Conventional_PrimaryBus_AT_Angledrive, TestName = "ConventionalPrimaryBus_AT_Angledrive")]
+ [TestCase(Conventional_PrimaryBus_Tyres, TestName = "ConventionalPrimaryBus Tyres")]
[TestCase(HEV_IEPC_S_PrimaryBus, TestName="HEV_IEPC_S_PrimaryBus")]
- [TestCase(HEV_Px_IHPC_PrimaryBus, TestName="HEV_Px_PrimaryBus")]
+ [TestCase(HEV_Px_PrimaryBus, TestName="HEV_Px_PrimaryBus")]
+ [TestCase(HEV_IHPC_PrimaryBus, TestName = "HEV_IHPC_PrimaryBus")]
+ [TestCase(HEV_Px_PrimaryBus_SuperCap, TestName = "HEV_Px_PrimaryBus_SuperCap")]
[TestCase(HEV_S2_PrimaryBus, TestName="HEV_S2_PrimaryBus")]
+ [TestCase(HEV_S2_PrimaryBus_GenSetADC, TestName = "HEV_S2_PrimaryBus_GenSetADC")]
+ [TestCase(HEV_S2_PrimaryBus_ADC, TestName = "HEV_S2_PrimaryBus_ADC")]
[TestCase(HEV_S3_PrimaryBus, TestName = "HEV_S3_PrimaryBus")]
[TestCase(HEV_S4_PrimaryBus, TestName = "HEV_S4_PrimaryBus")]
[TestCase(PEV_E2_PrimaryBus, TestName="PEV_E2_PrimaryBus")]
[TestCase(PEV_E3_PrimaryBus, TestName = "PEV_E3_PrimaryBus")]
[TestCase(PEV_E4_PrimaryBus, TestName = "PEV_E4_PrimaryBus")]
[TestCase(PEV_IEPC_PrimaryBus, TestName="PEV_IEPC_PrimaryBus")]
+ [TestCase(PEV_E2_PrimaryBus_StdEM, TestName = "PEV_E2_PrimaryBus_EM-Std")]
+ [TestCase(PEV_E2_PrimaryBus_StdBat, TestName = "PEV_E2_PrimaryBus_Battery-Std")]
+ [TestCase(Conventional_PrimaryBus_DF, TestName = "ConventionalPrimaryBus_DualFuel")]
public void PrimaryBusMockupTest(string fileName, bool mockup = true)
{
+ CopyInputFile(fileName);
var inputProvider = _inputDataReader.Create(fileName);
var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName);
- var sumWriter = new SummaryDataContainer(fileWriter);
+ var sumWriter = new SummaryDataContainer(null);
var jobContainer = new JobContainer(sumWriter);
- _simulatorFactory =
+ var _simulatorFactory =
_simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true);
Clearfiles(fileWriter); //remove files from previous test runs
@@ -249,26 +337,27 @@ namespace VectoMockupTest
jobContainer.Execute(false);
jobContainer.WaitFinished();
CheckFileExists(fileWriter, checkCif:false, checkPrimaryReport:true);
- Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLPrimaryVehicleReportName), XsdPath), "VIF invalid" );
- Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName), XsdPath), "MRF invalid");
+ Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLPrimaryVehicleReportName), XmlDocumentType.MultistepOutputData), "VIF invalid" );
+ Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName), XmlDocumentType.ManufacturerReport), "MRF invalid");
}
- [TestCase(Conventional_InterimBus,Conventional_StageInput, TestName = "ConventionalInterimBus")]
+ [TestCase(Conventional_InterimBus, Conventional_StageInput, TestName = "ConventionalInterimBus")]
public void InterimBusMockupTest(string vifInput, string stageInputFile)
{
+ CopyInputFile(vifInput);
//SimulatorFactory.MockUpRun = mockup;
- var multistageBusInput = _inputDataReader.Create(vifInput) as IMultistageBusInputDataProvider;
+ var multistageBusInput = _inputDataReader.Create(vifInput) as IMultistepBusInputDataProvider;
Assert.NotNull(multistageBusInput);
var stageInput = _inputDataReader.CreateDeclaration(stageInputFile);
var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, vifInput);
- var sumWriter = new SummaryDataContainer(fileWriter);
+ var sumWriter = new SummaryDataContainer(null);
var jobContainer = new JobContainer(sumWriter);
var inputData = new XMLDeclarationVIFInputData(multistageBusInput, stageInput.JobInputData.Vehicle);
- _simulatorFactory =
+ var _simulatorFactory =
_simFactoryFactory.Factory(ExecutionMode.Declaration, inputData, fileWriter, null, null, true);
Clearfiles(fileWriter);
jobContainer.AddRuns(_simulatorFactory);
@@ -283,18 +372,19 @@ namespace VectoMockupTest
[TestCase(Conventional_CompletedBus, TestName = "ConventionalCompletedBus")]
public void CompletedBusMockupTest(string fileName)
{
+ CopyInputFile(fileName);
//SimulatorFactory.MockUpRun = mockup;
XMLDeclarationVIFInputData input = null!;
var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName);
using (var reader = XmlReader.Create(fileName))
{
- input = new XMLDeclarationVIFInputData(_inputDataReader.Create(fileName) as IMultistageBusInputDataProvider, null);
+ input = new XMLDeclarationVIFInputData(_inputDataReader.Create(fileName) as IMultistepBusInputDataProvider, null);
fileWriter = new FileOutputVIFWriter(fileName, input.MultistageJobInputData.JobInputData.ManufacturingStages.Count);
}
- var sumWriter = new SummaryDataContainer(fileWriter);
+ var sumWriter = new SummaryDataContainer(null);
var jobContainer = new JobContainer(sumWriter);
- _simulatorFactory =
+ var _simulatorFactory =
_simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true);
Clearfiles(fileWriter);
jobContainer.AddRuns(_simulatorFactory);
@@ -303,32 +393,35 @@ namespace VectoMockupTest
CheckFileExists(fileWriter, checkCif: true, checkVif: false);
}
- [TestCase(CompletedDiesel, TestName="CompletedDiesel")]
+ [TestCase(CompleteDiesel, TestName="CompleteDiesel")]
+ [TestCase(CompleteExempted, TestName = "CompleteExempted Bus")]
+ [TestCase(CompleteExemptedWithoutTPMLM, TestName = "CompleteExempted No TPMLM")]
public void PrimaryAndCompletedTest(string fileName)
{
var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName);
- var sumWriter = new SummaryDataContainer(fileWriter);
+ var sumWriter = new SummaryDataContainer(null);
var jobContainer = new JobContainer(sumWriter);
var input = JSONInputDataFactory.ReadJsonJob(fileName);
- _simulatorFactory =
+ var _simulatorFactory =
_simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true);
Clearfiles(fileWriter);
jobContainer.AddRuns(_simulatorFactory);
jobContainer.Execute(false);
jobContainer.WaitFinished();
- CheckFileExists(fileWriter, checkCif: true, checkVif: false);
+ CheckFileExists(fileWriter, checkCif: true, checkVif: true, checkMrf: true, checkPrimaryMrf: true);
}
+
[TestCase(InterimDiesel, TestName = "PrimaryAndInterim")]
public void PrimaryAndInterim(string fileName)
{
var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName);
- var sumWriter = new SummaryDataContainer(fileWriter);
+ var sumWriter = new SummaryDataContainer(null);
var jobContainer = new JobContainer(sumWriter);
var input = JSONInputDataFactory.ReadJsonJob(fileName);
- _simulatorFactory =
+ var _simulatorFactory =
_simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true);
Clearfiles(fileWriter);
jobContainer.AddRuns(_simulatorFactory);
@@ -336,14 +429,293 @@ namespace VectoMockupTest
jobContainer.WaitFinished();
CheckFileExists(fileWriter, checkCif: false, checkVif: true, checkMrf:false, checkPrimaryMrf:true);
+ }
+
+ [TestCase(Conventional_PrimaryBus_Tyres, Conventional_InterimBusInput, "Conventional", TestName = "Interim_Conventional_Bus_DifferentTyres")]
+ [TestCase(Conventional_PrimaryBus_AT_Angledrive, Conventional_InterimBusInput, "Conventional", TestName = "Interim_Conventional_Bus_AT_Angledrive")]
+ [TestCase(Conventional_PrimaryBus, Conventional_InterimBusInput_AirdragV10, "Conventional", TestName = "InterimConventionalBusAirdrag_v1_0")]
+ [TestCase(Conventional_PrimaryBus, Conventional_InterimBusInput_AirdragV20, "Conventional", TestName = "InterimConventionalBusAirdrag_v2_0")]
+ [TestCase(Conventional_PrimaryBus_DF, Conventional_InterimBusInput, "Conventional", TestName = "Interim_ConventionalPrimaryBus_DualFuel")]
+ [TestCase(HEV_IEPC_S_PrimaryBus, HEV_InterimBusInput, "IEPC-S", "HEV", TestName = "Interim HEV_IEPC_S_Bus")]
+ [TestCase(HEV_Px_PrimaryBus, HEV_InterimBusInput, "Px", "HEV", TestName = "Interim HEV_Px_Bus")]
+ [TestCase(HEV_IHPC_PrimaryBus, HEV_InterimBusInput, "Px", "HEV", TestName = "Interim HEV_IHPC_Bus")]
+ [TestCase(HEV_S2_PrimaryBus, HEV_InterimBusInput, "Sx", "HEV", TestName = "Interim HEV_S2_Bus")]
+ [TestCase(HEV_S3_PrimaryBus, HEV_InterimBusInput, "Sx", "HEV", TestName = "Interim HEV_S3_Bus")]
+ [TestCase(HEV_S4_PrimaryBus, HEV_InterimBusInput, "Sx", "HEV", TestName = "Interim HEV_S4_Bus")]
+ [TestCase(PEV_E2_PrimaryBus, PEV_InterimBusInput, "Ex", "PEV", TestName = "Interim PEV_E2_Bus")]
+ [TestCase(PEV_E3_PrimaryBus, PEV_InterimBusInput, "Ex", "PEV", TestName = "Interim PEV_E3_Bus")]
+ [TestCase(PEV_E4_PrimaryBus, PEV_InterimBusInput, "Ex", "PEV", TestName = "Interim PEV_E4_Bus")]
+ [TestCase(PEV_IEPC_PrimaryBus, PEV_IEPC_InterimBusInput, "IEPC", TestName = "Interim PEV_IEPC_Bus")]
+ [TestCase(PEV_E2_PrimaryBus_StdEM, PEV_InterimBusInput, "Ex", "PEV", TestName = "Interim PEV_E2_Bus_EM-Std")]
+ public void InterimTest(string primaryBusInput, string interimBusInput, params string[] expectedType)
+ {
+ CopyInputFile(interimBusInput);
+ // VIF + interim input => VIF
+ // (approach: first simulate primary on its own to have an up-to-date VIF
+ // (no need to maintain this in the testfiles)
+
+ // setting up testcase
+ // run primary simulation
+ var inputProvider = _inputDataReader.Create(primaryBusInput);
+ var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, primaryBusInput);
+ var sumWriter = new SummaryDataContainer(null);
+ var jobContainer = new JobContainer(sumWriter);
+
+ var _simulatorFactory =
+ _simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true);
+
+ Clearfiles(fileWriter); //remove files from previous test runs
+ jobContainer.AddRuns(_simulatorFactory);
+ jobContainer.Execute(false);
+ jobContainer.WaitFinished();
+
+ CheckFileExists(fileWriter, checkCif: false, checkPrimaryReport: true, checkMrf: true);
+ File.Delete(fileWriter.XMLFullReportName);
+ CopyInputFile(fileWriter.XMLPrimaryVehicleReportName);
+ // done preparing testcase...
+
+ // this is the actual test: run completed simulation
+
+ var interimJob = GenerateJsonJobCompletedBus(fileWriter.XMLPrimaryVehicleReportName, interimBusInput, TestContext.CurrentContext.Test.Name);
+ var interimInputData = JSONInputDataFactory.ReadJsonJob(interimJob);
+ var interimFileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, interimBusInput);
+ var interimSumWriter = new SummaryDataContainer(null);
+ var interimJobContainer = new JobContainer(interimSumWriter);
+
+ var completedSimulatorFactory =
+ _simFactoryFactory.Factory(ExecutionMode.Declaration, interimInputData, interimFileWriter, null, null, true);
+
+ Clearfiles(interimFileWriter); //remove files from previous test runs
+ interimJobContainer.AddRuns(completedSimulatorFactory);
+ interimJobContainer.Execute(false);
+ interimJobContainer.WaitFinished();
+
+ // assertions
+ File.Delete(fileWriter.XMLPrimaryVehicleReportName);
+
+ CheckFileExists(interimFileWriter, checkVif: true, checkMrf: false, checkCif: false);
+
+ CheckElementTypeNameContains(interimFileWriter.XMLMultistageReportFileName, "Vehicle", expectedType);
+ }
+
+ [TestCase(Conventional_PrimaryBus_Tyres, Conventional_InterimBusInput, "Conventional", TestName = "PrimaryAndInterim Conventional Bus Different Tyres")]
+ [TestCase(Conventional_PrimaryBus_DF, Conventional_InterimBusInput, "Conventional", TestName = "PrimaryAndInterim ConventionalPrimaryBus_DualFuel")]
+ [TestCase(Conventional_PrimaryBus_AT_Angledrive, Conventional_InterimBusInput, "Conventional", TestName = "PrimaryAndInterim ConventionalPrimaryBus_AT_Angledrive")]
+ [TestCase(HEV_IEPC_S_PrimaryBus, HEV_InterimBusInput, "IEPC-S", "HEV", TestName = "PrimaryAndInterim HEV_IEPC_S_PrimaryBus")]
+ [TestCase(HEV_Px_PrimaryBus, HEV_InterimBusInput, "Px", "HEV", TestName = "PrimaryAndInterim HEV_Px_PrimaryBus")]
+ [TestCase(HEV_IHPC_PrimaryBus, HEV_InterimBusInput, "Px", "HEV", TestName = "PrimaryAndInterim HEV_IHPC_PrimaryBus")]
+ [TestCase(HEV_S2_PrimaryBus, HEV_InterimBusInput, "Sx", "HEV", TestName = "PrimaryAndInterim HEV_S2_PrimaryBus")]
+ [TestCase(HEV_S3_PrimaryBus, HEV_InterimBusInput, "Sx", "HEV", TestName = "PrimaryAndInterim HEV_S3_PrimaryBus")]
+ [TestCase(HEV_S4_PrimaryBus, HEV_InterimBusInput, "Sx", "HEV", TestName = "PrimaryAndInterim HEV_S4_PrimaryBus")]
+ [TestCase(PEV_E2_PrimaryBus, PEV_InterimBusInput, "Ex", "PEV", TestName = "PrimaryAndInterim PEV_E2_PrimaryBus")]
+ [TestCase(PEV_E3_PrimaryBus, PEV_InterimBusInput, "Ex", "PEV", TestName = "PrimaryAndInterim PEV_E3_PrimaryBus")]
+ [TestCase(PEV_E4_PrimaryBus, PEV_InterimBusInput, "Ex", "PEV", TestName = "PrimaryAndInterim PEV_E4_PrimaryBus")]
+ [TestCase(PEV_IEPC_PrimaryBus, PEV_IEPC_InterimBusInput, "IEPC", TestName = "PrimaryAndInterim PEV_IEPC_PrimaryBus")]
+ [TestCase(PEV_E2_PrimaryBus_StdEM, PEV_InterimBusInput, "Ex", "PEV", TestName = "PrimaryAndInterim PEV_E2_PrimaryBus_EM-Std")]
+ public void PrimaryWithInterimTest(string primaryBusInput, string interimInput, params string[] expectedType)
+ {
+ var copied = CopyInputFile(primaryBusInput, interimInput);
+ // complete: primary input + complete input (full) => MRF Primary, VIF (step 1), MRF Complete, CIF Complete
+ // (approach: first simulate primary on its own to have an up-to-date VIF
+ // (no need to maintain this in the testfiles)
+
+
+ var job = GenerateJsonJobCompleteBus(copied[0], copied[1], TestContext.CurrentContext.Test.Name);
+ var input = JSONInputDataFactory.ReadJsonJob(job);
+ var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, interimInput);
+ var sumWriter = new SummaryDataContainer(null);
+ var jobContainer = new JobContainer(sumWriter);
+
+ var completedSimulatorFactory =
+ _simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true);
+
+ Clearfiles(fileWriter); //remove files from previous test runs
+ jobContainer.AddRuns(completedSimulatorFactory);
+ jobContainer.Execute(false);
+ jobContainer.WaitFinished();
+
+ // assertions
+
+ CheckFileExists(fileWriter, checkPrimaryMrf: true, checkVif: true, checkCif: false, checkMrf: false);
+
+ CheckElementTypeNameContains(fileWriter.XMLMultistageReportFileName, "Vehicle", expectedType);
+ }
+
+
+
+ [TestCase(Conventional_PrimaryBus_Tyres, Conventional_CompletedBusInput, "Conventional", TestName = "Complete Conventional Bus Different Tyres")]
+ [TestCase(Conventional_PrimaryBus_DF, Conventional_CompletedBusInput, "Conventional", TestName = "Complete ConventionalPrimaryBus_DualFuel")]
+ [TestCase(Conventional_PrimaryBus_AT_Angledrive, Conventional_CompletedBusInput, "Conventional", TestName = "Complete ConventionalPrimaryBus_AT_Angledrive")]
+ [TestCase(HEV_IEPC_S_PrimaryBus, HEV_CompletedBusInput, "IEPC-S", "HEV", TestName = "Complete HEV_IEPC_S_PrimaryBus")]
+ [TestCase(HEV_Px_PrimaryBus, HEV_CompletedBusInput, "Px", "HEV", TestName = "Complete HEV_Px_PrimaryBus")]
+ [TestCase(HEV_IHPC_PrimaryBus, HEV_CompletedBusInput, "Px", "HEV", TestName = "Complete HEV_IHPC_PrimaryBus")]
+ [TestCase(HEV_S2_PrimaryBus, HEV_CompletedBusInput, "S2", "HEV", TestName = "Complete HEV_S2_PrimaryBus")]
+ [TestCase(HEV_S3_PrimaryBus, HEV_CompletedBusInput, "S3", "HEV", TestName = "Complete HEV_S3_PrimaryBus")]
+ [TestCase(HEV_S4_PrimaryBus, HEV_CompletedBusInput, "S4", "HEV", TestName = "Complete HEV_S4_PrimaryBus")]
+ [TestCase(PEV_E2_PrimaryBus, PEV_CompletedBusInput, "E2", "PEV", TestName = "Complete PEV_E2_PrimaryBus")]
+ [TestCase(PEV_E3_PrimaryBus, PEV_CompletedBusInput, "E3", "PEV", TestName = "Complete PEV_E3_PrimaryBus")]
+ [TestCase(PEV_E4_PrimaryBus, PEV_CompletedBusInput, "E4", "PEV", TestName = "Complete PEV_E4_PrimaryBus")]
+ [TestCase(PEV_IEPC_PrimaryBus, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Complete PEV_IEPC_PrimaryBus")]
+ [TestCase(PEV_E2_PrimaryBus_StdEM, PEV_CompletedBusInput, "E2", "PEV", TestName = "Complete PEV_E2_PrimaryBus_EM-Std")]
+ public void CompleteTest(string primaryBusInput, string completeBusInput, params string[] expectedType)
+ {
+ CopyInputFile(primaryBusInput, completeBusInput);
+ // complete: primary input + complete input (full) => MRF Primary, VIF (step 1), MRF Complete, CIF Complete
+ // (approach: first simulate primary on its own to have an up-to-date VIF
+ // (no need to maintain this in the testfiles)
+
+
+ var completeJob = GenerateJsonJobCompleteBus(primaryBusInput, completeBusInput, TestContext.CurrentContext.Test.Name);
+ var completeBusinput = JSONInputDataFactory.ReadJsonJob(completeJob);
+ var completeFileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, completeBusInput);
+ var completeSumWriter = new SummaryDataContainer(null);
+ var completeJobContainer = new JobContainer(completeSumWriter);
+
+ var completedSimulatorFactory =
+ _simFactoryFactory.Factory(ExecutionMode.Declaration, completeBusinput, completeFileWriter, null, null, true);
+
+ Clearfiles(completeFileWriter); //remove files from previous test runs
+ completeJobContainer.AddRuns(completedSimulatorFactory);
+ completeJobContainer.Execute(false);
+ completeJobContainer.WaitFinished();
+
+ // assertions
+
+ CheckFileExists(completeFileWriter, checkPrimaryMrf: true, checkVif: true, checkCif: true, checkMrf: true);
+
+ CheckElementTypeNameContains(completeFileWriter.XMLMultistageReportFileName, "Vehicle", expectedType);
+ }
+
+
+
+ [TestCase(Conventional_PrimaryBus_Tyres, Conventional_CompletedBusInput, "Conventional", TestName = "Completed Conventional Bus Different Tyres")]
+ [TestCase(Conventional_PrimaryBus_DF, Conventional_CompletedBusInput, "Conventional", TestName = "Completed ConventionalPrimaryBus_DualFuel")]
+ [TestCase(Conventional_PrimaryBus_AT_Angledrive, Conventional_CompletedBusInput, "Conventional", TestName = "Completed Conventional Bus_AT_Angledrive")]
+ [TestCase(HEV_IEPC_S_PrimaryBus, HEV_CompletedBusInput, "IEPC-S", "HEV", TestName = "Completed HEV_IEPC_S_PrimaryBus")]
+ [TestCase(HEV_Px_PrimaryBus, HEV_CompletedBusInput, "Px", "HEV", TestName = "Completed HEV_Px_PrimaryBus")]
+ [TestCase(HEV_IHPC_PrimaryBus, HEV_CompletedBusInput, "Px", "HEV", TestName = "Completed HEV_IHPC_PrimaryBus")]
+ [TestCase(HEV_S2_PrimaryBus, HEV_CompletedBusInput, "Sx", "HEV", TestName = "Completed HEV_S2_PrimaryBus")]
+ [TestCase(HEV_S3_PrimaryBus, HEV_CompletedBusInput, "Sx", "HEV", TestName = "Completed HEV_S3_PrimaryBus")]
+ [TestCase(HEV_S4_PrimaryBus, HEV_CompletedBusInput, "Sx", "HEV", TestName = "Completed HEV_S4_PrimaryBus")]
+ [TestCase(PEV_E2_PrimaryBus, PEV_CompletedBusInput, "Ex", "PEV", TestName = "Completed PEV_E2_PrimaryBus")]
+ [TestCase(PEV_E3_PrimaryBus, PEV_CompletedBusInput, "Ex", "PEV", TestName = "Completed PEV_E3_PrimaryBus")]
+ [TestCase(PEV_E4_PrimaryBus, PEV_CompletedBusInput, "Ex", "PEV", TestName = "Completed PEV_E4_PrimaryBus")]
+ [TestCase(PEV_IEPC_PrimaryBus, PEV_IEPC_CompletedBusInput, "IEPC", TestName = "Completed PEV_IEPC_PrimaryBus")]
+ [TestCase(PEV_E2_PrimaryBus_StdEM, PEV_CompletedBusInput, "Ex", "PEV", TestName = "Completed PEV_E2_PrimaryBus_EM-Std")]
+ public void CompletedTest(string primaryBusInput, string completeBusInput, params string[] expectedType)
+ {
+ CopyInputFile(completeBusInput);
+ CopyInputFile(primaryBusInput);
+ // completed: VIF + complete input (full) => VIF , MRF Completed, CIF Completed
+ // (approach: first simulate primary on its own to have an up-to-date VIF
+ // (no need to maintain this in the testfiles)
+
+ // setting up testcase
+ // run primary simulation
+ var inputProvider = _inputDataReader.Create(primaryBusInput);
+ var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, primaryBusInput);
+ var sumWriter = new SummaryDataContainer(null);
+ var jobContainer = new JobContainer(sumWriter);
+
+ var _simulatorFactory =
+ _simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true);
+
+ Clearfiles(fileWriter); //remove files from previous test runs
+ jobContainer.AddRuns(_simulatorFactory);
+ jobContainer.Execute(false);
+ jobContainer.WaitFinished();
+
+ CheckFileExists(fileWriter, checkCif: false, checkPrimaryReport: true, checkMrf: true);
+ //File.Delete(fileWriter.XMLFullReportName);
+ CopyInputFile(fileWriter.XMLPrimaryVehicleReportName);
+ // done preparing testcase...
+
+ // this is the actual test: run completed simulation
+ var completedJob = GenerateJsonJobCompletedBus(fileWriter.XMLPrimaryVehicleReportName, completeBusInput, TestContext.CurrentContext.Test.Name);
+ var completedInputData = JSONInputDataFactory.ReadJsonJob(completedJob);
+ var completedFileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, completeBusInput);
+ var completedSumWriter = new SummaryDataContainer(null);
+ var completedJobContainer = new JobContainer(completedSumWriter);
+ var completedSimulatorFactory =
+ _simFactoryFactory.Factory(ExecutionMode.Declaration, completedInputData, completedFileWriter, null, null, true);
+
+ Clearfiles(completedFileWriter); //remove files from previous test runs
+ completedJobContainer.AddRuns(completedSimulatorFactory);
+ completedJobContainer.Execute(false);
+ completedJobContainer.WaitFinished();
+
+ // assertions
+ //File.Delete(fileWriter.XMLPrimaryVehicleReportName);
+
+ CheckFileExists(completedFileWriter, checkCif: true, checkMrf: true, checkVif:true);
+
+ CheckElementTypeNameContains(completedFileWriter.XMLMultistageReportFileName, "Vehicle", expectedType);
}
+ private static void CheckElementTypeNameContains(string fileName, string elementName, params string[] expectedType)
+ {
+ var xmlDoc = new XmlDocument();
+ xmlDoc.Load(XmlReader.Create(fileName));
+ var validator = new XMLValidator(xmlDoc);
+ validator.ValidateXML(XmlDocumentType.MultistepOutputData);
+
+ var vehicleNodes = xmlDoc.SelectNodes($"//*[local-name()='{elementName}']");
+ foreach (XmlNode vehicleNode in vehicleNodes) {
+ var typeName = vehicleNode?.SchemaInfo?.SchemaType?.Name ?? "";
+ var contains = expectedType.Select(x => typeName.Contains(x, StringComparison.InvariantCultureIgnoreCase));
+ Assert.IsTrue(contains.Any(x => x), $"{typeName} -- {expectedType.Join()}");
+ }
+ }
+
+ private string GenerateJsonJobCompletedBus(string vif, string completeBusInput, string subDirectory)
+ {
+ subDirectory = Path.Combine("MockupReports", subDirectory, "Input");
+
+ var header = new Dictionary<string, object>() {
+ { "FileVersion", 7 }
+ };
+ var body = new Dictionary<string, object>() {
+ { "PrimaryVehicleResults", Path.GetRelativePath(subDirectory, Path.GetFullPath(vif)) },
+ { "CompletedVehicle", Path.GetRelativePath(subDirectory, Path.GetFullPath(completeBusInput)) }
+ };
+ var json = new Dictionary<string, object>() {
+ {"Header", header},
+ {"Body", body}
+ };
+
+ Directory.CreateDirectory(Path.GetFullPath(subDirectory));
+ var path = Path.Combine(Path.Combine(Path.GetFullPath(subDirectory)), "completedJob.vecto");
+ var str = JsonConvert.SerializeObject(json, Newtonsoft.Json.Formatting.Indented);
+ File.WriteAllText(path, str);
+ return path;
+ }
+
+ private string GenerateJsonJobCompleteBus(string primaryBusInput, string completeBusInput, string subDirectory)
+ {
+ subDirectory = Path.Combine("MockupReports", subDirectory, "Input");
+ var header = new Dictionary<string, object>() {
+ { "FileVersion", 10 }
+ };
+ var body = new Dictionary<string, object>() {
+ { "PrimaryVehicle", Path.GetRelativePath(subDirectory, Path.GetFullPath(primaryBusInput)) },
+ { "InterimStep", Path.GetRelativePath(subDirectory, Path.GetFullPath(completeBusInput)) }
+ };
+ var json = new Dictionary<string, object>() {
+ {"Header", header},
+ {"Body", body}
+ };
+ Directory.CreateDirectory(Path.GetFullPath(subDirectory));
+ var path = Path.Combine(Path.Combine(Path.GetFullPath(subDirectory)), "completeJob.vecto");
+ var str = JsonConvert.SerializeObject(json, Newtonsoft.Json.Formatting.Indented);
+ File.WriteAllText(path, str);
+ return path;
+ }
private static void CheckFileExists(FileOutputWriter fileWriter,
bool checkMrf = true,
@@ -352,35 +724,60 @@ namespace VectoMockupTest
bool checkPrimaryMrf = false,
bool checkPrimaryReport = false)
{
- if (checkCif && !File.Exists(fileWriter.XMLCustomerReportName)) {
- TestContext.WriteLine(fileWriter.XMLCustomerReportName + "Missing\n");
- Assert.Fail();
+ var fail = false;
+ if (checkCif) {
+ if (File.Exists(fileWriter.XMLCustomerReportName)) {
+ MRF_CIF_WriterTestBase.Validate(XDocument.Load(fileWriter.XMLCustomerReportName),
+ XmlDocumentType.CustomerReport);
+ } else {
+ TestContext.WriteLine(fileWriter.XMLCustomerReportName + " Missing\n");
+ fail = true;
+ }
}
- if (checkMrf && !File.Exists(fileWriter.XMLFullReportName))
- {
- TestContext.WriteLine(fileWriter.XMLFullReportName + "Missing\n");
- Assert.Fail();
+ if (checkMrf) {
+ if (File.Exists(fileWriter.XMLFullReportName)) {
+ MRF_CIF_WriterTestBase.Validate(XDocument.Load(fileWriter.XMLFullReportName),
+ XmlDocumentType.ManufacturerReport);
+ } else {
+ TestContext.WriteLine(fileWriter.XMLFullReportName + " Missing\n");
+ fail = true;
+ }
}
var primaryMrfPath = fileWriter.XMLFullReportName.Replace("RSLT_MANUFACTURER", "RSLT_MANUFACTURER_PRIMARY");
- if (checkPrimaryMrf && !File.Exists(primaryMrfPath)) {
- TestContext.WriteLine(primaryMrfPath + "Missing\n");
- Assert.Fail();
+ if (checkPrimaryMrf) {
+ if (File.Exists(primaryMrfPath)) {
+ MRF_CIF_WriterTestBase.Validate(XDocument.Load(primaryMrfPath), XmlDocumentType.ManufacturerReport);
+ } else {
+ TestContext.WriteLine(primaryMrfPath + " Missing\n");
+ fail = true;
+ }
}
- if (checkPrimaryReport && !File.Exists(fileWriter.XMLPrimaryVehicleReportName))
- {
- TestContext.WriteLine(fileWriter.XMLPrimaryVehicleReportName + "Missing\n");
- Assert.Fail();
+ if (checkPrimaryReport) {
+ if (File.Exists(fileWriter.XMLPrimaryVehicleReportName)) {
+ MRF_CIF_WriterTestBase.Validate(XDocument.Load(fileWriter.XMLPrimaryVehicleReportName),
+ XmlDocumentType.MultistepOutputData);
+ } else {
+ TestContext.WriteLine(fileWriter.XMLPrimaryVehicleReportName + " Missing\n");
+ fail = true;
+ }
}
+ if (checkVif) {
+ if (File.Exists(fileWriter.XMLMultistageReportFileName)) {
+ MRF_CIF_WriterTestBase.Validate(XDocument.Load(fileWriter.XMLMultistageReportFileName),
+ XmlDocumentType.MultistepOutputData);
+ } else {
+ TestContext.WriteLine(fileWriter.XMLMultistageReportFileName + " Missing\n");
+ fail = true;
+ }
+ }
- if (checkVif && !File.Exists(fileWriter.XMLMultistageReportFileName)) {
- TestContext.WriteLine(fileWriter.XMLMultistageReportFileName + "Missing\n");
+ if (fail) {
Assert.Fail();
}
-
}
@@ -401,7 +798,7 @@ namespace VectoMockupTest
var sumWriter = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumWriter);
- _simulatorFactory =
+ var _simulatorFactory =
_simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true);
Clearfiles(fileWriter);
jobContainer.AddRuns(_simulatorFactory);
@@ -409,8 +806,8 @@ namespace VectoMockupTest
jobContainer.WaitFinished();
CheckFileExists(fileWriter);
- Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName),XsdPath), "MRF invalid");
- Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLCustomerReportName),XsdPath), "CIF invalid");
+ Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName), XmlDocumentType.ManufacturerReport), "MRF invalid");
+ Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLCustomerReportName), XmlDocumentType.CustomerReport), "CIF invalid");
}
[TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/Tractor_4x2_vehicle-class-5_5_t_0.xml", TestName="Schema10Test1")]
@@ -430,7 +827,7 @@ namespace VectoMockupTest
var sumWriter = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumWriter);
- _simulatorFactory =
+ var _simulatorFactory =
_simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true);
Clearfiles(fileWriter);
jobContainer.AddRuns(_simulatorFactory);
@@ -438,8 +835,8 @@ namespace VectoMockupTest
jobContainer.WaitFinished();
CheckFileExists(fileWriter);
- Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName),XsdPath), "MRF invalid");
- Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLCustomerReportName),XsdPath), "CIF invalid");
+ Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName), XmlDocumentType.ManufacturerReport), "MRF invalid");
+ Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLCustomerReportName), XmlDocumentType.CustomerReport), "CIF invalid");
}
[TestCase(@"TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/Tractor_4x2_vehicle-class-5_5_t_0.xml", TestName="Schema20Test1")]
@@ -459,7 +856,7 @@ namespace VectoMockupTest
var sumWriter = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumWriter);
- _simulatorFactory =
+ var _simulatorFactory =
_simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true);
Clearfiles(fileWriter);
jobContainer.AddRuns(_simulatorFactory);
@@ -467,8 +864,8 @@ namespace VectoMockupTest
jobContainer.WaitFinished();
CheckFileExists(fileWriter);
- Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName),XsdPath), "MRF invalid");
- Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLCustomerReportName),XsdPath), "CIF invalid");
+ Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName), XmlDocumentType.ManufacturerReport), "MRF invalid");
+ Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLCustomerReportName), XmlDocumentType.CustomerReport), "CIF invalid");
}
@@ -485,7 +882,7 @@ namespace VectoMockupTest
var sumWriter = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumWriter);
- _simulatorFactory = null!;
+ ISimulatorFactory _simulatorFactory = null!;
Assert.Throws(typeof(VectoException), () => {
_simulatorFactory =
_simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true);
@@ -500,40 +897,41 @@ namespace VectoMockupTest
jobContainer.WaitFinished();
CheckFileExists(fileWriter);
- Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName), XsdPath), "MRF invalid");
- Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLCustomerReportName), XsdPath), "CIF invalid");
+ Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName), XmlDocumentType.ManufacturerReport), "MRF invalid");
+ Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLCustomerReportName), XmlDocumentType.CustomerReport), "CIF invalid");
}
- [TestCase("TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_completedBus_input_full.xml",
- true,
- true,
- false,
- false,
- true,
- TestName="ExemptedCompletedBus1")]
- [TestCase("TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_completedBus_input_only_mandatory_entries.xml",
- true,
- true,
- false,
- false,
- false,
- TestName="ExemptedCompletedBus1")]
- [TestCase("TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_heavyLorry.xml",
+ private const string BasePathExempted = "TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/";
+
+ // [TestCase(BasePathExempted + "exempted_completedBus_input_full.xml",
+ // true,
+ // true,
+ // false,
+ // false,
+ // true,
+ // TestName = "ExemptedCompletedBus1")]
+ // [TestCase(BasePathExempted + "exempted_completedBus_input_only_mandatory_entries.xml",
+ //true,
+ //true,
+ //false,
+ //false,
+ //false,
+ //TestName="ExemptedCompletedBus2")]
+ [TestCase(BasePathExempted + "exempted_heavyLorry.xml",
false,
false,
true,
false,
false,
TestName="ExemptedHeavyLorry")]
- [TestCase("TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_mediumLorry.xml",
-
+ [TestCase(BasePathExempted + "exempted_mediumLorry.xml",
false,
true,
true,
false,
false,
TestName="ExemptedMediumLorry")]
- [TestCase("TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_primaryBus.xml",
+ [TestCase(BasePathExempted + "exempted_primaryBus.xml",
false,
false,
true,
@@ -548,7 +946,7 @@ namespace VectoMockupTest
var sumWriter = new SummaryDataContainer(fileWriter);
var jobContainer = new JobContainer(sumWriter);
- _simulatorFactory =
+ var _simulatorFactory =
_simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true);
Clearfiles(fileWriter);
jobContainer.AddRuns(_simulatorFactory);
@@ -561,8 +959,17 @@ namespace VectoMockupTest
checkMrf:checkMrf,
checkPrimaryMrf:checkPrimaryMrf,
checkPrimaryReport:checkPrimaryReport);
- if(checkMrf) Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName), XsdPath), "MRF invalid");
- if(checkCif) Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLCustomerReportName), XsdPath), "CIF invalid");
+ if (checkMrf) Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLFullReportName), XmlDocumentType.ManufacturerReport), "MRF invalid");
+ if (checkPrimaryReport) Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLPrimaryVehicleReportName), XmlDocumentType.MultistepOutputData), "VIF invalid");
+ if (checkCif) Assert.IsTrue(MRF_CIF_WriterTestBase.ValidateAndPrint(XDocument.Load(fileWriter.XMLCustomerReportName), XmlDocumentType.CustomerReport), "CIF invalid");
+ }
+
+ public void ExemptedCompleteBusTest()
+ {
+ var primaryInput = BasePathExempted + "exempted_primaryBus.xml";
+ var completeInput = BasePathExempted + "exempted_completedBus_input_full.xml";
+
+
}
}
}